diff --git a/lib/options/options_hub_lib.py b/lib/options/options_hub_lib.py
index 973739b..4e0cdd8 100644
--- a/lib/options/options_hub_lib.py
+++ b/lib/options/options_hub_lib.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import os
from typing import Any
@@ -156,6 +157,7 @@ def build_options_hub_snapshot(cfg: dict[str, Any]) -> dict[str, Any]:
"max_active_positions": options_max_active_positions(),
"options_margin_mode": margin_mode,
"options_margin_mode_label": "币本位" if margin_mode == "coin" else "USDC",
+ "options_underly": (os.getenv("OKX_OPTIONS_DEFAULT_UNDERLY") or "ETH").strip().upper() or "ETH",
"coin_budget": coin_budget,
"bridge_status": bridge_status,
"open_bridges": open_bridges,
diff --git a/manual_trading_hub/static/app.js b/manual_trading_hub/static/app.js
index 755a13f..610a817 100644
--- a/manual_trading_hub/static/app.js
+++ b/manual_trading_hub/static/app.js
@@ -3882,27 +3882,59 @@
};
}
- function renderStatRow(funding, trading, upnl, kind) {
+ function renderStatRow(funding, trading, upnl, kind, optMeta) {
if (!showAccountPnlPref()) return "";
const isOpt = kind === "options";
const fundLabel = isOpt ? "期权资金账户" : "资金账户";
const tradeLabel = isOpt ? "期权交易账户" : "交易账户";
const pnlLabel = isOpt ? "期权浮盈" : "浮盈合计";
const rowCls = isOpt ? "stat-row stat-row-options" : "stat-row";
+ let fundTxt = `${fmt(funding, 2)}
U`;
+ let tradeTxt = `${fmt(trading, 2)}
U`;
+ if (isOpt && optMeta && (optMeta.options_margin_mode === "coin" || optMeta.margin_mode === "coin")) {
+ const underly = String(optMeta.options_underly || "ETH").toUpperCase();
+ fundTxt = formatCoinOptFunds(optMeta, "funding", underly);
+ tradeTxt = formatCoinOptFunds(optMeta, "trading", underly);
+ }
return `
-
${fundLabel}
${fmt(funding, 2)} U
-
${tradeLabel}
${fmt(trading, 2)} U
+
+
${pnlLabel}
${fmt(upnl, 2)}
`;
}
+ function formatCoinOptFunds(opt, side, underly) {
+ const bal = (opt && opt.balances) || {};
+ const usdt = side === "funding"
+ ? (bal.funding_usdt != null ? bal.funding_usdt : opt.funding_usdt)
+ : (bal.trading_usdt != null ? bal.trading_usdt : opt.trading_usdt);
+ let coin = side === "funding"
+ ? (bal.funding_eth != null ? bal.funding_eth : bal.funding_btc)
+ : (bal.trading_eth != null ? bal.trading_eth : bal.trading_btc);
+ if (underly === "BTC" && side === "funding" && bal.funding_btc != null) coin = bal.funding_btc;
+ if (underly === "BTC" && side === "trading" && bal.trading_btc != null) coin = bal.trading_btc;
+ const parts = [];
+ if (usdt != null && usdt !== "") {
+ const n = Number(usdt);
+ if (!Number.isNaN(n)) parts.push(`${n.toFixed(2)} USDT`);
+ }
+ if (coin != null && coin !== "") {
+ const n = Number(coin);
+ if (!Number.isNaN(n)) {
+ const txt = String(n.toFixed(6)).replace(/\.?0+$/, "");
+ parts.push(`${txt || "0"} ${underly}`);
+ }
+ }
+ return parts.length ? parts.join(" / ") : "—";
+ }
+
function renderAccountStatRow(row, ag) {
return renderStatRow(row.funding_usdt, row.trading_usdt, ag.total_unrealized_pnl);
}
function renderOptionsAccountStatRow(opt) {
const bal = optionsBalanceFields(opt);
- return renderStatRow(bal.funding, bal.trading, bal.upl, "options");
+ return renderStatRow(bal.funding, bal.trading, bal.upl, "options", opt || {});
}
function shortOptionsInst(instId) {
diff --git a/tests/test_instance_display_env_settings.py b/tests/test_instance_display_env_settings.py
index 361bc02..ec68a9e 100644
--- a/tests/test_instance_display_env_settings.py
+++ b/tests/test_instance_display_env_settings.py
@@ -91,6 +91,7 @@ class TestEnvSchema(unittest.TestCase):
"OKX_POS_MODE",
"POSITION_SIZING_MODE",
"TRADE_DIRECTION",
+ "OKX_OPTIONS_MARGIN_MODE",
):
self.assertIn(key, SELECT_OPTIONS)
@@ -101,9 +102,19 @@ class TestEnvSchema(unittest.TestCase):
self.skipTest("missing okx .env.example")
groups = build_env_ui_payload("okx", example, env_path if os.path.isfile(env_path) else example)
by_key = {f["key"]: f for g in groups for f in g["fields"]}
- for key in ("OKX_TD_MODE", "OKX_POS_MODE", "POSITION_SIZING_MODE", "TRADE_DIRECTION"):
+ for key in (
+ "OKX_TD_MODE",
+ "OKX_POS_MODE",
+ "POSITION_SIZING_MODE",
+ "TRADE_DIRECTION",
+ "OKX_OPTIONS_MARGIN_MODE",
+ ):
self.assertEqual(by_key[key]["type"], "select")
self.assertTrue(by_key[key]["options"])
+ self.assertEqual(
+ {o["value"] for o in by_key["OKX_OPTIONS_MARGIN_MODE"]["options"]},
+ {"usdc", "coin"},
+ )
self.assertIn("KEY_AUTO_ORDER_ENABLED", by_key)
self.assertEqual(by_key["KEY_AUTO_ORDER_ENABLED"]["label"], "关键位自动单")
self.assertEqual(by_key["KEY_AUTO_ORDER_ENABLED"]["type"], "bool")
@@ -146,6 +157,10 @@ class TestShowPerpFunds(unittest.TestCase):
self.assertEqual(options_funding_label(12.5, 99.0), "12.50 USDC")
self.assertEqual(options_funding_label(0.0, 50.0), "0.00 USDC")
self.assertEqual(options_funding_label(None, 10.0), "—")
+ self.assertEqual(
+ options_funding_label(1.0, 20.0, 0.01, "coin", "ETH"),
+ "20.00 USDT / 0.01 ETH",
+ )
if __name__ == "__main__":
diff --git a/tests/test_instance_header_stats_lib.py b/tests/test_instance_header_stats_lib.py
index 6b7db32..c5a3c46 100644
--- a/tests/test_instance_header_stats_lib.py
+++ b/tests/test_instance_header_stats_lib.py
@@ -27,17 +27,22 @@ class TestHeaderStatsLib(unittest.TestCase):
def test_total_funds_usdt(self):
self.assertEqual(total_funds_usdt(100.5, 59.27), 159.77)
- self.assertIsNone(total_funds_usdt(None, 10))
+ self.assertEqual(total_funds_usdt(None, 10), 10.0)
+ self.assertIsNone(total_funds_usdt(None, None))
self.assertEqual(
total_funds_usdt(100, 50, options_trading_usdc=0.2, options_trading_usdt=10),
160.2,
)
def test_options_funding_label(self):
- self.assertEqual(options_funding_label(1.5, 10), "1.50 USDC · 10.00 USDT")
+ self.assertEqual(options_funding_label(1.5, 10), "1.50 USDC")
self.assertEqual(options_funding_label(10.19, 0), "10.19 USDC")
- self.assertEqual(options_funding_label(None, 10), "10.00 USDT")
+ self.assertEqual(options_funding_label(None, 10), "—")
self.assertEqual(options_funding_label(None, None), "—")
+ self.assertEqual(
+ options_funding_label(None, 12.5, 0.004321, "coin", "ETH"),
+ "12.50 USDT / 0.004321 ETH",
+ )
if __name__ == "__main__":