diff --git a/src/Managing.Api/Program.cs b/src/Managing.Api/Program.cs index 9c9b06ba..2d6e6919 100644 --- a/src/Managing.Api/Program.cs +++ b/src/Managing.Api/Program.cs @@ -209,7 +209,7 @@ var jwtSecret = builder.Configuration["Jwt:Secret"]; if (string.IsNullOrWhiteSpace(jwtSecret)) { throw new InvalidOperationException( - "JWT secret is not configured. Please set 'Jwt:Secret' in appsettings.json or environment variables."); + "JWT secret is not configured. Please set 'Jwt:Secret' environment variable."); } if (jwtSecret.Length < 32) diff --git a/src/Managing.Api/appsettings.Development.json b/src/Managing.Api/appsettings.Development.json index b56e6307..fbc48460 100644 --- a/src/Managing.Api/appsettings.Development.json +++ b/src/Managing.Api/appsettings.Development.json @@ -1,10 +1,18 @@ { - "RunOrleansGrains": false, - "DeploymentMode": false, - "Logging": { - "LogLevel": { + "Privy": { + "AppId": "cm6f47n1l003jx7mjwaembhup" + }, + "Serilog": { + "MinimumLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Override": { + "Microsoft": "Information", + "System": "Warning" + } } - } -} + }, + "EnableSwagger": true, + "RunOrleansGrains": true, + "AllowedHosts": "*", + "KAIGEN_CREDITS_ENABLED": false +} \ No newline at end of file diff --git a/src/Managing.Api/appsettings.Oda-docker.json b/src/Managing.Api/appsettings.Oda-docker.json deleted file mode 100644 index 82031ba8..00000000 --- a/src/Managing.Api/appsettings.Oda-docker.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "InfluxDb": { - "Url": "http://localhost:8086/", - "Organization": "managing-org", - "Token": "Fw2FPL2OwTzDHzSbR2Sd5xs0EKQYy00Q-hYKYAhr9cC1_q5YySONpxuf_Ck0PTjyUiF13xXmi__bu_pXH-H9zA==" - }, - "PostgreSql": { - "ConnectionString": "Host=localhost;Port=5432;Database=managing;Username=postgres;Password=postgres", - "Orleans": "Host=localhost;Port=5432;Database=orleans;Username=postgres;Password=postgres" - }, - "Privy": { - "AppId": "cm6f47n1l003jx7mjwaembhup", - "AppSecret": "63Chz2z5M8TgR5qc8dznSLRAGTHTyPU4cjdQobrBF1Cx5tszZpTuFgyrRd7hZ2k6HpwDz3GEwQZzsCqHb8Z311bF" - }, - "Serilog": { - "MinimumLevel": { - "Default": "Information", - "Override": { - "Microsoft": "Information", - "System": "Warning" - } - } - }, - "ElasticConfiguration": { - "Uri": "http://elasticsearch:9200" - }, - "Discord": { - "ApplicationId": "", - "PublicKey": "", - "TokenId": "", - "SignalChannelId": 966080506473099314, - "TradesChannelId": 998374177763491851, - "TroublesChannelId": 1015761955321040917, - "RequestsChannelId": 1018589494968078356, - "ButtonExpirationMinutes": 2 - }, - "RunOrleansGrains": false, - "AllowedHosts": "*", - "KAIGEN_SECRET_KEY": "KaigenXCowchain", - "KAIGEN_CREDITS_ENABLED": false, - "WorkerBalancesTracking": false, - "WorkerNotifyBundleBacktest": false, - "WorkerPricesFifteenMinutes": true, - "WorkerPricesOneHour": false, - "WorkerPricesFourHours": false, - "WorkerPricesOneDay": false, - "WorkerPricesFiveMinutes": false, - "WorkerFee": false, - "WorkerPositionManager": false, - "WorkerPositionFetcher": false, - "WorkerSpotlight": false, - "WorkerTraderWatcher": false, - "WorkerLeaderboard": false, - "WorkerFundingRatesWatcher": false, - "WorkerGeneticAlgorithm": false, - "WorkerBundleBacktest": false -} \ No newline at end of file diff --git a/src/Managing.Api/appsettings.Oda.json b/src/Managing.Api/appsettings.Oda.json deleted file mode 100644 index 3ef9bdda..00000000 --- a/src/Managing.Api/appsettings.Oda.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "InfluxDb": { - "Url": "http://localhost:8086/", - "Organization": "managing-org", - "Token": "Fw2FPL2OwTzDHzSbR2Sd5xs0EKQYy00Q-hYKYAhr9cC1_q5YySONpxuf_Ck0PTjyUiF13xXmi__bu_pXH-H9zA==" - }, - "PostgreSql": { - "ConnectionString": "Host=localhost;Port=5432;Database=managing;Username=postgres;Password=postgres", - "Orleans": "Host=localhost;Port=5432;Database=orleans;Username=postgres;Password=postgres" - }, - "Privy": { - "AppId": "cm6f47n1l003jx7mjwaembhup", - "AppSecret": "63Chz2z5M8TgR5qc8dznSLRAGTHTyPU4cjdQobrBF1Cx5tszZpTuFgyrRd7hZ2k6HpwDz3GEwQZzsCqHb8Z311bF" - }, - "Kaigen": { - "BaseUrl": "https://kaigen-back.apps.managing.live" - }, - "Serilog": { - "MinimumLevel": { - "Default": "Information", - "Override": { - "Microsoft": "Information", - "System": "Warning" - } - } - }, - "ElasticConfiguration": { - "Uri": "http://elasticsearch:9200" - }, - "Discord": { - "ApplicationId": "", - "PublicKey": "", - "TokenId": "", - "SignalChannelId": 966080506473099314, - "TradesChannelId": 998374177763491851, - "TroublesChannelId": 1015761955321040917, - "RequestsChannelId": 1018589494968078356, - "ButtonExpirationMinutes": 2 - }, - "EnableSwagger": true, - "RunOrleansGrains": true, - "AllowedHosts": "*", - "KAIGEN_SECRET_KEY": "KaigenXCowchain", - "KAIGEN_CREDITS_ENABLED": false, - "WorkerBotManager": false, - "WorkerBalancesTracking": false, - "WorkerNotifyBundleBacktest": false, - "WorkerPricesFifteenMinutes": false, - "WorkerPricesOneHour": false, - "WorkerPricesFourHours": false, - "WorkerPricesOneDay": false, - "WorkerPricesFiveMinutes": false, - "WorkerFee": false, - "WorkerPositionManager": false, - "WorkerPositionFetcher": false, - "WorkerSpotlight": false, - "WorkerTraderWatcher": false, - "WorkerLeaderboard": false, - "WorkerFundingRatesWatcher": false, - "WorkerGeneticAlgorithm": false, - "WorkerBundleBacktest": false, - "WorkerBundleBacktestHealthCheck": false -} \ No newline at end of file diff --git a/src/Managing.Api/appsettings.Production.json b/src/Managing.Api/appsettings.Production.json index aed86f13..7349ab72 100644 --- a/src/Managing.Api/appsettings.Production.json +++ b/src/Managing.Api/appsettings.Production.json @@ -1,13 +1,4 @@ { - "PostgreSql": { - "ConnectionString": "Host=srv-captain--kaigen-db;Port=5432;Database=managing;Username=postgres;Password=2ab5423dcca4aa2d", - "Orleans": "Host=srv-captain--kaigen-db;Port=5432;Database=orleans;Username=postgres;Password=2ab5423dcca4aa2d" - }, - "InfluxDb": { - "Url": "http://srv-captain--influx-db:8086/", - "Organization": "managing-org", - "Token": "ROvQoZ1Dg5jiKDFxB0saEGqHC3rsLkUNlPL6_AFbOcpNjMieIv8v58yA4v5tFU9sX9LLvXEToPvUrxqQEMaWDw==" - }, "Web3Proxy": { "BaseUrl": "http://srv-captain--web3-proxy:4111", "MaxRetryAttempts": 2, @@ -26,16 +17,6 @@ "Kaigen": { "BaseUrl": "http://srv-captain--kaigen-back:3000" }, - "Flagsmith": { - "ApiKey": "ser.5TpNgoo4q6yhwFNfqHGr2s", - "ApiUrl": "https://flag.kaigen.ai/api/v1/" - }, - "N8n": { - "WebhookUrl": "https://n8n.kai.managing.live/webhook/fa9308b6-983b-42ec-b085-71599d655951", - "IndicatorRequestWebhookUrl": "https://n8n.kai.managing.live/webhook/3aa07b66-1e64-46a7-8618-af300914cb11", - "Username": "managing-api", - "Password": "T259836*PdiV2@%!eR%Qf4" - }, "SqlMonitoring": { "Enabled": true, "LoggingEnabled": false, diff --git a/src/Managing.Api/appsettings.ProductionRemote.json b/src/Managing.Api/appsettings.ProductionRemote.json deleted file mode 100644 index 3f4b9df5..00000000 --- a/src/Managing.Api/appsettings.ProductionRemote.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "PostgreSql": { - "ConnectionString": "Host=kaigen-db.kaigen.managing.live;Port=5432;Database=managing;Username=postgres;Password=2ab5423dcca4aa2d", - "Orleans": "Host=kaigen-db.kaigen.managing.live;Port=5432;Database=orleans;Username=postgres;Password=2ab5423dcca4aa2d" - }, - "InfluxDb": { - "Url": "https://influx-db.kaigen.managing.live", - "Organization": "managing-org", - "Token": "ROvQoZ1Dg5jiKDFxB0saEGqHC3rsLkUNlPL6_AFbOcpNjMieIv8v58yA4v5tFU9sX9LLvXEToPvUrxqQEMaWDw==" - }, - "RunOrleansGrains": true, - "AllowedHosts": "*" -} \ No newline at end of file diff --git a/src/Managing.Api/appsettings.Sandbox.json b/src/Managing.Api/appsettings.Sandbox.json index 5259f353..4a8d9407 100644 --- a/src/Managing.Api/appsettings.Sandbox.json +++ b/src/Managing.Api/appsettings.Sandbox.json @@ -1,13 +1,4 @@ { - "PostgreSql": { - "ConnectionString": "Host=srv-captain--db;Port=5432;Database=managing;Username=postgres;Password=28d7c07e72296e08", - "Orleans": "Host=srv-captain--db;Port=5432;Database=orleans;Username=postgres;Password=28d7c07e72296e08" - }, - "InfluxDb": { - "Url": "http://srv-captain--influx-db:8086/", - "Organization": "managing-org", - "Token": "R2FasLHQ3wdDOJ0nxq7wZ0OXe2yjPNW9mfZkbAjF35d1z7xGlSv4eY0y_AS6bvaVmPA0ETUMXHU1ftTNNFRDkA==" - }, "Kaigen": { "BaseUrl": "http://srv-captain--kaigen-back:3000" }, @@ -26,9 +17,6 @@ } } }, - "ElasticConfiguration": { - "Uri": "http://elasticsearch:9200" - }, "SqlMonitoring": { "Enabled": true, "LoggingEnabled": true, diff --git a/src/Managing.Api/appsettings.SandboxRemote.json b/src/Managing.Api/appsettings.SandboxRemote.json deleted file mode 100644 index 06890c6c..00000000 --- a/src/Managing.Api/appsettings.SandboxRemote.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "PostgreSql": { - "ConnectionString": "Host=db.apps.managing.live;Port=5432;Database=managing;Username=postgres;Password=28d7c07e72296e08", - "Orleans": "Host=db.apps.managing.live;Port=5432;Database=orleans;Username=postgres;Password=28d7c07e72296e08" - }, - "InfluxDb": { - "Url": "https://influx-db.apps.managing.live", - "Organization": "managing-org", - "Token": "R2FasLHQ3wdDOJ0nxq7wZ0OXe2yjPNW9mfZkbAjF35d1z7xGlSv4eY0y_AS6bvaVmPA0ETUMXHU1ftTNNFRDkA==" - } -} \ No newline at end of file diff --git a/src/Managing.Api/appsettings.json b/src/Managing.Api/appsettings.json index b74e7966..33770def 100644 --- a/src/Managing.Api/appsettings.json +++ b/src/Managing.Api/appsettings.json @@ -9,16 +9,10 @@ } } }, - "Jwt": { - "Secret": "2ed5f490-b6c1-4cad-8824-840c911f1fe6" - }, - "PostgreSql": { - "ConnectionString": "Host=localhost;Port=5432;Database=managing;Username=postgres;Password=postgres" - }, + + "InfluxDb": { - "Url": "http://influxdb:8086/", - "Organization": "", - "Token": "" + "Organization": "managing-org" }, "Web3Proxy": { "BaseUrl": "http://localhost:4111", @@ -32,17 +26,11 @@ "RefundEndpoint": "/api/credits/refund" }, "Flagsmith": { - "ApiKey": "ser.ShJJJMtWYS9fwuzd83ejwR", "ApiUrl": "https://flag.kaigen.ai/api/v1/" }, "N8n": { - "WebhookUrl": "https://n8n.kai.managing.live/webhook/fa9308b6-983b-42ec-b085-71599d655951", - "IndicatorRequestWebhookUrl": "https://n8n.kai.managing.live/webhook/3aa07b66-1e64-46a7-8618-af300914cb11", - "Username": "managing-api", - "Password": "T259836*PdiV2@%!eR%Qf4" }, "Sentry": { - "Dsn": "https://fe12add48c56419bbdfa86227c188e7a@glitch.kai.managing.live/1", "MinimumEventLevel": "Error", "SendDefaultPii": true, "MaxBreadcrumbs": 50, @@ -65,9 +53,6 @@ "Discord": { "BotActivity": "with trading strategies", "HandleUserAction": true, - "ApplicationId": "966075382002516031", - "PublicKey": "63028f6bb740cd5d26ae0340b582dee2075624011b28757436255fc002ca8a7c", - "TokenId": "OTY2MDc1MzgyMDAyNTE2MDMx.Yl8dzw.xpeIAaMwGrwTNY4r9JYv0ebzb-U", "SignalChannelId": 966080506473099314, "TradesChannelId": 998374177763491851, "TroublesChannelId": 1015761955321040917, diff --git a/src/Managing.Application/Shared/MessengerService.cs b/src/Managing.Application/Shared/MessengerService.cs index 1d5c82d5..b5ea66d6 100644 --- a/src/Managing.Application/Shared/MessengerService.cs +++ b/src/Managing.Application/Shared/MessengerService.cs @@ -11,13 +11,11 @@ public class MessengerService : IMessengerService { private readonly IDiscordService _discordService; private readonly IWebhookService _webhookService; - private readonly IUserService _userService; - public MessengerService(IDiscordService discordService, IWebhookService webhookService, IUserService userService) + public MessengerService(IDiscordService discordService, IWebhookService webhookService) { _discordService = discordService; _webhookService = webhookService; - _userService = userService; } public async Task SendClosedPosition(string address, Trade oldTrade) diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml index 1d050d9a..e81a7138 100644 --- a/src/docker-compose.override.yml +++ b/src/docker-compose.override.yml @@ -8,6 +8,29 @@ services: - ASPNETCORE_URLS=https://+:443;http://+:80 - ASPNETCORE_Kestrel__Certificates__Default__Password=!MotdepasseFort11 - ASPNETCORE_Kestrel__Certificates__Default__Path=/src/managing_cert.pfx + # Database Configuration + - PostgreSql__ConnectionString=Host=postgres;Port=5432;Database=managing;Username=postgres;Password=postgres + - PostgreSql__Orleans=Host=postgres;Port=5432;Database=orleans;Username=postgres;Password=postgres + # InfluxDB Configuration + - InfluxDb__Url=http://influxdb:8086 + - InfluxDb__Token=Fw2FPL2OwTzDHzSbR2Sd5xs0EKQYy00Q-hYKYAhr9cC1_q5YySONpxuf_Ck0PTjyUiF13xXmi__bu_pXH-H9zA== + # Authentication & Security + - Jwt__Secret=your-jwt-secret-here-minimum-32-characters + - Privy__AppSecret=63Chz2z5M8TgR5qc8dznSLRAGTHTyPU4cjdQobrBF1Cx5tszZpTuFgyrRd7hZ2k6HpwDz3GEwQZzsCqHb8Z311bF + # External Services + - Sentry__Dsn=your-sentry-dsn-here + - KAIGEN_SECRET_KEY=KaigenXCowchain + # Discord Bot Configuration + - Discord__ApplicationId=966075382002516031 + - Discord__PublicKey=63028f6bb740cd5d26ae0340b582dee2075624011b28757436255fc002ca8a7c + - Discord__TokenId=OTY2MDc1MzgyMDAyNTE2MDMx.Yl8dzw.xpeIAaMwGrwTNY4r9JYv0ebzb-U + # Flagsmith Configuration + - Flagsmith__ApiKey=ser.ShJJJMtWYS9fwuzd83ejwR + # N8n Configuration + - N8n__WebhookUrl=https://n8n.kai.managing.live/webhook/fa9308b6-983b-42ec-b085-71599d655951 + - N8n__IndicatorRequestWebhookUrl=https://n8n.kai.managing.live/webhook/3aa07b66-1e64-46a7-8618-af300914cb11 + - N8n__Username=managing-api + - N8n__Password=T259836*PdiV2@%!eR%Qf4 ports: - "82:80" - "446:443"