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

Update bot workflow

Browse Source
This commit is contained in:
Crypto Od
2025-03-02 18:24:50 +01:00
parent 3e44b2d14e
commit e59898bccb
13 changed files with 198 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Managing.Api.Workers/Managing.Api.Workers.csproj
View File

@@ -41,5 +41,8 @@
<Content Update="appsettings.Prod.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="appsettings.ProdLocal.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

8
src/Managing.Api.Workers/Program.cs
View File

@@ -107,16 +107,16 @@ builder.Services.AddSwaggerGen(options =>
});
builder.WebHost.SetupDiscordBot();
builder.Services.AddHostedService<FeeWorker>();
// builder.Services.AddHostedService<FeeWorker>();
// builder.Services.AddHostedService<PositionManagerWorker>();
// builder.Services.AddHostedService<PositionFetcher>();
// builder.Services.AddHostedService<PricesFiveMinutesWorker>();
builder.Services.AddHostedService<PricesFifteenMinutesWorker>();
builder.Services.AddHostedService<PricesOneHourWorker>();
// builder.Services.AddHostedService<PricesFourHoursWorker>();
builder.Services.AddHostedService<PricesFourHoursWorker>();
builder.Services.AddHostedService<PricesOneDayWorker>();
builder.Services.AddHostedService<SpotlightWorker>();
builder.Services.AddHostedService<TraderWatcher>();
// builder.Services.AddHostedService<SpotlightWorker>();
// builder.Services.AddHostedService<TraderWatcher>();
builder.Services.AddHostedService<LeaderboardWorker>();
builder.Services.AddHostedService<FundingRatesWatcher>();

74
src/Managing.Api.Workers/Workers/PositionManagerWorker.cs
View File

@@ -166,49 +166,63 @@ public class PositionManagerWorker : BaseWorker<PositionManagerWorker>
{
var positions = GetPositions(PositionStatus.New);
_logger.LogInformation("New positions count : {0} ", positions.Count());
_logger.LogInformation("Processing {NewPositionCount} new positions", positions.Count());
foreach (var position in positions)
{
_logger.LogInformation("Managing position: {0} - Date: {1} - Direction: {2} - Ticker: {3}",
position.Identifier, position.Date, position.OriginDirection, position.Ticker);
using (_logger.BeginScope("Position {SignalIdentifier}", position.SignalIdentifier))
{
try
{
// Immediate status update for concurrency protection
_logger.LogDebug("[{SignalIdentifier}] Acquiring position lock via status update", position.SignalIdentifier);
position.Status = PositionStatus.Updating;
_tradingService.UpdatePosition(position);
// Update status if position is open since to long
if (position.Date < DateTime.UtcNow.AddDays(-2))
var account = await GetAccount(position.AccountName);
var trade = await _exchangeService.GetTrade(account.Key, position.Open.ExchangeOrderId, position.Ticker);
var openTrade = position.Open;
if (trade.Status == TradeStatus.PendingOpen || trade.Status == TradeStatus.Requested)
{
// Position staleness check
if (position.Date < DateTime.UtcNow.AddDays(-1))
{
position.Status = PositionStatus.Canceled;
_tradingService.UpdatePosition(position);
_logger.LogInformation($"|_ Position is now Canceled");
continue;
}
var account = await GetAccount(position.AccountName);
var currentOpenOrders = await _exchangeService.GetOpenOrders(account, position.Ticker);
// if (currentOpenOrders.Any())
// {
// position.Status = PositionStatus.Canceled;
// _tradingService.UpdatePosition(position);
// _logger.LogInformation($"|_ Position is now Canceled - Position close from exchange");
// continue;
// }
var quantityInPosition = await _exchangeService.GetQuantityInPosition(account, position.Ticker);
if (quantityInPosition <= 0)
{
position.Status = PositionStatus.New;
_logger.LogInformation("|_ Position is currently waiting for filling");
_logger.LogWarning("[{SignalIdentifier}] Position canceled - stale since {PositionAge} days",
position.SignalIdentifier,
(DateTime.UtcNow - position.Date).TotalDays);
}
else
{
position.Open.SetStatus(TradeStatus.Filled);
position.Status = PositionStatus.PartiallyFilled;
_logger.LogInformation($"|_ Position is now PartiallyFilled");
}
// Reset status for retry
position.Status = PositionStatus.New;
_tradingService.UpdatePosition(position);
_logger.LogInformation("[{SignalIdentifier}] Awaiting order fill - {Ticker} (0/{ExpectedQuantity})",
position.SignalIdentifier,
position.Ticker, openTrade.Quantity);
}
}
else
{
position.Status = PositionStatus.PartiallyFilled;
position.Open = openTrade;
// Position is now open, now waiting to open SLTP
_tradingService.UpdatePosition(position);
_logger.LogInformation("[{SignalIdentifier}] Position now open ",
position.SignalIdentifier);
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Error processing position {SignalIdentifier}", position.SignalIdentifier);
// Consider resetting to New status for retry if needed
position.Status = PositionStatus.New;
_tradingService.UpdatePosition(position);
}
}
}
}

