Readiness, Electrum status, audit browsing and logs (B-92, API-37, API-46, API-47, AUD-34, AUD-41, ARC-02, ARC-09, ARC-61, ELC-29, SEC-48)
- GET /health/ready (Electrum connected, header < 1800s, scheduler heartbeat < 30s) is the container healthcheck; the scheduler beats on every tick and draw-wait iteration - GET /admin/electrum and an Electrum indicator in /admin (server, header age, last rotation) - GET /admin/audit-log: before_id, event_type, round_id, user_id, from, to; the panel gets filters - registration writes user_registered in its transaction - the app's own logs also go to stdout; uvicorn trusts X-Forwarded-For from Caddy's fixed address only, so the access log shows the client's IP Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
9520c80dcf
commit
575f1a5354
23 files changed
+478
-91
No files matched your search
@@ -1,6 +1,7 @@
|
||||
import asyncio
|
||||
import logging
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
from collections import Counter
|
||||
from collections.abc import Callable
|
||||
|
||||
@@ -79,6 +80,14 @@ _RESTORE_GAP_WINDOW = 20
|
||||
_MAX_HEADERS_PER_REQUEST = 2016
|
||||
|
||||
|
||||
def _rotation_reason(exc: BaseException) -> str:
|
||||
if isinstance(exc, ServerStalledError):
|
||||
return "stalled_tip"
|
||||
if isinstance(exc, HeaderValidationError):
|
||||
return "invalid_header"
|
||||
return "error"
|
||||
|
||||
|
||||
class ServerStalledError(Exception):
|
||||
"""The active server stopped following the chain while others report a higher tip
|
||||
(B-86, ELC-21). Ends the session like a dropped connection, so run() rotates."""
|
||||
@@ -119,6 +128,9 @@ class ElectrumListener:
|
||||
self._allow_no_quorum = allow_no_quorum
|
||||
self._endpoint_index = 0
|
||||
self._restore_checked = False
|
||||
# B-92 (API-47): why and when the listener last moved on to another server.
|
||||
self.last_rotation: dict | None = None
|
||||
self._end_reason: str | None = None
|
||||
self._refresh_locks: dict[int, asyncio.Lock] = {}
|
||||
self._scripthash_to_user: dict[str, int] = {}
|
||||
# Retains address_for_new_user's fire-and-forget subscribe task so it
|
||||
@@ -144,6 +156,18 @@ class ElectrumListener:
|
||||
# Users with a refresh already running because of a new block (see _consume_headers).
|
||||
self._block_refreshes: set[int] = set()
|
||||
|
||||
def last_header_age_seconds(self) -> int | None:
|
||||
"""B-92 (ELC-29): seconds since a header was last accepted, None before the first."""
|
||||
return None if self._last_header_at is None else int(_monotonic() - self._last_header_at)
|
||||
|
||||
@property
|
||||
def fallback_count(self) -> int:
|
||||
return max(len(self._endpoints) - 1, 0)
|
||||
|
||||
@property
|
||||
def quorum_enforced(self) -> bool:
|
||||
return not self._allow_no_quorum
|
||||
|
||||
@property
|
||||
def current_endpoint(self) -> ElectrumEndpoint | None:
|
||||
"""Which server the next (or current) session uses — for logging and for
|
||||
@@ -190,11 +214,13 @@ class ElectrumListener:
|
||||
logger.error("no Electrum endpoints configured; listener idle")
|
||||
return
|
||||
connected = False
|
||||
self._end_reason = None
|
||||
try:
|
||||
connected = await self._run_once(endpoint)
|
||||
except asyncio.CancelledError:
|
||||
raise
|
||||
except Exception:
|
||||
except Exception as exc:
|
||||
self._end_reason = _rotation_reason(exc)
|
||||
logger.exception("Electrum session on %s failed", endpoint)
|
||||
finally:
|
||||
self.client = None
|
||||
@@ -203,6 +229,11 @@ class ElectrumListener:
|
||||
# server that just dropped us has no claim on being tried first again.
|
||||
if len(self._endpoints) > 1:
|
||||
self._endpoint_index = (self._endpoint_index + 1) % len(self._endpoints)
|
||||
self.last_rotation = {
|
||||
"reason": self._end_reason or ("connection_closed" if connected else "unreachable"),
|
||||
"from": str(endpoint),
|
||||
"at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
|
||||
if connected:
|
||||
# We did reach a server, so the network is up — don't let an earlier
|
||||
@@ -294,6 +325,7 @@ class ElectrumListener:
|
||||
for task in done:
|
||||
exc = task.exception()
|
||||
if exc is not None:
|
||||
self._end_reason = _rotation_reason(exc)
|
||||
logger.warning("Electrum session on %s ending: %r", endpoint, exc)
|
||||
finally:
|
||||
self.client = None
|
||||
|
||||
Reference in new issue
Block a user