Oda/managing-apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update vitejs + fix bot saving

Browse Source
This commit is contained in:
cryptooda
2025-05-11 20:23:06 +07:00
parent 65c4ec4957
commit 84e09b32a2
20 changed files with 220 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Managing.Api/Controllers/BacktestController.cs
View File

@@ -125,7 +125,7 @@ public class BacktestController : BaseController
DateTime endDate,
MoneyManagement? moneyManagement = null,
bool save = false,
decimal cooldownPeriod = 1,
int cooldownPeriod = 1,
int maxLossStreak = 0)
{
if (string.IsNullOrEmpty(accountName))

10
src/Managing.Api/Controllers/BotController.cs
View File

@@ -1,9 +1,9 @@
using Managing.Application.Abstractions;
using Managing.Application.Abstractions.Services;
using Managing.Application.Bots;
using Managing.Application.Hubs;
using Managing.Application.ManageBot.Commands;
using Managing.Common;
using Managing.Domain.Bots;
using Managing.Domain.Trades;
using MediatR;
using Microsoft.AspNetCore.Authorization;
@@ -142,10 +142,13 @@ public class BotController : BaseController
BotTradingBalance = request.InitialTradingBalance,
BotType = request.BotType,
CooldownPeriod = request.CooldownPeriod,
MaxLossStreak = request.MaxLossStreak
MaxLossStreak = request.MaxLossStreak,
IsForBacktest = false,
FlipPosition = request.BotType == BotType.FlippingBot,
Name = request.Name
};
var result = await _mediator.Send(new StartBotCommand(config, request.Identifier, user));
var result = await _mediator.Send(new StartBotCommand(config, request.Name, user));
await NotifyBotSubscriberAsync();
return Ok(result);
@@ -627,4 +630,5 @@ public class StartBotRequest
public int CooldownPeriod { get; set; }
public int MaxLossStreak { get; set; }
public string Name { get; set; }
}

49
src/Managing.Application/Backtesting/Backtester.cs
View File

