diff --git a/lib/instance/templates/settings_panel.html b/lib/instance/templates/settings_panel.html
index 7d68000..dfb9195 100644
--- a/lib/instance/templates/settings_panel.html
+++ b/lib/instance/templates/settings_panel.html
@@ -36,7 +36,7 @@
{% include 'password_settings_panel.html' %}
{% elif tab.key == 'transfer' %}
永续资金划转
-
子账户永续:资金账户与交易账户之间划转 USDT.
+
账户内:资金账户与交易账户之间划转 USDT.
{% include 'instance_transfer_panel.html' %}
{% elif tab.key == 'export' %}
数据导出
diff --git a/lib/options/options_register.py b/lib/options/options_register.py
index 9ad75fc..b8e53fd 100644
--- a/lib/options/options_register.py
+++ b/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():
diff --git a/lib/options/templates/options_panel.html b/lib/options/templates/options_panel.html
index 4fff1e7..1841879 100644
--- a/lib/options/templates/options_panel.html
+++ b/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 %}
-
期权 API 未启用:请在 crypto_monitor_okx/.env 设置 OKX_OPTIONS_ENABLED=true 及主账户 OKX_OPTIONS_API_*,然后 pm2 restart crypto_okx --update-env.
+
期权未启用:请在 crypto_monitor_okx/.env 设置 OKX_OPTIONS_ENABLED=true 及 OKX_API_*(永续与期权共用),然后 pm2 restart crypto_okx --update-env.
{% endif %}
{% if options_enabled and options_open_allowed is defined and not options_open_allowed %}
当前交易模式为对冲(永期/期期),不可单独开期权;持仓可在此查看/平仓.切换请到 env「交易模式」.
diff --git a/lib/options/templates/options_settings_panel.html b/lib/options/templates/options_settings_panel.html
index 36bdca3..709408a 100644
--- a/lib/options/templates/options_settings_panel.html
+++ b/lib/options/templates/options_settings_panel.html
@@ -1,4 +1,3 @@
{# 期权设置脚本挂载点(卡片在 settings_panel 中拆分) #}
-
-
+
+
diff --git a/lib/options/templates/options_settings_swap.html b/lib/options/templates/options_settings_swap.html
index 86459e9..418144b 100644
--- a/lib/options/templates/options_settings_swap.html
+++ b/lib/options/templates/options_settings_swap.html
@@ -1,5 +1,5 @@
-
主账户资金账户:USDT ↔ USDC 现货市价单.
+
账户资金账户:USDT ↔ USDC 现货市价单.