Pre-launch hardening: KOL module, Telegram, scanners, WS resilience
Big-picture changes since b941223:
KOL pipeline (new) — Substack/podcast/blog RSS → AI ticker extraction →
on-chain wallet diff → talks-vs-trades divergence detection. Daily polls,
19 feeds, divergence emits Post + Telegram fan-out.
Telegram push (new) — walletless free tier + wallet-linked Pro upgrade,
in-bot preference commands (/trump /btc /funding /kol /conf /quiet),
signed-envelope API for dashboard. Disconnect-wallet keeps free
subscription.
BTC funding-rate reversal scanner (new) — hourly cron, 30d cumulative
funding threshold + mean-revert + 7d price confirm, emits via
/api/signals/ingest. BTC bottom-reversal scanner promoted to System 2.
WS broadcast rewrite — per-client send timeout + parallel fan-out
(asyncio.gather). Fixes "Binance WS no close frame" reconnect storms +
APScheduler 11-min job misses, both caused by one slow client stalling
the kline loop.
Error visibility — three silent-error sites (trumpstruth/truth_social
fetchers, funding_reversal scanner) now include exception type name so
httpx ConnectError-style empty-message errors stop logging blank lines.
Telegram bot loop now classifies ReadTimeout vs network vs unknown +
logger.exception for the unknown bucket.
Security hygiene — trumpsignal.db untracked from git (held subscriber
wallets + encrypted HL keys + 22 bot trades); .gitignore now blocks
*.db/.next/backups. CORS only allows FRONTEND_URL in production.
New ops scripts —
- scripts/preflight.py: env/DB/Telegram/AI auth verification gate
- scripts/backup_db.sh: cron-friendly daily DB backup (SQLite + Postgres)
- scripts/seed_kol_wallets.py: idempotent KOL on-chain wallet seeder
15 new Alembic migrations (007-021) covering convex strategy fields,
phase-1 safety, two-system frozen exits, invalidation prices, dynamic
SYS2 leverage, staged de-risk + pyramiding, peak gain tracking, risk
mode, auto-trade + grow flags, KOL module, KOL on-chain, KOL divergence,
Telegram bindings + walletless.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
k
@@ -11,15 +11,21 @@ from datetime import datetime, timezone
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.database import AsyncSessionLocal
|
||||
from app.models import BotTrade, Subscription
|
||||
from app.models import BotTrade, Post, Subscription
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def rehydrate_open_trades() -> None:
|
||||
# Imported locally to avoid circular imports at module load
|
||||
from app.services.bot_engine import MAX_HOLD_SECONDS, close_and_finalize
|
||||
from app.services.bot_engine import close_and_finalize
|
||||
from app.services.crypto import decrypt_api_key
|
||||
from app.services.signal_categories import (
|
||||
get_stop_ladder as _get_stop_ladder,
|
||||
sys2_derisk_ladder as _sys2_derisk_ladder,
|
||||
sys2_addon_ladder as _sys2_addon_ladder,
|
||||
sys2_peak_trail as _sys2_peak_trail,
|
||||
)
|
||||
from app.services.tp_sl_monitor import register_trade
|
||||
|
||||
async with AsyncSessionLocal() as db:
|
||||
@@ -53,7 +59,29 @@ async def rehydrate_open_trades() -> None:
|
||||
# Fall back to current Subscription only for legacy rows (pre-migration 005).
|
||||
trade_leverage = t.leverage if t.leverage is not None else sub.leverage
|
||||
|
||||
# Re-register TP/SL watcher
|
||||
# Re-register from the trade's FROZEN exit profile (eff_* columns),
|
||||
# NOT the live Subscription. The trade may be a 90-day System-2
|
||||
# reversal; using sub.* would rehydrate it with the user's Trump
|
||||
# stop (1.5%) and 7-day max-hold — silently rewriting its risk on
|
||||
# every restart. eff_* is stamped at open and never changes.
|
||||
#
|
||||
# Legacy rows (opened before this migration) have NULL eff_* —
|
||||
# fall back to the Subscription so they still get *some* watcher.
|
||||
eff_sl = t.eff_stop_loss_pct if t.eff_stop_loss_pct is not None else sub.stop_loss_pct
|
||||
eff_tp = t.eff_take_profit_pct # may legitimately be None (sys2 pure-trail)
|
||||
eff_tr = t.eff_trailing_stop_pct if t.eff_trailing_stop_pct is not None else sub.trailing_stop_pct
|
||||
eff_tra = t.eff_trailing_activate_pct if t.eff_trailing_activate_pct is not None else sub.trailing_activate_at_pct
|
||||
eff_mh = t.eff_max_hold_hours if t.eff_max_hold_hours is not None else (sub.max_hold_hours or 168)
|
||||
# NOTE: peak_gain_pct is now RESTORED from the row (throttled
|
||||
# persistence) so a pyramided / in-profit System-2 trade keeps its
|
||||
# regime across restarts. min_hold still resets on rehydrate, but
|
||||
# it only matters in the first 30 min of a Trump trade; a restart
|
||||
# inside that window is rare and the downside (TP can fire early)
|
||||
# is bounded.
|
||||
post_res = await db.execute(
|
||||
select(Post).where(Post.id == t.trigger_post_id)
|
||||
)
|
||||
trigger_post = post_res.scalar_one_or_none()
|
||||
register_trade(
|
||||
trade_id=t.id,
|
||||
wallet=t.wallet_address,
|
||||
@@ -62,14 +90,55 @@ async def rehydrate_open_trades() -> None:
|
||||
asset=t.asset,
|
||||
side=t.side,
|
||||
entry_price=t.entry_price,
|
||||
take_profit_pct=sub.take_profit_pct,
|
||||
stop_loss_pct=sub.stop_loss_pct,
|
||||
take_profit_pct=eff_tp,
|
||||
stop_loss_pct=eff_sl,
|
||||
trailing_stop_pct=eff_tr,
|
||||
trailing_activate_at_pct=eff_tra,
|
||||
invalidation=t.eff_invalidation,
|
||||
invalidation_price=(
|
||||
t.eff_invalidation_price
|
||||
if t.eff_invalidation_price is not None
|
||||
else (trigger_post.invalidation_price if trigger_post else None)
|
||||
),
|
||||
min_hold_until_ts=t.eff_min_hold_until_ts,
|
||||
stop_ladder=_get_stop_ladder(
|
||||
trigger_post.category if trigger_post else None
|
||||
),
|
||||
# Restore staged de-risk: rebuild the ladder from the trade's
|
||||
# FROZEN leverage and skip steps already executed before the
|
||||
# restart (derisk_steps_done is persisted on the row).
|
||||
# Restore staged de-risk/pyramid/peak-trail with the trade's
|
||||
# FROZEN risk mode + leverage, skipping steps already executed
|
||||
# before the restart (persisted on the row).
|
||||
derisk_ladder=(
|
||||
_sys2_derisk_ladder(t.leverage or 1, t.sys2_mode)
|
||||
if _get_stop_ladder(trigger_post.category if trigger_post else None)
|
||||
else None
|
||||
),
|
||||
derisk_done=(t.derisk_steps_done or 0),
|
||||
addon_ladder=(
|
||||
_sys2_addon_ladder(t.sys2_mode)
|
||||
if _get_stop_ladder(trigger_post.category if trigger_post else None)
|
||||
else None
|
||||
),
|
||||
addon_done=(t.addon_steps_done or 0),
|
||||
# Restore the monotonic peak so a pyramided / in-profit trade
|
||||
# doesn't fall back to the underwater de-risk regime on restart.
|
||||
initial_peak=(t.peak_gain_pct or 0.0),
|
||||
peak_trail=(
|
||||
_sys2_peak_trail(t.sys2_mode)
|
||||
if _get_stop_ladder(trigger_post.category if trigger_post else None)
|
||||
else None
|
||||
),
|
||||
grow_mode=bool(getattr(t, "grow_mode", False)),
|
||||
)
|
||||
|
||||
# Compute remaining hold; if already exceeded, close immediately
|
||||
# Remaining hold from the trade's FROZEN max_hold (e.g. 2160h for
|
||||
# an sma_reclaim), not the user's Trump setting.
|
||||
opened_aware = t.opened_at.replace(tzinfo=timezone.utc)
|
||||
elapsed = (now - opened_aware).total_seconds()
|
||||
remaining = MAX_HOLD_SECONDS - elapsed
|
||||
max_hold_seconds = int(eff_mh) * 3600
|
||||
remaining = max_hold_seconds - elapsed
|
||||
|
||||
from app.services.bot_engine import _background_tasks
|
||||
|
||||
|
||||
Reference in New Issue
Block a user