Padreug
607b71e796
Some checks failed
ci.yml / feat(cash-in): secure `create_withdraw` nostr-transport RPC (#31) (pull_request) Failing after 0s
Adds a server-side cash-in RPC so the ATM no longer supplies the withdraw
amount, fee, or attribution. The ATM sends a bunker-signed kind-21000
`create_withdraw` with just the gross `principal_sats` (the hardware-
attested fiat value); the handler derives everything else SERVER-SIDE:
- attribution = the VERIFIED transport `sender_pubkey` (never read from the
body), matched to an active machine on the authenticated wallet;
- fee = round(principal × super_cash_in) + round(principal × operator_cash_in),
per-leg rounding so it matches parse_settlement exactly (fee_mismatch=0);
- net = principal − fee → the withdraw amount the customer receives;
- stamps `extra={source:bitspire, type:cash_in, principal_sats, fee_sats,
nostr_sender_pubkey:<verified>, nostr_event_id}` onto the link.
The customer claims the NET link; the payout carries the stamped extra
(aiolabs/withdraw#3) and `_handle_payment` records the cash_in settlement
(spirekeeper#30) with cryptographic attribution — closing the vector where
`lnurlw_create_link` let the ATM set amount/fee/attribution freely.
Registered via `register_rpc("create_withdraw", …, AUTH_WALLET)` (extensions
register RPCs directly — withdraw already does). Soft-fails on lnbits without
`register_rpc`. Per-tx cap reads `super_config.max_cash_in_sats` defensively
(getattr) — the config field/UI is a fast-follow.
Wire schema pinned in #31. Depends on #30 (consumer-side settlement fix).
73 lines
2.5 KiB
Python
73 lines
2.5 KiB
Python
import asyncio
|
|
|
|
from fastapi import APIRouter
|
|
from lnbits.tasks import create_permanent_unique_task
|
|
from loguru import logger
|
|
|
|
from .cashin_transport import register_create_withdraw_rpc
|
|
from .crud import db
|
|
from .nostr_transport_roster import register_with_lnbits as register_roster_with_lnbits
|
|
from .tasks import wait_for_cassette_state_events, wait_for_paid_invoices
|
|
from .views import spirekeeper_generic_router
|
|
from .views_api import spirekeeper_api_router
|
|
|
|
logger.info("spirekeeper v2 loaded")
|
|
|
|
|
|
spirekeeper_ext: APIRouter = APIRouter(prefix="/spirekeeper", tags=["DCA Admin"])
|
|
spirekeeper_ext.include_router(spirekeeper_generic_router)
|
|
spirekeeper_ext.include_router(spirekeeper_api_router)
|
|
|
|
spirekeeper_static_files = [
|
|
{
|
|
"path": "/spirekeeper/static",
|
|
"name": "spirekeeper_static",
|
|
}
|
|
]
|
|
|
|
scheduled_tasks: list[asyncio.Task] = []
|
|
|
|
|
|
def spirekeeper_stop():
|
|
for task in scheduled_tasks:
|
|
try:
|
|
task.cancel()
|
|
except Exception as ex:
|
|
logger.warning(ex)
|
|
|
|
|
|
def spirekeeper_start():
|
|
# bitSpire invoice listener — replaces the v1 SSH/PostgreSQL poller.
|
|
invoice_task = create_permanent_unique_task(
|
|
"ext_spirekeeper", wait_for_paid_invoices
|
|
)
|
|
scheduled_tasks.append(invoice_task)
|
|
# Cassette bootstrap consumer (#29 v1) — subscribes to
|
|
# bitspire-cassettes-state events from each active ATM and upserts
|
|
# cassette_configs on receipt. Soft-fails if nostrclient isn't
|
|
# installed (logs + backs off, never crashes).
|
|
cassette_task = create_permanent_unique_task(
|
|
"ext_spirekeeper_cassette_bootstrap", wait_for_cassette_state_events
|
|
)
|
|
scheduled_tasks.append(cassette_task)
|
|
# Path-B wallet-routing hook (#20 / coord-log 2026-05-31T15:25Z):
|
|
# register our ATM-roster resolver with lnbits' nostr-transport so
|
|
# inbound kind-21000 from a known ATM npub routes to the operator's
|
|
# wallet, not an auto-created machine wallet. Soft-fails on lnbits
|
|
# versions that don't yet expose `register_roster_resolver`.
|
|
register_roster_with_lnbits()
|
|
# Secure cash-in (#31): register the `create_withdraw` nostr-transport RPC
|
|
# so the ATM requests a server-priced, server-stamped cash-in withdraw link
|
|
# over the bunker-signed transport — amount/fee/attribution derived
|
|
# server-side, never client-supplied. Soft-fails if `register_rpc` isn't
|
|
# exposed by this lnbits.
|
|
register_create_withdraw_rpc()
|
|
|
|
|
|
__all__ = [
|
|
"db",
|
|
"spirekeeper_ext",
|
|
"spirekeeper_start",
|
|
"spirekeeper_static_files",
|
|
"spirekeeper_stop",
|
|
]
|