Padreug
1f5652b425
Some checks failed
ci.yml / feat(transport): get_machine_config RPC — server-delivered machine config (#41) (pull_request) Failing after 0s
A paired ATM pulls its operator pubkey + fee config over the already-
authenticated kind-21000 transport, instead of the operator pubkey being
provisioned into the machine's .env and the fee config learned only from an
operator-signed kind-30078 broadcast. This lets a seed-only machine (blank
.env, scanned spire-seed) leave "awaiting configuration" with zero per-machine
provisioning — closing the gap surfaced by bitspire#70. Client half: bitspire#71.
The transport is already per-machine authenticated (the ATM signs with its
bunker-minted spire key == dca_machines.machine_npub), so the handler resolves
the exact machine → operator from the verified request.sender_pubkey — same
lookup as cashin_transport, no client-supplied trust — and returns only the
caller's own config. Returns {operator_pubkey, fee_config, fiat_code,
machine_npub, wallet_id, created_at}; fee_config is None until the operator has
a super-config. Reuses build_fee_payload + get_account; AUTH_ACCOUNT; registers
soft-failing (older lnbits) like the roster hook. kind-30078 push stays
dual-run for live mid-run updates.
6 tests; full suite 235 pass; black + ruff clean.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
79 lines
2.9 KiB
Python
79 lines
2.9 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 .machine_config_transport import register_machine_config_rpc
|
|
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()
|
|
# Server-delivered machine config (#41 / bitspire#70 P1): register the
|
|
# get_machine_config RPC so a paired ATM pulls its operator pubkey + fee
|
|
# config over the transport, leaving "awaiting configuration" with no
|
|
# per-machine env provisioning. Soft-fails if register_rpc isn't exposed.
|
|
register_machine_config_rpc()
|
|
|
|
|
|
__all__ = [
|
|
"db",
|
|
"spirekeeper_ext",
|
|
"spirekeeper_start",
|
|
"spirekeeper_static_files",
|
|
"spirekeeper_stop",
|
|
]
|