24
src/Managing.Api.Workers/appsettings.ProdLocal.json Normal file
View File

@@ -0,0 +1,24 @@
{
"ManagingDatabase": {
"ConnectionString": "mongodb://admin:r8oJiDIKbsEi@mongo-db.apps.managing.live:27017/?authMechanism=SCRAM-SHA-256",
"DatabaseName": "ManagingDb"
},
"InfluxDb": {
"Url": "https://influx-db.apps.managing.live",
"Organization": "managing-org",
"Token": "eOuXcXhH7CS13Iw4CTiDDpRjIjQtEVPOloD82pLPOejI4n0BsEj1YzUw0g3Cs1mdDG5m-RaxCavCMsVTtS5wIQ=="
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Information",
"System": "Warning"
}
}
},
"ElasticConfiguration": {
"Uri": "http://elasticsearch:9200"
},
"AllowedHosts": "*"
}

3
src/Managing.Api/Managing.Api.csproj
View File

@@ -42,5 +42,8 @@
<Content Update="appsettings.Oda-sandbox.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="appsettings.ProdLocal.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

1
src/Managing.Api/Program.cs
View File

@@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
using Managing.Api.Authorization;
using Managing.Api.Exceptions;
using Managing.Api.Filters;
using Managing.Api.Workers;
using Managing.Application.Hubs;
using Managing.Bootstrap;
using Managing.Common;

24
src/Managing.Api/appsettings.ProdLocal.json Normal file
View File

@@ -0,0 +1,24 @@
{
"ManagingDatabase": {
"ConnectionString": "mongodb://admin:r8oJiDIKbsEi@mongo-db.apps.managing.live:27017/?authMechanism=SCRAM-SHA-256",
"DatabaseName": "ManagingDb"
},
"InfluxDb": {
"Url": "https://influx-db.apps.managing.live",
"Organization": "managing-org",
"Token": "eOuXcXhH7CS13Iw4CTiDDpRjIjQtEVPOloD82pLPOejI4n0BsEj1YzUw0g3Cs1mdDG5m-RaxCavCMsVTtS5wIQ=="
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Information",
"System": "Warning"
}
}
},
"ElasticConfiguration": {
"Uri": "http://elasticsearch:9200"
},
"AllowedHosts": "*"
}

18
src/Managing.Application/Bots/TradingBot.cs
View File

@@ -111,8 +111,10 @@ public class TradingBot : Bot, ITradingBot
try
{
await MessengerService.SendMessage(
$"Hi everyone, I'm going to run {Name}. \nI will send a message here everytime a signal is triggered by the {string.Join(",", Strategies.Select(s => s.Name))} strategies.");
// await MessengerService.SendMessage(
// $"Hey everyone! I'm about to start {Name}. 🚀\n" +
// $"I'll post an update here each time a signal is triggered by the following strategies: {string.Join(", ", Strategies.Select(s => s.Name))}."
// );
}
catch (Exception ex)
{
@@ -414,11 +416,11 @@ public class TradingBot : Bot, ITradingBot
await LogWarning($"Open position trade is rejected for signal {signal.Identifier}");
// if position is not open
// Re-open the trade for the signal only if signal still up
//if (signal.Status == SignalStatus.PositionOpen)
//{
// Logger.LogInformation($"Try to re-open position");
// OpenPosition(signal);
//}
if (signal.Status == SignalStatus.PositionOpen)
{
Logger.LogInformation($"Try to re-open position");
await OpenPosition(signal);
}
}
}
catch (Exception ex)
@@ -495,7 +497,7 @@ public class TradingBot : Bot, ITradingBot
MoneyManagement,
signal.Direction,
Ticker,
PositionInitiator.Bot,
IsForBacktest ? PositionInitiator.PaperTrading : PositionInitiator.Bot ,
signal.Date,
IsForBacktest,
lastPrice,

