Add a maintenance pause/resume switch and a proper user navbar
RoundConfig gets a paused flag toggled via new POST /admin/pause and /admin/resume endpoints (audit-logged, surfaced as a "Manutenzione" card in the admin Parametri view). Pausing only stops the *next* round from opening once the current one closes — rounds/service.py:open_new_round_if_needed still lets an in-progress round finish, draw, and pay out its winner normally. GET /rounds/current exposes lottery_paused so the user page shows a maintenance banner (even while logged out) instead of silently going idle. Also replaces the user dashboard's stacked account-bar card + bento-grid menu with a single sticky navbar (identity row + Deposito/Bet/Prelievo tabs), and moves the page content into a dedicated .app-shell container so the navbar itself can span full width.
This commit is contained in:
@@ -64,6 +64,7 @@ Known risk: `docker-compose.yml` sets `restart: unless-stopped` on `app`, so a c
|
|||||||
- **Secrets**: master xprv encrypted at rest with a symmetric scheme (AES-GCM/Fernet); the encryption key itself lives in an env var, never in the DB or in git.
|
- **Secrets**: master xprv encrypted at rest with a symmetric scheme (AES-GCM/Fernet); the encryption key itself lives in an env var, never in the DB or in git.
|
||||||
- **Operational config**: every business/round parameter (fee address, bet amount, round duration, round cooldown, draw animation duration, minimum amount, network fee rate, RBF timeout) lives in the `round_config` DB table (single row, `app/rounds/config.py`) and is only editable live via the admin dashboard (`/admin`) or its API — no env var involved at all, no redeploy or restart needed. Defaults for a brand-new instance are hardcoded column defaults on the `RoundConfig` model (`app/db/models.py`), not `app/config.py`. Secrets and infra wiring (master key, JWT secret, Electrum host, admin token, database URL) stay env-var-driven in `.env` since those genuinely need a restart.
|
- **Operational config**: every business/round parameter (fee address, bet amount, round duration, round cooldown, draw animation duration, minimum amount, network fee rate, RBF timeout) lives in the `round_config` DB table (single row, `app/rounds/config.py`) and is only editable live via the admin dashboard (`/admin`) or its API — no env var involved at all, no redeploy or restart needed. Defaults for a brand-new instance are hardcoded column defaults on the `RoundConfig` model (`app/db/models.py`), not `app/config.py`. Secrets and infra wiring (master key, JWT secret, Electrum host, admin token, database URL) stay env-var-driven in `.env` since those genuinely need a restart.
|
||||||
- **Round cooldown**: `round_cooldown_seconds` — gap after a round closes before the next one opens, so players have time to see the outcome (default 30s). Not in the original flowchart; added afterwards as an explicit design decision.
|
- **Round cooldown**: `round_cooldown_seconds` — gap after a round closes before the next one opens, so players have time to see the outcome (default 30s). Not in the original flowchart; added afterwards as an explicit design decision.
|
||||||
|
- **Maintenance pause**: `RoundConfig.paused` (default `false`), toggled via `POST /admin/pause` / `POST /admin/resume` (a dedicated "Manutenzione" card in `/admin`'s Parametri section, not a plain config field — it's a deliberate operator action, audit-logged as `lottery_paused`/`lottery_resumed`). When set, `rounds/service.py:open_new_round_if_needed` stops opening a *next* round once the current one closes — it never interrupts a round already in progress (that one still closes, draws, and pays out its winner normally). `GET /rounds/current` exposes it as `lottery_paused` so the user-facing page (`/`) shows a maintenance banner.
|
||||||
|
|
||||||
## PLM network parameters
|
## PLM network parameters
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ _CONFIG_FIELDS = (
|
|||||||
"fee_rate_sat_vb",
|
"fee_rate_sat_vb",
|
||||||
"rbf_timeout_seconds",
|
"rbf_timeout_seconds",
|
||||||
"draw_animation_seconds",
|
"draw_animation_seconds",
|
||||||
|
"paused",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -41,6 +42,7 @@ class RoundConfigResponse(BaseModel):
|
|||||||
fee_rate_sat_vb: int
|
fee_rate_sat_vb: int
|
||||||
rbf_timeout_seconds: int
|
rbf_timeout_seconds: int
|
||||||
draw_animation_seconds: int
|
draw_animation_seconds: int
|
||||||
|
paused: bool
|
||||||
|
|
||||||
|
|
||||||
class RoundConfigUpdate(BaseModel):
|
class RoundConfigUpdate(BaseModel):
|
||||||
@@ -52,6 +54,7 @@ class RoundConfigUpdate(BaseModel):
|
|||||||
fee_rate_sat_vb: int | None = None
|
fee_rate_sat_vb: int | None = None
|
||||||
rbf_timeout_seconds: int | None = None
|
rbf_timeout_seconds: int | None = None
|
||||||
draw_animation_seconds: int | None = None
|
draw_animation_seconds: int | None = None
|
||||||
|
paused: bool | None = None
|
||||||
|
|
||||||
|
|
||||||
def _config_response(config) -> RoundConfigResponse:
|
def _config_response(config) -> RoundConfigResponse:
|
||||||
@@ -78,6 +81,27 @@ async def update_config(
|
|||||||
return _config_response(config)
|
return _config_response(config)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/pause", response_model=RoundConfigResponse, dependencies=[Depends(require_admin)])
|
||||||
|
async def pause_lottery(session: AsyncSession = Depends(get_session)) -> RoundConfigResponse:
|
||||||
|
"""Maintenance switch: the round in progress (if any) still closes, draws,
|
||||||
|
and pays out its winner normally — only opening the *next* round is
|
||||||
|
suppressed until /admin/resume is called (rounds/service.py)."""
|
||||||
|
config = await get_round_config(session)
|
||||||
|
config.paused = True
|
||||||
|
await write_audit_log(session, "lottery_paused", {})
|
||||||
|
await session.commit()
|
||||||
|
return _config_response(config)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/resume", response_model=RoundConfigResponse, dependencies=[Depends(require_admin)])
|
||||||
|
async def resume_lottery(session: AsyncSession = Depends(get_session)) -> RoundConfigResponse:
|
||||||
|
config = await get_round_config(session)
|
||||||
|
config.paused = False
|
||||||
|
await write_audit_log(session, "lottery_resumed", {})
|
||||||
|
await session.commit()
|
||||||
|
return _config_response(config)
|
||||||
|
|
||||||
|
|
||||||
class AdminUserResponse(BaseModel):
|
class AdminUserResponse(BaseModel):
|
||||||
id: int
|
id: int
|
||||||
username: str
|
username: str
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class CurrentRoundResponse(BaseModel):
|
|||||||
winner_user_id: int | None = None
|
winner_user_id: int | None = None
|
||||||
winner_amount_sats: int | None = None
|
winner_amount_sats: int | None = None
|
||||||
chain_tip_height: int | None = None
|
chain_tip_height: int | None = None
|
||||||
|
lottery_paused: bool = False
|
||||||
|
|
||||||
|
|
||||||
@router.get("/current", response_model=CurrentRoundResponse)
|
@router.get("/current", response_model=CurrentRoundResponse)
|
||||||
@@ -39,6 +40,7 @@ async def current_round(request: Request, session: AsyncSession = Depends(get_se
|
|||||||
bet_amount_sats=config.bet_amount_sats,
|
bet_amount_sats=config.bet_amount_sats,
|
||||||
draw_animation_seconds=config.draw_animation_seconds,
|
draw_animation_seconds=config.draw_animation_seconds,
|
||||||
chain_tip_height=chain_tip_height,
|
chain_tip_height=chain_tip_height,
|
||||||
|
lottery_paused=config.paused,
|
||||||
)
|
)
|
||||||
|
|
||||||
participant_count = await session.scalar(
|
participant_count = await session.scalar(
|
||||||
@@ -60,4 +62,5 @@ async def current_round(request: Request, session: AsyncSession = Depends(get_se
|
|||||||
winner_user_id=round_.winner_user_id,
|
winner_user_id=round_.winner_user_id,
|
||||||
winner_amount_sats=round_.winner_amount_sats,
|
winner_amount_sats=round_.winner_amount_sats,
|
||||||
chain_tip_height=chain_tip_height,
|
chain_tip_height=chain_tip_height,
|
||||||
|
lottery_paused=config.paused,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -95,6 +95,10 @@ class RoundConfig(Base):
|
|||||||
min_amount_sats: Mapped[int] = mapped_column(BigInteger, default=100_000_000)
|
min_amount_sats: Mapped[int] = mapped_column(BigInteger, default=100_000_000)
|
||||||
fee_rate_sat_vb: Mapped[int] = mapped_column(default=1)
|
fee_rate_sat_vb: Mapped[int] = mapped_column(default=1)
|
||||||
rbf_timeout_seconds: Mapped[int] = mapped_column(default=900)
|
rbf_timeout_seconds: Mapped[int] = mapped_column(default=900)
|
||||||
|
# Maintenance switch: when true, the round currently in progress still runs to
|
||||||
|
# completion (closes, draws, pays out the winner) but no new round is opened
|
||||||
|
# afterwards — see rounds/service.py:open_new_round_if_needed.
|
||||||
|
paused: Mapped[bool] = mapped_column(default=False)
|
||||||
updated_at: Mapped[datetime] = mapped_column(default=utcnow, onupdate=utcnow)
|
updated_at: Mapped[datetime] = mapped_column(default=utcnow, onupdate=utcnow)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+13
-6
@@ -19,19 +19,26 @@ async def get_active_round(session: AsyncSession) -> Round | None:
|
|||||||
async def open_new_round_if_needed(session: AsyncSession) -> Round | None:
|
async def open_new_round_if_needed(session: AsyncSession) -> Round | None:
|
||||||
"""Returns the active round if one exists (whatever its status). Otherwise
|
"""Returns the active round if one exists (whatever its status). Otherwise
|
||||||
opens a fresh one, unless the last closed round's cooldown (ROUND_COOLDOWN_SECONDS)
|
opens a fresh one, unless the last closed round's cooldown (ROUND_COOLDOWN_SECONDS)
|
||||||
hasn't elapsed yet — in which case returns None. Callers that need to attach a
|
hasn't elapsed yet, or the lottery is paused for maintenance — in either case
|
||||||
bet must additionally check the returned round's status == "open" — a round in
|
returns None. Callers that need to attach a bet must additionally check the
|
||||||
closing/drawing/paying_out isn't accepting new bets, but a new round can't open
|
returned round's status == "open" — a round in closing/drawing/paying_out
|
||||||
until it's done."""
|
isn't accepting new bets, but a new round can't open until it's done.
|
||||||
|
|
||||||
|
Pausing never touches a round already in progress: it only suppresses opening
|
||||||
|
the *next* one, so the current round still closes, draws, and pays out the
|
||||||
|
winner normally (see admin.py's /admin/pause and /admin/resume)."""
|
||||||
active = await get_active_round(session)
|
active = await get_active_round(session)
|
||||||
if active is not None:
|
if active is not None:
|
||||||
return active
|
return active
|
||||||
|
|
||||||
|
config = await get_round_config(session)
|
||||||
|
if config.paused:
|
||||||
|
return None
|
||||||
|
|
||||||
last_closed = await session.scalar(select(Round).where(Round.status == "closed").order_by(Round.id.desc()))
|
last_closed = await session.scalar(select(Round).where(Round.status == "closed").order_by(Round.id.desc()))
|
||||||
if last_closed is not None and last_closed.closed_at is not None:
|
if last_closed is not None and last_closed.closed_at is not None:
|
||||||
closed_at = last_closed.closed_at.replace(tzinfo=timezone.utc)
|
closed_at = last_closed.closed_at.replace(tzinfo=timezone.utc)
|
||||||
cooldown_seconds = (await get_round_config(session)).round_cooldown_seconds
|
if datetime.now(timezone.utc) < closed_at + timedelta(seconds=config.round_cooldown_seconds):
|
||||||
if datetime.now(timezone.utc) < closed_at + timedelta(seconds=cooldown_seconds):
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
round_ = Round(status="open")
|
round_ = Round(status="open")
|
||||||
|
|||||||
@@ -77,6 +77,12 @@
|
|||||||
}
|
}
|
||||||
.chain-block { color: var(--color-muted-foreground); font-size: 0.82rem; white-space: nowrap; }
|
.chain-block { color: var(--color-muted-foreground); font-size: 0.82rem; white-space: nowrap; }
|
||||||
|
|
||||||
|
.row-between { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
|
||||||
|
#maintenance-btn.btn-stop {
|
||||||
|
background: var(--color-destructive-bg); color: var(--color-destructive); border-color: var(--color-destructive);
|
||||||
|
}
|
||||||
|
.status-dot.status-paused { background: var(--color-destructive); }
|
||||||
|
|
||||||
main { max-width: 960px; margin: 0 auto; padding: 24px 20px 80px; }
|
main { max-width: 960px; margin: 0 auto; padding: 24px 20px 80px; }
|
||||||
|
|
||||||
.view { display: none; }
|
.view { display: none; }
|
||||||
@@ -221,6 +227,21 @@
|
|||||||
<h2 class="section-title">Parametri</h2>
|
<h2 class="section-title">Parametri</h2>
|
||||||
<p class="hint">Configurazione operativa, salvata nel database — modificabile in qualsiasi momento senza riavviare il server.</p>
|
<p class="hint">Configurazione operativa, salvata nel database — modificabile in qualsiasi momento senza riavviare il server.</p>
|
||||||
|
|
||||||
|
<div class="card" id="maintenance-card">
|
||||||
|
<h2>Manutenzione</h2>
|
||||||
|
<p class="hint" id="maintenance-hint">
|
||||||
|
Interrompe l'apertura di nuovi round dopo quello in corso, senza troncare il round attuale — chiusura,
|
||||||
|
estrazione e pagamento del vincitore avvengono normalmente. Gli utenti vedono un avviso di manutenzione.
|
||||||
|
</p>
|
||||||
|
<div class="row-between">
|
||||||
|
<span class="chain-status-pill">
|
||||||
|
<span class="status-dot" id="maintenance-dot"></span>
|
||||||
|
<span id="maintenance-status-label">—</span>
|
||||||
|
</span>
|
||||||
|
<button id="maintenance-btn" class="secondary" style="width:auto;margin-top:0" onclick="toggleMaintenance()">…</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="grid-2">
|
<div class="grid-2">
|
||||||
<div>
|
<div>
|
||||||
@@ -460,11 +481,53 @@ async function adminLoadConfig() {
|
|||||||
document.getElementById('admin-min-amount').value = data.min_amount_sats / SATS_PER_PLM;
|
document.getElementById('admin-min-amount').value = data.min_amount_sats / SATS_PER_PLM;
|
||||||
document.getElementById('admin-fee-rate').value = data.fee_rate_sat_vb;
|
document.getElementById('admin-fee-rate').value = data.fee_rate_sat_vb;
|
||||||
document.getElementById('admin-rbf-timeout').value = data.rbf_timeout_seconds;
|
document.getElementById('admin-rbf-timeout').value = data.rbf_timeout_seconds;
|
||||||
|
renderMaintenanceState(data.paused);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
toast('Errore nel caricamento configurazione: ' + e.message, 'error');
|
toast('Errore nel caricamento configurazione: ' + e.message, 'error');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderMaintenanceState(paused) {
|
||||||
|
const dot = document.getElementById('maintenance-dot');
|
||||||
|
const label = document.getElementById('maintenance-status-label');
|
||||||
|
const btn = document.getElementById('maintenance-btn');
|
||||||
|
btn.dataset.paused = paused ? '1' : '0';
|
||||||
|
if (paused) {
|
||||||
|
dot.className = 'status-dot status-paused';
|
||||||
|
label.textContent = 'In pausa: nessun nuovo round verrà aperto';
|
||||||
|
btn.textContent = 'Riprendi lotteria';
|
||||||
|
btn.classList.remove('btn-stop');
|
||||||
|
} else {
|
||||||
|
dot.className = 'status-dot status-open';
|
||||||
|
label.textContent = 'Attiva: i round si susseguono normalmente';
|
||||||
|
btn.textContent = 'Interrompi dopo questo round';
|
||||||
|
btn.classList.add('btn-stop');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleMaintenance() {
|
||||||
|
const btn = document.getElementById('maintenance-btn');
|
||||||
|
const isPaused = btn.dataset.paused === '1';
|
||||||
|
const path = isPaused ? '/admin/resume' : '/admin/pause';
|
||||||
|
if (!isPaused && !window.confirm(
|
||||||
|
"Nessun nuovo round verrà aperto dopo quello in corso, fino a quando non riprendi la lotteria. " +
|
||||||
|
"Il round attuale (se presente) verrà comunque completato e il vincitore pagato. Continuare?"
|
||||||
|
)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
btn.disabled = true;
|
||||||
|
try {
|
||||||
|
const data = await callAdmin('POST', path, {});
|
||||||
|
renderMaintenanceState(data.paused);
|
||||||
|
toast(data.paused ? 'Lotteria in pausa.' : 'Lotteria ripresa.', 'success');
|
||||||
|
refreshChainStatus();
|
||||||
|
} catch (e) {
|
||||||
|
toast('Errore: ' + e.message, 'error');
|
||||||
|
} finally {
|
||||||
|
btn.disabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function adminSave() {
|
async function adminSave() {
|
||||||
const btn = document.getElementById('save-btn');
|
const btn = document.getElementById('save-btn');
|
||||||
const feeAddress = document.getElementById('admin-fee-address').value;
|
const feeAddress = document.getElementById('admin-fee-address').value;
|
||||||
|
|||||||
+76
-65
@@ -30,17 +30,12 @@
|
|||||||
font-family: 'Fira Sans', system-ui, sans-serif;
|
font-family: 'Fira Sans', system-ui, sans-serif;
|
||||||
background: var(--color-background);
|
background: var(--color-background);
|
||||||
color: var(--color-foreground);
|
color: var(--color-foreground);
|
||||||
max-width: 480px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 32px 20px 80px;
|
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mono { font-family: 'Fira Code', monospace; }
|
.app-shell { max-width: 480px; margin: 0 auto; padding: 24px 20px 80px; }
|
||||||
|
|
||||||
header { margin-bottom: 24px; }
|
.mono { font-family: 'Fira Code', monospace; }
|
||||||
header h1 { font-size: 1.375rem; font-weight: 700; margin: 0; letter-spacing: -0.01em; }
|
|
||||||
header p { color: var(--color-muted-foreground); font-size: 0.9rem; margin: 4px 0 0; }
|
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
background: var(--color-surface);
|
background: var(--color-surface);
|
||||||
@@ -102,11 +97,37 @@
|
|||||||
}
|
}
|
||||||
button.link:hover { filter: none; color: var(--color-foreground); }
|
button.link:hover { filter: none; color: var(--color-foreground); }
|
||||||
|
|
||||||
.account-bar { display: flex; align-items: center; justify-content: space-between; margin-bottom: 4px; }
|
|
||||||
.account-bar .name { font-weight: 600; }
|
|
||||||
|
|
||||||
.row-between { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
|
.row-between { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
|
||||||
|
|
||||||
|
/* --- sticky app navbar: identity row + section tabs, shown only when logged in --- */
|
||||||
|
.app-navbar {
|
||||||
|
position: sticky; top: 0; z-index: 20;
|
||||||
|
background: color-mix(in srgb, var(--color-surface) 92%, transparent);
|
||||||
|
backdrop-filter: blur(6px); -webkit-backdrop-filter: blur(6px);
|
||||||
|
border-bottom: 1px solid var(--color-border); margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
.app-navbar-top {
|
||||||
|
max-width: 480px; margin: 0 auto; padding: 12px 20px 8px;
|
||||||
|
display: flex; align-items: center; justify-content: space-between; gap: 12px;
|
||||||
|
}
|
||||||
|
.app-navbar-top .brand { font-weight: 700; font-size: 1rem; letter-spacing: -0.01em; }
|
||||||
|
.app-navbar-account { display: flex; align-items: center; gap: 10px; }
|
||||||
|
.app-navbar-account .name { font-weight: 600; font-size: 0.85rem; }
|
||||||
|
|
||||||
|
.app-navbar-tabs { max-width: 480px; margin: 0 auto; padding: 0 12px; display: flex; }
|
||||||
|
.app-navbar-tabs button.navbar-tab {
|
||||||
|
flex: 1; width: auto; min-height: auto; margin-top: 0; padding: 8px 4px 10px;
|
||||||
|
display: flex; flex-direction: column; align-items: center; gap: 3px;
|
||||||
|
font-size: 0.72rem; font-weight: 600; font-family: inherit; cursor: pointer;
|
||||||
|
background: none; color: var(--color-muted-foreground);
|
||||||
|
border: none; border-bottom: 2px solid transparent; margin-bottom: -1px;
|
||||||
|
transition: color 150ms, border-color 150ms;
|
||||||
|
}
|
||||||
|
.app-navbar-tabs button.navbar-tab .icon { width: 18px; height: 18px; }
|
||||||
|
.app-navbar-tabs button.navbar-tab.active { color: var(--color-primary); border-bottom-color: var(--color-primary); }
|
||||||
|
.app-navbar-tabs button.navbar-tab:hover { filter: none; color: var(--color-foreground); }
|
||||||
|
.app-navbar-tabs button.navbar-tab.active:hover { color: var(--color-primary); }
|
||||||
|
|
||||||
.address-box {
|
.address-box {
|
||||||
display: flex; align-items: center; justify-content: space-between; gap: 8px;
|
display: flex; align-items: center; justify-content: space-between; gap: 8px;
|
||||||
background: var(--color-background); border: 1px solid var(--color-border);
|
background: var(--color-background); border: 1px solid var(--color-border);
|
||||||
@@ -118,20 +139,6 @@
|
|||||||
|
|
||||||
.icon { width: 16px; height: 16px; flex-shrink: 0; }
|
.icon { width: 16px; height: 16px; flex-shrink: 0; }
|
||||||
|
|
||||||
nav.menu { display: flex; gap: 4px; margin-bottom: 16px; }
|
|
||||||
nav.menu button.nav-item {
|
|
||||||
flex: 1; width: auto; margin-top: 0; min-height: 56px; padding: 8px 4px;
|
|
||||||
flex-direction: column; gap: 4px; font-size: 0.8rem; font-weight: 600;
|
|
||||||
background: var(--color-surface); color: var(--color-muted-foreground);
|
|
||||||
border: 1px solid var(--color-border); border-radius: 10px;
|
|
||||||
}
|
|
||||||
nav.menu button.nav-item .icon { width: 20px; height: 20px; }
|
|
||||||
nav.menu button.nav-item.active {
|
|
||||||
background: var(--color-primary); color: var(--color-on-primary); border-color: var(--color-primary);
|
|
||||||
}
|
|
||||||
nav.menu button.nav-item:hover { filter: none; border-color: var(--color-ring); }
|
|
||||||
nav.menu button.nav-item.active:hover { filter: brightness(0.94); }
|
|
||||||
|
|
||||||
.dash-panel { display: none; }
|
.dash-panel { display: none; }
|
||||||
.dash-panel.active { display: block; }
|
.dash-panel.active { display: block; }
|
||||||
|
|
||||||
@@ -220,25 +227,6 @@
|
|||||||
}
|
}
|
||||||
.trust-pill .icon { width: 13px; height: 13px; color: var(--color-success); flex-shrink: 0; }
|
.trust-pill .icon { width: 13px; height: 13px; color: var(--color-success); flex-shrink: 0; }
|
||||||
|
|
||||||
/* --- bento nav for the dashboard menu --- */
|
|
||||||
nav.menu.bento {
|
|
||||||
display: grid; grid-template-columns: 1fr 1fr; grid-template-areas: "deposit deposit" "bet withdraw";
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
nav.menu.bento button.nav-item {
|
|
||||||
width: 100%; align-items: flex-start; text-align: left; flex-direction: row; gap: 10px;
|
|
||||||
min-height: 64px; padding: 12px 14px; border-radius: 14px;
|
|
||||||
}
|
|
||||||
nav.menu.bento button#nav-deposit { grid-area: deposit; }
|
|
||||||
nav.menu.bento button#nav-bet { grid-area: bet; }
|
|
||||||
nav.menu.bento button#nav-withdraw { grid-area: withdraw; }
|
|
||||||
nav.menu.bento button.nav-item .icon { width: 20px; height: 20px; margin-top: 2px; }
|
|
||||||
nav.menu.bento button.nav-item .nav-item-text { display: flex; flex-direction: column; gap: 2px; }
|
|
||||||
nav.menu.bento button.nav-item .nav-item-title { font-size: 0.85rem; }
|
|
||||||
nav.menu.bento button.nav-item .nav-item-hint {
|
|
||||||
font-size: 0.7rem; font-weight: 400; color: inherit; opacity: 0.75;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* --- glowing card while a round is drawing --- */
|
/* --- glowing card while a round is drawing --- */
|
||||||
.card.drawing-glow {
|
.card.drawing-glow {
|
||||||
border-color: color-mix(in srgb, var(--color-primary) 55%, var(--color-border));
|
border-color: color-mix(in srgb, var(--color-primary) 55%, var(--color-border));
|
||||||
@@ -284,6 +272,14 @@
|
|||||||
}
|
}
|
||||||
.chain-block { color: var(--color-muted-foreground); white-space: nowrap; }
|
.chain-block { color: var(--color-muted-foreground); white-space: nowrap; }
|
||||||
|
|
||||||
|
.maintenance-banner {
|
||||||
|
display: flex; align-items: flex-start; gap: 8px;
|
||||||
|
background: color-mix(in srgb, var(--color-primary) 12%, var(--color-surface));
|
||||||
|
border: 1px solid color-mix(in srgb, var(--color-primary) 40%, transparent);
|
||||||
|
color: var(--color-foreground); border-radius: var(--radius);
|
||||||
|
padding: 12px 14px; font-size: 0.82rem; line-height: 1.4; margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
* { animation: none !important; transition: none !important; }
|
* { animation: none !important; transition: none !important; }
|
||||||
}
|
}
|
||||||
@@ -291,6 +287,32 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
<nav class="app-navbar hidden" id="app-navbar" aria-label="Sezioni">
|
||||||
|
<div class="app-navbar-top">
|
||||||
|
<span class="brand">PLM Lottery</span>
|
||||||
|
<div class="app-navbar-account">
|
||||||
|
<span class="name" id="dash-username"></span>
|
||||||
|
<button class="link" onclick="logout()">Esci</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="app-navbar-tabs">
|
||||||
|
<button class="navbar-tab active" id="nav-deposit" onclick="switchPanel('deposit')">
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="7" width="20" height="14" rx="2"/><path d="M16 21V5a2 2 0 0 0-2-2H6a2 2 0 0 0-2 2v16"/></svg>
|
||||||
|
Deposito
|
||||||
|
</button>
|
||||||
|
<button class="navbar-tab" id="nav-bet" onclick="switchPanel('bet')">
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="6" width="20" height="12" rx="2"/><path d="M6 12h.01M12 12h.01M18 12h.01"/></svg>
|
||||||
|
Bet
|
||||||
|
</button>
|
||||||
|
<button class="navbar-tab" id="nav-withdraw" onclick="switchPanel('withdraw')">
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19V5M5 12l7-7 7 7"/></svg>
|
||||||
|
Prelievo
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<div class="app-shell">
|
||||||
|
|
||||||
<div class="chain-bar" id="chain-bar">
|
<div class="chain-bar" id="chain-bar">
|
||||||
<span class="chain-status-pill">
|
<span class="chain-status-pill">
|
||||||
<span class="status-dot" id="chain-status-dot"></span>
|
<span class="status-dot" id="chain-status-dot"></span>
|
||||||
@@ -299,6 +321,11 @@
|
|||||||
<span class="chain-block mono" id="chain-block">Blocco —</span>
|
<span class="chain-block mono" id="chain-block">Blocco —</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="maintenance-banner hidden" id="maintenance-banner">
|
||||||
|
<span>⚠️</span>
|
||||||
|
<span>Manutenzione in programma: il round in corso viene completato regolarmente (vincitore incluso), ma il round successivo non si aprirà finché la manutenzione non sarà terminata.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<section id="landing-hero" class="hero">
|
<section id="landing-hero" class="hero">
|
||||||
<h1>PLM Lottery</h1>
|
<h1>PLM Lottery</h1>
|
||||||
<p class="lead">Deposita PLM, entra nel round con una quota fissa, e se viene estratto il tuo numero vinci il montepremi.</p>
|
<p class="lead">Deposita PLM, entra nel round con una quota fissa, e se viene estratto il tuo numero vinci il montepremi.</p>
|
||||||
@@ -355,13 +382,6 @@
|
|||||||
|
|
||||||
<section id="dashboard-section" class="hidden">
|
<section id="dashboard-section" class="hidden">
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<div class="account-bar">
|
|
||||||
<span class="name" id="dash-username"></span>
|
|
||||||
<button class="link" onclick="logout()">Esci</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card" id="round-card">
|
<div class="card" id="round-card">
|
||||||
<div class="row-between" id="round-normal-row">
|
<div class="row-between" id="round-normal-row">
|
||||||
<h2 id="round-title">Round —</h2>
|
<h2 id="round-title">Round —</h2>
|
||||||
@@ -386,21 +406,6 @@
|
|||||||
<div class="hidden" id="draw-result"></div>
|
<div class="hidden" id="draw-result"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav class="menu bento" aria-label="Sezioni">
|
|
||||||
<button class="nav-item active" id="nav-deposit" onclick="switchPanel('deposit')">
|
|
||||||
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="7" width="20" height="14" rx="2"/><path d="M16 21V5a2 2 0 0 0-2-2H6a2 2 0 0 0-2 2v16"/></svg>
|
|
||||||
<span class="nav-item-text"><span class="nav-item-title">Deposito</span><span class="nav-item-hint">Indirizzo e saldo</span></span>
|
|
||||||
</button>
|
|
||||||
<button class="nav-item" id="nav-bet" onclick="switchPanel('bet')">
|
|
||||||
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="6" width="20" height="12" rx="2"/><path d="M6 12h.01M12 12h.01M18 12h.01"/></svg>
|
|
||||||
<span class="nav-item-text"><span class="nav-item-title">Bet</span><span class="nav-item-hint">Entra nel round</span></span>
|
|
||||||
</button>
|
|
||||||
<button class="nav-item" id="nav-withdraw" onclick="switchPanel('withdraw')">
|
|
||||||
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19V5M5 12l7-7 7 7"/></svg>
|
|
||||||
<span class="nav-item-text"><span class="nav-item-title">Prelievo</span><span class="nav-item-hint">Verso indirizzo esterno</span></span>
|
|
||||||
</button>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div class="dash-panel active" id="panel-deposit">
|
<div class="dash-panel active" id="panel-deposit">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<h2>Saldo interno</h2>
|
<h2>Saldo interno</h2>
|
||||||
@@ -451,6 +456,8 @@
|
|||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<div id="toast-container" aria-live="polite"></div>
|
<div id="toast-container" aria-live="polite"></div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -536,6 +543,8 @@ function updateChainStatusBar(data) {
|
|||||||
dot.className = 'status-dot status-' + statusKey;
|
dot.className = 'status-dot status-' + statusKey;
|
||||||
label.textContent = CHAIN_STATUS_LABELS[statusKey];
|
label.textContent = CHAIN_STATUS_LABELS[statusKey];
|
||||||
block.textContent = 'Blocco ' + (data.chain_tip_height != null ? '#' + data.chain_tip_height : '—');
|
block.textContent = 'Blocco ' + (data.chain_tip_height != null ? '#' + data.chain_tip_height : '—');
|
||||||
|
|
||||||
|
document.getElementById('maintenance-banner').classList.toggle('hidden', !data.lottery_paused);
|
||||||
}
|
}
|
||||||
|
|
||||||
let chainOnlyInterval = null;
|
let chainOnlyInterval = null;
|
||||||
@@ -669,6 +678,7 @@ function showDashboard() {
|
|||||||
stopChainOnlyPolling();
|
stopChainOnlyPolling();
|
||||||
document.getElementById('landing-hero').classList.add('hidden');
|
document.getElementById('landing-hero').classList.add('hidden');
|
||||||
document.getElementById('auth-section').classList.add('hidden');
|
document.getElementById('auth-section').classList.add('hidden');
|
||||||
|
document.getElementById('app-navbar').classList.remove('hidden');
|
||||||
document.getElementById('dashboard-section').classList.remove('hidden');
|
document.getElementById('dashboard-section').classList.remove('hidden');
|
||||||
document.getElementById('dash-username').textContent = username;
|
document.getElementById('dash-username').textContent = username;
|
||||||
document.getElementById('dash-address').textContent = address;
|
document.getElementById('dash-address').textContent = address;
|
||||||
@@ -732,6 +742,7 @@ function logout() {
|
|||||||
for (const key of Object.keys(drawStartedAt)) delete drawStartedAt[key];
|
for (const key of Object.keys(drawStartedAt)) delete drawStartedAt[key];
|
||||||
clearInterval(roundTimerInterval);
|
clearInterval(roundTimerInterval);
|
||||||
clearTimeout(roundPollTimeout);
|
clearTimeout(roundPollTimeout);
|
||||||
|
document.getElementById('app-navbar').classList.add('hidden');
|
||||||
document.getElementById('dashboard-section').classList.add('hidden');
|
document.getElementById('dashboard-section').classList.add('hidden');
|
||||||
document.getElementById('auth-section').classList.remove('hidden');
|
document.getElementById('auth-section').classList.remove('hidden');
|
||||||
document.getElementById('landing-hero').classList.remove('hidden');
|
document.getElementById('landing-hero').classList.remove('hidden');
|
||||||
|
|||||||
@@ -54,6 +54,28 @@ hardcoded nel codice (`RoundConfig` in `app/db/models.py`: bet 10 PLM, round
|
|||||||
sat/vB, RBF timeout 900s) — vanno
|
sat/vB, RBF timeout 900s) — vanno
|
||||||
comunque rivisti e confermati dal pannello prima del primo utilizzo reale.
|
comunque rivisti e confermati dal pannello prima del primo utilizzo reale.
|
||||||
|
|
||||||
|
## Manutenzione (pausa/ripresa lotteria)
|
||||||
|
|
||||||
|
In cima alla sezione "Parametri" c'è una card "Manutenzione" con un pulsante
|
||||||
|
per fermare l'apertura di nuovi round — utile per intervenire sul server
|
||||||
|
(aggiornamenti, riavvii) senza lasciare gli utenti a metà di un round o
|
||||||
|
sorprenderli con un'interruzione improvvisa.
|
||||||
|
|
||||||
|
- **"Interrompi dopo questo round"**: il round eventualmente in corso viene
|
||||||
|
**completato normalmente** — chiude, estrae il vincitore da un blocco
|
||||||
|
confermato, e paga il 70/30 come sempre. Solo l'apertura del **round
|
||||||
|
successivo** viene sospesa. Gli utenti vedono un avviso di manutenzione
|
||||||
|
sulla loro dashboard (e sulla home, anche da sloggati) finché la lotteria
|
||||||
|
resta in pausa.
|
||||||
|
- **"Riprendi lotteria"**: annulla la pausa — al prossimo giro dello
|
||||||
|
scheduler (ogni 5 secondi) un nuovo round si apre normalmente (rispettando
|
||||||
|
comunque il cooldown se il precedente si è appena chiuso).
|
||||||
|
|
||||||
|
Ogni pausa/ripresa viene registrata nell'audit log (`lottery_paused` /
|
||||||
|
`lottery_resumed`), ma — come per il resto del pannello — non registra
|
||||||
|
*quale* operatore l'ha premuta (token condiviso, vedi limiti noti in
|
||||||
|
[CLAUDE.md](../CLAUDE.md)).
|
||||||
|
|
||||||
**Chi paga il fee-bump RBF?** Quando una bet, un payout o un prelievo resta
|
**Chi paga il fee-bump RBF?** Quando una bet, un payout o un prelievo resta
|
||||||
troppo a lungo senza conferma (oltre il "Timeout prima del fee-bump RBF"), il
|
troppo a lungo senza conferma (oltre il "Timeout prima del fee-bump RBF"), il
|
||||||
sistema lo ritrasmette con una fee più alta. Il costo aggiuntivo lo assorbe
|
sistema lo ritrasmette con una fee più alta. Il costo aggiuntivo lo assorbe
|
||||||
|
|||||||
@@ -52,6 +52,14 @@ messaggio:
|
|||||||
|
|
||||||
Il messaggio resta visibile fino all'apertura del round successivo.
|
Il messaggio resta visibile fino all'apertura del round successivo.
|
||||||
|
|
||||||
|
### Avviso di manutenzione
|
||||||
|
|
||||||
|
Se l'operatore ha messo in pausa la lotteria per manutenzione, in cima alla
|
||||||
|
pagina (visibile anche prima del login) compare un avviso: il round
|
||||||
|
eventualmente in corso viene comunque **completato normalmente**, vincitore
|
||||||
|
incluso, ma **non ne parte uno nuovo** finché la manutenzione non termina.
|
||||||
|
L'avviso sparisce da solo appena l'operatore riprende la lotteria.
|
||||||
|
|
||||||
### Deposito
|
### Deposito
|
||||||
|
|
||||||
- Il tuo **saldo interno** (accreditato dopo 1 conferma di rete) con bottone
|
- Il tuo **saldo interno** (accreditato dopo 1 conferma di rete) con bottone
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
"""add paused to round_config
|
||||||
|
|
||||||
|
Revision ID: 5f2079b95b33
|
||||||
|
Revises: 1db52f3a7c67
|
||||||
|
Create Date: 2026-07-22 00:00:00.000000
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '5f2079b95b33'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = '1db52f3a7c67'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# server_default backfills the existing singleton row (if any); dropped right
|
||||||
|
# after so new rows go through the ORM default instead of a stale constant.
|
||||||
|
op.add_column(
|
||||||
|
'round_config', sa.Column('paused', sa.Boolean(), nullable=False, server_default=sa.false())
|
||||||
|
)
|
||||||
|
with op.batch_alter_table('round_config') as batch_op:
|
||||||
|
batch_op.alter_column('paused', server_default=None)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('round_config', 'paused')
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -81,6 +81,29 @@ async def test_admin_reads_and_updates_config(client):
|
|||||||
assert resp.json()["fee_address"] == "plm1qfeeaddress"
|
assert resp.json()["fee_address"] == "plm1qfeeaddress"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_admin_can_pause_and_resume_the_lottery(client):
|
||||||
|
headers = {"X-Admin-Token": "test-admin-token"}
|
||||||
|
|
||||||
|
resp = await client.get("/admin/config", headers=headers)
|
||||||
|
assert resp.json()["paused"] is False
|
||||||
|
|
||||||
|
resp = await client.post("/admin/pause", headers=headers)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert resp.json()["paused"] is True
|
||||||
|
|
||||||
|
resp = await client.get("/admin/config", headers=headers)
|
||||||
|
assert resp.json()["paused"] is True
|
||||||
|
|
||||||
|
resp = await client.post("/admin/resume", headers=headers)
|
||||||
|
assert resp.status_code == 200
|
||||||
|
assert resp.json()["paused"] is False
|
||||||
|
|
||||||
|
|
||||||
|
async def test_admin_pause_requires_token(client):
|
||||||
|
resp = await client.post("/admin/pause")
|
||||||
|
assert resp.status_code == 403
|
||||||
|
|
||||||
|
|
||||||
async def test_admin_lists_users(client):
|
async def test_admin_lists_users(client):
|
||||||
from app.db import base as db_base
|
from app.db import base as db_base
|
||||||
from app.db.models import User
|
from app.db.models import User
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import pytest
|
|||||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
||||||
|
|
||||||
from app.db.base import Base
|
from app.db.base import Base
|
||||||
from app.db.models import Round
|
from app.db.models import Round, RoundConfig
|
||||||
from app.rounds.service import get_active_round, open_new_round_if_needed
|
from app.rounds.service import get_active_round, open_new_round_if_needed
|
||||||
|
|
||||||
ROUND_COOLDOWN_SECONDS = 30 # matches RoundConfig.round_cooldown_seconds' column default
|
ROUND_COOLDOWN_SECONDS = 30 # matches RoundConfig.round_cooldown_seconds' column default
|
||||||
@@ -81,3 +81,27 @@ async def test_opens_new_round_once_cooldown_elapses(session_factory):
|
|||||||
async with session_factory() as session:
|
async with session_factory() as session:
|
||||||
round_ = await open_new_round_if_needed(session)
|
round_ = await open_new_round_if_needed(session)
|
||||||
assert round_.status == "open"
|
assert round_.status == "open"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_withholds_new_round_while_paused(session_factory):
|
||||||
|
stale_close = datetime.now(timezone.utc) - timedelta(seconds=ROUND_COOLDOWN_SECONDS + 1)
|
||||||
|
async with session_factory() as session:
|
||||||
|
session.add(Round(status="closed", closed_at=stale_close))
|
||||||
|
session.add(RoundConfig(fee_address="", paused=True))
|
||||||
|
await session.commit()
|
||||||
|
|
||||||
|
async with session_factory() as session:
|
||||||
|
round_ = await open_new_round_if_needed(session)
|
||||||
|
assert round_ is None
|
||||||
|
|
||||||
|
|
||||||
|
async def test_pause_does_not_interrupt_a_round_in_progress(session_factory):
|
||||||
|
async with session_factory() as session:
|
||||||
|
session.add(Round(status="drawing"))
|
||||||
|
session.add(RoundConfig(fee_address="", paused=True))
|
||||||
|
await session.commit()
|
||||||
|
|
||||||
|
async with session_factory() as session:
|
||||||
|
returned = await open_new_round_if_needed(session)
|
||||||
|
assert returned is not None
|
||||||
|
assert returned.status == "drawing"
|
||||||
|
|||||||
Reference in New Issue
Block a user