popov/gogo2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed TZ

Browse Source
This commit is contained in:
Dobromir Popov
2025-08-08 02:12:01 +03:00
parent b80e1c1eba
commit 6214bc2e9f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/trading_executor.py
View File

@ -1452,8 +1452,8 @@ class TradingExecutor:
# Calculate position size in USD
position_size_usd = position.quantity * position.entry_price
# Calculate gross PnL (before fees) with leverage
gross_pnl = (current_price - position.entry_price) * position.quantity * leverage
# Calculate gross PnL (before fees) with leverage - SHORT profits when price falls
gross_pnl = (position.entry_price - current_price) * position.quantity * leverage
# Calculate net PnL (after fees)
net_pnl = gross_pnl - simulated_fees
@ -1543,8 +1543,8 @@ class TradingExecutor:
# Calculate position size in USD
position_size_usd = position.quantity * position.entry_price
# Calculate gross PnL (before fees) with leverage
gross_pnl = (current_price - position.entry_price) * position.quantity * leverage
# Calculate gross PnL (before fees) with leverage - SHORT profits when price falls
gross_pnl = (position.entry_price - current_price) * position.quantity * leverage
# Calculate net PnL (after fees)
net_pnl = gross_pnl - fees
@ -1630,7 +1630,7 @@ class TradingExecutor:
# Calculate position size in USD
position_size_usd = position.quantity * position.entry_price
# Calculate gross PnL (before fees) with leverage
# Calculate gross PnL (before fees) with leverage - LONG profits when price rises
gross_pnl = (current_price - position.entry_price) * position.quantity * leverage
# Calculate net PnL (after fees)

3
web/clean_dashboard.py
View File

@ -9059,7 +9059,8 @@ class CleanTradingDashboard:
kline = data['k']
tick_record = {
'symbol': 'ETHUSDT',
'datetime': datetime.fromtimestamp(int(kline['t']) / 1000),
# Store as UTC-aware to avoid local/UTC mixing
'datetime': datetime.fromtimestamp(int(kline['t']) / 1000, tz=timezone.utc),
'open': float(kline['o']),
'high': float(kline['h']),
'low': float(kline['l']),