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

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

lib/instance/instance_embed_context_lib.py

@@ -104,12 +104,14 @@ def options_funding_label(
     funding_usdc: float | None,
     funding_usdt: float | None = None,
 ) -> str:
-    parts: list[str] = []
-    if funding_usdc is not None and float(funding_usdc) > 0:
-        parts.append(f"{float(funding_usdc):.2f} USDC")
-    if funding_usdt is not None and float(funding_usdt) > 0:
-        parts.append(f"{float(funding_usdt):.2f} USDT")
-    return " · ".join(parts) if parts else "—"
+    """期权侧顶栏仅展示 USDC(USDT 归永续资金/交易账户).funding_usdt 参数保留兼容,忽略."""
+    _ = funding_usdt
+    if funding_usdc is None:
+        return "—"
+    try:
+        return f"{float(funding_usdc):.2f} USDC"
+    except (TypeError, ValueError):
+        return "—"
 
 
 def total_funds_usdt(

lib/instance/instance_settings_lib.py

@@ -158,24 +158,20 @@ def build_instance_settings_view(
         )
 
     if (exchange_key or "").strip().lower() == "okx" and _env_bool("OKX_OPTIONS_ENABLED", False):
-        opt_key = (os.getenv("OKX_OPTIONS_API_KEY") or "").strip()
+        api_key = (os.getenv("OKX_API_KEY") or "").strip()
         sections.append(
             {
                 "title": "期权设置",
                 "rows": [
                     _row("期权模块", "已启用"),
                     _row(
-                        "期权 API",
-                        f"已配置(…{opt_key[-4:]})" if len(opt_key) >= 4 else "未配置",
-                    ),
-                    _row(
-                        "子账户",
-                        (os.getenv("OKX_SUB_ACCOUNT_NAME") or "").strip() or "未配置 OKX_SUB_ACCOUNT_NAME",
-                        "主/子账户划转用",
+                        "账户 API",
+                        f"已配置(…{api_key[-4:]})" if len(api_key) >= 4 else "未配置 OKX_API_*",
+                        "永续与期权共用 OKX_API_*",
                     ),
                     _row(
                         "说明",
-                        "币种兑换与账户划转到右侧「期权设置」卡片操作",
+                        "币种兑换与账户内划转到右侧「期权设置」卡片操作",
                     ),
                 ],
             }
@@ -196,7 +192,6 @@ def build_instance_settings_view(
         "show_transfer": (exchange_key or "").strip().lower() in ("gate", "binance", "okx"),
         "options_settings_enabled": (exchange_key or "").strip().lower() == "okx"
         and _env_bool("OKX_OPTIONS_ENABLED", False),
-        "options_sub_account": (os.getenv("OKX_SUB_ACCOUNT_NAME") or "").strip(),
         "auto_transfer_enabled": auto_transfer_on,
         "auto_transfer_bj_hour": _env_int("AUTO_TRANSFER_BJ_HOUR", 8),
         "auto_transfer_amount": _env_float("AUTO_TRANSFER_AMOUNT", 30),

lib/instance/templates/embed_boot_scripts.html

@@ -1137,10 +1137,11 @@ function paintRealtimePnlFromSnapshot(data){
 }
 
 function formatOptionsFundingLabel(usdc, usdt) {
-    const parts = [];
-    if (usdc !== null && usdc !== undefined && Number(usdc) > 0) parts.push(`${Number(usdc).toFixed(2)} USDC`);
-    if (usdt !== null && usdt !== undefined && Number(usdt) > 0) parts.push(`${Number(usdt).toFixed(2)} USDT`);
-    return parts.length ? parts.join(" · ") : "—";
+    // 期权侧顶栏仅 USDC;usdt 参数忽略(USDT 在永续资金/交易账户)
+    if (usdc === null || usdc === undefined || usdc === "") return "—";
+    const n = Number(usdc);
+    if (Number.isNaN(n)) return "—";
+    return `${n.toFixed(2)} USDC`;
 }
 
 function setFundsFieldText(field, text){

lib/instance/templates/index.html

@@ -1614,10 +1614,11 @@ function paintRealtimePnlFromSnapshot(data){
 }
 
 function formatOptionsFundingLabel(usdc, usdt) {
-    const parts = [];
-    if (usdc !== null && usdc !== undefined && Number(usdc) > 0) parts.push(`${Number(usdc).toFixed(2)} USDC`);
-    if (usdt !== null && usdt !== undefined && Number(usdt) > 0) parts.push(`${Number(usdt).toFixed(2)} USDT`);
-    return parts.length ? parts.join(" · ") : "—";
+    // 期权侧顶栏仅 USDC;usdt 参数忽略(USDT 在永续资金/交易账户)
+    if(usdc == null || usdc === "") return "—";
+    const n = Number(usdc);
+    if(Number.isNaN(n)) return "—";
+    return `${n.toFixed(2)} USDC`;
 }
 
 function setFundsFieldText(field, text){

lib/instance/templates/instance_header_stats.html

@@ -35,11 +35,11 @@
     {% if options_enabled %}
     <div class="stat-strip-item">
         <div class="label">期权资金账户</div>
-        <div class="value" id="options-funding-usdc" data-funds-field="options-funding-usdc">{{ options_funding_label(options_funding_usdc, options_funding_usdt) }}</div>
+        <div class="value" id="options-funding-usdc" data-funds-field="options-funding-usdc">{{ options_funding_label(options_funding_usdc) }}</div>
     </div>
     <div class="stat-strip-item">
         <div class="label">期权交易账户</div>
-        <div class="value" id="options-trading-usdc" data-funds-field="options-trading-usdc">{{ options_funding_label(options_trading_usdc, options_trading_usdt) }}</div>
+        <div class="value" id="options-trading-usdc" data-funds-field="options-trading-usdc">{{ options_funding_label(options_trading_usdc) }}</div>
     </div>
     {% endif %}
     <div class="stat-strip-item stat-strip-item--pnl">

lib/instance/templates/settings_panel.html

@@ -36,7 +36,7 @@
                     {% include 'password_settings_panel.html' %}
                 {% elif tab.key == 'transfer' %}
                     <h2>永续资金划转</h2>
-                    <p class="settings-subcard-desc">子账户永续:资金账户与交易账户之间划转 USDT.</p>
+                    <p class="settings-subcard-desc">账户内:资金账户与交易账户之间划转 USDT.</p>
                     {% include 'instance_transfer_panel.html' %}
                 {% elif tab.key == 'export' %}
                     <h2>数据导出</h2>