improve signed reads, crypto hardening, and scraper transport

AGENTS.md

@@ -0,0 +1,609 @@
+# Trump Alpha — Backend
+
+> AI-powered crypto signal aggregator. Surfaces four uncorrelated signal
+> streams (Trump Truth Social, Macro Vibes, KOL talks-vs-trades, funding
+> reversal) and runs an optional execution layer on Hyperliquid perps.
+> Real money — handle every change to the trading layer like surgery.
+
+This file is the **first thing an AI agent should read** when entering this
+repo. It encodes the invariants that aren't visible from any single file.
+
+---
+
+## 🛑 Read this BEFORE touching anything trading-related
+
+This backend manages real Hyperliquid leveraged positions for real users.
+Bugs cost users money. **Five non-negotiable rules:**
+
+1. **Two systems, one execution layer.** System 1 (Trump scalp) auto-opens.
+   System 2 (Macro Vibes / reversal) is **MANAGE-ONLY since v2.0** — the
+   user opens manually on Hyperliquid, then `/adopt` hands it to the bot.
+   `process_post()` early-returns for sys2 sources. Re-enabling sys2
+   auto-open would silently reintroduce all the leverage/budget/concurrency
+   race conditions we excised. Don't do it without an ADR.
+
+2. **`released_at` is the "user took back control" marker.** A trade with
+   `released_at IS NOT NULL` is **OUT OF BOUNDS for the bot**:
+   - `recovery.rehydrate_open_trades` skips it
+   - `reconciler` skips it
+   - `close_and_finalize`'s atomic claim requires `released_at IS NULL`
+     unless `force=True` (only manual_close passes that)
+   - `partial_derisk` and `pyramid_add` early-return idempotent-success
+   - `/positions/open`, `/positions/today`, telegram_digest all filter it
+   If you add ANY new code path that touches BotTrade rows, ask yourself
+   "does this respect released_at?" Almost always yes.
+
+3. **Effective exit params are FROZEN on the BotTrade row at open time.**
+   See the `eff_*` columns on `BotTrade`. Recovery rebuilds the watchdog
+   from these, NOT from the live Subscription. Without this, restarting
+   the backend silently rewrites every open System-2 reversal's stop loss
+   to the user's Trump scalp setting (1.5%). NEVER read live
+   `Subscription.stop_loss_pct` etc. in the close path.
+
+4. **HL leverage is what HL says, not what the user requested.** Hyperliquid
+   silently clips the requested leverage to the asset's max (memes capped
+   at 3×). `hyperliquid.open_position()` returns `effective_leverage` —
+   bot_engine and adoption must use THAT value to compute
+   `sys2_protective_stop_pct(lev)` and the derisk ladder. Using the
+   requested value puts the stop OUTSIDE the real liquidation line.
+
+5. **Per-wallet asyncio locks wrap "check + open" critical sections.**
+   See `_wallet_lock` in `bot_engine` and `_wallet_adopt_lock` in
+   `adoption`. Without them, two concurrent signals can both pass the
+   daily-budget / concurrency / already-open check before either commits.
+
+---
+
+## What this product does (90 seconds)
+
+```
+Four signal sources → one bot → optional Hyperliquid execution
+
+┌──────────────────────────┐
+│ 1. Trump Truth Social    │── auto-classify (DeepSeek) → "buy"/"short"/"noise"
+│    (every post, <3s)     │   if actionable: Trump scalp auto-open (System 1)
+└──────────────────────────┘   Tight 1.5% SL, 12h cooldown, ≥30min min-hold
+                                Optional: post prediction tweet via x_poster.py
+
+┌──────────────────────────┐
+│ 2. Macro Vibes           │── 8 daily macro indicators (AHR999, F&G, etc.)
+│    (BTC bottom + funding)│   + 2-of-3 bottom-reversal trigger
+└──────────────────────────┘   Telegram alert with /adopt CTA — NO auto-open.
+                                User opens on HL → /adopt → bot manages with
+                                5-rung stop ladder, de-risk, pyramid, peak-trail.
+
+┌──────────────────────────┐
+│ 3. KOL talks-vs-trades   │── Substack/podcast/X ingest + ETH on-chain diff
+│    (29 feeds, daily)     │   Divergence (publicly bullish, secretly selling)
+└──────────────────────────┘   is the platform's highest-conviction signal.
+                                Telegram alert only — never auto-trades.
+                                x_analysis.py adds real-time X post scoring.
+
+┌──────────────────────────┐
+│ 4. Funding extreme       │── Hourly BTC perp funding scan
+└──────────────────────────┘   Alert only (manage-only via /adopt like Macro)
+
+┌──────────────────────────┐
+│   Telegram daily digest  │── Once-a-day 3-section brief (Macro/KOL/Trump)
+│   (per-user hour, opt-out)│  to every subscriber. Cron at minute=0 each hour.
+└──────────────────────────┘
+```
+
+Free tier = read everything + Telegram alerts. Pro tier (Hyperliquid wallet
+linked) = Trump auto-trade + /adopt manage-only flow for sys2.
+
+---
+
+## Stack
+
+- **Python 3.9+** / FastAPI / async SQLAlchemy 2.x / APScheduler
+- **DB**: SQLite dev, **Postgres prod**. All schema lives in
+  `alembic/versions/NNN_*.py`, ordered. Currently at head **026**.
+- **AI**: DeepSeek via OpenAI-compatible API (`AI_BASE_URL`, `AI_MODEL`).
+  - Live scoring uses `AI_LIVE_MODEL` (~2s, latency-critical)
+  - Batch / reanalysis uses `AI_MODEL` (quality, ~10s)
+- **Trading**: Hyperliquid SDK; API-wallet keys are envelope-encrypted with
+  `ENCRYPTION_KEY` (KEK), per-user DEK derivation via `crypto.py`.
+- **Prices**: Two feeds:
+  - `binance.py` WebSocket → 30 mainstream perps (BTC, ETH, SOL, TRUMP, BNB,
+    DOGE, LINK, AAVE + AVAX/ARB/OP/SUI/APT/INJ/ATOM/XRP/LTC/ADA/MATIC/SHIB/
+    PEPE/WIF/BONK/TAO/JUP/RENDER/FET/TIA/SEI/PENDLE). The WS URL is built FROM
+    `ASSET_MAP` so the two never drift. Any asset NOT in ASSET_MAP loses
+    TP/SL/trailing protection (only max-hold remains) — see the ASSET_MAP
+    docstring. `tp_sl_monitor.register_trade` logs an ERROR if a trade opens on
+    an uncovered asset.
+  - `hl_price_feed.py` polls HL `allMids` every 2s → HYPE, PURR (HL-native assets not on Binance)
+  Both pump `price_store` + `tp_sl_monitor` on every tick.
+- **Telegram**: long-poll mode (single instance), HTML messages, inline
+  keyboards. `telegram.py` send/edit/answer + `telegram_bot.py` commands.
+  Public channel broadcast (`TELEGRAM_PUBLIC_CHANNEL_ID` env) sends a
+  sanitised `format_public_post` version (no execution details, tier label
+  instead of raw confidence) after every per-user fan-out in `_dispatch`.
+- **X (Twitter)**: `x_poster.py` — optional viral prediction tweets after each
+  actionable Trump signal. Gated by `x_enabled=False` (off by default). Full
+  no-op if creds missing. OAuth 1.0a hand-signed with stdlib hmac — no extra deps.
+
+---
+
+## Module map (where things live)
+
+```
+app/
+├── api/                    HTTP routes
+│   ├── signals.py          POST /api/signals/ingest  ← scanners write here
+│   ├── positions.py        /positions/open|today|close|grow|adopt|release|hl
+│   ├── user.py             /subscribe|settings|manual-window|auto-trade
+│   ├── telegram.py         /telegram/{preferences,bind,unbind,test}
+│   ├── macro.py            /macro/{snapshot,history}
+│   ├── kol.py              /kol/{posts,digest,wallets,divergence}
+│   ├── performance.py      /performance  ← wallet-scoped real-money stats (30d)
+│   ├── funding_reversal.py /funding/snapshot  ← live funding state + 7d history
+│   ├── funding_signal.py   /signal/{status,toggle,history}  ← breakout monitor
+│   └── dev.py              Dev-only routes (only mounted in development env)
+├── services/
+│   ├── bot_engine.py       ★ TRADING CORE — process_post, _execute_for_subscriber,
+│   │                         _broadcast_trade_alert (WS failure notifications),
+│   │                         close_and_finalize, partial_derisk, pyramid_add
+│   ├── adoption.py         ★ /adopt + /release flow (sys2 manage-only)
+│   ├── tp_sl_monitor.py    Per-price-tick close evaluator. on_price_tick is
+│   │                         called from binance.py + hl_price_feed.py once/sec
+│   ├── hyperliquid.py      HL trader (open/close/reduce/leverage)
+│   ├── recovery.py         Startup rehydration of open BotTrades into watchdog
+│   ├── reconciler.py       Every 60s: compare DB ↔ HL state, mark drift
+│   ├── circuit_breaker.py  Per-system (sys1/sys2) CB, daily DD + N-loss streak
+│   ├── signal_categories.py CRITICAL CONFIG — sys1/sys2 sources, ladders,
+│   │                         leverage clamping, protective stop formulas
+│   ├── regime_filter.py    Sys1 only — recent-move / vol-contraction gates
+│   ├── analysis.py         AI signal scoring (DeepSeek) for Trump posts
+│   ├── x_analysis.py       AI scoring for X (Twitter) KOL posts. Three tiers:
+│   │                         TRADE_SIGNAL / DIRECTIONAL / NOISE. Strict NOISE
+│   │                         default — most X posts should be filtered out.
+│   │                         Consumed by kol_x.py. tickers come out in the
+│   │                         {ticker,action,conviction} shape kol_divergence reads.
+│   ├── x_poster.py         X (Twitter) auto-poster for Trump signals.
+│   │                         Fires a prediction tweet then a follow-up at
+│   │                         +x_followup_minutes with the actual move. Gated by
+│   │                         x_enabled env var (False by default). Full no-op
+│   │                         if creds missing — never blocks signal flow.
+│   ├── entry_filter.py     Cheap text-based pre-filter (skip RT/URL-only)
+│   ├── telegram.py         send_message / edit_message / answer_callback
+│   ├── telegram_bot.py     Long-poll loop + /start /digest /adopt /release ...
+│   ├── telegram_digest.py  Daily 3-section brief (rule-based; no LLM)
+│   ├── price_store.py      In-memory latest price per asset
+│   ├── price_backfill.py   Backfill historical 5min bars from Binance
+│   ├── hl_price_feed.py    Supplemental HL price feed for HL-native assets
+│   │                         (HYPE, PURR). Polls allMids every 2s. Runs
+│   │                         alongside binance.py. Without this, TP/SL
+│   │                         silently stops protecting HL-native trades.
+│   ├── backtest.py         Single-post backtest harness. Fetches 1m Binance
+│   │                         candles for [published_at, +max_hold_h] and
+│   │                         replays current exit rules. Conservative (uses
+│   │                         HIGH/LOW within bar). No fees. Batch runner on top.
+│   ├── crypto.py           HL API-key envelope encryption. enc:v2 =
+│   │                         PBKDF2-salted (H4 fix); enc:v1 read-compat.
+│   │                         scripts/reencrypt_keys.py upgrades stored rows.
+│   ├── scanner_state.py    In-memory toggle + observability for scanners
+│   ├── macro/
+│   │   ├── fetchers.py     8 macro indicator HTTP fetchers (each @_none_on_fail)
+│   │   ├── scoring.py      Weighted composite -100..+100
+│   │   └── poll.py         Daily UPSERT into macro_snapshots
+│   ├── scanners/
+│   │   ├── btc_bottom_reversal.py   2-of-3 AHR999 + 200WMA + Pi Bottom
+│   │   ├── funding_reversal.py       Hourly funding extreme
+│   │   └── sma_reclaim.py            (archive — not scheduled)
+│   ├── kol_substack.py     RSS ingest for 29 KOL feeds (substack/blog/podcast)
+│   ├── kol_x.py            X (Twitter) ingest via twitterapi.io → x_analysis →
+│   │                         KolPost(source="twitter"). Daily 01:30 UTC. No-op
+│   │                         if twitterapi_io_key unset. Provides the post-side
+│   │                         feed for X-only KOLs (andrewkang, murad).
+│   ├── kol_onchain.py      HL public API + Etherscan diff
+│   ├── kol_divergence.py   Cross-ref talks vs trades within ±7d
+│   ├── kol_analysis.py     AI ticker/direction/conviction extract (Substack).
+│   │                         `_derive_tier()` maps its conviction + talks-vs-
+│   │                         trades score → the SAME trade_signal/directional/
+│   │                         noise tiers x_analysis emits, so non-Twitter posts
+│   │                         get tier set in kol_substack (SIGNAL/VIEW badges +
+│   │                         "Signals only" filter work for blog/substack/pod).
+│   ├── bottom_indicators.py AHR999 / Pi Cycle / 200WMA math
+│   ├── funding_signal.py   Real-time funding extreme detector
+│   ├── signed_request.py   EIP-191 signature verification (+ replay cache).
+│   │                         signed_read_creds / optional_signed_read_creds:
+│   │                         header-based (X-Sig-Ts/X-Sig-Sig) creds for read
+│   │                         endpoints, query fallback deprecated (C3 fix).
+│   └── http_client.py      Shared pooled httpx.AsyncClient (keep-alive).
+│                             Hot paths (scrapers, telegram send/poll,
+│                             hl_price_feed, binance REST, x_poster) use
+│                             get_client() with per-request timeout instead of
+│                             new-client-per-call. Closed in lifespan shutdown.
+├── scrapers/
+│   ├── truth_social.py     CNN archive poller (5s interval) — primary.
+│   │                         Conditional GET (ETag/Last-Modified → 304 skips
+│   │                         the 30k-post download), batch dedup (1 IN-query
+│   │                         per poll instead of 50 SELECTs), per-post
+│   │                         commit+dispatch so an actionable post never
+│   │                         waits behind older entries' AI analysis.
+│   │                         dispatch_post() is the shared WS/TG/X/trade
+│   │                         fan-out used by BOTH pollers.
+│   └── trumpstruth.py      trumpstruth.org RSS fallback poller. Same post id
+│                             hash → automatic dedup. Whoever sees first wins.
+│                             Offset by half the interval so the two pollers
+│                             don't hit upstream simultaneously.
+├── ws/
+│   └── manager.py          WebSocket fan-out for live UI updates.
+│                             Broadcasts trade_alert events (execution_failed /
+│                             insufficient_balance / budget_reached) via
+│                             _broadcast_trade_alert() in bot_engine.py.
+├── models.py               ★ All SQLAlchemy models in one file
+├── database.py             Async engine + session factory
+├── config.py               Pydantic Settings — reads .env
+└── main.py                 FastAPI lifespan, scheduler setup, route mount
+                            Includes: singleton lock guard (one-leader, multi-
+                            worker safe), deep health check /api/health/deep,
+                            boot-grace window for price feeds.
+
+alembic/versions/           Migrations (numbered NNN). Latest = 026
+                            026 = composite index (wallet_address, closed_at) on bot_trades
+scripts/                    One-shot ops
+├── preflight.py            Pre-launch readiness gate (env / DB / TG / AI)
+├── launch_smoke.py         End-to-end smoke (14 checks against running API)
+├── launch_seed.py          Pre-launch data prep: drops test sources, trims KOL
+│                             window to last 30d, refetches all upstream sources.
+│                             Run ONCE before flipping traffic to a fresh DB.
+├── seed_kol_wallets.py     Seeds the KOL wallet table with known addresses.
+│                             Idempotent (INSERT OR IGNORE). Run once at first deploy.
+├── rescore_v5.py           Re-score every Post with current AI prompt
+├── backfill_signals.py     Fill in signal for posts missing it
+├── reencrypt_keys.py       Upgrade stored HL keys to enc:v2 (+KEK rotation
+│                             via OLD_ENCRYPTION_KEY). Idempotent; --dry-run.
+└── verify_sys2_lifecycle.py Manual System-2 lifecycle walk-through
+
+tests/                      pytest, 112 tests, fast (<3s total)
+├── test_adoption.py        Adoption + release flow (snapshot-style, no real HL/AI)
+├── test_telegram_digest.py Daily digest formatting
+├── test_kol_tier.py        kol_analysis._derive_tier (non-Twitter tier mapping)
+├── test_kol_x.py           X ingest: dedup / mapping / no-op (mocked fetch+AI)
+├── test_ratelimit.py       Rate limit coverage (BUG-02 fix)
+├── test_bottom_reversal_strategy.py  btc_bottom_reversal 2-of-3 logic
+├── test_macro_fetchers_timing.py     Macro fetcher timeout + error handling
+└── test_production_readiness.py      Environment / config sanity checks
+```
+
+---
+
+## The two trading systems (memorise this)
+
+```
+                  System 1                  System 2
+                  ────────                  ────────
+Source            "truth"                   "btc_bottom_reversal"
+                                            (+"funding_reversal" alert-only)
+Trigger           Trump posts a thing       Daily scanner: 2-of-3 confluence
+Latency need      Seconds (price moves fast) Days/weeks (signal lives a long time)
+Open path         Auto (bot_engine.process_post fires _execute_for_subscriber)
+                                            MANUAL: user opens on HL UI, then
+                                            /adopt hands it to the bot
+Stop loss         User-configured + tight   sys2_protective_stop_pct(actual_lev)
+                  1.5% floor (TRUMP_*)      = 85% × (100/lev), capped at 35%
+Exit model        TP / trailing / SL        5-rung stop ladder + downside de-risk
+                                            + pyramid + peak-trail. NO TP.
+Min hold          30 min (suppresses TP)    n/a
+Max hold          6h                        18 months (ladder is the real exit)
+Sizing            base × regime multiplier  Whatever user opened on HL
+Concurrency cap   n/a                       3 positions / wallet (correlated beta)
+Confidence min    88 (platform) / user      85 (platform)
+Circuit breaker   sys1_*                    sys2_*  (independent)
+Daily budget      Full daily_budget_usd     n/a — user controls notional on HL
+Telegram alert    Trump alert format        Macro/funding alert + /adopt CTA
+X tweet           Optional prediction tweet n/a
+```
+
+**If you're tempted to put sys2 logic in `_execute_for_subscriber`**: stop.
+`process_post()` early-returns for sys2. The function only runs for sys1 now.
+The dead sys2 branches inside `_execute_for_subscriber` are kept for diff
+minimalism — don't extend them.
+
+---
+
+## The /adopt flow (System-2 lifecycle in detail)
+
+```
+1. Scanner fires
+   └─ POST /api/signals/ingest  (source=btc_bottom_reversal, signal=buy)
+   └─ Post row created
+   └─ process_post() early-returns for sys2 (no auto-open)
+   └─ notify_signal() → Telegram fan-out with /adopt CTA appended
+
+2. User opens BTC long on Hyperliquid manually
+   └─ size / leverage of their choice
+
+3. User in bot: /adopt
+   └─ adoption.list_hl_positions(wallet) reads HL state
+   └─ Telegram inline keyboard: tap [🟢 BTC long $1500 @72k · 2x]
+   └─ Mode picker: [📈 Standard] or [🚀 Aggressive]
+   └─ adoption.adopt_position(wallet, asset, mode):
+      a. Per-wallet asyncio lock acquired
+      b. Pre-flight: no_subscription / no_hl_key / paper_mode /
+         macro_disabled (Subscription.macro_enabled must be ON — /adopt is the
+         sys2 management entry point, so the Macro Vibes toggle gates it) /
+         circuit_breaker (sys2 CB still gates adopt!) /
+         already_adopted / concurrency_cap (3)
+      c. Re-read HL state inside lock (fresh entry/size/lev)
+      d. Reject if leverage > SYS2_MAX_LEVERAGE (BUG-09 fix)
+      e. Resolve sys2_protective_stop_pct(HL_actual_leverage)
+      f. INSERT BotTrade with eff_* frozen + sys2_mode + hl_order_id="adopted:<ts>"
+         + trigger_post_id=NULL
+      g. register_trade() with full ladder/de-risk/addon/peak_trail
+
+4. tp_sl_monitor drives the position
+   └─ Stop ratchet, downside de-risk partial reduces, pyramid add-ons,
+      peak-trail close, max_hold backstop. All staged through the
+      lock-protected partial_derisk / pyramid_add / close_and_finalize.
+
+5a. User wants out: /release
+    └─ Sets BotTrade.released_at = now; unregister(trade_id) from watchdog
+    └─ HL position UNTOUCHED — bot stops driving, user has manual control
+
+5b. Bot drives the close (ladder / max-hold)
+    └─ close_and_finalize() atomic claim sets closed_at, computes pnl
+
+5c. User force-closes via UI: POST /api/positions/{id}/close
+    └─ manual_close calls close_and_finalize(force=True) — bypasses
+       released_at guard. Works on adopted-and-released trades too.
+
+6. Recovery on restart:
+   └─ recovery.rehydrate_open_trades reads BotTrade WHERE closed_at IS NULL
+      AND released_at IS NULL
+   └─ For each sys2 trade: rebuild ladder from sys2_mode + adopted fallback.
+      Also reschedules _time_stop_check with remaining seconds (elapsed windows
+      fire immediately with delay=0). This is the critical fix — without it
+      adopted trades lose their entire sys2 ladder on restart.
+```
+
+---
+
+## Singleton lock guard (critical infrastructure detail)
+
+`main.py:lifespan` calls `_acquire_singleton_lock()` at boot using an
+advisory file lock (`/tmp/trumpsignal-backend.lock`, configurable via
+`SINGLETON_LOCK_PATH`). Only ONE process — "the leader" — starts the
+scheduler, scrapers, price feeds, and Telegram poller. Any additional
+worker (e.g. accidental `--workers 2`) serves HTTP reads only and logs
+`SINGLETON LOCK NOT ACQUIRED`. The OS releases the lock automatically
+when the leader exits, so a crashed leader unblocks the next start.
+
+The `/api/health/deep` endpoint surfaces `"is_leader": false` and adds
+it to `problems[]` so uptime monitors catch mis-configured multi-worker
+deployments.
+
+---
+
+## Critical invariants checklist (when reviewing any trading change)
+
+- [ ] Does this code path respect `released_at IS NULL`?
+- [ ] Does it use `eff_*` (frozen) not live `Subscription.*` for exit math?
+- [ ] If it opens a new position, does it use HL's actual leverage (not requested)?
+- [ ] If it touches an open position concurrently, is it wrapped in the
+      per-trade `_lock_for(trade_id)` lock?
+- [ ] If it opens, is it inside `_wallet_lock(wallet)` so the budget /
+      concurrency check is atomic with the write?
+- [ ] If it closes, does it use the conditional `UPDATE ... WHERE closed_at
+      IS NULL` atomic claim?
+- [ ] Does it handle the `already_closed` path from HL gracefully (preserve
+      banked partial PnL)?
+- [ ] Does it correctly check sys1 vs sys2 CB independently?
+
+---
+
+## Common workflows
+
+### Add a new signal source
+
+1. Decide: System 1 (auto-trade) or System 2 (alert + /adopt) or alert-only?
+2. Write a scanner under `app/services/scanners/NEW.py` that posts to
+   `POST /api/signals/ingest` with `{source: "your_new_source", ...}`.
+3. Schedule it in `app/main.py` (`_scheduler.add_job`).
+4. Add the source to `signal_categories.SYSTEM_1_SOURCES` or
+   `SYSTEM_2_SOURCES` if it should trade. Leave it out if alert-only.
+5. Add a Telegram preference column to `TelegramBinding` (migration)
+   + a mapping entry in `telegram._pref_column_for_source`.
+6. Add a label to `telegram._source_label` and `_signal_emoji`.
+7. Add a `/yoursource on|off` command in `telegram_bot.py`.
+8. If sys2: extend `signal_categories._CATEGORY_EXITS` if it needs a custom
+   exit profile (otherwise default works).
+9. Add the deep-link path in `telegram.format_post` AND `telegram.format_public_post`.
+
+### Add a new bot command
+
+1. `_cmd_x` async function in `telegram_bot.py`.
+2. Route it in `_handle_message`.
+3. If it needs inline buttons: build `reply_markup` payload, handle
+   callbacks in `_handle_callback` (route by `callback_data` prefix).
+4. Update `HELP_TEXT` and remind the user to add it to BotFather
+   `/setcommands` after deploy.
+
+### Add a column to an existing table
+
+1. New migration `alembic/versions/NNN_description.py`.
+   - Use `op.batch_alter_table` (sqlite-compatible).
+   - Default values via `server_default=` so backfill is implicit.
+2. Mirror the field on the SQLAlchemy model in `app/models.py`.
+3. Apply locally: `DATABASE_URL=<sqlite> alembic upgrade head`.
+
+### Enable X (Twitter) posting
+
+1. Create a Twitter developer app with OAuth 1.0a user context permissions.
+2. Set in `.env`: `X_API_KEY`, `X_API_SECRET`, `X_ACCESS_TOKEN`,
+   `X_ACCESS_SECRET`, `X_ENABLED=true`.
+3. Optionally tune: `X_DAILY_CAP` (default 40), `X_FOLLOWUP_MINUTES` (default 15).
+4. Verify with a dry-run: set `X_ENABLED=false` and check logs — the poster
+   logs what it WOULD tweet without sending.
+
+### Deploy
+
+```bash
+# On the server:
+DATABASE_URL=$PROD_URL alembic upgrade head
+systemctl restart trumpalpha-backend   # or whatever the unit is
+python scripts/preflight.py             # MUST pass before flipping traffic
+python scripts/launch_smoke.py --base https://api.trumpalpha.io
+```
+
+---
+
+## Running it
+
+```bash
+cd backend && python -m venv venv && source venv/bin/activate
+pip install -r requirements.txt
+cp .env.example .env   # fill in: ENCRYPTION_KEY, AI_API_KEY, INGEST_API_KEY
+uvicorn app.main:app --reload   # dev only; prod uses --workers 1, no --reload
+```
+
+---
+
+## Testing
+
+```bash
+source venv/bin/activate
+python -m pytest tests/ -q           # 112 tests, ~2s
+python scripts/preflight.py          # env + DB + TG + AI auth checks
+python scripts/launch_smoke.py       # 14 end-to-end checks vs running API
+```
+
+Adoption + telegram_digest are snapshot-style (no real HL/AI).
+End-to-end trading is verified manually via the bot.
+
+---
+
+## Telegram bot mechanics (since it's a custom integration)
+
+- **Long-poll mode** via `getUpdates`. Only ONE process can long-poll a
+  given bot token at a time — if you horizontally scale, switch to
+  webhook (not done yet).
+- Bot must be re-bound via `@BotFather` `/setcommands` whenever new
+  commands are added (the slash-menu users see is separate from what
+  the bot internally handles).
+- `send_message` returns `False` on failure; per-user binding rows track
+  `total_alerts_sent` / `total_alerts_failed` counters.
+- **Inline keyboards** = the `reply_markup` payload to `sendMessage`.
+  Callback data is capped at 64 bytes; keep it short (`adopt:mode:BTC:standard`).
+  `_handle_callback` MUST end with `answer_callback` or the button spins
+  forever on the user's client.
+- Free tier = walletless `/start` (chat_id only). Pro tier = wallet bound
+  via `/start CODE` where CODE comes from Settings UI.
+
+---
+
+## Why "Macro Vibes" became manage-only (the ADR)
+
+V1.0: System 2 auto-opened sys2 trades on user wallets. Carried real
+execution surface: leverage clipping, daily budget split, concurrency caps,
+sys2 paper branches, key handling per user. Audit surfaced ~6 bugs.
+
+V2.0 (current): sys2 manage-only. The strategy is day-K — entry delay of
+24h doesn't matter. The valuable part is multi-month exit management
+(5-rung ladder, de-risk, pyramid, peak-trail), which still runs against
+positions the user adopts.
+
+**Net effect**: massive reduction in execution risk surface; same alpha
+(strategy logic unchanged); legal/responsibility shifts from "bot opened
+this for you" to "you opened it, bot manages your discipline".
+
+---
+
+## Things that LOOK like bugs but aren't
+
+- **`_execute_for_subscriber` has lots of `if sub["_is_system_2"]` branches.**
+  Dead code under v2.0 (process_post early-returns for sys2). Kept for diff
+  minimalism — don't extend or re-enable.
+- **`kol_x.X_KOLS` handle ≠ X username.** `handle` is the CANONICAL key
+  (e.g. "cryptohayes") that MUST match `KolWallet.handle` so divergence can
+  join post-side ↔ on-chain; `x_username` is the screen name fetched from X.
+  andrewkang/murad wallets stay dark (zero divergence detections) until X
+  ingestion supplies their post side — that's the whole reason kol_x exists.
+  Empty `twitterapi_io_key` → kol_x is a full no-op (no error).
+- **`funding_reversal` source is in `SYSTEM_2_SOURCES`? No.** It's
+  intentionally NOT in either supported set — it ingests as a Post for
+  audit + sends Telegram alert via the CTA path, but doesn't trigger any
+  auto-trading. Adopt still works (it's asset-based, not signal-based).
+- **`Subscription.sys2_budget_pct` defaults to 0.7.** Legacy field from the
+  auto-open era. With v2.0 manage-only, it's effectively unused — sys1
+  (Trump) reads full `daily_budget_usd`. Don't read it for new code.
+- **Adopted trades have `hl_order_id` starting with `"adopted:"`.** Distinct
+  from auto-opened (HL order id integer) and paper (`"paper"` literal).
+  Useful for telemetry filtering — AND it's the canonical sys2 marker the
+  daily-budget query uses, because adopted trades have `trigger_post_id=NULL`
+  so source-based classification fails (M1 fix). The `/trades` serializer also
+  reports `trigger_source="adopted"` from this prefix.
+- **`/signals/accuracy` is scoped to production sources + buy/short.** It
+  intentionally restricts to `SUPPORTED_TRADING_SOURCES` and the CURRENT
+  buy/short vocabulary — retired/test sources (rsi_reversal, sma_reclaim,
+  breakout, phase1, `test`) and the legacy `sell` signal are excluded so the
+  public accuracy scoreboard reflects what the live bot actually trades.
+- **macro_enabled vs Telegram alerts are TWO separate switches.** Turning off
+  Macro Vibes (`Subscription.macro_enabled`) gates sys2 *management* — it now
+  blocks `/adopt` (macro_disabled). It does NOT silence Telegram alerts; those
+  are controlled independently by the per-source `TelegramBinding` preference
+  columns. "Alerts on, don't auto-manage" is a deliberately supported combo.
+- **`telegram.send_message` accepts `int | str` for `chat_id`.** Intentional.
+  Integer = private chat, string = public channel username (e.g. `"@trumpalpha"`).
+- **`format_public_post` deliberately omits `expected_move_pct`,
+  `invalidation_price`, and `/adopt` CTA.** Execution-sensitive data stays
+  private. The public version shows confidence tier (HIGH/MED/LOW) instead
+  of the raw score.
+- **`_adopt_locks` in adoption.py** is an `OrderedDict` capped at 512 with
+  LRU eviction — matches the `_WALLET_LOCK_MAX` pattern in `bot_engine`.
+- **`trumpstruth.py` runs at half-interval offset** — the two CNN + trumpstruth
+  pollers are deliberately staggered so they don't hammer upstream simultaneously.
+  The offset is `truth_social_poll_seconds // 2`, set via APScheduler
+  `next_run_time` at boot.
+
+---
+
+## Open known issues (not blocking launch but worth fixing later)
+
+- **`adopt:choose:BTC` callback may show stale prices** if user takes >60s
+  to tap (HL fees, partial fills can change entry/size). adopt_position
+  re-reads HL at mode-tap time so the FROZEN BotTrade is always fresh,
+  but the picker label could be outdated.
+
+- ~~**Telegram bot offset on restart**~~ **FIXED 2026-06-01**: startup drain
+  added. Stale `/adopt` replays suppressed.
+
+- **`/adopt` picker label** can show stale price if user waits >60s to tap
+  (frozen BotTrade is always fresh, but the Telegram picker label may be outdated).
+
+- ~~**M1 adopted positions miscounted against sys1 budget**~~ **FIXED 2026-06-09**:
+  the daily-budget query in `bot_engine` now treats any trade whose
+  `hl_order_id` starts with `"adopted:"` as sys2, regardless of the NULL
+  `trigger_post_id`. Previously the outerjoin to Post yielded src=NULL →
+  classified as sys1 → every adopted macro position inflated the Trump
+  scalp budget and could prematurely trip `budget_reached`.
+
+- **Funding-reversal `/adopt` uses the btc_bottom_reversal exit profile**
+  (`ADOPTED_CATEGORY` is fixed). This is BY DESIGN, not a bug: adopt is
+  ASSET-based (the user opens any position on HL and adopts it) — the bot has
+  no reliable link back to which signal motivated it, and the sys2 ladder is
+  direction/horizon-agnostic. Changing this needs a source-tracking mechanism
+  at adopt time (an ADR), not a one-line tweak.
+
+**Deferred security items — ALL RESOLVED 2026-06-12:**
+- ~~**C3**~~ FIXED: signed reads now send `X-Sig-Ts` / `X-Sig-Sig` HEADERS
+  (see `signed_read_creds` in signed_request.py). Legacy `?ts=&sig=` query
+  params still accepted (deprecated) for old clients.
+- ~~**H4**~~ FIXED: keys now encrypt as `enc:v2` (PBKDF2-HMAC-SHA256, per-blob
+  salt, 600k iters). v1 blobs still decrypt; run `scripts/reencrypt_keys.py`
+  ONCE in prod (after DB backup) to upgrade stored rows.
+- ~~**M5**~~ Was already fixed: unauthenticated `/telegram/{wallet}/status`
+  returns only `configured`/`bound` booleans; full details require a signed read.
+
+---
+
+## Repos in this project
+
+- **This repo** (`/Users/k/Public/trumpsignal/backend`) — Python/FastAPI backend
+- **Sibling frontend** (`/Users/k/Public/trumpsignal/frontend`) — Next.js 16
+  dashboard at trumpsignal.com. See its own AGENTS.md.
+
+Both deployed independently. Backend serves the JSON API + Telegram bot.
+Frontend is a thin SPA over the API + WebSocket.

CLAUDE.md

@@ -105,7 +105,13 @@ linked) = Trump auto-trade + /adopt manage-only flow for sys2.
 - **Trading**: Hyperliquid SDK; API-wallet keys are envelope-encrypted with
   `ENCRYPTION_KEY` (KEK), per-user DEK derivation via `crypto.py`.
 - **Prices**: Two feeds:
-  - `binance.py` WebSocket → BTC, ETH, SOL, TRUMP, BNB, DOGE, LINK, AAVE
+  - `binance.py` WebSocket → 30 mainstream perps (BTC, ETH, SOL, TRUMP, BNB,
+    DOGE, LINK, AAVE + AVAX/ARB/OP/SUI/APT/INJ/ATOM/XRP/LTC/ADA/MATIC/SHIB/
+    PEPE/WIF/BONK/TAO/JUP/RENDER/FET/TIA/SEI/PENDLE). The WS URL is built FROM
+    `ASSET_MAP` so the two never drift. Any asset NOT in ASSET_MAP loses
+    TP/SL/trailing protection (only max-hold remains) — see the ASSET_MAP
+    docstring. `tp_sl_monitor.register_trade` logs an ERROR if a trade opens on
+    an uncovered asset.
   - `hl_price_feed.py` polls HL `allMids` every 2s → HYPE, PURR (HL-native assets not on Binance)
   Both pump `price_store` + `tp_sl_monitor` on every tick.
 - **Telegram**: long-poll mode (single instance), HTML messages, inline
@@ -173,7 +179,9 @@ app/
 │   │                         candles for [published_at, +max_hold_h] and
 │   │                         replays current exit rules. Conservative (uses
 │   │                         HIGH/LOW within bar). No fees. Batch runner on top.
