Merge OKX dual APIs into one OKX_API_* account for perp and options.

Co-authored-by: Cursor <cursoragent@cursor.com>

lib/options/options_register.py

@@ -92,12 +92,10 @@ def _build_cfg(app_module: Any) -> dict[str, Any]:
         quote_option_contract,
         spot_market_swap_usdt_usdc,
         transfer_ccy,
-        transfer_main_sub_account,
     )
 
     return {
         "enabled": _env_bool("OKX_OPTIONS_ENABLED", False),
-        "sub_account_name": (os.getenv("OKX_SUB_ACCOUNT_NAME") or "").strip(),
         "get_db": app_module.get_db,
         "login_required": app_module.login_required,
         "exchange_options": getattr(app_module, "exchange_options", None),
@@ -132,7 +130,6 @@ def _build_cfg(app_module: Any) -> dict[str, Any]:
         "execute_convert": execute_convert,
         "transfer_ccy": transfer_ccy,
         "spot_market_swap_usdt_usdc": spot_market_swap_usdt_usdc,
-        "transfer_main_sub_account": transfer_main_sub_account,
         "options_api_ready": options_api_ready,
         "app_module": app_module,
     }
@@ -357,13 +354,7 @@ def register_options_routes(app: Flask, cfg: dict[str, Any]) -> None:
         if ex is None:
             return jsonify({"ok": False, "msg": err})
         force = (request.args.get("force") or "").strip().lower() in ("1", "true", "yes")
-        scope = (request.args.get("scope") or "main").strip().lower()
-        bal = cfg["fetch_options_balances"](
-            ex,
-            force=force,
-            scope=scope,
-            sub_acct=cfg.get("sub_account_name") or "",
-        )
+        bal = cfg["fetch_options_balances"](ex, force=force, scope="main")
         return jsonify({"ok": True, **bal, "trade_budget": cfg["trade_budget"]})
 
     @app.route("/api/options/chain")
@@ -1272,54 +1263,6 @@ def register_options_routes(app: Flask, cfg: dict[str, Any]) -> None:
             _mark_balances_stale(cfg)
         return jsonify(result)
 
-    @app.route("/api/options/cross-transfer", methods=["POST"])
-    @lr
-    def api_options_cross_transfer():
-        ex, err = _require_options_ex(cfg)
-        if ex is None:
-            return jsonify({"ok": False, "msg": err})
-        data = request.get_json(silent=True) or {}
-        ccy = (data.get("ccy") or "USDT").upper()
-        direction = (data.get("direction") or "sub_to_main").strip()
-        from_account = (data.get("from_account") or data.get("account") or "funding").strip()
-        to_account = (data.get("to_account") or data.get("account") or "funding").strip()
-        try:
-            amount = float(data.get("amount"))
-        except (TypeError, ValueError):
-            return jsonify({"ok": False, "msg": "数量无效"})
-        main_to_sub = direction == "main_to_sub"
-        result = cfg["transfer_main_sub_account"](
-            ex,
-            ccy=ccy,
-            amount=amount,
-            sub_acct=cfg.get("sub_account_name") or "",
-            main_to_sub=main_to_sub,
-            from_account=from_account,
-            to_account=to_account,
-        )
-        if result.get("ok"):
-            conn = cfg["get_db"]()
-            try:
-                init_options_tables(conn)
-                conn.execute(
-                    """
-                    INSERT INTO options_transfer_log (ccy, amount, from_account, to_account, status, message)
-                    VALUES (?, ?, ?, ?, 'ok', ?)
-                    """,
-                    (
-                        ccy,
-                        amount,
-                        ("main" if main_to_sub else "sub") + ":" + from_account,
-                        ("sub" if main_to_sub else "main") + ":" + to_account,
-                        "cross",
-                    ),
-                )
-                conn.commit()
-            finally:
-                conn.close()
-            _mark_balances_stale(cfg)
-        return jsonify(result)
-
     @app.route("/api/options/history")
     @lr
     def api_options_history():

lib/options/templates/options_panel.html

@@ -4,7 +4,7 @@
      data-trade-budget="{{ options_trade_budget | default(10) }}"
      data-ask-liq-filter="{% if options_chain_ask_liq_filter is defined %}{{ '1' if options_chain_ask_liq_filter else '0' }}{% else %}1{% endif %}">
     {% if not options_enabled %}
