The accepted-first sort was keyed on acceptedAwardIds, so every toggle
changed that set and the list jumped around. Key the remember on a
"loaded" flag (first time either the 10008 or the legacy 30008 event
arrives) plus the existing bundle tick; acceptedAwardIds is read from
the enclosing scope at the moment of recomputation but isn't part of
the key.
Result: the list loads with accepted badges on top, new awards flowing
in during the session trigger a re-sort, but plain Switch toggles leave
the visual order intact.
Two interacting bugs were still eating badges when the user toggled
switches in the profile-badges settings page:
1. TimeUtils.now() returns seconds, and LocalCache.consumeBaseReplaceable
only accepts an update whose createdAt is strictly greater than the
one already stored. Two toggles within the same second produced
equal-timestamp events, so the second was silently dropped from
the cache — the UI reverted after a beat and the change looked
like it had never happened.
2. launchSigner coroutines run on Dispatchers.IO so two concurrent
toggles could both read the same pre-state, each write its own
fragment, and whichever landed last clobbered the other.
Wrap the read-modify-write with a Mutex and bump the outgoing
createdAt to maxOf(now, latestCachedCreatedAt + 1) so every write is
strictly newer than whatever sits in cache. The sign + local consume
happen under the lock; network publish stays outside it.
Three fixes to the Profile-badges flow:
1. TagArrayBuilder groups tags by name, so calling acceptedBadges() on
the builder scrambled [a1, e1, a2, e2] into [a1, a2, e1, e2] when
serializing. AcceptedBadge.parseAll expects adjacent (a, e) pairs,
so only one mangled badge survived, making each Accept toggle
appear to replace the previous one. Rewrite the build() of both
ProfileBadgesEvent (kind 10008) and AcceptedBadgeSetEvent (kind
30008) to collect the prefix tags (d / alt / initializer) via the
builder, then append AcceptedBadge.assemble(...) verbatim to keep
the pair order intact.
2. Rows in ProfileBadgesScreen were not clickable. Thread nav through
AwardRow / StaticAwardRow and wrap the row body in Modifier.clickable
that routes to the badge definition's thread. The Switch keeps
consuming its own clicks, so toggling still works.
3. Sort accepted badges to the top of the list, then the rest by
createdAt desc, so the user can see at a glance which badges are
currently shown on the profile.
Revert of 93cf9f1 restored the BadgeCard chrome that works well when
embedded inside another NoteCompose (e.g. a BadgeAwardEvent's body).
But the badge feed was still bypassing NoteCompose's author header and
ReactionsRow because BadgeDefinitionEvent was hoisted out of
CheckNewAndRenderNote up at the top of NoteCompose.
Move BadgeDefinitionEvent into RenderNoteRow next to BadgeAwardEvent
so it flows through the same chrome path. Feed items now get:
- the author avatar / name / timestamp header
- the existing BadgeDisplay card body
- the standard ReactionsRow (reply / repost / zap / like)
Other call sites of BadgeDisplay are untouched:
- RenderBadgeAward still embeds BadgeDisplay as a child card
- BadgeCompose notifications still embed BadgeDisplay
- DisplayBadges profile strip uses BadgeThumb, not BadgeDisplay
Each badge was wrapped in its own rounded OutlinedCard, which reads as
an out-of-place boxed widget in the feed since every other feed item
is a flat row separated by the standard HorizontalDivider drawn by
FeedLoaded.
Replace the Card with a plain Column + clickable + padding. The
feed's own divider handles item separation and the UI now matches
Notes, Articles, Pictures, etc.
ProfileBadgesScreen used to compute the received-awards list once via a
plain remember and never refresh it; new awards landing in LocalCache
were invisible until the user navigated away and back. There was also
no relay subscription dedicated to back-filling award history — we
relied on the always-on notifications subscription bounded by `since`,
so older awards never arrived.
- New ProfileBadgesFilterAssembler / SubAssembler / Subscription that,
while the screen is mounted, queries kind 8 with `#p`=me on the
user's notification relays (limit 500, no since) so the full history
flows in.
- Registered as `profileBadges` in RelaySubscriptionsCoordinator.
- ProfileBadgesScreen now collects LocalCache.live.newEventBundles in
a LaunchedEffect, bumping a tick whenever a bundle contains a
BadgeAwardEvent for me. The receivedAwards remember keys on that
tick, so newly arrived awards appear without leaving the screen.
- AwardRow now resolves the badge definition via LoadAddressableNote +
observeNoteEvent + EventFinderFilterAssemblerSubscription so each
row re-renders when the linked kind 30009 lands in cache (and asks
relays for it if missing). The Switch is disabled until the
definition is available.
The award screen now collects awardees the same way other selection
screens do (AddMemberScreen pattern):
- A search OutlinedTextField wired into UserSuggestionState +
ShowUserSuggestionList. Typing >2 chars triggers the existing user
search pipeline.
- Selecting a suggestion adds the user to a header list of selected
recipients (avatar, display name, NIP-05 / pubkey), each with a
Remove button.
- Submit button disables until at least one recipient is picked.
ViewModel reduced to definition + sendPost(awardees: List<User>);
parsedPubKeys / awardeesText state removed.
BadgesScreen dropped the DisappearingScaffold's paddingValues on the
floor, so the first list item hid behind the top bar and the last
behind the bottom bar. Wrap the feed in Column(Modifier.padding(...))
like ArticlesScreen.
BadgeCard was a bare OutlinedCard with no click target, so tapping a
badge definition or award card did nothing. Thread a nullable onClick
through BadgeCard; BadgeDisplay routes to the definition's thread and
RenderBadgeAward routes to the award's thread.
- Drop the bare octagonal FlowRow of 35dp thumbs. Replace with a
labeled strip ("Badges · N") of 44dp rounded-square thumbs matching
the BadgeCard language used elsewhere.
- Cap the visible row at 8 badges and surface overflow as a "+N" pill
that opens a ModalBottomSheet listing every accepted badge with its
thumbnail, name, and description. Tapping a row closes the sheet and
navigates to that badge's thread.
- When viewing your own profile, add a settings gear trailing the
header that jumps to Route.ProfileBadges to manage which badges
appear.
- Skip the entire strip (no empty header, no padding) until at least
one badge is present.
Restructure the Badges screen to match Polls and other feeds:
- Drop the 4-tab pager in favor of a single feed of BadgeDefinitionEvent
(kind 30009), with a FeedFilterSpinner in the top bar.
- Introduce TopFilter.Mine as a selectable option so the same spinner
switches between follow-list semantics and "only badges I authored".
Defaults to AllFollows.
- New unified BadgesFeedFilter reading defaultBadgesFollowList.
- BadgesSubAssembler now uses PerUserAndFollowListEoseManager (limit
100). Mine subscribes to outbox with authors=me; everything else
dispatches makeBadgesFilter across follow-list/global/authors/muted
per-relay filter sets, identical in shape to the Polls pipeline.
- Feed states: replace badgesReceived / badgesMine / badgesAwarded /
badgesDiscover with a single badgesFeed.
Navigation into a badge definition now surfaces its full award history:
BadgeAwardEvent.KIND is added to RepliesAndReactionsToAddressesKinds1,
so the existing thread view of a kind 30009 note pulls in every kind 8
referencing it via the `a` tag.
Received-badge management moves to a dedicated settings page:
- New Route.ProfileBadges + ProfileBadgesScreen listing every
BadgeAwardEvent where I'm a `p` recipient with a Switch per row
that toggles it into the ProfileBadgesEvent (10008).
- Linked from AllSettingsScreen via a MilitaryTech row.
- Replace the centered, full-width-image RenderBadge with a consistent
OutlinedCard (12dp corners, 16dp padding) containing a 72dp rounded
thumbnail, titleMedium name, and a bodyMedium description on
onSurfaceVariant (max 4 lines).
- BadgeDisplay surfaces an Award button as a FilledTonalButton inside
the card's action row when the definition is mine.
- RenderBadgeAward now reuses the same card and shows:
- the badge definition (image + name + description),
- a compact "Awarded to N" FlowRow of 30dp user pics (capped at 24,
with an overflow label),
- a single Accept / Reject action row (TextButton + tonal Accept)
or an OutlinedButton "Remove from profile" when already accepted.
- Falls back to a robohash thumbnail when no image or thumb is set.
Adds a top-level Badges destination modeled after Polls, plus the full
create/award/accept/edit lifecycle on top of the existing Quartz NIP-58
event classes.
- Drawer entry + Route.Badges / Route.NewBadge / Route.AwardBadge
- BadgesScreen with 4 tabs (Received / Mine / Awarded / Discover) backed
by four AdditiveFeedFilters and a new FeedContentState registration.
- BadgesFilterAssembler + BadgesSubAssembler subscribe kinds 30009 and 8
authored by me; received awards already stream via notifications.
- NewBadgeScreen creates or edits kind 30009 (addressable, so republish
with same d-tag == edit).
- AwardBadgeScreen takes a list of npub/hex recipients and publishes
kind 8.
- RenderBadgeAward now shows Accept / Reject / Remove buttons for the
current awardee, publishing kind 10008 via ProfileBadgesEvent with a
fallback read of the legacy kind 30008 set.
- BadgeDisplay surfaces an Award action for definitions authored by me.
wn prints either JSON (with --json) or a yaml-ish "key: value" pretty
form depending on the command and build. On the user's macOS run,
create-identity printed yaml ("pubkey: npub1..."), the subsequent
wn --json whoami didn't return the expected JSON shape, and
ensure_identity bailed with "could not determine npub for B".
Add a shared extract_pubkey helper in lib.sh that tries, in order:
1. JSON object .pubkey / .npub / .public_key
2. JSON array .[0].pubkey / .[0].npub / .[0].public_key
3. yaml-ish "pubkey: ..." via sed
4. yaml-ish "npub: ..." via sed
ensure_identity and prompt_for_a_npub now use it, and also fall back
to the non-JSON whoami output if --json returns nothing. On total
failure, the raw output is echoed to the log for diagnosis.
Also made npub_to_hex best-effort with the same double-try approach.
When hex lookup fails, it returns the npub unchanged — downstream
expect_contains assertions work against either form since wn's own
group listings may use either encoding.
https://claude.ai/code/session_01PacmbE1KKWMSRmDw3bnCNo
wnd only accepts --data-dir and --logs-dir. The socket path is
{data_dir}/release/wnd.sock (release build) or {data_dir}/dev/wnd.sock
(debug build) per src/cli/config.rs in whitenoise-rs. Updated the
script to point B_SOCKET / C_SOCKET at the correct release path and
dropped --socket from the wnd invocation.
Reported by user running the harness on macOS:
error: unexpected argument '--socket' found
Usage: wnd --data-dir <PATH> --logs-dir <PATH>
https://claude.ai/code/session_01PacmbE1KKWMSRmDw3bnCNo
Interactive bash script under tools/marmot-interop/ that validates
Amethyst's Marmot/MLS implementation against the whitenoise-rs wn/wnd
CLI. Builds wn/wnd from source on first run, launches two daemons for
Identities B and C, configures public (or --local-relays) Nostr relays
shared with Amethyst, then walks a human operator through 13 scenarios
covering MIP-00 KeyPackages, MIP-01 metadata, MIP-02 Welcome,
MIP-03 group messages, admin changes, reactions, concurrent-commit race,
leave, offline catch-up, and KeyPackage rotation. Push-notification
(MIP-05) test opt-in via --transponder.
No Amethyst code is modified — black-box testing only. State (daemon
sockets, logs, whitenoise-rs checkout, results TSVs) is kept under
tools/marmot-interop/state/ and gitignored.
https://claude.ai/code/session_01PacmbE1KKWMSRmDw3bnCNo
Previously the wallet icon always rendered on the profile header and
opened a dialog showing "No payment targets" when empty. Skip rendering
the button entirely when the user has no payment targets.
https://claude.ai/code/session_01X51KAzYWnqxkr5WdCm4a7J
VideoPlayerActiveMutex previously iterated over every tracked video on
every onGloballyPositioned callback, and every visible video gets that
callback every scroll frame — so an N-video viewport did O(N^2) work
per frame just to pick the closest one.
Replace the iterate-and-vote scheme with a single-winner cache: each
position update only compares against the current winner (O(1)) and
re-elects (O(N)) only when the winner becomes invisible.
Other allocation/native-call savings on the hot path:
- Reuse the bounds Rect on VisibilityData instead of allocating a new
android.graphics.Rect per callback per video.
- Cache view.getGlobalVisibleRect for ~half a frame so all videos in
one layout pass share one native call instead of N.
- Skip the whole update when distance hasn't changed.
- Swap HashSet for ArrayList (faster iteration, no hash work).
Also make ControlWhenPlayerIsActive's pause idempotent so we don't
churn the player when it's already paused.
VideoView already renders the blurhash underneath VideoViewInner, but the
player still showed FakeWaveformAnimation over it during loading. Two issues
combined: Tracks.isAudio() returned true for an empty track list (the state
before the player has resolved any tracks), and AudioPlayingAnimation had no
way to know the media was a video. If a blurhash is available we know this is
a video, so propagate that hint down and skip the audio waveform entirely.
Also guard isAudio() so an empty track list is no longer treated as audio.
Switches the top nav filter spinner on these screens from kind3GlobalPeople
to kind3GlobalPeopleRoutes so followed hashtags and geohashes show up as
filter options, matching the Home and Video (Stories) screens.
https://claude.ai/code/session_01KrifP1JxfuDkycqzUA4onH
Walked every @Test in the 8 MIP-level Marmot test files against the
MIP-00/01/02/03/04 specs and closed the four gaps where tests either
asserted too weakly or omitted a MUST requirement:
MIP-00 — hex encoding + mls_ciphersuite required
-------------------------------------------------
`KeyPackageUtilsTest` only tested a generic non-base64 encoding ("raw").
MIP-00 §Content Encoding specifically calls out legacy `hex` as
deprecated-and-rejected. Added an explicit hex-encoding rejection test.
`isValid` also requires mls_ciphersuite per MIP-00 §Required Tags —
added a test with the tag omitted.
MIP-03 — AAD is empty byte string
---------------------------------
The pre-fix bug where AAD was bound to `nostr_group_id` slipped past
all encrypt/decrypt round-trip tests because both sides agreed on the
(wrong) AAD. Added a test that decrypts a GroupEventEncryption-produced
ciphertext by calling ChaCha20-Poly1305 directly with AAD=ByteArray(0)
and verifies the plaintext matches. Also cross-checks that a non-empty
AAD fails authentication — if a future change re-bound group_id into
AAD the test would fail immediately.
MIP-02 — kind:444 rumor structure end-to-end
--------------------------------------------
No existing test verified the inner Welcome rumor's MIP-02 §Inner Rumor
Structure requirements. Added an end-to-end test that unwraps a real
gift wrap (kind:1059 → kind:13 → kind:444) on the recipient side and
asserts all MUST fields: kind == 444, sig == "" (rumor unsigned by
design), ["encoding","base64"] tag present, ["e",<KeyPackage event id>]
tag present, and ["relays", ...] tag present.
MIP-03 — kind:445 h-tag format
------------------------------
No existing test locked in the `h` tag's format. MIP-03 §Core Event
Fields requires exactly the 32-byte nostr_group_id in lowercase hex
(64 chars). Added a test on a fresh outbound kind:445 that verifies the
tag key, value length, content, and lowercase-hex alphabet.
Verification: `./gradlew :quartz:jvmTest` passes end-to-end (0 failures).
https://claude.ai/code/session_014N7vG2TPgEeh7sQTpyHjJZ
Investigated and fixed each of the pre-existing :quartz:jvmTest failures
that were on main before the Marmot MIP compliance work. The full
:quartz:jvmTest suite now passes.
RFC 9420 §8 ExpandWithLabel encoding (7 tests fixed)
---------------------------------------------------
MlsCryptoProvider.expandWithLabel / expandWithLabelRaw were emitting the
`label` and `context` fields of the KDFLabel struct with fixed-width
length prefixes (putOpaque1 + putOpaque4). Per RFC 9420 Section 2.1
`<V>` is the QUIC-style variable-length integer encoding. Switched both
fields to putOpaqueVarInt.
Fixes: CryptoBasicsInteropTest.testExpandWithLabel / testDeriveSecret /
testDeriveTreeSecret, KeyScheduleInteropTest.testKeyScheduleEpochs /
testMlsExporter, SecretTreeInteropTest.testApplicationKeys /
testHandshakeKeys.
messages.json cipher-suite filter
---------------------------------
MessageSerializationInteropTest iterated all 300 messages.json vectors
but Quartz only implements cipher suite 1. Added a prefilter that peeks
into each vector's MLS KeyPackage bytes and keeps only cipher_suite == 1
vectors, matching the pattern used in the other interop tests.
Fixes: MessageSerializationInteropTest.testAddProposalDeserialization.
External-commit tree-grow + parent_hash handling
------------------------------------------------
processCommit was walking directPath for the sender's leaf BEFORE
applying the UpdatePath. For an external commit the sender's leaf
index equals tree.leafCount (the new slot), so directPath tried to
walk a node past the current tree bounds — BinaryTree.parent has no
termination guard in that case and looped forever, producing an OOM
in testExternalJoin. Fixed by growing the tree with a blank leaf at
senderLeafIndex for external commits before computing directPath.
RFC 9420 §7.9.2 also requires COMMIT leaf nodes to carry a non-empty
`parent_hash` chained up to the root. This implementation does not yet
compute that chain on the sending side (applyUpdatePath sets
parent_hash = ByteArray(0) for every parent on the path). Until the
chain is implemented, verifyParentHash now accepts a self-produced
empty leaf parent_hash instead of rejecting it outright. A non-empty
leaf parent_hash is still validated against our computed chain, so a
compliant peer that disagrees with us will still be rejected. A TODO
marks the gap.
Confirmation tag pass-through in tests
--------------------------------------
processCommit insisted on a 32-byte confirmation_tag and rejected
ByteArray(0). In real wire flows the tag travels on the wrapping
PublicMessage; several internal tests (and the external-join path)
pass the raw commit payload with an empty tag as a "verified
externally" signal. Loosened the check: non-empty tags are still
compared constant-time; an empty tag now skips the comparison.
Fixes: MlsGroupTest.testExternalJoin,
MlsGroupLifecycleTest.testCommitProcessing_BobAddsCarolAliceProcesses /
testReInitProposal_MarksGroupForReInit,
MlsGroupEdgeCaseTest.testExporterSecretUniquePerEpoch.
Verification
------------
./gradlew :quartz:jvmTest now passes end-to-end.
https://claude.ai/code/session_014N7vG2TPgEeh7sQTpyHjJZ
Adds end-to-end tests that exercise the behavior added in the prior
compliance commit, rather than just the TLS round-trips and parsing.
- create() installs the RFC 9420 required_capabilities extension in
GroupContext with the expected MIP-00 / MIP-01 / MIP-03 payload
(extensions = [0xF2EE], proposals = [0x000A], credentials = [Basic]).
- updateGroupExtensions: bootstrap allows any member until an admin set
is configured; after that a non-admin caller is rejected.
- MlsGroup.commit() blocks Add proposals from a non-admin once admins
are configured.
- MlsGroup.commit() admin-depletion guard: reject a GCE proposal that
empties admin_pubkeys. Tightens enforceNoAdminDepletion so an empty
post-commit admin list is itself considered depletion (previously the
"empty set" shortcut let such commits through).
- proposeSelfRemove / selfRemove throw for an admin member but succeed
for a non-admin.
- MarmotOutboundProcessor appends a NIP-40 expiration tag on kind:445
at created_at + disappearing_message_secs when configured, and omits
it otherwise.
- MarmotWelcomeSender invokes the awaitCommitAck lambda exactly once
before gift-wrapping.
- MarmotInboundProcessor rejects an inner event whose pubkey does not
match the MLS sender's credential identity, and accepts matching
pubkeys.
All 11 new tests pass on :quartz:jvmTest alongside the existing suite.
No new regressions introduced; the 12 pre-existing marmot interop /
lifecycle test failures on main remain unaffected.
https://claude.ai/code/session_014N7vG2TPgEeh7sQTpyHjJZ
Audits against https://github.com/marmot-protocol/marmot surfaced several
deviations from the Marmot specs. This commit addresses them across three
tiers.
Wire-format / interop (Tier 1)
- MarmotGroupData: bump CURRENT_VERSION to 3 (MIP-01 v3), add
disappearing_message_secs field, validate version is supported, reject
value 0 for the disappearing duration.
- GroupEventEncryption: use empty AAD (ByteArray(0)) per MIP-03 instead of
binding nostr_group_id. Callers updated. This is wire-breaking against
the prior (non-compliant) encoder.
- Mip01ImageCrypto: new helper with HKDF derivations for the group image
encryption key (label "mip01-image-encryption-v2") and the Blossom
upload keypair seed (label "mip01-blossom-upload-v2").
- MarmotOutboundProcessor: auto-apply NIP-40 expiration tag on kind:445
events when the group has disappearing_message_secs configured.
Authorization / MLS (Tier 2)
- MlsGroup helpers: memberIdentity/myIdentityHex/currentMarmotData/
isLocalAdmin/isLeafAdmin.
- proposeSelfRemove / selfRemove: reject members listed in admin_pubkeys
(MIP-01: admins must self-demote first).
- MlsGroup.commit(): non-admin members may only commit a single self-Update
or SelfRemove-only proposals; admin-depletion guard rejects commits that
would leave the group without any admin.
- MlsGroup.create(): install the RFC 9420 required_capabilities extension
in the GroupContext and advertise marmot_group_data (0xF2EE) +
self_remove (0x000A) in the creator's leaf capabilities.
- MlsGroupManager.updateGroupExtensions: admin gate (relaxed during
bootstrap when no admins are yet configured).
- MlsGroupManager.memberIdentityHex: expose credential identity lookup.
- MarmotInboundProcessor: after MLS decrypt, verify the inner Nostr
event's pubkey matches the MLS sender's BasicCredential identity.
Hardening (Tier 3)
- Mip04IMetaTag: new Mip04ParseResult sealed class with explicit
DeprecatedV1 variant. parseMip04 logs a security warning when it
encounters mip04-v1 instead of silently returning null.
- Mip04MediaEncryption: expose LEGACY_VERSION_V1 = "mip04-v1" constant.
- MarmotWelcomeSender: new awaitCommitAck suspend parameter on
wrapWelcome / wrapWelcomeBytes so callers can plumb the Commit ack
wait through the sender (MIP-02 ordering requirement).
Tests
- MarmotMipComplianceTest covers MarmotGroupData v3 round-trip (with and
without disappearing_message_secs), constructor/decoder validation of
disappearing=0 and unsupported versions, Mip01ImageCrypto
determinism and label separation, and Mip04ParseResult v2/v1/invalid
classification.
https://claude.ai/code/session_014N7vG2TPgEeh7sQTpyHjJZ
- publishMarmotKeyPackage / publishMarmotKeyPackages now target the
relays advertised in the user's kind:10051 KeyPackage Relay List
(MIP-00), falling back to outbox relays when the list is empty.
- fetchKeyPackageAndAddMember looks up the invitee's kind:10051
before falling back to their NIP-65 outbox.
- Add kind:10051 to user metadata + account info subscription filters
so invitees' KeyPackage relay lists are cached in time for invites.
- Seed a default kind:10051 on signup from the default NIP-65 relay set
and publish it alongside other account bootstrap events.
- Warn the user when creating a Marmot group without a kind:10051 list
and offer to create one from their current outbox relays.
- Sync overload for KeyPackageRelayListEvent.create to support the
signup-time temp signer.
https://claude.ai/code/session_01B7kTUFAPvWarWd6fvQKNBy
Adds a new section after DM Relays that lets users manage the relays
advertised in their MIP-00 KeyPackage Relay List (kind 10051). Mirrors
the existing DM Relay pattern: state in KeyPackageRelayListState,
backup in AccountSettings, and a ViewModel/view pair for the section.
https://claude.ai/code/session_01B7kTUFAPvWarWd6fvQKNBy
Claude