Richard/PolyTraderSharp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Slice 6 (Fable-Fixes): Totcode/Demo-Balance/Settings-Validierung + Plan-Abschluss

Browse Source 
- Totcode: services/SnapshotService.cs entfernt (nirgends registriert).
- Demo-Balance/PnL-Reconciliation: Demo-BUY zieht jetzt die Entry-Fee ab, Demo-Close
  schreibt netto (exitUsd - Exit-Fee) gut -> Summe(Balance-Aenderungen) = Summe(PnL)
  statt um die Fees zu driften (Demo als Validierung konsistent).
- Settings-Validierung: SellLogic.IsLadderConfigInverted (Max-Preisabstand >= SELL-Floor
  -> Leiter startet am Floor) + Warnung beim Settings-Laden (StartupHydration).

Bewusst als Follow-up dokumentiert (Live-Verifikation/Risiko): M3-Autoincrement-Migration,
PersistenceService-Dedup-Zeitfenster, Perf (UpsertLive-Dirty-Check, Leiter-Parallelitaet).

Tests: +3 (IsLadderConfigInverted). Build 0 Fehler, 236 gruen, --smoke-ui ok.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Richard
2026-07-09 18:45:52 +02:00
co-authored by Claude Opus 4.8
parent 84b2b276d9
commit 782c08a860
6 changed files with 50 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/SnapshotService.cs
-152
View File
@@ -1,152 +0,0 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using PolyTraderSharp.Models;
namespace PolyTraderSharp.Services
{
public class SnapshotService : BackgroundService
{
private readonly TradingState _state;
private readonly CopyTradingState _copyState;
private readonly ILogger<SnapshotService> _logger;
private readonly string _snapshotPath = "snapshot.json";
private readonly TimeSpan _interval = TimeSpan.FromSeconds(30);
private readonly JobStatusRow _jobStatus;
public SnapshotService(TradingState state, CopyTradingState copyState, ILogger<SnapshotService> logger, JobManager jobManager)
{
_state = state;
_copyState = copyState;
_logger = logger;
_jobStatus = new JobStatusRow
{
JobName = "State Snapshot",
Description = "Saves active application state (balances, open pos) to snapshot.json.",
StatusText = "Pending Initial Delay..."
};
_jobStatus.ManualTriggerAction = async () =>
{
string oldStatus = _jobStatus.StatusText;
_jobStatus.StatusText = "Running (Manual)...";
await SaveSnapshotAsync();
_jobStatus.StatusText = "Idle";
};
jobManager.RegisterJob(_jobStatus);
}
public override async Task StartAsync(CancellationToken cancellationToken)
{
// Load state on startup
if (File.Exists(_snapshotPath))
{
try
{
string json = await File.ReadAllTextAsync(_snapshotPath, cancellationToken);
var snapshot = JsonConvert.DeserializeObject<StateSnapshot>(json);
if (snapshot != null)
{
_state.LiveTradingMode = snapshot.LiveMode;
_state.DemoTradingMode = snapshot.DemoMode;
_copyState.TotalCopyTrades = snapshot.CopyTrades;
_state.GlobalPnl = snapshot.GlobalPnl;
int restoredPositions = 0;
// Restore OpenPositions to matching accounts
foreach (var kvp in snapshot.OpenPositions)
{
if (_state.Accounts.TryGetValue(kvp.Key, out var acc))
{
foreach (var pos in kvp.Value)
{
acc.OpenPositions.TryAdd(pos.Key, pos.Value);
restoredPositions++;
}
}
}
_logger.LogInformation($"Snapshot loaded. Restored {restoredPositions} positions. Modes: Live={snapshot.LiveMode}, Demo={snapshot.DemoMode}");
}
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to load snapshot on startup");
}
}
await base.StartAsync(cancellationToken);
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
_jobStatus.StatusText = "Idle";
while (!stoppingToken.IsCancellationRequested)
{
if (_jobStatus.IsEnabled)
{
try
{
_jobStatus.StatusText = "Running (Scheduled)...";
await SaveSnapshotAsync();
_jobStatus.LastRun = DateTime.Now;
}
catch (TaskCanceledException)
{
break;
}
catch (Exception ex)
{
_logger.LogError(ex, "Error saving TradingState snapshot");
_jobStatus.StatusText = "Error!";
}
finally
{
if (_jobStatus.StatusText != "Error!") _jobStatus.StatusText = "Idle";
}
}
else
{
_jobStatus.StatusText = "Paused";
}
_jobStatus.NextRun = DateTime.Now.Add(_interval);
await Task.Delay(_interval, stoppingToken);
}
}
private async Task SaveSnapshotAsync()
{
var snapshot = new StateSnapshot
{
LiveMode = _state.LiveTradingMode,
DemoMode = _state.DemoTradingMode,
CopyTrades = _copyState.TotalCopyTrades,
GlobalPnl = _state.GlobalPnl,
OpenPositions = _state.Accounts.ToDictionary(
a => a.Key,
a => a.Value.OpenPositions.ToDictionary(p => p.Key, p => p.Value)
)
};
string json = JsonConvert.SerializeObject(snapshot, Formatting.Indented);
await File.WriteAllTextAsync(_snapshotPath, json);
_logger.LogTrace("TradingState snapshot saved.");
}
private class StateSnapshot
{
public TradingMode LiveMode { get; set; }
public TradingMode DemoMode { get; set; }
public int CopyTrades { get; set; }
public decimal GlobalPnl { get; set; }
public Dictionary<int, Dictionary<string, Position>> OpenPositions { get; set; } = new();
}
}
}
services/StartupHydrationService.cs
+5
View File
@@ -4,6 +4,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Hosting;
using PolyTrader.Core.Persistence;
using PolyTrader.Modules.CopyTrading.Logic;
using PolyTrader.Modules.CopyTrading.Persistence;
using PolyTraderSharp.Models;
@@ -92,6 +93,10 @@ namespace PolyTraderSharp.Services
if (existing.TryGetValue(acc.AccountId, out var s))
{
_copyState.AccountSettings[acc.AccountId] = s;
// Konfig-Plausibilität: BUY-Preisabstand ≥ SELL-Floor → Leiter startet am Floor.
if (SellLogic.IsLadderConfigInverted(s.MaxPriceDifference, s.SellFloorPct))
_logger.Warning($"⚠️ [Settings] {acc.Name}: Max. Preisabstand ({s.MaxPriceDifference:F1}%) ≥ SELL-Floor " +
$"({s.SellFloorPct:F1}%) – die SELL-Leiter startet direkt am Floor (keine echte Eskalation). Floor erhöhen oder Abstand senken.");
continue;
}