币本位盈亏双显ETH/U(按指数换算);平仓卖币改为卖光交易户可用余额
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -7076,9 +7076,10 @@ def api_account_snapshot():
|
||||
options_trading_btc = None
|
||||
options_margin_mode = "coin"
|
||||
options_underly = "ETH"
|
||||
options_index_px = None
|
||||
if OKX_OPTIONS_ENABLED and exchange_options.apiKey:
|
||||
try:
|
||||
from lib.exchange.okx_options_lib import options_header_balance_pack
|
||||
from lib.exchange.okx_options_lib import fetch_index_price, options_header_balance_pack
|
||||
|
||||
_op = options_header_balance_pack(exchange_options, force=force_refresh)
|
||||
options_trading_usdc = _op.get("trading_usdc")
|
||||
@@ -7090,6 +7091,7 @@ def api_account_snapshot():
|
||||
options_trading_btc = _op.get("trading_btc")
|
||||
options_margin_mode = _op.get("options_margin_mode") or "coin"
|
||||
options_underly = _op.get("options_underly") or "ETH"
|
||||
options_index_px = fetch_index_price(exchange_options, options_underly)
|
||||
except Exception:
|
||||
options_trading_usdc = None
|
||||
options_funding_usdc = None
|
||||
@@ -7100,6 +7102,7 @@ def api_account_snapshot():
|
||||
options_trading_btc = None
|
||||
options_margin_mode = "coin"
|
||||
options_underly = "ETH"
|
||||
options_index_px = None
|
||||
recommended_capital = get_recommended_capital(current_capital)
|
||||
from lib.strategy.strategy_trade_labels import count_position_limit_active_monitors
|
||||
|
||||
@@ -7187,6 +7190,7 @@ def api_account_snapshot():
|
||||
"options_trading_btc": options_trading_btc,
|
||||
"options_margin_mode": options_margin_mode,
|
||||
"options_underly": options_underly,
|
||||
"options_index_px": options_index_px,
|
||||
"total_funds": total_funds_usdt(
|
||||
funding_usdt if _show_perp_funds else None,
|
||||
current_capital if _show_perp_funds else None,
|
||||
@@ -7586,9 +7590,14 @@ def api_price_snapshot():
|
||||
)
|
||||
|
||||
options_unrealized_pnl = None
|
||||
options_index_px = None
|
||||
options_margin_mode = None
|
||||
options_underly = None
|
||||
if OKX_OPTIONS_ENABLED and exchange_options.apiKey:
|
||||
try:
|
||||
from lib.options.options_positions_lib import sum_options_net_pnl_usdc
|
||||
from lib.options.options_margin_mode_lib import normalize_options_margin_mode
|
||||
from lib.exchange.okx_options_lib import fetch_index_price
|
||||
|
||||
opt_cfg = app.extensions.get("options_cfg")
|
||||
if opt_cfg:
|
||||
@@ -7597,6 +7606,9 @@ def api_price_snapshot():
|
||||
from lib.exchange.okx_options_lib import fetch_options_unrealized_pnl_usdc
|
||||
|
||||
options_unrealized_pnl = fetch_options_unrealized_pnl_usdc(exchange_options)
|
||||
options_margin_mode = normalize_options_margin_mode()
|
||||
options_underly = (os.getenv("OKX_OPTIONS_DEFAULT_UNDERLY") or "ETH").strip().upper() or "ETH"
|
||||
options_index_px = fetch_index_price(exchange_options, options_underly)
|
||||
except Exception:
|
||||
options_unrealized_pnl = None
|
||||
|
||||
@@ -7607,6 +7619,9 @@ def api_price_snapshot():
|
||||
"position_marks": position_marks,
|
||||
"positions_raw_count": len(all_swap_positions),
|
||||
"options_unrealized_pnl": options_unrealized_pnl,
|
||||
"options_index_px": options_index_px,
|
||||
"options_margin_mode": options_margin_mode,
|
||||
"options_underly": options_underly,
|
||||
**force_close_template_context(
|
||||
FORCE_CLOSE_ENABLED,
|
||||
FORCE_CLOSE_BJ_HOUR,
|
||||
|
||||
Reference in New Issue
Block a user