11
src/Managing.Application/ManageBot/BotService.cs
View File

@@ -131,7 +131,7 @@ namespace Managing.Application.ManageBot
scalpingBotData.ScenarioName,
scalpingBotData.Timeframe,
scalpingBotData.IsForWatchingOnly);
botTask = Task.Run(() => ((ITradingBot)bot).Start());
botTask = Task.Run(() => InitBot((ITradingBot)bot, backupBot));
break;
case Enums.BotType.FlippingBot:
var flippingBotData = JsonConvert.DeserializeObject<TradingBotBackup>(backupBot.Data);
@@ -143,7 +143,7 @@ namespace Managing.Application.ManageBot
flippingBotData.ScenarioName,
flippingBotData.Timeframe,
flippingBotData.IsForWatchingOnly);
botTask = Task.Run(() => ((ITradingBot)bot).Start());
botTask = Task.Run(InitBot((ITradingBot)bot, backupBot));
break;
}
@@ -154,6 +154,13 @@ namespace Managing.Application.ManageBot
}
}
private static Action InitBot(ITradingBot bot, BotBackup backupBot)
{
bot.Start();
bot.LoadBackup(backupBot);
return () => { };
}
public IBot CreateSimpleBot(string botName, Workflow workflow)
{
return new SimpleBot(botName, _tradingBotLogger, workflow, this);

72
src/Managing.Application/ManageBot/LoadBackupBotCommandHandler.cs
View File

@@ -20,70 +20,66 @@ public class LoadBackupBotCommandHandler : IRequestHandler<LoadBackupBotCommand,
public Task<string> Handle(LoadBackupBotCommand request, CancellationToken cancellationToken)
{
BotStatus botStatus = BotStatus.Down;
var backupBots = _botService.GetSavedBots().ToList();
var activeBots = _botService.GetActiveBots();
var result = new Dictionary<string, BotStatus>();
_logger.LogInformation("Loading {Count} backup bots.", backupBots.Count);
_logger.LogInformation($"Loading {backupBots.Count()} backup bots");
var result = new Dictionary<string, BotStatus>();
bool anyBackupStarted = false;
bool anyBotActive = false;
foreach (var backupBot in backupBots)
{
// Check if bot is existing in cache
try
{
switch (backupBot.BotType)
var activeBot = _botService.GetActiveBots().FirstOrDefault(b => b.GetName() == backupBot.Name);
if (activeBot == null)
{
case BotType.SimpleBot:
var simpleBot = activeBots.FirstOrDefault(b => b.GetName() == backupBot.Name);
if (simpleBot == null)
{
_logger.LogInformation($"Starting backup bot {backupBot.Name}");
_logger.LogInformation("No active instance found for bot {BotName}. Starting backup...", backupBot.Name);
_botService.StartBotFromBackup(backupBot);
result.Add(simpleBot.GetName(), BotStatus.Backup);
activeBot = _botService.GetActiveBots().FirstOrDefault(b => b.GetName() == backupBot.Name);
if (activeBot != null)
{
result[activeBot.GetName()] = BotStatus.Backup;
anyBackupStarted = true;
_logger.LogInformation("Backup bot {BotName} started successfully.", backupBot.Name);
}
else
{
result.Add(simpleBot.GetName(), MiscExtensions.ParseEnum<BotStatus>(simpleBot.GetStatus()));
result[backupBot.Name] = BotStatus.Down;
_logger.LogWarning("Backup bot {BotName} failed to start.", backupBot.Name);
}
break;
case BotType.ScalpingBot:
case BotType.FlippingBot:
var scalpingBot = activeBots.FirstOrDefault(b => b.GetName() == backupBot.Name);
if (scalpingBot == null)
{
_logger.LogInformation($"Starting backup bot {backupBot.Name}");
_botService.StartBotFromBackup(backupBot);
var bots = _botService.GetActiveBots();
scalpingBot = bots.FirstOrDefault(b => b.GetName() == backupBot.Name);
result.Add(scalpingBot.GetName(), BotStatus.Backup);
}
else
{
result.Add(scalpingBot.GetName(),
MiscExtensions.ParseEnum<BotStatus>(scalpingBot.GetStatus()));
}
break;
default:
result.Add(backupBot.Name, BotStatus.Down);
break;
var status = MiscExtensions.ParseEnum<BotStatus>(activeBot.GetStatus());
result[activeBot.GetName()] = status;
anyBotActive = true;
_logger.LogInformation("Bot {BotName} is already active with status {Status}.", activeBot.GetName(), status);
}
}
catch (Exception ex)
{
_logger.LogError($"Error loading bot {backupBot.Name}", ex.Message);
_logger.LogError(ex, "Error loading bot {BotName}. Deleting its backup.", backupBot.Name);
_botService.DeleteBotBackup(backupBot.Name);
result.Add(backupBot.Name, BotStatus.Down);
result[backupBot.Name] = BotStatus.Down;
}
}
_logger.LogInformation("Bot loading completed");
_logger.LogInformation($"Bots: {result.Select(b => $"{b.Key} - {b.Value}")}");
var summary = string.Join(", ", result.Select(b => $"{b.Key}: {b.Value}"));
_logger.LogInformation("Bot loading completed. Summary: {Summary}", summary);
return Task.FromResult(botStatus.ToString());
// Determine final status
BotStatus finalStatus = anyBackupStarted
? BotStatus.Backup
: anyBotActive ? BotStatus.Up : BotStatus.Down;
_logger.LogInformation("Final aggregate bot status: {FinalStatus}", finalStatus);
return Task.FromResult(finalStatus.ToString());
}
}
public class LoadBackupBotCommand : IRequest<string>

4
src/Managing.Application/Trading/OpenPositionCommandHandler.cs
View File

@@ -108,7 +108,11 @@ namespace Managing.Application.Trading
position.Status = IsOpenTradeHandled(position.Open.Status, account.Exchange)
? position.Status
: PositionStatus.Rejected;
if (request.IsForPaperTrading)
{
tradingService.InsertPosition(position);
}
return position;
}

