zt p commited on
Commit
5a34ea1
·
1 Parent(s): d44feb9

Use Binance as primary source for GRAM and STRC

Browse files
Files changed (2) hide show
  1. README.md +9 -10
  2. coinpush.py +295 -137
README.md CHANGED
@@ -10,7 +10,7 @@ pinned: false
10
 
11
  # 🚀 虚拟货币价格通知
12
 
13
- 基于币安公开行情,对 BTC / TON 等币种做多维度监控,并通过企业微信机器人推送关键信号。
14
 
15
  ## 信号颜色
16
  - 🟢 涨 🔴 跌 🟡 值得关注(不涨不跌但需留意)
@@ -27,17 +27,16 @@ pinned: false
27
  - `WEWORK_BOT_WEBHOOK`(必填):企业微信机器人 Webhook
28
  - `BINANCE_API_KEY` / `BINANCE_API_SECRET`(可选,公开行情无需)
29
  - `BINANCE_SPOT_BASE` / `BINANCE_FAPI_BASE` / `BINANCE_FSTREAM_BASE`(可选,换镜像用)
30
- - `ENABLE_FUTURES`(可选,默认 false):币安合约/强平监控总开关(US 区域受限)
31
- - `BITGET_API_KEY` / `BITGET_API_SECRET` / `BITGET_API_PASSPHRASE`(Bitget 行情/STRC 股票)
32
- - `OKX_API_KEY` / `OKX_API_SECRET` / `OKX_API_PASSPHRASE`(OKX 行情/GRAM 合约)
33
  - `BITGET_BASE` / `OKX_BASE`(可选,受限区域可指向可用代理)
34
 
35
  ## 多交易所扩展
36
- - 监控币种:BTC、TON(Binance)、STRC(OKX `STRC-USDT-SWAP`)。三者均走相同的多维监控 + 历史自动校准。
37
- - STRC 作为完整币种处理(与 BTC/TON 一样:快速涨跌、突破、成交量、振幅、盘口、均线、RSI、资金费率、持仓量),
38
- 数据来源走 OKX(交易量更大),并多一个「休市」属性:价格长时间不变即判定休市,期间不推送任何提醒。
39
- - OKX 标的的合约信息(资金费率/持仓量)不受 `ENABLE_FUTURES`(仅针对币安 US 限制)约束。
40
- - 跨所差价提醒:BTC、TON/GRAM、STRC 在 Binance / Bitget / OKX 之间的价差(Binance 仍叫 TON,Bitget/OKX 已改名 GRAM;STRC 用 Bitget 现货 vs OKX 永续对比)。
41
- - OKX GRAM 永续合约(`GRAM-USDT-SWAP`)关键信息:合约价异动、资金费率、持仓量变化。
42
  - 以上均可在页面「多交易所设置」与各币种页开关、调参。Bitget/OKX 对部分地区有访问限制,
43
  若 Space 处于受限区域,需通过 `BITGET_BASE` / `OKX_BASE` 指向可用代理。
 
10
 
11
  # 🚀 虚拟货币价格通知
12
 
13
+ 基于币安公开行情,对 BTC / GRAM / STRC 等币种做多维度监控,并通过企业微信机器人推送关键信号。
14
 
15
  ## 信号颜色
16
  - 🟢 涨 🔴 跌 🟡 值得关注(不涨不跌但需留意)
 
27
  - `WEWORK_BOT_WEBHOOK`(必填):企业微信机器人 Webhook
28
  - `BINANCE_API_KEY` / `BINANCE_API_SECRET`(可选,公开行情无需)
29
  - `BINANCE_SPOT_BASE` / `BINANCE_FAPI_BASE` / `BINANCE_FSTREAM_BASE`(可选,换镜像用)
30
+ - `ENABLE_FUTURES`(可选,默认 false):币安现货主线币种的合约指标/强平流总开关;STRC 主行情仍走 `BINANCE_FAPI_BASE`
31
+ - `BITGET_API_KEY` / `BITGET_API_SECRET` / `BITGET_API_PASSPHRASE`(可选,Bitget 差价行情)
32
+ - `OKX_API_KEY` / `OKX_API_SECRET` / `OKX_API_PASSPHRASE`(可选,OKX 差价行情)
33
  - `BITGET_BASE` / `OKX_BASE`(可选,受限区域可指向可用代理)
34
 
35
  ## 多交易所扩展
36
+ - 主价格通知:BTC、GRAM(原 TON)、STRC 均以 Binance 为主行情源;GRAM 使用 Binance 现货 `GRAMUSDT`,STRC 使用 Binance 合约 `STRCUSDT`。
37
+ - STRC 作为完整币种处理(与 BTC/GRAM 一样:快速涨跌、突破、成交量、振幅、盘口、均线、RSI、资金费率、持仓量),
38
+ 并保留「休市」属性:价格长时间不变即判定休市,期间不推送任何提醒。
39
+ - `TONUSDT` 旧配置会自动迁移到 `GRAMUSDT`;旧的 OKX STRC/GRAM 独立提醒会清理,避免和 Binance 主行情重复。
40
+ - 跨所差价提醒:BTC、GRAM、STRC 在 Binance / Bitget / OKX 之间的价差;其中 STRC 的 Binance 侧使用 `futures:STRCUSDT` 合约价。
 
41
  - 以上均可在页面「多交易所设置」与各币种页开关、调参。Bitget/OKX 对部分地区有访问限制,
42
  若 Space 处于受限区域,需通过 `BITGET_BASE` / `OKX_BASE` 指向可用代理。
coinpush.py CHANGED
@@ -54,10 +54,10 @@ OKX_API_SECRET = os.getenv("OKX_API_SECRET")
54
  OKX_API_PASSPHRASE = os.getenv("OKX_API_PASSPHRASE")
55
  OKX_BASE = os.getenv("OKX_BASE", "https://www.okx.com")
56
 
57
- # 合约功能全局开关(默认关闭)。币安合约接口/强平流对 US 区域返回 451,
58
- # 而 HuggingFace Space 运行在 US。此开关优先级高于每个币种的 enable_futures:
59
- # 关闭时一律不调用 /fapi 与强平 websocket,避免 451 刷屏。
60
- # 若自带可访问合约接口的代理,设置环境变量 ENABLE_FUTURES=true 即可整体开启。
61
  FUTURES_ENABLED = os.getenv("ENABLE_FUTURES", "false").strip().lower() in ("1", "true", "yes", "on")
