diff --git a/config.json b/config.json index 03be67f..021565f 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "id": "events", - "version": "1.6.1-aio.5", + "version": "1.6.1-aio.3", "name": "Events", "repo": "https://git.atitlan.io/aiolabs/events", "short_description": "Sell and register event tickets", diff --git a/nostr_hooks.py b/nostr_hooks.py index 32ea11c..3211b24 100644 --- a/nostr_hooks.py +++ b/nostr_hooks.py @@ -15,30 +15,25 @@ from .nostr_publisher import publish_event_to_nostr async def publish_or_delete_nostr_event(event: Event, *, delete: bool = False) -> None: """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. + Pulls the wallet owner's pubkey/prvkey to sign with the user's identity. + Failures are logged and swallowed so a Nostr outage doesn't break the + HTTP flow that triggered the publish. """ try: - from lnbits.core.signers import resolve_for_wallet + from lnbits.core.crud.users import get_account + from lnbits.core.crud.wallets import get_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: skip the publish silently. The user can still - # publish kind-31922/31923 events client-side once we have - # that path. + wallet_obj = await get_wallet(event.wallet) + if not wallet_obj: + return + account = await get_account(wallet_obj.user) + if not account or not account.pubkey or not account.prvkey: return nostr_event = await publish_event_to_nostr( - nostr_client, event, signer, delete=delete + nostr_client, event, account.pubkey, account.prvkey, delete=delete ) if nostr_event and not delete: event.nostr_event_id = nostr_event.id diff --git a/nostr_publisher.py b/nostr_publisher.py index 81324fc..6867041 100644 --- a/nostr_publisher.py +++ b/nostr_publisher.py @@ -1,9 +1,8 @@ """ NIP-52 calendar event publishing for the events extension. -Builds NIP-52 calendar events from the Event model, signs them via the -core `NostrSigner` abstraction (backend-agnostic: LocalSigner, -RemoteBunkerSigner, etc.), and publishes via the NostrClient. +Builds NIP-52 calendar events from the Event model, signs them with the +creator's Account keypair, and publishes via the NostrClient. Kind 31922 is used for date-only events; kind 31923 (time-based) is used when event_start_date / event_end_date include a time component. @@ -14,7 +13,7 @@ Reference: https://github.com/nostr-protocol/nips/blob/master/52.md import time from datetime import datetime, timezone -from lnbits.core.signers import NostrSigner +import coincurve from loguru import logger from .models import Event @@ -143,20 +142,23 @@ def build_nip52_delete_event(event: Event, pubkey: str) -> NostrEvent: return nostr_event +def sign_nostr_event(nostr_event: NostrEvent, private_key_hex: str) -> None: + """Sign a NostrEvent in-place using Schnorr signature.""" + privkey = coincurve.PrivateKey(bytes.fromhex(private_key_hex)) + sig = privkey.sign_schnorr(bytes.fromhex(nostr_event.id)) + nostr_event.sig = sig.hex() + + async def publish_event_to_nostr( nostr_client, event: Event, - signer: NostrSigner, + account_pubkey: str, + account_prvkey: str, delete: bool = False, ) -> NostrEvent | None: """ Build, sign, and publish a NIP-52 calendar event (or delete event). - Signing routes through the core `NostrSigner` abstraction — - `signer.pubkey` for the event identity, `await signer.sign_event(...)` - for the Schnorr signature. The signer backend (LocalSigner / - RemoteBunkerSigner) is transparent to this function. - Returns the published NostrEvent for metadata storage, or None on failure. """ if not nostr_client: @@ -165,25 +167,11 @@ async def publish_event_to_nostr( try: if delete: - nostr_event = build_nip52_delete_event(event, signer.pubkey) + nostr_event = build_nip52_delete_event(event, account_pubkey) else: - nostr_event = build_nip52_event(event, signer.pubkey) - - # Hand the unsigned event to the signer — it fills in `id`, - # `pubkey`, and `sig`. The signer's serialization rules match - # NIP-01 (same as the local `event_id` property uses), so the - # returned id matches what we'd have computed locally. - unsigned = { - "kind": nostr_event.kind, - "created_at": nostr_event.created_at, - "tags": nostr_event.tags, - "content": nostr_event.content, - } - signed = await signer.sign_event(unsigned) - nostr_event.id = signed["id"] - nostr_event.pubkey = signed["pubkey"] - nostr_event.sig = signed["sig"] + nostr_event = build_nip52_event(event, account_pubkey) + sign_nostr_event(nostr_event, account_prvkey) await nostr_client.publish_nostr_event(nostr_event) logger.info( diff --git a/views_api.py b/views_api.py index 14d60e2..3edd953 100644 --- a/views_api.py +++ b/views_api.py @@ -47,7 +47,6 @@ from .crud import ( get_settings, get_ticket, get_tickets, - get_tickets_by_event, get_tickets_by_payment_hash, get_tickets_by_user_id, purge_unpaid_tickets, @@ -833,52 +832,3 @@ async def api_event_register_ticket( ticket.reg_timestamp = datetime.now(timezone.utc) ticket = await update_ticket(ticket) return ticket - - -@tickets_api_router.get("/event/{event_id}/stats") -async def api_event_ticket_stats( - event_id: str, - key_info: WalletTypeInfo = Depends(require_admin_key), -) -> dict: - """Door-scanner roster + counts for one event, organizer-only. - - Mirrors the `events_list_event_tickets` nostr-transport RPC for - callers that don't hold a raw user prvkey (the webapp post-#9, in - particular). Auth: wallet admin_key + the event's wallet must be - in the caller's wallet set. - """ - event = await get_event(event_id) - if not event: - raise HTTPException( - status_code=HTTPStatus.NOT_FOUND, detail="Event does not exist." - ) - - user = await get_user(key_info.wallet.user) - owned_wallet_ids = user.wallet_ids if user else [key_info.wallet.id] - if event.wallet not in owned_wallet_ids: - raise HTTPException( - status_code=HTTPStatus.FORBIDDEN, - detail="You do not own this event.", - ) - - tickets = await get_tickets_by_event(event_id) - paid_tickets = [t for t in tickets if t.paid] - registered_count = sum(1 for t in paid_tickets if t.registered) - - return { - "event_id": event_id, - "sold": len(paid_tickets), - "registered": registered_count, - "remaining": len(paid_tickets) - registered_count, - "tickets": [ - { - "id": t.id, - "name": t.name, - "registered": t.registered, - "registered_at": ( - t.reg_timestamp.isoformat() if t.reg_timestamp else None - ), - } - for t in paid_tickets - ], - }