9
src/Managing.Application/Users/UserService.cs
View File

@@ -11,7 +11,14 @@ public class UserService : IUserService
private readonly IUserRepository _userRepository;
private readonly IAccountService _accountService;
private string[] authorizedAddresses = ["0x6781920674dA695aa5120d95D80c4B1788046806", "0xA2B43AFF0992a47838DF2e6099A8439981f0B717", "0xAD4bcf258852e9d47E580798d312E1a52D59E721", "0xAd6D6c80910096b40e45690506a9f1052e072dCB", "0x309b9235edbe1C6f840816771c6C21aDa6c275EE"];
private string[] authorizedAddresses = [
"0x6781920674dA695aa5120d95D80c4B1788046806", // Macbook
"0xA2B43AFF0992a47838DF2e6099A8439981f0B717", // Phone
"0xAD4bcf258852e9d47E580798d312E1a52D59E721", // Razil
"0xAd6D6c80910096b40e45690506a9f1052e072dCB", // Teru
"0x309b9235edbe1C6f840816771c6C21aDa6c275EE", // Cowchain
"0x23AA99254cfaA2c374bE2bA5B55C68018cCdFCb3" // Local optiflex
];
public UserService(
IEvmManager evmManager,

5
src/Managing.Infrastructure.Web3/Services/Gmx/GmxV2Service.cs
View File

@@ -1228,7 +1228,7 @@ public class GmxV2Service
{
var position = await GetGmxPositionsV2(web3, publicAddress);
var positionsPerTicker =
position.First(p => GmxV2Helpers.SameAddress(p.MarketAddress, GmxV2Helpers.GetMarketAddress(ticker)));
position.First(p => GmxV2Helpers.SameAddress(p.Key, publicAddress));
return GmxV2Mappers.Map(positionsPerTicker, ticker);
}
@@ -1375,6 +1375,7 @@ public class GmxV2Service
public async Task<decimal> QuantityInPosition(Web3 web3, string publicAddress, Enums.Ticker ticker)
{
return (await GetTrade(web3, publicAddress, ticker)).Status == Enums.TradeStatus.Filled ? 1 : 0;
var trade = await GetTrade(web3, publicAddress, ticker);
return trade.Status == Enums.TradeStatus.Filled ? trade.Quantity : 0;
}
}