Repository navigation
Commit 78b5dae
fix(relay): store a kind:9000 and its membership writes in one transaction (#8606)
Follow-up to #8575.
## Problem
Today a kind:9000 is stored first and the membership write runs
afterwards, on its own. If that write fails, the relay logs it and still
returns an accepted OK. A resend of the same event then returns
`duplicate:`, so the person is never added. This is the
catch-log-and-accept failure that Review-Proven Rules #1 and #5
describe.
## Change
kind:9000 now uses the same atomic path as kind:9002
(`persisted_atomically` in ingest).
- **`buzz-db`:** new `put_members_with_event`, which runs one
transaction:
1. Take the channel's membership lock, before the event insert, the TTL
lock and the channel row. This matches the order the other membership
writers use, so it adds no new lock cycle.
2. Store the event. If it's already stored, roll back and return
`Duplicate`.
3. Run the existing `put_members` decisions and upsert. These now live
in a shared `put_members_on` step on the transaction.
4. Commit.
- **Failure:** nothing is stored and the client gets an `error:`
rejection, so it can resend the same event and have it applied.
- **Everyone refused:** if the decisions under the lock refuse every
person, nothing is stored and the event is rejected with the same text
validation gives. Before, a single-person add refused at that point was
accepted with an empty message.
- **After commit:** the live effects stay as they were. They're
best-effort and read the committed state: cache invalidation,
`member_joined` notices, member-added notifications and 39002 discovery.
- **`NOSTR.md`:** now says a failed kind:9000 can be resent as is.
## What got simpler
- kind:9000 no longer has its own store-then-apply path in ingest. It
shares the atomic branch with 9002 and workflow deletion.
- `apply_put_user`'s "write failed, report it as a per-person rejection
inside an accepted OK" branch is gone.
- The `Db::put_members` wrapper is deleted. Its only caller was the
kind:9000 path.
## Identified debt (not in this PR)
kind:9001 (remove), 9021 (join) and 9022 (leave) have the same gap. Each
stores the event, then runs the membership write in
`handle_side_effects`, and a failure is only logged. kind:9008 and 9005
follow the same store-then-apply pattern. These can move onto the same
atomic shape in a follow-up.
## Tests
- `failed_put_user_stores_nothing` (relay, Postgres): a test trigger
fails the second person's row in a two-person add, after the event row
and the first person were already written in the same transaction. It
checks:
- Both the send and a resend are rejected with `error:`.
- No kind:9000 is stored, nobody is added, and no `member_joined` notice
is posted.
- With the trigger dropped, the same signed event adds both people.
- One more resend returns `duplicate:` and posts no second notice.
- `put_members_with_event_stores_the_event_with_its_writes` (buzz-db):
checks the three outcomes:
- Refused: nothing is stored.
- Applied: the event is stored and the person is written.
- Duplicate: the roster is left alone.
- `put_user_refused_under_the_lock_stores_nothing` (relay, Postgres): a
test trigger removes the sender from a private channel inside the write
transaction, so validation passes and the decision under the lock
refuses. For a single add and a batch, it checks the `invalid:`
rejection, that nothing is stored and no notice is posted, and that the
same event applies once the trigger is gone.
- Mutation checks, run in Blox gates:
- At `d18e88fd`: committing the refused event fails the buzz-db test;
applying a duplicate fails the first two tests; storing the event in its
own transaction fails the first two tests.
- At `3b106623`: turning the refusal under the lock into `error:` fails
the new refusal test, and so does committing the refused event.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Signed-off-by: Luke Tornquist <[email protected]>
Co-authored-by: Elrond <28d6302a099e5225b02c4155ac4236e4912603df2ab08dbfc2f4fef08ce598c8@buzz.block.builderlab.xyz>
Co-authored-by: Claude Opus 5.5 <[email protected]>1 parent 3ed07e5 commit 78b5dae
5 files changed
Lines changed: 502 additions & 55 deletions
File tree
- crates
- buzz-db/src/store
- buzz-relay/src/handlers
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
791 | 791 | | |
792 | 792 | | |
793 | 793 | | |
794 | | - | |
795 | | - | |
796 | | - | |
797 | | - | |
798 | | - | |
799 | | - | |
800 | | - | |
801 | | - | |
| 794 | + | |
802 | 795 | | |
803 | 796 | | |
804 | 797 | | |
| |||
809 | 802 | | |
810 | 803 | | |
811 | 804 | | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
812 | 852 | | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
813 | 899 | | |
814 | 900 | | |
815 | 901 | | |
| |||
945 | 1031 | | |
946 | 1032 | | |
947 | 1033 | | |
948 | | - | |
949 | 1034 | | |
950 | 1035 | | |
951 | 1036 | | |
| |||
2115 | 2200 | | |
2116 | 2201 | | |
2117 | 2202 | | |
2118 | | - | |
2119 | | - | |
2120 | | - | |
2121 | | - | |
| 2203 | + | |
| 2204 | + | |
| 2205 | + | |
| 2206 | + | |
| 2207 | + | |
2122 | 2208 | | |
2123 | 2209 | | |
2124 | 2210 | | |
| 2211 | + | |
2125 | 2212 | | |
2126 | | - | |
2127 | | - | |
2128 | | - | |
| 2213 | + | |
| 2214 | + | |
| 2215 | + | |
| 2216 | + | |
| 2217 | + | |
| 2218 | + | |
| 2219 | + | |
| 2220 | + | |
| 2221 | + | |
| 2222 | + | |
| 2223 | + | |
| 2224 | + | |
2129 | 2225 | | |
2130 | 2226 | | |
2131 | 2227 | | |
| |||
3476 | 3572 | | |
3477 | 3573 | | |
3478 | 3574 | | |
| 3575 | + | |
| 3576 | + | |
| 3577 | + | |
| 3578 | + | |
| 3579 | + | |
| 3580 | + | |
| 3581 | + | |
| 3582 | + | |
| 3583 | + | |
| 3584 | + | |
| 3585 | + | |
| 3586 | + | |
| 3587 | + | |
| 3588 | + | |
| 3589 | + | |
| 3590 | + | |
| 3591 | + | |
| 3592 | + | |
| 3593 | + | |
| 3594 | + | |
| 3595 | + | |
| 3596 | + | |
| 3597 | + | |
| 3598 | + | |
| 3599 | + | |
| 3600 | + | |
| 3601 | + | |
| 3602 | + | |
| 3603 | + | |
| 3604 | + | |
| 3605 | + | |
| 3606 | + | |
| 3607 | + | |
| 3608 | + | |
| 3609 | + | |
| 3610 | + | |
| 3611 | + | |
| 3612 | + | |
| 3613 | + | |
| 3614 | + | |
| 3615 | + | |
| 3616 | + | |
| 3617 | + | |
| 3618 | + | |
| 3619 | + | |
| 3620 | + | |
| 3621 | + | |
| 3622 | + | |
| 3623 | + | |
| 3624 | + | |
| 3625 | + | |
| 3626 | + | |
| 3627 | + | |
| 3628 | + | |
| 3629 | + | |
| 3630 | + | |
| 3631 | + | |
| 3632 | + | |
| 3633 | + | |
| 3634 | + | |
| 3635 | + | |
| 3636 | + | |
| 3637 | + | |
| 3638 | + | |
| 3639 | + | |
| 3640 | + | |
| 3641 | + | |
| 3642 | + | |
| 3643 | + | |
| 3644 | + | |
| 3645 | + | |
| 3646 | + | |
| 3647 | + | |
| 3648 | + | |
| 3649 | + | |
| 3650 | + | |
| 3651 | + | |
| 3652 | + | |
| 3653 | + | |
| 3654 | + | |
| 3655 | + | |
| 3656 | + | |
| 3657 | + | |
| 3658 | + | |
| 3659 | + | |
| 3660 | + | |
| 3661 | + | |
| 3662 | + | |
| 3663 | + | |
| 3664 | + | |
| 3665 | + | |
| 3666 | + | |
| 3667 | + | |
| 3668 | + | |
| 3669 | + | |
| 3670 | + | |
| 3671 | + | |
| 3672 | + | |
| 3673 | + | |
| 3674 | + | |
| 3675 | + | |
| 3676 | + | |
| 3677 | + | |
| 3678 | + | |
| 3679 | + | |
| 3680 | + | |
3479 | 3681 | | |
3480 | 3682 | | |
3481 | 3683 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3053 | 3053 | | |
3054 | 3054 | | |
3055 | 3055 | | |
3056 | | - | |
| 3056 | + | |
3057 | 3057 | | |
3058 | 3058 | | |
3059 | 3059 | | |
| |||
3540 | 3540 | | |
3541 | 3541 | | |
3542 | 3542 | | |
| 3543 | + | |
3543 | 3544 | | |
3544 | 3545 | | |
3545 | 3546 | | |
| |||
3590 | 3591 | | |
3591 | 3592 | | |
3592 | 3593 | | |
| 3594 | + | |
| 3595 | + | |
| 3596 | + | |
| 3597 | + | |
| 3598 | + | |
| 3599 | + | |
| 3600 | + | |
| 3601 | + | |
| 3602 | + | |
| 3603 | + | |
| 3604 | + | |
| 3605 | + | |
| 3606 | + | |
| 3607 | + | |
| 3608 | + | |
| 3609 | + | |
| 3610 | + | |
| 3611 | + | |
| 3612 | + | |
| 3613 | + | |
| 3614 | + | |
| 3615 | + | |
3593 | 3616 | | |
3594 | 3617 | | |
3595 | 3618 | | |
| |||
3694 | 3717 | | |
3695 | 3718 | | |
3696 | 3719 | | |
3697 | | - | |
3698 | | - | |
3699 | | - | |
3700 | | - | |
3701 | | - | |
3702 | | - | |
3703 | | - | |
3704 | | - | |
| 3720 | + | |
| 3721 | + | |
| 3722 | + | |
| 3723 | + | |
| 3724 | + | |
| 3725 | + | |
3705 | 3726 | | |
3706 | 3727 | | |
3707 | 3728 | | |
| |||
0 commit comments