-│   ├── crypto.py           HL API-key envelope encryption
+│   ├── crypto.py           HL API-key envelope encryption. enc:v2 =
+│   │                         PBKDF2-salted (H4 fix); enc:v1 read-compat.
+│   │                         scripts/reencrypt_keys.py upgrades stored rows.
 │   ├── scanner_state.py    In-memory toggle + observability for scanners
 │   ├── macro/
 │   │   ├── fetchers.py     8 macro indicator HTTP fetchers (each @_none_on_fail)
@@ -190,12 +198,32 @@ app/
 │   │                         feed for X-only KOLs (andrewkang, murad).
 │   ├── kol_onchain.py      HL public API + Etherscan diff
 │   ├── kol_divergence.py   Cross-ref talks vs trades within ±7d
-│   ├── kol_analysis.py     AI ticker/direction/conviction extract (Substack)
+│   ├── kol_analysis.py     AI ticker/direction/conviction extract (Substack).
+│   │                         `_derive_tier()` maps its conviction + talks-vs-
+│   │                         trades score → the SAME trade_signal/directional/
+│   │                         noise tiers x_analysis emits, so non-Twitter posts
+│   │                         get tier set in kol_substack (SIGNAL/VIEW badges +
+│   │                         "Signals only" filter work for blog/substack/pod).
 │   ├── bottom_indicators.py AHR999 / Pi Cycle / 200WMA math
 │   ├── funding_signal.py   Real-time funding extreme detector