@@ -1,11 +1,11 @@
using Managing.Application.Abstractions;
using Managing.Application.Abstractions.Repositories;
using Managing.Application.Abstractions.Services;
using Managing.Application.Bots;
using Managing.Core;
using Managing.Core.FixedSizedQueue;
using Managing.Domain.Accounts;
using Managing.Domain.Backtests;
using Managing.Domain.Bots;
using Managing.Domain.Candles;
using Managing.Domain.MoneyManagements;
using Managing.Domain.Scenarios;
@@ -86,10 +86,10 @@ namespace Managing.Application.Backtesting
var scalpingBot = _botFactory.CreateBacktestScalpingBot(config);
scalpingBot.LoadScenario(scenario.Name);
scalpingBot.User = user;
await scalpingBot.LoadAccount();
var candles = initialCandles ?? GetCandles(account, ticker, timeframe, startDate, endDate);
var result = GetBacktestingResult(ticker, scenario, timeframe, scalpingBot, candles, balance, account,
moneyManagement);
var result = GetBacktestingResult(config, scalpingBot, candles);
if (user != null)
{
@@ -141,11 +141,11 @@ namespace Managing.Application.Backtesting
var flippingBot = _botFactory.CreateBacktestFlippingBot(config);
flippingBot.LoadScenario(scenario.Name);
flippingBot.User = user;
await flippingBot.LoadAccount();
var candles = initialCandles ?? GetCandles(account, ticker, timeframe, startDate, endDate);
var result = GetBacktestingResult(ticker, scenario, timeframe, flippingBot, candles, balance, account,
moneyManagement);
var result = GetBacktestingResult(config, flippingBot, candles);
if (user != null)
{
@@ -193,10 +193,10 @@ namespace Managing.Application.Backtesting
var bot = _botFactory.CreateBacktestScalpingBot(config);
bot.LoadScenario(scenario.Name);
bot.User = user;
await bot.LoadAccount();
var result = GetBacktestingResult(ticker, scenario, timeframe, bot, candles, balance, account,
moneyManagement);
var result = GetBacktestingResult(config, bot, candles);
if (user != null)
{
@@ -235,10 +235,10 @@ namespace Managing.Application.Backtesting
var bot = _botFactory.CreateBacktestFlippingBot(config);
bot.LoadScenario(scenario.Name);
bot.User = user;
await bot.LoadAccount();
var result = GetBacktestingResult(ticker, scenario, timeframe, bot, candles, balance, account,
moneyManagement);
var result = GetBacktestingResult(config, bot, candles);
if (user != null)
{
@@ -264,21 +264,16 @@ namespace Managing.Application.Backtesting
}
private Backtest GetBacktestingResult(
Ticker ticker,
Scenario scenario,
Timeframe timeframe,
TradingBotConfig config,
ITradingBot bot,
List<Candle> candles,
decimal balance,
Account account,
MoneyManagement moneyManagement)
List<Candle> candles)
{
if (candles == null || candles.Count == 0)
{
throw new Exception("No candle to backtest");
}
bot.WalletBalances.Add(candles.FirstOrDefault().Date, balance);
bot.WalletBalances.Add(candles.FirstOrDefault().Date, config.BotTradingBalance);
foreach (var candle in candles)
{
bot.OptimizedCandles.Enqueue(candle);
@@ -294,9 +289,10 @@ namespace Managing.Application.Backtesting
var finalPnl = bot.GetProfitAndLoss();
var winRate = bot.GetWinRate();
var optimizedMoneyManagement = TradingBox.GetBestMoneyManagement(candles, bot.Positions, moneyManagement);
var optimizedMoneyManagement =
TradingBox.GetBestMoneyManagement(candles, bot.Positions, config.MoneyManagement);
var stats = TradingHelpers.GetStatistics(bot.WalletBalances);
var growthPercentage = TradingHelpers.GetGrowthFromInitalBalance(balance, finalPnl);
var growthPercentage = TradingHelpers.GetGrowthFromInitalBalance(config.BotTradingBalance, finalPnl);
var hodlPercentage = TradingHelpers.GetHodlPercentage(candles[0], candles.Last());
var scoringParams = new BacktestScoringParams(
@@ -313,8 +309,7 @@ namespace Managing.Application.Backtesting
var score = BacktestScorer.CalculateTotalScore(scoringParams);
var result = new Backtest(ticker, scenario.Name, bot.Positions, bot.Signals.ToList(), timeframe, candles,
bot.Config.BotType, account.Name)
var result = new Backtest(config, bot.Positions, bot.Signals.ToList(), candles)
{
FinalPnl = finalPnl,
WinRate = winRate,
@@ -324,7 +319,6 @@ namespace Managing.Application.Backtesting
WalletBalances = bot.WalletBalances.ToList(),
Statistics = stats,
OptimizedMoneyManagement = optimizedMoneyManagement,
MoneyManagement = moneyManagement,
StrategiesValues = AggregateValues(strategiesValues, bot.StrategiesValues),
Score = score
};
@@ -430,9 +424,9 @@ namespace Managing.Application.Backtesting
{
var candles = await _exchangeService.GetCandlesInflux(
user.Accounts.First().Exchange,
backtest.Ticker,
backtest.Config.Ticker,
backtest.StartDate,
backtest.Timeframe,
backtest.Config.Timeframe,
backtest.EndDate);
if (candles != null && candles.Count > 0)
@@ -465,14 +459,15 @@ namespace Managing.Application.Backtesting
try
{
// Get the account
var account = new Account { Name = backtest.AccountName, Exchange = TradingExchanges.Binance };
var account = new Account
{ Name = backtest.Config.AccountName, Exchange = TradingExchanges.Evm };
// Use the stored start and end dates to retrieve candles
var candles = _exchangeService.GetCandlesInflux(
account.Exchange,
backtest.Ticker,
backtest.Config.Ticker,
backtest.StartDate,
backtest.Timeframe,
backtest.Config.Timeframe,
backtest.EndDate).Result;
if (candles != null && candles.Count > 0)

1
src/Managing.Application/Bots/FlippingBot.cs
View File

@@ -1,5 +1,6 @@
using Managing.Application.Abstractions;
using Managing.Application.Abstractions.Services;
using Managing.Domain.Bots;
using Microsoft.Extensions.Logging;
using static Managing.Common.Enums;

1
src/Managing.Application/Bots/ScalpingBot.cs
View File

@@ -1,5 +1,6 @@
using Managing.Application.Abstractions;
using Managing.Application.Abstractions.Services;
using Managing.Domain.Bots;
using Microsoft.Extensions.Logging;
using static Managing.Common.Enums;

21
src/Managing.Application/Bots/TradingBotConfig.cs
View File

@@ -1,21 +0,0 @@
using Managing.Domain.MoneyManagements;
using static Managing.Common.Enums;
namespace Managing.Application.Bots;
public class TradingBotConfig
{
public string AccountName { get; set; }
public MoneyManagement MoneyManagement { get; set; }
public Ticker Ticker { get; set; }
public string ScenarioName { get; set; }
public Timeframe Timeframe { get; set; }
public bool IsForBacktest { get; set; }
public bool IsForWatchingOnly { get; set; }
public bool FlipPosition { get; set; }
public BotType BotType { get; set; }
public decimal BotTradingBalance { get; set; }
public int CooldownPeriod { get; set; } = 1;
public int MaxLossStreak { get; set; } = 0;
public string Name { get; set; }
}

4
src/Managing.Application/ManageBot/Commands/StartBotCommand.cs
View File

@@ -1,4 +1,4 @@
using Managing.Application.Bots;
using Managing.Domain.Bots;
using Managing.Domain.Users;
using MediatR;
@@ -17,4 +17,4 @@ namespace Managing.Application.ManageBot.Commands
User = user;
}
}
}
}

32
src/Managing.Domain/Backtests/Backtest.cs
View File

@@ -1,11 +1,12 @@
using Exilion.TradingAtomics;
using System.ComponentModel.DataAnnotations;
using Exilion.TradingAtomics;
using Managing.Domain.Bots;
using Managing.Domain.Candles;
using Managing.Domain.MoneyManagements;
using Managing.Domain.Strategies;
using Managing.Domain.Strategies.Base;
using Managing.Domain.Trades;
using Managing.Domain.Users;
using System.ComponentModel.DataAnnotations;
using Managing.Domain.Strategies.Base;
using static Managing.Common.Enums;
namespace Managing.Domain.Backtests;
@@ -13,26 +14,18 @@ namespace Managing.Domain.Backtests;
public class Backtest
{
public Backtest(
Ticker ticker,
string scenario,
TradingBotConfig config,
List<Position> positions,
List<Signal> signals,
Timeframe timeframe,
List<Candle> candles,
BotType botType,
string accountName)
List<Candle> candles)
{
Ticker = ticker;
Config = config;
Positions = positions;
Signals = signals;
Timeframe = timeframe;
Candles = candles;
Scenario = scenario;
BotType = botType;
AccountName = accountName;
WalletBalances = new List<KeyValuePair<DateTime, decimal>>();
StrategiesValues = new Dictionary<StrategyType, StrategiesResultBase>();
// Initialize start and end dates if candles are provided
if (candles != null && candles.Count > 0)
{
@@ -51,13 +44,9 @@ public class Backtest
[Required] public int WinRate { get; set; }
[Required] public decimal GrowthPercentage { get; set; }
[Required] public decimal HodlPercentage { get; set; }
[Required] public Ticker Ticker { get; }
[Required] public string Scenario { get; set; }
[Required] public TradingBotConfig Config { get; }
[Required] public List<Position> Positions { get; }
[Required] public List<Signal> Signals { get; }
[Required] public Timeframe Timeframe { get; }
[Required] public BotType BotType { get; }
[Required] public string AccountName { get; }
[Required] public List<Candle> Candles { get; set; }
[Required] public DateTime StartDate { get; set; }
[Required] public DateTime EndDate { get; set; }
@@ -65,7 +54,6 @@ public class Backtest
[Required] public decimal Fees { get; set; }
[Required] public List<KeyValuePair<DateTime, decimal>> WalletBalances { get; set; }
[Required] public MoneyManagement OptimizedMoneyManagement { get; set; }
[Required] public MoneyManagement MoneyManagement { get; set; }
[Required] public User User { get; set; }
[Required] public Dictionary<StrategyType, StrategiesResultBase> StrategiesValues { get; set; }
[Required] public double Score { get; set; }
@@ -73,6 +61,6 @@ public class Backtest
public string GetStringReport()
{
return
$"{Ticker} | {Timeframe} | Positions: {Positions.Count} | Winrate: {WinRate}% | Pnl: {FinalPnl:#.##}$ | %Pnl: {GrowthPercentage:#.##}% | %Hodl: {HodlPercentage:#.##}%";
$"{Config.Ticker} | {Config.Timeframe} | Positions: {Positions.Count} | Winrate: {WinRate}% | Pnl: {FinalPnl:#.##}$ | %Pnl: {GrowthPercentage:#.##}% | %Hodl: {HodlPercentage:#.##}%";
}
}

22
src/Managing.Domain/Bots/TradingBotConfig.cs Normal file
View File

@@ -0,0 +1,22 @@
using System.ComponentModel.DataAnnotations;
using Managing.Domain.MoneyManagements;
using static Managing.Common.Enums;
namespace Managing.Domain.Bots;
public class TradingBotConfig
{
[Required] public string AccountName { get; set; }
[Required] public MoneyManagement MoneyManagement { get; set; }
[Required] public Ticker Ticker { get; set; }
[Required] public string ScenarioName { get; set; }
[Required] public Timeframe Timeframe { get; set; }
[Required] public bool IsForWatchingOnly { get; set; }
[Required] public decimal BotTradingBalance { get; set; }
[Required] public BotType BotType { get; set; }
[Required] public bool IsForBacktest { get; set; }
[Required] public int CooldownPeriod { get; set; }
[Required] public int MaxLossStreak { get; set; }
[Required] public bool FlipPosition { get; set; }
[Required] public string Name { get; set; }
}

2
src/Managing.Infrastructure.Database/BacktestRepository.cs
View File

@@ -26,7 +26,7 @@ public class BacktestRepository : IBacktestRepository
public IEnumerable<Backtest> GetBacktestsByUser(User user)
{
var backtests = _backtestRepository.AsQueryable()
.Where(b => b.User != null && b.User.Name == user.Name)
.Where(b => b.User.Name == user.Name)
.ToList();
return backtests.Select(b => MongoMappers.Map(b));

22
src/Managing.Infrastructure.Database/MongoDb/Collections/BacktestDto.cs
View File

@@ -1,6 +1,6 @@
using Managing.Infrastructure.Databases.MongoDb.Attributes;
using Exilion.TradingAtomics;
using Managing.Infrastructure.Databases.MongoDb.Attributes;
using Managing.Infrastructure.Databases.MongoDb.Configurations;
using Exilion.TradingAtomics;
using static Managing.Common.Enums;
namespace Managing.Infrastructure.Databases.MongoDb.Collections
@@ -12,21 +12,27 @@ namespace Managing.Infrastructure.Databases.MongoDb.Collections
public int WinRate { get; set; }
public decimal GrowthPercentage { get; set; }
public decimal HodlPercentage { get; set; }
public Ticker Ticker { get; set; }
public string Scenario { get; set; }
public List<PositionDto> Positions { get; set; }
public List<SignalDto> Signals { get; set; }
public Timeframe Timeframe { get; set; }
public RiskLevel RiskLevel { get; set; }
public string AccountName { get; set; }
public List<CandleDto> Candles { get; set; }
public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; }
public BotType BotType { get; set; }
public MoneyManagementDto MoneyManagement { get; internal set; }
public MoneyManagementDto OptimizedMoneyManagement { get; internal set; }
public UserDto User { get; set; }
public PerformanceMetrics Statistics { get; set; }
public double Score { get; set; }
// TradingBotConfig properties
public string AccountName { get; set; }
public Ticker Ticker { get; set; }
public string ScenarioName { get; set; }
public Timeframe Timeframe { get; set; }
public bool IsForWatchingOnly { get; set; }
public decimal BotTradingBalance { get; set; }
public BotType BotType { get; set; }
public bool IsForBacktest { get; set; }
public int CooldownPeriod { get; set; }
public int MaxLossStreak { get; set; }
}
}

48
src/Managing.Infrastructure.Database/MongoDb/MongoMappers.cs
View File

@@ -130,24 +130,34 @@ public static class MongoMappers
if (b == null)
return null;
var config = new TradingBotConfig
{
AccountName = b.AccountName,
Ticker = b.Ticker,
ScenarioName = b.ScenarioName,
Timeframe = b.Timeframe,
IsForWatchingOnly = b.IsForWatchingOnly,
BotTradingBalance = b.BotTradingBalance,
BotType = b.BotType,
IsForBacktest = b.IsForBacktest,
CooldownPeriod = b.CooldownPeriod,
MaxLossStreak = b.MaxLossStreak,
MoneyManagement = Map(b.MoneyManagement)
};
var bTest = new Backtest(
b.Ticker,
b.Scenario,
config,
b.Positions?.Select(p => Map(p)).ToList() ?? new List<Position>(),
b.Signals?.Select(s => Map(s)).ToList() ?? new List<Signal>(),
b.Timeframe,
b.Candles?.Select(c => Map(c)).ToList() ?? new List<Candle>(),
b.BotType,
b.AccountName)
b.Candles?.Select(c => Map(c)).ToList() ?? new List<Candle>())
{
FinalPnl = b.FinalPnl,
WinRate = b.WinRate,
GrowthPercentage = b.GrowthPercentage,
HodlPercentage = b.HodlPercentage,
Id = b.Id.ToString(),
MoneyManagement = Map(b.MoneyManagement),
OptimizedMoneyManagement = Map(b.OptimizedMoneyManagement),
User = b.User != null ? Map(b.User) : null,
User = Map(b.User),
Statistics = b.Statistics,
StartDate = b.StartDate,
EndDate = b.EndDate,
@@ -171,18 +181,24 @@ public static class MongoMappers
HodlPercentage = result.HodlPercentage,
Positions = Map(result.Positions),
Signals = result.Signals.Select(s => Map(s)).ToList(),
Ticker = result.Ticker,
Scenario = result.Scenario,
AccountName = result.AccountName,
BotType = result.BotType,
Timeframe = result.Timeframe,
MoneyManagement = Map(result.MoneyManagement),
Candles = result.Candles.Select(c => Map(c)).ToList(),
MoneyManagement = Map(result.Config.MoneyManagement),
OptimizedMoneyManagement = Map(result.OptimizedMoneyManagement),
User = result.User != null ? Map(result.User) : null,
User = Map(result.User),
Statistics = result.Statistics,
StartDate = result.StartDate,
EndDate = result.EndDate,
Score = result.Score
Score = result.Score,
AccountName = result.Config.AccountName,
Ticker = result.Config.Ticker,
ScenarioName = result.Config.ScenarioName,
Timeframe = result.Config.Timeframe,
IsForWatchingOnly = result.Config.IsForWatchingOnly,
BotTradingBalance = result.Config.BotTradingBalance,
BotType = result.Config.BotType,
IsForBacktest = result.Config.IsForBacktest,
CooldownPeriod = result.Config.CooldownPeriod,
MaxLossStreak = result.Config.MaxLossStreak
};
}

