Padreug
15c2276e57
Some checks failed
lint.yml / feat(nostr): publish the active ticket wave, not the roll-up (pull_request) Failing after 0s
Since upstream v1.6.8 price, currency and inventory belong to time-boxed ticket waves, and the event-level fields `sync_event_ticket_waves` derives are the PRIMARY wave's price/currency and the SUM of every wave's stock. The NIP-52 publisher read those, so as soon as an organiser created a second wave the public card would advertise the early-bird price after early bird closed and count stock in waves that had not opened. Refs #61. `build_nip52_event` now describes the wave a buyer can actually buy from: - several waves can be open at once, and a publisher has no one to ask which one the buyer wants (the purchase endpoint errors with "Please select a ticket wave"), so it advertises the CHEAPEST open wave — the price a buyer is able to obtain. Deviation recorded in docs/upstream-candidates.md. - with no open wave, `tickets_available` is 0 and never omitted: omission used to mean "unlimited", which #34/#62 removed as a concept. - `tickets_payment_methods` is scoped to the advertised wave too. It was derived from `event.allow_fiat` — the primary wave's — so it could offer a fiat rail while `tickets_allow_fiat` was absent and the purchase endpoint would refuse it. They are the same fact and now come from the same place. Wave boundaries are time-driven, and every republish we have is sale-driven, so nothing fires when early bird ends at midnight. Rather than add a scheduler, a publish records which wave it advertised (`nostr_published_wave_id`, m004) and the reconciliation sweep compares that against the wave that would be advertised now, setting `nostr_publish_pending` on a mismatch — reusing the existing retry path. NULL means "never published", which the sweep leaves alone so an upgrade does not republish the whole table on first boot. The selection rule lives in `models.advertised_ticket_wave` so the publisher and the drift detector cannot disagree about what is on the relay. 17 new tests; 114 pass. ruff, black, prettier clean; mypy error set still identical to HEAD's baseline.
86 lines
3.9 KiB
Python
86 lines
3.9 KiB
Python
"""Helpers that bridge event-mutation handlers to the Nostr publisher.
|
|
|
|
Lives in its own module so both `events_api_router` and any future router
|
|
can call it without importing through `views_api`, which would create an
|
|
import cycle (views_api -> nostr_hooks -> nostr_publisher -> models).
|
|
"""
|
|
|
|
from loguru import logger
|
|
|
|
from .crud import update_event
|
|
from .models import Event, advertised_wave_key
|
|
from .nostr_publisher import publish_event_to_nostr
|
|
|
|
|
|
async def publish_or_delete_nostr_event(event: Event, *, delete: bool = False) -> bool:
|
|
"""Publish or delete the NIP-52 calendar event for `event`.
|
|
|
|
Resolves a `NostrSigner` for the wallet owner — backend-agnostic
|
|
(LocalSigner / RemoteBunkerSigner / ClientSideOnlySigner). The
|
|
signer abstraction handles the actual key material; this hook
|
|
only needs `signer.pubkey` for event construction and
|
|
`await signer.sign_event(...)` for signing. Failures are logged
|
|
and swallowed so a Nostr outage doesn't break the HTTP flow that
|
|
triggered the publish.
|
|
|
|
Returns True when the event was signed and handed to the client,
|
|
False on any skip or failure. Callers are free to ignore it — the
|
|
`nostr_publish_pending` flag is the durable record, and the sweep
|
|
retries from that rather than from a return value.
|
|
"""
|
|
# Mark before attempting, clear only on confirmed success. Doing it
|
|
# in this order is what makes "the attempt was never made" — no
|
|
# signer, no NostrClient, process died mid-flight — as visible as
|
|
# "the attempt raised". Cheap guard so a re-publish of an already
|
|
# pending row doesn't write twice; `set_ticket_paid` sets the flag
|
|
# inside its own update so the sale path adds no extra write.
|
|
if not event.nostr_publish_pending:
|
|
event.nostr_publish_pending = True
|
|
await update_event(event)
|
|
|
|
try:
|
|
from lnbits.core.signers import resolve_for_wallet
|
|
|
|
from . import nostr_client
|
|
|
|
signer = await resolve_for_wallet(event.wallet)
|
|
if signer is None:
|
|
# Wallet missing, account missing, unclassified row, or
|
|
# ClientSideOnlySigner account (server can't sign for them).
|
|
# Soft-fail: the HTTP / payment flow that triggered this must
|
|
# not break. The user can still publish kind-31922/31923
|
|
# events client-side once we have that path.
|
|
#
|
|
# Logged at WARNING, not debug: skipping the publish means the
|
|
# relay keeps serving whatever inventory it last saw, so the
|
|
# public ticket count silently stops tracking the DB. That has
|
|
# twice been discovered only by a human noticing a wrong number
|
|
# on a public page (aiolabs/events#35, #51).
|
|
logger.warning(
|
|
f"[EVENTS] No signer for wallet {event.wallet}, skipping "
|
|
f"NIP-52 {'delete' if delete else 'publish'} for event {event.id}"
|
|
)
|
|
return False
|
|
|
|
nostr_event = await publish_event_to_nostr(
|
|
nostr_client, event, signer, delete=delete
|
|
)
|
|
if nostr_event is None:
|
|
return False
|
|
|
|
event.nostr_publish_pending = False
|
|
if not delete:
|
|
event.nostr_event_id = nostr_event.id
|
|
event.nostr_event_created_at = nostr_event.created_at
|
|
# Record which wave this publish advertised so the sweep can
|
|
# notice a wave boundary later (aiolabs/events#61). Written in
|
|
# the same update as the cleared flag, so the two can never
|
|
# disagree about what is on the relay.
|
|
event.nostr_published_wave_id = advertised_wave_key(event)
|
|
await update_event(event)
|
|
return True
|
|
except Exception as exc:
|
|
# ERROR, not warning: the row stays flagged and its published
|
|
# counts stay behind until the sweep or a later edit succeeds.
|
|
logger.error(f"[EVENTS] Nostr publish failed for event {event.id}: {exc}")
|
|
return False
|