-│   └── signed_request.py   EIP-191 signature verification (+ replay cache)
+│   ├── signed_request.py   EIP-191 signature verification (+ replay cache).
+│   │                         signed_read_creds / optional_signed_read_creds:
+│   │                         header-based (X-Sig-Ts/X-Sig-Sig) creds for read
+│   │                         endpoints, query fallback deprecated (C3 fix).
+│   └── http_client.py      Shared pooled httpx.AsyncClient (keep-alive).
+│                             Hot paths (scrapers, telegram send/poll,
+│                             hl_price_feed, binance REST, x_poster) use
+│                             get_client() with per-request timeout instead of
+│                             new-client-per-call. Closed in lifespan shutdown.
 ├── scrapers/
-│   ├── truth_social.py     CNN archive poller (5s interval) — primary
+│   ├── truth_social.py     CNN archive poller (5s interval) — primary.
+│   │                         Conditional GET (ETag/Last-Modified → 304 skips
+│   │                         the 30k-post download), batch dedup (1 IN-query
+│   │                         per poll instead of 50 SELECTs), per-post
+│   │                         commit+dispatch so an actionable post never
+│   │                         waits behind older entries' AI analysis.
+│   │                         dispatch_post() is the shared WS/TG/X/trade
+│   │                         fan-out used by BOTH pollers.
 │   └── trumpstruth.py      trumpstruth.org RSS fallback poller. Same post id
 │                             hash → automatic dedup. Whoever sees first wins.
 │                             Offset by half the interval so the two pollers
@@ -225,11 +253,14 @@ scripts/                    One-shot ops
 │                             Idempotent (INSERT OR IGNORE). Run once at first deploy.
 ├── rescore_v5.py           Re-score every Post with current AI prompt
 ├── backfill_signals.py     Fill in signal for posts missing it
+├── reencrypt_keys.py       Upgrade stored HL keys to enc:v2 (+KEK rotation
+│                             via OLD_ENCRYPTION_KEY). Idempotent; --dry-run.
 └── verify_sys2_lifecycle.py Manual System-2 lifecycle walk-through
 
-tests/                      pytest, 83 tests, fast (<3s total)
+tests/                      pytest, 112 tests, fast (<3s total)
 ├── test_adoption.py        Adoption + release flow (snapshot-style, no real HL/AI)
 ├── test_telegram_digest.py Daily digest formatting
+├── test_kol_tier.py        kol_analysis._derive_tier (non-Twitter tier mapping)
 ├── test_kol_x.py           X ingest: dedup / mapping / no-op (mocked fetch+AI)
 ├── test_ratelimit.py       Rate limit coverage (BUG-02 fix)
 ├── test_bottom_reversal_strategy.py  btc_bottom_reversal 2-of-3 logic
@@ -292,6 +323,8 @@ minimalism — don't extend them.
    └─ adoption.adopt_position(wallet, asset, mode):
       a. Per-wallet asyncio lock acquired
       b. Pre-flight: no_subscription / no_hl_key / paper_mode /
+         macro_disabled (Subscription.macro_enabled must be ON — /adopt is the
+         sys2 management entry point, so the Macro Vibes toggle gates it) /
          circuit_breaker (sys2 CB still gates adopt!) /
          already_adopted / concurrency_cap (3)
       c. Re-read HL state inside lock (fresh entry/size/lev)
@@ -432,7 +465,7 @@ uvicorn app.main:app --reload   # dev only; prod uses --workers 1, no --reload
 
 ```bash
 source venv/bin/activate
-python -m pytest tests/ -q           # 79 tests, ~2s
+python -m pytest tests/ -q           # 112 tests, ~2s
 python scripts/preflight.py          # env + DB + TG + AI auth checks
 python scripts/launch_smoke.py       # 14 end-to-end checks vs running API
 ```
@@ -498,7 +531,20 @@ this for you" to "you opened it, bot manages your discipline".
   (Trump) reads full `daily_budget_usd`. Don't read it for new code.
 - **Adopted trades have `hl_order_id` starting with `"adopted:"`.** Distinct
   from auto-opened (HL order id integer) and paper (`"paper"` literal).
-  Useful for telemetry filtering.
+  Useful for telemetry filtering — AND it's the canonical sys2 marker the
+  daily-budget query uses, because adopted trades have `trigger_post_id=NULL`
+  so source-based classification fails (M1 fix). The `/trades` serializer also
+  reports `trigger_source="adopted"` from this prefix.
+- **`/signals/accuracy` is scoped to production sources + buy/short.** It
+  intentionally restricts to `SUPPORTED_TRADING_SOURCES` and the CURRENT
+  buy/short vocabulary — retired/test sources (rsi_reversal, sma_reclaim,
+  breakout, phase1, `test`) and the legacy `sell` signal are excluded so the
+  public accuracy scoreboard reflects what the live bot actually trades.
+- **macro_enabled vs Telegram alerts are TWO separate switches.** Turning off
+  Macro Vibes (`Subscription.macro_enabled`) gates sys2 *management* — it now
+  blocks `/adopt` (macro_disabled). It does NOT silence Telegram alerts; those
+  are controlled independently by the per-source `TelegramBinding` preference
+  columns. "Alerts on, don't auto-manage" is a deliberately supported combo.
 - **`telegram.send_message` accepts `int | str` for `chat_id`.** Intentional.
   Integer = private chat, string = public channel username (e.g. `"@trumpalpha"`).
 - **`format_public_post` deliberately omits `expected_move_pct`,
@@ -527,11 +573,29 @@ this for you" to "you opened it, bot manages your discipline".
 - **`/adopt` picker label** can show stale price if user waits >60s to tap
   (frozen BotTrade is always fresh, but the Telegram picker label may be outdated).
 
-**Deferred security items (need interface change or DB migration):**
+- ~~**M1 adopted positions miscounted against sys1 budget**~~ **FIXED 2026-06-09**:
-- **C3**: Read endpoints pass `ts`/`sig` as URL query params → access log exposure.
+  the daily-budget query in `bot_engine` now treats any trade whose
-- **H4**: HL API key KEK uses single unsalted SHA-256. Needs re-encryption migration.
+  `hl_order_id` starts with `"adopted:"` as sys2, regardless of the NULL
-- **M1**: Adopted sys2 positions miscounted against sys1 daily budget.
+  `trigger_post_id`. Previously the outerjoin to Post yielded src=NULL →
-- **M5**: `GET /telegram/{wallet}/status` unauthenticated — exposes chat_id/tg_username.
+  classified as sys1 → every adopted macro position inflated the Trump
+  scalp budget and could prematurely trip `budget_reached`.
+
+- **Funding-reversal `/adopt` uses the btc_bottom_reversal exit profile**
+  (`ADOPTED_CATEGORY` is fixed). This is BY DESIGN, not a bug: adopt is
+  ASSET-based (the user opens any position on HL and adopts it) — the bot has
+  no reliable link back to which signal motivated it, and the sys2 ladder is
+  direction/horizon-agnostic. Changing this needs a source-tracking mechanism
+  at adopt time (an ADR), not a one-line tweak.
+
+**Deferred security items — ALL RESOLVED 2026-06-12:**
+- ~~**C3**~~ FIXED: signed reads now send `X-Sig-Ts` / `X-Sig-Sig` HEADERS
+  (see `signed_read_creds` in signed_request.py). Legacy `?ts=&sig=` query
+  params still accepted (deprecated) for old clients.
+- ~~**H4**~~ FIXED: keys now encrypt as `enc:v2` (PBKDF2-HMAC-SHA256, per-blob
+  salt, 600k iters). v1 blobs still decrypt; run `scripts/reencrypt_keys.py`
+  ONCE in prod (after DB backup) to upgrade stored rows.
+- ~~**M5**~~ Was already fixed: unauthenticated `/telegram/{wallet}/status`
+  returns only `configured`/`bound` booleans; full details require a signed read.
 
 ---
 

app/api/performance.py

@@ -8,7 +8,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.database import get_db
 from app.models import BotTrade
 from app.schemas import BotPerformance