62
 
63
  # 配置持久化文件
@@ -129,12 +129,13 @@ def _btc_defaults():
129
  }
130
 
131
 
132
- def _ton_defaults():
133
  d = _btc_defaults()
134
  d.update({
135
- "symbol": "TONUSDT",
136
- "futures_symbol": "TONUSDT",
137
- "enable_futures": False, # TONUSDT 合约已下线,待 GRAMUSDT 重新上线后启用
 
138
  "price_change": {
139
  "1m": 0.80,
140
  "5m": 1.80,
@@ -162,15 +163,20 @@ def _ton_defaults():
162
  return d
163
 
164
 
 
 
 
 
 
165
  def _strc_defaults():
166
- """STRC:与 BTC/TON 同样的多维监控 + 历史自动校准,数据走 OKX 永续,
167
  并带「休市」属性(股票类,休市价格不变时不提醒)。阈值会被历史校准刷新。"""
168
  d = _btc_defaults()
169
  d.update({
170
- "symbol": "STRC-USDT-SWAP",
171
- "futures_symbol": "STRC-USDT-SWAP",
172
- "data_source": "okx",
173
- "enable_futures": True, # OKX 合约不受 FUTURES_ENABLED 限制
174
  "market_close": True,
175
  "market_close_static_secs": 600,
176
  "price_change": {
@@ -201,7 +207,7 @@ def _strc_defaults():
201
  DEFAULT_CONFIG = {
202
  "coins": {
203
  "BTC": _btc_defaults(),
204
- "TON": _ton_defaults(),
205
  "STRC": _strc_defaults(),
206
  },
207
  "global": {
@@ -214,7 +220,7 @@ DEFAULT_CONFIG = {
214
  "auto_calibrate_hours": 24,
215
  "last_calibrate_ts": 0,
216
  },
217
- # 多交易所扩展:跨所差价、OKX 合约(GRAM / STRC)
218
  "exchanges": {
219
  "enable_bitget": True,
220
  "enable_okx": True,
@@ -223,26 +229,14 @@ DEFAULT_CONFIG = {
223
  "enable": True,
224
  "threshold_pct": 0.5, # 任意两所价差超过该百分比即提醒
225
  "pairs": [
226
- # Binance 仍叫 TON,Bitget/OKX 已改名 GRAM
227
  {"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT", "okx": "BTC-USDT"},
228
- {"name": "TON/GRAM", "binance": "TONUSDT", "bitget": "GRAMUSDT", "okx": "GRAM-USDT"},
229
- # STRC:Bitget 现货 rToken 与 OKX 永续做价差对比
230
- {"name": "STRC", "binance": "", "bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP"},
231
  ],
232
  },
233
- # OKX 永续合约关键信息(GRAM 等普通合约;STRC 已作为币种走完整监控)
234
- "okx_contracts": [
235
- {
236
- "name": "GRAM", "inst_id": "GRAM-USDT-SWAP", "enable": True,
237
- "price_change_pct": 2.0, # 合约价短时异动 %
238
- "funding_high": 0.05, # 资金费率绝对值高位 %
239
- "funding_neg": -0.05,
240
- "oi_change_pct": 5.0, # 持仓量较上次变动 %
241
- "amp_24h_pct": 0.0, # 0=不监控 24h 振幅
242
- "market_close_aware": False, # 普通合约 7x24 交易
243
- "static_secs": 600,
244
- },
245
- ],
246
  },
247
  }
248
 
@@ -254,7 +248,7 @@ COOLDOWN_MIN = {
254
  "big_trade": 15, "cum_trade": 20, "spread": 30, "imbalance": 30,
255
  "wall": 90, "wall_vanish": 30, "ma_deviation": 30,
256
  "consecutive": 60, "rsi": 60, "funding": 120, "oi": 30, "liquidation": 10,
257
- # 跨交易所差价 / STRC 股票异动 / OKX GRAM 合约
258
  "spread_ex": 20, "strc": 15, "okx_funding": 120, "okx_oi": 30, "okx_price": 10,
259
  }
260
 
@@ -271,57 +265,119 @@ def _deep_merge(base, override):
271
  return result
272
 
273
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
274
  def _normalize_exchanges(ex):
275
- """兼容旧配置:把旧的 strc / okx_gram_swap 结构迁移到 okx_contracts,
276
- 并确保 spread 含 STRC 对照、清理过时字段。"""
277
  ex = copy.deepcopy(ex)
278
 
279
- # 1) spread 对照表确保含 STRC(Bitget 现货 vs OKX 永续)
280
  sp = ex.setdefault("spread", {})
281
- pairs = sp.get("pairs") or []
282
- if "STRC" not in {p.get("name") for p in pairs}:
283
- pairs.append({"name": "STRC", "binance": "",
284
- "bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP"})
285
- sp["pairs"] = pairs
286
 
287
- # 2) okx_contracts 不存在则按默认创建
288
  contracts = ex.get("okx_contracts")
289
- if not isinstance(contracts, list) or not contracts:
290
- contracts = [
291
- {"name": "GRAM", "inst_id": "GRAM-USDT-SWAP", "enable": True,
292
- "price_change_pct": 2.0, "funding_high": 0.05, "funding_neg": -0.05,
293
- "oi_change_pct": 5.0, "amp_24h_pct": 0.0,
294
- "market_close_aware": False, "static_secs": 600},
295
- {"name": "STRC", "inst_id": "STRC-USDT-SWAP", "enable": True,
296
- "price_change_pct": 1.0, "funding_high": 0.05, "funding_neg": -0.05,
297
- "oi_change_pct": 5.0, "amp_24h_pct": 3.0,
298
- "market_close_aware": True, "static_secs": 600},
299
- ]
300
-
301
- by_name = {c.get("name"): c for c in contracts}
302
- # 旧 okx_gram_swap -> GRAM 合约
303
- old_gram = ex.get("okx_gram_swap")
304
- if isinstance(old_gram, dict) and "GRAM" in by_name:
305
- for k in ("inst_id", "enable", "price_change_pct",
306
- "funding_high", "funding_neg", "oi_change_pct"):
307
- if k in old_gram:
308
- by_name["GRAM"][k] = old_gram[k]
309
- # 旧 strc -> STRC 合约(change_pct 映射为 price_change_pct)
310
- old_strc = ex.get("strc")
311
- if isinstance(old_strc, dict) and "STRC" in by_name:
312
- if "change_pct" in old_strc:
313
- by_name["STRC"]["price_change_pct"] = old_strc["change_pct"]
314
- for k in ("enable", "amp_24h_pct", "static_secs"):
315
- if k in old_strc:
316
- by_name["STRC"][k] = old_strc[k]
317
-
318
- ex["okx_contracts"] = contracts
319
  ex.pop("okx_gram_swap", None)
320
  ex.pop("strc", None)
321
- # STRC 现已作为币种(coins)走完整监控,从 okx_contracts 移除以免重复
322
- ex["okx_contracts"] = [c for c in ex["okx_contracts"]
323
- if c.get("name") != "STRC"
324
- and c.get("inst_id") != "STRC-USDT-SWAP"]
325
  return ex
326
 
327
 
@@ -334,17 +390,27 @@ def load_config():
334
  saved = json.load(f)
335
  # global 直接合并
336
  cfg["global"] = _deep_merge(cfg["global"], saved.get("global", {}))
337
- # coins:保留用户自定义币种,并以 BTC 默认结构补全字段
338
  saved_coins = saved.get("coins", {})
339
  merged_coins = {}
340
  for name, coin_cfg in saved_coins.items():
341
- template = _btc_defaults()
342
- merged_coins[name] = _deep_merge(template, coin_cfg)
 
 
 
 
 
343
  if merged_coins:
344
  cfg["coins"] = merged_coins
345
- # STRC 现作为币种处理:老配置缺失时自动注入(OKX 数据 + 休市属性)
 
 
346
  if "STRC" not in cfg["coins"]:
347
  cfg["coins"]["STRC"] = _strc_defaults()
 
 
 
348
  # exchanges:跨所/STRC/OKX 合约配置,缺失字段以默认补全
349
  cfg["exchanges"] = _deep_merge(cfg["exchanges"], saved.get("exchanges", {}))
350
  cfg["exchanges"] = _normalize_exchanges(cfg["exchanges"])
@@ -515,6 +581,74 @@ class BinanceAPI:
515
  return self._get(FAPI_BASE, "/fapi/v1/fundingRate",
516
  {"symbol": symbol, "limit": limit})
517
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
518
 
519
  # --- 6b. Bitget 行情接口(现货 + STRC 股票代币)---
520
  class BitgetAPI:
@@ -674,7 +808,7 @@ class OKXAPI:
674
  # --- 6d. OKX → Binance 接口适配器 ---
675
  class OKXMarketAdapter:
676
  """把 OKX v5 行情包装成与 BinanceAPI 兼容的接口,使 CoinEvaluator / calibrate_thresholds
677
- 可无改动地像监控 BTC/TON 一样监控 OKX 标的(如 STRC-USDT-SWAP 股票类合约)。"""
678
  BAR = {"1m": "1m", "5m": "5m", "15m": "15m", "1h": "1H", "1d": "1D"}
679
 
680
  def __init__(self, okx_api, logger):
@@ -1016,9 +1150,9 @@ def calibrate_thresholds(api, coin_cfg, logger=print, sensitivity=1.0):
1016
  out["liq_5m_usdt"] = round(max(avg5 * 0.5, 10000))
1017
  out["liq_severe_usdt"] = round(out["liq_5m_usdt"] * 4)
1018
 
1019
- # 7) 资金费率:历史费率分位(合约启用时;OKX 标的不受 FUTURES_ENABLED 限制)
1020
  _ds = coin_cfg.get("data_source", "binance")
1021
- if coin_cfg.get("enable_futures") and (_ds == "okx" or FUTURES_ENABLED):
1022
  fr = api.funding_rate_history(coin_cfg["futures_symbol"], 500)
1023
  if fr:
1024
  try:
@@ -1182,8 +1316,9 @@ class CoinEvaluator:
1182
  # 11) RSI
1183
  self._check_rsi(cfg, sym, head, add)
1184
 
1185
- # 12) 合约类(OKX 标的不受 FUTURES_ENABLED 限制)
1186
- if cfg.get("enable_futures") and (self.data_source == "okx" or FUTURES_ENABLED):
 
1187
  self._check_futures(cfg, head, add)
1188
 
1189
  snapshot = {
@@ -1469,7 +1604,7 @@ def make_alert(name, category, key, direction, headline, body):
1469
 
1470
 
1471
  class CrossExchangeMonitor:
1472
- """同一资产在 Binance / Bitget / OKX 间的价差提醒(TON 在 Binance,GRAM 在 Bitget/OKX)"""
1473
 
1474
  def __init__(self, binance_api, bitget_api, okx_api, logger):
1475
  self.binance = binance_api
@@ -1478,7 +1613,16 @@ class CrossExchangeMonitor:
1478
  self.logger = logger
1479
 
1480
  def _binance_price(self, symbol):
1481
- t = self.binance.ticker_24h(symbol)
 
 
 
 
 
 
 
 
 
1482
  if t and t.get("lastPrice"):
1483
  try:
1484
  return float(t["lastPrice"])
@@ -1646,6 +1790,7 @@ class CryptoMonitor:
1646
  self._auto_calibrate_needed = not os.path.exists(CONFIG_FILE)
1647
 
1648
  self.api = BinanceAPI(self.log)
 
1649
  self.bitget = BitgetAPI(self.log)
1650
  self.okx = OKXAPI(self.log)
1651
  self.okx_adapter = OKXMarketAdapter(self.okx, self.log)
@@ -1671,17 +1816,20 @@ class CryptoMonitor:
1671
  self.logs.appendleft(entry)
1672
 
1673
  def _api_for(self, coin_cfg):
1674
- """按币种数据来源选择行情接口(binance / okx)"""
 
 
1675
  if coin_cfg.get("data_source") == "okx":
1676
  return self.okx_adapter
1677
  return self.api
1678
 
1679
  def _futures_symbols(self):
1680
- # 仅币安来源且全局开启时才订阅币安强平流;OKX 标的不走该 websocket
1681
  if not FUTURES_ENABLED:
1682
  return []
1683
  return [c["futures_symbol"] for c in self.config["coins"].values()
1684
- if c.get("enable_futures") and c.get("data_source", "binance") == "binance"]
 
1685
 
1686
  def _rebuild_evaluators(self):
1687
  with self.lock:
@@ -1950,17 +2098,17 @@ def render_config_editor(monitor):
1950
  else:
1951
  st.caption("自定义模式:阈值以下方各币种设置为准,不会被自动覆盖。")
1952
 
1953
- with st.expander("多交易所设置(Bitget / OKX / 跨所差价 / STRC)", expanded=False):
1954
  ex = cfg.setdefault("exchanges", {})
1955
  ec1, ec2 = st.columns(2)
1956
  with ec1:
1957
  ex["enable_bitget"] = st.checkbox(
1958
  "启用 Bitget", value=ex.get("enable_bitget", True),
1959
- help="跨所差价的 GRAM/BTC 价格、STRC 股票均来自 Bitget")
1960
  with ec2:
1961
  ex["enable_okx"] = st.checkbox(
1962
  "启用 OKX", value=ex.get("enable_okx", True),
1963
- help="跨所差价的 GRAM/BTC 价格、GRAM 合约信息均来自 OKX")
1964
  st.caption("⚠️ 密钥从环境变量读取(BITGET_*/OKX_*)。Bitget/OKX 对部分地区有访问限制,"
1965
  "若 Space 在受限区域可设置 BITGET_BASE / OKX_BASE 指向可用代理。")
1966
 
@@ -1976,7 +2124,7 @@ def render_config_editor(monitor):
1976
  new_pairs_txt = st.text_area(
1977
  "对照表(每行:名称,Binance,Bitget,OKX;留空表示该所不参与)",
1978
  value=pairs_txt, height=80,
1979
- help="例:TON/GRAM,TONUSDT,GRAMUSDT,GRAM-USDT")
1980
  parsed = []
1981
  for line in new_pairs_txt.splitlines():
1982
  cols = [c.strip() for c in line.split(",")]
@@ -1987,45 +2135,46 @@ def render_config_editor(monitor):
1987
  if parsed:
1988
  sp["pairs"] = parsed
1989
 
1990
- st.markdown("**OKX 永续合约(GRAM、STRC 等;STRC 为股票类合约,多一个休市属性)**")
1991
  contracts = ex.setdefault("okx_contracts", [])
1992
- for idx, c in enumerate(contracts):
1993
- cname = c.get("name") or c.get("inst_id") or f"合约{idx+1}"
1994
- st.markdown(f"— {cname}")
1995
- wc1, wc2 = st.columns(2)
1996
- with wc1:
1997
- c["enable"] = st.checkbox(
1998
- "启用监控", value=c.get("enable", True), key=f"okxc_{idx}_en")
1999
- c["inst_id"] = st.text_input(
2000
- "合约 instId", value=c.get("inst_id", ""), key=f"okxc_{idx}_inst")
2001
- c["price_change_pct"] = st.number_input(
2002
- "合约价短时异动 %", min_value=0.1, max_value=20.0,
2003
- value=float(c.get("price_change_pct", 2.0)), step=0.1,
2004
- format="%.1f", key=f"okxc_{idx}_pc")
2005
- c["oi_change_pct"] = st.number_input(
2006
- "持仓量变动 %", min_value=0.5, max_value=50.0,
2007
- value=float(c.get("oi_change_pct", 5.0)), step=0.5,
2008
- format="%.1f", key=f"okxc_{idx}_oi")
2009
- with wc2:
2010
- c["funding_high"] = st.number_input(
2011
- "资金费率高位 %", min_value=0.001, max_value=1.0,
2012
- value=float(c.get("funding_high", 0.05)), step=0.001,
2013
- format="%.3f", key=f"okxc_{idx}_fh")
2014
- c["funding_neg"] = st.number_input(
2015
- "资金费率负位 %", min_value=-1.0, max_value=-0.001,
2016
- value=float(c.get("funding_neg", -0.05)), step=0.001,
2017
- format="%.3f", key=f"okxc_{idx}_fn")
2018
- c["amp_24h_pct"] = st.number_input(
2019
- "24h 振幅阈值 %(0=不监控)", min_value=0.0, max_value=50.0,
2020
- value=float(c.get("amp_24h_pct", 0.0)), step=0.5,
2021
- format="%.1f", key=f"okxc_{idx}_amp")
2022
- c["market_close_aware"] = st.checkbox(
2023
- "股票类合约(休市价格不变时不提醒)",
2024
- value=c.get("market_close_aware", False), key=f"okxc_{idx}_mc")
2025
- if c["market_close_aware"]:
2026
- c["static_secs"] = st.number_input(
2027
- "判定休市的静止秒数", min_value=60, max_value=7200,
2028
- value=int(c.get("static_secs", 600)), step=60, key=f"okxc_{idx}_ss")
 
 
2029
 
2030
  coin_names = list(cfg["coins"].keys())
2031
  tabs = st.tabs(coin_names + ["➕ 新增币种"])
@@ -2033,15 +2182,24 @@ def render_config_editor(monitor):
2033
  for i, name in enumerate(coin_names):
2034
  with tabs[i]:
2035
  coin = cfg["coins"][name]
 
 
 
 
2036
  ds_label = st.radio(
2037
- "数据来源", ["Binance", "OKX"],
2038
- index=1 if coin.get("data_source") == "okx" else 0,
2039
  horizontal=True, key=f"{name}_ds",
2040
- help="OKX 标的(如 STRC-USDT-SWAP)合约信息不受 ENABLE_FUTURES 限制")
2041
- coin["data_source"] = "okx" if ds_label == "OKX" else "binance"
2042
  cc1, cc2, cc3 = st.columns(3)
2043
  with cc1:
2044
- sym_label = "OKX instId" if coin["data_source"] == "okx" else "现货交易对"
 
 
 
 
 
2045
  coin["symbol"] = st.text_input(
2046
  sym_label, value=coin["symbol"], key=f"{name}_symbol")
2047
  with cc2:
 
54
  OKX_API_PASSPHRASE = os.getenv("OKX_API_PASSPHRASE")
55
  OKX_BASE = os.getenv("OKX_BASE", "https://www.okx.com")
56
 
57
+ # 合约功能全局开关(默认关闭)。币安合约接口/强平流对 US 区域可能返回 451。
58
+ # 该开关控制现货主行情币种的合约指标与强平 websocket;若标的本身以 Binance
59
+ # 合约作为主行情源(如 STRC),仍会访问 /fapi 拉取价格、K线、盘口等主行情。
60
+ # 若自带可访问合约接口的代理,设置环境变量 ENABLE_FUTURES=true 可启用全部合约增强项。
61
  FUTURES_ENABLED = os.getenv("ENABLE_FUTURES", "false").strip().lower() in ("1", "true", "yes", "on")
62
 
63
  # 配置持久化文件
 
129
  }
130
 
131
 
132
+ def _gram_defaults():
133
  d = _btc_defaults()
134
  d.update({
135
+ "symbol": "GRAMUSDT",
136
+ "futures_symbol": "GRAMUSDT",
137
+ "data_source": "binance",
138
+ "enable_futures": True,
139
  "price_change": {
140
  "1m": 0.80,
141
  "5m": 1.80,
 
163
  return d
164
 
165
 
166
+ def _ton_defaults():
167
+ """兼容旧名称:TON 主线已迁到 Binance GRAMUSDT。"""
168
+ return _gram_defaults()
169
+
170
+
171
  def _strc_defaults():
172
+ """STRC:与 BTC/GRAM 同样的多维监控 + 历史自动校准,主行情走 Binance 合约,
173
  并带「休市」属性(股票类,休市价格不变时不提醒)。阈值会被历史校准刷新。"""
174
  d = _btc_defaults()
175
  d.update({
176
+ "symbol": "STRCUSDT",
177
+ "futures_symbol": "STRCUSDT",
178
+ "data_source": "binance_futures",
179
+ "enable_futures": True,
180
  "market_close": True,
181
  "market_close_static_secs": 600,
182
  "price_change": {
 
207
  DEFAULT_CONFIG = {
208
  "coins": {
209
  "BTC": _btc_defaults(),
210
+ "GRAM": _gram_defaults(),
211
  "STRC": _strc_defaults(),
212
  },
213
  "global": {
 
220
  "auto_calibrate_hours": 24,
221
  "last_calibrate_ts": 0,
222
  },
223
+ # 多交易所扩展:主行情走 Binance,Bitget/OKX 仅作为跨所差价提醒
224
  "exchanges": {
225
  "enable_bitget": True,
226
  "enable_okx": True,
 
229
  "enable": True,
230
  "threshold_pct": 0.5, # 任意两所价差超过该百分比即提醒
231
  "pairs": [
 
232
  {"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT", "okx": "BTC-USDT"},
233
+ {"name": "GRAM", "binance": "GRAMUSDT", "bitget": "GRAMUSDT", "okx": "GRAM-USDT"},
234
+ # futures: 前缀表示 Binance U 本位合约价格
235
+ {"name": "STRC", "binance": "futures:STRCUSDT", "bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP"},
236
  ],
237
  },
238
+ # 附加 OKX 合约监控保留给手工自定义;默认不再推送 OKX GRAM/STRC 主线提醒
239
+ "okx_contracts": [],
 
 
 
 
 
 
 
 
 
 
 
240
  },
241
  }
242
 
 
248
  "big_trade": 15, "cum_trade": 20, "spread": 30, "imbalance": 30,
249
  "wall": 90, "wall_vanish": 30, "ma_deviation": 30,
250
  "consecutive": 60, "rsi": 60, "funding": 120, "oi": 30, "liquidation": 10,
251
+ # 跨交易所差价 / 附加合约提醒
252
  "spread_ex": 20, "strc": 15, "okx_funding": 120, "okx_oi": 30, "okx_price": 10,
253
  }
254
 
 
265
  return result
266
 
267
 
268
+ def _coin_defaults_for(name):
269
+ name = str(name).upper()
270
+ if name == "GRAM":
271
+ return _gram_defaults()
272
+ if name == "STRC":
273
+ return _strc_defaults()
274
+ return _btc_defaults()
275
+
276
+
277
+ def _canonical_coin_name(name, coin_cfg):
278
+ name = str(name).upper()
279
+ sym = str((coin_cfg or {}).get("symbol", "")).upper()
280
+ fsym = str((coin_cfg or {}).get("futures_symbol", "")).upper()
281
+ if name == "TON" or sym == "TONUSDT" or fsym == "TONUSDT":
282
+ return "GRAM"
283
+ return name
284
+
285
+
286
+ def _normalize_primary_coin(name, coin_cfg):
287
+ coin = copy.deepcopy(coin_cfg)
288
+ if name == "GRAM":
289
+ coin.update({
290
+ "symbol": "GRAMUSDT",
291
+ "futures_symbol": "GRAMUSDT",
292
+ "data_source": "binance",
293
+ "enable_futures": True,
294
+ "market_close": False,
295
+ })
296
+ elif name == "STRC":
297
+ coin.update({
298
+ "symbol": "STRCUSDT",
299
+ "futures_symbol": "STRCUSDT",
300
+ "data_source": "binance_futures",
301
+ "enable_futures": True,
302
+ "market_close": True,
303
+ })
304
+ return coin
305
+
306
+
307
+ def _default_spread_pairs():
308
+ return {
309
+ "BTC": {"name": "BTC", "binance": "BTCUSDT", "bitget": "BTCUSDT", "okx": "BTC-USDT"},
310
+ "GRAM": {"name": "GRAM", "binance": "GRAMUSDT", "bitget": "GRAMUSDT", "okx": "GRAM-USDT"},
311
+ "STRC": {"name": "STRC", "binance": "futures:STRCUSDT",
312
+ "bitget": "RSTRCUSDT", "okx": "STRC-USDT-SWAP"},
313
+ }
314
+
315
+
316
+ def _normalize_spread_pairs(pairs):
317
+ defaults = _default_spread_pairs()
318
+ normalized, seen = [], set()
319
+
320
+ for pair in pairs or []:
321
+ p = copy.deepcopy(pair)
322
+ name = str(p.get("name") or "").strip()
323
+ name_key = name.upper()
324
+ b_symbol = str(p.get("binance") or "").strip().upper()
325
+ bitget_symbol = str(p.get("bitget") or "").strip().upper()
326
+ okx_symbol = str(p.get("okx") or "").strip().upper()
327
+
328
+ is_gram = (
329
+ name_key in ("TON", "TON/GRAM", "GRAM")
330
+ or b_symbol in ("TONUSDT", "GRAMUSDT")
331
+ or bitget_symbol == "GRAMUSDT"
332
+ or okx_symbol == "GRAM-USDT"
333
+ )
334
+ is_strc = (
335
+ name_key == "STRC"
336
+ or b_symbol in ("STRCUSDT", "FUTURES:STRCUSDT")
337
+ or bitget_symbol in ("RSTRCUSDT", "STRCUSDT")
338
+ or okx_symbol == "STRC-USDT-SWAP"
339
+ )
340
+
341
+ if is_gram:
342
+ p = _deep_merge(defaults["GRAM"], p)
343
+ p.update({"name": "GRAM", "binance": "GRAMUSDT"})
344
+ elif is_strc:
345
+ p = _deep_merge(defaults["STRC"], p)
346
+ p.update({"name": "STRC", "binance": "futures:STRCUSDT"})
347
+ elif name_key == "BTC":
348
+ p = _deep_merge(defaults["BTC"], p)
349
+ p.update({"name": "BTC"})
350
+
351
+ pair_name = str(p.get("name") or "").strip()
352
+ pair_key = pair_name.upper()
353
+ if not pair_name or pair_key in seen:
354
+ continue
355
+ seen.add(pair_key)
356
+ normalized.append(p)
357
+
358
+ for name in ("BTC", "GRAM", "STRC"):
359
+ if name not in seen:
360
+ normalized.append(copy.deepcopy(defaults[name]))
361
+ return normalized
362
+
363
+
364
  def _normalize_exchanges(ex):
365
+ """兼容旧配置:GRAM/STRC 主行情迁到 Binance,Bitget/OKX 只保留差价提醒。"""
 
366
  ex = copy.deepcopy(ex)
367
 
368
+ # 1) spread 对照表确保含 BTC/GRAM/STRC,并迁移旧 TONUSDT / OKX STRC 主线
369
  sp = ex.setdefault("spread", {})
370
+ sp["pairs"] = _normalize_spread_pairs(sp.get("pairs") or [])
 
 
 
 
371
 
372
+ # 2) 默认不再保留 OKX GRAM/STRC 独立合约提醒,避免和 Binance 主行情重复
373
  contracts = ex.get("okx_contracts")
374
+ if not isinstance(contracts, list):
375
+ contracts = []
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
376
  ex.pop("okx_gram_swap", None)
377
  ex.pop("strc", None)
378
+ ex["okx_contracts"] = [c for c in contracts
379
+ if c.get("name") not in ("GRAM", "STRC")
380
+ and c.get("inst_id") not in ("GRAM-USDT-SWAP", "STRC-USDT-SWAP")]
 
381
  return ex
382
 
383
 
 
390
  saved = json.load(f)
391
  # global 直接合并
392
  cfg["global"] = _deep_merge(cfg["global"], saved.get("global", {}))
393
+ # coins:保留用户自定义币种;TON 自动迁移为 GRAM,STRC 主行情迁到 Binance 合约
394
  saved_coins = saved.get("coins", {})
395
  merged_coins = {}
396
  for name, coin_cfg in saved_coins.items():
397
+ canonical = _canonical_coin_name(name, coin_cfg)
398
+ template = _coin_defaults_for(canonical)
399
+ merged = _deep_merge(template, coin_cfg)
400
+ merged = _normalize_primary_coin(canonical, merged)
401
+ if canonical in merged_coins:
402
+ merged = _deep_merge(merged_coins[canonical], merged)
403
+ merged_coins[canonical] = merged
404
  if merged_coins:
405
  cfg["coins"] = merged_coins
406
+ # 主线币种缺失时自动注入
407
+ if "GRAM" not in cfg["coins"]:
408
+ cfg["coins"]["GRAM"] = _gram_defaults()
409
  if "STRC" not in cfg["coins"]:
410
  cfg["coins"]["STRC"] = _strc_defaults()
411
+ for coin_name in ("GRAM", "STRC"):
412
+ cfg["coins"][coin_name] = _normalize_primary_coin(
413
+ coin_name, cfg["coins"][coin_name])
414
  # exchanges:跨所/STRC/OKX 合约配置,缺失字段以默认补全
415
  cfg["exchanges"] = _deep_merge(cfg["exchanges"], saved.get("exchanges", {}))
416
  cfg["exchanges"] = _normalize_exchanges(cfg["exchanges"])
 
581
  return self._get(FAPI_BASE, "/fapi/v1/fundingRate",
582
  {"symbol": symbol, "limit": limit})
583
 
584
+ # 合约行情(用于 Binance 合约作为主行情源的标的,如 STRCUSDT)
585
+ def futures_ticker_24h(self, symbol):
586
+ return self._get(FAPI_BASE, "/fapi/v1/ticker/24hr", {"symbol": symbol})
587
+
588
+ def futures_klines(self, symbol, interval, limit):
589
+ return self._get(FAPI_BASE, "/fapi/v1/klines",
590
+ {"symbol": symbol, "interval": interval, "limit": limit})
591
+
592
+ def futures_klines_history(self, symbol, interval, days, max_calls=40):
593
+ ms = INTERVAL_MS.get(interval)
594
+ if not ms:
595
+ return self.futures_klines(symbol, interval, 1000)
596
+ end = int(time.time() * 1000)
597
+ cursor = end - int(days * 86_400_000)
598
+ out, calls = [], 0
599
+ while cursor < end and calls < max_calls:
600
+ data = self._get(FAPI_BASE, "/fapi/v1/klines",
601
+ {"symbol": symbol, "interval": interval,
602
+ "startTime": cursor, "limit": 1000})
603
+ calls += 1
604
+ if not data:
605
+ break
606
+ out.extend(data)
607
+ nxt = data[-1][0] + ms
608
+ if nxt <= cursor:
609
+ break
610
+ cursor = nxt
611
+ if len(data) < 1000:
612
+ break
613
+ return out
614
+
615
+ def futures_depth(self, symbol, limit=500):
616
+ return self._get(FAPI_BASE, "/fapi/v1/depth", {"symbol": symbol, "limit": limit})
617
+
618
+ def futures_agg_trades(self, symbol, limit=1000):
619
+ return self._get(FAPI_BASE, "/fapi/v1/aggTrades", {"symbol": symbol, "limit": limit})
620
+
621
+
622
+ class BinanceFuturesMarketAdapter:
623
+ """把 Binance U 本位合约行情包装成与 BinanceAPI 现货接口兼容的主行情源。"""
624
+
625
+ def __init__(self, binance_api):
626
+ self.binance = binance_api
627
+
628
+ def ticker_24h(self, symbol):
629
+ return self.binance.futures_ticker_24h(symbol)
630
+
631
+ def klines(self, symbol, interval, limit):
632
+ return self.binance.futures_klines(symbol, interval, limit)
633
+
634
+ def klines_history(self, symbol, interval, days, max_calls=40):
635
+ return self.binance.futures_klines_history(symbol, interval, days, max_calls)
636
+
637
+ def depth(self, symbol, limit=500):
638
+ return self.binance.futures_depth(symbol, limit)
639
+
640
+ def agg_trades(self, symbol, limit=1000):
641
+ return self.binance.futures_agg_trades(symbol, limit)
642
+
643
+ def premium_index(self, symbol):
644
+ return self.binance.premium_index(symbol)
645
+
646
+ def open_interest(self, symbol):
647
+ return self.binance.open_interest(symbol)
648
+
649
+ def funding_rate_history(self, symbol, limit=500):
650
+ return self.binance.funding_rate_history(symbol, limit)
651
+
652
 
653
  # --- 6b. Bitget 行情接口(现货 + STRC 股票代币)---
654
  class BitgetAPI:
 
808
  # --- 6d. OKX → Binance 接口适配器 ---
809
  class OKXMarketAdapter:
810
  """把 OKX v5 行情包装成与 BinanceAPI 兼容的接口,使 CoinEvaluator / calibrate_thresholds
811
+ 可无改动地监控手工配置的 OKX 标的。"""
812
  BAR = {"1m": "1m", "5m": "5m", "15m": "15m", "1h": "1H", "1d": "1D"}
813
 
814
  def __init__(self, okx_api, logger):
 
1150
  out["liq_5m_usdt"] = round(max(avg5 * 0.5, 10000))
1151
  out["liq_severe_usdt"] = round(out["liq_5m_usdt"] * 4)
1152
 
1153
+ # 7) 资金费率:历史费率分位(合约启用时;合约主行情源不受 FUTURES_ENABLED 限制)
1154
  _ds = coin_cfg.get("data_source", "binance")
1155
+ if coin_cfg.get("enable_futures") and (_ds in ("okx", "binance_futures") or FUTURES_ENABLED):
1156
  fr = api.funding_rate_history(coin_cfg["futures_symbol"], 500)
1157
  if fr:
1158
  try:
 
1316
  # 11) RSI
1317
  self._check_rsi(cfg, sym, head, add)
1318
 
1319
+ # 12) 合约类(合约主行情源不受 FUTURES_ENABLED 限制)
1320
+ if cfg.get("enable_futures") and (
1321
+ self.data_source in ("okx", "binance_futures") or FUTURES_ENABLED):
1322
  self._check_futures(cfg, head, add)
1323
 
1324
  snapshot = {
 
1604
 
1605
 
1606
  class CrossExchangeMonitor:
1607
+ """同一资产在 Binance / Bitget / OKX 间的价差提醒,Binance 为主价格基准。"""
1608
 
1609
  def __init__(self, binance_api, bitget_api, okx_api, logger):
1610
  self.binance = binance_api
 
1613
  self.logger = logger
1614
 
1615
  def _binance_price(self, symbol):
1616
+ raw = str(symbol or "").strip()
1617
+ if not raw:
1618
+ return None
1619
+ market = "spot"
1620
+ if ":" in raw:
1621
+ prefix, raw = raw.split(":", 1)
1622
+ if prefix.lower() in ("futures", "fapi", "perp", "swap"):
1623
+ market = "futures"
1624
+ t = (self.binance.futures_ticker_24h(raw)
1625
+ if market == "futures" else self.binance.ticker_24h(raw))
1626
  if t and t.get("lastPrice"):
1627
  try:
1628
  return float(t["lastPrice"])
 
1790
  self._auto_calibrate_needed = not os.path.exists(CONFIG_FILE)
1791
 
1792
  self.api = BinanceAPI(self.log)
1793
+ self.binance_futures_adapter = BinanceFuturesMarketAdapter(self.api)
1794
  self.bitget = BitgetAPI(self.log)
1795
  self.okx = OKXAPI(self.log)
1796
  self.okx_adapter = OKXMarketAdapter(self.okx, self.log)
 
1816
  self.logs.appendleft(entry)
1817
 
1818
  def _api_for(self, coin_cfg):
1819
+ """按币种数据来源选择行情接口(binance / binance_futures / okx)"""
1820
+ if coin_cfg.get("data_source") == "binance_futures":
1821
+ return self.binance_futures_adapter
1822
  if coin_cfg.get("data_source") == "okx":
1823
  return self.okx_adapter
1824
  return self.api
1825
 
1826
  def _futures_symbols(self):
1827
+ # 仅 Binance 来源且全局开启时才订阅币安强平流;OKX 标的不走该 websocket
1828
  if not FUTURES_ENABLED:
1829
  return []
1830
  return [c["futures_symbol"] for c in self.config["coins"].values()
1831
+ if c.get("enable_futures")
1832
+ and c.get("data_source", "binance") in ("binance", "binance_futures")]
1833
 
1834
  def _rebuild_evaluators(self):
1835
  with self.lock:
 
2098
  else:
2099
  st.caption("自定义模式:阈值以下方各币种设置为准,不会被自动覆盖。")
2100
 
2101
+ with st.expander("多交易所设置(Binance 主价格 / Bitget / OKX 差价)", expanded=False):
2102
  ex = cfg.setdefault("exchanges", {})
2103
  ec1, ec2 = st.columns(2)
2104
  with ec1:
2105
  ex["enable_bitget"] = st.checkbox(
2106
  "启用 Bitget", value=ex.get("enable_bitget", True),
2107
+ help="仅用于跨所差价提醒")
2108
  with ec2:
2109
  ex["enable_okx"] = st.checkbox(
2110
  "启用 OKX", value=ex.get("enable_okx", True),
2111
+ help="仅用于跨所差价提醒")
2112
  st.caption("⚠️ 密钥从环境变量读取(BITGET_*/OKX_*)。Bitget/OKX 对部分地区有访问限制,"
2113
  "若 Space 在受限区域可设置 BITGET_BASE / OKX_BASE 指向可用代理。")
2114
 
 
2124
  new_pairs_txt = st.text_area(
2125
  "对照表(每行:名称,Binance,Bitget,OKX;留空表示该所不参与)",
2126
  value=pairs_txt, height=80,
2127
+ help="例:GRAM,GRAMUSDT,GRAMUSDT,GRAM-USDT;Binance 合约价用 futures:STRCUSDT")
2128
  parsed = []
2129
  for line in new_pairs_txt.splitlines():
2130
  cols = [c.strip() for c in line.split(",")]
 
2135
  if parsed:
2136
  sp["pairs"] = parsed
2137
 
 
2138
  contracts = ex.setdefault("okx_contracts", [])
2139
+ if contracts:
2140
+ st.markdown("**附加 OKX 永续合约监控(可选)**")
2141
+ for idx, c in enumerate(contracts):
2142
+ cname = c.get("name") or c.get("inst_id") or f"合约{idx+1}"
2143
+ st.markdown(f"— {cname}")
2144
+ wc1, wc2 = st.columns(2)
2145
+ with wc1:
2146
+ c["enable"] = st.checkbox(
2147
+ "启用监控", value=c.get("enable", True), key=f"okxc_{idx}_en")
2148
+ c["inst_id"] = st.text_input(
2149
+ "合约 instId", value=c.get("inst_id", ""), key=f"okxc_{idx}_inst")
2150
+ c["price_change_pct"] = st.number_input(
2151
+ "合约价短时异动 %", min_value=0.1, max_value=20.0,
2152
+ value=float(c.get("price_change_pct", 2.0)), step=0.1,
2153
+ format="%.1f", key=f"okxc_{idx}_pc")
2154
+ c["oi_change_pct"] = st.number_input(
2155
+ "持仓量变动 %", min_value=0.5, max_value=50.0,
2156
+ value=float(c.get("oi_change_pct", 5.0)), step=0.5,
2157
+ format="%.1f", key=f"okxc_{idx}_oi")
2158
+ with wc2:
2159
+ c["funding_high"] = st.number_input(
2160
+ "资金费率高位 %", min_value=0.001, max_value=1.0,
2161
+ value=float(c.get("funding_high", 0.05)), step=0.001,
2162
+ format="%.3f", key=f"okxc_{idx}_fh")
2163
+ c["funding_neg"] = st.number_input(
2164
+ "资金费率负位 %", min_value=-1.0, max_value=-0.001,
2165
+ value=float(c.get("funding_neg", -0.05)), step=0.001,
2166
+ format="%.3f", key=f"okxc_{idx}_fn")
2167
+ c["amp_24h_pct"] = st.number_input(
2168
+ "24h 振幅阈值 %(0=不监控)", min_value=0.0, max_value=50.0,
2169
+ value=float(c.get("amp_24h_pct", 0.0)), step=0.5,
2170
+ format="%.1f", key=f"okxc_{idx}_amp")
2171
+ c["market_close_aware"] = st.checkbox(
2172
+ "股票类合约(休市价格不变时不提醒)",
2173
+ value=c.get("market_close_aware", False), key=f"okxc_{idx}_mc")
2174
+ if c["market_close_aware"]:
2175
+ c["static_secs"] = st.number_input(
2176
+ "判定休市的静止秒数", min_value=60, max_value=7200,
2177
+ value=int(c.get("static_secs", 600)), step=60, key=f"okxc_{idx}_ss")
2178
 
2179
  coin_names = list(cfg["coins"].keys())
2180
  tabs = st.tabs(coin_names + ["➕ 新增币种"])
 
2182
  for i, name in enumerate(coin_names):
2183
  with tabs[i]:
2184
  coin = cfg["coins"][name]
2185
+ ds_map = {"Binance 现货": "binance", "Binance 合约": "binance_futures", "OKX": "okx"}
2186
+ ds_reverse = {v: k for k, v in ds_map.items()}
2187
+ current_ds = coin.get("data_source", "binance")
2188
+ current_label = ds_reverse.get(current_ds, "Binance 现货")
2189
  ds_label = st.radio(
2190
+ "数据来源", list(ds_map.keys()),
2191
+ index=list(ds_map.keys()).index(current_label),
2192
  horizontal=True, key=f"{name}_ds",
2193
+ help="STRC 可用 Binance 合约主行情;Bitget/OKX 默认仅用于差价提醒")
2194
+ coin["data_source"] = ds_map[ds_label]
2195
  cc1, cc2, cc3 = st.columns(3)
2196
  with cc1:
2197
+ if coin["data_source"] == "okx":
2198
+ sym_label = "OKX instId"
2199
+ elif coin["data_source"] == "binance_futures":
2200
+ sym_label = "Binance 合约交易对"
2201
+ else:
2202
+ sym_label = "现货交易对"
2203
  coin["symbol"] = st.text_input(
2204
  sym_label, value=coin["symbol"], key=f"{name}_symbol")
2205
  with cc2: