Compare commits
10
Commits
487ea4466d
...
e14dd25979
| Author | SHA1 | Date | |
|---|---|---|---|
 RichardandClaude Opus 5
|
e14dd25979 | ||
|
RichardandClaude Opus 5
|
636713b573 | ||
|
RichardandClaude Opus 5
|
6218a04fe4 | ||
|
RichardandClaude Opus 5
|
5507db3e32 | ||
|
RichardandClaude Opus 5
|
1fd3671b42 | ||
|
RichardandClaude Opus 5
|
bf8048b82a | ||
|
RichardandClaude Opus 5
|
dd8da3fd3f | ||
|
RichardandClaude Opus 5
|
ac5e16f0a6 | ||
|
RichardandAntigravity AI
|
7f0b05e9ba | ||
|
RichardandClaude Opus 5
|
29ea62fc7f |
@@ -0,0 +1,22 @@
|
||||
# Zeilenenden
|
||||
#
|
||||
# Entwickelt wird auf Windows (core.autocrlf=true), ausgeführt wird auf Linux. Für die
|
||||
# meisten Dateien ist das folgenlos - für die unten aufgeführten nicht: ein Shell-Skript
|
||||
# oder eine systemd-Unit mit CRLF scheitert auf Linux mit irreführenden Meldungen
|
||||
# ("command not found" für einen Befehl, der sichtbar dasteht - das \r gehört noch dazu).
|
||||
# Deshalb wird für diese Dateien LF erzwungen, unabhängig von der lokalen Git-Konfiguration.
|
||||
|
||||
# Standard: Git entscheidet, im Repo immer LF
|
||||
* text=auto
|
||||
|
||||
# Muss im Arbeitsverzeichnis LF bleiben - wird auf Linux ausgeführt
|
||||
*.yml text eol=lf
|
||||
*.yaml text eol=lf
|
||||
*.sh text eol=lf
|
||||
*.service text eol=lf
|
||||
|
||||
# Binärdateien nicht anfassen
|
||||
*.png binary
|
||||
*.ico binary
|
||||
*.nupkg binary
|
||||
*.pdf binary
|
||||
@@ -0,0 +1,159 @@
|
||||
name: CI
|
||||
|
||||
# Wozu diese CI da ist:
|
||||
# PolyTrader läuft künftig auf einem Linux-Server. Der plattformneutrale Zustand ist am
|
||||
# 22.08.2026 mühsam hergestellt worden (WinForms-Ausbau) und driftet ohne Wächter wieder weg —
|
||||
# eine einzige `net10.0-windows`-Zeile oder ein `using System.Drawing` genügt, und der
|
||||
# Linux-Build ist still kaputt. Genau das fängt der "guard"-Job ab, und zwar auf Linux,
|
||||
# nicht auf einer Windows-Entwicklermaschine, auf der es zufällig weiter baut.
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
DOTNET_NOLOGO: "true"
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
|
||||
|
||||
jobs:
|
||||
|
||||
build-test:
|
||||
name: Build & Tests (Linux)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Quellcode holen
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: .NET SDK einrichten
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '10.0.x'
|
||||
|
||||
- name: Pakete wiederherstellen
|
||||
# Der lokale Feed lib/nuget (Deploymentcenter.Client) ist in NuGet.Config relativ
|
||||
# eingebunden und liegt im Repo - hier ist also nichts zusätzlich einzurichten.
|
||||
run: dotnet restore PolyTraderSharp.sln
|
||||
|
||||
- name: Bauen
|
||||
run: dotnet build PolyTraderSharp.sln --configuration Release --no-restore
|
||||
|
||||
- name: Tests
|
||||
run: dotnet test tests/PolyTrader.Tests/PolyTrader.Tests.csproj --configuration Release --no-build --verbosity normal
|
||||
|
||||
- name: Linux-Publish (Nachweis der Lauffähigkeit)
|
||||
# Kein Selbstzweck: hier fällt auf, wenn ein Paket doch windows-only ist.
|
||||
run: dotnet publish src/PolyTrader.App.Avalonia/PolyTrader.App.Avalonia.csproj --configuration Release --runtime linux-x64 --self-contained false --output ./artifacts/linux-x64
|
||||
|
||||
- name: Publish-Ergebnis prüfen
|
||||
run: |
|
||||
set -e
|
||||
cd ./artifacts/linux-x64
|
||||
for f in PolyTrader.App.Avalonia PolyTrader.App.Avalonia.dll appsettings.json setup.json; do
|
||||
if [ ! -f "$f" ]; then
|
||||
echo "FEHLER: '$f' fehlt im Linux-Publish."
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
# Die nativen Skia-/HarfBuzz-Bibliotheken müssen die Linux-Fassung sein.
|
||||
if ! ls libSkiaSharp.so >/dev/null 2>&1; then
|
||||
echo "FEHLER: libSkiaSharp.so fehlt - Avalonia wäre auf Linux nicht lauffähig."
|
||||
exit 1
|
||||
fi
|
||||
echo "Linux-Publish vollständig ($(ls | wc -l) Dateien)."
|
||||
|
||||
guard:
|
||||
name: Plattformneutralität & Hygiene
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Quellcode holen
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: .NET SDK einrichten
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: '10.0.x'
|
||||
|
||||
- name: Keine windows-spezifischen Zielframeworks
|
||||
run: |
|
||||
set -e
|
||||
treffer=$(grep -rn -E "<TargetFrameworks?>[^<]*-windows" --include="*.csproj" . || true)
|
||||
if [ -n "$treffer" ]; then
|
||||
echo "FEHLER: windows-spezifisches Zielframework gefunden:"
|
||||
echo "$treffer"
|
||||
echo ""
|
||||
echo "PolyTrader ist seit dem 22.08.2026 plattformneutral. Siehe docs/PROJEKTSTAND.md."
|
||||
exit 1
|
||||
fi
|
||||
echo "OK - alle Projekte sind plattformneutral."
|
||||
|
||||
- name: Kein WinForms/WPF
|
||||
run: |
|
||||
set -e
|
||||
treffer=$(grep -rn -E "<(UseWindowsForms|UseWPF)>\s*true" --include="*.csproj" . || true)
|
||||
if [ -n "$treffer" ]; then
|
||||
echo "FEHLER: WinForms/WPF wurde wieder eingeschaltet:"
|
||||
echo "$treffer"
|
||||
exit 1
|
||||
fi
|
||||
echo "OK - kein WinForms/WPF."
|
||||
|
||||
- name: Keine windows-only Namespaces im Code
|
||||
run: |
|
||||
set -e
|
||||
# Nur echte using-Direktiven, keine Kommentare - die erklären im Bestand
|
||||
# bewusst, WARUM etwas nicht verwendet wird.
|
||||
treffer=$(grep -rn -E "^\s*using\s+System\.(Windows\.Forms|Drawing)\s*;" --include="*.cs" src/ tests/ || true)
|
||||
if [ -n "$treffer" ]; then
|
||||
echo "FEHLER: windows-only Namespace eingebunden:"
|
||||
echo "$treffer"
|
||||
echo ""
|
||||
echo "System.Drawing.Common ist seit .NET 7 Windows-only und wirft auf Linux."
|
||||
exit 1
|
||||
fi
|
||||
echo "OK - keine windows-only Namespaces."
|
||||
|
||||
- name: Keine Secret-Dateien versioniert
|
||||
run: |
|
||||
set -e
|
||||
# Diese Dateien enthalten echte Zugangsdaten und gehören nie ins Repo.
|
||||
# packager.config.json trägt FTP-Passwort und updateservice:publish-Token.
|
||||
verboten="deploy/packager.config.json appsettings.Local.json master.key openrouter.key .gitea-token server_settings.xml"
|
||||
fehler=0
|
||||
for f in $verboten; do
|
||||
if git ls-files --error-unmatch "$f" >/dev/null 2>&1; then
|
||||
echo "FEHLER: '$f' ist versioniert - enthält Zugangsdaten."
|
||||
fehler=1
|
||||
fi
|
||||
done
|
||||
# Zusätzlich: Deploymentcenter-Tokens im Klartext irgendwo in versionierten Dateien.
|
||||
# Die Plandokumente kürzen Tokens bewusst mit "…" ab, echte sind 40+ Zeichen.
|
||||
if git grep -nE "dc_(sub|master)_[0-9a-f]{40,}" -- . >/dev/null 2>&1; then
|
||||
echo "FEHLER: Deploymentcenter-Token im Klartext gefunden:"
|
||||
git grep -nE "dc_(sub|master)_[0-9a-f]{40,}" -- .
|
||||
fehler=1
|
||||
fi
|
||||
if [ "$fehler" -ne 0 ]; then
|
||||
echo ""
|
||||
echo "Diese Dateien gehören in .gitignore, nicht ins Repo."
|
||||
exit 1
|
||||
fi
|
||||
echo "OK - keine Secret-Dateien versioniert."
|
||||
|
||||
- name: Pakete auf bekannte Schwachstellen prüfen
|
||||
# Punkt 1 der wiederkehrenden Audit-Checkliste aus docs/sicherheit/SICHERHEITSKONZEPT.md.
|
||||
# Läuft ab jetzt bei jedem Push statt nur quartalsweise von Hand.
|
||||
run: |
|
||||
set -e
|
||||
dotnet restore PolyTraderSharp.sln
|
||||
ausgabe=$(dotnet list PolyTraderSharp.sln package --vulnerable --include-transitive)
|
||||
echo "$ausgabe"
|
||||
if echo "$ausgabe" | grep -qE "^\s+>\s"; then
|
||||
echo ""
|
||||
echo "FEHLER: anfällige Pakete gefunden (siehe oben)."
|
||||
exit 1
|
||||
fi
|
||||
echo "OK - keine anfälligen Pakete."
|
||||
+6
-4
@@ -25,7 +25,9 @@ server_settings.xml
|
||||
appsettings.*.json
|
||||
!appsettings.json
|
||||
|
||||
# Mongo-Exporte (enthalten Secrets: PrivateKey, ApiSecret) – niemals committen
|
||||
# Mongo-Exporte (enthalten Secrets: PrivateKey, ApiSecret) – niemals committen.
|
||||
# Die Migration nach MySQL ist abgeschlossen und der Ordner am 22.08.2026 entfernt;
|
||||
# der Eintrag bleibt als Schutz, falls noch einmal ein Export angelegt wird.
|
||||
MongoDB/
|
||||
|
||||
# Gitea Personal Access Token für Pushes – niemals committen
|
||||
@@ -33,13 +35,13 @@ MongoDB/
|
||||
master.key
|
||||
openrouter.key
|
||||
|
||||
# Packager-Zugangsdaten (FTP, updateservice:publish-Token) – Vorlage in deploy/packager.config.example.json
|
||||
deploy/packager.config.json
|
||||
|
||||
# ── Logs & temporäre Dateien ─────────────────────
|
||||
*.log
|
||||
*.tmp
|
||||
|
||||
# ── Agent-Arbeitsbereich: Brain / Chatverlauf ────
|
||||
agentspace/antigravity/
|
||||
|
||||
# ── Backups ──────────────────────────────────────
|
||||
*.bak
|
||||
*.bak[0-9]
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
<Project>
|
||||
|
||||
<!--
|
||||
Eine Versionsnummer für alle Projekte der Solution.
|
||||
|
||||
Vorher stand in keiner einzigen .csproj ein <Version> - jede Assembly trug
|
||||
stillschweigend 1.0.0.0. Für den Deploymentcenter-UpdateService ist das
|
||||
kein kosmetischer Mangel: der Packager prüft den Aufrufparameter "version"
|
||||
gegen die Hauptassembly und bricht bei Abweichung ab (aus gutem Grund: wird 1.0.1
|
||||
als 1.0.2 veröffentlicht, aktualisieren alle Clients, melden aber weiter
|
||||
1.0.1, halten das Release erneut für neu und aktualisieren bei jedem Start
|
||||
wieder). Eine zentrale Version verhindert genau das: <Version> steht ab
|
||||
jetzt an genau einer Stelle, nicht verstreut über mehrere Projektdateien,
|
||||
die sonst früher oder später auseinanderlaufen.
|
||||
|
||||
Hochzählen bei jedem Release, siehe
|
||||
docs/archiv/umsetzungsplaene/UMSETZUNGSPLAN-Deploymentcenter-Integration.md (D-4).
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<Version>0.1.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,21 +0,0 @@
|
||||
|
||||
Ideen zur direkten Umsetzung:
|
||||
Die Menüleiste enthält zwar jetzt alle Fenster. Sie sind jedoch im Untermenü "Fenster" versteckt. So sollte das nicht sein. Sie sollen ganz normal im Menüstrip nebeneinander aufgelistet sein. Füge auch die entsprechenden icons hinzu.
|
||||
|
||||
Polytrader darf nicht einfach so mit einem Klick auf "Beenden" beendet werden. Polytrader und seine "Module" müssen sicher heruntergefahren werden. Damit z.B. die Softare nicht beendet wird wärend wir noch auf eine API Antwort warten oder ähnliches.
|
||||
Es muss eine Sicherheitsabfrage geben, die nur nach ablauf eines 10 Sekunden Timers den Beendigungsvorgang einleiten kann, ein Abbrechen button soll immer klickbar sein. Nach dem Bestätigen des Beendigungsvorgangs wird das Programm heruntergefahren.
|
||||
|
||||
Zum Dashboard
|
||||
Wir benötigen im Dashboard noch die Möglichkeit die einzelnen Module zu aktivieren / deaktivieren bzw. ggf eine kurze Info anzuzeigen falls eine aktivierung nicht möglich ist.
|
||||
|
||||
Ideen, die wir im Hinterkopf behalten:
|
||||
|
||||
Wir benötigen einen Watchdog der mich informiert falls Predictalytics abstürzt oder schwerwiegende Fehler verursacht. WIe könnten wir das umsetzen ?
|
||||
|
||||
|
||||
In Bezug auf den Supervisor:
|
||||
Wir haben neben Polytrader und Predictalytics auch noch das Project "ClawdDotNet" in der Hinterhand.
|
||||
Das ist ein Agentenorchestrator, den wir bereits in betrieb hatten. Schau dir den Code und die Funktionen einmal an.
|
||||
Eventuell können wir dieses Projekt oder wenigstens Code Teile davon auch bei unserem Trading Setup verwenden.
|
||||
|
||||
|
||||
@@ -1,176 +0,0 @@
|
||||
using System;
|
||||
using LicenseLabrador.Client;
|
||||
using PolyTrader.Core.Security;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Licensing
|
||||
{
|
||||
/// <summary>
|
||||
/// Lizenz-Torwächter für den Programmstart (B.4). Prüft beim Start die LicenseLabrador-Lizenz und
|
||||
/// entscheidet, ob PolyTrader voll (mit allen Modulen) oder eingeschränkt (nur Core-Shell, damit
|
||||
/// Terminal und Einstellungen zum Eintragen einer Lizenz erreichbar bleiben) startet.
|
||||
///
|
||||
/// **Grundsatz:** kein harter Abbruch (<c>Environment.Exit</c>) bei ungültiger Lizenz. Ein
|
||||
/// Trading-Bot mit offenen Positionen darf nicht mitten im Lauf hart abgeschossen werden – im
|
||||
/// Zweifel startet die Shell ohne die Trading-/Analyse-Module weiter. Der Gate wirft nie; jeder
|
||||
/// Fehler in der Prüfung führt zum eingeschränkten Modus, nicht zum Absturz.
|
||||
///
|
||||
/// Die eigentliche Kryptografie (Ed25519-Signaturprüfung, Nonce, Offline-Kulanz, Hardware-Bindung)
|
||||
/// liegt im <see cref="LicenseClient"/> des SDK; dieser Gate ist nur die Anwendungslogik drumherum.
|
||||
/// </summary>
|
||||
public static class LicenseGate
|
||||
{
|
||||
/// <summary>
|
||||
/// Öffentlicher Ed25519-Schlüssel des Lizenzservers (license.mhdf.de), Base64. Bewusst fest
|
||||
/// eingebettet: nur mit diesem Schlüssel lässt sich eine Server-Antwort verifizieren – ein
|
||||
/// Angreifer kann ohne den (nur serverseitigen) privaten Schlüssel kein „valid" fälschen.
|
||||
/// </summary>
|
||||
private const string PublicKeyBase64 = "L7YR1wMKk8+lNefatzL+DMvAtHFVkZWYXAxXGrro+/U=";
|
||||
|
||||
/// <summary>Produkt-Slug im LicenseLabrador-Admin.</summary>
|
||||
private const string ProductSlug = "pt";
|
||||
|
||||
/// <summary>
|
||||
/// Lizenzserver-Endpunkt. Ausschließlich HTTPS – über http:// gingen Lizenzschlüssel und
|
||||
/// Hardware-ID im Klartext übers Netz (die signierte Antwort bliebe zwar fälschungssicher,
|
||||
/// der Schlüssel würde aber geleakt).
|
||||
/// </summary>
|
||||
private static readonly string[] Endpoints = { "https://license.mhdf.de" };
|
||||
|
||||
/// <summary>Offline-Kulanz, falls der Server das Feld nicht liefert (7 Tage).</summary>
|
||||
private const int OfflineGraceHoursFallback = 168;
|
||||
|
||||
public static LicenseConfig BuildConfig() => new LicenseConfig
|
||||
{
|
||||
ProductSlug = ProductSlug,
|
||||
PublicKeyBase64 = PublicKeyBase64,
|
||||
Endpoints = Endpoints,
|
||||
OfflineGraceHoursFallback = OfflineGraceHoursFallback
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Führt die Startprüfung durch. Rückgabe <c>true</c> = App darf voll (mit Modulen) starten.
|
||||
/// Zeigt bei ungültiger Lizenz einen modalen Dialog (Schlüssel eingeben, Hardware-ID anzeigen,
|
||||
/// eingeschränkt starten). Wirft nie.
|
||||
/// </summary>
|
||||
public static bool RunStartupGate(ServerSettings settings, TerminalLogger logger, string settingsPath)
|
||||
{
|
||||
LicenseClient client;
|
||||
try
|
||||
{
|
||||
client = new LicenseClient(BuildConfig());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error($"❌ Lizenzprüfung nicht initialisierbar: {ex.Message}. Start im eingeschränkten Modus.");
|
||||
return false;
|
||||
}
|
||||
|
||||
string storedKey = "";
|
||||
try
|
||||
{
|
||||
// Erlaubt einen mit dem Master-Key verschlüsselten Schlüssel (enc:v1:…); Klartext
|
||||
// wird unverändert durchgereicht.
|
||||
storedKey = SecretProtection.Unprotect(settings.LicenseKey);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Warning($"⚠️ Gespeicherter Lizenzschlüssel nicht lesbar ({ex.Message}) – behandle als 'keine Lizenz'.");
|
||||
}
|
||||
|
||||
LicenseResult result = EvaluateBlocking(client, storedKey);
|
||||
|
||||
if (result.IsUsable)
|
||||
{
|
||||
LogUsable(result, logger);
|
||||
return true;
|
||||
}
|
||||
|
||||
logger.Warning($"⚠️ Keine gültige Lizenz: {Describe(result)}. Öffne Lizenzdialog.");
|
||||
|
||||
LicenseResult? dialogResult;
|
||||
string? dialogKey;
|
||||
try
|
||||
{
|
||||
using var dlg = new PolyTraderSharp.Ui.LicenseDialog(client, storedKey, result);
|
||||
dlg.ShowDialog();
|
||||
dialogResult = dlg.ValidatedResult;
|
||||
dialogKey = dlg.ValidatedKey;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error($"❌ Lizenzdialog fehlgeschlagen: {ex.Message}. Start im eingeschränkten Modus.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (dialogResult != null && dialogResult.IsUsable && !string.IsNullOrWhiteSpace(dialogKey))
|
||||
{
|
||||
try
|
||||
{
|
||||
// Bei gesetztem Master-Key verschlüsselt speichern; sonst Klartext (Passthrough).
|
||||
settings.LicenseKey = SecretProtection.Protect(dialogKey!.Trim());
|
||||
settings.Save(settingsPath);
|
||||
logger.Info("🔑 Lizenz validiert und gespeichert.");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error($"Lizenz gültig, aber Speichern des Schlüssels fehlgeschlagen: {ex.Message}.");
|
||||
}
|
||||
|
||||
LogUsable(dialogResult, logger);
|
||||
return true;
|
||||
}
|
||||
|
||||
logger.Warning(
|
||||
"⚠️ Start im EINGESCHRÄNKTEN Modus – keine Module aktiv, nur Terminal und Einstellungen. " +
|
||||
"Lizenz in den Einstellungen setzen und PolyTrader neu starten.");
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Validiert synchron (blockierend). Das SDK arbeitet durchgängig mit ConfigureAwait(false),
|
||||
/// daher ist das Blockieren vor der Message-Loop unbedenklich. Ein leerer Schlüssel ergibt
|
||||
/// planmäßig <see cref="LicenseState.NoLicense"/>.
|
||||
/// </summary>
|
||||
internal static LicenseResult EvaluateBlocking(LicenseClient client, string? key)
|
||||
{
|
||||
return client.ValidateAsync(key ?? string.Empty).GetAwaiter().GetResult();
|
||||
}
|
||||
|
||||
private static void LogUsable(LicenseResult result, TerminalLogger logger)
|
||||
{
|
||||
switch (result.State)
|
||||
{
|
||||
case LicenseState.Valid:
|
||||
logger.Info("🔑 Lizenz gültig (online geprüft).");
|
||||
break;
|
||||
case LicenseState.ValidOffline:
|
||||
logger.Warning($"🔑 Lizenz im Offline-Kulanzmodus gültig bis {result.GraceUntil:g} " +
|
||||
"(Server nicht erreichbar).");
|
||||
break;
|
||||
case LicenseState.ValidLocalFile:
|
||||
logger.Info("🔑 Lizenz über lokale Offline-Lizenzdatei gültig.");
|
||||
break;
|
||||
default:
|
||||
logger.Info($"🔑 Lizenz nutzbar ({result.State}).");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Kurzbeschreibung eines nicht nutzbaren Ergebnisses für das Log/den Dialog.</summary>
|
||||
internal static string Describe(LicenseResult result)
|
||||
{
|
||||
return result.State switch
|
||||
{
|
||||
LicenseState.NoLicense => "kein oder ungültiger Schlüssel / Server nicht erreichbar",
|
||||
LicenseState.NotFound => "Schlüssel dem Server unbekannt",
|
||||
LicenseState.Revoked => "Lizenz wurde widerrufen",
|
||||
LicenseState.Expired => "Lizenz abgelaufen",
|
||||
LicenseState.ActivationLimit => "maximale Aktivierungen erreicht",
|
||||
LicenseState.TamperSuspected => "Manipulation erkannt (Signatur/Uhr) – Prüfung verweigert",
|
||||
_ => result.State.ToString()
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace PolyTraderSharp.Models
|
||||
{
|
||||
public class DashboardRow
|
||||
{
|
||||
[Browsable(false)]
|
||||
public int AccountId { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public bool IsDemo { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public bool IsActive { get; set; }
|
||||
|
||||
[DisplayName("Account")]
|
||||
public string AccountName { get; set; } = string.Empty;
|
||||
|
||||
[DisplayName("Balance Gesamt")]
|
||||
public decimal TotalBalance { get; set; }
|
||||
|
||||
[DisplayName("Balance verfügbar")]
|
||||
public decimal AvailableBalance { get; set; }
|
||||
|
||||
[DisplayName("Balance in Positionen")]
|
||||
public decimal PositionBalance { get; set; }
|
||||
|
||||
[DisplayName("Offene Trades")]
|
||||
public int OpenTradesCount { get; set; }
|
||||
|
||||
[DisplayName("Trades (24h)")]
|
||||
public int ClosedTrades24h { get; set; }
|
||||
|
||||
[DisplayName("P&L (24h)")]
|
||||
public decimal Pnl24h { get; set; }
|
||||
|
||||
[DisplayName("Winrate (24h)")]
|
||||
public string Winrate24h { get; set; } = "0%";
|
||||
|
||||
[DisplayName("Trades (7d)")]
|
||||
public int ClosedTrades7d { get; set; }
|
||||
|
||||
[DisplayName("P&L (7d)")]
|
||||
public decimal Pnl7d { get; set; }
|
||||
|
||||
[DisplayName("Winrate (7d)")]
|
||||
public string Winrate7d { get; set; } = "0%";
|
||||
}
|
||||
}
|
||||
+7
-7
@@ -3,19 +3,19 @@
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||
<!-- Lokaler Feed für Pakete aus unseren eigenen Schwester-Projekten (LicenseLabrador).
|
||||
Bewusst ein Paket im Repo statt einer Projektreferenz nach ..\..\LicenseLabrador:
|
||||
PolyTrader muss eigenständig bauen, ohne dass das Schwester-Repo daneben liegt.
|
||||
<!-- Lokaler Feed für Pakete aus unseren eigenen Schwester-Projekten. Bewusst ein Paket im
|
||||
Repo statt einer Projektreferenz nach ..\..\Deploymentcenter: PolyTrader muss
|
||||
eigenständig bauen, ohne dass das Schwester-Repo daneben liegt.
|
||||
Neues SDK übernehmen: siehe lib/nuget/README.md. -->
|
||||
<add key="local" value="lib/nuget" />
|
||||
</packageSources>
|
||||
<!-- Source-Mapping verhindert Dependency Confusion: unsere LicenseLabrador.*-Pakete werden
|
||||
ausschließlich lokal aufgelöst und können nicht von einem gleichnamigen Paket auf
|
||||
nuget.org verdrängt werden. Alles andere kommt weiterhin von nuget.org. -->
|
||||
<!-- Source-Mapping verhindert Dependency Confusion: unsere eigenen Pakete werden ausschließlich
|
||||
lokal aufgelöst und können nicht von einem gleichnamigen Paket auf nuget.org verdrängt
|
||||
werden. Alles andere kommt weiterhin von nuget.org. -->
|
||||
<packageSourceMapping>
|
||||
<clear />
|
||||
<packageSource key="local">
|
||||
<package pattern="LicenseLabrador.*" />
|
||||
<package pattern="Deploymentcenter.*" />
|
||||
</packageSource>
|
||||
<packageSource key="nuget.org">
|
||||
<package pattern="*" />
|
||||
|
||||
@@ -1,100 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net10.0-windows</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<ApplicationIcon>favicon.ico</ApplicationIcon>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<!-- Assembly heißt jetzt PolyTrader.App; RootNamespace bleibt PolyTraderSharp,
|
||||
damit die bestehenden Namespaces und die .resx-Ressourcenauflösung intakt bleiben. -->
|
||||
<AssemblyName>PolyTrader.App</AssemblyName>
|
||||
<RootNamespace>PolyTraderSharp</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Remove="agentspace\**" />
|
||||
<None Remove="agentspace\**" />
|
||||
<Compile Remove="libs\**" />
|
||||
<None Remove="libs\**" />
|
||||
<!-- Neue Modul-/Core-Projekte liegen unter src/ und werden separat kompiliert. -->
|
||||
<Compile Remove="src\**" />
|
||||
<None Remove="src\**" />
|
||||
<EmbeddedResource Remove="src\**" />
|
||||
<!-- Testprojekt unter tests/ wird separat kompiliert (nicht in die App ziehen). -->
|
||||
<Compile Remove="tests\**" />
|
||||
<None Remove="tests\**" />
|
||||
<EmbeddedResource Remove="tests\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="favicon.ico" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="appsettings.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<!-- Gitignorierte Local-Datei (MySQL-Connection) neben die EXE kopieren, damit die App
|
||||
die Verbindung auch findet, wenn sie NICHT aus dem Projekt-Root gestartet wird. -->
|
||||
<None Update="appsettings.Local.json" Condition="Exists('appsettings.Local.json')">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="agentspace\antigravity\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Resources.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Update="Properties\Settings.Designer.cs">
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Settings.settings</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Properties\Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Nethereum.Web3" Version="6.1.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<!-- Dashboard-Charts (MIT, keine Umsatzschwelle, kein Phone-Home – siehe docs/sicherheit). -->
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||
<!-- Angehoben, um Downgrade-Konflikt (EF Core zieht 8.0.2) aufzulösen. -->
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||
<PackageReference Include="ScottPlot" Version="5.1.59" />
|
||||
<!-- Lizenz-SDK (LicenseLabrador) als NuGet-Paket aus dem lokalen Feed lib/nuget.
|
||||
Bewusst KEINE Projektreferenz nach ..\..\LicenseLabrador: die beiden Repos bleiben
|
||||
eigenständig, PolyTrader baut ohne das Schwester-Repo. Aktualisieren: lib/nuget/README.md. -->
|
||||
<PackageReference Include="LicenseLabrador.Client" Version="1.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="src\PolyTrader.Core\PolyTrader.Core.csproj" />
|
||||
<ProjectReference Include="src\PolyTrader.Modules.CopyTrading\PolyTrader.Modules.CopyTrading.csproj" />
|
||||
<ProjectReference Include="src\PolyTrader.Modules.ResolutionFarming\PolyTrader.Modules.ResolutionFarming.csproj" />
|
||||
<ProjectReference Include="src\PolyTrader.Modules.Supervisor\PolyTrader.Modules.Supervisor.csproj" />
|
||||
<ProjectReference Include="src\PolyTrader.Modules.Accounting\PolyTrader.Modules.Accounting.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.14.36915.13
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolyTrader.App", "PolyTrader.App.csproj", "{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PolyTrader.Core", "src\PolyTrader.Core\PolyTrader.Core.csproj", "{3502A702-FA60-456E-BF23-05EAD02465E6}"
|
||||
@@ -33,18 +31,6 @@ Global
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|x64.Build.0 = Release|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8B91AC5C-8A7C-47BF-B651-6CF3B60FEC84}.Release|x86.Build.0 = Release|Any CPU
|
||||
{3502A702-FA60-456E-BF23-05EAD02465E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3502A702-FA60-456E-BF23-05EAD02465E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3502A702-FA60-456E-BF23-05EAD02465E6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
|
||||
-570
@@ -1,570 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Threading.Channels;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTrader.Core.Security;
|
||||
using System.Windows.Forms;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Options;
|
||||
using PolyTrader.Core.Configuration;
|
||||
using PolyTrader.Core.DependencyInjection;
|
||||
using PolyTrader.Core.Modularity;
|
||||
using PolyTrader.Modules.CopyTrading;
|
||||
using PolyTrader.Modules.CopyTrading.Persistence;
|
||||
using PolyTrader.Modules.ResolutionFarming;
|
||||
using PolyTrader.Modules.Supervisor;
|
||||
using PolyTrader.Modules.Accounting;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp;
|
||||
|
||||
internal static class Program
|
||||
{
|
||||
public static IHost? AppHost { get; private set; }
|
||||
|
||||
/// <summary>Pfad der (gitignorierten) Server-Settings-Datei – Quelle u.a. für die Modul-Aktivierung.</summary>
|
||||
private const string ServerSettingsPath = "server_settings.xml";
|
||||
|
||||
[STAThread]
|
||||
private static void Main(string[] args)
|
||||
{
|
||||
// Config-Migration aus mongoexport-JSON (Ordner, Default "MongoDB") -> MySQL.
|
||||
if (args.Length > 0 && string.Equals(args[0], "--migrate-json", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var folder = args.Length > 1 ? args[1] : "MongoDB";
|
||||
RunConfigMigrationFromJson(folder);
|
||||
return;
|
||||
}
|
||||
|
||||
// Readback-Verifikation der migrierten Config aus MySQL. Kein UI-Start.
|
||||
if (args.Length > 0 && string.Equals(args[0], "--verify-mysql", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
RunVerifyMySql();
|
||||
return;
|
||||
}
|
||||
|
||||
// Headless-Smoke-Test der UI: konstruiert jede View + den Launcher (ohne Message-Loop
|
||||
// und ohne Trading-/WSS-Services). Fängt Laufzeit-Konstruktionsfehler ab. Kein Fenster.
|
||||
if (args.Length > 0 && string.Equals(args[0], "--smoke-ui", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
Environment.ExitCode = RunSmokeUi();
|
||||
return;
|
||||
}
|
||||
|
||||
// Diagnose: gibt die MySQL-Serverversion aus (für das ServerVersion-Pinning). Kein UI.
|
||||
if (args.Length > 0 && string.Equals(args[0], "--db-version", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
RunDbVersion();
|
||||
return;
|
||||
}
|
||||
|
||||
ApplicationConfiguration.Initialize();
|
||||
|
||||
// Server-Settings früh laden (VOR der DI-Registrierung), damit deaktivierte Module gar nicht
|
||||
// erst geladen werden. Dieselbe Instanz wird als Singleton weitergereicht (eine Quelle).
|
||||
var serverSettings = PolyTraderSharp.Models.ServerSettings.Load(ServerSettingsPath);
|
||||
|
||||
// Früher Logger: wird unten als DI-Singleton weitergereicht, damit die Startmeldungen
|
||||
// (Master-Key, Lizenz) später im Terminal-Fenster erscheinen (History-Replay).
|
||||
var bootLog = new TerminalLogger();
|
||||
|
||||
// F1 (Sicherheit): Master-Key VOR jeder Entschlüsselung laden – wird sowohl für die
|
||||
// Account-Credentials als auch für den gespeicherten Lizenzschlüssel gebraucht.
|
||||
ConfigureSecretProtection(bootLog);
|
||||
|
||||
// Anzeige-Zeitzone einmalig setzen (Logs, Auswertungen). Ein unbekannter Wert ist nicht
|
||||
// fatal - es wird auf die Systemzeitzone ausgewichen und gewarnt.
|
||||
AppTimeZone.Configure(serverSettings.ApplicationTimeZoneId, m => bootLog.Warning(m));
|
||||
bootLog.Info($"Anzeige-Zeitzone: {AppTimeZone.CurrentId}");
|
||||
|
||||
// Alle bekannten Module; „modules" enthält nur die aktiven (nicht in DisabledModules).
|
||||
var allModules = new System.Collections.Generic.List<IPolyTraderModule>
|
||||
{
|
||||
new CopyTradingModule(),
|
||||
new ResolutionFarmingModule(),
|
||||
new SupervisorModule(),
|
||||
new AccountingModule()
|
||||
};
|
||||
var disabledModules = new System.Collections.Generic.HashSet<string>(
|
||||
serverSettings.DisabledModules, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
// B.4: Lizenzprüfung beim Start. Bei ungültiger Lizenz zeigt der Gate einen Dialog und
|
||||
// gibt false zurück → es werden KEINE Module registriert (nur die Core-Shell startet,
|
||||
// damit Terminal und Einstellungen zum Eintragen einer Lizenz erreichbar bleiben).
|
||||
// Bewusst KEIN Environment.Exit – ein Trading-Bot darf nicht mitten im Lauf hart sterben.
|
||||
bool licensed = PolyTraderSharp.Licensing.LicenseGate.RunStartupGate(serverSettings, bootLog, ServerSettingsPath);
|
||||
var modules = licensed
|
||||
? allModules.Where(m => !disabledModules.Contains(m.Name)).ToList()
|
||||
: new System.Collections.Generic.List<IPolyTraderModule>();
|
||||
|
||||
AppHost = Host.CreateDefaultBuilder()
|
||||
// Config immer neben der EXE suchen (nicht im Arbeitsverzeichnis), damit die App
|
||||
// auch beim Start aus bin/ oder per Doppelklick ihre appsettings findet.
|
||||
.UseContentRoot(AppContext.BaseDirectory)
|
||||
// Host.CreateDefaultBuilder lädt appsettings.Local.json NICHT (nur appsettings.json
|
||||
// + appsettings.{Environment}.json). Die gitignorierte Local-Datei hält aber die
|
||||
// MySQL-Connection – daher hier explizit ergänzen, sonst bleibt sie leer.
|
||||
.ConfigureAppConfiguration((context, config) =>
|
||||
config.AddJsonFile("appsettings.Local.json", optional: true, reloadOnChange: false))
|
||||
.ConfigureServices(delegate(HostBuilderContext context, IServiceCollection services)
|
||||
{
|
||||
var databaseOptions = new DatabaseOptions
|
||||
{
|
||||
MySqlConnectionString = context.Configuration["Database:MySqlConnectionString"] ?? string.Empty
|
||||
};
|
||||
services.Configure<DatabaseOptions>(context.Configuration.GetSection(DatabaseOptions.SectionName));
|
||||
services.AddCorePersistence(databaseOptions);
|
||||
services.AddSingleton(serverSettings);
|
||||
services.AddSingleton<TradingState>();
|
||||
services.AddSingleton(delegate(IServiceProvider sp)
|
||||
{
|
||||
TerminalLogger requiredService2 = sp.GetRequiredService<TerminalLogger>();
|
||||
var httpHandler = new SocketsHttpHandler { PooledConnectionLifetime = TimeSpan.FromMinutes(2), MaxConnectionsPerServer = 100 };
|
||||
return new PolymarketApiService(requiredService2, new HttpClient(httpHandler)
|
||||
{
|
||||
DefaultRequestHeaders =
|
||||
{
|
||||
{ "User-Agent", "py_clob_client" },
|
||||
{ "Accept", "*/*" }
|
||||
}
|
||||
});
|
||||
});
|
||||
services.AddSingleton(delegate(IServiceProvider sp)
|
||||
{
|
||||
TerminalLogger requiredService2 = sp.GetRequiredService<TerminalLogger>();
|
||||
var httpHandler = new SocketsHttpHandler { PooledConnectionLifetime = TimeSpan.FromMinutes(2), MaxConnectionsPerServer = 100 };
|
||||
return new PolymarketClobClient(requiredService2, new HttpClient(httpHandler)
|
||||
{
|
||||
DefaultRequestHeaders =
|
||||
{
|
||||
{ "User-Agent", "py_clob_client" },
|
||||
{ "Accept", "*/*" }
|
||||
}
|
||||
});
|
||||
});
|
||||
// Denselben früh erzeugten Logger als Singleton weiterreichen, damit die
|
||||
// Master-Key-/Lizenz-Meldungen von oben im Terminal-Fenster auftauchen.
|
||||
services.AddSingleton(bootLog);
|
||||
services.AddSingleton<MullvadVpnService>();
|
||||
services.AddSingleton<JobManager>();
|
||||
|
||||
// Benachrichtigungen laufen über eine neutrale Senke. Threema ist entfallen; bis RocketChat
|
||||
// und Telegram angebunden sind, landen Meldungen im Terminal-Log (LogNotificationSink).
|
||||
services.AddSingleton<PolyTrader.Core.Notifications.INotificationSink>(
|
||||
sp => new PolyTrader.Core.Notifications.LogNotificationSink(sp.GetRequiredService<TerminalLogger>()));
|
||||
|
||||
// Watchdog-Heartbeat (Dead-Man's-Switch). Als Singleton registriert, damit das
|
||||
// Settings-Fenster denselben Dienst für ReloadSettings/Test-Heartbeat nutzt.
|
||||
services.AddSingleton(sp => new WatchdogHeartbeatService(sp.GetRequiredService<TerminalLogger>()));
|
||||
|
||||
// MUSS als erster HostedService laufen: hydriert den State, bevor die
|
||||
// Trading-Services gegen einen leeren State anlaufen.
|
||||
services.AddHostedService<CoreStateHydrationService>();
|
||||
|
||||
// Module registrieren ihre eigenen Services/Channels/State selbst.
|
||||
foreach (var module in modules)
|
||||
{
|
||||
services.AddSingleton(module);
|
||||
module.RegisterServices(services, context.Configuration);
|
||||
}
|
||||
|
||||
services.AddHostedService<MarketSyncService>();
|
||||
services.AddHostedService((IServiceProvider sp) => sp.GetRequiredService<MullvadVpnService>());
|
||||
services.AddHostedService((IServiceProvider sp) => sp.GetRequiredService<WatchdogHeartbeatService>());
|
||||
services.AddSingleton<PolyTraderSharp.Ui.ShellUiHost>();
|
||||
services.AddTransient<PolyTraderSharp.Ui.LauncherForm>();
|
||||
}).Build();
|
||||
|
||||
// (Master-Key wurde bereits VOR dem Host-Build geladen – siehe ConfigureSecretProtection(bootLog) oben.)
|
||||
|
||||
// F5 (Sicherheit): warnen, wenn die (remote) DB-Verbindung keine TLS-Erzwingung hat.
|
||||
WarnIfDbTlsNotEnforced(AppHost.Services);
|
||||
|
||||
try
|
||||
{
|
||||
// Trade-Nummerierung fortsetzen: höchste bestehende TradeId serverseitig lesen
|
||||
// (M3: kein Full-Table-Load mehr über Find(_=>true).Max()). Nur wenn CopyTrading aktiv ist –
|
||||
// sonst sind dessen Services (CopyTradingState/…) gar nicht registriert.
|
||||
if (modules.Any(m => m is CopyTradingModule))
|
||||
{
|
||||
var copyState = AppHost.Services.GetRequiredService<CopyTradingState>();
|
||||
var tradeLog = AppHost.Services.GetRequiredService<ICopyTradeLogRepository>();
|
||||
copyState.TotalCopyTrades = tradeLog.GetMaxTradeId();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// M3: NICHT still schlucken. Bliebe der Zähler bei 0, kollidierten neue TradeIds mit
|
||||
// historischen (PK ist ValueGeneratedNever) → stiller Verlust aller Session-Trades.
|
||||
var log = AppHost.Services.GetRequiredService<TerminalLogger>();
|
||||
log.Error($"❌ KRITISCH: TradeId-Fortsetzung konnte nicht initialisiert werden: {ex.Message}. " +
|
||||
"Trade-Nummerierung ist NICHT sicher – neue Trades könnten mit bestehenden kollidieren. Bitte DB prüfen.");
|
||||
}
|
||||
|
||||
AppHost.Start();
|
||||
|
||||
// F1: einmalige, idempotente Verschlüsselung evtl. vorhandener Klartext-Credentials in der DB.
|
||||
ReencryptAccountCredentials(AppHost.Services);
|
||||
|
||||
// Shell-Views registrieren (Core-App-Views; Module folgen via module.RegisterUi).
|
||||
var uiHost = AppHost.Services.GetRequiredService<PolyTraderSharp.Ui.ShellUiHost>();
|
||||
var viewServices = AppHost.Services;
|
||||
uiHost.RegisterView(new PolyTrader.Core.Modularity.ModuleView
|
||||
{
|
||||
Id = "core.terminal",
|
||||
Title = "Terminal",
|
||||
Group = "Core",
|
||||
Order = 10,
|
||||
CreateView = () =>
|
||||
{
|
||||
var view = new PolyTraderSharp.Ui.Views.TerminalView();
|
||||
view.Initialize(viewServices.GetRequiredService<TerminalLogger>());
|
||||
return view;
|
||||
}
|
||||
});
|
||||
uiHost.RegisterView(new PolyTrader.Core.Modularity.ModuleView
|
||||
{
|
||||
Id = "core.settings",
|
||||
Title = "Server Settings",
|
||||
Group = "Core",
|
||||
Order = 20,
|
||||
CreateView = () =>
|
||||
{
|
||||
var view = new PolyTraderSharp.Ui.Views.SettingsView();
|
||||
view.Initialize(
|
||||
viewServices.GetRequiredService<MullvadVpnService>(),
|
||||
viewServices.GetRequiredService<TerminalLogger>(),
|
||||
viewServices.GetRequiredService<PolyTrader.Core.Persistence.IAccountRepository>(),
|
||||
viewServices.GetRequiredService<TradingState>(),
|
||||
viewServices.GetRequiredService<WatchdogHeartbeatService>());
|
||||
return view;
|
||||
}
|
||||
});
|
||||
uiHost.RegisterView(new PolyTrader.Core.Modularity.ModuleView
|
||||
{
|
||||
Id = "core.jobs",
|
||||
Title = "Server Jobs",
|
||||
Group = "Core",
|
||||
Order = 30,
|
||||
CreateView = () =>
|
||||
{
|
||||
var view = new PolyTraderSharp.Ui.Views.JobsView();
|
||||
view.Initialize(viewServices.GetRequiredService<JobManager>());
|
||||
return view;
|
||||
}
|
||||
});
|
||||
uiHost.RegisterView(new PolyTrader.Core.Modularity.ModuleView
|
||||
{
|
||||
Id = "core.dashboard",
|
||||
Title = "Dashboard",
|
||||
Group = "Core",
|
||||
Order = 5,
|
||||
CreateView = () =>
|
||||
{
|
||||
var view = new PolyTraderSharp.Ui.Views.DashboardView();
|
||||
var config = viewServices.GetRequiredService<Microsoft.Extensions.Configuration.IConfiguration>();
|
||||
// Alle Module (auch deaktivierte) fürs Dashboard: läuft-Status = ist in dieser Session geladen.
|
||||
var moduleInfos = allModules
|
||||
.Select(m => new PolyTrader.Core.Modularity.ModuleActivationInfo(
|
||||
m.Name, modules.Contains(m), m.GetActivationBlocker(config)))
|
||||
.ToList();
|
||||
view.Initialize(
|
||||
viewServices.GetRequiredService<PolyTrader.Core.Persistence.ITradeLogRepository>(),
|
||||
viewServices.GetRequiredService<TradingState>(),
|
||||
moduleInfos,
|
||||
ServerSettingsPath);
|
||||
return view;
|
||||
}
|
||||
});
|
||||
// Modul-UI registrieren (Module steuern ihre Views selbst bei).
|
||||
foreach (var module in modules)
|
||||
{
|
||||
module.RegisterUi(uiHost, viewServices);
|
||||
}
|
||||
|
||||
// Menü-Icons zentral zuweisen: Die App kennt alle Fenster-Ressourcen; Core und Module
|
||||
// referenzieren sie nicht. So erscheint jedes Fenster mit Icon in der obersten Menüleiste.
|
||||
AssignMenuIcons(uiHost);
|
||||
|
||||
var launcher = AppHost.Services.GetRequiredService<PolyTraderSharp.Ui.LauncherForm>();
|
||||
Application.Run(launcher);
|
||||
AppHost.StopAsync().GetAwaiter().GetResult();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Weist den registrierten Views (Core + Module) ihren Standard-Symbolschlüssel zu.
|
||||
/// Die Auflösung Schlüssel → Bildressource liegt in <see cref="PolyTraderSharp.Ui.ViewIcons"/>;
|
||||
/// Core und Module kennen nur noch den Schlüssel (toolkit-neutral, siehe ModuleView.IconKey).
|
||||
/// </summary>
|
||||
private static void AssignMenuIcons(PolyTraderSharp.Ui.ShellUiHost uiHost)
|
||||
=> PolyTraderSharp.Ui.ViewIcons.AssignDefaults(uiHost);
|
||||
|
||||
private static void RunConfigMigrationFromJson(string folder)
|
||||
{
|
||||
var config = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
|
||||
.SetBasePath(System.IO.Directory.GetCurrentDirectory())
|
||||
.AddJsonFile("appsettings.json", optional: true)
|
||||
.AddJsonFile("appsettings.Local.json", optional: true)
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
|
||||
var mySql = config["Database:MySqlConnectionString"] ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(mySql))
|
||||
{
|
||||
Console.WriteLine("FEHLER: Database:MySqlConnectionString fehlt (appsettings.Local.json).");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!System.IO.Path.IsPathRooted(folder))
|
||||
folder = System.IO.Path.Combine(System.IO.Directory.GetCurrentDirectory(), folder);
|
||||
|
||||
Services.ConfigMigrator.RunFromJson(folder, mySql);
|
||||
}
|
||||
|
||||
private static void RunVerifyMySql()
|
||||
{
|
||||
var config = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
|
||||
.SetBasePath(System.IO.Directory.GetCurrentDirectory())
|
||||
.AddJsonFile("appsettings.json", optional: true)
|
||||
.AddJsonFile("appsettings.Local.json", optional: true)
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
|
||||
var mySql = config["Database:MySqlConnectionString"] ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(mySql))
|
||||
{
|
||||
Console.WriteLine("FEHLER: Database:MySqlConnectionString fehlt (appsettings.Local.json).");
|
||||
return;
|
||||
}
|
||||
|
||||
Services.ConfigMigrator.VerifyMySql(mySql);
|
||||
}
|
||||
|
||||
private static void RunDbVersion()
|
||||
{
|
||||
var config = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
|
||||
.SetBasePath(System.IO.Directory.GetCurrentDirectory())
|
||||
.AddJsonFile("appsettings.json", optional: true)
|
||||
.AddJsonFile("appsettings.Local.json", optional: true)
|
||||
.AddEnvironmentVariables()
|
||||
.Build();
|
||||
|
||||
var conn = config["Database:MySqlConnectionString"] ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(conn))
|
||||
{
|
||||
Console.WriteLine("FEHLER: Database:MySqlConnectionString fehlt (appsettings.Local.json).");
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
using var c = new MySqlConnector.MySqlConnection(conn);
|
||||
c.Open();
|
||||
Console.WriteLine($"ServerVersion: {c.ServerVersion}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"FEHLER: {ex.GetType().Name}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// F1: Lädt den Master-Key (POLYTRADER_MASTER_KEY, sonst gitignorierte master.key) und aktiviert die
|
||||
/// at-rest-Verschlüsselung. Ohne Key läuft die App wie bisher mit Klartext – mit deutlicher Warnung
|
||||
/// (kein stiller Sicherheitsverlust). Muss VOR jeder Credential-Entschlüsselung laufen.
|
||||
/// </summary>
|
||||
private static void ConfigureSecretProtection(TerminalLogger logger)
|
||||
{
|
||||
string? masterKey = Environment.GetEnvironmentVariable("POLYTRADER_MASTER_KEY");
|
||||
if (string.IsNullOrWhiteSpace(masterKey))
|
||||
{
|
||||
string keyFile = Path.Combine(AppContext.BaseDirectory, "master.key");
|
||||
if (File.Exists(keyFile)) masterKey = File.ReadAllText(keyFile).Trim();
|
||||
}
|
||||
SecretProtection.Configure(masterKey);
|
||||
|
||||
if (SecretProtection.IsConfigured)
|
||||
logger.Info("🔐 Secret-Verschlüsselung aktiv – Account-Credentials werden at-rest verschlüsselt (AES-256-GCM).");
|
||||
else
|
||||
logger.Warning("⚠️ SICHERHEIT: Kein POLYTRADER_MASTER_KEY gesetzt – Account-Credentials liegen UNVERSCHLÜSSELT in der DB. " +
|
||||
"Master-Key setzen (env POLYTRADER_MASTER_KEY oder master.key), siehe docs/sicherheit.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// F5: Warnt, wenn der DB-Connection-String keine TLS-Erzwingung (SslMode) enthält. Der String
|
||||
/// selbst wird NICHT geloggt (enthält das Passwort) – nur das Fehlen der TLS-Option.
|
||||
/// </summary>
|
||||
private static void WarnIfDbTlsNotEnforced(IServiceProvider services)
|
||||
{
|
||||
try
|
||||
{
|
||||
var config = services.GetService<Microsoft.Extensions.Configuration.IConfiguration>();
|
||||
string conn = config?["Database:MySqlConnectionString"] ?? string.Empty;
|
||||
if (string.IsNullOrEmpty(conn)) return;
|
||||
if (conn.IndexOf("sslmode", StringComparison.OrdinalIgnoreCase) < 0)
|
||||
{
|
||||
services.GetRequiredService<TerminalLogger>().Warning(
|
||||
"⚠️ SICHERHEIT: DB-Verbindung ohne SslMode – Transportverschlüsselung zur (remote) MySQL nicht erzwungen. " +
|
||||
"Im Connection-String 'SslMode=Required' (oder VerifyFull) setzen, siehe docs/sicherheit.");
|
||||
}
|
||||
}
|
||||
catch { /* Warnung ist best-effort; darf den Start nie stören */ }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// F1: Verschlüsselt einmalig/idempotent evtl. vorhandene Klartext-Credentials in der DB (Alt-Bestand
|
||||
/// wird beim Re-Save durch den EF-Converter verschlüsselt). Nur wenn ein Master-Key gesetzt ist.
|
||||
/// Fehler blockieren den Start nicht (Log); künftige Saves verschlüsseln ohnehin.
|
||||
/// </summary>
|
||||
private static void ReencryptAccountCredentials(IServiceProvider services)
|
||||
{
|
||||
if (!SecretProtection.IsConfigured) return;
|
||||
var logger = services.GetRequiredService<TerminalLogger>();
|
||||
try
|
||||
{
|
||||
var accountRepo = services.GetRequiredService<IAccountRepository>();
|
||||
var accounts = accountRepo.GetAll(); // Converter entschlüsselt/passt Klartext durch
|
||||
foreach (var acc in accounts) accountRepo.Upsert(acc); // Re-Save → Converter verschlüsselt
|
||||
logger.Info($"🔐 Account-Credentials at-rest gesichert ({accounts.Count} Account(s)).");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error($"Re-Encryption der Account-Credentials fehlgeschlagen: {ex.Message}. " +
|
||||
"Stimmt der Master-Key mit den bereits verschlüsselten Daten überein?");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Headless-Smoke-Test: baut einen minimalen Host (Persistenz + State + Modul-Registrierung
|
||||
/// + Shell/Launcher), hydriert den State aus MySQL und konstruiert jede registrierte View
|
||||
/// sowie den Launcher – ohne Message-Loop und ohne Trading-/WSS-Services zu starten.
|
||||
/// Gibt 0 zurück, wenn alles fehlerfrei konstruiert, sonst die Fehleranzahl.
|
||||
/// </summary>
|
||||
private static int RunSmokeUi()
|
||||
{
|
||||
ApplicationConfiguration.Initialize();
|
||||
|
||||
var modules = new System.Collections.Generic.List<IPolyTraderModule> { new CopyTradingModule(), new ResolutionFarmingModule(), new SupervisorModule(), new AccountingModule() };
|
||||
|
||||
using var host = Host.CreateDefaultBuilder()
|
||||
.UseContentRoot(AppContext.BaseDirectory)
|
||||
.ConfigureAppConfiguration((context, config) =>
|
||||
config.AddJsonFile("appsettings.Local.json", optional: true, reloadOnChange: false))
|
||||
.ConfigureServices((context, services) =>
|
||||
{
|
||||
var databaseOptions = new DatabaseOptions
|
||||
{
|
||||
MySqlConnectionString = context.Configuration["Database:MySqlConnectionString"] ?? string.Empty
|
||||
};
|
||||
services.Configure<DatabaseOptions>(context.Configuration.GetSection(DatabaseOptions.SectionName));
|
||||
services.AddCorePersistence(databaseOptions);
|
||||
services.AddSingleton<TerminalLogger>();
|
||||
services.AddSingleton<TradingState>();
|
||||
services.AddSingleton<CoreStateHydrationService>();
|
||||
services.AddSingleton<CopyTradingHydrationService>();
|
||||
|
||||
foreach (var module in modules)
|
||||
{
|
||||
services.AddSingleton(module);
|
||||
module.RegisterServices(services, context.Configuration);
|
||||
}
|
||||
|
||||
services.AddSingleton<PolyTraderSharp.Ui.ShellUiHost>();
|
||||
services.AddTransient<PolyTraderSharp.Ui.LauncherForm>();
|
||||
}).Build();
|
||||
|
||||
// F1: Master-Key laden, damit die Hydration verschlüsselte Credentials entschlüsseln kann.
|
||||
ConfigureSecretProtection(host.Services.GetRequiredService<TerminalLogger>());
|
||||
|
||||
// State aus MySQL laden (Accounts/Trader/Settings), ohne die BackgroundServices zu starten.
|
||||
try
|
||||
{
|
||||
host.Services.GetRequiredService<CoreStateHydrationService>()
|
||||
.StartAsync(default).GetAwaiter().GetResult();
|
||||
host.Services.GetRequiredService<CopyTradingHydrationService>()
|
||||
.StartAsync(default).GetAwaiter().GetResult();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"[WARN] Hydration übersprungen: {ex.Message}");
|
||||
}
|
||||
|
||||
var uiHost = host.Services.GetRequiredService<PolyTraderSharp.Ui.ShellUiHost>();
|
||||
foreach (var module in modules)
|
||||
module.RegisterUi(uiHost, host.Services);
|
||||
|
||||
int failures = 0;
|
||||
Console.WriteLine("=== Smoke-UI: View-Konstruktion ===");
|
||||
foreach (var view in uiHost.Views)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var form = (System.Windows.Forms.Form)view.CreateView();
|
||||
Console.WriteLine($"[OK] {view.Id} ({view.Title})");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
failures++;
|
||||
Console.WriteLine($"[FEHLER] {view.Id}: {ex.GetType().Name}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
using var launcher = host.Services.GetRequiredService<PolyTraderSharp.Ui.LauncherForm>();
|
||||
Console.WriteLine("[OK] LauncherForm konstruiert");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
failures++;
|
||||
Console.WriteLine($"[FEHLER] LauncherForm: {ex.GetType().Name}: {ex.Message}");
|
||||
}
|
||||
|
||||
// Core-Dashboard direkt konstruieren (im Smoke nicht via uiHost registriert) - prueft das ScottPlot-Rendering headless.
|
||||
try
|
||||
{
|
||||
using var dash = new PolyTraderSharp.Ui.Views.DashboardView();
|
||||
dash.Initialize(host.Services.GetRequiredService<ITradeLogRepository>(), host.Services.GetRequiredService<TradingState>());
|
||||
Console.WriteLine("[OK] core.dashboard konstruiert (inkl. Charts)");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
failures++;
|
||||
Console.WriteLine($"[FEHLER] core.dashboard: {ex.GetType().Name}: {ex.Message}");
|
||||
}
|
||||
|
||||
// Core-Views mit hand-erstellten Grid-Spalten direkt konstruieren (nicht im uiHost registriert):
|
||||
// faengt VS-Re-Serialisierungs-Regressionen (fallengelassene DataGridView-Spalten) ab.
|
||||
foreach (var (id, make) in new (string, Func<System.Windows.Forms.Form>)[]
|
||||
{
|
||||
("core.jobs", () => new PolyTraderSharp.Ui.Views.JobsView()),
|
||||
("core.terminal", () => new PolyTraderSharp.Ui.Views.TerminalView()),
|
||||
("core.settings", () => new PolyTraderSharp.Ui.Views.SettingsView()),
|
||||
})
|
||||
{
|
||||
try { using var f = make(); Console.WriteLine($"[OK] {id} konstruiert"); }
|
||||
catch (Exception ex) { failures++; Console.WriteLine($"[FEHLER] {id}: {ex.GetType().Name}: {ex.Message}"); }
|
||||
}
|
||||
|
||||
// B.4: Lizenzdialog headless konstruieren (kein Netz, keine Message-Loop) – fängt
|
||||
// Designer-/Konstruktionsregressionen ab.
|
||||
try
|
||||
{
|
||||
var licClient = new LicenseLabrador.Client.LicenseClient(PolyTraderSharp.Licensing.LicenseGate.BuildConfig());
|
||||
var dummy = new LicenseLabrador.Client.LicenseResult(
|
||||
LicenseLabrador.Client.LicenseState.NoLicense, null, null, "Smoke-Test", string.Empty);
|
||||
using (var licDlg = new PolyTraderSharp.Ui.LicenseDialog(licClient, string.Empty, dummy, startupContext: true))
|
||||
using (var licDlgManage = new PolyTraderSharp.Ui.LicenseDialog(licClient, string.Empty, null, startupContext: false))
|
||||
Console.WriteLine("[OK] license.dialog konstruiert (Start- und Verwalten-Modus)");
|
||||
}
|
||||
catch (Exception ex) { failures++; Console.WriteLine($"[FEHLER] license.dialog: {ex.GetType().Name}: {ex.Message}"); }
|
||||
|
||||
Console.WriteLine(failures == 0 ? "=== Smoke-UI OK ===" : $"=== Smoke-UI: {failures} Fehler ===");
|
||||
return failures;
|
||||
}
|
||||
}
|
||||
Generated
-303
@@ -1,303 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Dieser Code wurde von einem Tool generiert.
|
||||
// Laufzeitversion:4.0.30319.42000
|
||||
//
|
||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
// der Code erneut generiert wird.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace PolyTraderSharp.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
/// </summary>
|
||||
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
|
||||
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
|
||||
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
|
||||
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Resources() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PolyTraderSharp.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
|
||||
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
internal static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap accept_button {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("accept_button", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap add {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("add", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap cancel {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("cancel", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap coins_in_hand {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("coins_in_hand", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap cross_reference {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("cross_reference", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap dashboard {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("dashboard", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap delete {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("delete", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap diskette {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("diskette", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap emotion_batman {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("emotion_batman", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap error_log {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("error_log", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap file_start_workflow {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("file_start_workflow", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap money {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("money", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap money_add {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("money_add", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap money_delete {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("money_delete", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap money_dollar {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("money_dollar", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap refresh_all {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("refresh_all", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap setting_tools {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("setting_tools", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap stop {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("stop", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap system_time {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("system_time", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap token_quantifier {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("token_quantifier", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap traffic_lights_green {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("traffic_lights_green", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap traffic_lights_red {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("traffic_lights_red", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap traffic_lights_yellow {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("traffic_lights_yellow", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap warning {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("warning", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,193 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="system_time" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\system_time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="diskette" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\diskette.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="money" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\money.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="cross_reference" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cross_reference.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="money_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\money_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="token_quantifier" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\token_quantifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="file_start_workflow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\file_start_workflow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="traffic_lights_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic_lights_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="refresh_all" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\refresh_all.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\dashboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="coins_in_hand" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\coins_in_hand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="traffic_lights_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic_lights_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="traffic_lights_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\traffic_lights_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="money_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\money_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="setting_tools" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\setting_tools.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="accept_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\accept_button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="money_dollar" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\money_dollar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="error_log" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\error_log.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="emotion_batman" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\emotion_batman.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
Generated
-26
@@ -1,26 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// Dieser Code wurde von einem Tool generiert.
|
||||
// Laufzeitversion:4.0.30319.42000
|
||||
//
|
||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||
// der Code erneut generiert wird.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace PolyTraderSharp.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
|
||||
public static Settings Default {
|
||||
get {
|
||||
return defaultInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
|
||||
<Profiles>
|
||||
<Profile Name="(Default)" />
|
||||
</Profiles>
|
||||
</SettingsFile>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Generated
-369
@@ -1,369 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
partial class LauncherForm
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
menuStrip = new MenuStrip();
|
||||
toolstrip_windows = new ToolStrip();
|
||||
btn_dashboard = new ToolStripButton();
|
||||
btn_settings = new ToolStripButton();
|
||||
btn_terminal = new ToolStripButton();
|
||||
btn_jobs = new ToolStripButton();
|
||||
btn_accounting = new ToolStripButton();
|
||||
toolStripSeparator1 = new ToolStripSeparator();
|
||||
toolStripSeparator2 = new ToolStripSeparator();
|
||||
btn_copytrading = new ToolStripButton();
|
||||
btn_resolutionfarming = new ToolStripButton();
|
||||
btn_supervisor = new ToolStripButton();
|
||||
toolstrip_quickbar = new ToolStrip();
|
||||
btn_liveTrading = new ToolStripButton();
|
||||
btn_demoTrading = new ToolStripButton();
|
||||
statusStrip_info = new StatusStrip();
|
||||
lbl_trading = new ToolStripStatusLabel();
|
||||
lbl_modules = new ToolStripStatusLabel();
|
||||
lbl_ratelimit = new ToolStripStatusLabel();
|
||||
dgv_accountlist = new DataGridView();
|
||||
colAccName = new DataGridViewTextBoxColumn();
|
||||
colAccModules = new DataGridViewTextBoxColumn();
|
||||
colAccPoly = new DataGridViewButtonColumn();
|
||||
colAccBalance = new DataGridViewTextBoxColumn();
|
||||
colAccPnl3d = new DataGridViewTextBoxColumn();
|
||||
colAccWin3d = new DataGridViewTextBoxColumn();
|
||||
colAccOverall = new DataGridViewTextBoxColumn();
|
||||
launcherWidgets = new LauncherWidgetsPanel();
|
||||
menuStrip.SuspendLayout();
|
||||
toolstrip_windows.SuspendLayout();
|
||||
toolstrip_quickbar.SuspendLayout();
|
||||
statusStrip_info.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgv_accountlist).BeginInit();
|
||||
SuspendLayout();
|
||||
//
|
||||
// menuStrip
|
||||
//
|
||||
menuStrip.ImageScalingSize = new Size(24, 24);
|
||||
// Einträge werden zur Laufzeit über WindowMenu.Wire gefüllt (alle Fenster nebeneinander mit Icon).
|
||||
menuStrip.Location = new Point(0, 0);
|
||||
menuStrip.Name = "menuStrip";
|
||||
menuStrip.Padding = new Padding(9, 3, 0, 3);
|
||||
menuStrip.Size = new Size(2599, 35);
|
||||
menuStrip.TabIndex = 0;
|
||||
//
|
||||
// toolstrip_windows
|
||||
//
|
||||
toolstrip_windows.AutoSize = false;
|
||||
toolstrip_windows.ImageScalingSize = new Size(64, 64);
|
||||
toolstrip_windows.Items.AddRange(new ToolStripItem[] { btn_dashboard, btn_settings, btn_terminal, btn_jobs, btn_accounting, btn_supervisor, toolStripSeparator1, toolStripSeparator2, btn_copytrading, btn_resolutionfarming });
|
||||
toolstrip_windows.Location = new Point(0, 35);
|
||||
toolstrip_windows.Name = "toolstrip_windows";
|
||||
toolstrip_windows.Size = new Size(2599, 70);
|
||||
toolstrip_windows.TabIndex = 3;
|
||||
toolstrip_windows.Text = "toolStrip1";
|
||||
//
|
||||
// btn_dashboard
|
||||
//
|
||||
btn_dashboard.Image = Properties.Resources.dashboard;
|
||||
btn_dashboard.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_dashboard.Name = "btn_dashboard";
|
||||
btn_dashboard.Overflow = ToolStripItemOverflow.Never;
|
||||
btn_dashboard.Size = new Size(104, 65);
|
||||
btn_dashboard.Text = "Dashboard";
|
||||
btn_dashboard.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_settings
|
||||
//
|
||||
btn_settings.BackColor = SystemColors.Control;
|
||||
btn_settings.Image = Properties.Resources.setting_tools;
|
||||
btn_settings.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_settings.ImageTransparentColor = Color.Magenta;
|
||||
btn_settings.Name = "btn_settings";
|
||||
btn_settings.Size = new Size(80, 65);
|
||||
btn_settings.Text = "Settings";
|
||||
btn_settings.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_terminal
|
||||
//
|
||||
btn_terminal.Image = Properties.Resources.error_log;
|
||||
btn_terminal.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_terminal.Name = "btn_terminal";
|
||||
btn_terminal.Size = new Size(136, 65);
|
||||
btn_terminal.Text = "Terminal / Logs";
|
||||
btn_terminal.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_jobs
|
||||
//
|
||||
btn_jobs.Image = Properties.Resources.system_time;
|
||||
btn_jobs.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_jobs.Name = "btn_jobs";
|
||||
btn_jobs.Size = new Size(106, 65);
|
||||
btn_jobs.Text = "Server Jobs";
|
||||
btn_jobs.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_accounting
|
||||
//
|
||||
btn_accounting.Image = Properties.Resources.coins_in_hand;
|
||||
btn_accounting.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_accounting.ImageTransparentColor = Color.Magenta;
|
||||
btn_accounting.Name = "btn_accounting";
|
||||
btn_accounting.Size = new Size(106, 65);
|
||||
btn_accounting.Text = "Accounting";
|
||||
btn_accounting.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// toolStripSeparator1
|
||||
//
|
||||
toolStripSeparator1.Name = "toolStripSeparator1";
|
||||
toolStripSeparator1.Size = new Size(6, 70);
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
toolStripSeparator2.Margin = new Padding(20, 0, 0, 0);
|
||||
toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
toolStripSeparator2.Size = new Size(6, 70);
|
||||
//
|
||||
// btn_copytrading
|
||||
//
|
||||
btn_copytrading.Image = Properties.Resources.cross_reference;
|
||||
btn_copytrading.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_copytrading.ImageTransparentColor = Color.Magenta;
|
||||
btn_copytrading.Name = "btn_copytrading";
|
||||
btn_copytrading.Size = new Size(116, 65);
|
||||
btn_copytrading.Text = "CopyTrading";
|
||||
btn_copytrading.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_resolutionfarming
|
||||
//
|
||||
btn_resolutionfarming.Image = Properties.Resources.file_start_workflow;
|
||||
btn_resolutionfarming.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_resolutionfarming.ImageTransparentColor = Color.Magenta;
|
||||
btn_resolutionfarming.Name = "btn_resolutionfarming";
|
||||
btn_resolutionfarming.Size = new Size(163, 65);
|
||||
btn_resolutionfarming.Text = "ResolutionFarming";
|
||||
btn_resolutionfarming.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_supervisor
|
||||
//
|
||||
btn_supervisor.Image = Properties.Resources.emotion_batman;
|
||||
btn_supervisor.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_supervisor.ImageTransparentColor = Color.Magenta;
|
||||
btn_supervisor.Name = "btn_supervisor";
|
||||
btn_supervisor.Size = new Size(100, 65);
|
||||
btn_supervisor.Text = "Supervisor";
|
||||
btn_supervisor.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// toolstrip_quickbar
|
||||
//
|
||||
toolstrip_quickbar.ImageScalingSize = new Size(24, 24);
|
||||
toolstrip_quickbar.Items.AddRange(new ToolStripItem[] { btn_liveTrading, btn_demoTrading });
|
||||
toolstrip_quickbar.Location = new Point(0, 105);
|
||||
toolstrip_quickbar.Name = "toolstrip_quickbar";
|
||||
toolstrip_quickbar.Size = new Size(2599, 34);
|
||||
toolstrip_quickbar.TabIndex = 4;
|
||||
toolstrip_quickbar.Text = "toolStrip2";
|
||||
//
|
||||
// btn_liveTrading
|
||||
//
|
||||
btn_liveTrading.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_liveTrading.Name = "btn_liveTrading";
|
||||
btn_liveTrading.Size = new Size(137, 29);
|
||||
btn_liveTrading.Text = "LiveTrading (—)";
|
||||
//
|
||||
// btn_demoTrading
|
||||
//
|
||||
btn_demoTrading.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_demoTrading.Name = "btn_demoTrading";
|
||||
btn_demoTrading.Size = new Size(156, 29);
|
||||
btn_demoTrading.Text = "DemoTrading (—)";
|
||||
//
|
||||
// statusStrip_info
|
||||
//
|
||||
statusStrip_info.BackColor = Color.Gainsboro;
|
||||
statusStrip_info.ImageScalingSize = new Size(24, 24);
|
||||
statusStrip_info.Items.AddRange(new ToolStripItem[] { lbl_trading, lbl_modules, lbl_ratelimit });
|
||||
statusStrip_info.Location = new Point(0, 637);
|
||||
statusStrip_info.Name = "statusStrip_info";
|
||||
statusStrip_info.Size = new Size(2599, 32);
|
||||
statusStrip_info.TabIndex = 5;
|
||||
statusStrip_info.Text = "statusStrip1";
|
||||
//
|
||||
// lbl_trading
|
||||
//
|
||||
lbl_trading.Name = "lbl_trading";
|
||||
lbl_trading.Size = new Size(97, 25);
|
||||
lbl_trading.Text = "Trading: —";
|
||||
//
|
||||
// lbl_modules
|
||||
//
|
||||
lbl_modules.Name = "lbl_modules";
|
||||
lbl_modules.Size = new Size(100, 25);
|
||||
lbl_modules.Text = "Module: —";
|
||||
//
|
||||
// lbl_ratelimit
|
||||
//
|
||||
lbl_ratelimit.Name = "lbl_ratelimit";
|
||||
lbl_ratelimit.Size = new Size(66, 25);
|
||||
lbl_ratelimit.Text = "API: —";
|
||||
//
|
||||
// dgv_accountlist
|
||||
//
|
||||
dgv_accountlist.AllowUserToAddRows = false;
|
||||
dgv_accountlist.AllowUserToDeleteRows = false;
|
||||
dgv_accountlist.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
|
||||
dgv_accountlist.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgv_accountlist.Columns.AddRange(new DataGridViewColumn[] { colAccName, colAccModules, colAccPoly, colAccBalance, colAccPnl3d, colAccWin3d, colAccOverall });
|
||||
dgv_accountlist.Dock = DockStyle.Fill;
|
||||
dgv_accountlist.Location = new Point(0, 139);
|
||||
dgv_accountlist.Name = "dgv_accountlist";
|
||||
dgv_accountlist.ReadOnly = true;
|
||||
dgv_accountlist.RowHeadersVisible = false;
|
||||
dgv_accountlist.RowHeadersWidth = 62;
|
||||
dgv_accountlist.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgv_accountlist.Size = new Size(2599, 498);
|
||||
dgv_accountlist.TabIndex = 6;
|
||||
//
|
||||
// colAccName
|
||||
//
|
||||
colAccName.DataPropertyName = "Name";
|
||||
colAccName.HeaderText = "Account";
|
||||
colAccName.MinimumWidth = 8;
|
||||
colAccName.Name = "colAccName";
|
||||
colAccName.ReadOnly = true;
|
||||
colAccName.Width = 113;
|
||||
//
|
||||
// colAccModules
|
||||
//
|
||||
colAccModules.DataPropertyName = "Modules";
|
||||
colAccModules.HeaderText = "Module";
|
||||
colAccModules.MinimumWidth = 8;
|
||||
colAccModules.Name = "colAccModules";
|
||||
colAccModules.ReadOnly = true;
|
||||
colAccModules.Width = 109;
|
||||
//
|
||||
// colAccPoly
|
||||
//
|
||||
colAccPoly.HeaderText = "Polymarket";
|
||||
colAccPoly.MinimumWidth = 8;
|
||||
colAccPoly.Name = "colAccPoly";
|
||||
colAccPoly.ReadOnly = true;
|
||||
colAccPoly.Text = "Öffnen";
|
||||
colAccPoly.UseColumnTextForButtonValue = true;
|
||||
colAccPoly.Width = 106;
|
||||
//
|
||||
// colAccBalance
|
||||
//
|
||||
colAccBalance.DataPropertyName = "Balance";
|
||||
colAccBalance.HeaderText = "Wallet (USDC)";
|
||||
colAccBalance.MinimumWidth = 8;
|
||||
colAccBalance.Name = "colAccBalance";
|
||||
colAccBalance.ReadOnly = true;
|
||||
colAccBalance.Width = 157;
|
||||
//
|
||||
// colAccPnl3d
|
||||
//
|
||||
colAccPnl3d.DataPropertyName = "Pnl3d";
|
||||
colAccPnl3d.HeaderText = "3T PnL";
|
||||
colAccPnl3d.MinimumWidth = 8;
|
||||
colAccPnl3d.Name = "colAccPnl3d";
|
||||
colAccPnl3d.ReadOnly = true;
|
||||
//
|
||||
// colAccWin3d
|
||||
//
|
||||
colAccWin3d.DataPropertyName = "WinRate3d";
|
||||
colAccWin3d.HeaderText = "3T Winrate %";
|
||||
colAccWin3d.MinimumWidth = 8;
|
||||
colAccWin3d.Name = "colAccWin3d";
|
||||
colAccWin3d.ReadOnly = true;
|
||||
colAccWin3d.Width = 153;
|
||||
//
|
||||
// colAccOverall
|
||||
//
|
||||
colAccOverall.DataPropertyName = "OverallPnl";
|
||||
colAccOverall.HeaderText = "Overall P/L";
|
||||
colAccOverall.MinimumWidth = 8;
|
||||
colAccOverall.Name = "colAccOverall";
|
||||
colAccOverall.ReadOnly = true;
|
||||
colAccOverall.Width = 133;
|
||||
//
|
||||
// launcherWidgets
|
||||
//
|
||||
launcherWidgets.Dock = DockStyle.Right;
|
||||
launcherWidgets.Location = new Point(2039, 139);
|
||||
launcherWidgets.Name = "launcherWidgets";
|
||||
launcherWidgets.Size = new Size(560, 498);
|
||||
launcherWidgets.TabIndex = 7;
|
||||
//
|
||||
// LauncherForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(2599, 669);
|
||||
Controls.Add(dgv_accountlist);
|
||||
Controls.Add(launcherWidgets);
|
||||
Controls.Add(statusStrip_info);
|
||||
Controls.Add(toolstrip_quickbar);
|
||||
Controls.Add(toolstrip_windows);
|
||||
Controls.Add(menuStrip);
|
||||
MainMenuStrip = menuStrip;
|
||||
Margin = new Padding(4, 5, 4, 5);
|
||||
MinimumSize = new Size(1280, 720);
|
||||
Name = "LauncherForm";
|
||||
StartPosition = FormStartPosition.CenterScreen;
|
||||
Text = "PolyTrader";
|
||||
WindowState = FormWindowState.Maximized;
|
||||
menuStrip.ResumeLayout(false);
|
||||
menuStrip.PerformLayout();
|
||||
toolstrip_windows.ResumeLayout(false);
|
||||
toolstrip_windows.PerformLayout();
|
||||
toolstrip_quickbar.ResumeLayout(false);
|
||||
toolstrip_quickbar.PerformLayout();
|
||||
statusStrip_info.ResumeLayout(false);
|
||||
statusStrip_info.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgv_accountlist).EndInit();
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.MenuStrip menuStrip;
|
||||
private ToolStrip toolstrip_windows;
|
||||
private ToolStripButton btn_settings;
|
||||
private ToolStripButton btn_terminal;
|
||||
private ToolStripButton btn_jobs;
|
||||
private ToolStripButton btn_dashboard;
|
||||
private ToolStripButton btn_copytrading;
|
||||
private ToolStripButton btn_resolutionfarming;
|
||||
private ToolStripButton btn_supervisor;
|
||||
private ToolStrip toolstrip_quickbar;
|
||||
private ToolStripButton btn_liveTrading;
|
||||
private ToolStripButton btn_demoTrading;
|
||||
private StatusStrip statusStrip_info;
|
||||
private ToolStripStatusLabel lbl_trading;
|
||||
private ToolStripStatusLabel lbl_modules;
|
||||
private ToolStripStatusLabel lbl_ratelimit;
|
||||
private ToolStripButton btn_accounting;
|
||||
private ToolStripSeparator toolStripSeparator1;
|
||||
private DataGridView dgv_accountlist;
|
||||
private DataGridViewTextBoxColumn colAccName;
|
||||
private DataGridViewTextBoxColumn colAccModules;
|
||||
private DataGridViewButtonColumn colAccPoly;
|
||||
private DataGridViewTextBoxColumn colAccBalance;
|
||||
private DataGridViewTextBoxColumn colAccPnl3d;
|
||||
private DataGridViewTextBoxColumn colAccWin3d;
|
||||
private DataGridViewTextBoxColumn colAccOverall;
|
||||
private ToolStripSeparator toolStripSeparator2;
|
||||
private LauncherWidgetsPanel launcherWidgets;
|
||||
}
|
||||
}
|
||||
@@ -1,268 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using PolyTrader.Core.Analytics;
|
||||
using PolyTrader.Core.Modularity;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTraderSharp.Models;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// „Startleiste" der PolyTrader.App. Fenster werden über die im Designer platzierten
|
||||
/// Buttons in <c>toolstrip_windows</c> geöffnet bzw. in den Vordergrund geholt.
|
||||
/// <c>toolstrip_quickbar</c> ist für Schnellaktionen (z.B. Trading an/aus) reserviert,
|
||||
/// <c>statusStrip_info</c> zeigt Kernkennzahlen. Der Launcher kennt selbst kein Modul —
|
||||
/// Buttons werden per stabiler View-ID an registrierte Views gebunden.
|
||||
/// </summary>
|
||||
public partial class LauncherForm : Form
|
||||
{
|
||||
private readonly ShellUiHost _uiHost;
|
||||
private readonly IServiceProvider _services;
|
||||
private readonly TradingState _state;
|
||||
private readonly System.Windows.Forms.Timer _statusTimer = new() { Interval = 1000 };
|
||||
private readonly Dictionary<string, ToolStripButton> _viewButtons;
|
||||
private int _statusTicks;
|
||||
|
||||
public LauncherForm(ShellUiHost uiHost, IServiceProvider services)
|
||||
{
|
||||
_uiHost = uiHost;
|
||||
_services = services;
|
||||
_state = services.GetRequiredService<TradingState>();
|
||||
|
||||
InitializeComponent();
|
||||
|
||||
_uiHost.SetMainWindow(this);
|
||||
|
||||
// Fenster-Buttons: ALLE statisch im Designer, an stabile View-IDs gebunden. Ist eine View
|
||||
// nicht registriert (Modul fehlt), wird der Button deaktiviert – nichts wird zur Laufzeit angehängt.
|
||||
_viewButtons = new Dictionary<string, ToolStripButton>
|
||||
{
|
||||
["core.dashboard"] = btn_dashboard,
|
||||
["core.settings"] = btn_settings,
|
||||
["core.terminal"] = btn_terminal,
|
||||
["core.jobs"] = btn_jobs,
|
||||
["copytrading.main"] = btn_copytrading,
|
||||
["resolutionfarming.main"] = btn_resolutionfarming,
|
||||
["supervisor.main"] = btn_supervisor,
|
||||
["accounting.main"] = btn_accounting,
|
||||
};
|
||||
var registered = _uiHost.Views.Select(v => v.Id).ToHashSet();
|
||||
foreach (var (id, btn) in _viewButtons)
|
||||
{
|
||||
var viewId = id;
|
||||
if (registered.Contains(viewId))
|
||||
btn.Click += (_, _) => _uiHost.OpenView(viewId);
|
||||
else
|
||||
btn.Enabled = false; // Modul/View nicht verfügbar
|
||||
}
|
||||
|
||||
// Gemeinsame Fenster-Menüleiste: alle Fenster nebeneinander mit Icon (Launcher ist das
|
||||
// aktuelle Fenster → currentViewId null).
|
||||
WindowMenu.Wire(menuStrip, _uiHost, null);
|
||||
|
||||
btn_liveTrading.Click += (_, _) => CycleLiveTrading();
|
||||
btn_demoTrading.Click += (_, _) => CycleDemoTrading();
|
||||
|
||||
// Offen-Status der Fenster spiegeln (Button „checked", wenn Fenster offen).
|
||||
_uiHost.OpenStateChanged += UpdateWindowButtonStates;
|
||||
|
||||
// Account-Übersicht (dgv_accountlist): Zahlenformate + Polymarket-Button.
|
||||
colAccBalance.DefaultCellStyle.Format = "N2";
|
||||
colAccPnl3d.DefaultCellStyle.Format = "N2";
|
||||
colAccWin3d.DefaultCellStyle.Format = "N1";
|
||||
colAccOverall.DefaultCellStyle.Format = "N2";
|
||||
dgv_accountlist.CellContentClick += AccountList_CellContentClick;
|
||||
|
||||
// Live-Überblick-Widgets (Modul-PnL/Winrate, Warnungen/Fehler, auffällige Trades, Supervisor-KI).
|
||||
launcherWidgets.Initialize(_services);
|
||||
|
||||
_statusTimer.Tick += (_, _) => UpdateStatus();
|
||||
_statusTimer.Start();
|
||||
UpdateStatus();
|
||||
UpdateTradingToggles();
|
||||
UpdateWindowButtonStates();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fängt das Schließen des Launchers ab: Statt direkt zu beenden, läuft auch das Schließen-X
|
||||
/// über die Sicherheitsabfrage (siehe <see cref="ShellUiHost.RequestShutdown"/>). Erst wenn dort
|
||||
/// bestätigt wurde (<see cref="ShellUiHost.ShutdownConfirmed"/>), darf das Fenster schließen.
|
||||
/// </summary>
|
||||
protected override void OnFormClosing(FormClosingEventArgs e)
|
||||
{
|
||||
if (!_uiHost.ShutdownConfirmed)
|
||||
{
|
||||
e.Cancel = true;
|
||||
BeginInvoke((Action)(() => _uiHost.RequestShutdown()));
|
||||
return;
|
||||
}
|
||||
base.OnFormClosing(e);
|
||||
}
|
||||
|
||||
private void UpdateWindowButtonStates()
|
||||
{
|
||||
if (IsDisposed) return;
|
||||
foreach (var (id, btn) in _viewButtons)
|
||||
btn.Checked = _uiHost.IsOpen(id);
|
||||
}
|
||||
|
||||
private void CycleLiveTrading()
|
||||
{
|
||||
_state.LiveTradingMode = _state.LiveTradingMode switch
|
||||
{
|
||||
TradingMode.Inactive => TradingMode.SellOnly,
|
||||
TradingMode.SellOnly => TradingMode.Active,
|
||||
_ => TradingMode.Inactive
|
||||
};
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void CycleDemoTrading()
|
||||
{
|
||||
_state.DemoTradingMode = _state.DemoTradingMode switch
|
||||
{
|
||||
TradingMode.Inactive => TradingMode.SellOnly,
|
||||
TradingMode.SellOnly => TradingMode.Active,
|
||||
_ => TradingMode.Inactive
|
||||
};
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void UpdateTradingToggles()
|
||||
{
|
||||
ApplyToggle(btn_liveTrading, "LiveTrading", _state.LiveTradingMode);
|
||||
ApplyToggle(btn_demoTrading, "DemoTrading", _state.DemoTradingMode);
|
||||
|
||||
static void ApplyToggle(ToolStripButton btn, string label, TradingMode mode)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case TradingMode.Active:
|
||||
btn.Text = $"{label} (AKTIV)";
|
||||
btn.BackColor = System.Drawing.Color.LightGreen;
|
||||
break;
|
||||
case TradingMode.SellOnly:
|
||||
btn.Text = $"{label} (SELL-ONLY)";
|
||||
btn.BackColor = System.Drawing.Color.Orange;
|
||||
break;
|
||||
default:
|
||||
btn.Text = $"{label} (DEAKTIVIERT)";
|
||||
btn.BackColor = System.Drawing.Color.IndianRed;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateStatus()
|
||||
{
|
||||
string trading = _state.GlobalTradingPaused
|
||||
? "Pausiert"
|
||||
: $"Live={_state.LiveTradingMode} / Demo={_state.DemoTradingMode}";
|
||||
lbl_trading.Text = $"Trading: {trading}";
|
||||
|
||||
int moduleCount = _services.GetServices<IPolyTraderModule>().Count();
|
||||
lbl_modules.Text = $"Module: {moduleCount}";
|
||||
|
||||
lbl_ratelimit.Text = $"API: {(_state.IsAlchemyHealthy ? "WSS aktiv" : "Polling")}";
|
||||
|
||||
UpdateTradingToggles();
|
||||
UpdateWindowButtonStates();
|
||||
|
||||
// Account-Übersicht + Widgets alle 30 s aktualisieren (DB-Abfragen – nicht jede Sekunde).
|
||||
if (_statusTicks++ % 30 == 0)
|
||||
{
|
||||
LoadAccountOverview();
|
||||
launcherWidgets.RefreshData();
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Account-Übersicht (dgv_accountlist) =====
|
||||
|
||||
private void LoadAccountOverview()
|
||||
{
|
||||
if (IsDisposed) return;
|
||||
var tradeLog = _services.GetService<ITradeLogRepository>();
|
||||
if (tradeLog == null) return;
|
||||
|
||||
DateTime since3d = DateTime.UtcNow.AddDays(-3);
|
||||
var rows = new List<AccountOverviewRow>();
|
||||
|
||||
foreach (var acc in _state.Accounts.Values.OrderBy(a => a.AccountId))
|
||||
{
|
||||
List<TradeRecord> trades;
|
||||
try { trades = tradeLog.Find(t => t.AccountId == acc.AccountId); }
|
||||
catch { trades = new List<TradeRecord>(); } // DB nicht bereit -> leer statt Absturz
|
||||
|
||||
var (pnl3d, win3d, _) = TradeAnalytics.WindowSummary(trades.Where(t => t.ClosedAt >= since3d));
|
||||
string modules = trades
|
||||
.Select(t => t.ModuleName)
|
||||
.Where(m => !string.IsNullOrEmpty(m))
|
||||
.Distinct().OrderBy(m => m)
|
||||
.DefaultIfEmpty("—")
|
||||
.Aggregate((a, b) => a + ", " + b);
|
||||
|
||||
rows.Add(new AccountOverviewRow
|
||||
{
|
||||
AccountId = acc.AccountId,
|
||||
Name = (string.IsNullOrEmpty(acc.Name) ? $"#{acc.AccountId}" : acc.Name) + (acc.IsDemo ? " (Demo)" : ""),
|
||||
Modules = modules,
|
||||
WalletAddress = acc.WalletAddress,
|
||||
Balance = acc.TotalBalance,
|
||||
Pnl3d = pnl3d,
|
||||
WinRate3d = win3d,
|
||||
OverallPnl = trades.Sum(t => t.RealizedPnl)
|
||||
});
|
||||
}
|
||||
|
||||
dgv_accountlist.DataSource = rows;
|
||||
}
|
||||
|
||||
private void AccountList_CellContentClick(object? sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
if (dgv_accountlist.Columns[e.ColumnIndex].Name != "colAccPoly") return;
|
||||
if (dgv_accountlist.Rows[e.RowIndex].DataBoundItem is AccountOverviewRow row)
|
||||
OpenPolymarketProfile(row.WalletAddress);
|
||||
}
|
||||
|
||||
private void OpenPolymarketProfile(string walletAddress)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(walletAddress))
|
||||
{
|
||||
MessageBox.Show("Für diesen Account ist keine Wallet-Adresse hinterlegt.", "Polymarket",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
Process.Start(new ProcessStartInfo
|
||||
{
|
||||
FileName = $"https://polymarket.com/profile/{walletAddress}",
|
||||
UseShellExecute = true
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Konnte Polymarket nicht öffnen: {ex.Message}", "Fehler",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Anzeige-Zeile der Account-Übersicht (Bindung an dgv_accountlist über DataPropertyName).</summary>
|
||||
private sealed class AccountOverviewRow
|
||||
{
|
||||
public int AccountId { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public string Modules { get; set; } = string.Empty;
|
||||
public string WalletAddress { get; set; } = string.Empty;
|
||||
public decimal Balance { get; set; }
|
||||
public decimal Pnl3d { get; set; }
|
||||
public decimal WinRate3d { get; set; }
|
||||
public decimal OverallPnl { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,135 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>585, 0</value>
|
||||
</metadata>
|
||||
<metadata name="toolstrip_windows.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>733, 0</value>
|
||||
</metadata>
|
||||
<metadata name="toolstrip_quickbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>376, 0</value>
|
||||
</metadata>
|
||||
<metadata name="statusStrip_info.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>944, 0</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>25</value>
|
||||
</metadata>
|
||||
</root>
|
||||
Generated
-244
@@ -1,244 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
partial class LauncherWidgetsPanel
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.tableLayout = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.flpKpis = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.grpSupervisor = new System.Windows.Forms.GroupBox();
|
||||
this.rtbSupervisor = new System.Windows.Forms.RichTextBox();
|
||||
this.grpAlerts = new System.Windows.Forms.GroupBox();
|
||||
this.dgvAlerts = new System.Windows.Forms.DataGridView();
|
||||
this.colAlertTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colAlertLevel = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colAlertMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.grpNotable = new System.Windows.Forms.GroupBox();
|
||||
this.dgvNotable = new System.Windows.Forms.DataGridView();
|
||||
this.colNotModule = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colNotMarket = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colNotPnl = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colNotPnlPct = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.tableLayout.SuspendLayout();
|
||||
this.grpSupervisor.SuspendLayout();
|
||||
this.grpAlerts.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvAlerts)).BeginInit();
|
||||
this.grpNotable.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvNotable)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// tableLayout
|
||||
//
|
||||
this.tableLayout.ColumnCount = 1;
|
||||
this.tableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayout.Controls.Add(this.flpKpis, 0, 0);
|
||||
this.tableLayout.Controls.Add(this.grpSupervisor, 0, 1);
|
||||
this.tableLayout.Controls.Add(this.grpAlerts, 0, 2);
|
||||
this.tableLayout.Controls.Add(this.grpNotable, 0, 3);
|
||||
this.tableLayout.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tableLayout.Location = new System.Drawing.Point(0, 0);
|
||||
this.tableLayout.Name = "tableLayout";
|
||||
this.tableLayout.RowCount = 4;
|
||||
this.tableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 210F));
|
||||
this.tableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
|
||||
this.tableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
|
||||
this.tableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35F));
|
||||
this.tableLayout.Size = new System.Drawing.Size(540, 900);
|
||||
this.tableLayout.TabIndex = 0;
|
||||
//
|
||||
// flpKpis
|
||||
//
|
||||
this.flpKpis.AutoScroll = true;
|
||||
this.flpKpis.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flpKpis.Location = new System.Drawing.Point(3, 3);
|
||||
this.flpKpis.Name = "flpKpis";
|
||||
this.flpKpis.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.flpKpis.Size = new System.Drawing.Size(534, 204);
|
||||
this.flpKpis.TabIndex = 0;
|
||||
//
|
||||
// grpSupervisor
|
||||
//
|
||||
this.grpSupervisor.Controls.Add(this.rtbSupervisor);
|
||||
this.grpSupervisor.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpSupervisor.Location = new System.Drawing.Point(3, 213);
|
||||
this.grpSupervisor.Name = "grpSupervisor";
|
||||
this.grpSupervisor.Padding = new System.Windows.Forms.Padding(6);
|
||||
this.grpSupervisor.Size = new System.Drawing.Size(534, 200);
|
||||
this.grpSupervisor.TabIndex = 1;
|
||||
this.grpSupervisor.TabStop = false;
|
||||
this.grpSupervisor.Text = "Supervisor-KI (letzter Bericht)";
|
||||
//
|
||||
// rtbSupervisor
|
||||
//
|
||||
this.rtbSupervisor.BackColor = System.Drawing.Color.White;
|
||||
this.rtbSupervisor.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.rtbSupervisor.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtbSupervisor.Location = new System.Drawing.Point(6, 22);
|
||||
this.rtbSupervisor.Name = "rtbSupervisor";
|
||||
this.rtbSupervisor.ReadOnly = true;
|
||||
this.rtbSupervisor.Size = new System.Drawing.Size(522, 172);
|
||||
this.rtbSupervisor.TabIndex = 0;
|
||||
this.rtbSupervisor.Text = "";
|
||||
//
|
||||
// grpAlerts
|
||||
//
|
||||
this.grpAlerts.Controls.Add(this.dgvAlerts);
|
||||
this.grpAlerts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpAlerts.Location = new System.Drawing.Point(3, 419);
|
||||
this.grpAlerts.Name = "grpAlerts";
|
||||
this.grpAlerts.Padding = new System.Windows.Forms.Padding(6);
|
||||
this.grpAlerts.Size = new System.Drawing.Size(534, 234);
|
||||
this.grpAlerts.TabIndex = 2;
|
||||
this.grpAlerts.TabStop = false;
|
||||
this.grpAlerts.Text = "Warnungen & Fehler (heute)";
|
||||
//
|
||||
// dgvAlerts
|
||||
//
|
||||
this.dgvAlerts.AllowUserToAddRows = false;
|
||||
this.dgvAlerts.AllowUserToDeleteRows = false;
|
||||
this.dgvAlerts.AutoGenerateColumns = false;
|
||||
this.dgvAlerts.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvAlerts.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colAlertTime, this.colAlertLevel, this.colAlertMsg});
|
||||
this.dgvAlerts.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dgvAlerts.Location = new System.Drawing.Point(6, 22);
|
||||
this.dgvAlerts.Name = "dgvAlerts";
|
||||
this.dgvAlerts.ReadOnly = true;
|
||||
this.dgvAlerts.RowHeadersVisible = false;
|
||||
this.dgvAlerts.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
|
||||
this.dgvAlerts.Size = new System.Drawing.Size(522, 206);
|
||||
this.dgvAlerts.TabIndex = 0;
|
||||
//
|
||||
// colAlertTime
|
||||
//
|
||||
this.colAlertTime.DataPropertyName = "Time";
|
||||
this.colAlertTime.HeaderText = "Zeit";
|
||||
this.colAlertTime.Name = "colAlertTime";
|
||||
this.colAlertTime.ReadOnly = true;
|
||||
this.colAlertTime.Width = 70;
|
||||
//
|
||||
// colAlertLevel
|
||||
//
|
||||
this.colAlertLevel.DataPropertyName = "Level";
|
||||
this.colAlertLevel.HeaderText = "Level";
|
||||
this.colAlertLevel.Name = "colAlertLevel";
|
||||
this.colAlertLevel.ReadOnly = true;
|
||||
this.colAlertLevel.Width = 70;
|
||||
//
|
||||
// colAlertMsg
|
||||
//
|
||||
this.colAlertMsg.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
|
||||
this.colAlertMsg.DataPropertyName = "Message";
|
||||
this.colAlertMsg.HeaderText = "Nachricht";
|
||||
this.colAlertMsg.Name = "colAlertMsg";
|
||||
this.colAlertMsg.ReadOnly = true;
|
||||
//
|
||||
// grpNotable
|
||||
//
|
||||
this.grpNotable.Controls.Add(this.dgvNotable);
|
||||
this.grpNotable.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpNotable.Location = new System.Drawing.Point(3, 659);
|
||||
this.grpNotable.Name = "grpNotable";
|
||||
this.grpNotable.Padding = new System.Windows.Forms.Padding(6);
|
||||
this.grpNotable.Size = new System.Drawing.Size(534, 238);
|
||||
this.grpNotable.TabIndex = 3;
|
||||
this.grpNotable.TabStop = false;
|
||||
this.grpNotable.Text = "Auffällige Trades (24h)";
|
||||
//
|
||||
// dgvNotable
|
||||
//
|
||||
this.dgvNotable.AllowUserToAddRows = false;
|
||||
this.dgvNotable.AllowUserToDeleteRows = false;
|
||||
this.dgvNotable.AutoGenerateColumns = false;
|
||||
this.dgvNotable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvNotable.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colNotModule, this.colNotMarket, this.colNotPnl, this.colNotPnlPct});
|
||||
this.dgvNotable.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dgvNotable.Location = new System.Drawing.Point(6, 22);
|
||||
this.dgvNotable.Name = "dgvNotable";
|
||||
this.dgvNotable.ReadOnly = true;
|
||||
this.dgvNotable.RowHeadersVisible = false;
|
||||
this.dgvNotable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
|
||||
this.dgvNotable.Size = new System.Drawing.Size(522, 210);
|
||||
this.dgvNotable.TabIndex = 0;
|
||||
//
|
||||
// colNotModule
|
||||
//
|
||||
this.colNotModule.DataPropertyName = "Module";
|
||||
this.colNotModule.HeaderText = "Modul";
|
||||
this.colNotModule.Name = "colNotModule";
|
||||
this.colNotModule.ReadOnly = true;
|
||||
this.colNotModule.Width = 100;
|
||||
//
|
||||
// colNotMarket
|
||||
//
|
||||
this.colNotMarket.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
|
||||
this.colNotMarket.DataPropertyName = "Market";
|
||||
this.colNotMarket.HeaderText = "Markt";
|
||||
this.colNotMarket.Name = "colNotMarket";
|
||||
this.colNotMarket.ReadOnly = true;
|
||||
//
|
||||
// colNotPnl
|
||||
//
|
||||
this.colNotPnl.DataPropertyName = "Pnl";
|
||||
this.colNotPnl.HeaderText = "PnL";
|
||||
this.colNotPnl.Name = "colNotPnl";
|
||||
this.colNotPnl.ReadOnly = true;
|
||||
this.colNotPnl.Width = 80;
|
||||
//
|
||||
// colNotPnlPct
|
||||
//
|
||||
this.colNotPnlPct.DataPropertyName = "PnlPct";
|
||||
this.colNotPnlPct.HeaderText = "PnL %";
|
||||
this.colNotPnlPct.Name = "colNotPnlPct";
|
||||
this.colNotPnlPct.ReadOnly = true;
|
||||
this.colNotPnlPct.Width = 70;
|
||||
//
|
||||
// LauncherWidgetsPanel
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.tableLayout);
|
||||
this.Name = "LauncherWidgetsPanel";
|
||||
this.Size = new System.Drawing.Size(540, 900);
|
||||
this.tableLayout.ResumeLayout(false);
|
||||
this.grpSupervisor.ResumeLayout(false);
|
||||
this.grpAlerts.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvAlerts)).EndInit();
|
||||
this.grpNotable.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvNotable)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayout;
|
||||
private System.Windows.Forms.FlowLayoutPanel flpKpis;
|
||||
private System.Windows.Forms.GroupBox grpSupervisor;
|
||||
private System.Windows.Forms.RichTextBox rtbSupervisor;
|
||||
private System.Windows.Forms.GroupBox grpAlerts;
|
||||
private System.Windows.Forms.DataGridView dgvAlerts;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAlertTime;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAlertLevel;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAlertMsg;
|
||||
private System.Windows.Forms.GroupBox grpNotable;
|
||||
private System.Windows.Forms.DataGridView dgvNotable;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotModule;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotMarket;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotPnl;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNotPnlPct;
|
||||
}
|
||||
}
|
||||
@@ -1,205 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using PolyTrader.Core.Analytics;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTrader.Modules.Supervisor.Persistence;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// Live-Überblick-Widgets für den Launcher (Slice 4): Modul-PnL/Winrate-Kacheln, Supervisor-KI-
|
||||
/// Kurzfassung, Warnungen/Fehler aus den Logs und auffällige Trades. Isoliert als UserControl,
|
||||
/// damit der Launcher-Designer schlank bleibt. Alle Datenzugriffe defensiv (Widgets dürfen den
|
||||
/// Launcher nie brechen). Layout im Designer (LauncherWidgetsPanel.Designer.cs).
|
||||
/// </summary>
|
||||
public partial class LauncherWidgetsPanel : UserControl
|
||||
{
|
||||
private ITradeLogRepository? _tradeLog;
|
||||
private ISupervisorReportRepository? _reports;
|
||||
private readonly string _logsDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs");
|
||||
|
||||
public LauncherWidgetsPanel()
|
||||
{
|
||||
InitializeComponent();
|
||||
colNotPnl.DefaultCellStyle.Format = "F2";
|
||||
colNotPnlPct.DefaultCellStyle.Format = "F1";
|
||||
}
|
||||
|
||||
public void Initialize(IServiceProvider services)
|
||||
{
|
||||
_tradeLog = services.GetService<ITradeLogRepository>();
|
||||
_reports = services.GetService<ISupervisorReportRepository>();
|
||||
RefreshData();
|
||||
}
|
||||
|
||||
/// <summary>Aktualisiert alle Widgets. Wird vom Launcher periodisch aufgerufen.</summary>
|
||||
public void RefreshData()
|
||||
{
|
||||
if (IsDisposed) return;
|
||||
UpdateModuleKpis();
|
||||
UpdateAlerts();
|
||||
UpdateNotable();
|
||||
UpdateSupervisor();
|
||||
}
|
||||
|
||||
// ----- Modul-PnL/Winrate-Kacheln -----
|
||||
|
||||
private void UpdateModuleKpis()
|
||||
{
|
||||
flpKpis.SuspendLayout();
|
||||
flpKpis.Controls.Clear();
|
||||
try
|
||||
{
|
||||
var since = DateTime.UtcNow.AddDays(-30);
|
||||
List<TradeRecord> all = _tradeLog?.Find(t => t.ClosedAt >= since) ?? new List<TradeRecord>();
|
||||
|
||||
DateTime today = DateTime.UtcNow.Date;
|
||||
DateTime week = DateTime.UtcNow.AddDays(-7);
|
||||
|
||||
foreach (var module in all.Select(t => t.ModuleName).Where(m => !string.IsNullOrEmpty(m)).Distinct().OrderBy(m => m))
|
||||
flpKpis.Controls.Add(BuildTile(module, all.Where(t => t.ModuleName == module).ToList(), today, week));
|
||||
|
||||
flpKpis.Controls.Add(BuildTile("Gesamt", all, today, week));
|
||||
|
||||
if (flpKpis.Controls.Count == 1) // nur "Gesamt", keine Trades
|
||||
flpKpis.Controls.Add(new Label { AutoSize = true, Margin = new Padding(6), ForeColor = Color.Gray, Text = "Noch keine abgeschlossenen Trades." });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
flpKpis.Controls.Add(new Label { AutoSize = true, ForeColor = Color.Firebrick, Text = $"KPIs n/v: {ex.Message}" });
|
||||
}
|
||||
flpKpis.ResumeLayout();
|
||||
}
|
||||
|
||||
private static Label BuildTile(string module, List<TradeRecord> moduleTrades, DateTime today, DateTime week)
|
||||
{
|
||||
decimal todayPnl = moduleTrades.Where(t => t.ClosedAt >= today).Sum(t => t.RealizedPnl);
|
||||
var k7 = TradeAnalytics.ComputeKpis(moduleTrades.Where(t => t.ClosedAt >= week));
|
||||
var k30 = TradeAnalytics.ComputeKpis(moduleTrades);
|
||||
|
||||
var tile = new Label
|
||||
{
|
||||
AutoSize = false,
|
||||
Width = 252,
|
||||
Height = 92,
|
||||
BorderStyle = BorderStyle.FixedSingle,
|
||||
Margin = new Padding(3),
|
||||
Padding = new Padding(7),
|
||||
TextAlign = ContentAlignment.TopLeft,
|
||||
Font = new Font("Segoe UI", 9F),
|
||||
Text = $"{module}\n" +
|
||||
$"Heute: {todayPnl:+0.00;-0.00} USDC\n" +
|
||||
$"7T: {k7.NetPnl:+0.00;-0.00} · {k7.WinRatePct:0}% · {k7.TradeCount} Tr.\n" +
|
||||
$"30T: {k30.NetPnl:+0.00;-0.00} · {k30.WinRatePct:0}%"
|
||||
};
|
||||
tile.ForeColor = k30.NetPnl >= 0 ? Color.ForestGreen : Color.Firebrick;
|
||||
return tile;
|
||||
}
|
||||
|
||||
// ----- Warnungen & Fehler (heute, JSONL) -----
|
||||
|
||||
private void UpdateAlerts()
|
||||
{
|
||||
try
|
||||
{
|
||||
string path = Path.Combine(_logsDir, $"{DateTime.Now:yyyy-MM-dd}.jsonl");
|
||||
var rows = new List<AlertRow>();
|
||||
if (File.Exists(path))
|
||||
{
|
||||
foreach (var line in File.ReadLines(path))
|
||||
{
|
||||
var p = LogJson.ParseLine(line);
|
||||
if (p == null) continue;
|
||||
if (p.Level != "Error" && p.Level != "Warning") continue;
|
||||
rows.Add(new AlertRow { Time = ShortTime(p.Time), Level = p.Level, Message = OneLine(p.Message) });
|
||||
}
|
||||
}
|
||||
rows.Reverse(); // neueste zuerst
|
||||
dgvAlerts.DataSource = rows.Take(200).ToList();
|
||||
grpAlerts.Text = $"Warnungen & Fehler (heute): {rows.Count}";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
grpAlerts.Text = $"Warnungen & Fehler – n/v ({ex.Message})";
|
||||
}
|
||||
}
|
||||
|
||||
// ----- Auffällige Trades (24h) -----
|
||||
|
||||
private void UpdateNotable()
|
||||
{
|
||||
try
|
||||
{
|
||||
var since = DateTime.UtcNow.AddDays(-1);
|
||||
var rows = (_tradeLog?.Find(t => t.ClosedAt >= since) ?? new List<TradeRecord>())
|
||||
.OrderByDescending(t => Math.Abs(t.RealizedPnl))
|
||||
.Take(30)
|
||||
.Select(t => new NotableRow
|
||||
{
|
||||
Module = t.ModuleName,
|
||||
Market = t.MarketQuestion,
|
||||
Pnl = t.RealizedPnl,
|
||||
PnlPct = t.PnlPercent
|
||||
})
|
||||
.ToList();
|
||||
dgvNotable.DataSource = rows;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
grpNotable.Text = $"Auffällige Trades – n/v ({ex.Message})";
|
||||
}
|
||||
}
|
||||
|
||||
// ----- Supervisor-KI-Kurzfassung -----
|
||||
|
||||
private void UpdateSupervisor()
|
||||
{
|
||||
if (_reports == null)
|
||||
{
|
||||
rtbSupervisor.Text = "Supervisor-Modul nicht verfügbar.";
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
var last = _reports.GetRecent(1).FirstOrDefault();
|
||||
rtbSupervisor.Text = last == null
|
||||
? "Noch kein Supervisor-Bericht. (OpenRouter-Key setzen und im Supervisor-Fenster eine Analyse starten.)"
|
||||
: $"[{last.CreatedAt:dd.MM. HH:mm}] {last.Profile} · {last.Model}\n\n{last.Answer}";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
rtbSupervisor.Text = $"Supervisor-Berichte n/v: {ex.Message}";
|
||||
}
|
||||
}
|
||||
|
||||
// ----- Helfer -----
|
||||
|
||||
private static string ShortTime(string iso) =>
|
||||
DateTime.TryParse(iso, out var dt) ? dt.ToString("HH:mm:ss") : iso;
|
||||
|
||||
private static string OneLine(string s) =>
|
||||
(s ?? string.Empty).Replace("\r", " ").Replace("\n", " ").Trim();
|
||||
|
||||
private sealed class AlertRow
|
||||
{
|
||||
public string Time { get; set; } = string.Empty;
|
||||
public string Level { get; set; } = string.Empty;
|
||||
public string Message { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
private sealed class NotableRow
|
||||
{
|
||||
public string Module { get; set; } = string.Empty;
|
||||
public string Market { get; set; } = string.Empty;
|
||||
public decimal Pnl { get; set; }
|
||||
public decimal PnlPct { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
-157
@@ -1,157 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
partial class LicenseDialog
|
||||
{
|
||||
/// <summary>Erforderliche Designer-Variable.</summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Windows Form-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
lblHeadline = new System.Windows.Forms.Label();
|
||||
lblStatus = new System.Windows.Forms.Label();
|
||||
lblHwCaption = new System.Windows.Forms.Label();
|
||||
txtHardwareId = new System.Windows.Forms.TextBox();
|
||||
btnCopyHwId = new System.Windows.Forms.Button();
|
||||
lblKeyCaption = new System.Windows.Forms.Label();
|
||||
txtKey = new System.Windows.Forms.TextBox();
|
||||
btnValidate = new System.Windows.Forms.Button();
|
||||
lblResult = new System.Windows.Forms.Label();
|
||||
btnLimited = new System.Windows.Forms.Button();
|
||||
SuspendLayout();
|
||||
//
|
||||
// lblHeadline
|
||||
//
|
||||
lblHeadline.AutoSize = true;
|
||||
lblHeadline.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold);
|
||||
lblHeadline.Location = new System.Drawing.Point(16, 14);
|
||||
lblHeadline.Name = "lblHeadline";
|
||||
lblHeadline.Size = new System.Drawing.Size(316, 17);
|
||||
lblHeadline.TabIndex = 0;
|
||||
lblHeadline.Text = "Für PolyTrader wird eine gültige Lizenz benötigt.";
|
||||
//
|
||||
// lblStatus
|
||||
//
|
||||
lblStatus.Location = new System.Drawing.Point(16, 40);
|
||||
lblStatus.Name = "lblStatus";
|
||||
lblStatus.Size = new System.Drawing.Size(504, 34);
|
||||
lblStatus.TabIndex = 1;
|
||||
lblStatus.Text = "Status:";
|
||||
//
|
||||
// lblHwCaption
|
||||
//
|
||||
lblHwCaption.AutoSize = true;
|
||||
lblHwCaption.Location = new System.Drawing.Point(16, 82);
|
||||
lblHwCaption.Name = "lblHwCaption";
|
||||
lblHwCaption.Size = new System.Drawing.Size(214, 15);
|
||||
lblHwCaption.TabIndex = 2;
|
||||
lblHwCaption.Text = "Hardware-ID dieses Rechners (für die Aktivierung):";
|
||||
//
|
||||
// txtHardwareId
|
||||
//
|
||||
txtHardwareId.Location = new System.Drawing.Point(16, 100);
|
||||
txtHardwareId.Name = "txtHardwareId";
|
||||
txtHardwareId.ReadOnly = true;
|
||||
txtHardwareId.Size = new System.Drawing.Size(400, 23);
|
||||
txtHardwareId.TabIndex = 3;
|
||||
//
|
||||
// btnCopyHwId
|
||||
//
|
||||
btnCopyHwId.Location = new System.Drawing.Point(424, 99);
|
||||
btnCopyHwId.Name = "btnCopyHwId";
|
||||
btnCopyHwId.Size = new System.Drawing.Size(96, 25);
|
||||
btnCopyHwId.TabIndex = 4;
|
||||
btnCopyHwId.Text = "Kopieren";
|
||||
btnCopyHwId.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// lblKeyCaption
|
||||
//
|
||||
lblKeyCaption.AutoSize = true;
|
||||
lblKeyCaption.Location = new System.Drawing.Point(16, 136);
|
||||
lblKeyCaption.Name = "lblKeyCaption";
|
||||
lblKeyCaption.Size = new System.Drawing.Size(96, 15);
|
||||
lblKeyCaption.TabIndex = 5;
|
||||
lblKeyCaption.Text = "Lizenzschlüssel:";
|
||||
//
|
||||
// txtKey
|
||||
//
|
||||
txtKey.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
|
||||
txtKey.Location = new System.Drawing.Point(16, 154);
|
||||
txtKey.Name = "txtKey";
|
||||
txtKey.Size = new System.Drawing.Size(400, 23);
|
||||
txtKey.TabIndex = 6;
|
||||
//
|
||||
// btnValidate
|
||||
//
|
||||
btnValidate.Location = new System.Drawing.Point(424, 153);
|
||||
btnValidate.Name = "btnValidate";
|
||||
btnValidate.Size = new System.Drawing.Size(96, 25);
|
||||
btnValidate.TabIndex = 7;
|
||||
btnValidate.Text = "Validieren";
|
||||
btnValidate.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// lblResult
|
||||
//
|
||||
lblResult.Location = new System.Drawing.Point(16, 190);
|
||||
lblResult.Name = "lblResult";
|
||||
lblResult.Size = new System.Drawing.Size(504, 40);
|
||||
lblResult.TabIndex = 8;
|
||||
//
|
||||
// btnLimited
|
||||
//
|
||||
btnLimited.Location = new System.Drawing.Point(16, 236);
|
||||
btnLimited.Name = "btnLimited";
|
||||
btnLimited.Size = new System.Drawing.Size(230, 27);
|
||||
btnLimited.TabIndex = 9;
|
||||
btnLimited.Text = "Ohne Lizenz starten (eingeschränkt)";
|
||||
btnLimited.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// LicenseDialog
|
||||
//
|
||||
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
ClientSize = new System.Drawing.Size(536, 278);
|
||||
Controls.Add(btnLimited);
|
||||
Controls.Add(lblResult);
|
||||
Controls.Add(btnValidate);
|
||||
Controls.Add(txtKey);
|
||||
Controls.Add(lblKeyCaption);
|
||||
Controls.Add(btnCopyHwId);
|
||||
Controls.Add(txtHardwareId);
|
||||
Controls.Add(lblHwCaption);
|
||||
Controls.Add(lblStatus);
|
||||
Controls.Add(lblHeadline);
|
||||
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
MaximizeBox = false;
|
||||
MinimizeBox = false;
|
||||
Name = "LicenseDialog";
|
||||
StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
Text = "PolyTrader – Lizenz";
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Label lblHeadline;
|
||||
private System.Windows.Forms.Label lblStatus;
|
||||
private System.Windows.Forms.Label lblHwCaption;
|
||||
private System.Windows.Forms.TextBox txtHardwareId;
|
||||
private System.Windows.Forms.Button btnCopyHwId;
|
||||
private System.Windows.Forms.Label lblKeyCaption;
|
||||
private System.Windows.Forms.TextBox txtKey;
|
||||
private System.Windows.Forms.Button btnValidate;
|
||||
private System.Windows.Forms.Label lblResult;
|
||||
private System.Windows.Forms.Button btnLimited;
|
||||
}
|
||||
}
|
||||
@@ -1,135 +0,0 @@
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using LicenseLabrador.Client;
|
||||
using PolyTraderSharp.Licensing;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// Modaler Lizenzdialog beim Programmstart, wenn keine gültige Lizenz vorliegt. Zeigt die
|
||||
/// Hardware-ID (kopierbar, für die Aktivierung im Lizenz-Admin), nimmt einen Lizenzschlüssel
|
||||
/// entgegen und validiert ihn gegen den Lizenzserver. Bei Erfolg werden <see cref="ValidatedKey"/>
|
||||
/// und <see cref="ValidatedResult"/> gesetzt; der Aufrufer (LicenseGate) speichert den Schlüssel.
|
||||
/// Ohne gültige Lizenz kann der Nutzer eingeschränkt (nur Core-Shell) weiterstarten.
|
||||
/// </summary>
|
||||
public partial class LicenseDialog : Form
|
||||
{
|
||||
private readonly LicenseClient _client;
|
||||
|
||||
/// <summary>Nur gesetzt, wenn im Dialog erfolgreich validiert wurde.</summary>
|
||||
public LicenseResult? ValidatedResult { get; private set; }
|
||||
|
||||
/// <summary>Der erfolgreich validierte Schlüssel (für die verschlüsselte Ablage).</summary>
|
||||
public string? ValidatedKey { get; private set; }
|
||||
|
||||
/// <param name="startupContext">
|
||||
/// true = Aufruf beim Programmstart (keine gültige Lizenz): der Abbruch-Button bietet
|
||||
/// „eingeschränkt starten". false = Aufruf aus den Einstellungen (App läuft bereits): der
|
||||
/// Button heißt „Schließen".
|
||||
/// </param>
|
||||
public LicenseDialog(LicenseClient client, string prefillKey, LicenseResult? initialResult, bool startupContext = true)
|
||||
{
|
||||
_client = client ?? throw new ArgumentNullException(nameof(client));
|
||||
InitializeComponent();
|
||||
|
||||
txtHardwareId.Text = SafeHardwareId(client);
|
||||
txtKey.Text = prefillKey ?? string.Empty;
|
||||
|
||||
if (initialResult != null)
|
||||
{
|
||||
lblStatus.Text = "Status: " + LicenseGate.Describe(initialResult) +
|
||||
(string.IsNullOrEmpty(initialResult.Message) ? string.Empty : $" – {initialResult.Message}");
|
||||
}
|
||||
else
|
||||
{
|
||||
lblStatus.Text = "Status: noch nicht geprüft – bitte „Validieren“ klicken.";
|
||||
}
|
||||
|
||||
if (startupContext)
|
||||
{
|
||||
lblHeadline.Text = "Für PolyTrader wird eine gültige Lizenz benötigt.";
|
||||
btnLimited.Text = "Ohne Lizenz starten (eingeschränkt)";
|
||||
}
|
||||
else
|
||||
{
|
||||
lblHeadline.Text = "Lizenz prüfen / hinterlegen";
|
||||
btnLimited.Text = "Schließen";
|
||||
}
|
||||
|
||||
btnValidate.Click += (_, _) => ValidateKey();
|
||||
btnCopyHwId.Click += (_, _) => CopyHardwareId();
|
||||
btnLimited.Click += (_, _) => { DialogResult = DialogResult.Cancel; Close(); };
|
||||
AcceptButton = btnValidate;
|
||||
}
|
||||
|
||||
private static string SafeHardwareId(LicenseClient client)
|
||||
{
|
||||
try { return client.GetHardwareId(); }
|
||||
catch { return "(nicht ermittelbar)"; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Prüft den eingegebenen Schlüssel gegen den Lizenzserver. Bewusst NICHT „Validate" genannt:
|
||||
/// das würde <see cref="ContainerControl.Validate()"/> verdecken (CS0108), sodass ein Aufruf
|
||||
/// über eine <see cref="Form"/>-Referenz statt der Control-Validierung einen Netzwerk-Call
|
||||
/// auslösen würde.
|
||||
/// </summary>
|
||||
private void ValidateKey()
|
||||
{
|
||||
string key = txtKey.Text.Trim();
|
||||
if (string.IsNullOrWhiteSpace(key))
|
||||
{
|
||||
lblResult.ForeColor = Color.Firebrick;
|
||||
lblResult.Text = "Bitte einen Lizenzschlüssel eingeben.";
|
||||
return;
|
||||
}
|
||||
|
||||
btnValidate.Enabled = false;
|
||||
Cursor = Cursors.WaitCursor;
|
||||
lblResult.ForeColor = SystemColors.ControlText;
|
||||
lblResult.Text = "Prüfe Lizenz …";
|
||||
lblResult.Refresh();
|
||||
|
||||
try
|
||||
{
|
||||
// Blockierend: das SDK nutzt durchgängig ConfigureAwait(false) → kein Deadlock auf dem
|
||||
// UI-Thread; der kurze Freeze (max. HTTP-Timeout) ist im modalen Startdialog vertretbar
|
||||
// und vermeidet jede Abhängigkeit vom WinForms-SynchronizationContext vor Application.Run.
|
||||
LicenseResult result = _client.ValidateAsync(key).GetAwaiter().GetResult();
|
||||
|
||||
if (result.IsUsable)
|
||||
{
|
||||
ValidatedResult = result;
|
||||
ValidatedKey = key;
|
||||
lblResult.ForeColor = Color.Green;
|
||||
lblResult.Text = "Lizenz gültig – PolyTrader startet.";
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
}
|
||||
else
|
||||
{
|
||||
lblResult.ForeColor = Color.Firebrick;
|
||||
string extra = string.IsNullOrEmpty(result.Message) ? string.Empty : $" ({result.Message})";
|
||||
lblResult.Text = "Nicht gültig: " + LicenseGate.Describe(result) + extra;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
lblResult.ForeColor = Color.Firebrick;
|
||||
lblResult.Text = "Fehler bei der Prüfung: " + ex.Message;
|
||||
}
|
||||
finally
|
||||
{
|
||||
Cursor = Cursors.Default;
|
||||
btnValidate.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void CopyHardwareId()
|
||||
{
|
||||
try { Clipboard.SetText(txtHardwareId.Text); }
|
||||
catch { /* Zwischenablage kann kurzzeitig belegt sein – kein harter Fehler */ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using PolyTrader.Core.Modularity;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// Verwaltet die registrierten Fenster-Views: öffnet sie als eigenständige Forms,
|
||||
/// hält je View höchstens eine Instanz offen und holt ein bereits offenes Fenster
|
||||
/// wieder in den Vordergrund. Meldet Änderungen am Offen-Status (für die
|
||||
/// Button-Markierung im Launcher).
|
||||
/// </summary>
|
||||
public class ShellUiHost : IModuleUiHost
|
||||
{
|
||||
private readonly List<ModuleView> _views = new();
|
||||
private readonly Dictionary<string, Form> _open = new();
|
||||
private Form? _mainWindow;
|
||||
private bool _shutdownDialogOpen;
|
||||
|
||||
/// <summary>
|
||||
/// True, sobald das Herunterfahren über die Sicherheitsabfrage bestätigt wurde. Der Launcher
|
||||
/// wertet das in FormClosing aus, um beim Schließen-X denselben Dialog zu erzwingen.
|
||||
/// </summary>
|
||||
public bool ShutdownConfirmed { get; private set; }
|
||||
|
||||
/// <summary>Wird ausgelöst, wenn sich der Offen-Status irgendeiner View ändert.</summary>
|
||||
public event Action? OpenStateChanged;
|
||||
|
||||
public IReadOnlyList<ModuleView> Views => _views;
|
||||
|
||||
public void RegisterView(ModuleView view) => _views.Add(view);
|
||||
|
||||
/// <summary>Setzt das Hauptfenster (Launcher) – Ziel für <see cref="ActivateMain"/>.</summary>
|
||||
public void SetMainWindow(Form main) => _mainWindow = main;
|
||||
|
||||
/// <summary>
|
||||
/// Fügt einem Fenster die gemeinsame Fenster-Menüleiste hinzu (oberste Leiste, alle Fenster
|
||||
/// nebeneinander mit Icon). Als letztes hinzugefügtes Top-Control belegt der MenuStrip die
|
||||
/// oberste Zeile über etwaigen ToolStrips.
|
||||
/// </summary>
|
||||
private void AttachWindowMenu(Form form, string currentViewId)
|
||||
{
|
||||
var menu = new MenuStrip { Dock = DockStyle.Top, ImageScalingSize = new System.Drawing.Size(24, 24) };
|
||||
WindowMenu.Wire(menu, this, currentViewId);
|
||||
form.Controls.Add(menu);
|
||||
form.MainMenuStrip = menu;
|
||||
}
|
||||
|
||||
public void ActivateMain()
|
||||
{
|
||||
if (_mainWindow == null || _mainWindow.IsDisposed) return;
|
||||
if (_mainWindow.WindowState == FormWindowState.Minimized)
|
||||
_mainWindow.WindowState = FormWindowState.Maximized;
|
||||
_mainWindow.BringToFront();
|
||||
_mainWindow.Activate();
|
||||
}
|
||||
|
||||
public bool IsOpen(string viewId) =>
|
||||
_open.TryGetValue(viewId, out var form) && !form.IsDisposed;
|
||||
|
||||
/// <summary>
|
||||
/// Zeigt die Sicherheitsabfrage (Timer-gesperrter Beenden-Button, Abbrechen jederzeit). Bei
|
||||
/// Bestätigung wird die Message-Loop beendet – das geordnete Herunterfahren der Module läuft
|
||||
/// anschließend in Program.Main über <c>AppHost.StopAsync()</c> (nach <c>Application.Run</c>).
|
||||
/// Aus jedem Fenster aufrufbar; der Dialog erscheint zentriert über dem Hauptfenster.
|
||||
/// </summary>
|
||||
public void RequestShutdown()
|
||||
{
|
||||
if (ShutdownConfirmed || _shutdownDialogOpen) return;
|
||||
_shutdownDialogOpen = true;
|
||||
try
|
||||
{
|
||||
using var dlg = new ShutdownConfirmDialog();
|
||||
var owner = _mainWindow != null && !_mainWindow.IsDisposed ? _mainWindow : null;
|
||||
var result = owner != null ? dlg.ShowDialog(owner) : dlg.ShowDialog();
|
||||
if (result != DialogResult.OK) return;
|
||||
|
||||
ShutdownConfirmed = true;
|
||||
Application.Exit(); // beendet die Message-Loop; StopAsync() fährt Module danach sauber herunter
|
||||
}
|
||||
finally
|
||||
{
|
||||
_shutdownDialogOpen = false;
|
||||
}
|
||||
}
|
||||
|
||||
public void OpenView(string viewId)
|
||||
{
|
||||
var view = _views.FirstOrDefault(v => v.Id == viewId);
|
||||
if (view != null) OpenView(view);
|
||||
}
|
||||
|
||||
public void OpenView(ModuleView view)
|
||||
{
|
||||
if (_open.TryGetValue(view.Id, out var existing) && !existing.IsDisposed)
|
||||
{
|
||||
if (existing.WindowState == FormWindowState.Minimized)
|
||||
existing.WindowState = FormWindowState.Normal;
|
||||
existing.BringToFront();
|
||||
existing.Activate();
|
||||
return;
|
||||
}
|
||||
|
||||
// CreateView liefert bewusst object (toolkit-neutraler Core-Contract). Die WinForms-Shell
|
||||
// kennt ihr Toolkit und castet hier; ein falscher Typ ist ein Programmierfehler und soll
|
||||
// laut knallen, nicht still ein leeres Fenster erzeugen.
|
||||
var form = (Form)view.CreateView();
|
||||
if (string.IsNullOrEmpty(form.Text) || form.Text == form.Name)
|
||||
form.Text = view.Title;
|
||||
|
||||
// Gemeinsames „Fenster"-Menü zentral in jedes Fenster injizieren (identische Shell-Chrome
|
||||
// auf allen Fenstern; die inhaltlichen Controls bleiben designerbasiert). Nur, wenn das
|
||||
// Fenster nicht bereits ein eigenes Menü mitbringt (z. B. der Launcher).
|
||||
if (form.MainMenuStrip == null)
|
||||
AttachWindowMenu(form, view.Id);
|
||||
|
||||
// Alle Fenster maximiert (Vorgabe): Full-HD-Ziel, skaliert auf größere Auflösungen.
|
||||
form.StartPosition = FormStartPosition.CenterScreen;
|
||||
form.WindowState = FormWindowState.Maximized;
|
||||
|
||||
_open[view.Id] = form;
|
||||
form.FormClosed += (_, _) =>
|
||||
{
|
||||
_open.Remove(view.Id);
|
||||
OpenStateChanged?.Invoke();
|
||||
};
|
||||
|
||||
form.Show();
|
||||
OpenStateChanged?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
-120
@@ -1,120 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
partial class ShutdownConfirmDialog
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
components = new System.ComponentModel.Container();
|
||||
lblTitle = new System.Windows.Forms.Label();
|
||||
lblInfo = new System.Windows.Forms.Label();
|
||||
lblCountdown = new System.Windows.Forms.Label();
|
||||
btnConfirm = new System.Windows.Forms.Button();
|
||||
btnCancel = new System.Windows.Forms.Button();
|
||||
countdownTimer = new System.Windows.Forms.Timer(components);
|
||||
SuspendLayout();
|
||||
//
|
||||
// lblTitle
|
||||
//
|
||||
lblTitle.AutoSize = true;
|
||||
lblTitle.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Bold);
|
||||
lblTitle.Location = new System.Drawing.Point(18, 16);
|
||||
lblTitle.Name = "lblTitle";
|
||||
lblTitle.Size = new System.Drawing.Size(300, 28);
|
||||
lblTitle.TabIndex = 0;
|
||||
lblTitle.Text = "PolyTrader sicher beenden?";
|
||||
//
|
||||
// lblInfo
|
||||
//
|
||||
lblInfo.Location = new System.Drawing.Point(20, 52);
|
||||
lblInfo.Name = "lblInfo";
|
||||
lblInfo.Size = new System.Drawing.Size(464, 96);
|
||||
lblInfo.TabIndex = 1;
|
||||
lblInfo.Text = "PolyTrader und alle Module werden geordnet heruntergefahren. Laufende API-Aufrufe, "
|
||||
+ "Order- und Trading-Vorgänge werden dabei sauber abgeschlossen.\r\n\r\n"
|
||||
+ "Aus Sicherheit ist die Beenden-Schaltfläche erst nach Ablauf eines kurzen Timers "
|
||||
+ "aktiv. Abbrechen ist jederzeit möglich.";
|
||||
//
|
||||
// lblCountdown
|
||||
//
|
||||
lblCountdown.AutoSize = true;
|
||||
lblCountdown.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold);
|
||||
lblCountdown.ForeColor = System.Drawing.Color.Firebrick;
|
||||
lblCountdown.Location = new System.Drawing.Point(20, 158);
|
||||
lblCountdown.Name = "lblCountdown";
|
||||
lblCountdown.Size = new System.Drawing.Size(200, 23);
|
||||
lblCountdown.TabIndex = 2;
|
||||
lblCountdown.Text = "Beenden möglich in 10 s …";
|
||||
//
|
||||
// btnConfirm
|
||||
//
|
||||
btnConfirm.DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
btnConfirm.Enabled = false;
|
||||
btnConfirm.Location = new System.Drawing.Point(232, 196);
|
||||
btnConfirm.Name = "btnConfirm";
|
||||
btnConfirm.Size = new System.Drawing.Size(140, 36);
|
||||
btnConfirm.TabIndex = 3;
|
||||
btnConfirm.Text = "Beenden (10 s)";
|
||||
btnConfirm.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
btnCancel.Location = new System.Drawing.Point(380, 196);
|
||||
btnCancel.Name = "btnCancel";
|
||||
btnCancel.Size = new System.Drawing.Size(104, 36);
|
||||
btnCancel.TabIndex = 4;
|
||||
btnCancel.Text = "Abbrechen";
|
||||
btnCancel.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// countdownTimer
|
||||
//
|
||||
countdownTimer.Interval = 1000;
|
||||
countdownTimer.Tick += CountdownTimer_Tick;
|
||||
//
|
||||
// ShutdownConfirmDialog
|
||||
//
|
||||
AcceptButton = btnConfirm;
|
||||
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
CancelButton = btnCancel;
|
||||
ClientSize = new System.Drawing.Size(504, 248);
|
||||
Controls.Add(btnCancel);
|
||||
Controls.Add(btnConfirm);
|
||||
Controls.Add(lblCountdown);
|
||||
Controls.Add(lblInfo);
|
||||
Controls.Add(lblTitle);
|
||||
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
MaximizeBox = false;
|
||||
MinimizeBox = false;
|
||||
Name = "ShutdownConfirmDialog";
|
||||
ShowIcon = false;
|
||||
ShowInTaskbar = false;
|
||||
StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
Text = "PolyTrader beenden";
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Label lblTitle;
|
||||
private System.Windows.Forms.Label lblInfo;
|
||||
private System.Windows.Forms.Label lblCountdown;
|
||||
private System.Windows.Forms.Button btnConfirm;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
private System.Windows.Forms.Timer countdownTimer;
|
||||
}
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// Sicherheitsabfrage vor dem Herunterfahren. Die Beenden-Schaltfläche ist erst nach Ablauf eines
|
||||
/// kurzen Timers klickbar (verhindert versehentliches Beenden, z.B. während auf eine API-Antwort
|
||||
/// gewartet wird); „Abbrechen" ist jederzeit möglich. Bei Bestätigung liefert der Dialog
|
||||
/// <see cref="DialogResult.OK"/> – das eigentliche geordnete Herunterfahren übernimmt der Aufrufer.
|
||||
/// </summary>
|
||||
public partial class ShutdownConfirmDialog : Form
|
||||
{
|
||||
private int _remaining;
|
||||
|
||||
/// <param name="delaySeconds">Sekunden, bis „Beenden" freigeschaltet wird (Standard 10).</param>
|
||||
public ShutdownConfirmDialog(int delaySeconds = 10)
|
||||
{
|
||||
InitializeComponent();
|
||||
_remaining = Math.Max(0, delaySeconds);
|
||||
UpdateCountdownUi();
|
||||
}
|
||||
|
||||
protected override void OnShown(EventArgs e)
|
||||
{
|
||||
base.OnShown(e);
|
||||
if (_remaining <= 0)
|
||||
{
|
||||
EnableConfirm();
|
||||
return;
|
||||
}
|
||||
countdownTimer.Start();
|
||||
}
|
||||
|
||||
private void CountdownTimer_Tick(object? sender, EventArgs e)
|
||||
{
|
||||
_remaining--;
|
||||
if (_remaining <= 0)
|
||||
{
|
||||
countdownTimer.Stop();
|
||||
EnableConfirm();
|
||||
return;
|
||||
}
|
||||
UpdateCountdownUi();
|
||||
}
|
||||
|
||||
private void UpdateCountdownUi()
|
||||
{
|
||||
lblCountdown.Text = $"Beenden möglich in {_remaining} s …";
|
||||
btnConfirm.Text = $"Beenden ({_remaining} s)";
|
||||
}
|
||||
|
||||
private void EnableConfirm()
|
||||
{
|
||||
btnConfirm.Enabled = true;
|
||||
btnConfirm.Text = "Jetzt beenden";
|
||||
lblCountdown.Text = "PolyTrader kann jetzt beendet werden.";
|
||||
lblCountdown.ForeColor = System.Drawing.Color.ForestGreen;
|
||||
btnConfirm.Focus();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using PolyTrader.Core.Modularity;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// Löst die toolkit-neutralen <see cref="ModuleView.IconKey"/>-Schlüssel gegen die WinForms-
|
||||
/// Bildressourcen der App auf. Diese Zuordnung ist die einzige Stelle, an der Views und
|
||||
/// Bilddaten zusammenkommen – Core und Module kennen nur noch den Schlüssel als Zeichenkette.
|
||||
///
|
||||
/// Die Avalonia-Shell bekommt später ein eigenes Gegenstück mit denselben Schlüsseln; die
|
||||
/// Registrierungen in Core und Modulen bleiben dabei unverändert.
|
||||
/// </summary>
|
||||
internal static class ViewIcons
|
||||
{
|
||||
/// <summary>Symbol-Schlüssel → Bildressource. Unbekannte Schlüssel liefern <c>null</c> (Text-only-Menüeintrag).</summary>
|
||||
private static readonly Dictionary<string, Image> Map = new()
|
||||
{
|
||||
["dashboard"] = Properties.Resources.dashboard,
|
||||
["settings"] = Properties.Resources.setting_tools,
|
||||
["terminal"] = Properties.Resources.error_log,
|
||||
["jobs"] = Properties.Resources.system_time,
|
||||
["accounting"] = Properties.Resources.coins_in_hand,
|
||||
["copytrading"] = Properties.Resources.cross_reference,
|
||||
["resolutionfarming"] = Properties.Resources.file_start_workflow,
|
||||
["supervisor"] = Properties.Resources.emotion_batman,
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Standard-Symbolschlüssel je View-ID. Greift für Views, die selbst keinen
|
||||
/// <see cref="ModuleView.IconKey"/> setzen – u.a. die Modul-Fenster, die die App-Ressourcen
|
||||
/// nicht kennen. Ersetzt die frühere Icon-Zuweisung in <c>Program.AssignMenuIcons</c>.
|
||||
/// </summary>
|
||||
private static readonly Dictionary<string, string> DefaultKeyByViewId = new()
|
||||
{
|
||||
["core.dashboard"] = "dashboard",
|
||||
["core.settings"] = "settings",
|
||||
["core.terminal"] = "terminal",
|
||||
["core.jobs"] = "jobs",
|
||||
["accounting.main"] = "accounting",
|
||||
["copytrading.main"] = "copytrading",
|
||||
["resolutionfarming.main"] = "resolutionfarming",
|
||||
["supervisor.main"] = "supervisor",
|
||||
};
|
||||
|
||||
/// <summary>Bildressource zum Schlüssel, oder <c>null</c> (kein Symbol / unbekannter Schlüssel).</summary>
|
||||
public static Image? Resolve(string? iconKey) =>
|
||||
iconKey != null && Map.TryGetValue(iconKey, out var img) ? img : null;
|
||||
|
||||
/// <summary>
|
||||
/// Setzt bei allen registrierten Views den Standard-Symbolschlüssel, sofern noch keiner gesetzt ist.
|
||||
/// </summary>
|
||||
public static void AssignDefaults(IModuleUiHost uiHost)
|
||||
{
|
||||
foreach (var view in uiHost.Views)
|
||||
if (view.IconKey == null && DefaultKeyByViewId.TryGetValue(view.Id, out var key))
|
||||
view.IconKey = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
Generated
-623
@@ -1,623 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
partial class DashboardView
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DashboardView));
|
||||
toolStripDash = new ToolStrip();
|
||||
tslKonto = new ToolStripLabel();
|
||||
cbAccount = new ToolStripComboBox();
|
||||
tslModul = new ToolStripLabel();
|
||||
cbModule = new ToolStripComboBox();
|
||||
tslArt = new ToolStripLabel();
|
||||
cbMode = new ToolStripComboBox();
|
||||
tslZeit = new ToolStripLabel();
|
||||
cbRange = new ToolStripComboBox();
|
||||
tsRefresh = new ToolStripButton();
|
||||
tabControlDash = new TabControl();
|
||||
tabDashboard = new TabPage();
|
||||
picEquity = new PictureBox();
|
||||
pnlChartsBottom = new Panel();
|
||||
picDay = new PictureBox();
|
||||
picModule = new PictureBox();
|
||||
flpKpis = new FlowLayoutPanel();
|
||||
lblKpiPnl = new Label();
|
||||
lblKpiWin = new Label();
|
||||
lblKpiTrades = new Label();
|
||||
lblKpiAvg = new Label();
|
||||
lblKpiPf = new Label();
|
||||
tabHistory = new TabPage();
|
||||
dgvTrades = new DataGridView();
|
||||
colModule = new DataGridViewTextBoxColumn();
|
||||
colAccount = new DataGridViewTextBoxColumn();
|
||||
colMarket = new DataGridViewTextBoxColumn();
|
||||
colOutcome = new DataGridViewTextBoxColumn();
|
||||
colSide = new DataGridViewTextBoxColumn();
|
||||
colEntry = new DataGridViewTextBoxColumn();
|
||||
colExit = new DataGridViewTextBoxColumn();
|
||||
colSize = new DataGridViewTextBoxColumn();
|
||||
colPnl = new DataGridViewTextBoxColumn();
|
||||
colPnlPct = new DataGridViewTextBoxColumn();
|
||||
colClosedAt = new DataGridViewTextBoxColumn();
|
||||
pnlHistFilters = new Panel();
|
||||
cbWinLoss = new ComboBox();
|
||||
lblErgebnis = new Label();
|
||||
tbSearch = new TextBox();
|
||||
lblSuche = new Label();
|
||||
tabModules = new TabPage();
|
||||
dgvModules = new DataGridView();
|
||||
colModName = new DataGridViewTextBoxColumn();
|
||||
colModStatus = new DataGridViewTextBoxColumn();
|
||||
colModHint = new DataGridViewTextBoxColumn();
|
||||
colModAction = new DataGridViewButtonColumn();
|
||||
lblModulesInfo = new Label();
|
||||
toolStripDash.SuspendLayout();
|
||||
tabControlDash.SuspendLayout();
|
||||
tabModules.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvModules).BeginInit();
|
||||
tabDashboard.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)picEquity).BeginInit();
|
||||
pnlChartsBottom.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)picDay).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)picModule).BeginInit();
|
||||
flpKpis.SuspendLayout();
|
||||
tabHistory.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvTrades).BeginInit();
|
||||
pnlHistFilters.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// toolStripDash
|
||||
//
|
||||
toolStripDash.ImageScalingSize = new Size(24, 24);
|
||||
toolStripDash.Items.AddRange(new ToolStripItem[] { tslKonto, cbAccount, tslModul, cbModule, tslArt, cbMode, tslZeit, cbRange, tsRefresh });
|
||||
toolStripDash.Location = new Point(0, 0);
|
||||
toolStripDash.Name = "toolStripDash";
|
||||
toolStripDash.Padding = new Padding(0, 0, 3, 0);
|
||||
toolStripDash.Size = new Size(1714, 34);
|
||||
toolStripDash.TabIndex = 0;
|
||||
//
|
||||
// tslKonto
|
||||
//
|
||||
tslKonto.Name = "tslKonto";
|
||||
tslKonto.Size = new Size(64, 29);
|
||||
tslKonto.Text = "Konto:";
|
||||
//
|
||||
// cbAccount
|
||||
//
|
||||
cbAccount.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbAccount.Name = "cbAccount";
|
||||
cbAccount.Size = new Size(241, 34);
|
||||
//
|
||||
// tslModul
|
||||
//
|
||||
tslModul.Name = "tslModul";
|
||||
tslModul.Size = new Size(68, 29);
|
||||
tslModul.Text = "Modul:";
|
||||
//
|
||||
// cbModule
|
||||
//
|
||||
cbModule.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbModule.Name = "cbModule";
|
||||
cbModule.Size = new Size(213, 34);
|
||||
//
|
||||
// tslArt
|
||||
//
|
||||
tslArt.Name = "tslArt";
|
||||
tslArt.Size = new Size(40, 29);
|
||||
tslArt.Text = "Art:";
|
||||
//
|
||||
// cbMode
|
||||
//
|
||||
cbMode.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbMode.Name = "cbMode";
|
||||
cbMode.Size = new Size(141, 34);
|
||||
//
|
||||
// tslZeit
|
||||
//
|
||||
tslZeit.Name = "tslZeit";
|
||||
tslZeit.Size = new Size(86, 29);
|
||||
tslZeit.Text = "Zeitraum:";
|
||||
//
|
||||
// cbRange
|
||||
//
|
||||
cbRange.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbRange.Name = "cbRange";
|
||||
cbRange.Size = new Size(155, 34);
|
||||
//
|
||||
// tsRefresh
|
||||
//
|
||||
tsRefresh.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
tsRefresh.Name = "tsRefresh";
|
||||
tsRefresh.Size = new Size(116, 29);
|
||||
tsRefresh.Text = "Aktualisieren";
|
||||
//
|
||||
// tabControlDash
|
||||
//
|
||||
tabControlDash.Controls.Add(tabDashboard);
|
||||
tabControlDash.Controls.Add(tabHistory);
|
||||
tabControlDash.Controls.Add(tabModules);
|
||||
tabControlDash.Dock = DockStyle.Fill;
|
||||
tabControlDash.Location = new Point(0, 34);
|
||||
tabControlDash.Margin = new Padding(4, 5, 4, 5);
|
||||
tabControlDash.Name = "tabControlDash";
|
||||
tabControlDash.SelectedIndex = 0;
|
||||
tabControlDash.Size = new Size(1714, 1049);
|
||||
tabControlDash.TabIndex = 1;
|
||||
//
|
||||
// tabDashboard
|
||||
//
|
||||
tabDashboard.Controls.Add(picEquity);
|
||||
tabDashboard.Controls.Add(pnlChartsBottom);
|
||||
tabDashboard.Controls.Add(flpKpis);
|
||||
tabDashboard.Location = new Point(4, 34);
|
||||
tabDashboard.Margin = new Padding(4, 5, 4, 5);
|
||||
tabDashboard.Name = "tabDashboard";
|
||||
tabDashboard.Padding = new Padding(4, 5, 4, 5);
|
||||
tabDashboard.Size = new Size(1706, 1011);
|
||||
tabDashboard.TabIndex = 0;
|
||||
tabDashboard.Text = "Dashboard";
|
||||
tabDashboard.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// picEquity
|
||||
//
|
||||
picEquity.BackColor = Color.White;
|
||||
picEquity.Dock = DockStyle.Fill;
|
||||
picEquity.Location = new Point(4, 132);
|
||||
picEquity.Margin = new Padding(4, 5, 4, 5);
|
||||
picEquity.Name = "picEquity";
|
||||
picEquity.Size = new Size(1698, 474);
|
||||
picEquity.SizeMode = PictureBoxSizeMode.Zoom;
|
||||
picEquity.TabIndex = 2;
|
||||
picEquity.TabStop = false;
|
||||
//
|
||||
// pnlChartsBottom
|
||||
//
|
||||
pnlChartsBottom.Controls.Add(picDay);
|
||||
pnlChartsBottom.Controls.Add(picModule);
|
||||
pnlChartsBottom.Dock = DockStyle.Bottom;
|
||||
pnlChartsBottom.Location = new Point(4, 606);
|
||||
pnlChartsBottom.Margin = new Padding(4, 5, 4, 5);
|
||||
pnlChartsBottom.Name = "pnlChartsBottom";
|
||||
pnlChartsBottom.Size = new Size(1698, 400);
|
||||
pnlChartsBottom.TabIndex = 1;
|
||||
//
|
||||
// picDay
|
||||
//
|
||||
picDay.BackColor = Color.White;
|
||||
picDay.Dock = DockStyle.Fill;
|
||||
picDay.Location = new Point(847, 0);
|
||||
picDay.Margin = new Padding(4, 5, 4, 5);
|
||||
picDay.Name = "picDay";
|
||||
picDay.Size = new Size(851, 400);
|
||||
picDay.SizeMode = PictureBoxSizeMode.Zoom;
|
||||
picDay.TabIndex = 1;
|
||||
picDay.TabStop = false;
|
||||
//
|
||||
// picModule
|
||||
//
|
||||
picModule.BackColor = Color.White;
|
||||
picModule.Dock = DockStyle.Left;
|
||||
picModule.Location = new Point(0, 0);
|
||||
picModule.Margin = new Padding(4, 5, 4, 5);
|
||||
picModule.Name = "picModule";
|
||||
picModule.Size = new Size(847, 400);
|
||||
picModule.SizeMode = PictureBoxSizeMode.Zoom;
|
||||
picModule.TabIndex = 0;
|
||||
picModule.TabStop = false;
|
||||
//
|
||||
// flpKpis
|
||||
//
|
||||
flpKpis.Controls.Add(lblKpiPnl);
|
||||
flpKpis.Controls.Add(lblKpiWin);
|
||||
flpKpis.Controls.Add(lblKpiTrades);
|
||||
flpKpis.Controls.Add(lblKpiAvg);
|
||||
flpKpis.Controls.Add(lblKpiPf);
|
||||
flpKpis.Dock = DockStyle.Top;
|
||||
flpKpis.Location = new Point(4, 5);
|
||||
flpKpis.Margin = new Padding(4, 5, 4, 5);
|
||||
flpKpis.Name = "flpKpis";
|
||||
flpKpis.Padding = new Padding(6, 7, 6, 7);
|
||||
flpKpis.Size = new Size(1698, 127);
|
||||
flpKpis.TabIndex = 0;
|
||||
flpKpis.WrapContents = false;
|
||||
//
|
||||
// lblKpiPnl
|
||||
//
|
||||
lblKpiPnl.BorderStyle = BorderStyle.FixedSingle;
|
||||
lblKpiPnl.Font = new Font("Segoe UI", 10F, FontStyle.Bold);
|
||||
lblKpiPnl.Location = new Point(12, 14);
|
||||
lblKpiPnl.Margin = new Padding(6, 7, 6, 7);
|
||||
lblKpiPnl.MinimumSize = new Size(271, 92);
|
||||
lblKpiPnl.Name = "lblKpiPnl";
|
||||
lblKpiPnl.Padding = new Padding(11, 13, 11, 13);
|
||||
lblKpiPnl.Size = new Size(271, 92);
|
||||
lblKpiPnl.TabIndex = 0;
|
||||
lblKpiPnl.Text = "Netto-PnL\n—";
|
||||
lblKpiPnl.TextAlign = ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblKpiWin
|
||||
//
|
||||
lblKpiWin.BorderStyle = BorderStyle.FixedSingle;
|
||||
lblKpiWin.Font = new Font("Segoe UI", 10F, FontStyle.Bold);
|
||||
lblKpiWin.Location = new Point(295, 14);
|
||||
lblKpiWin.Margin = new Padding(6, 7, 6, 7);
|
||||
lblKpiWin.MinimumSize = new Size(213, 92);
|
||||
lblKpiWin.Name = "lblKpiWin";
|
||||
lblKpiWin.Padding = new Padding(11, 13, 11, 13);
|
||||
lblKpiWin.Size = new Size(213, 92);
|
||||
lblKpiWin.TabIndex = 1;
|
||||
lblKpiWin.Text = "Winrate\n—";
|
||||
lblKpiWin.TextAlign = ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblKpiTrades
|
||||
//
|
||||
lblKpiTrades.BorderStyle = BorderStyle.FixedSingle;
|
||||
lblKpiTrades.Font = new Font("Segoe UI", 10F, FontStyle.Bold);
|
||||
lblKpiTrades.Location = new Point(520, 14);
|
||||
lblKpiTrades.Margin = new Padding(6, 7, 6, 7);
|
||||
lblKpiTrades.MinimumSize = new Size(185, 92);
|
||||
lblKpiTrades.Name = "lblKpiTrades";
|
||||
lblKpiTrades.Padding = new Padding(11, 13, 11, 13);
|
||||
lblKpiTrades.Size = new Size(185, 92);
|
||||
lblKpiTrades.TabIndex = 2;
|
||||
lblKpiTrades.Text = "Trades\n—";
|
||||
lblKpiTrades.TextAlign = ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblKpiAvg
|
||||
//
|
||||
lblKpiAvg.BorderStyle = BorderStyle.FixedSingle;
|
||||
lblKpiAvg.Font = new Font("Segoe UI", 10F, FontStyle.Bold);
|
||||
lblKpiAvg.Location = new Point(717, 14);
|
||||
lblKpiAvg.Margin = new Padding(6, 7, 6, 7);
|
||||
lblKpiAvg.MinimumSize = new Size(242, 92);
|
||||
lblKpiAvg.Name = "lblKpiAvg";
|
||||
lblKpiAvg.Padding = new Padding(11, 13, 11, 13);
|
||||
lblKpiAvg.Size = new Size(242, 92);
|
||||
lblKpiAvg.TabIndex = 3;
|
||||
lblKpiAvg.Text = "Ø PnL/Trade\n—";
|
||||
lblKpiAvg.TextAlign = ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// lblKpiPf
|
||||
//
|
||||
lblKpiPf.BorderStyle = BorderStyle.FixedSingle;
|
||||
lblKpiPf.Font = new Font("Segoe UI", 10F, FontStyle.Bold);
|
||||
lblKpiPf.Location = new Point(971, 14);
|
||||
lblKpiPf.Margin = new Padding(6, 7, 6, 7);
|
||||
lblKpiPf.MinimumSize = new Size(213, 92);
|
||||
lblKpiPf.Name = "lblKpiPf";
|
||||
lblKpiPf.Padding = new Padding(11, 13, 11, 13);
|
||||
lblKpiPf.Size = new Size(213, 92);
|
||||
lblKpiPf.TabIndex = 4;
|
||||
lblKpiPf.Text = "Profit-Faktor\n—";
|
||||
lblKpiPf.TextAlign = ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// tabHistory
|
||||
//
|
||||
tabHistory.Controls.Add(dgvTrades);
|
||||
tabHistory.Controls.Add(pnlHistFilters);
|
||||
tabHistory.Location = new Point(4, 34);
|
||||
tabHistory.Margin = new Padding(4, 5, 4, 5);
|
||||
tabHistory.Name = "tabHistory";
|
||||
tabHistory.Padding = new Padding(4, 5, 4, 5);
|
||||
tabHistory.Size = new Size(1706, 1000);
|
||||
tabHistory.TabIndex = 1;
|
||||
tabHistory.Text = "Tradehistorie";
|
||||
tabHistory.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// dgvTrades
|
||||
//
|
||||
dgvTrades.AllowUserToAddRows = false;
|
||||
dgvTrades.AllowUserToDeleteRows = false;
|
||||
dgvTrades.AutoGenerateColumns = false;
|
||||
dgvTrades.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvTrades.Columns.AddRange(new DataGridViewColumn[] { colModule, colAccount, colMarket, colOutcome, colSide, colEntry, colExit, colSize, colPnl, colPnlPct, colClosedAt });
|
||||
dgvTrades.Dock = DockStyle.Fill;
|
||||
dgvTrades.Location = new Point(4, 65);
|
||||
dgvTrades.Margin = new Padding(4, 5, 4, 5);
|
||||
dgvTrades.Name = "dgvTrades";
|
||||
dgvTrades.ReadOnly = true;
|
||||
dgvTrades.RowHeadersVisible = false;
|
||||
dgvTrades.RowHeadersWidth = 62;
|
||||
dgvTrades.Size = new Size(1698, 930);
|
||||
dgvTrades.TabIndex = 1;
|
||||
//
|
||||
// colModule
|
||||
//
|
||||
colModule.DataPropertyName = "Module";
|
||||
colModule.HeaderText = "Modul";
|
||||
colModule.Name = "colModule";
|
||||
colModule.Width = 110;
|
||||
//
|
||||
// colAccount
|
||||
//
|
||||
colAccount.DataPropertyName = "Account";
|
||||
colAccount.HeaderText = "Konto";
|
||||
colAccount.Name = "colAccount";
|
||||
colAccount.Width = 130;
|
||||
//
|
||||
// colMarket
|
||||
//
|
||||
colMarket.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||
colMarket.DataPropertyName = "Market";
|
||||
colMarket.HeaderText = "Markt";
|
||||
colMarket.Name = "colMarket";
|
||||
//
|
||||
// colOutcome
|
||||
//
|
||||
colOutcome.DataPropertyName = "Outcome";
|
||||
colOutcome.HeaderText = "Outcome";
|
||||
colOutcome.Name = "colOutcome";
|
||||
colOutcome.Width = 80;
|
||||
//
|
||||
// colSide
|
||||
//
|
||||
colSide.DataPropertyName = "Side";
|
||||
colSide.HeaderText = "Side";
|
||||
colSide.Name = "colSide";
|
||||
colSide.Width = 60;
|
||||
//
|
||||
// colEntry
|
||||
//
|
||||
colEntry.DataPropertyName = "EntryPrice";
|
||||
colEntry.HeaderText = "Entry";
|
||||
colEntry.Name = "colEntry";
|
||||
colEntry.Width = 70;
|
||||
//
|
||||
// colExit
|
||||
//
|
||||
colExit.DataPropertyName = "ExitPrice";
|
||||
colExit.HeaderText = "Exit";
|
||||
colExit.Name = "colExit";
|
||||
colExit.Width = 70;
|
||||
//
|
||||
// colSize
|
||||
//
|
||||
colSize.DataPropertyName = "Size";
|
||||
colSize.HeaderText = "Size";
|
||||
colSize.Name = "colSize";
|
||||
colSize.Width = 70;
|
||||
//
|
||||
// colPnl
|
||||
//
|
||||
colPnl.DataPropertyName = "RealizedPnl";
|
||||
colPnl.HeaderText = "PnL";
|
||||
colPnl.Name = "colPnl";
|
||||
colPnl.Width = 80;
|
||||
//
|
||||
// colPnlPct
|
||||
//
|
||||
colPnlPct.DataPropertyName = "PnlPercent";
|
||||
colPnlPct.HeaderText = "PnL %";
|
||||
colPnlPct.Name = "colPnlPct";
|
||||
colPnlPct.Width = 70;
|
||||
//
|
||||
// colClosedAt
|
||||
//
|
||||
colClosedAt.DataPropertyName = "ClosedAt";
|
||||
colClosedAt.HeaderText = "Geschlossen";
|
||||
colClosedAt.Name = "colClosedAt";
|
||||
colClosedAt.Width = 140;
|
||||
//
|
||||
// pnlHistFilters
|
||||
//
|
||||
pnlHistFilters.Controls.Add(cbWinLoss);
|
||||
pnlHistFilters.Controls.Add(lblErgebnis);
|
||||
pnlHistFilters.Controls.Add(tbSearch);
|
||||
pnlHistFilters.Controls.Add(lblSuche);
|
||||
pnlHistFilters.Dock = DockStyle.Top;
|
||||
pnlHistFilters.Location = new Point(4, 5);
|
||||
pnlHistFilters.Margin = new Padding(4, 5, 4, 5);
|
||||
pnlHistFilters.Name = "pnlHistFilters";
|
||||
pnlHistFilters.Size = new Size(1698, 60);
|
||||
pnlHistFilters.TabIndex = 0;
|
||||
//
|
||||
// cbWinLoss
|
||||
//
|
||||
cbWinLoss.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbWinLoss.Location = new Point(606, 10);
|
||||
cbWinLoss.Margin = new Padding(4, 5, 4, 5);
|
||||
cbWinLoss.Name = "cbWinLoss";
|
||||
cbWinLoss.Size = new Size(213, 33);
|
||||
cbWinLoss.TabIndex = 3;
|
||||
//
|
||||
// lblErgebnis
|
||||
//
|
||||
lblErgebnis.AutoSize = true;
|
||||
lblErgebnis.Location = new Point(514, 15);
|
||||
lblErgebnis.Margin = new Padding(4, 0, 4, 0);
|
||||
lblErgebnis.Name = "lblErgebnis";
|
||||
lblErgebnis.Size = new Size(84, 25);
|
||||
lblErgebnis.TabIndex = 2;
|
||||
lblErgebnis.Text = "Ergebnis:";
|
||||
//
|
||||
// tbSearch
|
||||
//
|
||||
tbSearch.Location = new Point(81, 10);
|
||||
tbSearch.Margin = new Padding(4, 5, 4, 5);
|
||||
tbSearch.Name = "tbSearch";
|
||||
tbSearch.PlaceholderText = "Markt / Outcome …";
|
||||
tbSearch.Size = new Size(398, 31);
|
||||
tbSearch.TabIndex = 1;
|
||||
//
|
||||
// lblSuche
|
||||
//
|
||||
lblSuche.AutoSize = true;
|
||||
lblSuche.Location = new Point(9, 15);
|
||||
lblSuche.Margin = new Padding(4, 0, 4, 0);
|
||||
lblSuche.Name = "lblSuche";
|
||||
lblSuche.Size = new Size(63, 25);
|
||||
lblSuche.TabIndex = 0;
|
||||
lblSuche.Text = "Suche:";
|
||||
//
|
||||
// tabModules
|
||||
//
|
||||
tabModules.Controls.Add(dgvModules);
|
||||
tabModules.Controls.Add(lblModulesInfo);
|
||||
tabModules.Location = new Point(4, 34);
|
||||
tabModules.Margin = new Padding(4, 5, 4, 5);
|
||||
tabModules.Name = "tabModules";
|
||||
tabModules.Padding = new Padding(12, 12, 12, 12);
|
||||
tabModules.Size = new Size(1706, 1000);
|
||||
tabModules.TabIndex = 2;
|
||||
tabModules.Text = "Module";
|
||||
tabModules.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// lblModulesInfo
|
||||
//
|
||||
lblModulesInfo.Dock = DockStyle.Top;
|
||||
lblModulesInfo.Font = new Font("Segoe UI", 10F);
|
||||
lblModulesInfo.Location = new Point(12, 12);
|
||||
lblModulesInfo.Name = "lblModulesInfo";
|
||||
lblModulesInfo.Padding = new Padding(4, 8, 4, 12);
|
||||
lblModulesInfo.Size = new Size(1682, 56);
|
||||
lblModulesInfo.TabIndex = 0;
|
||||
lblModulesInfo.Text = "Module aktivieren/deaktivieren. Änderungen greifen nach dem nächsten Neustart von PolyTrader.";
|
||||
//
|
||||
// dgvModules
|
||||
//
|
||||
dgvModules.AllowUserToAddRows = false;
|
||||
dgvModules.AllowUserToDeleteRows = false;
|
||||
dgvModules.AllowUserToResizeRows = false;
|
||||
dgvModules.AutoGenerateColumns = false;
|
||||
dgvModules.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvModules.Columns.AddRange(new DataGridViewColumn[] { colModName, colModStatus, colModHint, colModAction });
|
||||
dgvModules.Dock = DockStyle.Fill;
|
||||
dgvModules.Location = new Point(12, 68);
|
||||
dgvModules.Margin = new Padding(4, 5, 4, 5);
|
||||
dgvModules.Name = "dgvModules";
|
||||
dgvModules.ReadOnly = true;
|
||||
dgvModules.RowHeadersVisible = false;
|
||||
dgvModules.RowHeadersWidth = 62;
|
||||
dgvModules.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvModules.Size = new Size(1682, 920);
|
||||
dgvModules.TabIndex = 1;
|
||||
//
|
||||
// colModName
|
||||
//
|
||||
colModName.DataPropertyName = "Modul";
|
||||
colModName.HeaderText = "Modul";
|
||||
colModName.Name = "colModName";
|
||||
colModName.ReadOnly = true;
|
||||
colModName.Width = 220;
|
||||
//
|
||||
// colModStatus
|
||||
//
|
||||
colModStatus.DataPropertyName = "Status";
|
||||
colModStatus.HeaderText = "Status";
|
||||
colModStatus.Name = "colModStatus";
|
||||
colModStatus.ReadOnly = true;
|
||||
colModStatus.Width = 260;
|
||||
//
|
||||
// colModHint
|
||||
//
|
||||
colModHint.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||
colModHint.DataPropertyName = "Hinweis";
|
||||
colModHint.HeaderText = "Hinweis";
|
||||
colModHint.Name = "colModHint";
|
||||
colModHint.ReadOnly = true;
|
||||
//
|
||||
// colModAction
|
||||
//
|
||||
colModAction.DataPropertyName = "Aktion";
|
||||
colModAction.HeaderText = "Aktion";
|
||||
colModAction.Name = "colModAction";
|
||||
colModAction.ReadOnly = true;
|
||||
colModAction.Text = "Umschalten";
|
||||
colModAction.UseColumnTextForButtonValue = false;
|
||||
colModAction.Width = 160;
|
||||
//
|
||||
// DashboardView
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1714, 1083);
|
||||
Controls.Add(tabControlDash);
|
||||
Controls.Add(toolStripDash);
|
||||
Icon = (Icon)resources.GetObject("$this.Icon");
|
||||
Margin = new Padding(4, 5, 4, 5);
|
||||
Name = "DashboardView";
|
||||
Text = "Dashboard";
|
||||
toolStripDash.ResumeLayout(false);
|
||||
toolStripDash.PerformLayout();
|
||||
tabControlDash.ResumeLayout(false);
|
||||
tabDashboard.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)picEquity).EndInit();
|
||||
pnlChartsBottom.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)picDay).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)picModule).EndInit();
|
||||
flpKpis.ResumeLayout(false);
|
||||
tabHistory.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)dgvTrades).EndInit();
|
||||
pnlHistFilters.ResumeLayout(false);
|
||||
pnlHistFilters.PerformLayout();
|
||||
tabModules.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)dgvModules).EndInit();
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.ToolStrip toolStripDash;
|
||||
private System.Windows.Forms.ToolStripLabel tslKonto;
|
||||
private System.Windows.Forms.ToolStripComboBox cbAccount;
|
||||
private System.Windows.Forms.ToolStripLabel tslModul;
|
||||
private System.Windows.Forms.ToolStripComboBox cbModule;
|
||||
private System.Windows.Forms.ToolStripLabel tslArt;
|
||||
private System.Windows.Forms.ToolStripComboBox cbMode;
|
||||
private System.Windows.Forms.ToolStripLabel tslZeit;
|
||||
private System.Windows.Forms.ToolStripComboBox cbRange;
|
||||
private System.Windows.Forms.ToolStripButton tsRefresh;
|
||||
private System.Windows.Forms.TabControl tabControlDash;
|
||||
private System.Windows.Forms.TabPage tabDashboard;
|
||||
private System.Windows.Forms.FlowLayoutPanel flpKpis;
|
||||
private System.Windows.Forms.Label lblKpiPnl;
|
||||
private System.Windows.Forms.Label lblKpiWin;
|
||||
private System.Windows.Forms.Label lblKpiTrades;
|
||||
private System.Windows.Forms.Label lblKpiAvg;
|
||||
private System.Windows.Forms.Label lblKpiPf;
|
||||
private System.Windows.Forms.Panel pnlChartsBottom;
|
||||
private System.Windows.Forms.PictureBox picModule;
|
||||
private System.Windows.Forms.PictureBox picDay;
|
||||
private System.Windows.Forms.PictureBox picEquity;
|
||||
private System.Windows.Forms.TabPage tabHistory;
|
||||
private System.Windows.Forms.Panel pnlHistFilters;
|
||||
private System.Windows.Forms.Label lblSuche;
|
||||
private System.Windows.Forms.TextBox tbSearch;
|
||||
private System.Windows.Forms.Label lblErgebnis;
|
||||
private System.Windows.Forms.ComboBox cbWinLoss;
|
||||
private System.Windows.Forms.DataGridView dgvTrades;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colModule;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colAccount;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colMarket;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colOutcome;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSide;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colEntry;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colExit;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSize;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPnl;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colPnlPct;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colClosedAt;
|
||||
private System.Windows.Forms.TabPage tabModules;
|
||||
private System.Windows.Forms.Label lblModulesInfo;
|
||||
private System.Windows.Forms.DataGridView dgvModules;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colModName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colModStatus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colModHint;
|
||||
private System.Windows.Forms.DataGridViewButtonColumn colModAction;
|
||||
}
|
||||
}
|
||||
@@ -1,407 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using PolyTrader.Core.Analytics;
|
||||
using PolyTrader.Core.Modularity;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTraderSharp.Models;
|
||||
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// Modulübergreifendes Dashboard aus dem generischen Core-Trade-Log (ITradeLogRepository).
|
||||
/// Tab „Dashboard": KPI-Kacheln + Charts (Equity-Kurve, PnL je Modul, PnL je Tag) für den im
|
||||
/// ToolStrip gewählten Scope (Konto/Modul/Live-Demo/Zeitraum). Tab „Tradehistorie": gefilterte
|
||||
/// Trade-Liste. Auswertungslogik pur in <see cref="TradeAnalytics"/>; Charts via ScottPlot
|
||||
/// (als Bitmap gerendert – kein WinForms-GL-Control, saubere Dependencies).
|
||||
/// </summary>
|
||||
public partial class DashboardView : Form
|
||||
{
|
||||
private ITradeLogRepository? _tradeLog;
|
||||
private TradingState? _state;
|
||||
|
||||
private IReadOnlyList<ModuleActivationInfo>? _moduleInfos; // alle Module (auch deaktivierte)
|
||||
private string? _settingsPath; // Quelle/Ziel der Modul-Aktivierung
|
||||
|
||||
private List<TradeRecord> _allTrades = new(); // zuletzt geladener Roh-Satz
|
||||
private List<DashboardTradeRow> _historyBase = new(); // Scope-gefiltert, Basis für die Historie-Filter
|
||||
private bool _loading;
|
||||
|
||||
public DashboardView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
colEntry.DefaultCellStyle.Format = "F3";
|
||||
colExit.DefaultCellStyle.Format = "F3";
|
||||
colSize.DefaultCellStyle.Format = "F2";
|
||||
colPnl.DefaultCellStyle.Format = "F2";
|
||||
colPnlPct.DefaultCellStyle.Format = "F1";
|
||||
colClosedAt.DefaultCellStyle.Format = "dd.MM.yyyy HH:mm";
|
||||
|
||||
cbMode.Items.AddRange(new object[] { "Alle", "Live", "Demo" });
|
||||
cbRange.Items.AddRange(new object[] { "7 Tage", "30 Tage", "90 Tage", "Alle" });
|
||||
cbWinLoss.Items.AddRange(new object[] { "Alle", "Gewinner", "Verlierer" });
|
||||
|
||||
tsRefresh.Click += (_, _) => RefreshData();
|
||||
cbAccount.SelectedIndexChanged += (_, _) => { if (!_loading) ApplyScope(); };
|
||||
cbModule.SelectedIndexChanged += (_, _) => { if (!_loading) ApplyScope(); };
|
||||
cbMode.SelectedIndexChanged += (_, _) => { if (!_loading) ApplyScope(); };
|
||||
cbRange.SelectedIndexChanged += (_, _) => { if (!_loading) ApplyScope(); };
|
||||
tbSearch.TextChanged += (_, _) => { if (!_loading) ApplyHistoryFilter(); };
|
||||
cbWinLoss.SelectedIndexChanged += (_, _) => { if (!_loading) ApplyHistoryFilter(); };
|
||||
|
||||
dgvModules.CellContentClick += Modules_CellContentClick;
|
||||
}
|
||||
|
||||
/// <param name="modules">
|
||||
/// Alle bekannten Module (auch deaktivierte) für den Tab „Module". <c>null</c> = kein
|
||||
/// Modul-Management (Tab wird entfernt, z.B. im Headless-Smoke-Test).
|
||||
/// </param>
|
||||
/// <param name="settingsPath">Pfad der Server-Settings-Datei (Ziel für die Ein/Aus-Persistenz).</param>
|
||||
public void Initialize(ITradeLogRepository tradeLog, TradingState state,
|
||||
IReadOnlyList<ModuleActivationInfo>? modules = null, string? settingsPath = null)
|
||||
{
|
||||
_tradeLog = tradeLog;
|
||||
_state = state;
|
||||
_moduleInfos = modules;
|
||||
_settingsPath = settingsPath;
|
||||
RefreshData();
|
||||
InitModulesTab();
|
||||
}
|
||||
|
||||
// ===== Daten laden / Scope =====
|
||||
|
||||
private void RefreshData()
|
||||
{
|
||||
if (_tradeLog == null) return;
|
||||
try { _allTrades = _tradeLog.GetRecent(5000); }
|
||||
catch { _allTrades = new List<TradeRecord>(); } // DB nicht bereit -> leer statt Absturz
|
||||
|
||||
_loading = true;
|
||||
PopulateScopeCombos();
|
||||
_loading = false;
|
||||
|
||||
ApplyScope();
|
||||
}
|
||||
|
||||
private void PopulateScopeCombos()
|
||||
{
|
||||
// Konten
|
||||
var selectedAcc = (cbAccount.SelectedItem as FilterAccount)?.Id ?? -1;
|
||||
cbAccount.Items.Clear();
|
||||
cbAccount.Items.Add(new FilterAccount(-1, "Alle Konten"));
|
||||
if (_state != null)
|
||||
foreach (var a in _state.Accounts.Values.OrderBy(a => a.AccountId))
|
||||
cbAccount.Items.Add(new FilterAccount(a.AccountId,
|
||||
(string.IsNullOrEmpty(a.Name) ? $"#{a.AccountId}" : a.Name) + (a.IsDemo ? " (Demo)" : "")));
|
||||
cbAccount.SelectedIndex = Math.Max(0, IndexOfAccount(selectedAcc));
|
||||
|
||||
// Module (aus den vorhandenen Daten)
|
||||
string selectedMod = cbModule.SelectedItem as string ?? "Alle Module";
|
||||
cbModule.Items.Clear();
|
||||
cbModule.Items.Add("Alle Module");
|
||||
foreach (var m in _allTrades.Select(t => t.ModuleName).Where(m => !string.IsNullOrEmpty(m)).Distinct().OrderBy(m => m))
|
||||
cbModule.Items.Add(m);
|
||||
int modIdx = cbModule.Items.IndexOf(selectedMod);
|
||||
cbModule.SelectedIndex = modIdx >= 0 ? modIdx : 0;
|
||||
|
||||
if (cbMode.SelectedIndex < 0) cbMode.SelectedIndex = 0; // Alle
|
||||
if (cbRange.SelectedIndex < 0) cbRange.SelectedIndex = 1; // 30 Tage
|
||||
if (cbWinLoss.SelectedIndex < 0) cbWinLoss.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
private int IndexOfAccount(int id)
|
||||
{
|
||||
for (int i = 0; i < cbAccount.Items.Count; i++)
|
||||
if (cbAccount.Items[i] is FilterAccount fa && fa.Id == id) return i;
|
||||
return 0;
|
||||
}
|
||||
|
||||
private void ApplyScope()
|
||||
{
|
||||
int accId = (cbAccount.SelectedItem as FilterAccount)?.Id ?? -1;
|
||||
string module = cbModule.SelectedItem as string ?? "Alle Module";
|
||||
string mode = cbMode.SelectedItem as string ?? "Alle";
|
||||
int? days = (cbRange.SelectedItem as string) switch
|
||||
{
|
||||
"7 Tage" => 7,
|
||||
"30 Tage" => 30,
|
||||
"90 Tage" => 90,
|
||||
_ => (int?)null
|
||||
};
|
||||
DateTime? since = days.HasValue ? DateTime.UtcNow.AddDays(-days.Value) : null;
|
||||
|
||||
var scoped = _allTrades.Where(t =>
|
||||
(accId < 0 || t.AccountId == accId) &&
|
||||
(module == "Alle Module" || t.ModuleName == module) &&
|
||||
(mode == "Alle" || (mode == "Live" && !t.IsDemo) || (mode == "Demo" && t.IsDemo)) &&
|
||||
(!since.HasValue || t.ClosedAt >= since.Value)).ToList();
|
||||
|
||||
UpdateKpis(scoped);
|
||||
RenderCharts(scoped);
|
||||
|
||||
_historyBase = scoped
|
||||
.OrderByDescending(t => t.ClosedAt)
|
||||
.Select(ToRow)
|
||||
.ToList();
|
||||
ApplyHistoryFilter();
|
||||
}
|
||||
|
||||
// ===== KPIs =====
|
||||
|
||||
private void UpdateKpis(List<TradeRecord> scoped)
|
||||
{
|
||||
var k = TradeAnalytics.ComputeKpis(scoped);
|
||||
lblKpiPnl.Text = $"Netto-PnL\n{k.NetPnl:N2} USDC";
|
||||
lblKpiPnl.ForeColor = k.NetPnl >= 0 ? System.Drawing.Color.ForestGreen : System.Drawing.Color.Firebrick;
|
||||
lblKpiWin.Text = $"Winrate\n{k.WinRatePct:N1} %";
|
||||
lblKpiTrades.Text = $"Trades\n{k.TradeCount}";
|
||||
lblKpiAvg.Text = $"Ø PnL/Trade\n{k.AvgPnlPerTrade:N2}";
|
||||
lblKpiPf.Text = $"Profit-Faktor\n{(k.ProfitFactor >= TradeAnalytics.NoLossProfitFactor ? "∞" : k.ProfitFactor.ToString("N2"))}";
|
||||
}
|
||||
|
||||
// ===== Charts (ScottPlot -> Bitmap) =====
|
||||
|
||||
private void RenderCharts(List<TradeRecord> scoped)
|
||||
{
|
||||
RenderPlot(picEquity, plot =>
|
||||
{
|
||||
var curve = TradeAnalytics.EquityCurve(scoped);
|
||||
plot.Title("Equity-Kurve (kumulierter PnL)");
|
||||
if (curve.Count == 0) return;
|
||||
double[] xs = curve.Select(p => p.At.ToOADate()).ToArray();
|
||||
double[] ys = curve.Select(p => (double)p.Cumulative).ToArray();
|
||||
plot.Add.Scatter(xs, ys);
|
||||
plot.Axes.DateTimeTicksBottom();
|
||||
});
|
||||
|
||||
RenderPlot(picModule, plot =>
|
||||
{
|
||||
var byMod = TradeAnalytics.PnlByKey(scoped, t => string.IsNullOrEmpty(t.ModuleName) ? "—" : t.ModuleName);
|
||||
plot.Title("PnL je Modul");
|
||||
if (byMod.Count == 0) return;
|
||||
plot.Add.Bars(byMod.Select(x => (double)x.Pnl).ToArray());
|
||||
SetCategoryTicks(plot, byMod.Select(x => x.Key).ToArray());
|
||||
});
|
||||
|
||||
RenderPlot(picDay, plot =>
|
||||
{
|
||||
var byDay = TradeAnalytics.PnlByDay(scoped);
|
||||
plot.Title("PnL je Tag");
|
||||
if (byDay.Count == 0) return;
|
||||
plot.Add.Bars(byDay.Select(x => (double)x.Pnl).ToArray());
|
||||
SetCategoryTicks(plot, byDay.Select(x => x.Day.ToString("dd.MM")).ToArray());
|
||||
});
|
||||
}
|
||||
|
||||
private static void SetCategoryTicks(ScottPlot.Plot plot, string[] labels)
|
||||
{
|
||||
var ticks = new ScottPlot.TickGenerators.NumericManual();
|
||||
for (int i = 0; i < labels.Length; i++)
|
||||
ticks.AddMajor(i, labels[i]);
|
||||
plot.Axes.Bottom.TickGenerator = ticks;
|
||||
}
|
||||
|
||||
private static void RenderPlot(PictureBox pic, Action<ScottPlot.Plot> build)
|
||||
{
|
||||
int w = Math.Max(pic.ClientSize.Width, 300);
|
||||
int h = Math.Max(pic.ClientSize.Height, 200);
|
||||
var plot = new ScottPlot.Plot();
|
||||
try { build(plot); }
|
||||
catch { /* Chart-Rendering darf die UI nie killen */ }
|
||||
|
||||
byte[] png = plot.GetImage(w, h).GetImageBytes();
|
||||
using var ms = new MemoryStream(png);
|
||||
using var img = System.Drawing.Image.FromStream(ms);
|
||||
var old = pic.Image;
|
||||
pic.Image = new System.Drawing.Bitmap(img);
|
||||
old?.Dispose();
|
||||
}
|
||||
|
||||
// ===== Tradehistorie =====
|
||||
|
||||
private void ApplyHistoryFilter()
|
||||
{
|
||||
string search = tbSearch.Text.Trim();
|
||||
string winLoss = cbWinLoss.SelectedItem as string ?? "Alle";
|
||||
|
||||
IEnumerable<DashboardTradeRow> rows = _historyBase;
|
||||
if (search.Length > 0)
|
||||
rows = rows.Where(r =>
|
||||
(r.Market?.Contains(search, StringComparison.OrdinalIgnoreCase) ?? false) ||
|
||||
(r.Outcome?.Contains(search, StringComparison.OrdinalIgnoreCase) ?? false));
|
||||
if (winLoss == "Gewinner") rows = rows.Where(r => r.RealizedPnl > 0m);
|
||||
else if (winLoss == "Verlierer") rows = rows.Where(r => r.RealizedPnl < 0m);
|
||||
|
||||
dgvTrades.DataSource = new BindingList<DashboardTradeRow>(rows.ToList());
|
||||
}
|
||||
|
||||
private DashboardTradeRow ToRow(TradeRecord r) => new()
|
||||
{
|
||||
Module = r.ModuleName,
|
||||
Account = ResolveAccount(r.AccountId, r.IsDemo),
|
||||
Market = r.MarketQuestion,
|
||||
Outcome = r.Outcome,
|
||||
Side = r.Side,
|
||||
EntryPrice = r.EntryPrice,
|
||||
ExitPrice = r.ExitPrice,
|
||||
Size = r.Size,
|
||||
RealizedPnl = r.RealizedPnl,
|
||||
PnlPercent = r.PnlPercent,
|
||||
ClosedAt = r.ClosedAt
|
||||
};
|
||||
|
||||
private string ResolveAccount(int accountId, bool isDemo)
|
||||
{
|
||||
string suffix = isDemo ? " (Demo)" : "";
|
||||
if (_state != null && _state.Accounts.TryGetValue(accountId, out var acc) && !string.IsNullOrEmpty(acc.Name))
|
||||
return acc.Name + suffix;
|
||||
return $"#{accountId}{suffix}";
|
||||
}
|
||||
|
||||
private sealed record FilterAccount(int Id, string Label)
|
||||
{
|
||||
public override string ToString() => Label;
|
||||
}
|
||||
|
||||
// ===== Module aktivieren/deaktivieren (neustart-basiert) =====
|
||||
|
||||
private void InitModulesTab()
|
||||
{
|
||||
if (_moduleInfos == null || string.IsNullOrEmpty(_settingsPath))
|
||||
{
|
||||
// Kein Modul-Management (z.B. Smoke-Test) -> Tab entfernen statt leer anzuzeigen.
|
||||
if (tabControlDash.TabPages.Contains(tabModules))
|
||||
tabControlDash.TabPages.Remove(tabModules);
|
||||
return;
|
||||
}
|
||||
PopulateModules();
|
||||
}
|
||||
|
||||
private HashSet<string> LoadDisabledModules()
|
||||
{
|
||||
try
|
||||
{
|
||||
var s = ServerSettings.Load(_settingsPath!);
|
||||
return new HashSet<string>(s.DisabledModules, StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
|
||||
private void PopulateModules()
|
||||
{
|
||||
if (_moduleInfos == null) return;
|
||||
var disabled = LoadDisabledModules();
|
||||
|
||||
var rows = new List<ModuleRow>();
|
||||
foreach (var m in _moduleInfos)
|
||||
{
|
||||
bool blocked = !string.IsNullOrEmpty(m.Blocker);
|
||||
bool desiredEnabled = !disabled.Contains(m.Name);
|
||||
|
||||
string status, hint, action;
|
||||
if (blocked)
|
||||
{
|
||||
status = "⚠ Nicht aktivierbar";
|
||||
hint = m.Blocker!;
|
||||
action = "—";
|
||||
}
|
||||
else if (m.IsRunning && desiredEnabled)
|
||||
{
|
||||
status = "Aktiv"; hint = ""; action = "Deaktivieren";
|
||||
}
|
||||
else if (m.IsRunning && !desiredEnabled)
|
||||
{
|
||||
status = "Aktiv – stoppt nach Neustart"; hint = "Änderung greift nach Neustart"; action = "Aktivieren";
|
||||
}
|
||||
else if (!m.IsRunning && desiredEnabled)
|
||||
{
|
||||
status = "Startet nach Neustart"; hint = "Änderung greift nach Neustart"; action = "Deaktivieren";
|
||||
}
|
||||
else
|
||||
{
|
||||
status = "Deaktiviert"; hint = ""; action = "Aktivieren";
|
||||
}
|
||||
|
||||
rows.Add(new ModuleRow { Modul = m.Name, Status = status, Hinweis = hint, Aktion = action });
|
||||
}
|
||||
|
||||
dgvModules.DataSource = new BindingList<ModuleRow>(rows);
|
||||
}
|
||||
|
||||
private void Modules_CellContentClick(object? sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (_moduleInfos == null || string.IsNullOrEmpty(_settingsPath)) return;
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
if (dgvModules.Columns[e.ColumnIndex].Name != "colModAction") return;
|
||||
if (dgvModules.Rows[e.RowIndex].DataBoundItem is not ModuleRow row) return;
|
||||
|
||||
var info = _moduleInfos.FirstOrDefault(m => m.Name == row.Modul);
|
||||
if (info == null) return;
|
||||
|
||||
if (!string.IsNullOrEmpty(info.Blocker))
|
||||
{
|
||||
MessageBox.Show($"Modul „{info.Name}“ kann nicht aktiviert werden:\n\n{info.Blocker}",
|
||||
"Aktivierung nicht möglich", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// Frisch aus der Datei lesen, damit parallele Änderungen (z.B. Settings-Fenster) nicht überschrieben werden.
|
||||
var settings = ServerSettings.Load(_settingsPath!);
|
||||
var set = new HashSet<string>(settings.DisabledModules, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
bool nowDisabled;
|
||||
if (set.Contains(info.Name)) { set.Remove(info.Name); nowDisabled = false; }
|
||||
else { set.Add(info.Name); nowDisabled = true; }
|
||||
|
||||
settings.DisabledModules = set.OrderBy(x => x).ToList();
|
||||
settings.Save(_settingsPath!);
|
||||
|
||||
PopulateModules();
|
||||
|
||||
MessageBox.Show(
|
||||
$"Modul „{info.Name}“ wird beim nächsten Start {(nowDisabled ? "NICHT mehr geladen" : "geladen")}.\n\n" +
|
||||
"Die Änderung greift erst nach einem Neustart von PolyTrader.",
|
||||
"Gespeichert", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Konnte die Modul-Einstellung nicht speichern: {ex.Message}", "Fehler",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Anzeige-Zeile des Modul-Grids (Bindung über DataPropertyName).</summary>
|
||||
private sealed class ModuleRow
|
||||
{
|
||||
public string Modul { get; set; } = string.Empty;
|
||||
public string Status { get; set; } = string.Empty;
|
||||
public string Hinweis { get; set; } = string.Empty;
|
||||
public string Aktion { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Anzeige-Zeile für das Historie-Grid (Account bereits zu Name aufgelöst).</summary>
|
||||
public class DashboardTradeRow
|
||||
{
|
||||
public string Module { get; set; } = string.Empty;
|
||||
public string Account { get; set; } = string.Empty;
|
||||
public string Market { get; set; } = string.Empty;
|
||||
public string Outcome { get; set; } = string.Empty;
|
||||
public string Side { get; set; } = string.Empty;
|
||||
public decimal EntryPrice { get; set; }
|
||||
public decimal ExitPrice { get; set; }
|
||||
public decimal Size { get; set; }
|
||||
public decimal RealizedPnl { get; set; }
|
||||
public decimal PnlPercent { get; set; }
|
||||
public DateTime ClosedAt { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -1,186 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="toolStripDash.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
QmCC
|
||||
</value>
|
||||
</data>
|
||||
</root>
|
||||
Generated
-156
@@ -1,156 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
partial class JobsView
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(JobsView));
|
||||
dgvJobs = new DataGridView();
|
||||
colJobName = new DataGridViewTextBoxColumn();
|
||||
colStatus = new DataGridViewTextBoxColumn();
|
||||
colLastRun = new DataGridViewTextBoxColumn();
|
||||
colNextRun = new DataGridViewTextBoxColumn();
|
||||
col_dgv_jobs_Enabled = new DataGridViewCheckBoxColumn();
|
||||
col_dgv_jobs_Run = new DataGridViewButtonColumn();
|
||||
colDescription = new DataGridViewTextBoxColumn();
|
||||
toolStripJobs = new ToolStrip();
|
||||
tsJobsRefresh = new ToolStripButton();
|
||||
((System.ComponentModel.ISupportInitialize)dgvJobs).BeginInit();
|
||||
toolStripJobs.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// dgvJobs
|
||||
//
|
||||
dgvJobs.AllowUserToAddRows = false;
|
||||
dgvJobs.AllowUserToDeleteRows = false;
|
||||
dgvJobs.AutoGenerateColumns = false;
|
||||
dgvJobs.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvJobs.Columns.AddRange(new DataGridViewColumn[] { colJobName, colStatus, colLastRun, colNextRun, col_dgv_jobs_Enabled, col_dgv_jobs_Run, colDescription });
|
||||
dgvJobs.Dock = DockStyle.Fill;
|
||||
dgvJobs.Location = new Point(0, 34);
|
||||
dgvJobs.Margin = new Padding(4, 5, 4, 5);
|
||||
dgvJobs.Name = "dgvJobs";
|
||||
dgvJobs.RowHeadersVisible = false;
|
||||
dgvJobs.RowHeadersWidth = 62;
|
||||
dgvJobs.Size = new Size(1429, 799);
|
||||
dgvJobs.TabIndex = 0;
|
||||
//
|
||||
// colJobName
|
||||
//
|
||||
colJobName.DataPropertyName = "JobName";
|
||||
colJobName.HeaderText = "Job Name";
|
||||
colJobName.Name = "colJobName";
|
||||
colJobName.ReadOnly = true;
|
||||
colJobName.Width = 150;
|
||||
//
|
||||
// colStatus
|
||||
//
|
||||
colStatus.DataPropertyName = "StatusText";
|
||||
colStatus.HeaderText = "Status";
|
||||
colStatus.Name = "colStatus";
|
||||
colStatus.ReadOnly = true;
|
||||
colStatus.Width = 150;
|
||||
//
|
||||
// colLastRun
|
||||
//
|
||||
colLastRun.DataPropertyName = "LastRun";
|
||||
colLastRun.HeaderText = "Zuletzt ausgeführt";
|
||||
colLastRun.Name = "colLastRun";
|
||||
colLastRun.ReadOnly = true;
|
||||
colLastRun.Width = 130;
|
||||
//
|
||||
// colNextRun
|
||||
//
|
||||
colNextRun.DataPropertyName = "NextRun";
|
||||
colNextRun.HeaderText = "Nächster Lauf";
|
||||
colNextRun.Name = "colNextRun";
|
||||
colNextRun.ReadOnly = true;
|
||||
colNextRun.Width = 130;
|
||||
//
|
||||
// col_dgv_jobs_Enabled
|
||||
//
|
||||
col_dgv_jobs_Enabled.DataPropertyName = "IsEnabled";
|
||||
col_dgv_jobs_Enabled.HeaderText = "Aktiv";
|
||||
col_dgv_jobs_Enabled.Name = "col_dgv_jobs_Enabled";
|
||||
col_dgv_jobs_Enabled.Width = 60;
|
||||
//
|
||||
// col_dgv_jobs_Run
|
||||
//
|
||||
col_dgv_jobs_Run.HeaderText = "Aktion";
|
||||
col_dgv_jobs_Run.MinimumWidth = 8;
|
||||
col_dgv_jobs_Run.Name = "col_dgv_jobs_Run";
|
||||
col_dgv_jobs_Run.Text = "Run Now";
|
||||
col_dgv_jobs_Run.UseColumnTextForButtonValue = true;
|
||||
col_dgv_jobs_Run.Width = 90;
|
||||
//
|
||||
// colDescription
|
||||
//
|
||||
colDescription.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||
colDescription.DataPropertyName = "Description";
|
||||
colDescription.HeaderText = "Beschreibung";
|
||||
colDescription.Name = "colDescription";
|
||||
colDescription.ReadOnly = true;
|
||||
//
|
||||
// toolStripJobs
|
||||
//
|
||||
toolStripJobs.ImageScalingSize = new Size(24, 24);
|
||||
toolStripJobs.Items.AddRange(new ToolStripItem[] { tsJobsRefresh });
|
||||
toolStripJobs.Location = new Point(0, 0);
|
||||
toolStripJobs.Name = "toolStripJobs";
|
||||
toolStripJobs.Padding = new Padding(0, 0, 3, 0);
|
||||
toolStripJobs.Size = new Size(1429, 34);
|
||||
toolStripJobs.TabIndex = 1;
|
||||
//
|
||||
// tsJobsRefresh
|
||||
//
|
||||
tsJobsRefresh.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
tsJobsRefresh.Name = "tsJobsRefresh";
|
||||
tsJobsRefresh.Size = new Size(116, 29);
|
||||
tsJobsRefresh.Text = "Aktualisieren";
|
||||
tsJobsRefresh.ToolTipText = "Job-Liste neu zeichnen (Status/Zeiten aktualisieren).";
|
||||
//
|
||||
// JobsView
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1429, 833);
|
||||
Controls.Add(dgvJobs);
|
||||
Controls.Add(toolStripJobs);
|
||||
Icon = (Icon)resources.GetObject("$this.Icon");
|
||||
Margin = new Padding(4, 5, 4, 5);
|
||||
Name = "JobsView";
|
||||
Text = "Server Jobs";
|
||||
((System.ComponentModel.ISupportInitialize)dgvJobs).EndInit();
|
||||
toolStripJobs.ResumeLayout(false);
|
||||
toolStripJobs.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.DataGridView dgvJobs;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colJobName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colStatus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLastRun;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNextRun;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn col_dgv_jobs_Enabled;
|
||||
private System.Windows.Forms.DataGridViewButtonColumn col_dgv_jobs_Run;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colDescription;
|
||||
private System.Windows.Forms.ToolStrip toolStripJobs;
|
||||
private System.Windows.Forms.ToolStripButton tsJobsRefresh;
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// Ansicht der Hintergrund-Jobs (JobManager). Designbar (JobsView.Designer.cs).
|
||||
/// Verhalten wie der bisherige Jobs-Tab: „Run Now" löst den ManualTrigger aus,
|
||||
/// „Aktiv" schaltet den Job über die Bindung.
|
||||
/// </summary>
|
||||
public partial class JobsView : Form
|
||||
{
|
||||
public JobsView()
|
||||
{
|
||||
InitializeComponent();
|
||||
colLastRun.DefaultCellStyle.Format = "HH:mm:ss";
|
||||
colNextRun.DefaultCellStyle.Format = "HH:mm:ss";
|
||||
dgvJobs.CellContentClick += DgvJobs_CellContentClick;
|
||||
tsJobsRefresh.Click += (_, _) => dgvJobs.Refresh();
|
||||
}
|
||||
|
||||
public void Initialize(JobManager jobManager)
|
||||
{
|
||||
dgvJobs.DataSource = new System.ComponentModel.BindingList<JobStatusRow>(jobManager.Jobs);
|
||||
}
|
||||
|
||||
private void DgvJobs_CellContentClick(object? sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
var dgv = (DataGridView)sender!;
|
||||
var colName = dgv.Columns[e.ColumnIndex].Name;
|
||||
|
||||
if (dgv.Rows[e.RowIndex].DataBoundItem is JobStatusRow job)
|
||||
{
|
||||
if (colName == "col_dgv_jobs_Run")
|
||||
{
|
||||
if (job.ManualTriggerAction != null)
|
||||
_ = Task.Run(() => job.ManualTriggerAction.Invoke());
|
||||
}
|
||||
else if (colName == "col_dgv_jobs_Enabled")
|
||||
{
|
||||
dgv.EndEdit();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,192 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="toolStripJobs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
XYlhrDInAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
</root>
|
||||
Generated
-250
@@ -1,250 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
partial class SettingsView
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsView));
|
||||
propertyGrid = new PropertyGrid();
|
||||
tabControl1 = new TabControl();
|
||||
tabPage1 = new TabPage();
|
||||
toolStrip2 = new ToolStrip();
|
||||
btn_save = new ToolStripButton();
|
||||
btn_loadsettings = new ToolStripButton();
|
||||
btnGenMasterKey = new ToolStripButton();
|
||||
btnSetOpenRouterKey = new ToolStripButton();
|
||||
btnSetWatchdogToken = new ToolStripButton();
|
||||
btnTestWatchdog = new ToolStripButton();
|
||||
btnSetLicenseKey = new ToolStripButton();
|
||||
tabPage2 = new TabPage();
|
||||
pgAccount = new PropertyGrid();
|
||||
dgvAccounts = new DataGridView();
|
||||
toolStripAccounts = new ToolStrip();
|
||||
btnAccNew = new ToolStripButton();
|
||||
btnAccDelete = new ToolStripButton();
|
||||
tabControl1.SuspendLayout();
|
||||
tabPage1.SuspendLayout();
|
||||
toolStrip2.SuspendLayout();
|
||||
tabPage2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvAccounts).BeginInit();
|
||||
toolStripAccounts.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// propertyGrid
|
||||
//
|
||||
propertyGrid.Dock = DockStyle.Fill;
|
||||
propertyGrid.Location = new Point(3, 37);
|
||||
propertyGrid.Name = "propertyGrid";
|
||||
propertyGrid.Size = new Size(1171, 742);
|
||||
propertyGrid.TabIndex = 1;
|
||||
//
|
||||
// tabControl1
|
||||
//
|
||||
tabControl1.Controls.Add(tabPage1);
|
||||
tabControl1.Controls.Add(tabPage2);
|
||||
tabControl1.Dock = DockStyle.Fill;
|
||||
tabControl1.Location = new Point(0, 0);
|
||||
tabControl1.Name = "tabControl1";
|
||||
tabControl1.SelectedIndex = 0;
|
||||
tabControl1.Size = new Size(1185, 820);
|
||||
tabControl1.TabIndex = 3;
|
||||
//
|
||||
// tabPage1
|
||||
//
|
||||
tabPage1.Controls.Add(propertyGrid);
|
||||
tabPage1.Controls.Add(toolStrip2);
|
||||
tabPage1.Location = new Point(4, 34);
|
||||
tabPage1.Name = "tabPage1";
|
||||
tabPage1.Padding = new Padding(3);
|
||||
tabPage1.Size = new Size(1177, 782);
|
||||
tabPage1.TabIndex = 0;
|
||||
tabPage1.Text = "General Settings";
|
||||
tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// toolStrip2
|
||||
//
|
||||
toolStrip2.ImageScalingSize = new Size(24, 24);
|
||||
toolStrip2.Items.AddRange(new ToolStripItem[] { btn_save, btn_loadsettings, btnGenMasterKey, btnSetOpenRouterKey, btnSetWatchdogToken, btnTestWatchdog, btnSetLicenseKey });
|
||||
toolStrip2.Location = new Point(3, 3);
|
||||
toolStrip2.Name = "toolStrip2";
|
||||
toolStrip2.Size = new Size(1171, 34);
|
||||
toolStrip2.TabIndex = 0;
|
||||
toolStrip2.Text = "toolStrip2";
|
||||
//
|
||||
// btn_save
|
||||
//
|
||||
btn_save.Image = Properties.Resources.diskette;
|
||||
btn_save.ImageTransparentColor = Color.Magenta;
|
||||
btn_save.Name = "btn_save";
|
||||
btn_save.Size = new Size(150, 29);
|
||||
btn_save.Text = "Save Changes";
|
||||
//
|
||||
// btn_loadsettings
|
||||
//
|
||||
btn_loadsettings.Image = Properties.Resources.token_quantifier;
|
||||
btn_loadsettings.ImageTransparentColor = Color.Magenta;
|
||||
btn_loadsettings.Name = "btn_loadsettings";
|
||||
btn_loadsettings.Size = new Size(223, 29);
|
||||
btn_loadsettings.Text = "Load Settings from File";
|
||||
//
|
||||
// btnGenMasterKey
|
||||
//
|
||||
btnGenMasterKey.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btnGenMasterKey.Name = "btnGenMasterKey";
|
||||
btnGenMasterKey.Size = new Size(182, 29);
|
||||
btnGenMasterKey.Text = "Master-Key erzeugen";
|
||||
btnGenMasterKey.ToolTipText = "Erzeugt einen zufälligen AES-Master-Key (nur wenn noch keiner existiert).";
|
||||
//
|
||||
// btnSetOpenRouterKey
|
||||
//
|
||||
btnSetOpenRouterKey.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btnSetOpenRouterKey.Name = "btnSetOpenRouterKey";
|
||||
btnSetOpenRouterKey.Size = new Size(220, 29);
|
||||
btnSetOpenRouterKey.Text = "OpenRouter-Key setzen …";
|
||||
btnSetOpenRouterKey.ToolTipText = "Speichert den OpenRouter-API-Key für den Supervisor (gitignorierte Datei openrouter.key).";
|
||||
//
|
||||
// btnSetWatchdogToken
|
||||
//
|
||||
btnSetWatchdogToken.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btnSetWatchdogToken.Name = "btnSetWatchdogToken";
|
||||
btnSetWatchdogToken.Size = new Size(220, 29);
|
||||
btnSetWatchdogToken.Text = "Watchdog-Token setzen …";
|
||||
btnSetWatchdogToken.ToolTipText = "Speichert den Watchdog-Agent-Token (maskierte Eingabe, bei gesetztem Master-Key verschlüsselt).";
|
||||
//
|
||||
// btnTestWatchdog
|
||||
//
|
||||
btnTestWatchdog.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btnTestWatchdog.Name = "btnTestWatchdog";
|
||||
btnTestWatchdog.Size = new Size(210, 29);
|
||||
btnTestWatchdog.Text = "Test-Heartbeat senden";
|
||||
btnTestWatchdog.ToolTipText = "Sendet sofort einen Heartbeat an den konfigurierten Watchdog-Server und meldet das Ergebnis.";
|
||||
//
|
||||
// btnSetLicenseKey
|
||||
//
|
||||
btnSetLicenseKey.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btnSetLicenseKey.Name = "btnSetLicenseKey";
|
||||
btnSetLicenseKey.Size = new Size(210, 29);
|
||||
btnSetLicenseKey.Text = "Lizenz prüfen / setzen …";
|
||||
btnSetLicenseKey.ToolTipText = "Öffnet den Lizenzdialog (Hardware-ID + Server-Validierung). Gültiger Schlüssel wird gespeichert (bei Master-Key verschlüsselt).";
|
||||
//
|
||||
// tabPage2
|
||||
//
|
||||
tabPage2.Controls.Add(pgAccount);
|
||||
tabPage2.Controls.Add(dgvAccounts);
|
||||
tabPage2.Controls.Add(toolStripAccounts);
|
||||
tabPage2.Location = new Point(4, 34);
|
||||
tabPage2.Name = "tabPage2";
|
||||
tabPage2.Padding = new Padding(3);
|
||||
tabPage2.Size = new Size(1177, 762);
|
||||
tabPage2.TabIndex = 1;
|
||||
tabPage2.Text = "Polymarket Accounts";
|
||||
tabPage2.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// pgAccount
|
||||
//
|
||||
pgAccount.Dock = DockStyle.Fill;
|
||||
pgAccount.Location = new Point(623, 37);
|
||||
pgAccount.Name = "pgAccount";
|
||||
pgAccount.Size = new Size(551, 722);
|
||||
pgAccount.TabIndex = 2;
|
||||
//
|
||||
// dgvAccounts
|
||||
//
|
||||
dgvAccounts.AllowUserToAddRows = false;
|
||||
dgvAccounts.AllowUserToDeleteRows = false;
|
||||
dgvAccounts.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvAccounts.Dock = DockStyle.Left;
|
||||
dgvAccounts.Location = new Point(3, 37);
|
||||
dgvAccounts.MultiSelect = false;
|
||||
dgvAccounts.Name = "dgvAccounts";
|
||||
dgvAccounts.ReadOnly = true;
|
||||
dgvAccounts.RowHeadersVisible = false;
|
||||
dgvAccounts.RowHeadersWidth = 62;
|
||||
dgvAccounts.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvAccounts.Size = new Size(620, 722);
|
||||
dgvAccounts.TabIndex = 1;
|
||||
//
|
||||
// toolStripAccounts
|
||||
//
|
||||
toolStripAccounts.ImageScalingSize = new Size(24, 24);
|
||||
toolStripAccounts.Items.AddRange(new ToolStripItem[] { btnAccNew, btnAccDelete });
|
||||
toolStripAccounts.Location = new Point(3, 3);
|
||||
toolStripAccounts.Name = "toolStripAccounts";
|
||||
toolStripAccounts.Size = new Size(1171, 34);
|
||||
toolStripAccounts.TabIndex = 0;
|
||||
//
|
||||
// btnAccNew
|
||||
//
|
||||
btnAccNew.Image = Properties.Resources.add;
|
||||
btnAccNew.Name = "btnAccNew";
|
||||
btnAccNew.Size = new Size(157, 29);
|
||||
btnAccNew.Text = "Neuer Account";
|
||||
//
|
||||
// btnAccDelete
|
||||
//
|
||||
btnAccDelete.Image = Properties.Resources.cancel;
|
||||
btnAccDelete.Name = "btnAccDelete";
|
||||
btnAccDelete.Size = new Size(104, 29);
|
||||
btnAccDelete.Text = "Löschen";
|
||||
//
|
||||
// SettingsView
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1185, 820);
|
||||
Controls.Add(tabControl1);
|
||||
Icon = (Icon)resources.GetObject("$this.Icon");
|
||||
Margin = new Padding(4, 5, 4, 5);
|
||||
Name = "SettingsView";
|
||||
Text = "Server Settings";
|
||||
tabControl1.ResumeLayout(false);
|
||||
tabPage1.ResumeLayout(false);
|
||||
tabPage1.PerformLayout();
|
||||
toolStrip2.ResumeLayout(false);
|
||||
toolStrip2.PerformLayout();
|
||||
tabPage2.ResumeLayout(false);
|
||||
tabPage2.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvAccounts).EndInit();
|
||||
toolStripAccounts.ResumeLayout(false);
|
||||
toolStripAccounts.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.PropertyGrid propertyGrid;
|
||||
private TabControl tabControl1;
|
||||
private TabPage tabPage1;
|
||||
private ToolStrip toolStrip2;
|
||||
private TabPage tabPage2;
|
||||
private ToolStripButton btn_save;
|
||||
private ToolStripButton btn_loadsettings;
|
||||
private ToolStripButton btnGenMasterKey;
|
||||
private ToolStripButton btnSetOpenRouterKey;
|
||||
private ToolStripButton btnSetWatchdogToken;
|
||||
private ToolStripButton btnTestWatchdog;
|
||||
private ToolStripButton btnSetLicenseKey;
|
||||
private ToolStrip toolStripAccounts;
|
||||
private ToolStripButton btnAccNew;
|
||||
private ToolStripButton btnAccDelete;
|
||||
private DataGridView dgvAccounts;
|
||||
private DataGridViewTextBoxColumn colAccName;
|
||||
private DataGridViewTextBoxColumn colAccWallet;
|
||||
private DataGridViewCheckBoxColumn colAccDemo;
|
||||
private DataGridViewCheckBoxColumn colAccActive;
|
||||
private PropertyGrid pgAccount;
|
||||
}
|
||||
}
|
||||
@@ -1,410 +0,0 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTrader.Core.Security;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// Core-Settings-Fenster: allgemeine Server-Einstellungen (PropertyGrid) und die
|
||||
/// allgemeine Verwaltung der Polymarket-Accounts (Wallets, API-Keys …).
|
||||
/// Die copytrading-spezifischen Detail-Limits werden NICHT hier, sondern im
|
||||
/// Copytrading-Modul-View bearbeitet (AccountState ist bewusst general-only).
|
||||
/// </summary>
|
||||
public partial class SettingsView : Form
|
||||
{
|
||||
private const string SettingsPath = "server_settings.xml";
|
||||
|
||||
private ServerSettings _settings = new();
|
||||
private MullvadVpnService? _vpn;
|
||||
private WatchdogHeartbeatService? _watchdog;
|
||||
private TerminalLogger? _logger;
|
||||
|
||||
private IAccountRepository? _accountRepo;
|
||||
private TradingState? _state;
|
||||
private BindingList<AccountState> _accounts = new();
|
||||
|
||||
public SettingsView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
btn_save.Click += (_, _) => Save();
|
||||
btn_loadsettings.Click += (_, _) => Reload();
|
||||
btnGenMasterKey.Click += (_, _) => GenerateMasterKey();
|
||||
btnSetOpenRouterKey.Click += (_, _) => SetOpenRouterKey();
|
||||
btnSetWatchdogToken.Click += (_, _) => SetWatchdogToken();
|
||||
btnTestWatchdog.Click += async (_, _) => await TestWatchdogAsync();
|
||||
btnSetLicenseKey.Click += (_, _) => SetLicenseKey();
|
||||
UpdateMasterKeyButtonState();
|
||||
|
||||
btnAccNew.Click += (_, _) => AddAccount();
|
||||
btnAccDelete.Click += (_, _) => DeleteAccount();
|
||||
dgvAccounts.SelectionChanged += (_, _) =>
|
||||
{
|
||||
pgAccount.SelectedObject = dgvAccounts.CurrentRow?.DataBoundItem as AccountState;
|
||||
};
|
||||
pgAccount.PropertyValueChanged += (_, _) =>
|
||||
{
|
||||
if (pgAccount.SelectedObject is AccountState acc) SaveAccount(acc);
|
||||
};
|
||||
}
|
||||
|
||||
public void Initialize(MullvadVpnService vpn, TerminalLogger logger,
|
||||
IAccountRepository accountRepo, TradingState state, WatchdogHeartbeatService? watchdog = null)
|
||||
{
|
||||
_vpn = vpn;
|
||||
_logger = logger;
|
||||
_accountRepo = accountRepo;
|
||||
_state = state;
|
||||
_watchdog = watchdog;
|
||||
|
||||
Reload();
|
||||
LoadAccounts();
|
||||
}
|
||||
|
||||
// ===== Server-Settings =====
|
||||
|
||||
private void Reload()
|
||||
{
|
||||
_settings = ServerSettings.Load(SettingsPath);
|
||||
propertyGrid.SelectedObject = _settings;
|
||||
}
|
||||
|
||||
private void Save()
|
||||
{
|
||||
try
|
||||
{
|
||||
_settings.Save(SettingsPath);
|
||||
_vpn?.ReloadSettings();
|
||||
_watchdog?.ReloadSettings();
|
||||
_logger?.Info("Server-Einstellungen gespeichert und Services neu geladen.");
|
||||
MessageBox.Show("Server-Einstellungen gespeichert.", "Erfolg",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Fehler beim Speichern: {ex.Message}", "Fehler",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Polymarket Accounts (allgemeine Einstellungen) =====
|
||||
|
||||
private void LoadAccounts()
|
||||
{
|
||||
if (_state == null) return;
|
||||
_accounts = new BindingList<AccountState>(_state.Accounts.Values.OrderBy(a => a.AccountId).ToList());
|
||||
dgvAccounts.DataSource = _accounts;
|
||||
pgAccount.SelectedObject = dgvAccounts.CurrentRow?.DataBoundItem as AccountState;
|
||||
}
|
||||
|
||||
private void AddAccount()
|
||||
{
|
||||
if (_state == null || _accountRepo == null) return;
|
||||
|
||||
int newId = _state.Accounts.Count > 0 ? _state.Accounts.Keys.Max() + 1 : 1;
|
||||
var acc = new AccountState { AccountId = newId, Name = "Neuer Account" };
|
||||
|
||||
_state.Accounts[acc.AccountId] = acc;
|
||||
_accountRepo.Upsert(acc);
|
||||
|
||||
_accounts.Add(acc);
|
||||
dgvAccounts.CurrentCell = dgvAccounts.Rows[dgvAccounts.Rows.Count - 1].Cells[0];
|
||||
}
|
||||
|
||||
private void DeleteAccount()
|
||||
{
|
||||
if (_state == null || _accountRepo == null) return;
|
||||
if (dgvAccounts.CurrentRow?.DataBoundItem is not AccountState acc) return;
|
||||
|
||||
if (MessageBox.Show($"Account '{acc.Name}' (ID {acc.AccountId}) wirklich löschen?",
|
||||
"Löschen bestätigen", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) != DialogResult.Yes)
|
||||
return;
|
||||
|
||||
_state.Accounts.TryRemove(acc.AccountId, out _);
|
||||
_accountRepo.Delete(acc.AccountId);
|
||||
_accounts.Remove(acc);
|
||||
}
|
||||
|
||||
private void SaveAccount(AccountState acc)
|
||||
{
|
||||
_accountRepo?.Upsert(acc);
|
||||
_state?.Accounts.AddOrUpdate(acc.AccountId, acc, (_, _) => acc);
|
||||
dgvAccounts.Refresh();
|
||||
}
|
||||
|
||||
// ===== Watchdog =====
|
||||
|
||||
/// <summary>
|
||||
/// Setzt/entfernt den Watchdog-Agent-Token über eine maskierte Eingabe – damit das Secret
|
||||
/// nicht offen im PropertyGrid steht und die server_settings.xml nicht per Hand bearbeitet
|
||||
/// werden muss. Ist ein Master-Key gesetzt, wird der Token verschlüsselt abgelegt.
|
||||
/// Wird sofort gespeichert, damit der Test-Button und der laufende Dienst ihn direkt nutzen.
|
||||
/// </summary>
|
||||
private void SetWatchdogToken()
|
||||
{
|
||||
bool exists = !string.IsNullOrWhiteSpace(_settings.WatchdogToken);
|
||||
string? token = PromptForSecret("Watchdog Agent-Token",
|
||||
"Agent-Token aus dem Watchdog-Admin eingeben (Header X-Watchdog-Key).\n" +
|
||||
"Wird in der gitignorierten server_settings.xml gespeichert (leer = entfernen).\n" +
|
||||
(exists ? $"Aktuell: {_settings.WatchdogTokenStatus}." : "Aktuell ist KEIN Token gesetzt."));
|
||||
if (token == null) return; // Abbruch
|
||||
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(token))
|
||||
{
|
||||
_settings.WatchdogToken = "";
|
||||
_settings.Save(SettingsPath);
|
||||
_watchdog?.ReloadSettings();
|
||||
propertyGrid.Refresh();
|
||||
_logger?.Info("Watchdog-Agent-Token entfernt.");
|
||||
MessageBox.Show("Watchdog-Token entfernt.", "Watchdog",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
return;
|
||||
}
|
||||
|
||||
// Protect() gibt ohne Master-Key den Klartext unverändert zurück – kein stiller
|
||||
// Sicherheitsverlust, der Nutzer wird darauf hingewiesen.
|
||||
_settings.WatchdogToken = SecretProtection.Protect(token.Trim());
|
||||
_settings.Save(SettingsPath);
|
||||
_watchdog?.ReloadSettings();
|
||||
propertyGrid.Refresh();
|
||||
|
||||
bool encrypted = SecretProtection.IsEncrypted(_settings.WatchdogToken);
|
||||
_logger?.Info($"Watchdog-Agent-Token gespeichert ({(encrypted ? "verschlüsselt" : "Klartext")}).");
|
||||
MessageBox.Show(
|
||||
"Watchdog-Token gespeichert und sofort aktiv.\n\n" +
|
||||
(encrypted
|
||||
? "Der Token liegt mit dem Master-Key verschlüsselt in server_settings.xml."
|
||||
: "Hinweis: Es ist kein Master-Key gesetzt – der Token liegt im Klartext in der " +
|
||||
"(gitignorierten) server_settings.xml. Mit „Master-Key erzeugen\" kannst du das ändern."),
|
||||
"Watchdog", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Fehler beim Speichern des Watchdog-Tokens: {ex.Message}",
|
||||
"Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Sendet einen Heartbeat mit den GESPEICHERTEN Einstellungen und meldet das Ergebnis.
|
||||
/// Ungespeicherte Änderungen im PropertyGrid wirken bewusst nicht – sonst würde ein
|
||||
/// erfolgreicher Test eine Konfiguration bestätigen, die so nicht auf der Platte liegt.
|
||||
/// </summary>
|
||||
private async Task TestWatchdogAsync()
|
||||
{
|
||||
if (_watchdog == null)
|
||||
{
|
||||
MessageBox.Show("Der Watchdog-Dienst ist nicht verfügbar.", "Watchdog",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
btnTestWatchdog.Enabled = false;
|
||||
try
|
||||
{
|
||||
var result = await _watchdog.SendHeartbeatAsync(
|
||||
"ok", "Test-Heartbeat aus dem PolyTrader-Settings-Fenster");
|
||||
|
||||
if (result.Success)
|
||||
{
|
||||
_logger?.Info($"✅ Watchdog-Test-Heartbeat erfolgreich gesendet ({result.Detail}).");
|
||||
MessageBox.Show(
|
||||
$"Test-Heartbeat erfolgreich gesendet ({result.Detail}).\n\n" +
|
||||
"Der Monitor sollte im Watchdog-Dashboard jetzt auf 'up' stehen.",
|
||||
"Watchdog", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger?.Warning($"⚠️ Watchdog-Test-Heartbeat fehlgeschlagen: {result.Detail}");
|
||||
MessageBox.Show(
|
||||
$"Test-Heartbeat fehlgeschlagen:\n\n{result.Detail}\n\n" +
|
||||
"Bitte URL, Agent-Token und Source prüfen und die Einstellungen vorher speichern.",
|
||||
"Watchdog", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
btnTestWatchdog.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Lizenz (LicenseLabrador) =====
|
||||
|
||||
/// <summary>
|
||||
/// Öffnet denselben Lizenzdialog wie der Programmstart (Hardware-ID + Server-Validierung),
|
||||
/// nur im Verwalten-Modus. Ein erfolgreich validierter Schlüssel wird – bei gesetztem
|
||||
/// Master-Key verschlüsselt – in server_settings.xml gespeichert und gilt ab dem nächsten Start.
|
||||
/// </summary>
|
||||
private void SetLicenseKey()
|
||||
{
|
||||
string current = string.Empty;
|
||||
try { current = SecretProtection.Unprotect(_settings.LicenseKey); }
|
||||
catch { /* nicht lesbar → als leer behandeln */ }
|
||||
|
||||
LicenseLabrador.Client.LicenseClient client;
|
||||
try
|
||||
{
|
||||
client = new LicenseLabrador.Client.LicenseClient(PolyTraderSharp.Licensing.LicenseGate.BuildConfig());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Lizenzprüfung nicht verfügbar: {ex.Message}", "Lizenz",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
return;
|
||||
}
|
||||
|
||||
using var dlg = new LicenseDialog(client, current, initialResult: null, startupContext: false);
|
||||
dlg.ShowDialog(this);
|
||||
|
||||
if (dlg.ValidatedResult == null || !dlg.ValidatedResult.IsUsable || string.IsNullOrWhiteSpace(dlg.ValidatedKey))
|
||||
return; // abgebrochen oder nicht validiert – nichts speichern
|
||||
|
||||
try
|
||||
{
|
||||
_settings.LicenseKey = SecretProtection.Protect(dlg.ValidatedKey!.Trim());
|
||||
_settings.Save(SettingsPath);
|
||||
propertyGrid.Refresh();
|
||||
|
||||
bool encrypted = SecretProtection.IsEncrypted(_settings.LicenseKey);
|
||||
_logger?.Info($"Lizenz validiert und gespeichert ({(encrypted ? "verschlüsselt" : "Klartext")}).");
|
||||
MessageBox.Show(
|
||||
"Lizenz validiert und gespeichert.\n\n" +
|
||||
(encrypted
|
||||
? "Der Schlüssel liegt mit dem Master-Key verschlüsselt in server_settings.xml."
|
||||
: "Hinweis: Es ist kein Master-Key gesetzt – der Schlüssel liegt im Klartext in der " +
|
||||
"(gitignorierten) server_settings.xml."),
|
||||
"Lizenz", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Fehler beim Speichern des Lizenzschlüssels: {ex.Message}",
|
||||
"Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Master-Key (at-rest-Verschlüsselung, F1) =====
|
||||
|
||||
/// <summary>Pfad der Master-Key-Datei – identisch zu Program.cs (App-Ordner, gitignored).</summary>
|
||||
private static string MasterKeyFilePath => Path.Combine(AppContext.BaseDirectory, "master.key");
|
||||
|
||||
/// <summary>Existiert bereits ein Master-Key (Umgebungsvariable ODER Datei)?</summary>
|
||||
private static bool MasterKeyExists() =>
|
||||
!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("POLYTRADER_MASTER_KEY"))
|
||||
|| File.Exists(MasterKeyFilePath);
|
||||
|
||||
/// <summary>Button nur aktiv, solange KEIN Master-Key existiert (Überschreiben = Lockout-Gefahr).</summary>
|
||||
private void UpdateMasterKeyButtonState() => btnGenMasterKey.Enabled = !MasterKeyExists();
|
||||
|
||||
private void GenerateMasterKey()
|
||||
{
|
||||
// Sicherheitsnetz gegen Race/Doppelklick: einen bestehenden Key NIEMALS überschreiben.
|
||||
if (MasterKeyExists())
|
||||
{
|
||||
MessageBox.Show(
|
||||
"Es existiert bereits ein Master-Key – Erzeugung abgebrochen. Ein Überschreiben würde den " +
|
||||
"Zugriff auf bereits verschlüsselte Wallet-Keys unwiederbringlich zerstören.",
|
||||
"Master-Key vorhanden", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
UpdateMasterKeyButtonState();
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
byte[] keyBytes = RandomNumberGenerator.GetBytes(32); // 256-Bit-Schlüssel
|
||||
File.WriteAllText(MasterKeyFilePath, Convert.ToBase64String(keyBytes));
|
||||
_logger?.Info("🔐 Master-Key erzeugt und in master.key gespeichert. At-rest-Verschlüsselung wird beim nächsten Start aktiv.");
|
||||
|
||||
MessageBox.Show(
|
||||
"Ein zufälliger 32-Byte-Master-Key wurde erzeugt und in der Datei 'master.key' (App-Ordner, gitignored) gespeichert.\n\n" +
|
||||
"WICHTIG:\n" +
|
||||
"• Sichere diese Datei SOFORT separat und sicher (z. B. Passwort-Manager / Offline-Backup).\n" +
|
||||
"• Master-Key-Verlust = KEIN Zugriff mehr auf die verschlüsselten Wallet-Keys!\n" +
|
||||
"• Die Verschlüsselung der Account-Credentials wird beim nächsten Programmstart aktiv.",
|
||||
"Master-Key erzeugt", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Fehler beim Erzeugen des Master-Keys: {ex.Message}",
|
||||
"Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
|
||||
UpdateMasterKeyButtonState(); // nach Erzeugung deaktivieren
|
||||
}
|
||||
|
||||
// ===== OpenRouter-API-Key (Supervisor) =====
|
||||
|
||||
/// <summary>
|
||||
/// Setzt/entfernt den OpenRouter-API-Key des Supervisors. Ablage in der gitignorierten Datei
|
||||
/// openrouter.key (genau das liest der OpenRouterClient) – kein Secret im Klartext in
|
||||
/// server_settings.xml. Der Nutzer gibt den Key selbst maskiert ein.
|
||||
/// </summary>
|
||||
private void SetOpenRouterKey()
|
||||
{
|
||||
string keyFile = Path.Combine(AppContext.BaseDirectory, "openrouter.key");
|
||||
bool exists = File.Exists(keyFile) ||
|
||||
!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("POLYTRADER_OPENROUTER_KEY"));
|
||||
string? key = PromptForSecret("OpenRouter-API-Key",
|
||||
"OpenRouter-API-Key für den Supervisor eingeben.\n" +
|
||||
"Wird in der gitignorierten Datei 'openrouter.key' gespeichert (leer = entfernen).\n" +
|
||||
(exists ? "Aktuell ist bereits ein Key hinterlegt." : "Aktuell ist KEIN Key gesetzt."));
|
||||
if (key == null) return; // Abbruch
|
||||
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(key))
|
||||
{
|
||||
if (File.Exists(keyFile)) File.Delete(keyFile);
|
||||
_logger?.Info("OpenRouter-Key aus openrouter.key entfernt.");
|
||||
MessageBox.Show("OpenRouter-Key entfernt.", "OpenRouter",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
else
|
||||
{
|
||||
File.WriteAllText(keyFile, key.Trim());
|
||||
_logger?.Info("OpenRouter-Key gespeichert (openrouter.key).");
|
||||
MessageBox.Show("OpenRouter-Key gespeichert. Wirkt beim nächsten Programmstart bzw. der nächsten Supervisor-Anfrage.\n\n" +
|
||||
"Tipp: bei OpenRouter ein Spend-Limit für diesen Key setzen (separater Key für den Supervisor empfohlen).",
|
||||
"OpenRouter", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Fehler beim Speichern des OpenRouter-Keys: {ex.Message}",
|
||||
"Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Modaler Mini-Dialog mit maskierter Eingabe. Rückgabe null = Abbruch.</summary>
|
||||
private string? PromptForSecret(string title, string prompt)
|
||||
{
|
||||
using var form = new Form
|
||||
{
|
||||
Text = title,
|
||||
Width = 480,
|
||||
Height = 210,
|
||||
FormBorderStyle = FormBorderStyle.FixedDialog,
|
||||
StartPosition = FormStartPosition.CenterParent,
|
||||
MinimizeBox = false,
|
||||
MaximizeBox = false
|
||||
};
|
||||
var lbl = new Label { Text = prompt, Left = 12, Top = 12, Width = 445, Height = 70, AutoSize = false };
|
||||
var tb = new TextBox { Left = 12, Top = 92, Width = 445, UseSystemPasswordChar = true };
|
||||
var ok = new Button { Text = "OK", DialogResult = DialogResult.OK, Left = 296, Top = 128, Width = 75 };
|
||||
var cancel = new Button { Text = "Abbrechen", DialogResult = DialogResult.Cancel, Left = 380, Top = 128, Width = 77 };
|
||||
form.Controls.AddRange(new Control[] { lbl, tb, ok, cancel });
|
||||
form.AcceptButton = ok;
|
||||
form.CancelButton = cancel;
|
||||
return form.ShowDialog(this) == DialogResult.OK ? tb.Text : null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,219 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>370, 17</value>
|
||||
</metadata>
|
||||
<metadata name="toolStripAccounts.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
</value>
|
||||
</data>
|
||||
</root>
|
||||
Generated
-378
@@ -1,378 +0,0 @@
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
partial class TerminalView
|
||||
{
|
||||
/// <summary>Erforderliche Designer-Variable.</summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TerminalView));
|
||||
tabControlTerminal = new TabControl();
|
||||
tabLive = new TabPage();
|
||||
rtbTerminal = new RichTextBox();
|
||||
contextMenuTerminal = new ContextMenuStrip(components);
|
||||
miCopy = new ToolStripMenuItem();
|
||||
miSelectAll = new ToolStripMenuItem();
|
||||
miCopyAll = new ToolStripMenuItem();
|
||||
miSep1 = new ToolStripSeparator();
|
||||
miClear = new ToolStripMenuItem();
|
||||
pnlTop = new Panel();
|
||||
btnAutoscroll = new Button();
|
||||
cbLogLevel = new ComboBox();
|
||||
lblFilter = new Label();
|
||||
tabViewer = new TabPage();
|
||||
dgvLogs = new DataGridView();
|
||||
pnlViewerTop = new Panel();
|
||||
lblViewerStatus = new Label();
|
||||
btnViewerLoad = new Button();
|
||||
tbViewerText = new TextBox();
|
||||
lblVText = new Label();
|
||||
tbViewerCid = new TextBox();
|
||||
lblVCid = new Label();
|
||||
cbViewerLevel = new ComboBox();
|
||||
lblVLevel = new Label();
|
||||
dtViewerDate = new DateTimePicker();
|
||||
lblVDatum = new Label();
|
||||
tabControlTerminal.SuspendLayout();
|
||||
tabLive.SuspendLayout();
|
||||
contextMenuTerminal.SuspendLayout();
|
||||
pnlTop.SuspendLayout();
|
||||
tabViewer.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)dgvLogs).BeginInit();
|
||||
pnlViewerTop.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// tabControlTerminal
|
||||
//
|
||||
tabControlTerminal.Controls.Add(tabLive);
|
||||
tabControlTerminal.Controls.Add(tabViewer);
|
||||
tabControlTerminal.Dock = DockStyle.Fill;
|
||||
tabControlTerminal.Location = new Point(0, 0);
|
||||
tabControlTerminal.Margin = new Padding(4, 5, 4, 5);
|
||||
tabControlTerminal.Name = "tabControlTerminal";
|
||||
tabControlTerminal.SelectedIndex = 0;
|
||||
tabControlTerminal.Size = new Size(1429, 1083);
|
||||
tabControlTerminal.TabIndex = 0;
|
||||
//
|
||||
// tabLive
|
||||
//
|
||||
tabLive.Controls.Add(rtbTerminal);
|
||||
tabLive.Controls.Add(pnlTop);
|
||||
tabLive.Location = new Point(4, 34);
|
||||
tabLive.Margin = new Padding(4, 5, 4, 5);
|
||||
tabLive.Name = "tabLive";
|
||||
tabLive.Padding = new Padding(4, 5, 4, 5);
|
||||
tabLive.Size = new Size(1421, 1045);
|
||||
tabLive.TabIndex = 0;
|
||||
tabLive.Text = "Live";
|
||||
tabLive.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// rtbTerminal
|
||||
//
|
||||
rtbTerminal.BackColor = Color.Black;
|
||||
rtbTerminal.ContextMenuStrip = contextMenuTerminal;
|
||||
rtbTerminal.Dock = DockStyle.Fill;
|
||||
rtbTerminal.ForeColor = Color.White;
|
||||
rtbTerminal.Location = new Point(4, 65);
|
||||
rtbTerminal.Margin = new Padding(4, 5, 4, 5);
|
||||
rtbTerminal.Name = "rtbTerminal";
|
||||
rtbTerminal.ReadOnly = true;
|
||||
rtbTerminal.Size = new Size(1413, 975);
|
||||
rtbTerminal.TabIndex = 1;
|
||||
rtbTerminal.Text = "";
|
||||
//
|
||||
// contextMenuTerminal
|
||||
//
|
||||
contextMenuTerminal.ImageScalingSize = new Size(24, 24);
|
||||
contextMenuTerminal.Items.AddRange(new ToolStripItem[] { miCopy, miSelectAll, miCopyAll, miSep1, miClear });
|
||||
contextMenuTerminal.Name = "contextMenuTerminal";
|
||||
contextMenuTerminal.Size = new Size(277, 138);
|
||||
//
|
||||
// miCopy
|
||||
//
|
||||
miCopy.Name = "miCopy";
|
||||
miCopy.ShortcutKeyDisplayString = "Strg+C";
|
||||
miCopy.Size = new Size(276, 32);
|
||||
miCopy.Text = "Kopieren";
|
||||
//
|
||||
// miSelectAll
|
||||
//
|
||||
miSelectAll.Name = "miSelectAll";
|
||||
miSelectAll.ShortcutKeyDisplayString = "Strg+A";
|
||||
miSelectAll.Size = new Size(276, 32);
|
||||
miSelectAll.Text = "Alles auswählen";
|
||||
//
|
||||
// miCopyAll
|
||||
//
|
||||
miCopyAll.Name = "miCopyAll";
|
||||
miCopyAll.Size = new Size(276, 32);
|
||||
miCopyAll.Text = "Alles kopieren";
|
||||
//
|
||||
// miSep1
|
||||
//
|
||||
miSep1.Name = "miSep1";
|
||||
miSep1.Size = new Size(273, 6);
|
||||
//
|
||||
// miClear
|
||||
//
|
||||
miClear.Name = "miClear";
|
||||
miClear.Size = new Size(276, 32);
|
||||
miClear.Text = "Terminal leeren";
|
||||
//
|
||||
// pnlTop
|
||||
//
|
||||
pnlTop.Controls.Add(btnAutoscroll);
|
||||
pnlTop.Controls.Add(cbLogLevel);
|
||||
pnlTop.Controls.Add(lblFilter);
|
||||
pnlTop.Dock = DockStyle.Top;
|
||||
pnlTop.Location = new Point(4, 5);
|
||||
pnlTop.Margin = new Padding(4, 5, 4, 5);
|
||||
pnlTop.Name = "pnlTop";
|
||||
pnlTop.Size = new Size(1413, 60);
|
||||
pnlTop.TabIndex = 0;
|
||||
//
|
||||
// btnAutoscroll
|
||||
//
|
||||
btnAutoscroll.BackColor = Color.LightGreen;
|
||||
btnAutoscroll.Location = new Point(320, 8);
|
||||
btnAutoscroll.Margin = new Padding(4, 5, 4, 5);
|
||||
btnAutoscroll.Name = "btnAutoscroll";
|
||||
btnAutoscroll.Size = new Size(214, 43);
|
||||
btnAutoscroll.TabIndex = 2;
|
||||
btnAutoscroll.Text = "Stop Autoscroll";
|
||||
btnAutoscroll.UseVisualStyleBackColor = false;
|
||||
//
|
||||
// cbLogLevel
|
||||
//
|
||||
cbLogLevel.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbLogLevel.Items.AddRange(new object[] { "Alle", "Debug", "Info", "Warning", "Error", "Trade", "TradeReasoning" });
|
||||
cbLogLevel.Location = new Point(74, 10);
|
||||
cbLogLevel.Margin = new Padding(4, 5, 4, 5);
|
||||
cbLogLevel.Name = "cbLogLevel";
|
||||
cbLogLevel.Size = new Size(227, 33);
|
||||
cbLogLevel.TabIndex = 1;
|
||||
//
|
||||
// lblFilter
|
||||
//
|
||||
lblFilter.AutoSize = true;
|
||||
lblFilter.Location = new Point(11, 17);
|
||||
lblFilter.Margin = new Padding(4, 0, 4, 0);
|
||||
lblFilter.Name = "lblFilter";
|
||||
lblFilter.Size = new Size(55, 25);
|
||||
lblFilter.TabIndex = 0;
|
||||
lblFilter.Text = "Level:";
|
||||
//
|
||||
// tabViewer
|
||||
//
|
||||
tabViewer.Controls.Add(dgvLogs);
|
||||
tabViewer.Controls.Add(pnlViewerTop);
|
||||
tabViewer.Location = new Point(4, 34);
|
||||
tabViewer.Margin = new Padding(4, 5, 4, 5);
|
||||
tabViewer.Name = "tabViewer";
|
||||
tabViewer.Padding = new Padding(4, 5, 4, 5);
|
||||
tabViewer.Size = new Size(1421, 1045);
|
||||
tabViewer.TabIndex = 1;
|
||||
tabViewer.Text = "Log Viewer";
|
||||
tabViewer.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// dgvLogs
|
||||
//
|
||||
dgvLogs.AllowUserToAddRows = false;
|
||||
dgvLogs.AllowUserToDeleteRows = false;
|
||||
dgvLogs.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
dgvLogs.Dock = DockStyle.Fill;
|
||||
dgvLogs.Location = new Point(4, 68);
|
||||
dgvLogs.Margin = new Padding(4, 5, 4, 5);
|
||||
dgvLogs.Name = "dgvLogs";
|
||||
dgvLogs.ReadOnly = true;
|
||||
dgvLogs.RowHeadersVisible = false;
|
||||
dgvLogs.RowHeadersWidth = 62;
|
||||
dgvLogs.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
|
||||
dgvLogs.Size = new Size(1413, 972);
|
||||
dgvLogs.TabIndex = 1;
|
||||
//
|
||||
// pnlViewerTop
|
||||
//
|
||||
pnlViewerTop.Controls.Add(lblViewerStatus);
|
||||
pnlViewerTop.Controls.Add(btnViewerLoad);
|
||||
pnlViewerTop.Controls.Add(tbViewerText);
|
||||
pnlViewerTop.Controls.Add(lblVText);
|
||||
pnlViewerTop.Controls.Add(tbViewerCid);
|
||||
pnlViewerTop.Controls.Add(lblVCid);
|
||||
pnlViewerTop.Controls.Add(cbViewerLevel);
|
||||
pnlViewerTop.Controls.Add(lblVLevel);
|
||||
pnlViewerTop.Controls.Add(dtViewerDate);
|
||||
pnlViewerTop.Controls.Add(lblVDatum);
|
||||
pnlViewerTop.Dock = DockStyle.Top;
|
||||
pnlViewerTop.Location = new Point(4, 5);
|
||||
pnlViewerTop.Margin = new Padding(4, 5, 4, 5);
|
||||
pnlViewerTop.Name = "pnlViewerTop";
|
||||
pnlViewerTop.Size = new Size(1413, 63);
|
||||
pnlViewerTop.TabIndex = 0;
|
||||
//
|
||||
// lblViewerStatus
|
||||
//
|
||||
lblViewerStatus.AutoSize = true;
|
||||
lblViewerStatus.Location = new Point(1279, 18);
|
||||
lblViewerStatus.Margin = new Padding(4, 0, 4, 0);
|
||||
lblViewerStatus.Name = "lblViewerStatus";
|
||||
lblViewerStatus.Size = new Size(30, 25);
|
||||
lblViewerStatus.TabIndex = 9;
|
||||
lblViewerStatus.Text = "—";
|
||||
//
|
||||
// btnViewerLoad
|
||||
//
|
||||
btnViewerLoad.Location = new Point(1137, 10);
|
||||
btnViewerLoad.Margin = new Padding(4, 5, 4, 5);
|
||||
btnViewerLoad.Name = "btnViewerLoad";
|
||||
btnViewerLoad.Size = new Size(129, 43);
|
||||
btnViewerLoad.TabIndex = 8;
|
||||
btnViewerLoad.Text = "Laden";
|
||||
btnViewerLoad.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// tbViewerText
|
||||
//
|
||||
tbViewerText.Location = new Point(866, 12);
|
||||
tbViewerText.Margin = new Padding(4, 5, 4, 5);
|
||||
tbViewerText.Name = "tbViewerText";
|
||||
tbViewerText.PlaceholderText = "Suchtext …";
|
||||
tbViewerText.Size = new Size(255, 31);
|
||||
tbViewerText.TabIndex = 7;
|
||||
//
|
||||
// lblVText
|
||||
//
|
||||
lblVText.AutoSize = true;
|
||||
lblVText.Location = new Point(814, 18);
|
||||
lblVText.Margin = new Padding(4, 0, 4, 0);
|
||||
lblVText.Name = "lblVText";
|
||||
lblVText.Size = new Size(46, 25);
|
||||
lblVText.TabIndex = 6;
|
||||
lblVText.Text = "Text:";
|
||||
//
|
||||
// tbViewerCid
|
||||
//
|
||||
tbViewerCid.Location = new Point(583, 12);
|
||||
tbViewerCid.Margin = new Padding(4, 5, 4, 5);
|
||||
tbViewerCid.Name = "tbViewerCid";
|
||||
tbViewerCid.PlaceholderText = "SignalId …";
|
||||
tbViewerCid.Size = new Size(213, 31);
|
||||
tbViewerCid.TabIndex = 5;
|
||||
//
|
||||
// lblVCid
|
||||
//
|
||||
lblVCid.AutoSize = true;
|
||||
lblVCid.Location = new Point(534, 18);
|
||||
lblVCid.Margin = new Padding(4, 0, 4, 0);
|
||||
lblVCid.Name = "lblVCid";
|
||||
lblVCid.Size = new Size(45, 25);
|
||||
lblVCid.TabIndex = 4;
|
||||
lblVCid.Text = "CID:";
|
||||
//
|
||||
// cbViewerLevel
|
||||
//
|
||||
cbViewerLevel.DropDownStyle = ComboBoxStyle.DropDownList;
|
||||
cbViewerLevel.Items.AddRange(new object[] { "Alle", "Debug", "Info", "Warning", "Error", "Trade", "TradeReasoning" });
|
||||
cbViewerLevel.Location = new Point(317, 12);
|
||||
cbViewerLevel.Margin = new Padding(4, 5, 4, 5);
|
||||
cbViewerLevel.Name = "cbViewerLevel";
|
||||
cbViewerLevel.Size = new Size(198, 33);
|
||||
cbViewerLevel.TabIndex = 3;
|
||||
//
|
||||
// lblVLevel
|
||||
//
|
||||
lblVLevel.AutoSize = true;
|
||||
lblVLevel.Location = new Point(257, 18);
|
||||
lblVLevel.Margin = new Padding(4, 0, 4, 0);
|
||||
lblVLevel.Name = "lblVLevel";
|
||||
lblVLevel.Size = new Size(55, 25);
|
||||
lblVLevel.TabIndex = 2;
|
||||
lblVLevel.Text = "Level:";
|
||||
//
|
||||
// dtViewerDate
|
||||
//
|
||||
dtViewerDate.Format = DateTimePickerFormat.Short;
|
||||
dtViewerDate.Location = new Point(83, 12);
|
||||
dtViewerDate.Margin = new Padding(4, 5, 4, 5);
|
||||
dtViewerDate.Name = "dtViewerDate";
|
||||
dtViewerDate.Size = new Size(155, 31);
|
||||
dtViewerDate.TabIndex = 1;
|
||||
//
|
||||
// lblVDatum
|
||||
//
|
||||
lblVDatum.AutoSize = true;
|
||||
lblVDatum.Location = new Point(11, 18);
|
||||
lblVDatum.Margin = new Padding(4, 0, 4, 0);
|
||||
lblVDatum.Name = "lblVDatum";
|
||||
lblVDatum.Size = new Size(70, 25);
|
||||
lblVDatum.TabIndex = 0;
|
||||
lblVDatum.Text = "Datum:";
|
||||
//
|
||||
// TerminalView
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(1429, 1083);
|
||||
Controls.Add(tabControlTerminal);
|
||||
Icon = (Icon)resources.GetObject("$this.Icon");
|
||||
Margin = new Padding(4, 5, 4, 5);
|
||||
Name = "TerminalView";
|
||||
Text = "Terminal / Logs";
|
||||
tabControlTerminal.ResumeLayout(false);
|
||||
tabLive.ResumeLayout(false);
|
||||
contextMenuTerminal.ResumeLayout(false);
|
||||
pnlTop.ResumeLayout(false);
|
||||
pnlTop.PerformLayout();
|
||||
tabViewer.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)dgvLogs).EndInit();
|
||||
pnlViewerTop.ResumeLayout(false);
|
||||
pnlViewerTop.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.TabControl tabControlTerminal;
|
||||
private System.Windows.Forms.TabPage tabLive;
|
||||
private System.Windows.Forms.Panel pnlTop;
|
||||
private System.Windows.Forms.Label lblFilter;
|
||||
private System.Windows.Forms.ComboBox cbLogLevel;
|
||||
private System.Windows.Forms.Button btnAutoscroll;
|
||||
private System.Windows.Forms.RichTextBox rtbTerminal;
|
||||
private System.Windows.Forms.ContextMenuStrip contextMenuTerminal;
|
||||
private System.Windows.Forms.ToolStripMenuItem miCopy;
|
||||
private System.Windows.Forms.ToolStripMenuItem miSelectAll;
|
||||
private System.Windows.Forms.ToolStripMenuItem miCopyAll;
|
||||
private System.Windows.Forms.ToolStripSeparator miSep1;
|
||||
private System.Windows.Forms.ToolStripMenuItem miClear;
|
||||
private System.Windows.Forms.TabPage tabViewer;
|
||||
private System.Windows.Forms.Panel pnlViewerTop;
|
||||
private System.Windows.Forms.Label lblVDatum;
|
||||
private System.Windows.Forms.DateTimePicker dtViewerDate;
|
||||
private System.Windows.Forms.Label lblVLevel;
|
||||
private System.Windows.Forms.ComboBox cbViewerLevel;
|
||||
private System.Windows.Forms.Label lblVCid;
|
||||
private System.Windows.Forms.TextBox tbViewerCid;
|
||||
private System.Windows.Forms.Label lblVText;
|
||||
private System.Windows.Forms.TextBox tbViewerText;
|
||||
private System.Windows.Forms.Button btnViewerLoad;
|
||||
private System.Windows.Forms.Label lblViewerStatus;
|
||||
private System.Windows.Forms.DataGridView dgvLogs;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLogTime;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLogLevel;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLogCid;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLogMsg;
|
||||
}
|
||||
}
|
||||
@@ -1,195 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Forms;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// Terminal-/Log-Ansicht. Designbar (siehe TerminalView.Designer.cs). Die Laufzeit-
|
||||
/// Abhängigkeit (TerminalLogger) wird per <see cref="Initialize"/> injiziert, damit der
|
||||
/// parameterlose Konstruktor für den VS-Designer nutzbar bleibt.
|
||||
/// </summary>
|
||||
public partial class TerminalView : Form
|
||||
{
|
||||
private TerminalLogger? _logger;
|
||||
private readonly ConcurrentQueue<LogMessageEventArgs> _logQueue = new();
|
||||
private readonly System.Windows.Forms.Timer _uiLogTimer = new() { Interval = 250 };
|
||||
private bool _autoScroll = true;
|
||||
private EventHandler<LogMessageEventArgs>? _logHandler;
|
||||
|
||||
public TerminalView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
// Steuerelemente + statische Eigenschaften stammen aus dem Designer.
|
||||
// Hier nur noch Verhalten verdrahten und einen sinnvollen Default wählen.
|
||||
if (cbLogLevel.Items.Count > 0) cbLogLevel.SelectedIndex = 0;
|
||||
btnAutoscroll.Click += (_, _) => ToggleAutoscroll();
|
||||
_uiLogTimer.Tick += ProcessLogQueue;
|
||||
|
||||
// Kontextmenü: Text aus dem Terminal kopieren (Ctrl+C funktioniert zusätzlich nativ).
|
||||
miCopy.Click += (_, _) => { if (rtbTerminal.SelectionLength > 0) rtbTerminal.Copy(); };
|
||||
miSelectAll.Click += (_, _) => rtbTerminal.SelectAll();
|
||||
miCopyAll.Click += (_, _) => CopyAllToClipboard();
|
||||
miClear.Click += (_, _) => rtbTerminal.Clear();
|
||||
|
||||
// Log Viewer (S-0): JSONL-Tagesdateien menschenlesbar, filterbar nach Level/CID/Text.
|
||||
if (cbViewerLevel.Items.Count > 0) cbViewerLevel.SelectedIndex = 0;
|
||||
btnViewerLoad.Click += (_, _) => LoadViewer();
|
||||
tbViewerCid.KeyDown += (_, e) => { if (e.KeyCode == Keys.Enter) { LoadViewer(); e.SuppressKeyPress = true; } };
|
||||
tbViewerText.KeyDown += (_, e) => { if (e.KeyCode == Keys.Enter) { LoadViewer(); e.SuppressKeyPress = true; } };
|
||||
// Doppelklick auf eine CID: komplette Signal-Kette anzeigen.
|
||||
dgvLogs.CellDoubleClick += (_, e) =>
|
||||
{
|
||||
if (e.RowIndex < 0) return;
|
||||
if (dgvLogs.Rows[e.RowIndex].DataBoundItem is LogViewerRow row && !string.IsNullOrEmpty(row.Cid))
|
||||
{
|
||||
tbViewerCid.Text = row.Cid;
|
||||
tbViewerText.Text = "";
|
||||
LoadViewer();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// ===== Log Viewer =====
|
||||
|
||||
/// <summary>Anzeige-Zeile des Log Viewers (Bindung über DataPropertyName).</summary>
|
||||
private sealed class LogViewerRow
|
||||
{
|
||||
public string Time { get; init; } = "";
|
||||
public string Level { get; init; } = "";
|
||||
public string Cid { get; init; } = "";
|
||||
public string Message { get; init; } = "";
|
||||
}
|
||||
|
||||
private void LoadViewer()
|
||||
{
|
||||
try
|
||||
{
|
||||
string path = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Logs",
|
||||
$"{dtViewerDate.Value:yyyy-MM-dd}.jsonl");
|
||||
if (!System.IO.File.Exists(path))
|
||||
{
|
||||
dgvLogs.DataSource = new System.ComponentModel.BindingList<LogViewerRow>();
|
||||
lblViewerStatus.Text = "Keine JSONL-Datei für dieses Datum.";
|
||||
return;
|
||||
}
|
||||
|
||||
string levelFilter = cbViewerLevel.SelectedItem?.ToString() ?? "Alle";
|
||||
string cidFilter = tbViewerCid.Text.Trim();
|
||||
string textFilter = tbViewerText.Text.Trim();
|
||||
|
||||
var rows = new List<LogViewerRow>();
|
||||
foreach (string line in System.IO.File.ReadLines(path))
|
||||
{
|
||||
var p = LogJson.ParseLine(line);
|
||||
if (p == null) continue;
|
||||
if (levelFilter != "Alle" && p.Level != levelFilter) continue;
|
||||
if (cidFilter.Length > 0 && !p.Cid.Contains(cidFilter, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
if (textFilter.Length > 0 && !p.Message.Contains(textFilter, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
rows.Add(new LogViewerRow { Time = p.Time, Level = p.Level, Cid = p.Cid, Message = p.Message });
|
||||
if (rows.Count >= 20000) break; // UI-Schutz bei sehr großen Tagen
|
||||
}
|
||||
|
||||
dgvLogs.DataSource = new System.ComponentModel.BindingList<LogViewerRow>(rows);
|
||||
lblViewerStatus.Text = $"{rows.Count} Einträge.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
lblViewerStatus.Text = $"Fehler: {ex.Message}";
|
||||
}
|
||||
}
|
||||
|
||||
private void CopyAllToClipboard()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(rtbTerminal.Text))
|
||||
Clipboard.SetText(rtbTerminal.Text);
|
||||
}
|
||||
catch { /* Zwischenablage kann kurzzeitig belegt sein – bewusst ignorieren */ }
|
||||
}
|
||||
|
||||
/// <summary>Verbindet die View mit dem Logger (Laufzeit-DI).</summary>
|
||||
public void Initialize(TerminalLogger logger)
|
||||
{
|
||||
_logger = logger;
|
||||
|
||||
// Jüngste Historie vorladen, damit das Fenster beim Öffnen nicht leer ist.
|
||||
foreach (var e in _logger.GetHistory(TimeSpan.FromMinutes(10)))
|
||||
_logQueue.Enqueue(e);
|
||||
|
||||
_logHandler = (_, e) => _logQueue.Enqueue(e);
|
||||
_logger.OnLogMessage += _logHandler;
|
||||
|
||||
_uiLogTimer.Start();
|
||||
Disposed += OnDisposed;
|
||||
}
|
||||
|
||||
private void OnDisposed(object? sender, EventArgs e)
|
||||
{
|
||||
_uiLogTimer.Stop();
|
||||
if (_logger != null && _logHandler != null)
|
||||
_logger.OnLogMessage -= _logHandler;
|
||||
}
|
||||
|
||||
private void ToggleAutoscroll()
|
||||
{
|
||||
_autoScroll = !_autoScroll;
|
||||
btnAutoscroll.BackColor = _autoScroll ? System.Drawing.Color.LightGreen : System.Drawing.Color.IndianRed;
|
||||
btnAutoscroll.Text = _autoScroll ? "Stop Autoscroll" : "Start Autoscroll";
|
||||
}
|
||||
|
||||
private void ProcessLogQueue(object? sender, EventArgs e)
|
||||
{
|
||||
if (_logQueue.IsEmpty || !IsHandleCreated) return;
|
||||
|
||||
string filter = cbLogLevel.SelectedItem?.ToString() ?? "Alle";
|
||||
TimeZoneInfo berlinTz = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
|
||||
bool appended = false;
|
||||
int count = 0;
|
||||
const int maxProcess = 500;
|
||||
|
||||
rtbTerminal.SuspendLayout();
|
||||
|
||||
while (count < maxProcess && _logQueue.TryDequeue(out var logEvent))
|
||||
{
|
||||
count++;
|
||||
if (filter != "Alle" && logEvent.Level.ToString() != filter) continue;
|
||||
|
||||
DateTime logTime = logEvent.Timestamp.Kind == DateTimeKind.Utc
|
||||
? TimeZoneInfo.ConvertTimeFromUtc(logEvent.Timestamp, berlinTz)
|
||||
: TimeZoneInfo.ConvertTime(logEvent.Timestamp, berlinTz);
|
||||
string timeStr = $"[{logTime:HH:mm:ss}]";
|
||||
|
||||
System.Drawing.Color c = System.Drawing.Color.White;
|
||||
if (logEvent.Level == LogLevel.Error) c = System.Drawing.Color.Red;
|
||||
else if (logEvent.Level == LogLevel.Warning) c = System.Drawing.Color.Yellow;
|
||||
else if (logEvent.Level == LogLevel.Trade) c = System.Drawing.Color.LightGreen;
|
||||
else if (logEvent.Level == LogLevel.TradeReasoning) c = System.Drawing.Color.Orange;
|
||||
|
||||
rtbTerminal.SelectionStart = rtbTerminal.TextLength;
|
||||
rtbTerminal.SelectionLength = 0;
|
||||
rtbTerminal.SelectionColor = c;
|
||||
rtbTerminal.AppendText($"{timeStr} [{logEvent.Level}] {logEvent.Message}\n");
|
||||
appended = true;
|
||||
}
|
||||
|
||||
if (appended)
|
||||
{
|
||||
if (rtbTerminal.TextLength > 80000)
|
||||
{
|
||||
rtbTerminal.Clear();
|
||||
rtbTerminal.SelectionColor = System.Drawing.Color.LightPink;
|
||||
rtbTerminal.AppendText($"[{DateTime.Now:HH:mm:ss}] [System] Terminal Auto-Clear (RAM Limit erreicht). Vollständige Logs im Ordner /Logs.\n");
|
||||
}
|
||||
|
||||
if (_autoScroll) rtbTerminal.ScrollToCaret();
|
||||
}
|
||||
|
||||
rtbTerminal.ResumeLayout();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,185 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="contextMenuTerminal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1,97 +0,0 @@
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using PolyTrader.Core.Modularity;
|
||||
|
||||
namespace PolyTraderSharp.Ui
|
||||
{
|
||||
/// <summary>
|
||||
/// WinForms-Umsetzung des gemeinsamen Fenster-Menüs. Liegt bewusst in der App und nicht mehr
|
||||
/// im Core: der Core ist seit der Linux-Portierung toolkit-neutral (net8.0) und darf keine
|
||||
/// WinForms-Typen mehr kennen. Die Avalonia-Shell bekommt später ihr eigenes Gegenstück.
|
||||
///
|
||||
/// Baut das gemeinsame Fenster-Menü, das auf JEDEM PolyTrader-Fenster erscheint und das Wechseln
|
||||
/// zwischen allen Fenstern (Launcher + Core + Module) erlaubt. Da es nur den Core-Contract
|
||||
/// <see cref="IModuleUiHost"/> nutzt, funktioniert es auch aus Modul-Fenstern (die die App nicht kennen).
|
||||
///
|
||||
/// Die Fenster werden NICHT mehr in einem Untermenü „Fenster" versteckt, sondern als eigenständige
|
||||
/// Einträge (mit Icon) direkt nebeneinander in der obersten Menüleiste aufgelistet. Das aktuelle
|
||||
/// Fenster ist fett + angehakt, weitere offene Fenster sind angehakt.
|
||||
/// Rechts liegt eine kontextabhängige Aktion: NUR auf dem Launcher (Hauptprozess) „Beenden"
|
||||
/// (fährt die gesamte App über die Sicherheitsabfrage herunter); auf allen anderen Fenstern
|
||||
/// „Fenster schließen" (schließt nur dieses Fenster – ohne Einfluss auf laufende Module).
|
||||
/// Die Leiste wird bei jeder Statusänderung (Fenster geöffnet/geschlossen) neu aufgebaut.
|
||||
/// </summary>
|
||||
public static class WindowMenu
|
||||
{
|
||||
/// <summary>
|
||||
/// Verdrahtet eine Designer-<see cref="MenuStrip"/> mit der Fensterliste: füllt sie sofort und
|
||||
/// baut sie bei jeder Offen-Status-Änderung neu auf. Die Registrierung wird sauber gelöst, sobald
|
||||
/// die Menüleiste (mit ihrem Fenster) entsorgt wird – kein Event-Leak über die Host-Lebensdauer.
|
||||
/// </summary>
|
||||
public static void Wire(MenuStrip menu, IModuleUiHost host, string? currentViewId)
|
||||
{
|
||||
void Refresh()
|
||||
{
|
||||
if (menu.IsDisposed) return;
|
||||
if (menu.IsHandleCreated && menu.InvokeRequired)
|
||||
{
|
||||
try { menu.BeginInvoke((Action)(() => Populate(menu, host, currentViewId))); }
|
||||
catch { /* Fenster wird gerade geschlossen */ }
|
||||
return;
|
||||
}
|
||||
Populate(menu, host, currentViewId);
|
||||
}
|
||||
|
||||
Populate(menu, host, currentViewId);
|
||||
host.OpenStateChanged += Refresh;
|
||||
menu.Disposed += (_, _) => host.OpenStateChanged -= Refresh;
|
||||
}
|
||||
|
||||
/// <summary>Baut die Menüleiste komplett neu auf (Launcher, alle Views nebeneinander, Beenden rechts).</summary>
|
||||
public static void Populate(MenuStrip menu, IModuleUiHost host, string? currentViewId)
|
||||
{
|
||||
menu.Items.Clear();
|
||||
|
||||
var launcher = new ToolStripMenuItem("Launcher") { Checked = currentViewId == null };
|
||||
if (currentViewId == null) launcher.Font = new Font(launcher.Font, FontStyle.Bold);
|
||||
launcher.Click += (_, _) => host.ActivateMain();
|
||||
menu.Items.Add(launcher);
|
||||
|
||||
foreach (var view in host.Views.OrderBy(v => v.Order).ThenBy(v => v.Title))
|
||||
{
|
||||
bool isCurrent = view.Id == currentViewId;
|
||||
var image = ViewIcons.Resolve(view.IconKey);
|
||||
var item = new ToolStripMenuItem(view.Title)
|
||||
{
|
||||
Image = image,
|
||||
ImageScaling = ToolStripItemImageScaling.SizeToFit,
|
||||
DisplayStyle = image != null
|
||||
? ToolStripItemDisplayStyle.ImageAndText
|
||||
: ToolStripItemDisplayStyle.Text,
|
||||
Checked = isCurrent || host.IsOpen(view.Id)
|
||||
};
|
||||
if (isCurrent) item.Font = new Font(item.Font, FontStyle.Bold);
|
||||
string id = view.Id;
|
||||
item.Click += (_, _) => host.OpenView(id);
|
||||
menu.Items.Add(item);
|
||||
}
|
||||
|
||||
// Kontextabhängige rechte Aktion: nur der Launcher darf die App beenden (Sicherheitsabfrage);
|
||||
// jedes andere Fenster bietet nur „Fenster schließen" (kein App-Shutdown, Module laufen weiter).
|
||||
if (currentViewId == null)
|
||||
{
|
||||
var exit = new ToolStripMenuItem("Beenden") { Alignment = ToolStripItemAlignment.Right };
|
||||
exit.Click += (_, _) => host.RequestShutdown();
|
||||
menu.Items.Add(exit);
|
||||
}
|
||||
else
|
||||
{
|
||||
var close = new ToolStripMenuItem("Fenster schließen") { Alignment = ToolStripItemAlignment.Right };
|
||||
close.Click += (_, _) => menu.FindForm()?.Close();
|
||||
menu.Items.Add(close);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,161 +0,0 @@
|
||||
import requests
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import statistics
|
||||
import datetime
|
||||
|
||||
def fetch_activity_3days(wallet):
|
||||
all_trades = []
|
||||
offset = 0
|
||||
now_ts = int(datetime.datetime.now(datetime.timezone.utc).timestamp())
|
||||
three_days = 3 * 24 * 60 * 60
|
||||
|
||||
print(f"Fetching 3 days history for {wallet}...")
|
||||
while True:
|
||||
url = f"https://data-api.polymarket.com/activity?user={wallet}&limit=1000&offset={offset}"
|
||||
try:
|
||||
r = requests.get(url, timeout=15)
|
||||
if r.status_code == 200:
|
||||
data = r.json()
|
||||
items = data if isinstance(data, list) else (data.get("value", data.get("data", [])) if isinstance(data, dict) else [])
|
||||
|
||||
if not items:
|
||||
break
|
||||
|
||||
all_trades.extend(items)
|
||||
|
||||
# Check if we have passed 3 days
|
||||
oldest_ts = items[-1].get("timestamp")
|
||||
if oldest_ts and (now_ts - oldest_ts) >= three_days:
|
||||
break
|
||||
|
||||
offset += 1000
|
||||
else:
|
||||
break
|
||||
except Exception as e:
|
||||
print(f"Error fetching {wallet}: {e}")
|
||||
break
|
||||
|
||||
return all_trades
|
||||
|
||||
def analyze_trader(wallet, display_name):
|
||||
trades = fetch_activity_3days(wallet)
|
||||
if not trades:
|
||||
return None
|
||||
|
||||
# Filter trades and sort ascending (oldest first)
|
||||
valid_trades = [t for t in trades if t.get("type") == "TRADE" and t.get("timestamp") and t.get("asset")]
|
||||
valid_trades.sort(key=lambda x: x["timestamp"])
|
||||
|
||||
# Group by asset
|
||||
from collections import defaultdict
|
||||
by_asset = defaultdict(list)
|
||||
for t in valid_trades:
|
||||
by_asset[t["asset"]].append(t)
|
||||
|
||||
total_evaluated = 0
|
||||
snipes = 0
|
||||
hold_times = []
|
||||
|
||||
for asset, asset_trades in by_asset.items():
|
||||
# Find first BUY
|
||||
buy_ts = None
|
||||
for t in asset_trades:
|
||||
if t["side"] == "BUY":
|
||||
buy_ts = t["timestamp"]
|
||||
break
|
||||
|
||||
if buy_ts is None:
|
||||
continue
|
||||
|
||||
# Find first SELL after BUY (allow same second for immediate script-sells)
|
||||
sell_ts = None
|
||||
for t in asset_trades:
|
||||
if t["side"] == "SELL" and t["timestamp"] >= buy_ts:
|
||||
sell_ts = t["timestamp"]
|
||||
break
|
||||
|
||||
if sell_ts is not None:
|
||||
total_evaluated += 1
|
||||
hold_dur = sell_ts - buy_ts
|
||||
hold_times.append(hold_dur)
|
||||
if hold_dur < 300: # Less than 5 minutes
|
||||
snipes += 1
|
||||
|
||||
if total_evaluated == 0:
|
||||
return {
|
||||
"name": display_name,
|
||||
"wallet": wallet,
|
||||
"evaluated": 0,
|
||||
"snipes": 0,
|
||||
"ratio": 0.0,
|
||||
"median": 0
|
||||
}
|
||||
|
||||
ratio = (snipes / total_evaluated) * 100
|
||||
median_hold = statistics.median(hold_times) if hold_times else 0
|
||||
|
||||
return {
|
||||
"name": display_name,
|
||||
"wallet": wallet,
|
||||
"evaluated": total_evaluated,
|
||||
"snipes": snipes,
|
||||
"ratio": ratio,
|
||||
"median": median_hold
|
||||
}
|
||||
|
||||
def print_result(res):
|
||||
print(f"Trader: {res['name']} ({res['wallet']})")
|
||||
print(f" Evaluated Pairs: {res['evaluated']}")
|
||||
print(f" Snipe Trades (<5m): {res['snipes']}")
|
||||
if res['evaluated'] > 0:
|
||||
print(f" Sniper Ratio: {res['ratio']:.2f}%")
|
||||
print(f" Median Hold: {res['median']:.0f} seconds")
|
||||
print("-" * 40)
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Analyze a trader for Liquidity Sniping.")
|
||||
parser.add_argument("--wallet", type=str, help="Single wallet to analyze")
|
||||
parser.add_argument("--all", action="store_true", help="Analyze all active traders in PolyTraderDB.trackers.json")
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.wallet:
|
||||
res = analyze_trader(args.wallet, "CLI_TEST")
|
||||
if res:
|
||||
print_result(res)
|
||||
elif args.all:
|
||||
print("Analyzing all active traders...")
|
||||
db_path = r"bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.trackers.json"
|
||||
if not os.path.exists(db_path):
|
||||
print(f"Could not find DB at {db_path}")
|
||||
return
|
||||
|
||||
with open(db_path, "r", encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
|
||||
active_traders = [t for t in data if t.get("IsActive")]
|
||||
print(f"Found {len(active_traders)} active traders.")
|
||||
|
||||
results = []
|
||||
for t in active_traders:
|
||||
wallet = t.get("WalletAddress")
|
||||
name = t.get("DisplayName")
|
||||
res = analyze_trader(wallet, name)
|
||||
if res:
|
||||
results.append(res)
|
||||
|
||||
# Sort by worst offenders (highest sniper ratio)
|
||||
results.sort(key=lambda x: x["ratio"], reverse=True)
|
||||
|
||||
print("\n=== SNIPING REPORT ===")
|
||||
print(f"{'Trader Name':<20} | {'Evaluated':<10} | {'Snipes':<8} | {'Ratio':<8} | {'Median Hold':<12}")
|
||||
print("-" * 75)
|
||||
for r in results:
|
||||
if r['evaluated'] > 0:
|
||||
print(f"{r['name']:<20} | {r['evaluated']:<10} | {r['snipes']:<8} | {r['ratio']:>5.1f}% | {r['median']:>5.0f} sec")
|
||||
else:
|
||||
print(f"{r['name']:<20} | {r['evaluated']:<10} | {r['snipes']:<8} | {'N/A':<8} | {'N/A':<12}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,93 +0,0 @@
|
||||
import sqlite3
|
||||
import json
|
||||
import os
|
||||
|
||||
db_path = r"J:\Softwareprojekte\Polytrader\DBBackup\polytrader.db"
|
||||
conn = sqlite3.connect(db_path)
|
||||
conn.row_factory = sqlite3.Row
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Accounts
|
||||
cursor.execute("SELECT * FROM polymarket_accounts")
|
||||
accounts_rows = cursor.fetchall()
|
||||
accounts_dict = {}
|
||||
for r in accounts_rows:
|
||||
acc = dict(r)
|
||||
# Map to C# AccountState
|
||||
acc_obj = {
|
||||
"AccountId": acc["id"],
|
||||
"Name": acc["name"],
|
||||
"WalletAddress": acc["wallet_address"],
|
||||
"ApiKey": acc["api_key"] or "",
|
||||
"ApiSecret": acc["api_secret"] or "",
|
||||
"ApiPassphrase": acc["api_passphrase"] or "",
|
||||
"PrivateKey": acc["private_key"] or "",
|
||||
"IsDemo": bool(acc["is_demo"]),
|
||||
"IsActive": bool(acc["is_active"]),
|
||||
"CloseOnlyMode": bool(acc["close_only_mode"]),
|
||||
"PayoutAddress": acc["payout_address"] or "",
|
||||
"PayoutLimitUsd": float(acc["payout_limit_usd"] or 0),
|
||||
"PerMarketLimit": float(acc["per_market_limit"] or acc.get("max_trade_percent", 5.0)),
|
||||
"MaxPriceDifference": float(acc["max_price_difference"] or 2.0),
|
||||
"MaxBuyPrice": float(acc["max_buy_price"] or 0.98),
|
||||
"ProfitTarget": float(acc["profit_target"] or 50.0),
|
||||
"LimitUnder6h": float(acc["limit_under_6h"] or 20.0),
|
||||
"LimitUnder24h": float(acc["limit_under_24h"] or 20.0),
|
||||
"LimitUnder72h": float(acc["limit_under_72h"] or 20.0),
|
||||
"LimitOver72h": float(acc["limit_over_72h"] or 40.0),
|
||||
"TotalBalance": 0.0,
|
||||
"AvailableBalance": 0.0,
|
||||
"OpenPositions": {}
|
||||
}
|
||||
accounts_dict[str(acc["id"])] = acc_obj
|
||||
|
||||
# Traders
|
||||
cursor.execute("SELECT * FROM tracked_traders")
|
||||
traders_rows = cursor.fetchall()
|
||||
|
||||
# Links
|
||||
cursor.execute("SELECT * FROM trader_account_links")
|
||||
links_rows = cursor.fetchall()
|
||||
links_map = {}
|
||||
for r in links_rows:
|
||||
t_id = r["trader_id"]
|
||||
a_id = r["account_id"]
|
||||
if t_id not in links_map:
|
||||
links_map[t_id] = []
|
||||
links_map[t_id].append(a_id)
|
||||
|
||||
traders_dict = {}
|
||||
for r in traders_rows:
|
||||
t = dict(r)
|
||||
t_id = t["id"]
|
||||
trader_obj = {
|
||||
"Id": t_id,
|
||||
"WalletAddress": t["wallet_address"],
|
||||
"Category": t["category"] or "",
|
||||
"DisplayName": t["display_name"] or "",
|
||||
"Description": t["description"] or "",
|
||||
"Reasoning": t["reasoning"] or "",
|
||||
"IsActive": bool(t["is_active"]),
|
||||
"IsHidden": bool(t["is_hidden"]),
|
||||
"TotalTrades": int(t["total_trades"] or 0),
|
||||
"WinningTrades": int(t["winning_trades"] or 0),
|
||||
"Winrate30t": float(t["winrate_30t"] or 0.0),
|
||||
"TotalPnl": float(t["total_pnl"] or 0.0),
|
||||
"AssignedAccountIds": links_map.get(t_id, [])
|
||||
}
|
||||
traders_dict[str(t_id)] = trader_obj
|
||||
|
||||
snapshot = {
|
||||
"GlobalTradingPaused": False,
|
||||
"LiveTradingMode": 0,
|
||||
"DemoTradingMode": 0,
|
||||
"Accounts": accounts_dict,
|
||||
"Traders": traders_dict,
|
||||
"TotalCopyTrades": 0,
|
||||
"GlobalPnl": 0.0
|
||||
}
|
||||
|
||||
with open("snapshot.json", "w") as f:
|
||||
json.dump(snapshot, f, indent=4)
|
||||
|
||||
print("Export to snapshot.json complete! File size:", os.path.getsize("snapshot.json"))
|
||||
@@ -1,15 +0,0 @@
|
||||
import json
|
||||
|
||||
log_path = r"J:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\28-03-2026-Debug.log"
|
||||
|
||||
with open(log_path, 'r', encoding='utf-8', errors='ignore') as f:
|
||||
for line in f:
|
||||
if "14:15:" in line or "14:16:" in line or "14:17:" in line:
|
||||
if "CLOB-PAYLOAD" in line:
|
||||
try:
|
||||
json_str = line.split("->")[1].strip()
|
||||
payload = json.loads(json_str)
|
||||
order = payload.get("order", {})
|
||||
print(f"[{line[:10]}] SIDE: {order.get('side')} | MAKER: {order.get('makerAmount')} | TAKER: {order.get('takerAmount')} | TYPE: {order.get('signatureType')} | TOKEN: {str(order.get('tokenId'))[:10]}...")
|
||||
except Exception as e:
|
||||
pass
|
||||
@@ -1,23 +0,0 @@
|
||||
import json
|
||||
with open(r'j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\PolyTraderDB\closed_trades.json', 'r', encoding='utf-8') as f:
|
||||
trades = [json.loads(line) for line in f]
|
||||
|
||||
wins = sum(1 for t in trades if t.get('RealizedPnl', 0) > 0)
|
||||
losses = sum(1 for t in trades if t.get('RealizedPnl', 0) < 0)
|
||||
pnl = sum(t.get('RealizedPnl', 0) for t in trades)
|
||||
|
||||
print(f'Total Trades: {len(trades)}')
|
||||
print(f'Wins: {wins}, Losses: {losses}')
|
||||
print(f'Total PnL: {pnl:.2f}')
|
||||
|
||||
reasons = {}
|
||||
for t in trades:
|
||||
r = t.get('ExitReason', 'None')
|
||||
p = t.get('RealizedPnl', 0)
|
||||
if r not in reasons: reasons[r] = {'count': 0, 'pnl': 0}
|
||||
reasons[r]['count'] += 1
|
||||
reasons[r]['pnl'] += p
|
||||
|
||||
print('--- By Reason ---')
|
||||
for r, d in reasons.items():
|
||||
print(r + ': ' + str(d['count']) + ' trades, PnL: ' + str(round(d['pnl'], 2)))
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,518 +0,0 @@
|
||||
# Chat Conversation
|
||||
|
||||
Note: _This is purely the output of the chat conversation and does not contain any raw data, codebase snippets, etc. used to generate the output._
|
||||
|
||||
### User Input
|
||||
|
||||
Wir haben heute 2 Projekte:
|
||||
|
||||
|
||||
Erstens:
|
||||
Ich habe im Designer den Button: btn_sixshares hinzugefügt. Der Button soll als Toggle fungieren. Wenn er Aktiv ist soll der Hintergrund grün sein, wenn er inaktiv ist soll der hintergrund rot sein. Standardmäßig ist er inaktiv.
|
||||
Solange er aktiv ist sollen unsere Limits für kleine Wallets so angepasst werden, das bei Orders, die vermutlich sofort erfüllt werden, immer mindestens 6 Shares gekauft werden. Auch wenn dadurch die 1,2$ und 3$ Limits überschritten werden. Bei Orders bei denen wir aufgrund des Preises sowieso über 6 Shares liegen sollen natürlich weiterhin die 1,2$, 3$ und bei größeren Wallets die prozentualen Limits ausschlaggebend sein.
|
||||
|
||||
Bitte beachte die @[.agents/rules/clob.md] hinweise.
|
||||
|
||||
|
||||
|
||||
Zweitens: soll der Text des toolStripStatusLabel_build in Zukunft immer Datum und Uhrzeit (MESZ) des Buildzeitpunkts der Anwendung anzeigen. Damit kann ich immer sicher sein welche version von Polytrader ich gerade auf meinem Server laufen habe.
|
||||
|
||||
|
||||
|
||||
*Viewed [clob.md](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/.agents/rules/clob.md) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Copy-Item j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs -Destination j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs.bak4`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Listed directory [PolyTraderSharp](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path *.cs, Services\*.cs -Pattern "btn_sixshares"`*
|
||||
|
||||
*User accepted the command `Select-String -Path *.cs, Services\*.cs -Pattern "toolStripStatusLabel_build"`*
|
||||
|
||||
*User accepted the command `Select-String -Path Services\*.cs -Pattern "1.2"`*
|
||||
|
||||
*User accepted the command `Select-String -Path Services\*.cs -Pattern "3.0"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/CopyTradingEngine.cs) *
|
||||
|
||||
*User accepted the command `Select-String -Path *.cs, Models\*.cs, Services\*.cs -Pattern "class ServerSettings"`*
|
||||
|
||||
*User accepted the command `Select-String -Path *.cs, Models\*.cs, Services\*.cs -Pattern "Global"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Viewed [TradingState.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/TradingState.cs) *
|
||||
|
||||
*Viewed [frm_main.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/frm_main.cs) *
|
||||
|
||||
*Viewed [ServerSettings.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/ServerSettings.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `dotnet build`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe die beiden gewünschten Änderungen vorgenommen!
|
||||
|
||||
**Hier ist die Übersicht der durchgeführten Optimierungen. Die Anwendung komiliert sauber und ein Backup der `CopyTradingEngine.cs` wurde automatisch vor dem Eingriff wie in `clob.md` angewiesen erstellt:**
|
||||
|
||||
1. **Toggle-Button für "6 Shares" (`btn_sixshares`)**
|
||||
* Der Zustand des Buttons wird nun im in-memory `TradingState` festgehalten.
|
||||
* Ein Klick auf den Button ändert seinen Hintergrund automatisch auf Grün (aktiv) oder Rot (inaktiv). Standardmäßig ist dies aus Sicherheitsgründen beim Start deaktiviert.
|
||||
* In der **`CopyTradingEngine.cs`** (bei der Risikoprüfung und Budgetierung vor dem API Aufruf) habe ich eine Prüfung hinzugefügt. Solange das Toggle aktiv ist und der Account zur "Low Balance" (unter 500$) Kategorie anfällt, wird dynamisch der mathematische Limit-Preis für 6 Shares kalkuliert.
|
||||
* Ist das für 6 Shares notwendige Budget *höher* als das aktuell erlaubte 1,20$ oder 3,00$ Freibudget für das aktuelle Wallet berechnet, wird das Budget genau soweit nach oben korrigiert, dass `min. 6 Shares` bei der Order erzielt werden. Die vorhandene `AvailableBalance` des Wallets darf dabei natürlich weiterhin in keinem Fall überschritten werden!
|
||||
* Bei größeren Wallets (>= 500$) bleiben diese Limits unberührt und nur die PerMaster / PerMarket Prozent-Limits gelten weiterhin.
|
||||
|
||||
2. **Build-Version Zeitstempel (`toolStripStatusLabel_build`)**
|
||||
* Wenn die Benutzeroberfläche fertig geladen hat (`frm_main_Load`), wird nun das genaue Erstelldatum der `PolyTraderSharp.dll` bzw. `.exe` (ausgeführtes Assembly) per Windows Dateizeitsystem ausgelesen und sicher in die deutsche "W. Europe Standard Time" (CET/MESZ) konvertiert.
|
||||
* Dieser Buildzeitpunkt wird nun unten rechts dauerhaft in der Statusleiste eingeblendet (`z.B. Build: 06.04.2026 11:06 MESZ`).
|
||||
|
||||
Diese Änderungen greifen sofort und du kannst die Oberfläche via `dotnet run` direkt nutzen! Lass mich wissen, falls ich noch Feinjustierungen am Toleranz-Algorithmus der Shares vornehmen soll.
|
||||
|
||||
### User Input
|
||||
|
||||
Ich habe dir im @[bin/Debug/net8.0-windows7.0/Logs]Ordner einmal die heutigen Logs und die LiteDB von der laufenden PolyTrader instanz auf meinem Server heruntergeladen. Leider ist unsere Performance deutlich schlechter als die, der Trader die wir kopieren.
|
||||
Nutze die Daten die du aus den Logs und der Datenbank extrahieren kannst um herauszufinden warum wir die Performance unserer QUell-Trader nicht erreichen und was wir tun können um besser abzuschneiden.
|
||||
Mir ist unter anderem aufgefallen, das wir mehrere Positionen hatten die eine Zeit lang gut im Plus lagen und dann trotzdem mit einem Totalverlust geendet sind. Werden Sell-Trades nich bzw nicht richtig / nicht immer kopiert ? Sind wir zu langsam ? Fehlen uns Informationen ?
|
||||
|
||||
Analysiere das genau. und detailliert.
|
||||
Achtung: Nimm KEINE Änderungen am Code von Polytrader vor! (du darfst dir natürlich Hilfs-Skripte für die Analyse erstellen!)
|
||||
Erstelle mir mit allen deinen Ergebnissen eine Analyse die entsprechende Schwachstellen auflistet, ihre schwere Einschätzt und gib mir zusätzlich einen oder mehrere Lösungsvorschläge damit wir in Zukunft erfolgreicher im Copytrading sind.
|
||||
|
||||
*Listed directory [Logs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs) *
|
||||
|
||||
*Listed directory [net8.0-windows7.0](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0) *
|
||||
|
||||
*Viewed [06-04-2026-Trade.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Trade.log) *
|
||||
|
||||
*Viewed [06-04-2026-TradeReasoning.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-TradeReasoning.log) *
|
||||
|
||||
*Viewed [06-04-2026-Error.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Error.log) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Let me pick up where we left off. I was in the middle of analyzing the PolyTrader performance logs and database. Let me check the conversation state and continue.
|
||||
|
||||
*Listed directory [8b386bd6-9d08-4d59-93f0-8699a8a228eb](file:///C:/Users/bergm/.gemini/antigravity/brain/8b386bd6-9d08-4d59-93f0-8699a8a228eb) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
OK, the conversation artifacts directory is empty. Let me resume the analysis by reviewing the log files and understanding where we are.
|
||||
|
||||
*Listed directory [Logs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs) *
|
||||
|
||||
*Listed directory [net8.0-windows7.0](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Good. I have the logs and a LiteDB database snapshot. Let me start the detailed analysis by reading all log files systematically.
|
||||
|
||||
*Viewed [06-04-2026-Trade.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Trade.log) *
|
||||
|
||||
*Viewed [06-04-2026-Error.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Error.log) *
|
||||
|
||||
*Viewed [06-04-2026-TradeReasoning.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-TradeReasoning.log) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me create a PowerShell analysis script to extract key metrics from all logs systematically. This will be much faster than manually reading thousands of lines.
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `powershell -ExecutionPolicy Bypass -File "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analyze_logs.ps1"`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Let me get the full output properly:
|
||||
|
||||
*Checked command status*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Let me run the script again, redirecting output to a file:
|
||||
|
||||
*User accepted the command `powershell -ExecutionPolicy Bypass -File "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analyze_logs.ps1" > "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analysis_output.txt" 2>&1`*
|
||||
|
||||
*User accepted the command `powershell -ExecutionPolicy Bypass -Command "& { . 'j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analyze_logs.ps1' } | Out-File -FilePath 'j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analysis_output.txt' -Encoding utf8"`*
|
||||
|
||||
*Viewed [analysis_output.txt](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/analysis_output.txt) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
The output went to stdout. Let me write a simpler script that captures everything properly:
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `powershell -ExecutionPolicy Bypass -File "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\analyze2.ps1"`*
|
||||
|
||||
*Viewed [analysis_result.txt](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/analysis_result.txt) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Excellent! This is extremely revealing. Let me now dig deeper into the critical findings. Let me look at the Info log for SELL handling, the successfully closed trades, and the specific positions that went from profit to total loss.
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
The encoding might be an issue with grep. Let me try different search terms:
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [06-04-2026-Trade.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Trade.log) *
|
||||
|
||||
*Viewed [06-04-2026-TradeReasoning.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-TradeReasoning.log) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me check some key areas - the info log for SELL execution, and the key areas around the SELL failures. Let me also look at the CopyTradingEngine code for SELL handling:
|
||||
|
||||
*Viewed [06-04-2026-Info.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Info.log) *
|
||||
|
||||
*Viewed [06-04-2026-Warning.log](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/06-04-2026-Warning.log) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
I now have a comprehensive picture of all the issues. Let me create the detailed analysis artifact.
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Die Analyse ist fertig. Hier sind die wichtigsten Ergebnisse auf einen Blick:
|
||||
|
||||
## Hauptursachen für die schlechte Performance
|
||||
|
||||
### 🔴 #1: SELL-Orders werden NICHT ausgeführt
|
||||
Das ist der **Killer**. Von 1.386 erkannten SELL-Signalen wurde kein einziger erfolgreich umgesetzt. Bei ~95% aller Versuche kommt `"Position nicht im Portfolio gefunden"`. Das bedeutet: Wenn der Quell-Trader im Plus verkauft, bleiben unsere Positionen im Portfolio, bis sie verfallen und wertlos werden. **Das ist genau der Grund für die Totalverluste bei vorher profitablen Positionen.**
|
||||
|
||||
### 🔴 #2: BUY-Endlosschleife
|
||||
Das System feuert zwischen 01:05:41 und 01:06:00 **~60 BUY-Requests in 19 Sekunden** — alle scheitern sofort an der Fee-Rate-Anpassung und werden endlos recycelt.
|
||||
|
||||
### 🟠 #3-5: Filter zu restriktiv
|
||||
- **806 API-Errors** wegen "Size < 5 Shares" ($1.20 Budget reicht bei vielen Preisen nicht für 5 Shares)
|
||||
- **PerMasterLimit (10%)** blockiert nach wenigen Dollar alle weiteren Trades eines Traders
|
||||
- **TimeLimit-Budget** ist nach 1-2 Trades erschöpft
|
||||
|
||||
Die vollständige Analyse mit allen Details, Quell-Trader-Statistiken und priorisierten Handlungsempfehlungen findest du im Artifact. Was sind deine Gedanken dazu?
|
||||
|
||||
### Planner Response
|
||||
|
||||
Die Analyse ist abgeschlossen und genehmigt. Jetzt wende ich mich dem **ersten Projekt** zu: `btn_sixshares` Toggle-Button und Build-Timestamp-Label. Lass mich zunächst die Regeln und den relevanten Code untersuchen.
|
||||
|
||||
*Viewed [clob.md](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/.agents/rules/clob.md) *
|
||||
|
||||
*Listed directory [PolyTraderSharp](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [frm_main.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/frm_main.cs) *
|
||||
|
||||
*Viewed [TradingState.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/TradingState.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Good — the UI toggle and `TradingState` property are already in place. Now I need to find where the **order sizing logic** is, where the `$1.20` and `$3.00` limits are applied, to add the 6-share minimum override.
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
The SixShares logic is already partially implemented in `CopyTradingEngine.cs`. Let me see the full context:
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/CopyTradingEngine.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
I can see the full picture now. Both features (**btn_sixshares** toggle and **build timestamp**) are **already implemented**:
|
||||
|
||||
1. **`btn_sixshares`** (lines 367-374 in frm_main.cs):
|
||||
- Toggle logic ✅ (`_tradingState.SixSharesMinimum = !_tradingState.SixSharesMinimum`)
|
||||
- Green/Red background on state ✅
|
||||
- Default inactive ✅ (`SixSharesMinimum = false` in TradingState.cs)
|
||||
- 6-share minimum override in CopyTradingEngine.cs (lines 195-207) ✅
|
||||
|
||||
2. **`toolStripStatusLabel_build`** (lines 411-420 in frm_main.cs):
|
||||
- Reads assembly file's `LastWriteTimeUtc` ✅
|
||||
- Converts to MESZ (Berlin timezone) ✅
|
||||
- Displays `Build: dd.MM.yyyy HH:mm MESZ` ✅
|
||||
|
||||
Both features from **Projekt 1** are already fully implemented in the codebase. The `btn_sixshares` toggle:
|
||||
- Is wired as a `ToolStripMenuItem` with checked state
|
||||
- Toggles `_tradingState.SixSharesMinimum`
|
||||
- Changes background to **green** (active) / **red** (inactive)
|
||||
- In `CopyTradingEngine`, when active + balance < $500, it adjusts `maxAllowed` to cover at least 6 shares × order price, even if this exceeds the $1.20 / $3.00 limits
|
||||
|
||||
The build timestamp label reads the assembly file's last-modified date, converts to MESZ, and displays it in `dd.MM.yyyy HH:mm MESZ` format.
|
||||
|
||||
Is there anything else you'd like me to adjust on these features, or shall we move on to addressing the performance issues identified in the analysis?
|
||||
|
||||
### User Input
|
||||
|
||||
OK, kümmern wir uns um einige der probleme aus der @[c:\Users\bergm\.gemini\antigravity\brain\8b386bd6-9d08-4d59-93f0-8699a8a228eb\polytrader_performance_analysis.md.resolved]
|
||||
Beachte dabei die @[.agents/rules/clob.md] Hinweise!
|
||||
|
||||
Erstens: Prüfe detailliert ob das Problem mit den vielen verworfenen Sell-Orders wirklich damit zusammenhängt, das wir unterschiedliche TokenIDs bekommen bzw. aus anderen Gründen die gepollte Sell-Order nicht mit unseren eigenen Positionen abgleichen können.
|
||||
|
||||
Zweitens: Das 5 Share Minimum Problem sollten wir,wie du gemerkt hast, mit den jüngsten Änderungen in den Griff bekommen.
|
||||
|
||||
Drittens: Sorge dafür, das wir pro offenem Trade das Auto-Redeem maximal 2x mit einem Zeitversatz von 5 Minuten testen.
|
||||
|
||||
Viertens:
|
||||
Lass uns für High Frequency Trader wie z.B. Sharky6999 ein separates festes MaxPriceDifference Limit von 0.5 Cent( nicht 0.50$!!!) festlegen! Dieses Limit soll auf basis der Kategorie des Master-Traders verwendet werden. Immer dann wenn die Kategorie des Master-Traders auf "HF" steht. für alle anderen Master-Trader, deren Kategorie nicht auf "HF" steht, gilt weiterhin das normale prozentuale Limit aus den Einstellungen des jeweiligen Slave-Trader accounts.
|
||||
|
||||
Fünfstens:
|
||||
Erweitere unsere überwachung der auf polymarket platzierten offenen Orders so, das eine Order nach spätestens 30 Minuten geschlossen wird. Bei Master-Tradern der "HF" Kategorie sollen die offenen Trades schon nach 3 Minuten geschlossen werden.
|
||||
Wir haben aktuell einen haufen stein-alte "offene Trades" die oft erst erfüllt werden, wenn der Markt schon verloren ist und wir sinnlos ins fallende Messer greifen.
|
||||
|
||||
### Planner Response
|
||||
|
||||
Das sind 5 Aufgaben, davon mehrere mit CLOB-kritischen Änderungen. Ich starte mit der Research-Phase, bevor ich einen Plan erstelle.
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/CopyTradingEngine.cs) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [TrackedTrader.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/TrackedTrader.cs) *
|
||||
|
||||
*Viewed [PolymarketWssClient.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/PolymarketWssClient.cs) *
|
||||
|
||||
*Viewed [AccountState.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/AccountState.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me check the SELL signal generation — how does the `TraderMonitorService` create SELL signals and what TokenId does it use:
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Listed directory [services](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/TraderMonitorService.cs) *
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/TraderMonitorService.cs) *
|
||||
|
||||
*Viewed [CopySignal.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/CopySignal.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me check the open orders monitoring and MaxPriceDifference logic:
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [PolymarketClobClient.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/PolymarketClobClient.cs) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me check how MaxPriceDifference is actually used in the engine — where does the price diff check happen:
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Interesting — `MaxPriceDifference` exists on `AccountState` but is **never actually used** in the trading engine logic. Now let me check the `MarketSyncService` to understand how open orders are monitored, and look at `Position.cs`:
|
||||
|
||||
*Viewed [MarketSyncService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/MarketSyncService.cs) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [Position.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/Position.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now let me also check where "stale orders" or order timeout logic might exist:
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Let me now also look at the data endpoint to check whether there's a way to get ALL open orders for an account (not just per asset):
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [AlchemyWebsocketService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/AlchemyWebsocketService.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now I have a complete picture. Let me look at the logs to analyze the SELL problem more deeply — specifically to understand the TokenID relationship:
|
||||
|
||||
*User accepted the command `powershell -Command "Get-Content '06-04-2026-Trade.log' | Select-String 'SELL' | Select-Object -First 30 | ForEach-Object { $_.Line }"`*
|
||||
|
||||
*User accepted the command `powershell -Command "Select-String 'SELL' '06-04-2026-Trade.log' | Select-Object -First 30 -ExpandProperty Line"`*
|
||||
|
||||
*User accepted the command `powershell -Command "Select-String 'SELL' '06-04-2026-Info.log' | Select-Object -First 25 -ExpandProperty Line"`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
The logs confirm the pattern. Now I have everything I need to create the implementation plan. Let me first examine how `MaxPriceDifference` is meant to be used (it's defined but never enforced in the engine):
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now I have all the context needed. Let me create the implementation plan:
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Der Implementierungsplan ist erstellt. Hier die wichtigsten Punkte:
|
||||
|
||||
**Aufgabe 1 (SELL-Matching):** Nach detaillierter Code-Analyse ist das **kein TokenID-Mismatch**. Das Matching funktioniert korrekt (TokenId + Slug/Outcome Fallback). Die 95% "Position nicht gefunden"-Fehler entstehen, weil die BUYs zuvor durch unsere Limits blockiert wurden → wir halten die Positionen gar nicht. Das löst sich automatisch sobald wir mehr BUYs zulassen.
|
||||
|
||||
**Aufgabe 3 (Auto-Redeem):** Max. 2 Versuche pro Position, 5 Min Abstand. Danach permanent ignoriert.
|
||||
|
||||
**Aufgabe 4 (HF MaxPriceDifference):** Festes 0.5 Cent Limit für `Category == "HF"`, prozentuales Limit für alle anderen.
|
||||
|
||||
**Aufgabe 5 (Order Timeout):** 30 Min für normale, 3 Min für HF-Trader. Neuer Cleanup-Job in TraderMonitorService.
|
||||
|
||||
Zwei offene Fragen:
|
||||
1. Ist `MaxPriceDifference = 2.0` als **2% Aufschlag** oder **$2.00 absolut** gemeint?
|
||||
2. Soll ich HF für bestimmte Trader (z.B. Sharky6999) direkt im Code vorbelegen oder machst du das über die UI?
|
||||
|
||||
### Planner Response
|
||||
|
||||
Der Plan wurde genehmigt. Ich beginne mit der Umsetzung. Zuerst Backups erstellen (gemäß clob.md), dann die Änderungen implementieren.
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `Copy-Item "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\CopyTradingEngine.cs" "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\CopyTradingEngine.cs.bak5"; Copy-Item "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\PolymarketWssClient.cs" "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\PolymarketWssClient.cs.bak"; Copy-Item "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\TraderMonitorService.cs" "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\TraderMonitorService.cs.bak"; Copy-Item "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\PolymarketClobClient.cs" "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\services\PolymarketClobClient.cs.bak5"; Write-Output "Backups created."`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Backups erstellt. Jetzt implementiere ich die Änderungen:
|
||||
|
||||
**Aufgabe 3: Auto-Redeem Spam-Fix**
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
**Aufgabe 4: HF MaxPriceDifference + Aufgabe 5a: PendingOrderTimestamps**
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now implement **Aufgabe 4 (HF MaxPriceDifference)** and **Aufgabe 5b (Order Timestamp tracking)** in `CopyTradingEngine.cs`:
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/CopyTradingEngine.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
The first chunk (MaxPriceDifference) succeeded. The second chunk (timestamp tracking) failed. Let me check the current state of the file around the live BUY success block:
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/CopyTradingEngine.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Now **Aufgabe 5c + 5d**: Add `PolymarketClobClient` to `TraderMonitorService` and implement stale order cleanup. First check `Program.cs`:
|
||||
|
||||
*Viewed [Program.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Program.cs) *
|
||||
|
||||
### Planner Response
|
||||
|
||||
Good — `PolymarketClobClient` is registered as a singleton. `TraderMonitorService` currently takes `(TradingState, PolymarketApiService, ChannelWriter<CopySignal>, ChannelWriter<ClosedTrade>, TerminalLogger)`. I need to add `PolymarketClobClient` as a dependency:
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
All code changes are in. Now let's verify the build:
|
||||
|
||||
*User accepted the command `dotnet build PolyTraderSharp.sln --no-restore 2>&1 | Select-Object -Last 20`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
**Build erfolgreich: 0 Fehler, 0 Warnungen.** Jetzt update ich die Task-Liste und erstelle den Walkthrough:
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Alle Änderungen sind implementiert und der Build ist clean. Hier die Zusammenfassung:
|
||||
|
||||
## ✅ Erledigt
|
||||
|
||||
| # | Aufgabe | Status |
|
||||
|---|---|---|
|
||||
| 1 | **SELL-Matching Analyse** | ✅ Kein Code-Fix nötig — Problem ist dass BUYs durch Limits blockiert werden → Positionen existieren gar nicht |
|
||||
| 3 | **Auto-Redeem Spam** | ✅ Max 2 Versuche pro Position, 5 Min Abstand. Danach permanent ignoriert (~3.700 → max 2 Warnungen/Position) |
|
||||
| 4 | **HF MaxPriceDifference** | ✅ Festes 0.5 Cent Limit für `Category == "HF"`, prozentuales Limit für alle anderen |
|
||||
| 5 | **Stale Order Cleanup** | ✅ 30 Min Timeout (3 Min für HF). Neue `CleanupStaleOpenOrdersAsync()` im 30s-Polling-Zyklus |
|
||||
|
||||
**Build: 0 Errors, 0 Warnings** | Backups aller CLOB-Dateien erstellt
|
||||
|
||||
**Wichtig:** Damit die HF-Features greifen, musst du die gewünschten Master-Trader (z.B. Sharky6999) über die UI-Properties auf Category `"HF"` setzen.
|
||||
@@ -1,681 +0,0 @@
|
||||
# Chat Conversation
|
||||
|
||||
Note: _This is purely the output of the chat conversation and does not contain any raw data, codebase snippets, etc. used to generate the output._
|
||||
|
||||
### User Input
|
||||
|
||||
Im @[bin/Debug/net8.0-windows7.0/Logs]Ordner findest du wieder alle Exporte, Logs und die Polymarke Historie.
|
||||
Wir haben über die NAcht wieder verluste gemacht. analysiere jeden Trade der gestern ab 22:30 gelaufen ist und finde heraus warum wir nicht profitabel waren. Erstelle mir einen Analysebericht mit deinen entdeckungen und gib mir Lösungsvorschläge dazu. Nimm noch keine Änderungen am Code vor.
|
||||
|
||||
Lass dir zeit und analysiere genau. Überprüfe jeden trade einzeln. wenn möglich auch den QUell-trade des Master-Traders . was hat der anders gemacht als wir ? haben wir einen sell verpasst ?Waren wir zu langsam ? gibt es noch einen Fehler im Code ?
|
||||
|
||||
*Listed directory [Logs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs) *
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Select-Object -First 3`*
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json" | Select-Object -First 20`*
|
||||
|
||||
*User accepted the command `$trades = Get-Content 'j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json' | ConvertFrom-Json
|
||||
$recentTrades = $trades | Where-Object { $_.ClosedAt.'$date' -gt '2026-04-11T20:30:00.000Z' }
|
||||
$recentTrades | Select-Object _id, SourceTraderId, MarketQuestion, Outcome, EntryPrice, ExitPrice, Size, RealizedPnl, PnlPercent, @{Name='Opened';Expression={$_.OpenedAt.'$date'}}, @{Name='Closed';Expression={$_.ClosedAt.'$date'}} | ConvertTo-Json -Depth 2`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Beijing Guoan" | Select-Object -First 5 | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "Chengdu Rongcheng" | Select-Object -First 10 | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "08:54:0" | Select-Object -First 10 | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Beijing" | Select-String "08:54" | Format-List`*
|
||||
|
||||
*User accepted the command `$json = Get-Content 'j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json' | ConvertFrom-Json
|
||||
$ourTrades = $json | Where-Object { $_.SourceTraderId -eq 0 -and $_.ClosedAt.'$date' -gt '2026-04-11T20:30:00.000Z' }
|
||||
$masterTrades = $json | Where-Object { $_.SourceTraderId -ne 0 -and $_.ClosedAt.'$date' -gt '2026-04-11T20:30:00.000Z' }
|
||||
|
||||
foreach ($trade in $ourTrades) {
|
||||
# Find matching master trade
|
||||
# Match by mostly same question, close enough OpenedAt time, etc.
|
||||
$mt = $masterTrades | Where-Object { $_.MarketQuestion -eq $trade.MarketQuestion } | Sort-Object -Property @{Expression={$_.ClosedAt.'$date'}; Descending=$true} | Select-Object -First 1
|
||||
|
||||
Write-Host "---"
|
||||
Write-Host "OUR TRADE: id=$($trade._id), Question=$($trade.MarketQuestion), Outcome=$($trade.Outcome)"
|
||||
Write-Host " Opened: $($trade.OpenedAt.'$date'), Closed: $($trade.ClosedAt.'$date')"
|
||||
Write-Host " Entry: $($trade.EntryPrice), Exit: $($trade.ExitPrice), RealizedPnl: $($trade.RealizedPnl) ($($trade.PnlPercent)%)"
|
||||
if ($mt) {
|
||||
Write-Host "MASTER TRADE: mt_id=$($mt.SourceTraderId), id=$($mt._id), Outcome=$($mt.Outcome)"
|
||||
Write-Host " Opened: $($mt.OpenedAt.'$date'), Closed: $($mt.ClosedAt.'$date')"
|
||||
Write-Host " Entry: $($mt.EntryPrice), Exit: $($mt.ExitPrice), RealizedPnl: $($mt.RealizedPnl) ($($mt.PnlPercent)%)"
|
||||
} else {
|
||||
Write-Host "MASTER TRADE NOT FOUND for question"
|
||||
}
|
||||
}
|
||||
`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "Beijing Guoan" | Where-Object { $_.Line -match '^\[08:(4[7-9]|5[0-5]):' } | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Beijing" | Where-Object { $_.Line -match '^\[08:(5[0-5]):' } | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "0.369" | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "Stuttgart" | Where-Object { $_.Line -match '^\[06:(4[0-5]):' } | Format-List`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Trade.log" -Pattern "Stuttgart" | Select-Object -First 10 | Format-List`*
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" | Select-String "Copy" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern '^\[06:43:0[0-9]\]' | Format-List`*
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Select-String "Stuttgart" | Format-List`*
|
||||
|
||||
*User accepted the command `[datetimeoffset]::FromUnixTimeSeconds(1775968405).UtcDateTime
|
||||
[datetimeoffset]::FromUnixTimeSeconds(1775968603).UtcDateTime`*
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Select-String "Beijing Guoan" | Format-List`*
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Select-String "Middlesbrough FC" | Format-List`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe die nächtlichen Trades (ab gestern 22:30 Uhr) auf Basis der generierten Logs, der Datenbankauszüge und der echten Polymarket-Historie (CSV) detailliert analysiert. Die Ergebnisse, warum wir trotz eigentlich profitabler Master-Trades herbe Verluste eingefahren haben, habe ich komplett ausgearbeitet.
|
||||
|
||||
**Zusammenfassung der Erkenntnisse:**
|
||||
1. **Kein reines "Schnelligkeits-Problem", sondern "Liquidity Sniping" (Frontrunning):** Der PolyTrader und der "FAST TRACK" reagieren wahnsinnig schnell – in der Blockchain lagen wir oft **nur 3 bis 4 Sekunden hinter dem Master!** Das verhängnisvolle Problem ist das Limit-Orderbook (CLOB). Der Master Trader kauft Markt-Ineffizienzen billig auf. Wenn er nach 3 Minuten aus dem Trade rausgeht, verkauft er seine Anteile an den letzten Käufer, der bereit ist, einen absurden Preis (0.99) zu zahlen. Wenn unser Bot nur 4 Sekunden danach den Verkauf kopiert, ist die einzige (gute) Kauf-Order bereits vom Master bedient worden. Unser Bot muss dann zwangsweise das restliche, tiefere Orderbuch abgrasen und wir verkaufen unfreiwillig mit enormer *Slippage* (z.B. Entry bei 0.51, Master Exit bei 0.99, unser Exit bei 0.49). Wir sind faktisch die Exit-Liquidität für den Master geworden.
|
||||
2. **Der Datenbank- & Live-Sync Fehler:** Viele Trades in der Datenbank sahen auf den ersten Blick absurd aus, weil die `OpenedAt` und `ClosedAt` Zeitstempel auf die exakte Millisekunde genau übereingestimmt haben (und augenscheinlich 10 Minuten nach dem Trade stattfanden). Dies liegt an einem Fehler im Code: Wenn der Trade über den "Live Sync" oder den API-Fallback nachträglich in die Datenbank aufbereitet wird, trägt der Code einfach `DateTime.UtcNow` für den Kauf- und Verkaufszeitpunkt ein, anstatt den echten UNIX Timestamp aus der Blockchain (`tx.timestamp`) zu extrahieren.
|
||||
3. **Märkte mit -100% PnL (Ausgestoppte Trades):** Ein paar Trades bei denen der Exit auf `0.00` stand, waren klassische, normale Wettverluste (sogenannte Auto-Redemptions bei einem Marktende). Da trug der Master ebenfalls den kompletten Verlust, es gab hier also keinen System-Ausführungsfehler von uns.
|
||||
|
||||
Dein vollständiger Bericht und meine Lösungsvorschläge (Slippage/Limit-Schutz einbauen, LiveSync Time-Bug beheben und Volumen-Filter implementieren) findest du hier ausgearbeitet: [analysis_results.md](file:///C:/Users/bergm/.gemini/antigravity/brain/0896aadd-bbef-4a4c-9cb1-21d5080d6418/analysis_results.md)
|
||||
|
||||
Lass mich wissen, wie du vorgehen möchtest oder ob ich bereits anfangen soll, die Fixes (z.B. für den Limit-Enforcement-Schutz oder den Zeitstempel-Bug) umzusetzen!
|
||||
|
||||
### User Input
|
||||
|
||||
Ok, lass uns deine Löfungsvorschläge durchgehen.
|
||||
1. Striktes Limit-Enforcement (Slippage-Schutz aktivieren - setzen wir um.
|
||||
2. ist schwieriger und wird uns viel zeit kosten, da wir so nicht direkt den Trade kopieren können sondern alles erstmal geprüft werden muss. Das kostet zusätzlich zeit, die wir besonders in diesen hochgeschwindigskeits szenarien nicht haben. am besten wäre es wenn wir irgendwie vorher erkennen würden, das es sich um soche "sniping" trades handelt, die wir sowieso nicht mitgehen können und diese dann einfach direkt überspringen.
|
||||
Wenn auch das nicht zuverlässig möglich ist sollten wir wieder zu punkt 1 springen und auf jeden Fall eine Limit order platzieren bzw. bis zum ablauf warten. beides ist besser als stumpf als Exit liquidity für Master-Trader zu enden.
|
||||
|
||||
3. machen wir natürlich
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "ClosedAt = DateTime" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs" -Pattern "OpenedAt" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs" -Pattern "CreateOrder" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs" -Pattern "clob\." -Context 3,3`*
|
||||
|
||||
*Viewed [CopyTradingEngine.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/CopyTradingEngine.cs) *
|
||||
|
||||
*User accepted the command `Get-Content -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" | Select-String "GetPositionsAdmin" -Context 5,20`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "Background Sync" -Context 15,15`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "Sync.*History|GetTrades" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketApiService.cs" -Pattern "Trade" -Context 1,1`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "cm\." -Context 5,5`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketApiService.cs" -Pattern "SyncClosedPositionsAsync" -Context 3,10`*
|
||||
|
||||
*User accepted the command `$resp = Invoke-RestMethod -Uri "https://data-api.polymarket.com/closed-positions?user=0xd8419d04ec769687c6ad565fb69eebe8ea5635898364c31b5d55d19557eaa6ec&limit=1"
|
||||
$resp | ConvertTo-Json -Depth 5`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe den **Implementation Plan** entsprechend ausgearbeitet. Der Hauptpunkt betrifft die Änderung der "Sell"-Ausführung: Anstatt gnadenlos mit einer `MARKET`-Order das Orderbuch abzuräumen, berechnen wir (genau wie beim Kauf) nun das dynamische `Limit`, unterschreiten dies niemals und stellen eine `GTD` Limit-Order ein.
|
||||
|
||||
Außerdem wird der Bug bei den Zeitstempeln wie gewünscht eliminiert, damit korrekte Blockchain-Werte für `OpenedAt` und `ClosedAt` verwendet werden, falls der Markt über den Fallback-Sync aufgelöst wird.
|
||||
|
||||
Bitte wirf einen kurzen Blick auf den Plan. Da Limit-Orders (im Gegensatz zu Markt-Orders) nicht garantieren, dass wir die Anteile sofort loswerden, bleibt eine Verkaufsposition nun solange theoretisch im Bot aktiv, bis sie entweder von jemandem abgekauft oder vom Markt bei Abschluss aufgelöst wird (Auto-Redeem). Entsprechend habe ich dir noch zwei kleine offene Rückfragen im Plan notiert.
|
||||
|
||||
Wenn der Plan für dich so passt, gib mir kurz Bescheid, und ich beginne direkt mit der Umsetzung im Code!
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "decimal realizedPnl = 0m, entryPrice = 0m, size = 0m" -Context 3,35`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "ExitReason = ""API" -Context 15,15`*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `dotnet build -v q`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Alles erledigt! Die Code-Änderungen sind nun ins System integriert und das Projekt kompiliert ohne Fehler.
|
||||
|
||||
**1. Slippage Protection (Limit-Enforcement) implementiert:**
|
||||
Die Verkäufe (SELLS) werden ab sofort als `GTD` Limit-Order (Strikte Limits) aufgegeben. Die `MARKET` Order-Konfiguration ist ausgebaut. Bei High-Frequency (HF) Tradern akzeptiert der Bot nun maximal `0.5 Cents` Verlust. Bei anderen Trades orientiert er sich an deinem prozentualen `MaxPriceDifference` Setting.
|
||||
Wird unser Limit nicht zugeteilt, bleibt der Trade offen im Portfolio stehen (als offene Order). Er wird *nicht* mehr blindlings herausgelöscht, bis unser externe Background Sync meldet, dass die Anteile auch tatsächlich verkauft oder vom Markt automatisch aufgelöst wurden! Damit verhindern wir zukünftig, dass du bei Snipe-Pumps als unfreiwillige Floor-Liquiditiy von 0.99$ auf 0.49$ endest.
|
||||
|
||||
**2. Timestamp-Bug (Background Sync) gefixt:**
|
||||
`TraderMonitorService.cs` parst nun beim Durchsuchen fehlender oder geschlossener Datensätze aktiv die Meta-Daten der JSON-Objekte (`timestamp`, `updatedAt`, `createdAt`). Dein `OpenedAt` und `ClosedAt` Feld in der Datenbank hat nun wieder präzise Blockchain-Stempel und weicht auf Millisekundenebene vom API-Poll-Zeitpunkt (`DateTime.UtcNow`) ab – was deine zukünftigen Analysen deutlich verbessern wird.
|
||||
|
||||
Den technischen Überblick dazu findest du hier: [walkthrough.md](file:///C:/Users/bergm/.gemini/antigravity/brain/0896aadd-bbef-4a4c-9cb1-21d5080d6418/walkthrough.md)
|
||||
|
||||
Lass mich wissen, ob du das so schon mal auf dem externen Server ausprobieren/compilieren möchtest oder ob wir noch etwas anpassen sollen!
|
||||
|
||||
### User Input
|
||||
|
||||
lass den build durchlaufen und wir testen das ganze direkt
|
||||
|
||||
*User accepted the command `dotnet publish -c Release -o bin\Publish`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe den Build (inklusive Release-Publish) durchlaufen lassen. Er ist fertig und liegt bereit!
|
||||
|
||||
Alle Dateien wurden erfolgreich ohne Fehler kompiliert und im Ordner `bin/Publish` (bzw. wie gewohnt in `bin/Release/`) abgelegt. Du kannst den PolyTrader nun auf deinen externen Server ziehen und starten.
|
||||
|
||||
Sobald der Bot die ersten Trades kopiert hat, kannst du entweder in die Logs / UI auf dem Server schauen oder mir später die `closed_trades.json` bzw. den Log-Export zur Überprüfung geben, um zu verifizieren, dass die `GTD` Limits sauber greifen und die Zeitstempel exakt stimmen.
|
||||
|
||||
Sag gerne Bescheid, was das erste Test-Ergebnis geliefert hat!
|
||||
|
||||
### User Input
|
||||
|
||||
Anscheinend gibt es immernoch eine Möglichkeit die perMarket,perMaster und PerMaxTime Limits zu umgehen. Im @[bin/Debug/net8.0-windows7.0/Logs]Ordner sind wieder die aktuellsten Logs vom Server und zusätzlich die
|
||||
@[bin/Debug/net8.0-windows7.0/Logs/sustrades.csv]diesen Trade habe ich mehrfach manuell beendet, da er zu viel Guthaben unserer sehr kleinen wallet blockiert hat. Er wurde jedoch immer wieder erneut eröffnet und dabei noch größer platziert.
|
||||
|
||||
Bitte prüfe einmal wie es dazu kommen kann und sorge dafür ,dass das nichtmehr passiert.
|
||||
|
||||
*Viewed [sustrades.csv](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/sustrades.csv) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Will the next Prime Minister of Hungary" -Context 0,2 | Select -Last 20`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Will the next Prime Minister of Hungary be Viktor"`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "LIVE-EXECUTION.*Hungary" -Context 0,2`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "LIVE-EXECUTION" | Select -Last 5`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "LIVE-EXECUTION" | Where-Object { $_.Line -match "12:41:" -or $_.Line -match "12:42:" }`*
|
||||
|
||||
*Viewed [AccountState.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/AccountState.cs) *
|
||||
|
||||
*Viewed [Position.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Models/Position.cs) *
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "LIVE-EXECUTION" | Where-Object { $_.Line -match "13:00:" -or $_.Line -match "12:56:" }`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "LIVE-EXECUTION" | Where-Object { $_.Line -match "12:58:" -or $_.Line -match "12:59:" }`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\MarketSyncService.cs" -Pattern "md.Closed =" -Context 2,2`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\MarketSyncService.cs" -Pattern "Closed" -Context 1,1`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-Info.log" -Pattern "\(Ext. Verkauft/Wartend\)" -Context 0,0 | Select -Last 10`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs | Select-Object -Skip 180 -First 60`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs | Select-Object -Skip 240 -First 60`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe den Fehler gefunden! Du hast völlig recht, der Bot hat die Limits mehrfach ignoriert – aber nicht, weil die Limit-Algorithmen defekt sind, sondern wegen eines teuflischen Timing-Bugs bei der Synchronisation mit Polymarket.
|
||||
|
||||
Ich habe dir den exakten Ablauf und meinen Lösungsplan in `implementation_plan.md` (oben) zusammengefasst.
|
||||
|
||||
Zusammenfassung: Weil die Polymarket API teilweise stark asynchron laggt, meldet sie dem Bot fälschlicherweise gelegentlich nicht mehr alle aktiven Trades zurück. Der Bot hat diese "fehlenden" Trades nach 5 Minuten Wartezeit aus dem lokalen Speicher (Portfolio) gelöscht, da er davon ausging, du habest sie extern verkauft. Da der Trade für den Bot nun "0,00$" Volumen im Portfolio aufwies, hat ihn der nächste Master-Kauf erneut direkt platziert. Dies geschah 4x hintereinander innerhalb von 15 Minuten.
|
||||
|
||||
Wir müssen nun zwingend den Ablauf in der `TraderMonitorService.cs` anpassen: Eine laufende Position darf nicht stur nach Ablauf von 5 Minuten aus dem Cache gelöscht werden, wenn die API sie nicht meldet. Wir löschen sie erst, wenn es entweder einen harten Beweis gibt, dass sie weg ist (Auftauchen in `closedPositions` API), oder eine deutlichere Frist von z.B. 60 Minuten verstrichen ist.
|
||||
|
||||
Bist du mit dem Lösungsansatz einverstanden? Dann ersetze ich die 5-Minuten-Löschregel sofort durch eine robuste Sicherheits-Schleife.
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 688 -First 40`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 779 -First 48`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 688 -First 138`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 815 -First 25`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 835 -First 20`*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `dotnet build`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Der Bug ist behoben und im Code implementiert! Ich habe den Build getestet (`0 Fehler`). Du findest eine kurze Zusammenfassung im [Walkthrough-Dokument](file:///C:/Users/bergm/.gemini/antigravity/brain/0896aadd-bbef-4a4c-9cb1-21d5080d6418/walkthrough.md).
|
||||
|
||||
Die kritische Änderung war, das `TryRemove` im `TraderMonitorService` aufzuschieben, bis wir über einen Fallback (Closed-API-Match oder Ablauf von echten 60 Minuten) zweifelsfrei ausschließen können, dass es sich nur um ein temporäres Graph-API-Lag/Caching-Problem seitens Polymarket handelt.
|
||||
|
||||
Der Bot wird deine Limit-Budgetierung auf lokalen Trades ab sofort dauerhaft aufrecht erhalten – selbst wenn die API zwischendurch kurz unzuverlässig zurückmeldet, dass der Trade angeblich nicht existiert. Dein Master-Trader kann somit weiterhin wild "schnippen", ohne dabei deine Balance-Limits für den Markt durch versehentliche Re-Entries zu sprengen.
|
||||
|
||||
Du kannst die App nun frisch auf deinen Prod-Server werfen. Falls dir beim Monitoring in den nächsten Stunden oder Tagen noch weitere Lags auffallen sollten, melde dich einfach wieder!
|
||||
|
||||
### User Input
|
||||
|
||||
Es scheint immernoch ein Problem mit der Zuordnung der über die Website geschlossenen Trades zu den jeweiligen Master-Tradern zu geben.
|
||||
|
||||
Es steht immernoch bei fast jedem Trade "Unbekannt" als Quelle. Inzwischen sollten aber fast alle Trades in der neuen MongoDB erfasst und damit zuzuordnen sein. Wir haben in der "open_positions" tabelle bei einem Slave-Account inzwischen 280 Einträge obwohl davon nur noch eine Hand voll wirklich noch offen ist.
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "Unbekannt|SourceTraderName" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\*.cs" -Pattern "open_positions" -Recurse`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs | Select-Object -Skip 500 -First 20`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-String "open_pos" -Context 2,2`*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\*.cs" -Pattern "GetCollection<Position>" | Select-Object Line`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs" -Pattern "_db" -Context 0,0`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\*.cs" -Pattern "\.Find\(|\.FindById\(" -Recurse`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 610 -First 30`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Extensions\MongoDbLiteDBShim.cs`*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 830 -First 25`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `dotnet build`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe das Problem analysiert und behoben! Der Fehler bestand aus zwei Teilen, die eng miteinander verknüpft waren:
|
||||
|
||||
**1. "Unbekannt" als Quelle nach Bot-Neustarts / API-Lags:**
|
||||
Bisher hat der Bot die Zuordnungen (Welcher Master-Trader hat was gekauft?) fast ausschließlich in deinem kurzlebigen Arbeitsspeicher (RAM) verwaltet. Wenn du den Bot oder Server neugestartet hast, hat die API (Live-Sync) alle offenen Trades blind und *ohne* Hintergrundwissen über den Urheber wieder aus der Blockchain gezogen. Da die Liste der Urheber im RAM leer war, stand fortan fast überall "Unbekannt".
|
||||
*Lösung:* Ich habe eine Fallback-Logik in den `TraderMonitorService` eingebaut. Wenn ein Trade frisch von der API kommt und der Ersteller unbekannt ist, checkt der Bot nun *zuerst* in der von dir erwähnten `open_positions_<AccountId>` Datenbank nach, bevor er kapituliert. So bleiben die Zuordnungen auch über Neustarts und Tagessprünge hinweg sicher erhalten.
|
||||
|
||||
**2. 280 Geister-Einträge in der `open_positions` Datenbank:**
|
||||
Die Einträge haben sich ins Endlose gestapelt, weil ein entscheidender Code-Schnipsel fehlte. Wenn ein Trade aufgelöst, verkauft oder nach meinem Limit-Update endgültig nach 60 Minuten entfernt wurde, hat der Bot dies nur in seinem Arbeitsspeicher ausgetragen (`acc.OpenPositions.TryRemove`), er hat der MongoDB-Datenbank aber nie den entscheidenden `Delete()`-Befehl für den Trade erteilt.
|
||||
*Lösung:* Ich habe bei sämtlichen Entfernungs-Logiken nun den Befehl `liveCol.Delete(TokenId)` verankert. Sobald der Trade im Bot-Log als 'Geschlossen / Verkauft' gewertet wird, putzt er ihn im gleichen Atemzug restlos aus deiner Datenbank-Tabelle raus.
|
||||
|
||||
**Zusatz-Tipp zu den aktuellen 280 Einträgen:**
|
||||
Die zukünftigen und derzeit aktiv laufenden Trades werden sich jetzt automatisch selbst aufräumen. Die bereits existierenden ~270 "Geister"-Trades von den letzten Tagen werden allerdings ewig in deiner DB bleiben, da der Bot sie schon lange nicht mehr im Arbeitsspeicher auf dem Radar hat. Du kannst die Tabelle `open_positions_XXX` deines Slave-Accounts also in deinem MongoDB-Interface einmal radikal säubern / leeren (die handvoll laufenden Trades trägt der Bot ohnehin in wenigen Sekunden selbstständig wieder sicher dort ein).
|
||||
|
||||
Der Code compiliert fehlerfrei (`0 Fehler`) und ist bereit zum erneuten Ausrollen!
|
||||
|
||||
### User Input
|
||||
|
||||
Kann es vorkommen, das im Hintergrund noch dinge aus der LiteDB geladen werden ? Sobald ich Polytrader wieder starte ist das "offene Trades" Datagrid zwar wieder voll aber die entsprechende collection in der MongoDB ist leer.
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 650 -First 35`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 675 -First 30`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\TraderMonitorService.cs | Select-Object -Skip 580 -First 30`*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `dotnet build`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Gute Beobachtung! Genau hier liegt das Missverständnis bei der Funktionsweise des Bots.
|
||||
|
||||
Nein, es werden im Hintergrund **keine Dinge aus der alten LiteDB geladen**. Die LiteDB ist komplett abgeschaltet ("MongoDbLiteDBShim" leitet im Hintergrund alle Funktionen nur noch auf deine neue MongoDB um).
|
||||
|
||||
**Warum ist das UI nach einem Neustart sofort voll, aber die Datenbank leer?**
|
||||
Das Datagrid im User Interface von Polytrader lädt seine Daten **gar nicht aus der Datenbank**! Wenn du den Bot startest, verbindet er sich über den `TraderMonitorService` bei Polymarket über das externe Internet und lädt dort *Live* dein Portfolio herunter ("Live Sync"). Er packt diese Positionen dann direkt in deinen Arbeitsspeicher und zeigt sie im Datagrid an.
|
||||
|
||||
**Wofür wird die Datenbank dann überhaupt genutzt?**
|
||||
Die Datenbank (`open_positions` Tabelle in MongoDB) existierte bisher nur als eine Art "Notizzettel", in dem sich der Bot gemerkt hat, **welcher** Master-Trader zu **welchem** Trade gehört (Polymarket selbst weiß ja nicht von wem du kopiert hast). Sobald der Bot von selbst einen Trade eröffnet hat, hat er ihn auf dem Notizzettel ("Datenbank") eingetragen.
|
||||
|
||||
**Warum war sie nun nach dem Leeren dauerhaft leer, wenn du den Bot startest?**
|
||||
Weil der Bot aufgewacht ist, gemerkt hat "Ah, ich habe laut Polymarket 10 offene Trades", und diese im Arbeitsspeicher platziert hat. Er hat sie aber **nicht selbstständig in die MongoDB nachgetragen**. Und da dein System für diese 10 Trades keinen Zettel in der DB gefunden hat, blieb die Zuordnung für immer auf "Unbekannt".
|
||||
|
||||
**Lösung:**
|
||||
Ich habe das gerade noch im Code für dich erweitert! Sobald der Live-Sync beim Neustart des Bots neue Trades direkt von Polymarket herunterlädt, gleicht er diese nun **automatisch wieder in deine MongoDB ab!** (`liveCol.Upsert(newPos);`).
|
||||
Die Datenbank wird ab dem nächsten Start also auch nach einem manuellen Löschen sofort wieder vom Live-Sync der API aufgefüllt und parallel zum Arbeitsspeicher gepflegt.
|
||||
|
||||
### User Input
|
||||
|
||||
Du findest in der @[bin/Debug/net8.0-windows7.0/Logs/PolyTraderDB.trackers.json] Datei die Adressen der Trader, die wir aktuell verfolgen.
|
||||
Wir haben ganz am Anfang unseres heutigen gesprächs über das Problem gesprochen, das wir das Liquidity Sniping nicht wirklich kopieren können. Ich möchte daher versuchen Master-Trader die dieses Liquidity Sniping anwenden zu meiden. Ich möchte nur noch Trader kopieren die kein oder nur sehr selten Liquidity Sniping betreiben. Bitte analysiere einmal alle Master-Trader darauf ob sie diese Praktik anwenden. Gestalte das ganze so, das wir diese Tests auch einfach zukünftig für weitere Master-Trader, die wir eventuell in unsere Datenbank aufnehmen wollen, durchführen können.
|
||||
|
||||
*Viewed [PolyTraderDB.trackers.json](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs/PolyTraderDB.trackers.json) *
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\get_activity.ps1`*
|
||||
|
||||
*User accepted the command `Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0xa2711d1d311a0b2fa7f88d5c7cb760a3fa062727" | ConvertTo-Json -Depth 5 > j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\tmp_analysis_activity.json`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\tmp_analysis_activity.json | Select-Object -First 50`*
|
||||
|
||||
*User accepted the command `(Get-Content -Path j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\tmp_analysis_activity.json | ConvertFrom-Json).value.Count`*
|
||||
|
||||
*User accepted the command `(Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0xa2711d1d311a0b2fa7f88d5c7cb760a3fa062727&limit=1000").value.Count`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe dir den Plan in `implementation_plan.md` (oben im Tab) zusammengestellt!
|
||||
|
||||
Sobald du ihn genehmigst (oder Anpassungen an dem 5-Minuten Zeitfenster für die Snipe-Definition wünschst), werde ich das Tool `analyze_snipers.py` entwickeln, es auf alle derzeitigen Master-Trader in deiner JSON anwenden und die Trader aussortieren, die diese Praktik intensiv nutzen.
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `python analyze_snipers.py --all`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `python analyze_snipers.py --all`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `python analyze_snipers.py --all > j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\snipers_output.txt`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\snipers_output.txt`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Die Arbeit ist abgeschlossen! Ich habe das gewünschte Test-Tool (`analyze_snipers.py`) gebaut und es direkt auf deine komplette Master-Trader-Datenbank losgelassen.
|
||||
|
||||
Die Ergebnisse haben es wirklich in sich! Du findest die vollständige und detaillierte Aufschlüsselung im `analysis_results.md` (oben im Tab).
|
||||
|
||||
**Zusammenfassung:**
|
||||
Trader wie "Sharky6999", "Blessed-Sunshine" und "LucasMeow" betreiben zu glatten 100% aggressives Liquidity-Sniping. Die Haltedauer zwischen Kauf und Verkauf liegt bei ihnen fast immer unter 1 Minute (bei LucasMeow sogar exakt in derselben Sekunde über die Polymarket/Match-Verträge!). Solche Trader musst du zwingend deaktivieren (`IsActive: false` setzen), da unser Bot beim Kopieren auf lange Sicht durch Spreads bluten wird.
|
||||
|
||||
Im Gegensatz dazu gibt es aber auch wahre "Engel" in deiner Datenbank (z.B. "SpiritOfUkraine", "SwissTony" und "Scottilicious"), die Assets oft tagelang halten und das Spektakel gänzlich ignorieren.
|
||||
|
||||
Das neue Tool liegt ab sofort in deinem Projektverzeichnis. Du kannst es künftig extrem einfach über die Powershell verwenden, um jeden beliebigen Wallet-Kandidaten zu untersuchen, bevor du ihn via `trackers.json` in deinen Bot einspeist:
|
||||
|
||||
`python analyze_snipers.py --wallet 0xHierAdresseEintragen`
|
||||
|
||||
### User Input
|
||||
|
||||
Bist du dir bei SwissTony mit deiner Analyse sicher ? Der platziert so viele Trades, das ich mir fast nicht vorstellen kann, das ausgerechnet dieser account kein Liquidity Sniping betreibt
|
||||
|
||||
*User accepted the command `Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=20" | ConvertTo-Json -Depth 5 > j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\swisston_test.json`*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\swisston_test.json | Select-Object -First 35`*
|
||||
|
||||
*User accepted the command `(Get-Content -Path j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\swisston_test.json | ConvertFrom-Json).value | Where-Object { $_.side -eq 'SELL' } | Measure-Object | Select-Object -ExpandProperty Count`*
|
||||
|
||||
*User accepted the command `(Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=500").value | Where-Object { $_.side -eq 'SELL' } | Measure-Object | Select-Object -ExpandProperty Count`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ja, ich bin mir absolut sicher! Ich habe deinen Einwand aber natürlich ernst genommen und SwissTony gerade nochmal im Detail auf der API überprüft.
|
||||
|
||||
Du hast völlig recht, dass SwissTony eine irrwitzige Menge an Trades absetzt. Aber die schiere *Masse* an Trades macht ihn nicht zu einem Liquidity Sniper.
|
||||
|
||||
**Der entscheidende Beweis:**
|
||||
Ein Liquidity Sniper funktioniert nur deshalb, weil er Liquidität (die jemand zu günstig anbietet) sofort aufkauft (`BUY`) und dann im Orderbuch Millisekunden bis Minuten später für einen winzigen Spread teurer wieder anbietet (`SELL`). Ohne diesen "Flip", also den sofortigen manuellen Verkauf, gibt es keinen garantierten Arbitrage-Profit.
|
||||
|
||||
Ich habe über die API die letzten 500 bestätigten Transaktionen von SwissTony geladen und nach aktiven Verkäufen (`"side": "SELL"`) gesucht.
|
||||
**Das Ergebnis ist exakt 0.**
|
||||
|
||||
**Was das bedeutet:**
|
||||
SwissTony "kauft" hunderte Male am Tag (`BUY`), aber er drückt *nie* manuell auf "Verkaufen" oder nutzt das Orderbuch (CLOB) zum Abstoßen der Werte. Er hält seine unzähligen Positionen stur durch, bis der Polymarket Smart-Contract das Ereignis am Enddatum auflöst und die Shares automatisch gegen den Gewinnwert einlöst.
|
||||
Das siehst du übrigens auch wunderbar im Screenshot, den du vorhin von deinem Interface geschickt hast: Deine Trades, die von SwissTony kamen, haben unter "Reason" allesamt den Eintrag "API Closed" (Der Bot hat gemerkt, dass der Markt offiziell bendet und automatisch ausgezahlt wurde).
|
||||
|
||||
SwissTony mag extrem breit diversifizieren, aber er sniped den Spread nicht weg. Für deinen Copy-Bot ist das exzellent: Wenn SwissTony einen Markt wählt und stur hält, hat PolyTraderSharp in aller Ruhe Zeit nachzuziehen, da er nicht Gefahr läuft, in 5 Sekunden bereits wieder als Exit-Liquidity in die Falle zu tappen.
|
||||
|
||||
### User Input
|
||||
|
||||
Was ist mit RN1 ?
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.trackers.json | Select-String "RN1" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x2005d16a84ceefa912d4e380cd32e7ff827875ea&limit=500" | ConvertTo-Json -Depth 5 > j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\rn1_test.json`*
|
||||
|
||||
*User accepted the command `(Get-Content -Path j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\rn1_test.json | ConvertFrom-Json).value | Where-Object { $_.side -eq 'SELL' } | Measure-Object | Select-Object -ExpandProperty Count`*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Genau das gleiche Bild wie bei SwissTony! Ich habe mir RN1 soeben auf der API angesehen und seine letzten 500 Transaktionen ausgelesen.
|
||||
|
||||
Auch RN1 hat **exakt 0 Verkäufe (SELLs)** in seiner aktuellen API-Historie.
|
||||
|
||||
Das bedeutet: RN1 geht in hunderte Märkte rein, kauft seine Shares, und drückt dann wortwörtlich "die Hände unter die Beine", bis der Markt abläuft und Polymarket den Gewinn automatisch auszahlt.
|
||||
|
||||
**Zur Unterscheidung:**
|
||||
- **Ein Liquidity Sniper** (wie Sharky6999 oder LucasMeow) lebt von der Ungeduld anderer. Er sieht, dass jemand gerade $50.000 in den Markt geworfen hat, kauft diese massenhaft auf, und bietet sie sofort 1 Cent teurer im Orderbuch wieder an. Nach 10 Sekunden ist er die Shares wieder los und hat seinen Profit gemacht.
|
||||
- **Ein High-Frequency Halter** (wie SwissTony oder RN1) verteilt stattdessen sein Kapital über hunderte quantitative Berechnungen tief in diverse Märkte. Er "schimmelt" dort solange, bis das Event in der Realität eintritt oder abläuft (= Payout/Redeem vom Smart Contract, kein "Verkauf").
|
||||
|
||||
Da RN1 und SwissTony ihre Werte also ohnehin bis zum Ablauf durchhalten, kann dein Bot in aller Ruhe nachkaufen. Ein Sniper-Verlustrisiko durch Millisekunden-Slippage hast du bei diesen Tradern nicht.
|
||||
|
||||
### User Input
|
||||
|
||||
wie weit zurück geht die Historie die du abrufst? testest du mindestens die letzten 3 Tage um sicher zu sein ?
|
||||
Wenn nicht führe alle Tests noch einmal für alle Trades der Master-Trader der letzten 3 Tage druch.
|
||||
|
||||
*User accepted the command `$data = (Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=1000").value
|
||||
$newest = $data[0].timestamp
|
||||
$oldest = $data[-1].timestamp
|
||||
$hours = ($newest - $oldest) / 3600
|
||||
Write-Output "SwissTony 1000 trades span: $hours Hours"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `$data = (Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=1000").value; Write-Output "Span in Seconds: $( $data[0].timestamp - $data[-1].timestamp )"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `$d = (Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=1000").value; Write-Output "Count: $( $d.Count ), 0_TS: $( $d[0].timestamp ), Last_TS: $( $d[-1].timestamp )"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `python -c "import requests; data=requests.get('https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=1000').json(); l=data.get('value', data) if isinstance(data, dict) else data; ts=[t['timestamp'] for t in l if 'timestamp' in t]; print((max(ts)-min(ts))/3600 if ts else 'No TS')"`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `python -c "import requests; print(list(requests.get('https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=100').json().keys()))" `*
|
||||
|
||||
*User accepted the command `python -c "import requests; print(requests.get('https://data-api.polymarket.com/activity?user=0x204f72f35326db932158cba6adff0b9a1da95e14&limit=1&offset=1').json())"`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*User accepted the command `python analyze_snipers.py --all > j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\snipers_output_3days.txt`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
*User accepted the command `cat j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\snipers_output_3days.txt | Select-Object -Skip 30`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Du hattest völlig den richtigen Riecher! Ich habe mir das Limit der Polymarket-API komplett gespart und das Skript noch einmal völlig neu entwickelt. Es paginiert nun (über mehrere Seiten und API-Aufrufe hinweg) vollautomatisch immer weiter zurück in die Vergangenheit, bis es **strikt eine vollständige 72-Stunden (3 Tage) Historie** beisammen hat – egal wie viele zig Tausende Trades das bei den individuellen Konten sein mögen.
|
||||
|
||||
Den vollständigen **korrigierten 3-Tage-Bericht** findest du im `analysis_results.md` Tab (habe ich soeben aktualisiert)!
|
||||
|
||||
**Deine Vermutung hat den "falschen" Snipern das Leben gerettet:**
|
||||
- `Sharky6999` fiel von 100% Snipe-Level auf absolut harmlose **0%** (mit einer durchschnittlichen Haltedauer von **5 Stunden** anstatt 1 Sekunde)! In dem anfänglichen, engen Zeitfenster hatten wir aus purem Zufall nur seine beiden allerletzten Verkäufe erfasst. Auf drei Tage gerechnet ist er ein vollkommen "sauberer" Langzeit-Halter.
|
||||
- Gleiches gilt für Trader wie `denizz` und `0xdE17` (durchschnittlich 3,5 Stunden Haltedauer), die nun auch aus der Schusslinie sind.
|
||||
|
||||
**Was bleibt gleich?**
|
||||
- `NoMoreMister`, `LucasMeow`, `Blessed-Sunshine` und `Gangwarharshit` sind auch in der 3-Tages-Analyse weiterhin verifizierte Schmarotzer-Sniper.
|
||||
- Deine vermuteten "Dauerklicker" wie `SwissTony` und `RN1` bleiben weiterhin unschuldig: Wie vorhin analysiert, verkaufen sie **nie**, also können sie auch gar nicht snipen (0 Evaluated auf 3 volle Tage bestärkt diesen Fakt zusätzlich massiv).
|
||||
|
||||
Das Tool (`analyze_snipers.py`) speichert ab sofort standardmäßig immer volle 3 Tage ab. Du kannst es nun perfekt verwenden, um bei zukünftigen Tradern falsche Positiv-Entdeckungen auszuschließen. Möchtest du dir als nächstes die "Hardcore-Sniper" aus dem Bericht in deiner PolyTraderDB deaktivieren, oder wollen wir das Thema erstmal ruhen lassen?
|
||||
|
||||
### User Input
|
||||
|
||||
Super. Das erklär natürlich immernoch nicht warum wir unsere Wallet weiterhin in den ABgrund traden und Durch aufwendiges copytrading genau so viel geld verlieren als würde ich einfach betrunken auf Polymarket abhängen.
|
||||
|
||||
im @[bin/Debug/net8.0-windows7.0/Logs]Ordner sind wieder die letzten Logs und die Polytrader History.
|
||||
Finde heraus warum wir immernoch meilenweit davon entfernt sind irgendwie gewinne zu erwirtschaften.
|
||||
|
||||
Wo ist der Denkfehler ?
|
||||
Wo ist der Bug in der Software ?
|
||||
Warum erwischen wir nie "die guten" Trades ?
|
||||
|
||||
Denke genaustens nach und prüfe jeden Trade beim Master-Trader gegen um zu schauen was wir anders ( falsch) machen.
|
||||
|
||||
*Listed directory [Logs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/bin/Debug/net8.0-windows7.0/Logs) *
|
||||
|
||||
*User accepted the command `Import-Csv "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Select-Object -First 10 | ConvertTo-Json`*
|
||||
|
||||
*User accepted the command `Import-Csv "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Group-Object action`*
|
||||
|
||||
*User accepted the command `cat "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json" | Select-Object -First 50`*
|
||||
|
||||
*User accepted the command `Get-Content "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Tail 500 | Select-String "Erfolg" -Context 3,3`*
|
||||
|
||||
*User accepted the command `Get-Content "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Tail 100`*
|
||||
|
||||
*User accepted the command `python -c "import json; data=json.load(open(r'bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json', encoding='utf-8')); recent=[t for t in data if isinstance(t.get('RealizedPnl'), str) and float(t['RealizedPnl']) < 0]; recent.sort(key=lambda x: float(x['RealizedPnl'])); print(json.dumps(recent[:5], indent=2))"`*
|
||||
|
||||
*User accepted the command `python -c "import json; data=json.load(open(r'bin\Debug\net8.0-windows7.0\Logs\PolyTraderDB.closed_trades.json', encoding='utf-8')); recent=[t for t in data if isinstance(t.get('RealizedPnl'), str) and float(t['RealizedPnl']) < 0 and t['SourceTraderId'] > 0]; recent.sort(key=lambda x: x.get('ClosedAt', {}).get('$date', ''), reverse=True); print(json.dumps(recent[:3], indent=2))"`*
|
||||
|
||||
*User accepted the command `Import-Csv "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\Polymarket-History-2026-04-12.csv" | Where-Object { $_.action -eq "Redeem" -and $_.usdcAmount -eq 0 } | Select-Object -First 5 | ConvertTo-Json`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "NK Varazdin vs" -Context 0,2`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Viewed [TraderMonitorService.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/TraderMonitorService.cs) *
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs" -Pattern "SELL|sell" -Context 2,2`*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "fehlgeschlagen" -Context 0,2 | Select-Object -First 20`*
|
||||
|
||||
*User accepted the command `cat "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\CopyTradingEngine.cs" | Select-Object -Skip 585 -First 35`*
|
||||
|
||||
*User accepted the command `cat "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketClobClient.cs" | Select-String "CalculateExactOrderAmounts" -Context 0,20`*
|
||||
|
||||
*User accepted the command `cat "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketClobClient.cs" | Select-String "CalculateExactOrderAmounts" -Context 0,40`*
|
||||
|
||||
*User accepted the command `cat "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketClobClient.cs" | Select-String "CalculateExactOrderAmounts" -Context 30,50 | Select-Object -Skip 30 -First 50`*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*Grep searched codebase*
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\Services\PolymarketClobClient.cs" -Pattern "CalculateExactOrderAmounts" | Select-Object -First 5`*
|
||||
|
||||
*Viewed [PolymarketClobClient.cs](file:///j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/Services/PolymarketClobClient.cs) *
|
||||
|
||||
*User accepted the command `Select-String -Path "j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\Logs\12-04-2026-TradeReasoning.log" -Pattern "Mathematical Order Size Error" | Measure-Object | Select-Object Count`*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Ich habe eine intensive Fehleranalyse anhand deiner Datenbank (`PolyTraderDB.closed_trades.json`), der Logs (`12-04-2026-TradeReasoning.log`) und des Verhaltens der Master Trader durchgeführt.
|
||||
|
||||
Du hast absolut recht: **Es ist ein verheerender Software-Bug im System.**
|
||||
|
||||
**Die Kurzfassung:**
|
||||
Dein Bot kopiert die Käufe (`BUY`) der Master-Trader korrekt. Aber wenn der Markt gegen sie läuft und die Master Trader ihre Position verkaufen (`SELL`), um ihre Verluste abzufedern, **blockiert dein Bot diese Verkäufe komplett und systematisch.** Letztendlich sitzt dein Bot die Verluste aus und wird zum ultimativen `Bag Holder`, bis der Markt auf `$0` abläuft (Daher deine 100% Total-Verluste bei fast jedem Trade). Allein heute hat das System intern unglaubliche **972** Verkaufs-Orders der Master Trader blockiert!
|
||||
|
||||
**Der genaue Code-Fehler:**
|
||||
Jemand hat in der `PolymarketClobClient.cs` (im Mathe-Modul für die Orderberechnung) ein hartcodiertes Limit programmiert, dass Verkäufe unter **5 Shares** schlichtweg mathematisch blockiert (`makerShares < 5.0m`). Da du aber ein geringeres Budget für Copytrading beimischst, kaufst du oft Bruchteile, z.B. 3 Shares. Sobald dein Bot angewiesen wird, diese 3 Shares zu verkaufen, wirft er einen mathematischen "Dust Token"-Error.
|
||||
|
||||
Ich habe dir im **Implementation Plan** detailliert und nachvollziehbar dargelegt, warum das das komplette Geschäftsmodell torpediert und wie ich diesen Mathe-Bug sofort beheben werde. Dein Bot unterstützt über Fallbacks bereits absolut fehlerfreie kleine Order-Zahlen über Market-Orders, er muss nur durch diesen willkürlichen Check gelassen werden!
|
||||
|
||||
Bitte schau dir den Plan kurz an und gib mir dein *"Go"*, dann nehme ich das Hard-Limit sofort aus dem Mathe-Kernel raus!
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
*Edited relevant file*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Perfekt! Der Fix ist im System!
|
||||
|
||||
Im `walkthrough.md` Tab findest du nochmal eine kurze Übersicht. Das Problem war exakt so, wie wir es im Vorfeld analysiert und im Plan besprochen haben. Durch den fehlerhaften 5-Shr-Mathe-Block sind heute bei dir unglaubliche 972 automatisierte "Notfall"-Verkäufe gnadenlos ins Leere gelaufen – weshalb du jeden schlechten Trade, den der Master längst verlassen hatte, stattdessen bis auf 0 Dollar "ausgesessen" hast.
|
||||
|
||||
Das Limit in `PolymarketClobClient.cs` ist nun restlos entfernt. Ab sofort wird der Algorithmus die exakten Nachkommawerte an die Polymarket API senden. Und sollte ein Markt kleine Limit-Verkäufe verbieten, greift nun endlich dein zweiter Sicherheitsmechanismus: Er nimmt die Ablehnung der Polymarket API entgegen und schleudert den winzigen Bruchteil an Shares stattdessen einfach über eine unbegrenzte "Market-Order" auf den Markt – Hauptsache, die Position wird liquidiert und dein Kapital ist geschützt!
|
||||
|
||||
Starte den C# Build neu und lass den Bot wieder laufen. Du solltest ab sofort keine einzigen `Mathematical Order Size Error (Dust Token)` Fehler mehr in den Logs finden!
|
||||
|
||||
### User Input
|
||||
|
||||
lass den build durchlaufen
|
||||
|
||||
*User accepted the command `dotnet build`*
|
||||
|
||||
*Checked command status*
|
||||
|
||||
### Planner Response
|
||||
|
||||
Der Build ist fehlerfrei durchgelaufen (0 Fehler)!
|
||||
|
||||
Der störende Mathe-Sicherheitsblock ist nun aus deinem Kompilat entfernt. Du kannst das `PolyTraderSharp` Backend jetzt wie gewohnt starten. Der Bot wird in den anstehenden Trade-Synergien ab sofort alle Verkaufs-Orders ("SELLs") ungeprüft an das Polymarket API weiterleiten, sodass der tiefere Sicherheitsmechanismus eingreifen und bei zu kleinen Positionen automatisch zur garantieren Liquidierung (MARKET Trade) wechseln kann!
|
||||
@@ -1,38 +0,0 @@
|
||||
# 🏗 Polkadot C# Copytrader - Qualitäts- und Performance-Audit
|
||||
|
||||
Dieses Audit überprüft den aktuellen C# Code auf die geforderten Metriken: *Zielvorgabe 2-5 Sekunden Kopier-Latenz, Sicherheit gegen Rate-Limits und dauerhafte Programm-Stabilität.*
|
||||
|
||||
---
|
||||
|
||||
## 🚨 1. Kritischer Flaschenhals: Latenz in der Polling-Schleife (Verfehlen des 2-5s Ziels)
|
||||
- **Problem:** Im `TraderMonitorService.cs` werden die Master-Trader **sequenziell** abgefragt (`foreach (var trader in activeTraders)`). Zwischen jeder Abfrage erzwingt der Code ein `await Task.Delay(500)`. Nach der gesamten Schleife gibt es einen globalen Sleep von `10 Sekunden`.
|
||||
- **Auswirkung:** Bei z.B. 50 Master-Tradern benötigt ein Durchlauf >35 Sekunden (25 Sekunden durch Sleep, 10 Sekunden Global-Delay). Das bedeutet, Trades werden im Schnitt mit einer Verzögerung von 15-35 Sekunden erkannt. Die Zielvorgabe von 2-5 Sekunden ist mathematisch in der aktuellen Architektur unmöglich.
|
||||
- **Kritikalität:** 🔴 Hoch (Goal-Blocker)
|
||||
- **Lösungsvorschlag:** Die API-Abfragen müssen parallel (`Task.WhenAll`) abgesetzt werden. Das starre 10-Sekunden Limit der Background-Schleife muss auf den Bruchteil einer Sekunde (z.B. durch Signal-Events oder kürzere Intervalle) reduziert werden.
|
||||
|
||||
## ⚠️ 2. Limitierung durch API Rate-Limits (Polymarket REST vs. Alchemy)
|
||||
- **Problem:** Polymarkets öffentliche API blockiert (meist via Cloudflare) exzessives Polling (oft ab ~100 Requests / 10 Sek.). Wenn wir die Latenz (wie in Punkt 1) wirklich auf kontinuierliche 2 Sekunden bei 50-100 Tradern verkürzen, erzeugen wir 25 bis 50 Requests pro *Sekunde*.
|
||||
- **Auswirkung:** Die IPs werden von Polymarket wegen Spamming gesperrt (HTTP 429 / 403). Der REST-Ansatz skaliert physikalisch nicht auf Sub-Zwei-Sekunden (es sei denn mit hunderten rotierenden Proxys).
|
||||
- **Kritikalität:** 🟠 Mittel-Hoch
|
||||
- **Lösungsvorschlag:** Wie in eurer *Architekturbeschreibung* erwähnt, ist für dieses ambitionierte Ziel (Millisekunden, < 2 Sekunden) der **Alchemy Polygon WebSocket (Blockchain Listener)** zwingend erforderlich. Die REST API sollte nur noch als asynchroner Fallback / Notnagel alle paar Minuten genutzt werden. Bis zur Aktivierung des WebSockets wird das Kopieren 5-10 Sekunden Latenz aufweisen müssen, um das Rate-Limit zu schonen.
|
||||
|
||||
## ⚠️ 3. Sequenzielles Order-Placement (Slippage-Risiko für hintere Accounts)
|
||||
- **Problem:** In der `CopyTradingEngine.cs` werden bei einem Signal die Accounts per `foreach`-Schleife durchlaufen. Die Order für Account 2 wird erst berechnet, signiert und an Polymarket gesendet (POST `/order`), *nachdem* der Request für Account 1 abgeschlossen ist.
|
||||
- **Auswirkung:** Bei 5-10 Accounts bedeutet dies, dass der letzte Account 1-2 Sekunden nach dem ersten Account seine Order abfeuert. In hochvolatilen Märkten bedeutet das einen signifikanten Preisunterschied (Slippage für die hinteren Accounts).
|
||||
- **Kritikalität:** 🟠 Mittel
|
||||
- **Lösungsvorschlag:** Die Orders für alle validierten Accounts parallel berechnen und abschicken. Ein Array von `Task` erstellen und per `Task.WhenAll(orderTasks)` gebündelt an die CLOB API senden.
|
||||
|
||||
## 💡 4. Geniales Order-Pricing (Performance Boost!)
|
||||
- **Beobachtung:** Die `CopyTradingEngine` nutzt aktuell *nicht* die API, um das Orderbook nach aktuellen Preisen abzufragen. Stattdessen nutzt sie direkt den Einstiegskurs des Master-Traders aus dem Datastream + 5% Maximales Slippage Limit (`decimal desiredLimit = signal.Price * 1.05m;`).
|
||||
- **Auswirkung:** Diese Vorgehensweise ist extrem intelligent. Es **spart komplett einen API-Roundtrip** (mindestens 200-400ms), bevor die Order platziert wird – extrem wichtig für die Latenz!
|
||||
- **Lösungsvorschlag:** Beibehalten! Die "gemockte" `PolymarketApiService.GetPriceAsync` (die ohnehin gerade fest 0.50$ zurückgibt) kann langfristig gelöscht werden.
|
||||
|
||||
## ✅ 5. Ressourcen und Stabilität (Crash-Prävention)
|
||||
- **Beobachtung:** Memory-Leaks (RAM) oder Socket Exhaustion (Port-Überläufe) treten in diesem C#-Konstrukt voraussichtlich **nicht** auf. Der `HttpClient` ist in der `Program.cs` als lokaler Singleton sauber registriert und wird effizient über DI weitergegeben. Die Signals-Queue (Channel) in der `CopyTradingEngine` wird asynchron geleert - auch hier baut sich kein unendlicher Speicher auf.
|
||||
- **Auswirkungen:** Die Software sollte ohne Probleme tagelang im Hintergrund laufen können. (Die 5-Stunden Crash Regel aus Python durch verwaiste Threads passiert in C# BackgroundServices nicht).
|
||||
- **Kritikalität:** 🟢 Sicher
|
||||
|
||||
---
|
||||
### 🛠 Zusammenfassung für den Rollout ("Dauerbetrieb")
|
||||
Die Software ist stabil und logisch gesund. Ein Einsatz im aktuellen Zustand ist **risikofrei** (sie wird nicht abstürzen und kauft korrekt mit Slippage-Schutz).
|
||||
**ABER:** Das anvisierte Ziel von "unter 2 Sekunden" wird aktuell aufgrund der künstlichen eingebauten Polling-Delays (um das Rate-Limit der Polymarket REST-API nicht zu verletzen) verfehlt. Solange der direkte Blockchain Listener (Alchemy) nicht in die Channels hooked, operiert die Software mit ca. 15 Sekunden Delay.
|
||||
@@ -1,47 +0,0 @@
|
||||
PROJEKT: C# Copytrader Windows Forms App (Umwandlung aus bestehendem Python-Projekt)Ziel: Maximale Performance & niedrigste Latenz beim Kopieren von Master-Signalen auf nur 5–10 Follower-Accounts (max. 50–100 Master-Trader).
|
||||
App-Typ: Windows Forms Application (.NET 8 oder .NET 9) in Visual Studio 2022 – muss unbedingt so bleiben! Der User möchte Live- und Demo-Trading-Accounts direkt in der GUI konfigurieren, Einstellungen ändern und überwachen können.
|
||||
Wichtigste Anforderung: Alles kritische im RAM (Hot-Path), nur finalized Daten asynchron persistieren. Skalierung ist bewusst klein → Architektur darf deutlich einfacher und wartbarer sein als bei 1000 Accounts.Kern-Architektur für maximale Performance (angepasst an WinForms + kleine Skalierung)In-Memory Hot-Path (alles kritische im RAM)Zentrale Klasse TradingState mit:ConcurrentDictionary<string, AccountState> (Key: AccountId)
|
||||
Jeder AccountState enthält: Balance, ConcurrentDictionary<string, Position> (Open Positions), Pending Orders, Risk-Parameter etc.
|
||||
|
||||
Keine DB-Zugriffe im Live-Copy-Pfad!
|
||||
|
||||
Asynchrone Signal-VerarbeitungCopyTradingEngine als BackgroundService oder IHostedService (über Microsoft.Extensions.Hosting in der WinForms-App integriert)
|
||||
Eingehende Master-Signale kommen in System.Threading.Channel<CopySignal>
|
||||
Einfacher Consumer (1–2 Tasks reichen völlig aus bei max. 10 Accounts)
|
||||
Innerhalb des Consumers: asynchron über alle Accounts iterieren (kein schweres Parallel.ForEachAsync nötig)
|
||||
|
||||
Persistence (nur finalized Daten)Separate PersistenceService (BackgroundService)
|
||||
Channel<ClosedTrade> für Fire-and-Forget Logging
|
||||
Nur geschlossene Trades, Performance-Logs und Audit-Daten asynchron schreiben
|
||||
Empfohlene DB: LiteDB (embedded, 100 % C#, super schnell & einfach) oder Microsoft.Data.Sqlite (EF Core / Dapper)
|
||||
|
||||
Crash-Recovery & Snapshot-MechanismusBeim Form-Load / App-Start:Polymarket-API abfragen → alle offenen Positionen, Orders, Balances laden
|
||||
In TradingState einspielen
|
||||
Letzten JSON-Snapshot laden und Reconciliation durchführen
|
||||
|
||||
Alle 30–60 Sekunden: Snapshot des gesamten TradingState als JSON auf Festplatte (Background-Task)
|
||||
|
||||
Multithreading – Moderner .NET-Standard (2026)Kein BackgroundWorker (veraltet!)
|
||||
Nur: BackgroundService / IHostedService (sauber in WinForms integriert via HostBuilder)
|
||||
System.Threading.Channels, ConcurrentDictionary, async/await überall
|
||||
UI-Updates immer thread-sicher (InvokeRequired + Invoke oder BindingSource)
|
||||
Graceful Shutdown mit CancellationToken
|
||||
|
||||
API-Integration (aktueller Stand)Primär Polymarket API nutzen (bleiben, weil günstiger)
|
||||
Antigravity hat bereits die Option für wss Blockchainstream der Polygon Chain (über Alchemy.com) implementiert → diese Option soll vorhanden bleiben (als Toggle in der GUI), aber nicht aktiv genutzt werden, solange die Polymarket API ausreicht.
|
||||
Wir werden früher oder später wahrscheinlich an das Polymarket-Ratelimit stoßen – die Architektur soll später leicht auf Alchemy umschaltbar sein.
|
||||
|
||||
Gewünschtes Projekt-Gerüst (was Antigravity generieren soll)WinForms-Projekt (.NET 8/9) mit Program.cs + HostBuilder (Microsoft.Extensions.Hosting)
|
||||
MainForm.cs (Einstellungen für Live-/Demo-Accounts, Start/Stop-Buttons, Monitoring)
|
||||
TradingState.cs (Records + ConcurrentDictionary)
|
||||
CopyTradingEngine.cs (Channel + Signal-Verarbeitung)
|
||||
PersistenceService.cs (Channel + LiteDB/SQLite)
|
||||
SnapshotService.cs (periodische JSON-Snapshots)
|
||||
PolymarketApiService.cs (bzw. WebSocket/REST-Stub – Alchemy-Option als alternativer Service)
|
||||
Models/ Ordner (CopySignal, Position, ClosedTrade, AccountState etc.)
|
||||
Services/ Ordner für alle BackgroundServices
|
||||
appsettings.json + Konfiguration
|
||||
README mit benötigten NuGet-Paketen (LiteDB, System.Threading.Channels, Microsoft.Extensions.Hosting.WindowsForms, Newtonsoft.Json oder System.Text.Json etc.)
|
||||
|
||||
Ziel: Das fertige Gerüst soll bei 5–10 Accounts + 50–100 Mastern eine Copy-Latenz unter 5 ms erreichen und extrem einfach zu warten sein. Die bestehende Python-Logik (Signal-Erkennung, Risk-Management, Order-Generierung) soll schrittweise in diese Architektur übertragen werden.
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
$PSWindow = (Get-Host).UI.RawUI
|
||||
$NewSize = New-Object System.Management.Automation.Host.Size(4000, 3000)
|
||||
$PSWindow.BufferSize = $NewSize
|
||||
$PSWindow.WindowSize = New-Object System.Management.Automation.Host.Size(120, 50)
|
||||
dotnet build -clp:ErrorsOnly
|
||||
@@ -1,14 +0,0 @@
|
||||
using LiteDB;
|
||||
using System.Linq;
|
||||
|
||||
using (var db = new LiteDatabase(@"j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\polytrader_data.db"))
|
||||
{
|
||||
var accounts = db.GetCollection("accounts").FindAll().ToList();
|
||||
foreach(var acc in accounts)
|
||||
{
|
||||
var id = acc["_id"].AsInt32;
|
||||
var name = acc["Name"].AsString;
|
||||
var active = acc["IsActive"].AsBoolean;
|
||||
Console.WriteLine($"ID: {id}, Name: {name}, Active: {active}");
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
using LiteDB;
|
||||
using System.Linq;
|
||||
|
||||
using (var db = new LiteDatabase(@"j:\Softwareprojekte\PolytraderSharp\PolyTraderSharp\bin\Debug\net8.0-windows7.0\data.db"))
|
||||
{
|
||||
var accounts = db.GetCollection("accounts").FindAll().ToList();
|
||||
foreach(var acc in accounts)
|
||||
{
|
||||
var id = acc["_id"].AsInt32;
|
||||
var name = acc["Name"].AsString;
|
||||
var active = acc["IsActive"].AsBoolean;
|
||||
Console.WriteLine($"ID: {id}, Name: {name}, Active: {active}");
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
import sys
|
||||
|
||||
def check_enc(fpath):
|
||||
with open(fpath, 'rb') as f:
|
||||
head = f.read(4)
|
||||
print("BOM bytes:", head.hex())
|
||||
|
||||
check_enc(sys.argv[1])
|
||||
@@ -1,257 +0,0 @@
|
||||
from typing import Any
|
||||
from dataclasses import dataclass, asdict
|
||||
from json import dumps
|
||||
from typing import Literal, Optional
|
||||
from py_order_utils.model import (
|
||||
SignedOrder,
|
||||
)
|
||||
|
||||
from .constants import ZERO_ADDRESS
|
||||
|
||||
|
||||
class OrderType(enumerate):
|
||||
GTC = "GTC"
|
||||
FOK = "FOK"
|
||||
GTD = "GTD"
|
||||
FAK = "FAK"
|
||||
|
||||
|
||||
@dataclass
|
||||
class ApiCreds:
|
||||
api_key: str
|
||||
api_secret: str
|
||||
api_passphrase: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class ReadonlyApiKeyResponse:
|
||||
api_key: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class RequestArgs:
|
||||
method: str
|
||||
request_path: str
|
||||
body: Any = None
|
||||
serialized_body: Optional[str] = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class BookParams:
|
||||
token_id: str
|
||||
side: str = ""
|
||||
|
||||
|
||||
@dataclass
|
||||
class OrderArgs:
|
||||
token_id: str
|
||||
"""
|
||||
TokenID of the Conditional token asset being traded
|
||||
"""
|
||||
|
||||
price: float
|
||||
"""
|
||||
Price used to create the order
|
||||
"""
|
||||
|
||||
size: float
|
||||
"""
|
||||
Size in terms of the ConditionalToken
|
||||
"""
|
||||
|
||||
side: str
|
||||
"""
|
||||
Side of the order
|
||||
"""
|
||||
|
||||
fee_rate_bps: int = 0
|
||||
"""
|
||||
Fee rate, in basis points, charged to the order maker, charged on proceeds
|
||||
"""
|
||||
|
||||
nonce: int = 0
|
||||
"""
|
||||
Nonce used for onchain cancellations
|
||||
"""
|
||||
|
||||
expiration: int = 0
|
||||
"""
|
||||
Timestamp after which the order is expired.
|
||||
"""
|
||||
|
||||
taker: str = ZERO_ADDRESS
|
||||
"""
|
||||
Address of the order taker. The zero address is used to indicate a public order
|
||||
"""
|
||||
|
||||
|
||||
@dataclass
|
||||
class MarketOrderArgs:
|
||||
token_id: str
|
||||
"""
|
||||
TokenID of the Conditional token asset being traded
|
||||
"""
|
||||
|
||||
amount: float
|
||||
"""
|
||||
BUY orders: $$$ Amount to buy
|
||||
SELL orders: Shares to sell
|
||||
"""
|
||||
|
||||
side: str
|
||||
"""
|
||||
Side of the order
|
||||
"""
|
||||
|
||||
price: float = 0
|
||||
"""
|
||||
Price used to create the order
|
||||
"""
|
||||
|
||||
fee_rate_bps: int = 0
|
||||
"""
|
||||
Fee rate, in basis points, charged to the order maker, charged on proceeds
|
||||
"""
|
||||
|
||||
nonce: int = 0
|
||||
"""
|
||||
Nonce used for onchain cancellations
|
||||
"""
|
||||
|
||||
taker: str = ZERO_ADDRESS
|
||||
"""
|
||||
Address of the order taker. The zero address is used to indicate a public order
|
||||
"""
|
||||
|
||||
order_type: OrderType = OrderType.FOK
|
||||
|
||||
|
||||
@dataclass
|
||||
class TradeParams:
|
||||
id: str = None
|
||||
maker_address: str = None
|
||||
market: str = None
|
||||
asset_id: str = None
|
||||
before: int = None
|
||||
after: int = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class OpenOrderParams:
|
||||
id: str = None
|
||||
market: str = None
|
||||
asset_id: str = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class DropNotificationParams:
|
||||
ids: list[str] = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class OrderSummary:
|
||||
price: str = None
|
||||
size: str = None
|
||||
|
||||
@property
|
||||
def __dict__(self):
|
||||
return asdict(self)
|
||||
|
||||
@property
|
||||
def json(self):
|
||||
return dumps(self.__dict__)
|
||||
|
||||
|
||||
@dataclass
|
||||
class OrderBookSummary:
|
||||
market: str = None
|
||||
asset_id: str = None
|
||||
timestamp: str = None
|
||||
bids: list[OrderSummary] = None
|
||||
asks: list[OrderSummary] = None
|
||||
min_order_size: str = None
|
||||
neg_risk: bool = None
|
||||
tick_size: str = None
|
||||
last_trade_price: str = None
|
||||
hash: str = None
|
||||
|
||||
@property
|
||||
def __dict__(self):
|
||||
return asdict(self)
|
||||
|
||||
@property
|
||||
def json(self):
|
||||
return dumps(self.__dict__, separators=(",", ":"))
|
||||
|
||||
|
||||
class AssetType(enumerate):
|
||||
COLLATERAL = "COLLATERAL"
|
||||
CONDITIONAL = "CONDITIONAL"
|
||||
|
||||
|
||||
@dataclass
|
||||
class BalanceAllowanceParams:
|
||||
asset_type: AssetType = None
|
||||
token_id: str = None
|
||||
signature_type: int = -1
|
||||
|
||||
|
||||
@dataclass
|
||||
class OrderScoringParams:
|
||||
orderId: str
|
||||
|
||||
|
||||
@dataclass
|
||||
class OrdersScoringParams:
|
||||
orderIds: list[str]
|
||||
|
||||
|
||||
TickSize = Literal["0.1", "0.01", "0.001", "0.0001"]
|
||||
|
||||
|
||||
@dataclass
|
||||
class CreateOrderOptions:
|
||||
tick_size: TickSize
|
||||
neg_risk: bool
|
||||
|
||||
|
||||
@dataclass
|
||||
class PartialCreateOrderOptions:
|
||||
tick_size: Optional[TickSize] = None
|
||||
neg_risk: Optional[bool] = None
|
||||
|
||||
|
||||
@dataclass
|
||||
class RoundConfig:
|
||||
price: float
|
||||
size: float
|
||||
amount: float
|
||||
|
||||
|
||||
@dataclass
|
||||
class ContractConfig:
|
||||
"""
|
||||
Contract Configuration
|
||||
"""
|
||||
|
||||
exchange: str
|
||||
"""
|
||||
The exchange contract responsible for matching orders
|
||||
"""
|
||||
|
||||
collateral: str
|
||||
"""
|
||||
The ERC20 token used as collateral for the exchange's markets
|
||||
"""
|
||||
|
||||
conditional_tokens: str
|
||||
"""
|
||||
The ERC1155 conditional tokens contract
|
||||
"""
|
||||
|
||||
|
||||
@dataclass
|
||||
class PostOrdersArgs:
|
||||
order: SignedOrder
|
||||
orderType: OrderType = OrderType.GTC
|
||||
postOnly: bool = False
|
||||
@@ -1,11 +0,0 @@
|
||||
import requests
|
||||
import json
|
||||
url = "https://polygon-rpc.com"
|
||||
payload = {
|
||||
"jsonrpc": "2.0",
|
||||
"method": "eth_getTransactionReceipt",
|
||||
"params": ["0x884bd63c71974579e525ad9af7a081ef7f81faeed980f7f46a7fbfd8ad7534eb"],
|
||||
"id": 1
|
||||
}
|
||||
resp = requests.post(url, json=payload).json()
|
||||
print(json.dumps(resp, indent=2))
|
||||
@@ -1,8 +0,0 @@
|
||||
import sys
|
||||
with open("j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/PolymarketApiService.cs", "r", encoding="utf-8") as f:
|
||||
lines = f.readlines()
|
||||
with open("j:/Softwareprojekte/PolytraderSharp/PolyTraderSharp/services/PolymarketApiService.cs", "w", encoding="utf-8") as f:
|
||||
for i, line in enumerate(lines):
|
||||
if 649 <= i <= 843:
|
||||
continue
|
||||
f.write(line)
|
||||
@@ -1,14 +0,0 @@
|
||||
from pymongo import MongoClient
|
||||
from bson.objectid import ObjectId
|
||||
|
||||
client = MongoClient('mongodb://localhost:27017/')
|
||||
db = client['PolyTraderDB']
|
||||
col = db['closed_trades']
|
||||
|
||||
deleted = 0
|
||||
for doc in col.find({}):
|
||||
if isinstance(doc['_id'], ObjectId):
|
||||
col.delete_one({'_id': doc['_id']})
|
||||
deleted += 1
|
||||
|
||||
print(f"Deleted {deleted} invalid ObjectId records from closed_trades.")
|
||||
@@ -1,2 +0,0 @@
|
||||
$response = Invoke-RestMethod -Uri "https://data-api.polymarket.com/activity?user=0xC5d563A36AE78145C45a50134d48A1215220f80a"
|
||||
$response | ConvertTo-Json -Depth 10 > debug_activity.json
|
||||
@@ -1,2 +0,0 @@
|
||||
$response = Invoke-RestMethod -Uri "https://gamma-api.polymarket.com/events?slug=highest-temperature-in-seattle-on-march-4-2026-54-55f"
|
||||
$response | ConvertTo-Json -Depth 5 > debug_event.json
|
||||
@@ -1,2 +0,0 @@
|
||||
$response = Invoke-RestMethod -Uri "https://data-api.polymarket.com/markets?asset_id=16390480740794212860585822641698670781065007954223853906471315387406983668414"
|
||||
$response | ConvertTo-Json -Depth 5 > debug_market.json
|
||||
@@ -1,2 +0,0 @@
|
||||
$response = Invoke-RestMethod -Uri "https://data-api.polymarket.com/positions?user=0xC5d563A36AE78145C45a50134d48A1215220f80a"
|
||||
$response | ConvertTo-Json -Depth 10 > debug_positions.json
|
||||
@@ -1,161 +0,0 @@
|
||||
import re
|
||||
import sys
|
||||
|
||||
def patch_file(designer_file):
|
||||
with open(designer_file, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
grids = {
|
||||
"dgv_dashboard": [
|
||||
("AccountId", "Account ID", False, False),
|
||||
("IsDemo", "Is Demo", False, False),
|
||||
("IsActive", "Is Active", False, False),
|
||||
("AccountName", "Account", True, False),
|
||||
("TotalBalance", "Total USD", True, False),
|
||||
("AvailableBalance", "Available", True, False),
|
||||
("PositionBalance", "Positions", True, False),
|
||||
("OpenTradesCount", "Open", True, False),
|
||||
("ClosedTrades24h", "Closed 24h", True, False),
|
||||
("Pnl24h", "Pnl 24h", True, False),
|
||||
("Winrate24h", "Winrate 24h", True, False),
|
||||
("ClosedTrades7d", "Closed 7d", True, False),
|
||||
("Pnl7d", "Pnl 7d", True, False),
|
||||
("Winrate7d", "Winrate 7d", True, False)
|
||||
],
|
||||
"dgv_openTrades": [
|
||||
("AccountName", "Account", True, False),
|
||||
("SourceTraderName", "Copied From", True, True),
|
||||
("MarketQuestion", "Market", True, True),
|
||||
("MarketSlug", "Market Slug", False, False),
|
||||
("Outcome", "Outcome", True, False),
|
||||
("Side", "Side", True, False),
|
||||
("EntryPrice", "Entry Price", True, False),
|
||||
("Size", "Shares", True, False),
|
||||
("AmountUsd", "Amount USD", True, False)
|
||||
],
|
||||
"dgv_closedTrades": [
|
||||
("TradeId", "ID", False, False),
|
||||
("AccountId", "Account ID", False, False),
|
||||
("SourceTraderId", "SourceTraderId", False, False),
|
||||
("IsDemo", "Is Demo", False, False),
|
||||
("TokenId", "TokenId", False, False),
|
||||
("MarketSlug", "Market Slug", False, False),
|
||||
("MarketQuestion", "Market", True, True),
|
||||
("Outcome", "Outcome", True, False),
|
||||
("Side", "Side", True, False),
|
||||
("EntryPrice", "Entry Price", True, False),
|
||||
("ExitPrice", "Exit Price", True, False),
|
||||
("Size", "Shares", True, False),
|
||||
("RealizedPnl", "P&L", True, False),
|
||||
("PnlPercent", "P&L %", True, False),
|
||||
("TotalFees", "Fees", True, False),
|
||||
("OpenedAt", "Opened At", True, False),
|
||||
("ClosedAt", "Closed At", True, False),
|
||||
("ExitReason", "Reason", True, False)
|
||||
],
|
||||
"dgv_masterTraders": [
|
||||
("Id", "Id", False, False),
|
||||
("WalletAddress", "Wallet", True, False),
|
||||
("DisplayName", "Name", True, False),
|
||||
("Category", "Category", True, False),
|
||||
("Description", "Description", True, False),
|
||||
("Reasoning", "Reasoning", True, False),
|
||||
("IsActive", "Is Active", True, False),
|
||||
("IsHidden", "Is Hidden", True, False),
|
||||
("TotalTrades", "Trades", True, False),
|
||||
("WinningTrades", "Wins", True, False),
|
||||
("Winrate30t", "Winrate 30t", True, False),
|
||||
("TotalPnl", "Total P&L", True, False)
|
||||
],
|
||||
"dgv_SlaveTraders": [
|
||||
("AccountId", "ID", False, False),
|
||||
("Name", "Name", True, False),
|
||||
("WalletAddress", "Wallet", True, False),
|
||||
("IsDemo", "Is Demo", True, False),
|
||||
("IsActive", "Is Active", True, False),
|
||||
("CloseOnlyMode", "Close Only", True, False),
|
||||
("PayoutAddress", "Payout Address", True, False),
|
||||
("PayoutLimitUsd", "Payout Limit", True, False),
|
||||
("PerMarketLimit", "Max %", True, False),
|
||||
("MaxPriceDifference", "Max Price Diff", True, False),
|
||||
("MaxBuyPrice", "Max Buy Price", True, False),
|
||||
("ProfitTarget", "Profit Target", True, False),
|
||||
("LimitUnder6h", "< 6h", True, False),
|
||||
("LimitUnder24h", "< 24h", True, False),
|
||||
("LimitUnder72h", "< 72h", True, False),
|
||||
("LimitOver72h", "> 72h", True, False)
|
||||
]
|
||||
}
|
||||
|
||||
declarations = []
|
||||
instantiations = []
|
||||
setups = []
|
||||
|
||||
for dgv_name, cols in grids.items():
|
||||
if f"{dgv_name}.Columns.AddRange" in content:
|
||||
print(f"{dgv_name} already patched.")
|
||||
continue
|
||||
|
||||
col_refs = []
|
||||
for prop, header, visible, is_link in cols:
|
||||
col_type = "DataGridViewLinkColumn" if is_link else "DataGridViewTextBoxColumn"
|
||||
col_name = f"col_{dgv_name}_{prop}"
|
||||
col_refs.append(f"{col_name}")
|
||||
|
||||
declarations.append(f"private {col_type} {col_name};")
|
||||
instantiations.append(f"{col_name} = new {col_type}();")
|
||||
|
||||
setup = f"""//
|
||||
// {col_name}
|
||||
//
|
||||
{col_name}.DataPropertyName = "{prop}";
|
||||
{col_name}.HeaderText = "{header}";
|
||||
{col_name}.Name = "{col_name}";
|
||||
{col_name}.ReadOnly = true;
|
||||
"""
|
||||
if not visible:
|
||||
setup += f"{col_name}.Visible = false;\n"
|
||||
|
||||
if is_link:
|
||||
setup += f"{col_name}.ActiveLinkColor = Color.White;\n"
|
||||
setup += f"{col_name}.LinkBehavior = LinkBehavior.SystemDefault;\n"
|
||||
setup += f"{col_name}.LinkColor = Color.Blue;\n"
|
||||
setup += f"{col_name}.TrackVisitedState = true;\n"
|
||||
setup += f"{col_name}.VisitedLinkColor = Color.Purple;\n"
|
||||
|
||||
setups.append(setup)
|
||||
|
||||
add_range_code = f"{dgv_name}.Columns.AddRange(new DataGridViewColumn[] {{ " + ", ".join(col_refs) + " });\n"
|
||||
|
||||
# find `dgv_name.Name = "..."`
|
||||
pattern = f'({dgv_name}\\.Name = "{dgv_name}";)'
|
||||
content, n = re.subn(pattern, r'\1\n ' + add_range_code.replace('\n', '\n '), content)
|
||||
if n == 0:
|
||||
print(f"FAILED to find {pattern}")
|
||||
|
||||
if not declarations:
|
||||
print("No grids to patch or already patched.")
|
||||
return
|
||||
|
||||
# Declarations
|
||||
bottom_pattern = r'(private DataGridView dgv_dashboard;)'
|
||||
decl_str = "\n ".join(declarations) + "\n "
|
||||
content, n = re.subn(bottom_pattern, decl_str + r'\1', content)
|
||||
|
||||
# Instantiations
|
||||
top_pattern = r'(dgv_dashboard = new DataGridView\(\);)'
|
||||
inst_str = "\n ".join(instantiations) + "\n "
|
||||
content, n = re.subn(top_pattern, inst_str + r'\1', content)
|
||||
|
||||
# Setups
|
||||
resume_pattern = r'(\(\(System\.ComponentModel\.ISupportInitialize\)dgv_dashboard\)\.EndInit\(\);)'
|
||||
setup_str = "\n ".join("\n ".join(s.splitlines()) for s in setups) + "\n "
|
||||
content, n = re.subn(resume_pattern, setup_str + r'\1', content)
|
||||
|
||||
with open(designer_file, 'w', encoding='utf-8') as f:
|
||||
f.write(content)
|
||||
|
||||
print("Patched successfully.")
|
||||
|
||||
if __name__ == '__main__':
|
||||
patch_file(sys.argv[1])
|
||||
@@ -1,6 +0,0 @@
|
||||
$json = Get-Content "debug_event.json" -Raw
|
||||
$obj = ConvertFrom-Json $json
|
||||
Write-Output "Event Closed: $($obj[0].closed)"
|
||||
Write-Output "Event Active: $($obj[0].active)"
|
||||
Write-Output "First Market Resolved: $($obj[0].markets[0].closed)"
|
||||
Write-Output "First Market Winner: $($obj[0].markets[0].winner)"
|
||||
@@ -1,39 +0,0 @@
|
||||
import sys
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
|
||||
# PolyTraderSharp - Auto-Redeem Stub
|
||||
# Dieses Skript dient als Brücke zur Polymarket Relayer API, um gewonnene Tokens
|
||||
# automatisiert (gasless) via On-Chain Meta-Transaktion auszulösen.
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
|
||||
def redeem_tokens(token_ids, api_key, private_key, api_passphrase):
|
||||
# WICHTIG: Die offizielle Automatisierung von "Redeems" ohne Gas-Gebühren
|
||||
# erfordert Polymarkets py-builder-relayer-client SDK oder Relayer JWT Keys.
|
||||
# Da das Gnosis Safe Proxy Wallet angesprochen werden muss, ist das klassische py_clob_client SDK dafür nicht ausgelegt.
|
||||
|
||||
# 1. Sammle Token IDs
|
||||
tokens = [t.strip() for t in token_ids.split(",") if t.strip()]
|
||||
|
||||
logging.info(f"Redeem-Anforderung für Token erkannt: {tokens}")
|
||||
logging.warning("HINWEIS: Ein vollautomatisierter On-Chain Redeem erfordert das 'builder-relayer-client-python' Package.")
|
||||
logging.warning("Installiere es (sofern Polymarket es publiziert hat) oder nutze die Relayer REST-API direkt mit L2 Signaturen.")
|
||||
logging.info("PolyTraderSharp hat die C#-seitige Accounting-Logik aktualisiert, sodass Gewinne/Verluste in deinem Interface nun sofort verbucht werden!")
|
||||
|
||||
# Placeholder für erfolgreiches Accounting
|
||||
print(json.dumps({"status": "accounting_only", "redeemed_tokens": tokens}))
|
||||
return
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) < 5:
|
||||
print("Usage: python redeem_markets.py <token_ids_comma_separated> <api_key> <private_key> <api_passphrase>")
|
||||
sys.exit(1)
|
||||
|
||||
token_ids = sys.argv[1]
|
||||
api_key = sys.argv[2]
|
||||
private_key = sys.argv[3]
|
||||
api_passphrase = sys.argv[4]
|
||||
|
||||
redeem_tokens(token_ids, api_key, private_key, api_passphrase)
|
||||
@@ -1,38 +0,0 @@
|
||||
import re
|
||||
import sys
|
||||
|
||||
def revert_file(filepath):
|
||||
with open(filepath, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
# 1. Remove AddRange statements for our columns
|
||||
# Example: dgv_dashboard.Columns.AddRange(new DataGridViewColumn[] { ... col_dgv_ ... });
|
||||
pattern1 = r'\s*dgv_\w+\.Columns\.AddRange\(new DataGridViewColumn\[\] \{[^}]*col_dgv_[^}]*\}\);'
|
||||
content = re.sub(pattern1, '', content, flags=re.MULTILINE)
|
||||
|
||||
# 2. Remove all lines referencing col_dgv_ (declarations, instantiations, property assignments)
|
||||
# Be careful not to remove lines that just accidentally match. We'll match lines that start with whitespace and have col_dgv_
|
||||
lines = content.splitlines()
|
||||
new_lines = []
|
||||
skip = False
|
||||
for line in lines:
|
||||
if "col_dgv_" in line:
|
||||
continue
|
||||
if line.strip() == "//" and new_lines and new_lines[-1].strip() == "//":
|
||||
# Might be part of our property comment block // \n // col_name \n //
|
||||
# Wait, easier to just strip empty trailing // later.
|
||||
pass
|
||||
new_lines.append(line)
|
||||
|
||||
content = "\n".join(new_lines)
|
||||
|
||||
# 3. Clean up empty comment blocks
|
||||
content = re.sub(r'\s*// \s*\n\s*// \s*\n\s*// \s*\n', '\n', content)
|
||||
|
||||
with open(filepath, 'w', encoding='utf-8') as f:
|
||||
f.write(content)
|
||||
|
||||
print("Reverted.")
|
||||
|
||||
if __name__ == '__main__':
|
||||
revert_file(sys.argv[1])
|
||||
@@ -1,35 +0,0 @@
|
||||
import sys
|
||||
import datetime
|
||||
sys.path.append('J:\\Softwareprojekte\\Polytrader\\venv\\Lib\\site-packages')
|
||||
from py_clob_client.signing.eip712 import get_clob_auth_domain, MSG_TO_SIGN
|
||||
from py_clob_client.signing.model import ClobAuth
|
||||
from eth_utils import keccak
|
||||
|
||||
domain = get_clob_auth_domain(137)
|
||||
target_msg_hash = bytes.fromhex("68eff3a266838ca5dd9049f4dba0b95170871d2a1a16478443df0515e5c3f606")
|
||||
|
||||
# The timestamp of the log was 16:06:52. Let's guess unix time for 2026-03-26.
|
||||
# Let's just brute force a wide range of timestamps.
|
||||
# 2026-03-26 15:00:00 UTC is ~1774537200
|
||||
base = 1774537200
|
||||
|
||||
found = False
|
||||
for t in range(base - 10000, base + 10000):
|
||||
clob_auth_msg = ClobAuth(
|
||||
address="0x628914CF1e96A9D1Ab8F0489A9f64be5633bac41",
|
||||
timestamp=str(t),
|
||||
nonce=0,
|
||||
message=MSG_TO_SIGN,
|
||||
)
|
||||
# The message hash is the keccak hash of the ABI encoded ClobAuth type struct.
|
||||
# signable_bytes returns 1901 + domainHash + messageHash
|
||||
signable = clob_auth_msg.signable_bytes(domain)
|
||||
# the last 32 bytes is the message Hash
|
||||
msg_hash = signable[34:]
|
||||
if msg_hash == target_msg_hash:
|
||||
print("MATCH FOUND FOR TIMESTAMP:", t)
|
||||
found = True
|
||||
break
|
||||
|
||||
if not found:
|
||||
print("NO MATCH FOUND.")
|
||||
@@ -1,16 +0,0 @@
|
||||
import sys
|
||||
import datetime
|
||||
sys.path.append('J:\\Softwareprojekte\\Polytrader\\venv\\Lib\\site-packages')
|
||||
from py_clob_client.signer import Signer
|
||||
from py_clob_client.signing.eip712 import sign_clob_auth_message
|
||||
|
||||
signer = Signer("425454f8eef01dc6d4effeec1a9587f5969b53c18c7c9e621da73b9e80effd60", 137)
|
||||
target_sig = "0x3c4f2c1cbede3e423c265a90cfc32e37c2336e95fc4aa92e82081c96bcf518295893c4e65f0c2ae6e414210815e37f40200a4b5cad0104c0f71de5551297fd5d1c"
|
||||
|
||||
sig = sign_clob_auth_message(signer, 1774537612, 0)
|
||||
print("PYTHON SIG: " + sig)
|
||||
print("CSHARP SIG: " + target_sig)
|
||||
if sig == target_sig:
|
||||
print("THEY ARE IDENTICAL!!")
|
||||
else:
|
||||
print("THE ECDSA OUTPUT DIFFERS!!")
|
||||
@@ -1,105 +0,0 @@
|
||||
// File: hash_test.csx
|
||||
#r "nuget: Nethereum.Signer, 4.22.0"
|
||||
#r "nuget: Nethereum.ABI, 4.22.0"
|
||||
#r "nuget: Nethereum.Hex, 4.22.0"
|
||||
|
||||
using System;
|
||||
using System.Numerics;
|
||||
using Nethereum.Signer.EIP712;
|
||||
using Nethereum.Signer;
|
||||
using Nethereum.ABI.FunctionEncoding.Attributes;
|
||||
|
||||
[Struct("EIP712Domain")]
|
||||
public class CtfDomain
|
||||
{
|
||||
[Parameter("string", "name", 1)]
|
||||
public string Name { get; set; }
|
||||
|
||||
[Parameter("string", "version", 2)]
|
||||
public string Version { get; set; }
|
||||
|
||||
[Parameter("uint256", "chainId", 3)]
|
||||
public ulong ChainId { get; set; }
|
||||
|
||||
[Parameter("address", "verifyingContract", 4)]
|
||||
public string VerifyingContract { get; set; }
|
||||
}
|
||||
|
||||
[Struct("Order")]
|
||||
public class CtfOrder
|
||||
{
|
||||
[Parameter("uint256", "salt", 1)]
|
||||
public BigInteger Salt { get; set; }
|
||||
|
||||
[Parameter("address", "maker", 2)]
|
||||
public string Maker { get; set; }
|
||||
|
||||
[Parameter("address", "signer", 3)]
|
||||
public string Signer { get; set; }
|
||||
|
||||
[Parameter("address", "taker", 4)]
|
||||
public string Taker { get; set; }
|
||||
|
||||
[Parameter("uint256", "tokenId", 5)]
|
||||
public BigInteger TokenId { get; set; }
|
||||
|
||||
[Parameter("uint256", "makerAmount", 6)]
|
||||
public BigInteger MakerAmount { get; set; }
|
||||
|
||||
[Parameter("uint256", "takerAmount", 7)]
|
||||
public BigInteger TakerAmount { get; set; }
|
||||
|
||||
[Parameter("uint256", "expiration", 8)]
|
||||
public BigInteger Expiration { get; set; }
|
||||
|
||||
[Parameter("uint256", "nonce", 9)]
|
||||
public BigInteger Nonce { get; set; }
|
||||
|
||||
[Parameter("uint256", "feeRateBps", 10)]
|
||||
public BigInteger FeeRateBps { get; set; }
|
||||
|
||||
[Parameter("uint8", "side", 11)]
|
||||
public byte Side { get; set; }
|
||||
|
||||
[Parameter("uint8", "signatureType", 12)]
|
||||
public byte SignatureType { get; set; }
|
||||
}
|
||||
|
||||
var typedData = new TypedData<CtfDomain>
|
||||
{
|
||||
Domain = new CtfDomain
|
||||
{
|
||||
Name = "Polymarket CTF Exchange",
|
||||
Version = "1",
|
||||
ChainId = 137,
|
||||
VerifyingContract = "0x4bFb41d5B3570DeFd03C39a9A4D8dE6Bd8B8982E"
|
||||
},
|
||||
Types = Nethereum.ABI.EIP712.MemberDescriptionFactory.GetTypesMemberDescription(typeof(CtfDomain), typeof(CtfOrder)),
|
||||
PrimaryType = "Order"
|
||||
};
|
||||
|
||||
var ctfOrder = new CtfOrder
|
||||
{
|
||||
Salt = 17747015785747,
|
||||
Maker = "0x628914cf1e96a9d1ab8f0489a9f64be5633bac41",
|
||||
Signer = "0x883fe952a23bb68aab8832343d4bedde759b40ea",
|
||||
Taker = "0x0000000000000000000000000000000000000000",
|
||||
TokenId = BigInteger.Parse("54119275359569982132308633107899675342776540894581625713762792947175003762644"),
|
||||
MakerAmount = 999180,
|
||||
TakerAmount = 3660000,
|
||||
Expiration = 0,
|
||||
Nonce = 0,
|
||||
FeeRateBps = 0,
|
||||
Side = 0,
|
||||
SignatureType = 0
|
||||
};
|
||||
|
||||
string privKey = new string('1', 64);
|
||||
var eip712TypedDataSigner = new Eip712TypedDataSigner();
|
||||
var key = new EthECKey(privKey);
|
||||
|
||||
var hash = eip712TypedDataSigner.HashTypedDataV4(ctfOrder, typedData);
|
||||
var sig = eip712TypedDataSigner.SignTypedDataV4(ctfOrder, typedData, key);
|
||||
|
||||
Console.WriteLine("CS_STRUCT_HASH|" + Nethereum.Hex.HexConvertors.Extensions.HexByteConvertorExtensions.ToHex(hash, true));
|
||||
Console.WriteLine("CS_SIG|" + sig);
|
||||
@@ -1,39 +0,0 @@
|
||||
from eth_account import Account
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
sys.path.insert(0, "J:/Softwareprojekte/Polytrader/venv/Lib/site-packages")
|
||||
|
||||
from py_order_utils.builders.base_builder import BaseBuilder
|
||||
from py_order_utils.model.order import OrderData
|
||||
from py_order_utils.signer import Signer
|
||||
|
||||
order_json = '''{"salt":17747015785747,"maker":"0x628914cf1e96a9d1ab8f0489a9f64be5633bac41","signer":"0x883fe952a23bb68aab8832343d4bedde759b40ea","taker":"0x0000000000000000000000000000000000000000","tokenId":"54119275359569982132308633107899675342776540894581625713762792947175003762644","makerAmount":"999180","takerAmount":"3660000","expiration":"0","nonce":"0","feeRateBps":"0","side":"BUY","signatureType":0}'''
|
||||
|
||||
data = json.loads(order_json)
|
||||
data["side"] = 0 if data["side"] == "BUY" else 1
|
||||
|
||||
priv_key = "0x" + "1"*64
|
||||
signer = Signer(priv_key)
|
||||
|
||||
builder = BaseBuilder('0x4bFb41d5B3570DeFd03C39a9A4D8dE6Bd8B8982E', 137, signer, lambda: 1)
|
||||
|
||||
from py_order_utils.model.order import Order
|
||||
order = Order(
|
||||
salt=int(data["salt"]),
|
||||
maker=data["maker"],
|
||||
signer=data["signer"],
|
||||
taker=data["taker"],
|
||||
tokenId=int(data["tokenId"]),
|
||||
makerAmount=int(data["makerAmount"]),
|
||||
takerAmount=int(data["takerAmount"]),
|
||||
expiration=int(data["expiration"]),
|
||||
nonce=int(data["nonce"]),
|
||||
feeRateBps=int(data["feeRateBps"]),
|
||||
side=int(data["side"]),
|
||||
signatureType=int(data["signatureType"])
|
||||
)
|
||||
|
||||
struct_hash = builder._create_struct_hash(order)
|
||||
print("PYTHON_STRUCT_HASH|" + struct_hash)
|
||||
print("PYTHON_SIG|" + signer.sign(struct_hash))
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"Database": {
|
||||
"_comment": "MySqlConnectionString liegt in der gitignorierten appsettings.Local.json.",
|
||||
"MySqlConnectionString": ""
|
||||
},
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.EntityFrameworkCore": "Warning",
|
||||
"Microsoft.EntityFrameworkCore.Database.Command": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
"_comment": "Kopie als packager.config.json in diesem Ordner anlegen und ausfuellen. packager.config.json ist per .gitignore ausgeschlossen. Alternativ ueber Umgebungsvariablen: DC_FTP_HOST, DC_FTP_PORT, DC_FTP_USER, DC_FTP_PASS, DC_API_URL, DC_TOKEN. Siehe docs/archiv/umsetzungsplaene/UMSETZUNGSPLAN-Deploymentcenter-Integration.md, Schnitt D-4.",
|
||||
|
||||
"ftpHost": "ftp.example.com",
|
||||
"ftpPort": 21,
|
||||
"ftpUser": "ftp-user",
|
||||
"ftpPass": "ftp-password",
|
||||
"ftpRemoteBaseDir": "/public_html/releases",
|
||||
|
||||
"apiBaseUrl": "https://dc.mhdf.de",
|
||||
"_apiToken_comment": "Token mit dem Recht updateservice:publish. Im Deploymentcenter-WebUI unter Token-Verwaltung erzeugen - NICHT das Dev-Sub-Token aus appsettings.Local.json wiederverwenden (das hat nur watchdog:ping/bugtracker:report).",
|
||||
"apiToken": "",
|
||||
|
||||
"_excludePatterns_comment": "Kommt gar nicht ins Paket. D-6 des Umsetzungsplans: appsettings.Local.json enthaelt das MySQL-Passwort im Klartext, server_settings.xml den Watchdog-Token und den Lizenzschluessel, master.key den AES-Master-Key aller verschluesselten Secrets. Der Packager bricht seit Version 2.5.0 zusaetzlich bei erkannten Zugangsdaten ab (Datei- UND Inhaltspruefung) - diese Liste ist die erste, nicht die einzige Verteidigungslinie.",
|
||||
"excludePatterns": [
|
||||
"appsettings.Local.json",
|
||||
"appsettings.*.Local.json",
|
||||
"*.local.json",
|
||||
"master.key",
|
||||
"openrouter.key",
|
||||
"server_settings.xml",
|
||||
"*.pfx",
|
||||
"*.key",
|
||||
"*.pem",
|
||||
"*.p12",
|
||||
"*.db",
|
||||
"*.sqlite",
|
||||
"*.sqlite3",
|
||||
"Logs/**",
|
||||
"*.pdb",
|
||||
"*.xml",
|
||||
"*.log",
|
||||
"scratch/**"
|
||||
],
|
||||
|
||||
"_preservePatterns_comment": "Wird ausgeliefert, ersetzt am Ziel aber niemals eine vorhandene Datei. appsettings.json enthaelt den Deploymentcenter-Konfigurationsblock (BaseUrl, ProjectSlug, ...) - eine Erstinstallation bekommt die Vorlage, ein Update laesst die vor Ort eingerichteten Werte in Ruhe.",
|
||||
"preservePatterns": [
|
||||
"appsettings.json"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
# systemd-Unit für den kopflosen Linux-Betrieb (--headless, Stufe L2 der Linux-Portierung).
|
||||
# Der Deploymentcenter-Installer legt selbst keinen Dienst an (siehe SETUP_INTEGRATION_GUIDE §7,
|
||||
# "Dienstregistrierung fehlt") - diese Datei ist unser Ersatz dafür.
|
||||
#
|
||||
# Einrichtung:
|
||||
# sudo cp deploy/polytrader.service /etc/systemd/system/polytrader.service
|
||||
# sudo systemctl daemon-reload
|
||||
# sudo systemctl enable --now polytrader
|
||||
#
|
||||
# WICHTIG (D-11 aus dem Umsetzungsplan): server_settings.xml wird relativ zum Arbeitsverzeichnis
|
||||
# geladen, master.key dagegen relativ zur ausführbaren Datei (AppContext.BaseDirectory). Beides
|
||||
# fällt nur zusammen, wenn WorkingDirectory exakt das Installationsverzeichnis ist - deshalb hier
|
||||
# ausdrücklich gesetzt statt dem systemd-Standard (Root des Dienstbenutzers) überlassen. Eine
|
||||
# abweichende WorkingDirectory liest server_settings.xml aus dem falschen Ordner, ohne dass das
|
||||
# irgendwo auffällt (ServerSettings.Load() legt bei fehlender Datei kommentarlos eine neue an).
|
||||
|
||||
[Unit]
|
||||
Description=PolyTrader (Trading- und Analyse-Suite fuer Polymarket)
|
||||
After=network-online.target mysql.service
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
# Anpassen: Installationsverzeichnis und Dienstkonto. Nicht als root betreiben - das
|
||||
# Installationsverzeichnis (inkl. master.key, server_settings.xml, data.db) gehört diesem Konto.
|
||||
User=polytrader
|
||||
Group=polytrader
|
||||
WorkingDirectory=/opt/polytrader
|
||||
ExecStart=/opt/polytrader/PolyTrader.App.Avalonia --headless
|
||||
Restart=on-failure
|
||||
RestartSec=10
|
||||
|
||||
# Absturz vom sauberen Beenden unterscheiden: SIGTERM statt SIGKILL, mit Frist fuer den
|
||||
# geordneten Shutdown-Pfad (offene Positionen, Watchdog-"stopped_graceful", DB-Flush).
|
||||
KillSignal=SIGTERM
|
||||
TimeoutStopSec=45
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -77,7 +77,7 @@ zweimal gebaut wird. → siehe ❓F-1.
|
||||
Trades aus einer früheren PolyTrader-Version on-chain stehen. Auch „Konto abrufen"
|
||||
für das Testkonto liefert nichts.
|
||||
**Befund (geprüft):** Kein Rechen-Bug — es kommen **gar keine Daten** rein.
|
||||
In [`AccountingModule.cs:43-45`](src/PolyTrader.Modules.Accounting/AccountingModule.cs)
|
||||
In [`AccountingModule.cs:43-45`](../src/PolyTrader.Modules.Accounting/AccountingModule.cs)
|
||||
sind alle drei Ingest-Quellen als Null-Stubs registriert:
|
||||
|
||||
```csharp
|
||||
@@ -87,7 +87,7 @@ services.AddSingleton<IBalanceAnchorSource, NullBalanceAnchorSource>();
|
||||
```
|
||||
|
||||
`NullActivitySource.GetActivityAsync` gibt konstant ein leeres Array zurück
|
||||
([`Services/IngestSources.cs:36-51`](src/PolyTrader.Modules.Accounting/Services/IngestSources.cs)).
|
||||
([`Services/IngestSources.cs:36-51`](../src/PolyTrader.Modules.Accounting/Services/IngestSources.cs)).
|
||||
Der Ingest bucht daher „korrekt nichts" — der Ledger bleibt leer, folglich ist jede
|
||||
Auswertung 0. Das war bewusst so (A-1 = Fundament, Live-Quellen „im Zielland").
|
||||
**Wichtig:** Die Begründung „Zielland" trägt hier nicht — Accounting **liest nur**
|
||||
@@ -167,7 +167,7 @@ oben ausgewählten Jobs** — z. B. beim „Threema Webhook Listener": wann lief
|
||||
je Aufruf eine Kurzinfo (wurden Nachrichten abgerufen? Fehler?). So sieht man auf einen
|
||||
Blick, ob die Jobs überhaupt laufen.
|
||||
**Befund:** `Ui/Views/JobsView.cs` bindet schlicht `jobManager.Jobs` ans Grid.
|
||||
`JobManager` ([`Services/JobManager.cs`](src/PolyTrader.Core/Services/JobManager.cs)) ist
|
||||
`JobManager` ([`Services/JobManager.cs`](../src/PolyTrader.Core/Services/JobManager.cs)) ist
|
||||
eine reine `BindingList<JobStatusRow>` — **es gibt keinerlei Lauf-Historie**, nur den
|
||||
aktuellen Status. Die Historie muss also erst entstehen.
|
||||
**Ansatz:** `JobRunEntry` (JobName, Start, Dauer, Ergebnis Ok/Warn/Fehler, Kurztext,
|
||||
@@ -227,7 +227,7 @@ Trades bereits gebaut), Prädikate für PnL-Vorzeichen und Marktstatus (baut auf
|
||||
**Beobachtung:** Ein Button, der alle beendeten Märkte einlöst. Frage: Wie ist der
|
||||
Stand der Redeem-Integration?
|
||||
**Befund (geprüft):** **Nicht implementiert.** Es existiert ein durchdachter Plan
|
||||
([`docs/umsetzungsplaene/UMSETZUNGSPLAN-AutoRedeem.md`](docs/umsetzungsplaene/UMSETZUNGSPLAN-AutoRedeem.md),
|
||||
([`docs/archiv/umsetzungsplaene/UMSETZUNGSPLAN-AutoRedeem.md`](./archiv/umsetzungsplaene/UMSETZUNGSPLAN-AutoRedeem.md),
|
||||
Stand 11.07.2026) mit Queue-Architektur, Modul-Schaltern und 4 Phasen (RD-1 … RD-4) —
|
||||
aber im Code gibt es weder `IRedeemQueue` noch `OnChainCtfService` noch die Tabelle
|
||||
`core_redeem_queue`. Grep über das gesamte Repo findet diese Begriffe **ausschließlich
|
||||
@@ -248,7 +248,7 @@ und unterliegen `.agents/rules/clob.md` in verschärfter Form.
|
||||
müsste jetzt schon funktionieren, um zu sehen, ob und wie die Erkennung läuft. Tut es
|
||||
offenbar nicht.
|
||||
**Befund (geprüft):** Gleiche Ursache wie ACC-1. In
|
||||
[`ResolutionFarmingModule.cs:41`](src/PolyTrader.Modules.ResolutionFarming/ResolutionFarmingModule.cs)
|
||||
[`ResolutionFarmingModule.cs:41`](../src/PolyTrader.Modules.ResolutionFarming/ResolutionFarmingModule.cs)
|
||||
ist `IFarmingMarketSource` auf `NullFarmingMarketSource` gesetzt → der `MarketScannerService`
|
||||
läuft, bekommt aber nie Märkte und produziert „korrekt keine Kandidaten". Ebenso ist
|
||||
`IMarketResolutionSource` auf `NullMarketResolutionSource` gesetzt (nichts löst je auf).
|
||||
|
||||
@@ -0,0 +1,399 @@
|
||||
# Portierungsleitfaden Avalonia (Fortsetzung)
|
||||
|
||||
**Stand:** 13.08.2026 (A1–A4 abgehakt, Deploymentcenter-Hinweis) · **Zielgruppe:** KI-Agent, der die UI-Portierung fortsetzt
|
||||
**Vorgänger-Dokumente:** [`UI-SPEZIFIKATION-WinForms.md`](UI-SPEZIFIKATION-WinForms.md) (wie die alte
|
||||
Oberfläche aussah), [`ANALYSE-Linux-Portierung.md`](./archiv/ANALYSE-Linux-Portierung.md) (Gesamtplan)
|
||||
|
||||
---
|
||||
|
||||
## 0. Was du wissen musst, bevor du irgendetwas anfasst
|
||||
|
||||
| Punkt | Wert |
|
||||
|---|---|
|
||||
| Projekt | `src/PolyTrader.App.Avalonia` |
|
||||
| Zielframework | `net10.0` |
|
||||
| Avalonia | **11.3.19** — **NICHT auf 12 heben!** LiveCharts2 2.0.5 ist gegen 11 gebaut und wirft unter 12 zur Laufzeit `MissingFieldException: Avalonia.Input.Gestures.PinchEvent`. `Avalonia.Controls.DataGrid` folgt einer eigenen Reihe und steht auf **11.3.13**. |
|
||||
| Diagramme | LiveCharts2 (`LiveChartsCore.SkiaSharpView.Avalonia` 2.0.5) |
|
||||
| Alte Oberfläche | Git-Tag **`winforms-final`** — dort steht der komplette WinForms-Code |
|
||||
| Sprache | Alles auf Deutsch: Beschriftungen, Kommentare, Commit-Nachrichten |
|
||||
|
||||
### Der Referenzstand ist eine Tag-Abfrage entfernt
|
||||
|
||||
```bash
|
||||
git show winforms-final:Ui/Views/DashboardView.cs
|
||||
git show winforms-final:src/PolyTrader.Modules.CopyTrading/Ui/MasterTradersView.Designer.cs
|
||||
```
|
||||
|
||||
**Nutze das immer**, bevor du eine Ansicht anfasst. Die Spezifikation ist eine Zusammenfassung –
|
||||
der Tag ist die Wahrheit.
|
||||
|
||||
---
|
||||
|
||||
## 1. Die harten Regeln
|
||||
|
||||
### 1.1 Layout ist deklarativ. Immer.
|
||||
|
||||
> **Jede View besteht aus `View.axaml` (vollständiges Layout) und `View.axaml.cs` (nur Verdrahtung
|
||||
> und Datenlogik). Steuerelemente und Layout werden NIEMALS zur Laufzeit im Code erzeugt.**
|
||||
|
||||
Das ist Richards ausdrückliche Vorgabe und ersetzt die frühere WinForms-Designer-Regel. Wenn du
|
||||
etwas Dynamisches brauchst (Menüeinträge, Formularfelder), dann so:
|
||||
|
||||
- Das **Datenmodell** liefert eine Liste (`ObservableCollection<T>`)
|
||||
- Das **XAML** beschreibt über `ItemsControl` + `DataTemplate`, wie ein Element aussieht
|
||||
|
||||
Vorbilder im Code: `Controls/WindowMenuBar.axaml` (am 22.08.2026 entfernt, siehe Tag `winforms-final`)
|
||||
und [`Controls/SettingsEditor.axaml`](../src/PolyTrader.App.Avalonia/Controls/SettingsEditor.axaml).
|
||||
|
||||
### 1.2 Keine festen Farben
|
||||
|
||||
Alle Farben kommen aus den Themen-Ressourcen (`App.axaml`, 18 Token je Variante). Im XAML:
|
||||
|
||||
```xml
|
||||
Foreground="{DynamicResource AppMutedTextBrush}"
|
||||
```
|
||||
|
||||
Im Code (nur wo unvermeidbar):
|
||||
|
||||
```csharp
|
||||
btn.Background = ThemeManager.Brush("AppToggleActiveBrush");
|
||||
```
|
||||
|
||||
**Wichtig:** Im Code gesetzte Farben folgen dem Themenwechsel **nicht von selbst**. Wenn du eine
|
||||
setzt, hänge dich an `ThemeManager.ThemeChanged` und zeichne dort neu — und melde dich beim
|
||||
`Closed`-Ereignis wieder ab:
|
||||
|
||||
```csharp
|
||||
void OnTheme() => UpdateFarben();
|
||||
ThemeManager.ThemeChanged += OnTheme;
|
||||
Closed += (_, _) => ThemeManager.ThemeChanged -= OnTheme;
|
||||
```
|
||||
|
||||
Verfügbare Token: `AppSurfaceBrush`, `AppSurfaceAltBrush`, `AppCardBrush`, `AppBorderBrush`,
|
||||
`AppMutedTextBrush`, `AppCaptionTextBrush`, `AppReadOnlyTextBrush`, `AppPositiveBrush`,
|
||||
`AppNegativeBrush`, `AppWarningBrush`, `AppTradeLossBrush`, `AppTradeSmallWinBrush`,
|
||||
`AppTradeBigWinBrush`, `AppToggleActiveBrush`, `AppToggleSellOnlyBrush`, `AppToggleInactiveBrush`,
|
||||
`AppChatUserBrush`, `AppChatAgentBrush`.
|
||||
|
||||
**Neuen Token gebraucht?** In `App.axaml` in **beiden** `ResourceDictionary`-Blöcken ergänzen und
|
||||
den Schlüssel in die Prüfliste in `Program.RunSmokeUi` aufnehmen.
|
||||
|
||||
### 1.3 Keine Dialoge für Erfolgsmeldungen
|
||||
|
||||
Die WinForms-Fassung bestätigte jedes Speichern mit einer MessageBox. Das ist bewusst abgeschafft:
|
||||
|
||||
- **Erfolg/Status** → Statuszeile des Fensters (`lblStatus`, `Border Classes="statusbar"`)
|
||||
- **Echte Entscheidung** (Löschen bestätigen, Eingabe erfragen) → `DialogWindow.Confirm` / `.Prompt`
|
||||
- **Fehler, der Handeln erfordert** → `DialogWindow.Info`
|
||||
|
||||
### 1.4 Fehlerbehandlung: die Ansicht muss bedienbar bleiben
|
||||
|
||||
Datenzugriffe immer in `try/catch`. Bei Fehlern die Liste leeren und die Meldung in die Statuszeile
|
||||
schreiben — **nie** die Ansicht mit einer Ausnahme aufreißen:
|
||||
|
||||
```csharp
|
||||
try { _rows.Clear(); foreach (var r in repo.GetAll()) _rows.Add(r); }
|
||||
catch (Exception ex) { Status($"Laden fehlgeschlagen: {ex.Message}"); }
|
||||
```
|
||||
|
||||
### 1.5 Module bleiben frei von Avalonia
|
||||
|
||||
Die Modul-Fenster liegen in `Views/Modules/` **in der App**, nicht in den Modulprojekten. Grund:
|
||||
Der kopflose Linux-Daemon (`--headless`) soll keine GUI-Bibliothek mitschleppen. Siehe
|
||||
[`Views/Modules/README.md`](../src/PolyTrader.App.Avalonia/Views/Modules/README.md).
|
||||
|
||||
**Füge NIEMALS eine Avalonia-Paketreferenz zu einem `PolyTrader.Modules.*`-Projekt hinzu.**
|
||||
|
||||
---
|
||||
|
||||
## 2. Das Baukastenmuster
|
||||
|
||||
Jedes Fenster folgt demselben Aufbau. Kopiere [`Views/JobsWindow.axaml`](../src/PolyTrader.App.Avalonia/Views/JobsWindow.axaml)
|
||||
als kleinstes Beispiel oder [`Views/Modules/CopyTradingWindow.axaml`](../src/PolyTrader.App.Avalonia/Views/Modules/CopyTradingWindow.axaml)
|
||||
als größtes.
|
||||
|
||||
```xml
|
||||
<Window xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="using:PolyTrader.App.Avalonia.Controls"
|
||||
xmlns:vm="using:PolyTrader.App.Avalonia.ViewModels"
|
||||
x:Class="PolyTrader.App.Avalonia.Views.MeinFenster"
|
||||
Title="Titel aus der Spezifikation"
|
||||
Width="…" Height="…"> <!-- Maße aus UI-SPEZIFIKATION übernehmen -->
|
||||
|
||||
<DockPanel>
|
||||
<controls:WindowMenuBar Name="menuBar" DockPanel.Dock="Top" />
|
||||
|
||||
<Border Classes="toolbar" DockPanel.Dock="Top">
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<Button Name="btnRefresh" Content="Aktualisieren" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border Classes="statusbar" DockPanel.Dock="Bottom">
|
||||
<TextBlock Name="lblStatus" Text="Bereit." />
|
||||
</Border>
|
||||
|
||||
<DataGrid Name="grid" x:DataType="vm:MeineZeile">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Spalte" Width="120" Binding="{Binding Feld}" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</DockPanel>
|
||||
</Window>
|
||||
```
|
||||
|
||||
Im Code-Behind **zwei Konstruktoren** — der parameterlose wird vom XAML-Lader gebraucht:
|
||||
|
||||
```csharp
|
||||
public MeinFenster() => AvaloniaXamlLoader.Load(this);
|
||||
|
||||
public MeinFenster(IModuleUiHost host, /* Abhängigkeiten */) : this()
|
||||
{
|
||||
this.FindControl<Controls.WindowMenuBar>("menuBar")!.Attach(host, "meine.view.id", this);
|
||||
// ItemsSource setzen, Ereignisse verdrahten, Daten laden
|
||||
}
|
||||
```
|
||||
|
||||
### Stolperfallen, die mich Zeit gekostet haben
|
||||
|
||||
| Falle | Lösung |
|
||||
|---|---|
|
||||
| `AVLN2100: Cannot parse a compiled binding without an explicit x:DataType` | `x:DataType` an das **DataGrid** (nicht an die Spalten) bzw. an das `DataTemplate`. Bei Bindungen gegen den `DataContext` des Fensters: `x:DataType` ans `<Window>`. |
|
||||
| `CalendarDatePicker.SelectedDate` | ist `DateTime?`, **nicht** `DateTimeOffset?` |
|
||||
| Neue Einträge erscheinen nicht im Grid | `ObservableCollection<T>` verwenden. `BindingList<T>` implementiert kein `INotifyCollectionChanged` — Avalonia sieht Ergänzungen nicht. |
|
||||
| Zeilenfarben | über `DataGrid.LoadingRow` setzen, nicht über Styles. Greift auch bei virtualisierten Zeilen. |
|
||||
| `TryFindResource` nicht gefunden | `using Avalonia.Controls;` (dort als Erweiterungsmethode definiert) |
|
||||
| Namenskollision `ClosedTradeRow` | Es gibt bereits `PolyTraderSharp.Models.ClosedTradeRow`. Eigene Anzeigezeilen mit Präfix benennen (`CopyClosedTradeRow`). |
|
||||
| Datei speichern | `StorageProvider.SaveFilePickerAsync(...)`, dann `picker.Path.LocalPath` — **nicht** `TryGetLocalPath()` |
|
||||
|
||||
---
|
||||
|
||||
## 3. Was noch fehlt — die Aufgabenliste
|
||||
|
||||
> **Stand 13.08.2026 (nachgeprüft am Code):** A1–A4 sind mit Commit `7f0b05e` **umgesetzt**. Der
|
||||
> Commit hat dieses Dokument seinerzeit nicht mitgezogen, weshalb die Liste unten zwei Wochen lang
|
||||
> Arbeit als offen auswies, die längst erledigt war. **Real offen ist nur noch A5.**
|
||||
>
|
||||
> Die Beschreibungen von A1–A4 bleiben als *Soll-Spezifikation* stehen — sie sind die Vorlage, gegen
|
||||
> die bei A5 geprüft wird. Was tatsächlich gebaut wurde:
|
||||
|
||||
| | Soll | Ist (geprüft) |
|
||||
|---|---|---|
|
||||
| **A1** ✅ | Drei Widgets + Modul-KPIs | [`LauncherWindow.axaml`](../src/PolyTrader.App.Avalonia/Views/LauncherWindow.axaml) — „Auffällige Trades (24h)", „Warnungen & Fehler (heute)", „Supervisor-KI", `Modul-KPIs` als `ItemsControl`. Supervisor korrekt über nullables `GetService<ISupervisorReportRepository>()`. |
|
||||
| **A2** ✅ | Account-Übersicht mit Profil-Schaltfläche | Spalten inkl. „3T Winrate %" / „Overall P/L"; `OnOpenPolymarketProfileClick` nutzt wie empfohlen `TopLevel.Launcher.LaunchUriAsync`, mit Hinweis bei fehlender Wallet-Adresse. |
|
||||
| **A3** ✅ | „Neu" + „Löschen" für Master-Trader | [`CopyTradingWindow.axaml.cs`](../src/PolyTrader.App.Avalonia/Views/Modules/CopyTradingWindow.axaml.cs) — `DeleteSelectedTrader()` mit `DialogWindow.Confirm` vor `_traderRepo.Delete(id)`. |
|
||||
| **A4** ✅ | Kontextmenü im Terminal | [`TerminalWindow.axaml`](../src/PolyTrader.App.Avalonia/Views/TerminalWindow.axaml) — `<ContextMenu>` am `ScrollViewer` mit „Kopieren" und „Alles auswählen". |
|
||||
|
||||
**Wenn du hier etwas änderst, zieh dieses Dokument im selben Commit mit.** Genau das ist beim
|
||||
letzten Mal unterblieben.
|
||||
|
||||
---
|
||||
|
||||
### A1 — Launcher: Live-Überblick ✅ ERLEDIGT (Commit `7f0b05e`)
|
||||
|
||||
Die WinForms-Fassung hatte unter den Fenster-Buttons ein `LauncherWidgetsPanel` (205 + 244 LOC) mit
|
||||
drei Bereichen nebeneinander in einem `TableLayoutPanel`:
|
||||
|
||||
| Bereich | Inhalt | Datenquelle |
|
||||
|---|---|---|
|
||||
| **Auffällige Trades (24h)** | Grid: Modul, Markt, PnL, PnL % | `ITradeLogRepository`, letzte 30 nach Betrag sortiert |
|
||||
| **Warnungen & Fehler (heute)** | Grid: Zeit, Level, Nachricht | `Logs/{heute:yyyy-MM-dd}.jsonl` über `LogJson.ParseLine`, max. 200 |
|
||||
| **Supervisor-KI (letzter Bericht)** | Textfeld | `ISupervisorReportRepository.GetRecent(1)` |
|
||||
|
||||
Dazu die **Modul-KPIs** (`UpdateModuleKpis`): je Modul PnL/Winrate aus dem Trade-Log.
|
||||
|
||||
**Referenz:** `git show winforms-final:Ui/LauncherWidgetsPanel.cs`
|
||||
|
||||
**Achtung:** Der Supervisor-Teil darf nur erscheinen, wenn das Modul geladen ist — nutze
|
||||
`services.GetService<…>()` (nullable) statt `GetRequiredService`.
|
||||
|
||||
### A2 — Launcher: Account-Übersicht ✅ ERLEDIGT (Commit `7f0b05e`)
|
||||
|
||||
Grid mit: Account, Module, Polymarket, Wallet (USDC), 3T PnL, 3T Winrate %, Overall P/L.
|
||||
Die Spalte „Polymarket" war ein **Button**, der das Polymarket-Profil des Kontos im Browser öffnet.
|
||||
|
||||
**Referenz:** `git show winforms-final:Ui/LauncherForm.cs` → `UpdateAccountList()`,
|
||||
`AccountList_CellContentClick()`
|
||||
|
||||
**Plattformhinweis:** Das alte `Process.Start(new ProcessStartInfo { UseShellExecute = true })`
|
||||
funktioniert auch auf Linux, ist aber unnötig — nimm stattdessen
|
||||
`TopLevel.GetTopLevel(this)!.Launcher.LaunchUriAsync(new Uri(url))`. Das ist Avalonias
|
||||
plattformneutraler Weg.
|
||||
|
||||
### A3 — Copytrading: „Neu" und „Löschen" für Master-Trader ✅ ERLEDIGT (Commit `7f0b05e`)
|
||||
|
||||
Die WinForms-`MasterTradersView` hatte vier Werkzeugleisten-Schaltflächen: Aktualisieren, **Neu**,
|
||||
Speichern, **Löschen**. Im Avalonia-Fenster sind nur Aktualisieren und Speichern verdrahtet.
|
||||
|
||||
**Referenz:** `git show winforms-final:src/PolyTrader.Modules.CopyTrading/Ui/MasterTradersView.cs`
|
||||
→ `AddNew()`, `DeleteCurrent()`
|
||||
|
||||
Löschen mit `DialogWindow.Confirm` absichern, danach `ITrackedTraderRepository.Delete(id)` und den
|
||||
Eintrag aus `CopyTradingState.Traders` entfernen.
|
||||
|
||||
### A4 — Terminal: Kontextmenü ✅ ERLEDIGT (Commit `7f0b05e`)
|
||||
|
||||
Vorhanden sind Schaltflächen für „Alles kopieren" und „Terminal leeren". Es fehlen die Einträge
|
||||
**„Kopieren" (nur Auswahl)** und **„Alles auswählen"** als Kontextmenü auf der Log-Ausgabe.
|
||||
|
||||
In Avalonia deklarativ über `<ContextMenu>` am Container, gebunden an Befehle im Code-Behind.
|
||||
|
||||
### A5 — Durchsehen mit echten Daten ⬅️ **der einzige noch offene Punkt**
|
||||
|
||||
Alle Fenster wurden **konstruiert** und die App lief, aber es wurde **nicht jedes Fenster mit
|
||||
echten Daten durchgeklickt**. Layout-Details siehst du erst im Gebrauch:
|
||||
|
||||
- Spaltenbreiten (feste Pixel wurden teils in Sternbreiten übersetzt)
|
||||
- Umbrüche in Werkzeugleisten bei schmalen Fenstern
|
||||
- Splitter-Positionen (Copytrading Master-Trader, Supervisor Dossiers)
|
||||
- Ob die KPI-Kacheln bei acht Stück (Accounting) sinnvoll umbrechen
|
||||
|
||||
**Vorgehen:** App starten, jedes Fenster öffnen, mit der alten Oberfläche vergleichen.
|
||||
|
||||
> **Seit dem Frühjahrsputz am 22.08.2026** liegt die WinForms-Fassung nicht mehr im
|
||||
> Arbeitsbaum. Zum Vergleich entweder die Bildbeschreibung in
|
||||
> [UI-SPEZIFIKATION-WinForms.md](./UI-SPEZIFIKATION-WinForms.md) heranziehen oder den alten
|
||||
> Stand in einem getrennten Arbeitsbaum auschecken — das Repo bleibt dabei unberührt:
|
||||
>
|
||||
> ```bash
|
||||
> git worktree add ../polytrader-winforms winforms-final
|
||||
> ```
|
||||
>
|
||||
> Danach dort `dotnet build PolyTrader.App.csproj` und starten. Aufräumen mit
|
||||
> `git worktree remove ../polytrader-winforms`.
|
||||
|
||||
### B — Ehemals zurückgestellt · ✅ mit der Deploymentcenter-Integration aufgelöst
|
||||
|
||||
> **Stand 22.08.2026:** Dieser Abschnitt ist abgearbeitet. Die Deploymentcenter-Integration
|
||||
> (D-0 bis D-5) ist code-seitig umgesetzt, und mit dem Frühjahrsputz vom 22.08.2026 ist das
|
||||
> WinForms-Projekt aus dem Repo entfernt. Die Tabelle bleibt als Verlaufsspur stehen.
|
||||
|
||||
| Was | Stand heute |
|
||||
|---|---|
|
||||
| **Lizenzdialog** (`LicenseDialog`) | ✅ Entfallen. Das WinForms-Fenster ist mit dem Ausbau gelöscht; die Lizenzeingabe liegt jetzt im Avalonia-Einstellungsfenster (D-2). |
|
||||
| **Lizenz-Startprüfung** (`LicenseGate`) | ✅ Neu gebaut in [`Licensing/LicenseGate.cs`](../src/PolyTrader.App.Avalonia/Licensing/LicenseGate.cs) gegen das Deploymentcenter (D-2). Der frühere Hinweis „setzt gar keine Lizenz durch" gilt nicht mehr. |
|
||||
| **Watchdog-Heartbeat** | ✅ `WatchdogHeartbeatService` ist auf die Deploymentcenter-API umgestellt (D-1) — inklusive `version`, `os`, `checks`, `metrics` und `status: "stopped"`. Die `Watchdog*`-Felder in `ServerSettings` wurden dabei **umgewidmet, nicht ersetzt**, und sind weiterhin in Gebrauch. |
|
||||
| **WinForms-Projekt entfernen** | ✅ Erledigt am 22.08.2026 (P11/L5). `PolyTrader.App.csproj`, `Ui/`, `Models/`, `Licensing/`, `services/`, `Properties/`, `Resources/icons/`, `Program.cs` und `favicon.ico` sind gelöscht, das Projekt ist aus der Solution genommen. Rückfallebene: Git-Tag `winforms-final` (liegt auch auf dem Server). |
|
||||
|
||||
### C — Kleinere Folgepunkte (kein Blocker)
|
||||
|
||||
| Was | Befund |
|
||||
|---|---|
|
||||
| Logging kennt `AppTimeZone` nicht | [`TerminalLogger.cs:23`](../src/PolyTrader.Core/Services/TerminalLogger.cs) stempelt mit `DateTime.Now`, und der Launcher liest die Tagesdatei mit `DateTime.Now`. Schreiber und Leser stimmen also überein — **kein Fehler**. Beide ignorieren aber die in P2 eingeführte konfigurierbare Zeitzone, sodass auf einem UTC-Linuxserver mit Anzeigezone `Europe/Berlin` die Dateigrenzen nicht zur angezeigten Uhrzeit passen. Beim Headless-Schritt (L2) mitbehandeln. |
|
||||
| Ungenutzte Designer-Felder | ✅ Erledigt. Mit dem WinForms-Ausbau (22.08.2026) sind die `CS0169`-Warnungen verschwunden; der Solution-Build wirft noch **15** Warnungen, alle aus dem Avalonia-Projekt (`CS8618` in Fenster-Konstruktoren, je einmal `CS8848` und `CS8602`). |
|
||||
|
||||
---
|
||||
|
||||
## 4. Wie du prüfst, ob es funktioniert
|
||||
|
||||
**Nach jeder Änderung, ohne Ausnahme:**
|
||||
|
||||
```bash
|
||||
dotnet build PolyTraderSharp.sln -v q --nologo
|
||||
```
|
||||
|
||||
```bash
|
||||
dotnet test tests/PolyTrader.Tests/PolyTrader.Tests.csproj --nologo -v q
|
||||
```
|
||||
|
||||
**Der wichtigste Test — konstruiert alle Fenster kopflos, ohne die Trading-Dienste zu starten:**
|
||||
|
||||
```bash
|
||||
dotnet run --project src/PolyTrader.App.Avalonia --no-build -- --smoke-ui
|
||||
```
|
||||
|
||||
Erwartete Ausgabe (Stand heute):
|
||||
|
||||
```
|
||||
=== Smoke-UI: Fenster-Konstruktion (Avalonia) ===
|
||||
[OK] core.dashboard (Dashboard)
|
||||
[OK] core.settings (Server Settings)
|
||||
[OK] core.jobs (Server Jobs)
|
||||
[OK] core.terminal (Terminal / Logs)
|
||||
[OK] copytrading.main (Copytrading)
|
||||
[OK] resolutionfarming.main (ResolutionFarming)
|
||||
[OK] supervisor.main (Supervisor)
|
||||
[OK] accounting.main (Accounting)
|
||||
[OK] LauncherWindow konstruiert
|
||||
[OK] ShutdownConfirmWindow konstruiert
|
||||
[OK] Einstellungs-Editor: 7 Abschnitte, 17 Felder (…)
|
||||
[OK] Farbschema „Light": alle 18 Farben vorhanden
|
||||
[OK] Farbschema „Dark": alle 18 Farben vorhanden
|
||||
=== Smoke-UI OK ===
|
||||
```
|
||||
|
||||
**Der Smoke-Test startet den Host absichtlich NICHT** — sonst liefe die Trading-Engine gegen die
|
||||
echten Börsen-Endpunkte. Nicht ändern.
|
||||
|
||||
**Linux-Tauglichkeit gegenprüfen** (der Sinn der ganzen Übung):
|
||||
|
||||
```bash
|
||||
dotnet publish src/PolyTrader.App.Avalonia -r linux-x64 --self-contained false -o /tmp/pt
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. Wo was liegt
|
||||
|
||||
```
|
||||
src/PolyTrader.App.Avalonia/
|
||||
├─ App.axaml Farb-Token (Light/Dark) + projektweite Stile
|
||||
├─ Program.cs Einstieg; BuildHost() ohne UI-Bezug, --headless, --smoke-ui
|
||||
├─ Shell/
|
||||
│ ├─ AvaloniaUiHost.cs Fensterverwaltung (IModuleUiHost)
|
||||
│ ├─ ThemeManager.cs Farbschema + ThemeChanged
|
||||
│ ├─ ViewIcons.cs Symbolschlüssel → PNG
|
||||
│ ├─ CoreViews.cs Registrierung der Core-Fenster
|
||||
│ └─ ModuleViews.cs Registrierung der Modul-Fenster
|
||||
├─ Controls/
|
||||
│ ├─ WindowMenuBar.axaml gemeinsame Fensterleiste (auf JEDEM Fenster)
|
||||
│ └─ SettingsEditor.axaml Ersatz fürs PropertyGrid
|
||||
├─ ViewModels/ Anzeigezeilen und Datenmodelle
|
||||
└─ Views/
|
||||
├─ *.axaml Core-Fenster
|
||||
└─ Modules/*.axaml Modul-Fenster
|
||||
```
|
||||
|
||||
### Der `SettingsEditor` — nutze ihn
|
||||
|
||||
Du brauchst **nie** ein Einstellungsformular von Hand zu bauen. Ein Aufruf genügt:
|
||||
|
||||
```csharp
|
||||
this.FindControl<SettingsEditor>("editorXyz")!.Show(meinEinstellungsObjekt);
|
||||
```
|
||||
|
||||
Er liest `[Category]`, `[DisplayName]`, `[Description]` und `[Browsable(false)]` vom Modell und
|
||||
rendert Überschrift + Beschriftung links + Feld rechts + Hinweis darunter. Unterstützte Typen:
|
||||
`string`, `int`/`long`, `bool`, Enums, Nur-Lese-Eigenschaften.
|
||||
|
||||
**Ein neues Feld in den Einstellungen** heißt also: Eigenschaft am Modell ergänzen, Attribute dran,
|
||||
fertig. Kein UI-Code.
|
||||
|
||||
---
|
||||
|
||||
## 6. Arbeitsweise
|
||||
|
||||
1. **Eine Aufgabe aus Abschnitt 3 nehmen**, nicht mehrere gleichzeitig
|
||||
2. **`git show winforms-final:<pfad>`** — das Original ansehen, bevor du schreibst
|
||||
3. Umsetzen nach dem Muster aus Abschnitt 2
|
||||
4. Build + Tests + `--smoke-ui`
|
||||
5. Committen mit deutscher Nachricht, die **das Warum** erklärt, nicht nur das Was
|
||||
6. Commit-Fuß: `Co-Authored-By: <dein Name> <deine Adresse>`
|
||||
|
||||
### Was du NICHT tun sollst
|
||||
|
||||
- Avalonia auf 12 heben (siehe Abschnitt 0)
|
||||
- Avalonia in die Modulprojekte ziehen
|
||||
- Layout im Code aufbauen
|
||||
- Feste Farben verwenden
|
||||
- Den Lizenzdialog portieren
|
||||
- Das WinForms-Projekt löschen
|
||||
- Den Smoke-Test den Host starten lassen
|
||||
- Fachlogik in Fenster verlagern — Auswertung gehört in `TradeAnalytics`, `AccountingEngine` usw.
|
||||
|
||||
### Wenn du unsicher bist
|
||||
|
||||
Der Tag `winforms-final` beantwortet fast jede Frage zum *bisherigen* Verhalten. Wenn er es nicht
|
||||
tut und die Entscheidung fachlich ist (Handelslogik, Buchhaltung, Steuern), **frag nach**, statt zu
|
||||
raten. Bei reinen Darstellungsfragen entscheide selbst und schreib eine Zeile ins Commit, warum.
|
||||
@@ -0,0 +1,133 @@
|
||||
# Leitfaden: Continuous Integration
|
||||
|
||||
**Stand: 22.08.2026** · Workflow: [`.gitea/workflows/ci.yml`](../.gitea/workflows/ci.yml)
|
||||
|
||||
> **Status: Der Workflow liegt, der Runner fehlt noch.** Gitea 1.26.2 hat Actions aktiviert
|
||||
> (`has_actions: true`), aber auf der Instanz ist **kein einziger Runner registriert** — geprüft
|
||||
> auf Repo-, Benutzer- und Instanzebene. Bis Abschnitt 3 erledigt ist, passiert bei einem Push
|
||||
> nichts. Der Workflow ist dann sofort lauffähig, ohne weitere Änderung.
|
||||
|
||||
---
|
||||
|
||||
## 1. Warum überhaupt
|
||||
|
||||
PolyTrader soll auf einem Linux-Server laufen. Der plattformneutrale Zustand wurde am
|
||||
22.08.2026 mit dem WinForms-Ausbau hergestellt — und er **driftet ohne Wächter wieder weg**.
|
||||
Eine einzige `net10.0-windows`-Zeile oder ein `using System.Drawing` genügt, und der
|
||||
Linux-Build ist kaputt, ohne dass es auf einer Windows-Entwicklermaschine auffällt: dort baut
|
||||
es weiter.
|
||||
|
||||
Genau deshalb läuft die CI **auf Linux**. Sie ist kein Selbstzweck, sondern die einzige
|
||||
Instanz, die den mühsam hergestellten Zustand verteidigt.
|
||||
|
||||
## 2. Was geprüft wird
|
||||
|
||||
Zwei Jobs, beide auf `ubuntu-latest`:
|
||||
|
||||
### `build-test` — Build & Tests
|
||||
|
||||
| Schritt | Zweck |
|
||||
|---|---|
|
||||
| `dotnet restore` | Der lokale Feed `lib/nuget` (Deploymentcenter-SDK) ist relativ eingebunden und liegt im Repo — nichts einzurichten |
|
||||
| `dotnet build -c Release` | Baut alle 7 Projekte |
|
||||
| `dotnet test` | Die 476 Tests. Brauchen **keine Datenbank** — sie laufen gegen EF-InMemory |
|
||||
| `dotnet publish -r linux-x64` | Kein Selbstzweck: hier fällt auf, wenn ein Paket doch windows-only ist |
|
||||
| Publish-Prüfung | Erwartet `PolyTrader.App.Avalonia`, `appsettings.json`, `setup.json` und `libSkiaSharp.so` — ohne die native Skia-Bibliothek wäre Avalonia auf Linux nicht lauffähig |
|
||||
|
||||
### `guard` — Plattformneutralität & Hygiene
|
||||
|
||||
| Prüfung | Schlägt fehl bei |
|
||||
|---|---|
|
||||
| Zielframeworks | irgendeinem `<TargetFramework>…-windows` in einer `.csproj` |
|
||||
| WinForms/WPF | `<UseWindowsForms>true` oder `<UseWPF>true` |
|
||||
| Namespaces | echten `using System.Windows.Forms;` / `using System.Drawing;`-Direktiven in `src/` oder `tests/` |
|
||||
| Secret-Dateien | `deploy/packager.config.json`, `appsettings.Local.json`, `master.key`, `openrouter.key`, `.gitea-token` oder `server_settings.xml` **versioniert**; oder einem Deploymentcenter-Token im Klartext |
|
||||
| Schwachstellen | `dotnet list package --vulnerable --include-transitive` findet etwas |
|
||||
|
||||
**Zur Namespace-Prüfung:** Sie trifft bewusst nur echte `using`-Direktiven, keine Kommentare.
|
||||
Im Bestand steht an vielen Stellen erklärt, *warum* `System.Drawing` nicht verwendet wird —
|
||||
das darf keinen Fehlalarm auslösen. Beide Richtungen sind gegengeprüft.
|
||||
|
||||
**Zum Schwachstellen-Check:** Das ist Punkt 1 der wiederkehrenden Audit-Checkliste aus
|
||||
[`sicherheit/SICHERHEITSKONZEPT.md`](./sicherheit/SICHERHEITSKONZEPT.md) — läuft ab jetzt bei
|
||||
jedem Push statt quartalsweise von Hand. Er würde zum Beispiel anschlagen, wenn der
|
||||
`Newtonsoft.Json`-Pin im Core entfernt wird: Nethereum 6.1.0 löst dann transitiv auf 11.0.2
|
||||
auf (GHSA-5crp-9r3c-p9vr, Schweregrad hoch).
|
||||
|
||||
> Die Warnungen des Builds (aktuell 15) lassen die CI **nicht** fehlschlagen. `-warnaserror`
|
||||
> wäre hier verfrüht: die vorhandenen Warnungen müssten erst abgearbeitet werden, sonst ist
|
||||
> die CI ab dem ersten Tag rot und wird ignoriert.
|
||||
|
||||
## 3. Runner einrichten (einmalig)
|
||||
|
||||
Ohne Runner führt Gitea den Workflow nicht aus. Der Runner ist ein eigenes Programm
|
||||
(`act_runner`), das sich beim Gitea-Server meldet und Jobs abholt. Er läuft sinnvollerweise
|
||||
**auf dem Gitea-Host** (`192.168.178.10`) oder jeder anderen Maschine im selben Netz, die
|
||||
Docker hat.
|
||||
|
||||
### 3.1 Registrierungstoken holen
|
||||
|
||||
In der Weboberfläche: **Repo → Einstellungen → Actions → Runner → „Runner erstellen"**.
|
||||
Dort steht ein Token der Form `…`. Alternativ instanzweit unter
|
||||
**Website-Verwaltung → Actions → Runner**, wenn der Runner mehreren Repos dienen soll —
|
||||
für den Anfang genügt der Repo-Runner.
|
||||
|
||||
### 3.2 Runner per Docker starten
|
||||
|
||||
```bash
|
||||
docker run -d --restart always \
|
||||
--name gitea-runner \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v /opt/gitea-runner:/data \
|
||||
-e GITEA_INSTANCE_URL=http://192.168.178.10:8418 \
|
||||
-e GITEA_RUNNER_REGISTRATION_TOKEN=<TOKEN_AUS_3.1> \
|
||||
-e GITEA_RUNNER_NAME=polytrader-runner \
|
||||
-e GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:act-latest \
|
||||
gitea/act_runner:latest
|
||||
```
|
||||
|
||||
**Das `GITEA_RUNNER_LABELS`-Feld ist der kritische Teil.** Es bildet `runs-on: ubuntu-latest`
|
||||
aus dem Workflow auf ein Container-Image ab. Fehlt das Label, bleibt der Job auf
|
||||
„warten auf Runner" stehen, ohne Fehlermeldung. Das Image `catthehacker/ubuntu:act-latest`
|
||||
bringt Node mit, das `actions/checkout` und `actions/setup-dotnet` benötigen.
|
||||
|
||||
Der Mount von `docker.sock` ist nötig, weil der Runner die Job-Container selbst startet.
|
||||
|
||||
### 3.3 Prüfen
|
||||
|
||||
```bash
|
||||
curl -s -H "Authorization: token $(cat ~/.gitea-token)" http://192.168.178.10:8418/api/v1/repos/Richard/PolyTraderSharp/actions/runners
|
||||
```
|
||||
|
||||
Steht dort `"total_count": 0`, hat sich der Runner nicht registriert — dann in die Logs sehen:
|
||||
`docker logs gitea-runner`.
|
||||
|
||||
Danach den Workflow von Hand anstoßen: **Repo → Actions → CI → „Run workflow"**
|
||||
(`workflow_dispatch` ist im Workflow vorgesehen). Der erste Lauf dauert länger, weil das
|
||||
.NET-SDK heruntergeladen wird.
|
||||
|
||||
## 4. Wenn kein Internetzugang besteht
|
||||
|
||||
`actions/setup-dotnet` lädt das SDK von Microsoft. Ist der Runner offline, gibt es zwei Wege:
|
||||
|
||||
1. **Container-Image mit SDK** statt `setup-dotnet` — im Workflow je Job ergänzen:
|
||||
```yaml
|
||||
container:
|
||||
image: mcr.microsoft.com/dotnet/sdk:10.0
|
||||
```
|
||||
Dann muss das `setup-dotnet`-Steps-Paar entfallen. **Achtung:** Dieses Image bringt kein
|
||||
Node mit; `actions/checkout` braucht es. Entweder ein eigenes Image bauen
|
||||
(`dotnet/sdk:10.0` + `nodejs`) oder auschecken per `git clone` statt per Action.
|
||||
2. **SDK im Runner-Image vorinstallieren** und `setup-dotnet` weglassen.
|
||||
|
||||
Weg 1 mit eigenem Image ist der sauberere, sobald das Netz wirklich zu ist.
|
||||
|
||||
## 5. Was die CI (noch) nicht tut
|
||||
|
||||
- **Kein Deployment.** Die Auslieferung läuft über den Deploymentcenter-Packager
|
||||
(`deploy/packager.config.json`, siehe Schnitt D-4). Das bewusst nicht automatisiert, solange
|
||||
die Live-Abnahme aussteht.
|
||||
- **Keine Integrationstests gegen eine echte MySQL.** Die Testsuite läuft gegen EF-InMemory.
|
||||
Ein MySQL-Service-Container wäre der nächste sinnvolle Ausbauschritt, wenn die
|
||||
Repository-Schicht einmal gegen echtes SQL geprüft werden soll.
|
||||
- **Kein `-warnaserror`.** Siehe Kasten in Abschnitt 2.
|
||||
@@ -0,0 +1,166 @@
|
||||
# Projektstand PolyTrader
|
||||
|
||||
**Stand: 22.08.2026** · erstellt beim Frühjahrsputz, alle Angaben am Code nachgeprüft
|
||||
(nicht aus Plandokumenten übernommen — mehrere davon waren veraltet).
|
||||
|
||||
> **Arbeitsteilung:** Dieses Dokument beschreibt, was **ist** — Architektur, Kennzahlen,
|
||||
> Modul-Stand. Was **kommt**, steht in der [ROADMAP.md](./ROADMAP.md). Die Detailpläne im
|
||||
> [Archiv](./archiv/) bleiben maßgeblich für das *Wie*.
|
||||
|
||||
---
|
||||
|
||||
## 1. Kurzfassung
|
||||
|
||||
PolyTrader ist eine modulare Trading- und Analyse-Suite für Polymarket: ein schlanker
|
||||
**Core** und vier eigenständige **Module**, dazu eine plattformneutrale
|
||||
**Avalonia-Oberfläche**.
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Projekte | 7 (Core, 4 Module, Avalonia-App, Tests) — **alle auf `net10.0`** |
|
||||
| Plattform | **Windows und Linux.** Seit dem 22.08.2026 kein `net10.0-windows` mehr im Repo; Linux-Publish verifiziert |
|
||||
| Produktivcode | ~27.100 LOC, davon Core ~8.000, CopyTrading ~7.700, UI ~4.900 |
|
||||
| Tests | **476**, alle grün (~5.700 LOC) |
|
||||
| Build | 0 Fehler, 15 Warnungen (alle im Avalonia-Projekt, siehe §5.3) |
|
||||
| Sicherheit | 0 anfällige Pakete über alle 7 Projekte, inkl. transitiver |
|
||||
| Datenbank | MySQL über EF Core / Pomelo. Mongo und SQLite vollständig entfernt |
|
||||
|
||||
**Der große Bogen ist geschlossen.** Aus dem monolithischen WinForms-Copytrader ist ein
|
||||
modulares, plattformneutrales System geworden. Was noch offen ist, teilt sich sauber in
|
||||
zwei Gruppen: Dinge, die **nur im Zielland mit echtem Geld** abgenommen werden können, und
|
||||
**bewusst zurückgestellte Neuentwicklung**.
|
||||
|
||||
---
|
||||
|
||||
## 2. Architektur
|
||||
|
||||
```
|
||||
PolyTrader.Core Host, Persistenz (EF/MySQL), Settings, Jobs, Logging,
|
||||
CLOB-Client, Streaming, Security, Deploymentcenter-Anbindung
|
||||
│
|
||||
├── Modules.CopyTrading Master-Trader spiegeln
|
||||
├── Modules.ResolutionFarming Favoriten nahe Auflösung
|
||||
├── Modules.Supervisor KI-gestützte Handelsanalyse (OpenRouter)
|
||||
└── Modules.Accounting Unabhängige Buchhaltung aller Live-Accounts
|
||||
│
|
||||
PolyTrader.App.Avalonia Einfenster-Shell mit Seitenleiste
|
||||
```
|
||||
|
||||
**Leitprinzip, das gehalten hat:** Der Core kennt keine Module. Module registrieren sich
|
||||
über `IPolyTraderModule` und liefern ihre Ansichten über einen toolkit-neutralen
|
||||
UI-Contract — deshalb war der Wechsel von WinForms nach Avalonia überhaupt möglich, ohne
|
||||
die Fachlogik anzufassen.
|
||||
|
||||
---
|
||||
|
||||
## 3. Modul-Stand
|
||||
|
||||
| Modul | Stand | Offen |
|
||||
|---|---|---|
|
||||
| **CopyTrading** | Produktiv nutzbar. Rentabilitätsplan und alle Review-Fixes umgesetzt | CLOB-User-/Market-WSS-Kanal + Orderbuch-Check, Partial-Fill-Verdrahtung, echte `fee_rate_bps` — alles live-gebunden |
|
||||
| **ResolutionFarming** | Slices 0–5 fertig: Logik, Persistenz, Scanner, UI, Demo-Execution, Monitor | Live-Anbindung und On-Chain-Redeem |
|
||||
| **Supervisor** | S-0 bis S-4 komplett: Journal, Dossiers, OpenRouter-Agent, Profile, Berichte, Counterfactual | Predictalytics-Werkzeuge (API existiert noch nicht), Live-Key-Test |
|
||||
| **Accounting** | A-1 Ingest, A-2 Abrechnung/BWA/FX und A-4 Export (CSV + PDF) sind gebaut | **A-3 US-Steuerschicht fehlt vollständig** — kein `UsTaxEngine`, kein Form-8949/Schedule-D |
|
||||
|
||||
---
|
||||
|
||||
## 4. Abgeschlossen
|
||||
|
||||
- **Modularisierung** (Phasen 0–6) — Core + vier Module, kein Monolith mehr
|
||||
- **MySQL-Migration** — Mongo restlos raus, `core_`/`mod_`-Schema, Migration über
|
||||
`--migrate-json` / `--verify-mysql` gelaufen
|
||||
- **Linux-Portierung, UI-Teil** — WinForms vollständig nach Avalonia portiert (A1–A4),
|
||||
LiveCharts2 statt ScottPlot, kategorisierter `SettingsEditor` statt `PropertyGrid`
|
||||
- **Einfenster-Shell** — Mehrfenster-Launcher durch eine Shell mit Seitenleiste ersetzt
|
||||
- **Deploymentcenter-Integration** (D-0 bis D-5) — Lizenz, Watchdog, Fehler-Reporting,
|
||||
Auslieferung und Erstinstallation, **code-seitig**
|
||||
- **Sicherheit F1–F6** — AES-GCM at-rest für Keys über `POLYTRADER_MASTER_KEY`, keine
|
||||
Secrets in Argumenten oder Logs
|
||||
- **WinForms-Ausbau** (P11/L5) und **LicenseLabrador-Ablösung** (D-6) — 22.08.2026
|
||||
|
||||
---
|
||||
|
||||
## 5. Offen
|
||||
|
||||
**Steht vollständig in der [ROADMAP.md](./ROADMAP.md).** Dort sind alle Vorhaben nach Stufen
|
||||
geordnet, mit Blockern und Begründungen — dieses Dokument beschreibt den *Ist*-Zustand, die
|
||||
Roadmap den Weg nach vorn. Kurz zusammengefasst:
|
||||
|
||||
- **Stufe A — Abnahme & Fundament:** A5-Abnahme der Oberfläche, CI-Runner, Deploymentcenter
|
||||
live, systemd/Feldtest, Master-Key im Zielland
|
||||
- **Stufe B — Module scharf schalten:** CopyTrading Phase 1 (Marktdaten-Fundament, der
|
||||
wichtigste Einzelposten), ResolutionFarming live, AutoRedeem, Accounting A-3/A-5
|
||||
- **Stufe C — Neue Strategiemodule:** MarketMaking, BundleArbitrage (beide hängen an
|
||||
CopyTrading Phase 1), StrategieDrift und AI-Auflösequalität (zurückgestellt)
|
||||
- **Stufe D — Nicht beschlossen:** DataDriven, Predictalytics-Anbindung
|
||||
- **Technische Schuld:** 15 Build-Warnungen, TerminalLogger/Zeitzone, God-Methoden
|
||||
|
||||
---
|
||||
|
||||
## 6. Der Frühjahrsputz vom 22.08.2026
|
||||
|
||||
Zwei Commits: `dd8da3f` sicherte den unversionierten Arbeitsstand (58 Dateien: die
|
||||
Deploymentcenter-Integration und die Einfenster-Shell lagen uncommittet im Arbeitsbaum),
|
||||
`bf8048b` räumte auf.
|
||||
|
||||
**Entfernt** — 124 Dateien, 10.619 Zeilen weniger:
|
||||
|
||||
- Das **WinForms-Projekt** samt `Ui/`, `Models/`, `Licensing/`, `services/`, `Properties/`,
|
||||
`Resources/icons/`, `Program.cs`, `favicon.ico` und `PolyTrader.App.csproj`
|
||||
- **`LicenseLabrador.Client`** aus `lib/nuget` und dem Quellen-Mapping
|
||||
- **`agentspace/`** (30 Dateien: WinForms-Designer-Patcher, `fix_mongo.py`, Wegwerfskripte)
|
||||
- `Ideen-fuer-Mittwoch.txt`, das Root-`appsettings.json` (Duplikat), lokal `MongoDB/`,
|
||||
`data.db` und eine `.bak`-Datei
|
||||
|
||||
**Beim Aufräumen aufgefallen und mitbehoben:**
|
||||
|
||||
- Der Rückfall-Tag **`winforms-final` lag nur lokal** und war nicht auf dem Server — genau
|
||||
die Sicherung, auf die sich die Doku als Fallback beruft. Jetzt gepusht.
|
||||
- Die Avalonia-App band ihre **PNG-Symbole aus dem Repo-Root** ein (`..\..\Resources\*.png`)
|
||||
und hätte sie beim Ausbau verloren. Sie liegen jetzt in
|
||||
`src/PolyTrader.App.Avalonia/Assets/`; der `avares://`-Pfad blieb gleich.
|
||||
|
||||
**Bewusst *nicht* entfernt**, obwohl Pläne es nahelegten:
|
||||
|
||||
- **`Newtonsoft.Json` im Core** ist kein toter Ballast, sondern ein Sicherheits-Pin:
|
||||
Nethereum 6.1.0 würde sonst transitiv auf 11.0.2 auflösen (GHSA-5crp-9r3c-p9vr).
|
||||
- **Die `Watchdog*`-Felder in `ServerSettings`.** Schnitt D-6 verlangte ihre Entfernung,
|
||||
aber D-1 hatte sie zuvor auf die Deploymentcenter-API *umgewidmet*. Sie sind in Gebrauch;
|
||||
ein Entfernen wäre ein Rückschritt gewesen.
|
||||
- **`Resources/*.png`** — siehe oben.
|
||||
|
||||
**Gesucht und nicht gefunden:** toter Code. Eine Prüfung aller 285 Typen in `src/` gegen
|
||||
ihre Verwendung ergab keinen einzigen verwaisten Typ. Die scheinbaren Treffer waren
|
||||
EF-Design-Time-Factories und Migrationen (per Reflection genutzt) sowie Null-Stubs, die
|
||||
über DI registriert sind. Auch leere `catch {}`-Blöcke: keine.
|
||||
|
||||
**Doku nachgezogen:** Der Modularisierungsplan führte die Phasen 3–6 als „IN ARBEIT"
|
||||
beziehungsweise offen, obwohl sie seit Wochen erledigt waren — die Häkchen sind jetzt am
|
||||
Code nachgeprüft gesetzt. Der Watchdog/LicenseLabrador-Plan ist als **abgelöst**
|
||||
gekennzeichnet, `ANALYSE-Linux-Portierung.md` steht auf Revision 6.
|
||||
|
||||
---
|
||||
|
||||
## 7. Doku-Landkarte
|
||||
|
||||
| Dokument | Rolle |
|
||||
|---|---|
|
||||
| `ROADMAP.md` | **Das Steuerungsdokument** — alle Vorhaben, Status, Reihenfolge |
|
||||
| `PROJEKTSTAND.md` | **Dieses Dokument** — der Ist-Zustand: Architektur, Kennzahlen, Modul-Stand |
|
||||
| `archiv/` | Die Detailpläne, aus denen die Roadmap entstand. Weiterhin die Bauanleitungen |
|
||||
| `LEITFADEN-Avalonia-Portierung.md` | Arbeitsregeln für die Oberfläche. **Vor jeder UI-Arbeit lesen** |
|
||||
| `LEITFADEN-CI.md` | Was die CI prüft und wie der Gitea-Runner eingerichtet wird |
|
||||
| `UI-SPEZIFIKATION-WinForms.md` | Beschreibung der alten Oberfläche — Vergleichsvorlage für A5 |
|
||||
| `sicherheit/SICHERHEITSKONZEPT.md` | Konzept + **wiederkehrende Audit-Checkliste**. Die offenen Kästchen dort sind eine Vorlage, keine Rückstände |
|
||||
| `IDEENSAMMLUNG-Feldtest-2026-08.md` | Beobachtungen aus dem laufenden Einsatz. Nur sammeln |
|
||||
| `.agents/rules/clob.md` | Regeln für alles, was Geld bewegt |
|
||||
|
||||
**Abgelöst, nur noch Verlauf:** `UMSETZUNGSPLAN-Watchdog-LicenseLabrador-Integration.md`
|
||||
|
||||
---
|
||||
|
||||
## 8. Wie es weitergeht
|
||||
|
||||
Die Reihenfolge steht in der **[ROADMAP.md](./ROADMAP.md)**. Die kürzeste Fassung: erst die
|
||||
Abnahmen aus Stufe A abschließen (dort steckt fertige Arbeit, die nur noch bestätigt werden
|
||||
muss), dann CopyTrading Phase 1 — daran hängen beide geplanten Strategiemodule.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user