From 03a4e179f7e266587c8d6d081309b55c677032e6 Mon Sep 17 00:00:00 2001 From: cryptooda Date: Thu, 17 Jul 2025 22:29:13 +0700 Subject: [PATCH] Fix Wallet balances --- src/Managing.Application/Backtesting/Backtester.cs | 3 ++- src/Managing.Application/Bots/TradingBot.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Managing.Application/Backtesting/Backtester.cs b/src/Managing.Application/Backtesting/Backtester.cs index a96294c..67da89c 100644 --- a/src/Managing.Application/Backtesting/Backtester.cs +++ b/src/Managing.Application/Backtesting/Backtester.cs @@ -296,7 +296,8 @@ namespace Managing.Application.Backtesting var optimizedMoneyManagement = TradingBox.GetBestMoneyManagement(candles, bot.Positions, config.MoneyManagement); var stats = TradingHelpers.GetStatistics(bot.WalletBalances); - var growthPercentage = TradingHelpers.GetGrowthFromInitalBalance(config.BotTradingBalance, finalPnl); + var growthPercentage = + TradingHelpers.GetGrowthFromInitalBalance(bot.WalletBalances.FirstOrDefault().Value, finalPnl); var hodlPercentage = TradingHelpers.GetHodlPercentage(candles[0], candles.Last()); var fees = bot.GetTotalFees(); diff --git a/src/Managing.Application/Bots/TradingBot.cs b/src/Managing.Application/Bots/TradingBot.cs index 6401b60..45d2bdf 100644 --- a/src/Managing.Application/Bots/TradingBot.cs +++ b/src/Managing.Application/Bots/TradingBot.cs @@ -1313,7 +1313,7 @@ public class TradingBot : Bot, ITradingBot public decimal GetProfitAndLoss() { - var pnl = Positions.Where(p => p.ProfitAndLoss != null).Sum(p => p.ProfitAndLoss.Realized); + var pnl = Positions.Where(p => p.ProfitAndLoss != null && p.IsFinished()).Sum(p => p.ProfitAndLoss.Realized); return pnl - GetTotalFees(); }