-from app.services.signed_request import verify_signed_request_any
+from app.services.signed_request import (
+    SignedReadCreds, signed_read_creds, verify_signed_request_any)
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -21,8 +22,7 @@ ACTION_VIEW_USER = "view_user"
 @router.get("/performance", response_model=BotPerformance)
 async def get_performance(
     wallet: str = Query(..., description="Wallet address (lower-cased internally)"),
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
     include_paper: bool = Query(
         False,
         description="Include paper (simulated) trades. Default false — this "
@@ -35,8 +35,8 @@ async def get_performance(
     verify_signed_request_any(
         actions=[ACTION_VIEW_PERFORMANCE, ACTION_VIEW_USER],
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,
     )

app/api/positions.py

@@ -35,7 +35,9 @@ from app.database import get_db
 from app.models import BotTrade, Subscription, iso_utc
 from app.services.crypto import decrypt_api_key
 from app.services.price_store import price_store
-from app.services.signed_request import verify_signed_request, verify_signed_request_any
+from app.services.signed_request import (
+    SignedReadCreds, signed_read_creds,
+    verify_signed_request, verify_signed_request_any)
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -144,8 +146,7 @@ def _enrich(trade: BotTrade) -> OpenPosition:
 @router.get("/positions/open", response_model=OpenPositionsResponse)
 async def get_open_positions(
     wallet: str = Query(..., description="Wallet address (lower-cased internally)"),
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
     db: AsyncSession = Depends(get_db),
 ):
     """Live open positions for the wallet, with mark-to-market PnL."""
@@ -153,8 +154,8 @@ async def get_open_positions(
     verify_signed_request_any(
         actions=[ACTION_VIEW_POSITIONS, ACTION_VIEW_USER],
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,
     )
@@ -177,8 +178,7 @@ async def get_open_positions(
 @router.get("/positions/today", response_model=TodayStatsResponse)
 async def get_today_stats(
     wallet: str = Query(...),
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
     db: AsyncSession = Depends(get_db),
 ):
     """Today's realized P&L (since UTC midnight) + open count.
@@ -190,8 +190,8 @@ async def get_today_stats(
     verify_signed_request_any(
         actions=[ACTION_VIEW_POSITIONS, ACTION_VIEW_USER],
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,
     )
@@ -453,8 +453,7 @@ class HLPositionsResponse(BaseModel):
 @router.get("/positions/hl/{wallet}", response_model=HLPositionsResponse)
 async def list_hl_positions_endpoint(
     wallet: str,
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
 ):
     """Read the wallet's CURRENT Hyperliquid open positions, annotated with
     'already adopted' flag. Used by the Adopt picker on the frontend.
@@ -469,8 +468,8 @@ async def list_hl_positions_endpoint(
     verify_signed_request_any(
         actions=[ACTION_VIEW_POSITIONS, ACTION_VIEW_USER],
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,
     )

app/api/prices.py

@@ -1,7 +1,6 @@
 import logging
 from typing import List
 
-import httpx
 from fastapi import APIRouter, HTTPException, Query, Request
 from fastapi.responses import Response
 
@@ -33,8 +32,8 @@ async def fetch_binance_candles(asset: str, tf: str, limit: int) -> List[Candle]
     symbol = SYMBOL_MAP[asset]
     interval = BINANCE_INTERVAL[tf]
     url = f"{settings.binance_rest_url}/api/v3/klines?symbol={symbol}&interval={interval}&limit={limit}"
-    async with httpx.AsyncClient(timeout=15) as client:
+    from app.services.http_client import get_client
-        resp = await client.get(url)
+    resp = await get_client().get(url, timeout=15)
     resp.raise_for_status()
     rows = resp.json()
     return [

app/api/telegram.py

@@ -25,7 +25,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.config import settings
 from app.database import get_db
 from app.models import TelegramBinding, Subscription
-from app.services.signed_request import verify_signed_request
+from app.services.signed_request import (
+    SignedReadCreds, optional_signed_read_creds, verify_signed_request)
 from app.services.telegram import send_test_message
 from app.services.telegram_bot import issue_binding_code, unbind_wallet
 
@@ -144,8 +145,7 @@ async def _build_status(
 @router.get("/{wallet}/status", response_model=StatusResponse)
 async def status(
     wallet: str,
-    timestamp: Optional[int] = None,
+    creds: Optional[SignedReadCreds] = Depends(optional_signed_read_creds),
-    signature: Optional[str] = None,
     db: AsyncSession = Depends(get_db),
 ) -> StatusResponse:
     """Wallet Telegram status.
@@ -162,14 +162,14 @@ async def status(
     # Accepting view_user avoids requiring a separate wallet signature just to
     # see Telegram status — the frontend reuses its cached view_user envelope.
     authenticated = False
-    if timestamp is not None and signature:
+    if creds is not None:
         for _action in ("view_telegram_status", "view_user"):
             try:
                 verify_signed_request(
                     action=_action,
                     wallet=wallet,
-                    timestamp_ms=timestamp,
+                    timestamp_ms=creds.ts,
-                    signature=signature,
+                    signature=creds.sig,
                     body=None,
                     allow_replay=True,
                 )

app/api/trades.py

@@ -9,7 +9,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.database import get_db
 from app.models import BotTrade, iso_utc
 from app.schemas import BotTrade as BotTradeSchema
-from app.services.signed_request import verify_signed_request_any
+from app.services.signed_request import (
+    SignedReadCreds, signed_read_creds, verify_signed_request_any)
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -55,8 +56,7 @@ def _trade_to_schema(trade: BotTrade) -> BotTradeSchema:
 @router.get("/trades", response_model=List[BotTradeSchema])
 async def get_trades(
     wallet: str = Query(..., description="Wallet address (lower-cased internally)"),
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
     limit: int = Query(default=20, ge=1, le=500),  # raised from 100: Analytics needs 500 for full history
     page:  int = Query(default=1,  ge=1),
     db: AsyncSession = Depends(get_db),
@@ -65,8 +65,8 @@ async def get_trades(
     verify_signed_request_any(
         actions=[ACTION_VIEW_TRADES, ACTION_VIEW_USER],
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,
     )

app/api/user.py

@@ -16,7 +16,8 @@ from app.schemas import (
 )
 from app.services.crypto import encrypt_api_key
 from app.services.hyperliquid import HyperliquidTrader
-from app.services.signed_request import verify_signed_request
+from app.services.signed_request import (
+    SignedReadCreds, signed_read_creds, verify_signed_request)
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -132,8 +133,7 @@ async def get_user_public(wallet: str, db: AsyncSession = Depends(get_db)):
 @router.get("/user/{wallet}", response_model=UserResponse)
 async def get_user(
     wallet: str,
-    ts: int = Query(..., description="Signed timestamp (ms)"),
+    creds: SignedReadCreds = Depends(signed_read_creds),
-    sig: str = Query(..., description="EIP-191 signature"),
     db: AsyncSession = Depends(get_db),
 ):
     wallet = wallet.lower().strip()
@@ -143,8 +143,8 @@ async def get_user(
     verify_signed_request(
         action=ACTION_VIEW_USER,
         wallet=wallet,
-        timestamp_ms=ts,
+        timestamp_ms=creds.ts,
-        signature=sig,
+        signature=creds.sig,
         body=None,
         allow_replay=True,  # idempotent GET — allow sessionStorage caching for UX
     )

app/main.py

@@ -139,17 +139,12 @@ async def lifespan(app: FastAPI):
 
     # 3. Start Truth Social poller via APScheduler
     _scheduler = AsyncIOScheduler()
-    # Signal monitor — polls every 5 minutes
+    # Breakout signal monitor (poll_funding_signal, ETH/LINK 5m) UNSCHEDULED
-    from app.services.funding_signal import poll_funding_signal
+    # 2026-06-12: the feature has been disabled for months (_enabled=False,
-    _scheduler.add_job(
+    # operator-only toggle) and the frontend panel that displayed it was
-        poll_funding_signal,
+    # removed — the 5-min Binance kline poll was pure waste. The /signal/*
-        "interval",
+    # API routes still work; to revive, re-add the add_job() here AND remount
-        minutes=5,
+    # SignalMonitor in the frontend's MacroVibesPageClient.
-        id="funding_signal_poll",
-        max_instances=1,
-        coalesce=True,
-    )
-    logger.info("Breakout signal monitor scheduled every 5 minutes.")
 
     _scheduler.add_job(
         poll_truth_social,
@@ -347,6 +342,8 @@ async def lifespan(app: FastAPI):
             await _telegram_task
         except asyncio.CancelledError:
             pass
+    from app.services.http_client import aclose as http_client_aclose
+    await http_client_aclose()
     await engine.dispose()
     logger.info("Shutdown complete.")
 

app/scrapers/trumpstruth.py

@@ -24,10 +24,12 @@ from datetime import datetime, timezone
 from email.utils import parsedate_to_datetime
 from typing import Optional
 
-import httpx
+from app.scrapers.truth_social import (
-
+    NOT_MODIFIED,
-from app.scrapers.truth_social import _process_entry, _post_to_ws_payload
+    _known_external_ids,
-from app.ws.manager import manager
+    _process_entry,
+    dispatch_post,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -41,16 +43,31 @@ NS = {
 last_successful_poll_at: Optional[datetime] = None
 last_poll_error: Optional[str] = None
 
+# Conditional-GET validators (same scheme as truth_social.py — most polls
+# come back 304 and skip the download + XML parse entirely).
+_etag: Optional[str] = None
+_last_modified: Optional[str] = None
 
-async def _fetch_feed() -> Optional[str]:
+
+async def _fetch_feed():
+    """Fetch the RSS body. Returns str, NOT_MODIFIED (304), or None on error."""
+    global _etag, _last_modified
     headers = {
         "User-Agent": "Mozilla/5.0 (compatible; TrumpSignal/1.0)",
         "Accept": "application/rss+xml, application/xml",
     }
+    if _etag:
+        headers["If-None-Match"] = _etag
+    if _last_modified:
+        headers["If-Modified-Since"] = _last_modified
     try:
-        async with httpx.AsyncClient(timeout=20, follow_redirects=True) as client:
+        from app.services.http_client import get_client
-            resp = await client.get(FEED_URL, headers=headers)
+        resp = await get_client().get(FEED_URL, headers=headers, timeout=20)
+        if resp.status_code == 304:
+            return NOT_MODIFIED
         resp.raise_for_status()
+        _etag = resp.headers.get("etag")
+        _last_modified = resp.headers.get("last-modified")
         return resp.text
     except Exception as exc:
         # Include type name — httpx often raises bare ConnectError/RemoteProtocolError
@@ -105,6 +122,11 @@ async def poll_trumpstruth(db_session_factory) -> None:
     global last_successful_poll_at, last_poll_error
 
     raw = await _fetch_feed()
+    if raw is NOT_MODIFIED:
+        # Feed unchanged — successful cycle, nothing to do.
+        last_successful_poll_at = datetime.now(timezone.utc)
+        last_poll_error = None
+        return
     if raw is None:
         last_poll_error = "fetch_feed returned None"
         return
@@ -128,41 +150,26 @@ async def poll_trumpstruth(db_session_factory) -> None:
 
     async with db_session_factory() as db:
         try:
-            new_posts = []
+            known_ids = await _known_external_ids(entries, db)
+            # Newest-first: commit + dispatch each new post immediately so an
+            # actionable post never queues behind older entries' AI analysis.
+            # dispatch_post is the shared fan-out (WS + Telegram + X + trade)
+            # from truth_social.py — delivery must not depend on which poller
+            # wins the race.
             for entry in entries:
                 try:
-                    post = await _process_entry(entry, db)
+                    post = await _process_entry(entry, db, known_ids)
                     if post:
-                        new_posts.append(post)
+                        await db.commit()
+                        logger.info("[trumpstruth] beat CNN — new post id=%d",
+                                    post.id)
+                        await dispatch_post(post, db)
                 except Exception as exc:
                     logger.error("trumpstruth: error on entry %s: %s",
                                  entry.get("id"), exc)
 
-            if new_posts:
+            # Capture any remaining writes (entry-filter stub rows).
             await db.commit()
-                for post in new_posts:
-                    await manager.broadcast(_post_to_ws_payload(post))
-                    logger.info("[trumpstruth] beat CNN — new post id=%d: %s",
-                                post.id, post.text[:60])
-                    # Telegram fan-out — matches truth_social.py. Without this,
-                    # whichever poller wins the race determines whether users
-                    # get pushed — flaky 50% delivery.
-                    try:
-                        from app.services.telegram import notify_signal
-                        notify_signal(post)
-                    except Exception as exc:
-                        logger.warning("Telegram notify failed for post %d: %s", post.id, exc)
-                    try:
-                        from app.services.x_poster import notify_x_signal
-                        notify_x_signal(post)
-                    except Exception as exc:
-                        logger.warning("X notify failed for post %d: %s", post.id, exc)
-                    try:
-                        from app.services.bot_engine import process_post
-                        await process_post(post, db)
-                    except Exception as exc:
-                        logger.error("process_post failed for post %d: %s",
-                                     post.id, exc)
             last_successful_poll_at = datetime.now(timezone.utc)
             last_poll_error = None
         except Exception as exc:

app/scrapers/truth_social.py

@@ -11,7 +11,6 @@ import re
 from datetime import datetime, timezone
 from typing import Optional
 
-import httpx
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -29,6 +28,16 @@ ARCHIVE_URL = "https://ix.cnn.io/data/truth-social/truth_archive.json"
 last_successful_poll_at: Optional[datetime] = None
 last_poll_error: Optional[str] = None
 
+# Conditional-GET validators from the last 200 response. The archive is 30k+
+# posts (~MBs of JSON); CNN only regenerates it every ~5 min, so most polls
+# can be answered with a 304 and skip download + parse entirely.
+_etag: Optional[str] = None
+_last_modified: Optional[str] = None
+
+# Sentinel returned by _fetch_archive on HTTP 304 — distinct from None
+# (fetch failure) so the poller can count it as a successful, no-work cycle.
+NOT_MODIFIED = object()
+
 
 def _strip_html(text: str) -> str:
     text = re.sub(r"<[^>]+>", " ", text)
@@ -52,15 +61,28 @@ def _parse_dt(iso: str) -> datetime:
         return datetime.now(timezone.utc).replace(tzinfo=None)
 
 
-async def _fetch_archive() -> Optional[list]:
+async def _fetch_archive(conditional: bool = True):
+    """Fetch the archive JSON. Returns a list, NOT_MODIFIED (304), or None
+    on error. `conditional=False` (backfill) always downloads the full body
+    so a poller-set ETag can't starve the startup backfill."""
+    global _etag, _last_modified
     headers = {
         "User-Agent": "Mozilla/5.0 (compatible; TrumpSignal/1.0)",
         "Accept": "application/json",
     }
+    if conditional:
+        if _etag:
+            headers["If-None-Match"] = _etag
+        if _last_modified:
+            headers["If-Modified-Since"] = _last_modified
     try:
-        async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
+        from app.services.http_client import get_client
-            resp = await client.get(ARCHIVE_URL, headers=headers)
+        resp = await get_client().get(ARCHIVE_URL, headers=headers, timeout=30)
+        if conditional and resp.status_code == 304:
+            return NOT_MODIFIED
         resp.raise_for_status()
+        _etag = resp.headers.get("etag")
+        _last_modified = resp.headers.get("last-modified")
         return resp.json()
     except Exception as exc:
         # Include type name — httpx often raises bare ConnectError/TimeoutException
@@ -71,9 +93,27 @@ async def _fetch_archive() -> Optional[list]:
         return None
 
 
-async def _process_entry(entry: dict, db: AsyncSession) -> Optional[Post]:
+async def _known_external_ids(entries: list, db: AsyncSession) -> set:
+    """One batch query for the dedup pass. On a typical poll all ~50 entries
+    already exist, so this replaces 50 per-entry SELECTs with 1."""
+    ids = [hashlib.md5(str(e["id"]).encode()).hexdigest() for e in entries]
+    if not ids:
+        return set()
+    rows = await db.execute(
+        select(Post.external_id).where(Post.external_id.in_(ids)))
+    return {r[0] for r in rows}
+
+
+async def _process_entry(entry: dict, db: AsyncSession,
+                         known_ids: Optional[set] = None) -> Optional[Post]:
     external_id = hashlib.md5(str(entry["id"]).encode()).hexdigest()
 
+    # Fast path: pre-fetched batch dedup set. New (unseen) ids still get the
+    # confirming SELECT below — protects against a concurrent insert by the
+    # other poller between the batch query and this entry.
+    if known_ids is not None and external_id in known_ids:
+        return None
+
     result = await db.execute(select(Post).where(Post.external_id == external_id))
     if result.scalar_one_or_none():
         return None
@@ -198,37 +238,14 @@ def _post_to_ws_payload(post: Post) -> dict:
     }
 
 
-async def poll_truth_social(db_session_factory) -> None:
+async def dispatch_post(post: Post, db: AsyncSession) -> None:
-    global last_successful_poll_at, last_poll_error
+    """Broadcast + fan-out + trade for one freshly committed post. Shared by
-    logger.info("Polling CNN Truth Social archive...")
+    both pollers so delivery doesn't depend on which source wins the race."""
-    entries = await _fetch_archive()
-    if not entries:
-        last_poll_error = "fetch_archive returned empty"
-        return
-
-    # Only process the latest 50 entries each poll (archive has 30k+ posts)
-    recent = entries[:50]
-    logger.info("Checking %d recent entries...", len(recent))
-
-    async with db_session_factory() as db:
-        try:
-            new_posts = []
-            for entry in recent:
-                try:
-                    post = await _process_entry(entry, db)
-                    if post:
-                        new_posts.append(post)
-                except Exception as exc:
-                    logger.error("Error processing entry %s: %s", entry.get("id"), exc)
-
-            if new_posts:
-                await db.commit()
-                for post in new_posts:
     await manager.broadcast(_post_to_ws_payload(post))
     logger.info("Saved new post id=%d: %s", post.id, post.text[:60])
-                    # Telegram fan-out (fire-and-forget). _dispatch filters
+    # Telegram fan-out (fire-and-forget). _dispatch filters internally:
-                    # internally: buy/short → per-subscriber + public channel;
+    # buy/short → per-subscriber + public channel; relevant-but-hold →
-                    # relevant-but-hold → public channel only; noise → dropped.
+    # public channel only; noise → dropped.
     try:
         from app.services.telegram import notify_signal
         notify_signal(post)
@@ -244,7 +261,45 @@ async def poll_truth_social(db_session_factory) -> None:
         await process_post(post, db)
     except Exception as exc:
         logger.error("process_post failed for post %d: %s", post.id, exc)
-            else:
+
+
+async def poll_truth_social(db_session_factory) -> None:
+    global last_successful_poll_at, last_poll_error
+    logger.info("Polling CNN Truth Social archive...")
+    entries = await _fetch_archive()
+    if entries is NOT_MODIFIED:
+        # Archive unchanged since last poll — successful cycle, nothing to do.
+        last_successful_poll_at = datetime.now(timezone.utc)
+        last_poll_error = None
+        return
+    if not entries:
+        last_poll_error = "fetch_archive returned empty"
+        return
+
+    # Only process the latest 50 entries each poll (archive has 30k+ posts)
+    recent = entries[:50]
+    logger.info("Checking %d recent entries...", len(recent))
+
+    async with db_session_factory() as db:
+        try:
+            known_ids = await _known_external_ids(recent, db)
+            found_new = False
+            # Entries are newest-first. Commit + dispatch each new post
+            # IMMEDIATELY rather than after the whole batch — an actionable
+            # post must not wait behind the AI analysis of older entries.
+            for entry in recent:
+                try:
+                    post = await _process_entry(entry, db, known_ids)
+                    if post:
+                        found_new = True
+                        await db.commit()
+                        await dispatch_post(post, db)
+                except Exception as exc:
+                    logger.error("Error processing entry %s: %s", entry.get("id"), exc)
+
+            # Capture any remaining writes (entry-filter stub rows).
+            await db.commit()
+            if not found_new:
                 logger.info("No new posts found.")
             # Mark a successful poll cycle (separate from "found new posts").
             last_successful_poll_at = datetime.now(timezone.utc)
@@ -258,7 +313,7 @@ async def poll_truth_social(db_session_factory) -> None:
 async def backfill_history(db_session_factory, limit: int = 500) -> None:
     """One-time backfill of historical posts (no Claude analysis, no price impact)."""
     logger.info("Starting historical backfill (limit=%d)...", limit)
-    entries = await _fetch_archive()
+    entries = await _fetch_archive(conditional=False)
     if not entries:
         logger.error("Backfill failed: could not fetch archive")
         return
@@ -268,10 +323,10 @@ async def backfill_history(db_session_factory, limit: int = 500) -> None:
 
     async with db_session_factory() as db:
         try:
+            known_ids = await _known_external_ids(to_process, db)
             for entry in to_process:
                 external_id = hashlib.md5(str(entry["id"]).encode()).hexdigest()
-                result = await db.execute(select(Post).where(Post.external_id == external_id))
+                if external_id in known_ids:
-                if result.scalar_one_or_none():
                     continue
 
                 text = _strip_html(entry.get("content") or "").strip()

app/services/adoption.py

@@ -244,6 +244,16 @@ async def _adopt_locked(wallet_l: str, asset_u: str, mode_n: str) -> AdoptionRes
                 "no Hyperliquid position to manage. Turn off paper mode in "
                 "Settings to use /adopt.")
 
+        # Macro Vibes (System-2) must be ENABLED to hand a position to the bot.
+        # /adopt is the entry point to sys2 management, so honouring the
+        # macro_enabled switch here is what makes that toggle real — otherwise
+        # a user who turned Macro Vibes OFF could still /adopt and the bot would
+        # manage it, contradicting their setting.
+        if not getattr(sub, "macro_enabled", False):
+            raise AdoptionError("macro_disabled",
+                "Macro Vibes is turned off for this wallet. Enable Macro Vibes "
+                "in Settings before using /adopt.")
+
         # System-2 circuit breaker. Same gate the auto-open path used to run:
         # if recent losses tripped the sys2 breaker, block new adoptions for
         # the lockout window. Otherwise the breaker would be useless under

app/services/binance.py

@@ -4,7 +4,6 @@ import logging
 from datetime import datetime, timezone
 from typing import Optional
 
-import httpx
 import websockets
 
 from app.config import settings
@@ -127,8 +126,8 @@ async def fetch_historical(asset: str, symbol: str, interval: str = "1m", limit:
     """Fetch historical klines from Binance REST API to pre-fill price_store."""
     url = f"{settings.binance_rest_url}/api/v3/klines?symbol={symbol.upper()}&interval={interval}&limit={limit}"
     try:
-        async with httpx.AsyncClient(timeout=15) as client:
+        from app.services.http_client import get_client
-            resp = await client.get(url)
+        resp = await get_client().get(url, timeout=15)
         resp.raise_for_status()
         for row in resp.json():
             candle = {

app/services/crypto.py

@@ -1,54 +1,132 @@
 """
 Envelope encryption for HL API private keys.
 
-Plaintext keys never touch disk: stored values are Fernet-encrypted with a KEK
+Plaintext keys never touch disk: stored values are Fernet-encrypted with a key
-loaded from env (ENCRYPTION_KEY). Rotate KEK → re-encrypt all keys offline.
+derived from the env KEK (ENCRYPTION_KEY).
+
+Blob formats:
+  enc:v2:<salt_b64url>:<fernet_token>   — current. Per-blob random 16-byte
+      salt; Fernet key = PBKDF2-HMAC-SHA256(KEK, salt, 600k iters). Derived
+      keys are cached per salt so steady-state decryption pays the KDF once.
+  enc:v1:<fernet_token>                 — legacy. Fernet key = single unsalted
+      SHA-256(KEK). Read-only: decrypt still works, encrypt always writes v2.
+      Upgrade rows with scripts/reencrypt_keys.py (H4 fix).
+  <plaintext>                            — pre-encryption rows. Refused in prod.
+
+Rotate KEK → re-encrypt all keys offline (scripts/reencrypt_keys.py).
 """
 import base64
 import hashlib
 import logging
-from typing import Optional
+import os
+from typing import Dict, Optional
 
 from cryptography.fernet import Fernet, InvalidToken
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 
 from app.config import settings
 
 logger = logging.getLogger(__name__)
 
+# OWASP-recommended floor for PBKDF2-HMAC-SHA256. The KEK is already a
+# high-entropy secret, so the KDF mainly buys defence-in-depth against a
+# weak / partially-leaked / reused KEK. ~0.2-0.4s, paid once per unique salt.
+_PBKDF2_ITERATIONS = 600_000
+_SALT_BYTES = 16
 
-def _derive_fernet_key(raw: str) -> bytes:
+ENC_PREFIX_V1 = "enc:v1:"
-    """Accept any reasonably-long secret and derive a valid 32-byte Fernet key."""
+ENC_PREFIX_V2 = "enc:v2:"
+# Kept for older imports / scripts that reference the original name.
+ENC_PREFIX = ENC_PREFIX_V1
+
+
+def _check_kek(raw: str) -> str:
     if not raw or len(raw) < 32:
         raise RuntimeError(
             "ENCRYPTION_KEY must be set to at least 32 random chars (e.g. `openssl rand -hex 32`)"
         )
-    digest = hashlib.sha256(raw.encode("utf-8")).digest()
+    return raw
+
+
+def _derive_v1_key(raw: str) -> bytes:
+    """Legacy: single unsalted SHA-256 of the KEK."""
+    digest = hashlib.sha256(_check_kek(raw).encode("utf-8")).digest()
     return base64.urlsafe_b64encode(digest)
 
 
-_fernet: Optional[Fernet] = None
+def _derive_v2_key(raw: str, salt: bytes) -> bytes:
+    kdf = PBKDF2HMAC(
+        algorithm=hashes.SHA256(),
+        length=32,
+        salt=salt,
+        iterations=_PBKDF2_ITERATIONS,
+    )
+    return base64.urlsafe_b64encode(kdf.derive(_check_kek(raw).encode("utf-8")))
 
 
-def _cipher() -> Fernet:
+_fernet_v1: Optional[Fernet] = None
-    global _fernet
+# salt → Fernet. One entry per unique salt actually seen: encryption reuses a
-    if _fernet is None:
+# single process-lifetime salt, decryption adds one per distinct stored blob.
-        _fernet = Fernet(_derive_fernet_key(settings.encryption_key))
+_fernet_v2_cache: Dict[bytes, Fernet] = {}
-    return _fernet
+_V2_CACHE_MAX = 4096
+
+# Salt for NEW encryptions in this process — generated once so the encrypt
+# path pays the 600k-iteration KDF a single time per process, while blobs
+# written by other processes/runs still carry their own salt.
+_encrypt_salt: Optional[bytes] = None
 
 
-# Prefix lets us distinguish encrypted blobs from any legacy plaintext rows during migration
+def _cipher_v1() -> Fernet:
-ENC_PREFIX = "enc:v1:"
+    global _fernet_v1
+    if _fernet_v1 is None:
+        _fernet_v1 = Fernet(_derive_v1_key(settings.encryption_key))
+    return _fernet_v1
+
+
+def _cipher_v2(salt: bytes) -> Fernet:
+    cached = _fernet_v2_cache.get(salt)
+    if cached is not None:
+        return cached
+    f = Fernet(_derive_v2_key(settings.encryption_key, salt))
+    if len(_fernet_v2_cache) >= _V2_CACHE_MAX:
+        _fernet_v2_cache.clear()
+    _fernet_v2_cache[salt] = f
+    return f
 
 
 def encrypt_api_key(plaintext: str) -> str:
-    token = _cipher().encrypt(plaintext.encode("utf-8")).decode("utf-8")
+    global _encrypt_salt
-    return ENC_PREFIX + token
+    if _encrypt_salt is None:
+        _encrypt_salt = os.urandom(_SALT_BYTES)
+    salt_b64 = base64.urlsafe_b64encode(_encrypt_salt).decode("ascii")
+    token = _cipher_v2(_encrypt_salt).encrypt(plaintext.encode("utf-8")).decode("utf-8")
+    return f"{ENC_PREFIX_V2}{salt_b64}:{token}"
 
 
 def decrypt_api_key(stored: str) -> str:
     if not stored:
         raise ValueError("Empty api key")
-    if not stored.startswith(ENC_PREFIX):
+
+    if stored.startswith(ENC_PREFIX_V2):
+        rest = stored[len(ENC_PREFIX_V2):]
+        try:
+            salt_b64, token = rest.split(":", 1)
+            salt = base64.urlsafe_b64decode(salt_b64.encode("ascii"))
+        except Exception as exc:
+            raise RuntimeError("Malformed enc:v2 blob") from exc
+        try:
+            return _cipher_v2(salt).decrypt(token.encode("utf-8")).decode("utf-8")
+        except InvalidToken as exc:
+            raise RuntimeError("HL key decryption failed — wrong ENCRYPTION_KEY?") from exc
+
+    if stored.startswith(ENC_PREFIX_V1):
+        try:
+            return _cipher_v1().decrypt(
+                stored[len(ENC_PREFIX_V1):].encode("utf-8")).decode("utf-8")
+        except InvalidToken as exc:
+            raise RuntimeError("HL key decryption failed — wrong ENCRYPTION_KEY?") from exc
+
     # Legacy plaintext row (from before encryption was added). Refuse to use in prod.
     if settings.environment == "production":
         raise RuntimeError(
@@ -56,7 +134,8 @@ def decrypt_api_key(stored: str) -> str:
         )
     logger.warning("Reading LEGACY plaintext HL key — migrate ASAP")
     return stored
-    try:
+
-        return _cipher().decrypt(stored[len(ENC_PREFIX):].encode("utf-8")).decode("utf-8")
+
-    except InvalidToken as exc:
+def is_current_format(stored: Optional[str]) -> bool:
-        raise RuntimeError("HL key decryption failed — wrong ENCRYPTION_KEY?") from exc
+    """True if the blob is already enc:v2 (used by scripts/reencrypt_keys.py)."""
+    return bool(stored) and stored.startswith(ENC_PREFIX_V2)

app/services/hl_price_feed.py

@@ -31,7 +31,6 @@ import time
 from datetime import datetime, timezone
 from typing import Optional
 
-import httpx
 
 from app.services.price_store import price_store
 from app.ws.manager import manager
@@ -96,8 +95,8 @@ async def _tick() -> None:
     """Single price fetch + dispatch cycle for all HL_PRICE_ASSETS."""
     now_ms = int(time.time() * 1000)
 
-    async with httpx.AsyncClient(timeout=4.0) as c:
+    from app.services.http_client import get_client
-        r = await c.post(HL_API_URL, json={"type": "allMids"})
+    r = await get_client().post(HL_API_URL, json={"type": "allMids"}, timeout=4.0)
     r.raise_for_status()
     mids: dict = r.json()  # {"BTC": "74541.0", "HYPE": "13.5", …}
 

app/services/http_client.py

@@ -0,0 +1,37 @@
+"""Shared pooled httpx.AsyncClient.
+
+Hot paths (scrapers, Telegram send/poll, price feeds, X poster) used to build
+a fresh AsyncClient per request, paying a TCP+TLS handshake every time. This
+module owns one process-wide client with keep-alive pooling; callers override
+the timeout per request (`client.get(url, timeout=10)`).
+
+Lifecycle: lazily created on first use; main.py's lifespan closes it on
+shutdown. Low-frequency daily jobs (KOL/macro fetchers) may keep their own
+ad-hoc clients — pooling only matters on the per-second paths.
+"""
+import logging
+from typing import Optional
+
+import httpx
+
+logger = logging.getLogger(__name__)
+
+_client: Optional[httpx.AsyncClient] = None
+
+
+def get_client() -> httpx.AsyncClient:
+    global _client
+    if _client is None or _client.is_closed:
+        _client = httpx.AsyncClient(
+            timeout=httpx.Timeout(20.0),
+            follow_redirects=True,
+            limits=httpx.Limits(max_connections=50, max_keepalive_connections=20),
+        )
+    return _client
+
+
+async def aclose() -> None:
+    global _client
+    if _client is not None and not _client.is_closed:
+        await _client.aclose()
+    _client = None

app/services/kol_analysis.py

@@ -315,6 +315,8 @@ async def extract_kol_signal(
     if post_type not in valid_post_types:
         post_type = "other"
 
+    tier = _derive_tier(cleaned, tvt_score)
+
     return {
         "summary": (data.get("summary") or "").strip() or None,
         "post_type": post_type,
@@ -322,6 +324,33 @@ async def extract_kol_signal(
         "talks_vs_trades_score": tvt_score,
         # Keep old boolean for any callers that still check it
         "talks_vs_trades_flag": tvt_score >= 0.5,
+        # tier mirrors x_analysis' vocabulary (trade_signal / directional /
+        # noise) so blog/substack/podcast posts get the same SIGNAL/VIEW UI
+        # badges + the "Signals only" filter that Twitter posts already have.
+        "tier": tier,
         "model": model,
         "version": ANALYSIS_VERSION,
     }
+
+
+def _derive_tier(tickers: list[dict], tvt_score: float) -> str:
+    """Map kol_analysis output → the trade_signal/directional/noise tiers that
+    x_analysis emits directly. Non-Twitter analyzers don't ask the model for a
+    tier, so we derive one from the per-ticker conviction + the talks-vs-trades
+    (divergence) score. Without this, blog/substack/podcast rows have tier=NULL
+    and the "Signals only" filter + SIGNAL/VIEW badges never apply to them.
+
+      * directional ticker = an explicit non-"mention" action (buy/sell/
+        reduce/bullish/bearish).
+      * trade_signal = high conviction (>= 0.6) on a directional ticker, or a
+        strong talks-vs-trades divergence (>= 0.6) — the platform's top signal.
+      * directional  = a directional view exists but below the trade_signal bar.
+      * noise        = no directional ticker and no notable divergence.
+    """
+    directional = [t for t in tickers if (t.get("action") or "mention") != "mention"]
+    max_conv = max((float(t.get("conviction") or 0) for t in directional), default=0.0)
+    if max_conv >= 0.6 or tvt_score >= 0.6:
+        return "trade_signal"
+    if directional or tvt_score >= 0.5:
+        return "directional"
+    return "noise"

app/services/kol_substack.py

@@ -468,6 +468,9 @@ async def _ingest_kol(
                     # Extended analysis fields (migration 027)
                     row.post_type = result.get("post_type")
                     row.talks_vs_trades_flag = bool(result.get("talks_vs_trades_flag", False))
+                    # tier (trade_signal/directional/noise) so the "Signals only"
+                    # filter + SIGNAL/VIEW badges work for non-Twitter KOLs too.
+                    row.tier = result.get("tier")
                     stats["analyzed"] += 1
             except Exception as e:
                 logger.warning("[kol_substack] analysis failed for %s post %s: %s",

app/services/signed_request.py

@@ -144,3 +144,58 @@ def verify_signed_request_any(
             last_exc = exc
     if last_exc is not None:
         raise last_exc
+
+
+# ── Signed-read credential extraction (C3) ────────────────────────────────
+# Read endpoints historically took the signature as `?ts=&sig=` query params,
+# which leaks signatures into access logs / proxies / browser history. The
+# canonical transport is now the X-Sig-Ts / X-Sig-Sig HEADERS; the query
+# params are kept as a deprecated fallback so older clients keep working.
+from dataclasses import dataclass
+
+from fastapi import Header, Query
+
+
+@dataclass
+class SignedReadCreds:
+    ts: int
+    sig: str
+
+
+def signed_read_creds(
+    ts: Optional[int] = Query(default=None, deprecated=True,
+                              description="DEPRECATED — use X-Sig-Ts header"),
+    sig: Optional[str] = Query(default=None, deprecated=True,
+                               description="DEPRECATED — use X-Sig-Sig header"),
+    x_sig_ts: Optional[int] = Header(default=None, alias="X-Sig-Ts",
+                                     description="Signed timestamp (ms)"),
+    x_sig_sig: Optional[str] = Header(default=None, alias="X-Sig-Sig",
+                                      description="EIP-191 signature"),
+) -> SignedReadCreds:
+    """FastAPI dependency: required signed-read credentials.
+
+    Headers win over query params when both are present."""
+    t = x_sig_ts if x_sig_ts is not None else ts
+    s = x_sig_sig if x_sig_sig else sig
+    if t is None or not s:
+        raise HTTPException(
+            422, "Missing signed-read credentials (X-Sig-Ts / X-Sig-Sig headers)")
+    return SignedReadCreds(ts=t, sig=s)
+
+
+def optional_signed_read_creds(
+    # Legacy query names used by /telegram/{wallet}/status.
+    timestamp: Optional[int] = Query(default=None, deprecated=True,
+                                     description="DEPRECATED — use X-Sig-Ts header"),
+    signature: Optional[str] = Query(default=None, deprecated=True,
+                                     description="DEPRECATED — use X-Sig-Sig header"),
+    x_sig_ts: Optional[int] = Header(default=None, alias="X-Sig-Ts"),
+    x_sig_sig: Optional[str] = Header(default=None, alias="X-Sig-Sig"),
+) -> Optional[SignedReadCreds]:
+    """Like signed_read_creds but returns None when absent — for endpoints
+    that serve a redacted response to unauthenticated callers."""
+    t = x_sig_ts if x_sig_ts is not None else timestamp
+    s = x_sig_sig if x_sig_sig else signature
+    if t is None or not s:
+        return None
+    return SignedReadCreds(ts=t, sig=s)

app/services/telegram.py

@@ -27,7 +27,6 @@ import logging
 from datetime import datetime, timezone
 from typing import Optional
 
-import httpx
 from sqlalchemy import select, update
 
 from app.config import settings
@@ -274,8 +273,8 @@ async def send_message(chat_id: int | str, text: str, *,
     if reply_markup is not None:
         payload["reply_markup"] = reply_markup
     try:
-        async with httpx.AsyncClient(timeout=10) as client:
+        from app.services.http_client import get_client
-            r = await client.post(url, json=payload)
+        r = await get_client().post(url, json=payload, timeout=10)
         if r.status_code != 200:
             logger.warning("Telegram sendMessage failed chat=%s status=%d body=%s",
                            chat_id, r.status_code, r.text[:200])
@@ -302,8 +301,8 @@ async def edit_message(chat_id: int, message_id: int, text: str, *,
     if reply_markup is not None:
         payload["reply_markup"] = reply_markup
     try:
-        async with httpx.AsyncClient(timeout=10) as client:
+        from app.services.http_client import get_client
-            r = await client.post(url, json=payload)
+        r = await get_client().post(url, json=payload, timeout=10)
         if r.status_code != 200:
             # Telegram returns 400 on "message is not modified" — harmless.
             if "message is not modified" not in r.text:
@@ -331,8 +330,8 @@ async def answer_callback(callback_query_id: str, text: str = "",
         payload["text"] = text
         payload["show_alert"] = show_alert
     try:
-        async with httpx.AsyncClient(timeout=10) as client:
+        from app.services.http_client import get_client
-            await client.post(url, json=payload)
+        await get_client().post(url, json=payload, timeout=10)
         return True
     except Exception as exc:
         logger.debug("Telegram answerCallback exception: %s", exc)

app/services/telegram_bot.py

@@ -1007,15 +1007,14 @@ async def run_bot_loop() -> None:
     # them without processing, then start the real loop fresh.
     try:
         drain_url = TG_API.format(token=token, method="getUpdates")
-        async with httpx.AsyncClient(timeout=10) as client:
+        from app.services.http_client import get_client
-            r = await client.get(drain_url, params={"timeout": 0, "limit": 100})
+        r = await get_client().get(drain_url, params={"timeout": 0, "limit": 100}, timeout=10)
         if r.status_code == 200:
             pending = r.json().get("result", [])
             if pending:
                 drain_offset = pending[-1]["update_id"] + 1
                 # ACK by sending offset back — Telegram won't re-deliver these.
-                async with httpx.AsyncClient(timeout=10) as client:
+                await get_client().get(drain_url, params={"timeout": 0, "offset": drain_offset}, timeout=10)
-                    await client.get(drain_url, params={"timeout": 0, "offset": drain_offset})
                 logger.info(
                     "Startup drain: skipped %d stale update(s), offset now %d",
                     len(pending), drain_offset,
@@ -1032,8 +1031,8 @@ async def run_bot_loop() -> None:
             params: dict = {"timeout": 25}
             if offset is not None:
                 params["offset"] = offset
-            async with httpx.AsyncClient(timeout=35) as client:
+            from app.services.http_client import get_client
-                r = await client.get(url, params=params)
+            r = await get_client().get(url, params=params, timeout=35)
             if r.status_code != 200:
                 logger.warning("Telegram getUpdates HTTP %d: %s", r.status_code, r.text[:200])
                 await asyncio.sleep(backoff)

app/services/x_poster.py

@@ -33,7 +33,6 @@ import urllib.parse
 from datetime import datetime, timezone
 from typing import Optional
 
-import httpx
 from sqlalchemy import select
 
 from app.config import settings
@@ -146,8 +145,8 @@ async def _post_tweet(text: str, reply_to: Optional[str] = None) -> Optional[str
         "Content-Type": "application/json",
     }
     try:
-        async with httpx.AsyncClient(timeout=10) as client:
+        from app.services.http_client import get_client
-            resp = await client.post(TWEET_URL, json=payload, headers=headers)
+        resp = await get_client().post(TWEET_URL, json=payload, headers=headers, timeout=10)
         if resp.status_code in (200, 201):
             _record_sent()
             tid = resp.json().get("data", {}).get("id")

scripts/reencrypt_keys.py

@@ -0,0 +1,90 @@
+"""
+Re-encrypt all stored HL API keys to the current enc:v2 format (H4 fix).
+
+Upgrades, in place:
+  * enc:v1 blobs (legacy unsalted-SHA256 KEK derivation)
+  * plaintext rows (pre-encryption era)
+to enc:v2 (PBKDF2-HMAC-SHA256, per-blob salt). Rows already in enc:v2 are
+skipped — the script is idempotent and safe to re-run.
+
+KEK rotation: set OLD_ENCRYPTION_KEY in the environment to decrypt with the
+old KEK while encrypting with the current ENCRYPTION_KEY.
+
+Usage (BACK UP THE DB FIRST):
+    DATABASE_URL=<prod-url> python scripts/reencrypt_keys.py [--dry-run]
+"""
+import argparse
+import asyncio
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from sqlalchemy import select
+
+from app.database import AsyncSessionLocal
+from app.models import Subscription
+from app.services import crypto
+
+
+async def main(dry_run: bool) -> None:
+    old_kek = os.environ.get("OLD_ENCRYPTION_KEY")
+    if old_kek:
+        # Decrypt with the old KEK, encrypt with the new one. Swapping the
+        # setting around each call keeps crypto.py's caching simple.
+        print("KEK rotation mode: decrypting with OLD_ENCRYPTION_KEY")
+
+    upgraded = skipped = failed = 0
+    async with AsyncSessionLocal() as db:
+        rows = (await db.execute(
+            select(Subscription).where(Subscription.hl_api_key.is_not(None))
+        )).scalars().all()
+        print(f"{len(rows)} subscription(s) with a stored HL key")
+
+        for sub in rows:
+            stored = sub.hl_api_key
+            if crypto.is_current_format(stored) and not old_kek:
+                skipped += 1
+                continue
+            try:
+                if old_kek:
+                    current = crypto.settings.encryption_key
+                    crypto.settings.encryption_key = old_kek
+                    crypto._fernet_v1 = None
+                    crypto._fernet_v2_cache.clear()
+                    try:
+                        plaintext = crypto.decrypt_api_key(stored)
+                    finally:
+                        crypto.settings.encryption_key = current
+                        crypto._fernet_v1 = None
+                        crypto._fernet_v2_cache.clear()
+                        crypto._encrypt_salt = None
+                else:
+                    plaintext = crypto.decrypt_api_key(stored)
+                new_blob = crypto.encrypt_api_key(plaintext)
+                # Round-trip check before touching the row.
+                assert crypto.decrypt_api_key(new_blob) == plaintext
+                if not dry_run:
+                    sub.hl_api_key = new_blob
+                upgraded += 1
+                print(f"  {sub.wallet_address}: upgraded"
+                      f"{' (dry-run)' if dry_run else ''}")
+            except Exception as exc:
+                failed += 1
+                print(f"  {sub.wallet_address}: FAILED — {type(exc).__name__}: {exc}")
+
+        if not dry_run and upgraded:
+            await db.commit()
+            print("Committed.")
+
+    print(f"Done: upgraded={upgraded} skipped(already v2)={skipped} failed={failed}")
+    if failed:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    ap = argparse.ArgumentParser()
+    ap.add_argument("--dry-run", action="store_true",
+                    help="report what would change without writing")
+    args = ap.parse_args()
+    asyncio.run(main(args.dry_run))

tests/test_adoption.py

@@ -155,7 +155,7 @@ def test_adoption_error_codes_used_by_callers_are_all_defined():
     # These are the codes referenced from app/api/positions.py +
     # app/services/telegram_bot.py. Update both sites if you add one.
     promised_codes = {
-        "no_subscription", "no_hl_key", "paper_mode",
+        "no_subscription", "no_hl_key", "paper_mode", "macro_disabled",
         "key_decrypt_failed", "hl_read_failed",
         "bad_mode", "circuit_breaker",
         "already_adopted", "concurrency_cap",

tests/test_crypto.py

@@ -0,0 +1,58 @@
+"""enc:v2 envelope encryption (H4): roundtrip, legacy v1 compat, format checks."""
+import base64
+import hashlib
+
+import pytest
+from cryptography.fernet import Fernet
+
+from app.services import crypto
+
+
+@pytest.fixture(autouse=True)
+def _kek(monkeypatch):
+    monkeypatch.setattr(crypto.settings, "encryption_key", "k" * 64)
+    # Reset module caches so each test derives from the patched KEK.
+    crypto._fernet_v1 = None
+    crypto._fernet_v2_cache.clear()
+    crypto._encrypt_salt = None
+    yield
+    crypto._fernet_v1 = None
+    crypto._fernet_v2_cache.clear()
+    crypto._encrypt_salt = None
+
+
+def test_v2_roundtrip():
+    blob = crypto.encrypt_api_key("0x" + "ab" * 32)
+    assert blob.startswith(crypto.ENC_PREFIX_V2)
+    assert crypto.decrypt_api_key(blob) == "0x" + "ab" * 32
+    assert crypto.is_current_format(blob)
+    # Fits the hl_api_key String(256) column.
+    assert len(blob) <= 256
+
+
+def test_v1_blob_still_decrypts():
+    # Build a v1 blob exactly the way the legacy code did.
+    digest = hashlib.sha256(("k" * 64).encode()).digest()
+    f = Fernet(base64.urlsafe_b64encode(digest))
+    blob = crypto.ENC_PREFIX_V1 + f.encrypt(b"secret-key").decode()
+    assert not crypto.is_current_format(blob)
+    assert crypto.decrypt_api_key(blob) == "secret-key"
+
+
+def test_wrong_kek_raises(monkeypatch):
+    blob = crypto.encrypt_api_key("topsecret")
+    monkeypatch.setattr(crypto.settings, "encryption_key", "x" * 64)
+    crypto._fernet_v2_cache.clear()
+    with pytest.raises(RuntimeError):
+        crypto.decrypt_api_key(blob)
+
+
+def test_malformed_v2_raises():
+    with pytest.raises(RuntimeError):
+        crypto.decrypt_api_key(crypto.ENC_PREFIX_V2 + "no-salt-separator")
+
+
+def test_plaintext_refused_in_production(monkeypatch):
+    monkeypatch.setattr(crypto.settings, "environment", "production")
+    with pytest.raises(RuntimeError):
+        crypto.decrypt_api_key("raw-plaintext-key")

tests/test_kol_tier.py

@@ -0,0 +1,38 @@
+"""Unit tests for kol_analysis._derive_tier — the non-Twitter tier derivation
+that lets blog/substack/podcast posts get the same trade_signal/directional/
+noise tiers (and SIGNAL/VIEW badges + "Signals only" filter) as Twitter posts.
+"""
+
+from app.services.kol_analysis import _derive_tier
+
+
+def _tk(action="mention", conviction=0.0):
+    return {"action": action, "conviction": conviction}
+
+
+def test_no_tickers_is_noise():
+    assert _derive_tier([], 0.0) == "noise"
+
+
+def test_only_mentions_is_noise():
+    assert _derive_tier([_tk("mention", 0.9)], 0.1) == "noise"
+
+
+def test_high_conviction_directional_is_trade_signal():
+    assert _derive_tier([_tk("buy", 0.7)], 0.0) == "trade_signal"
+
+
+def test_strong_divergence_is_trade_signal_even_without_ticker():
+    assert _derive_tier([], 0.8) == "trade_signal"
+
+
+def test_low_conviction_directional_is_directional():
+    assert _derive_tier([_tk("bullish", 0.4)], 0.0) == "directional"
+
+
+def test_moderate_divergence_is_directional():
+    assert _derive_tier([_tk("mention", 0.0)], 0.55) == "directional"
+
+
+def test_boundary_conviction_0_6_is_trade_signal():
+    assert _derive_tier([_tk("sell", 0.6)], 0.0) == "trade_signal"

tests/test_production_readiness.py

@@ -97,10 +97,10 @@ async def test_open_positions_requires_signed_wallet_read(monkeypatch):
     monkeypatch.setattr(positions, "verify_signed_request_any", fake_verify)
     db = _Db([[]])
 
+    from app.services.signed_request import SignedReadCreds
     result = await positions.get_open_positions(
         wallet="0xABC",
-        ts=123,
+        creds=SignedReadCreds(ts=123, sig="0xsig"),
-        sig="0xsig",
         db=db,
     )