Padreug
e307829b50
Closes aiolabs/tasks#3. Pre-cascade prerequisite for aiolabs/lnbits#17 (signer abstraction phase 1), which lands an m002 startup job that NULLs the legacy `accounts.prvkey` column. After this migration, the tasks extension reads no plaintext nsec and works with any NostrSigner backend (LocalSigner / RemoteBunkerSigner / ClientSideOnlySigner). ## What changed ### nostr_hooks.py — three publisher entry points Was: `_account_keys(wallet_id)` helper pulled `(account.pubkey, account.prvkey)` from the wallet's owning account, returned None when prvkey was missing, then passed both to the publishers. Now: each of `publish_or_delete_task_event`, `publish_task_completion`, and `publish_completion_delete` calls `await resolve_for_wallet(...)` (the DRY helper from aiolabs/lnbits#23 — wallet → account → signer → can_sign-check in one call, returns None on any soft-fail). The resolved `NostrSigner` is passed to the publisher. Soft-skip on None (wallet missing, account unclassified, or ClientSideOnlySigner where the server has no signing authority). Removed the `_account_keys` helper entirely. ### nostr_publisher.py — three publishers Was: `publish_task_to_nostr`, `publish_completion_to_nostr`, and `publish_completion_delete_to_nostr` each accepted `(account_pubkey: str, account_prvkey: str)` and signed via a local `sign_nostr_event` helper that called `coincurve.PrivateKey .sign_schnorr` directly on the plaintext nsec. Now: each publisher accepts `signer: NostrSigner`. Signing is factored into a shared `_sign_and_publish` helper that builds the unsigned event dict (`kind`/`created_at`/`tags`/`content`), hands it to `await signer.sign_event(...)`, and writes `id`/`pubkey`/`sig` back onto the local `NostrEvent` model before publishing. The signer backend (LocalSigner / RemoteBunkerSigner) is transparent. Removed the `sign_nostr_event` helper entirely — the signer abstraction handles all signing now. Dropped the `coincurve` import; no direct crypto in this extension. ## Acceptance - [x] `_account_keys` helper removed (nostr_hooks no longer touches account.prvkey) - [x] all three publishers accept NostrSigner instead of (pubkey, prvkey) - [x] extension-local Schnorr code removed (sign_nostr_event gone) - [x] coincurve import dropped - [x] re-grep `tasks/`: zero `account.prvkey` references - [x] version bumped: 0.0.1 → 0.0.2 (catalog entry deferred until cascade lands) Manual smoke testing + tag + catalog entry follow the migration landing; will run against the regtest stack with lnbits on `issue-18-phase-2.3` (which validates both LocalSigner and RemoteBunkerSigner signing paths end-to-end). ## Cross-references - aiolabs/tasks#3 — issue this commit closes - aiolabs/lnbits#17 — the cascading signer-abstraction PR - aiolabs/lnbits#23 — the resolve_for_wallet helper this uses - aiolabs/lnbits#21 — umbrella audit (5 affected extensions) - aiolabs/events#23 — sister migration (already on signer-abstraction branch) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
85 lines
2.7 KiB
Python
85 lines
2.7 KiB
Python
"""Helpers that bridge task-mutation handlers to the Nostr publisher.
|
|
|
|
Sits between views_api and nostr_publisher so we don't pull the publisher
|
|
through the views module (which would create an import cycle via models)."""
|
|
|
|
from loguru import logger
|
|
|
|
from .crud import update_task
|
|
from .models import Task, TaskCompletion
|
|
from .nostr_publisher import (
|
|
publish_completion_delete_to_nostr,
|
|
publish_completion_to_nostr,
|
|
publish_task_to_nostr,
|
|
)
|
|
|
|
|
|
async def publish_or_delete_task_event(
|
|
task: Task, *, delete: bool = False
|
|
) -> None:
|
|
"""Publish (or delete-publish) the NIP-52 kind 31922 for `task`.
|
|
|
|
Errors 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 . import nostr_client
|
|
|
|
signer = await resolve_for_wallet(task.wallet)
|
|
if signer is None:
|
|
return
|
|
|
|
nostr_event = await publish_task_to_nostr(
|
|
nostr_client, task, signer, delete=delete
|
|
)
|
|
if nostr_event and not delete:
|
|
task.nostr_event_id = nostr_event.id
|
|
task.nostr_event_created_at = nostr_event.created_at
|
|
await update_task(task)
|
|
except Exception as exc:
|
|
logger.warning(f"[TASKS] Nostr task publish failed: {exc}")
|
|
|
|
|
|
async def publish_task_completion(
|
|
task: Task, completion: TaskCompletion
|
|
) -> str | None:
|
|
"""Publish a kind 31925 completion. Returns the Nostr event id so the
|
|
caller can persist it as the completion's primary key, replacing the
|
|
locally-generated hash from the optimistic insert."""
|
|
try:
|
|
from lnbits.core.signers import resolve_for_wallet
|
|
|
|
from . import nostr_client
|
|
|
|
signer = await resolve_for_wallet(task.wallet)
|
|
if signer is None:
|
|
return None
|
|
|
|
nostr_event = await publish_completion_to_nostr(
|
|
nostr_client, task.address, completion, signer
|
|
)
|
|
return nostr_event.id if nostr_event else None
|
|
except Exception as exc:
|
|
logger.warning(f"[TASKS] Nostr completion publish failed: {exc}")
|
|
return None
|
|
|
|
|
|
async def publish_completion_delete(
|
|
wallet_id: str, completion_id: str
|
|
) -> None:
|
|
"""Publish a NIP-09 delete for a previously-published completion."""
|
|
try:
|
|
from lnbits.core.signers import resolve_for_wallet
|
|
|
|
from . import nostr_client
|
|
|
|
signer = await resolve_for_wallet(wallet_id)
|
|
if signer is None:
|
|
return
|
|
|
|
await publish_completion_delete_to_nostr(
|
|
nostr_client, completion_id, signer
|
|
)
|
|
except Exception as exc:
|
|
logger.warning(f"[TASKS] Nostr completion delete failed: {exc}")
|