-    <div class="flash" style="margin-bottom:12px">期权 API 未启用:请在 <code>crypto_monitor_okx/.env</code> 设置 <code>OKX_OPTIONS_ENABLED=true</code> 及主账户 <code>OKX_OPTIONS_API_*</code>,然后 <code>pm2 restart crypto_okx --update-env</code>.</div>
+    <div class="flash" style="margin-bottom:12px">期权未启用:请在 <code>crypto_monitor_okx/.env</code> 设置 <code>OKX_OPTIONS_ENABLED=true</code> 及 <code>OKX_API_*</code>(永续与期权共用),然后 <code>pm2 restart crypto_okx --update-env</code>.</div>
     {% endif %}
     {% if options_enabled and options_open_allowed is defined and not options_open_allowed %}
     <div class="flash" style="margin-bottom:12px">当前交易模式为对冲(永期/期期),不可单独开期权;持仓可在此查看/平仓.切换请到 env「交易模式」.</div>

lib/options/templates/options_settings_panel.html

@@ -1,4 +1,3 @@
 {# 期权设置脚本挂载点(卡片在 settings_panel 中拆分) #}
-<div id="options-settings-root" hidden
-     data-sub-account="{{ instance_settings.options_sub_account | default('', true) }}"></div>
-<script src="/static/options_settings.js?v=9"></script>
+<div id="options-settings-root" hidden></div>
+<script src="/static/options_settings.js?v=10"></script>

lib/options/templates/options_settings_swap.html

@@ -1,5 +1,5 @@
 <div class="options-settings-section">
-    <p class="options-settings-hint">主账户资金账户:USDT ↔ USDC 现货市价单.</p>
+    <p class="options-settings-hint">账户资金账户:USDT ↔ USDC 现货市价单.</p>
     <div class="form-row settings-transfer-form options-settings-row">
         <input type="text" name="username" autocomplete="username" tabindex="-1" aria-hidden="true"
                style="position:absolute;left:-9999px;width:1px;height:1px;opacity:0" value="">

lib/options/templates/options_settings_transfer.html

@@ -1,5 +1,5 @@
 <div class="options-settings-section">
-    <div class="options-settings-subtitle">主账户内</div>
+    <div class="options-settings-subtitle">账户内划转</div>
     <div class="form-row settings-transfer-form options-settings-row">
         <input type="text" name="username" autocomplete="username" tabindex="-1" aria-hidden="true"
                style="position:absolute;left:-9999px;width:1px;height:1px;opacity:0" value="">
@@ -22,35 +22,3 @@
     </div>
     <div id="opt-set-int-msg" class="options-settings-msg muted"></div>
 </div>
-
-<div class="options-settings-section">
-    <div class="options-settings-subtitle">
-        主子账户
-        <span class="muted">({{ instance_settings.options_sub_account or '未配置' }})</span>
-    </div>
-    <div class="form-row settings-transfer-form options-settings-row">
-        <input type="text" name="username" autocomplete="username" tabindex="-1" aria-hidden="true"
-               style="position:absolute;left:-9999px;width:1px;height:1px;opacity:0" value="">
-        <select id="opt-set-cross-dir" aria-label="主子方向" autocomplete="off">
-            <option value="main_to_sub" selected>主 → 子</option>
-            <option value="sub_to_main">子 → 主</option>
-        </select>
-        <select id="opt-set-cross-ccy" aria-label="币种">
-            <option value="USDT" selected>USDT</option>
-            <option value="USDC">USDC</option>
-        </select>
-        <select id="opt-set-cross-from" aria-label="划出账户">
-            <option value="funding" selected>from: 资金</option>
-            <option value="trading">from: 交易</option>
-        </select>
-        <select id="opt-set-cross-to" aria-label="划入账户">
-            <option value="trading" selected>to: 交易</option>
-            <option value="funding">to: 资金</option>
-        </select>
-        <input type="number" id="opt-set-cross-amount" name="cm_opt_cross_amt" min="0.01" step="0.01" placeholder="数量"
-               autocomplete="off" inputmode="decimal" data-lpignore="true" data-1p-ignore="true" data-bwignore="true" data-form-type="other" readonly>
-        <button type="button" class="btn-secondary btn-sm" id="opt-set-cross-all-btn">全部划转</button>
-        <button type="button" class="btn-primary btn-sm" id="opt-set-cross-btn">划转</button>
-    </div>
-    <div id="opt-set-cross-msg" class="options-settings-msg muted"></div>
-</div>