5
src/Managing.WebApp/package.json
View File

@@ -59,8 +59,7 @@
"viem": "2.28.0",
"wagmi": "^2.15.0",
"web3": "^4.16.0",
"zustand": "^4.4.1",
"@gmx-io/sdk": "0.2.0"
"zustand": "^4.4.1"
},
"devDependencies": {
"@types/elliptic": "^6.4.18",
@@ -83,7 +82,7 @@
"prettier-plugin-tailwind-css": "^1.5.0",
"tailwindcss": "^3.0.23",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite": "^6.3.5",
"whatwg-fetch": "^3.6.2"
},
"msw": {

40
src/Managing.WebApp/src/components/organism/Backtest/backtestCards.tsx
View File

@@ -56,14 +56,14 @@ const BacktestCards: React.FC<IBacktestCards> = ({ list, setBacktests }) => {
const client = new BotClient({}, apiUrl)
const request: StartBotRequest = {
accountName: backtest.accountName,
botName: backtest.ticker + '-' + backtest.timeframe.toString(),
accountName: backtest.config.accountName,
name: backtest.config.ticker + '-' + backtest.config.timeframe?.toString(),
botType: BotType.ScalpingBot,
isForWatchOnly: isForWatchOnly,
moneyManagementName: backtest.moneyManagement?.name,
scenario: backtest.scenario,
ticker: backtest.ticker as Ticker,
timeframe: backtest.timeframe,
moneyManagementName: backtest.config.moneyManagement?.name,
scenario: backtest.config.scenarioName,
ticker: backtest.config.ticker as Ticker,
timeframe: backtest.config.timeframe,
initialTradingBalance: 1000,
}
@@ -87,21 +87,23 @@ const BacktestCards: React.FC<IBacktestCards> = ({ list, setBacktests }) => {
await client
.backtest_Run(
backtest.accountName,
backtest.botType,
backtest.ticker as Ticker,
backtest.scenario,
backtest.timeframe,
backtest.config.accountName,
backtest.config.botType,
backtest.config.ticker as Ticker,
backtest.config.scenarioName,
backtest.config.timeframe,
false, // watchOnly
backtest.walletBalances[0].value, // balance
'', // moneyManagementName (empty since we're passing the optimized moneyManagement object)
startDate, // startDate
endDate, // endDate
false, // save
backtest.optimizedMoneyManagement // moneyManagement object
backtest.config.cooldownPeriod,
backtest.config.maxLossStreak,
backtest.config.moneyManagement as MoneyManagement, // moneyManagement object
)
.then((backtest: Backtest) => {
t.update('success', `${backtest.ticker} Backtest Succeeded`)
t.update('success', `${backtest.config.ticker} Backtest Succeeded`)
setBacktests((arr) => [...arr, backtest])
})
.catch((err) => {
@@ -177,7 +179,7 @@ const BacktestCards: React.FC<IBacktestCards> = ({ list, setBacktests }) => {
<button
className="text-xs"
onClick={() =>
saveMoneyManagement(backtest.moneyManagement)
saveMoneyManagement(backtest.config.moneyManagement)
}
>
Save money management
@@ -193,7 +195,7 @@ const BacktestCards: React.FC<IBacktestCards> = ({ list, setBacktests }) => {
</li>
</ul>
</div>
{backtest.ticker}
{backtest.config.ticker}
{botStatusResult(
backtest.growthPercentage,
backtest.hodlPercentage
@@ -203,19 +205,19 @@ const BacktestCards: React.FC<IBacktestCards> = ({ list, setBacktests }) => {
<div>
<CardText
title="Ticker"
content={backtest.ticker}
content={backtest.config.ticker}
></CardText>
<CardText
title="Account"
content={backtest.accountName}
content={backtest.config.accountName}
></CardText>
<CardText
title="Scenario"
content={backtest.scenario}
content={backtest.config.scenarioName}
></CardText>
<CardText
title="Timeframe"
content={backtest.timeframe}
content={backtest.config.timeframe?.toString()}
></CardText>
</div>
</div>

20
src/Managing.WebApp/src/components/organism/Backtest/backtestModal.tsx
View File

@@ -4,15 +4,15 @@ import {type SubmitHandler, useForm} from 'react-hook-form'
import useApiUrlStore from '../../../app/store/apiStore'
import {
AccountClient,
BacktestClient,
BotType,
DataClient,
MoneyManagement,
MoneyManagementClient,
ScenarioClient,
Ticker,
Timeframe,
AccountClient,
BacktestClient,
BotType,
DataClient,
MoneyManagement,
MoneyManagementClient,
ScenarioClient,
Ticker,
Timeframe,
} from '../../../generated/ManagingApi'
import type {BacktestModalProps, IBacktestsFormInput,} from '../../../global/type'
import {Loader, Slider} from '../../atoms'
@@ -123,7 +123,7 @@ const BacktestModal: React.FC<BacktestModalProps> = ({
customMoneyManagement
);
t.update('success', `${backtest.ticker} Backtest Succeeded`)
t.update('success', `${backtest.config.ticker} Backtest Succeeded`)
setBacktests((arr) => [...arr, backtest])
if (showLoopSlider && selectedLoopQuantity > loopCount) {

22
src/Managing.WebApp/src/components/organism/Backtest/backtestTable.tsx
View File

@@ -50,16 +50,18 @@ const BacktestTable: React.FC<IBacktestCards> = ({ list, isFetching, setBacktest
moneyManagementName.toLowerCase().includes('custom');
const request: StartBotRequest = {
accountName: backtest.accountName,
botName: botName,
botType: backtest.botType,
accountName: backtest.config.accountName,
botType: backtest.config.botType,
isForWatchOnly: isForWatchOnly,
// Only use the money management name if it's not a custom money management
moneyManagementName: isCustomMoneyManagement ? '' : moneyManagementName,
scenario: backtest.scenario,
ticker: backtest.ticker as Ticker,
timeframe: backtest.timeframe,
scenario: backtest.config.scenarioName,
ticker: backtest.config.ticker as Ticker,
timeframe: backtest.config.timeframe,
initialTradingBalance: initialTradingBalance,
cooldownPeriod: backtest.config.cooldownPeriod,
maxLossStreak: backtest.config.maxLossStreak,
name: botName,
}
await client
@@ -162,26 +164,26 @@ const BacktestTable: React.FC<IBacktestCards> = ({ list, isFetching, setBacktest
{
Filter: SelectColumnFilter,
Header: 'Ticker',
accessor: 'ticker',
accessor: 'config.ticker',
disableSortBy: true,
},
{
Filter: SelectColumnFilter,
Header: 'Timeframe',
accessor: 'timeframe',
accessor: 'config.timeframe',
disableSortBy: true,
},
{
Filter: SelectColumnFilter,
Header: 'Scenario',
accessor: 'scenario',
accessor: 'config.scenarioName',
disableSortBy: true,
},
{
Filter: SelectColumnFilter,
Header: 'BotType',
accessor: 'botType',
accessor: 'config.botType',
disableSortBy: true,
},
],

76
src/Managing.WebApp/src/generated/ManagingApi.ts
View File

@@ -2544,13 +2544,9 @@ export interface Backtest {
winRate: number;
growthPercentage: number;
hodlPercentage: number;
ticker: Ticker;
scenario: string;
config: TradingBotConfig;
positions: Position[];
signals: Signal[];
timeframe: Timeframe;
botType: BotType;
accountName: string;
candles: Candle[];
startDate: Date;
endDate: Date;
@@ -2558,12 +2554,46 @@ export interface Backtest {
fees: number;
walletBalances: KeyValuePairOfDateTimeAndDecimal[];
optimizedMoneyManagement: MoneyManagement;
moneyManagement: MoneyManagement;
user: User;
strategiesValues: { [key in keyof typeof StrategyType]?: StrategiesResultBase; };
score: number;
}
export interface TradingBotConfig {
accountName: string;
moneyManagement: MoneyManagement;
ticker: Ticker;
scenarioName: string;
timeframe: Timeframe;
isForWatchingOnly: boolean;
botTradingBalance: number;
botType: BotType;
isForBacktest: boolean;
cooldownPeriod: number;
maxLossStreak: number;
flipPosition: boolean;
name: string;
}
export interface MoneyManagement {
name: string;
timeframe: Timeframe;
stopLoss: number;
takeProfit: number;
leverage: number;
user?: User | null;
}
export enum Timeframe {
FiveMinutes = "FiveMinutes",
FifteenMinutes = "FifteenMinutes",
ThirtyMinutes = "ThirtyMinutes",
OneHour = "OneHour",
FourHour = "FourHour",
OneDay = "OneDay",
OneMinute = "OneMinute",
}
export enum Ticker {
AAVE = "AAVE",
ADA = "ADA",
@@ -2673,6 +2703,12 @@ export enum Ticker {
Unknown = "Unknown",
}
export enum BotType {
SimpleBot = "SimpleBot",
ScalpingBot = "ScalpingBot",
FlippingBot = "FlippingBot",
}
export interface Position {
accountName: string;
date: Date;
@@ -2697,25 +2733,6 @@ export enum TradeDirection {
Long = "Long",
}
export interface MoneyManagement {
name: string;
timeframe: Timeframe;
stopLoss: number;
takeProfit: number;
leverage: number;
user?: User | null;
}
export enum Timeframe {
FiveMinutes = "FiveMinutes",
FifteenMinutes = "FifteenMinutes",
ThirtyMinutes = "ThirtyMinutes",
OneHour = "OneHour",
FourHour = "FourHour",
OneDay = "OneDay",
OneMinute = "OneMinute",
}
export interface Trade {
fee?: number;
date: Date;
@@ -2850,12 +2867,6 @@ export enum SignalType {
Context = "Context",
}
export enum BotType {
SimpleBot = "SimpleBot",
ScalpingBot = "ScalpingBot",
FlippingBot = "FlippingBot",
}
export interface PerformanceMetrics {
count?: number;
sharpeRatio?: number;
@@ -2970,6 +2981,9 @@ export interface StartBotRequest {
moneyManagementName?: string | null;
isForWatchOnly?: boolean;
initialTradingBalance?: number;
cooldownPeriod?: number;
maxLossStreak?: number;
name?: string | null;
}
export interface TradingBot {

34
src/Managing.WebApp/src/pages/backtestPage/backtestScanner.tsx
View File

@@ -1,14 +1,14 @@
import { ColorSwatchIcon, TrashIcon, XIcon } from '@heroicons/react/solid'
import { useQuery } from '@tanstack/react-query'
import React, { useEffect, useState } from 'react'
import {ColorSwatchIcon, TrashIcon} from '@heroicons/react/solid'
import {useQuery} from '@tanstack/react-query'
import React, {useEffect, useState} from 'react'
import 'react-toastify/dist/ReactToastify.css'
import useApiUrlStore from '../../app/store/apiStore'
import { Loader } from '../../components/atoms'
import { Modal, Toast } from '../../components/mollecules'
import { BacktestModal, BacktestTable } from '../../components/organism'
import type { Backtest } from '../../generated/ManagingApi'
import { BacktestClient } from '../../generated/ManagingApi'
import {Loader} from '../../components/atoms'
import {Modal, Toast} from '../../components/mollecules'
import {BacktestModal, BacktestTable} from '../../components/organism'
import type {Backtest} from '../../generated/ManagingApi'
import {BacktestClient} from '../../generated/ManagingApi'
const BacktestScanner: React.FC = () => {
const [backtestingResult, setBacktest] = useState<Backtest[]>([])
@@ -28,19 +28,6 @@ const BacktestScanner: React.FC = () => {
}
}, [backtests])
function deleteAllBacktests() {
const t = new Toast('Deleting all backtests')
client
.backtest_DeleteBacktests()
.then(() => {
t.update('success', 'Backtest Succeeded')
refetch()
})
.catch((err) => {
t.update('error', 'Error :' + err)
})
}
const openModalRemoveBacktests = () => {
setShowModalRemoveBacktest(true)
}
@@ -111,11 +98,6 @@ const BacktestScanner: React.FC = () => {
<TrashIcon width="20"></TrashIcon>
</button>
</div>
<div className="tooltip" data-tip="Delete all backtests">
<button className="btn btn-error text-xs" onClick={deleteAllBacktests}>
<XIcon width="20"></XIcon>
</button>
</div>
<BacktestTable list={backtestingResult} isFetching={isLoading} setBacktests={setBacktest} />

41
src/Managing.WebApp/src/pages/settingsPage/defaultConfig/defaultConfig.tsx
View File

@@ -1,47 +1,12 @@
import React, { useState } from 'react'
import { toast } from 'react-toastify'
import { SettingsClient } from '../../../generated/ManagingApi'
import React, {useState} from 'react'
import {toast} from 'react-toastify'
import {SettingsClient} from '../../../generated/ManagingApi'
import useApiUrlStore from '../../../app/store/apiStore'
import { GmxSdk } from '@gmx-io/sdk'
import { createClient, createTestClient, createWalletClient, http, publicActions, walletActions } from 'viem'
import { getClient, getConnectorClient } from '@wagmi/core'
import { privyWagmiConfig } from '../../../config/privy'
import { arbitrum } from 'viem/chains'
import { GmxSdkConfig } from '@gmx-io/sdk/build/src/types/sdk'
const DefaultConfig: React.FC = () => {
const [isCreating, setIsCreating] = useState(false)
const { apiUrl } = useApiUrlStore()
const client = createWalletClient({
account: "0x9f7198eb1b9Ccc0Eb7A07eD228d8FbC12963ea33",
chain: arbitrum,
transport: http(),
})
const testClient = createTestClient({
chain: arbitrum,
mode: "hardhat",
transport: http(),
})
.extend(publicActions)
.extend(walletActions);
const arbitrumSdkConfig: GmxSdkConfig = {
chainId: arbitrum.id,
account: "0x9f7198eb1b9Ccc0Eb7A07eD228d8FbC12963ea33",
oracleUrl: "https://arbitrum-api.gmxinfra.io",
rpcUrl: "https://arb1.arbitrum.io/rpc",
walletClient: client,
subsquidUrl: "https://gmx.squids.live/gmx-synthetics-arbitrum:live/api/graphql",
subgraphUrl: "https://subgraph.satsuma-prod.com/3b2ced13c8d9/gmx/synthetics-arbitrum-stats/api",
};
const sdk = new GmxSdk(arbitrumSdkConfig)
console.log(sdk)
const createDefaultConfig = async () => {
try {
const client = new SettingsClient({}, apiUrl)