Account types with the catalog's new combineCmeHolidays flag are read through a combined-day view: holiday-session P&L entries fold into the next full trading day (computed from the federal-holiday rules, so any year works), the day count matches how the firm records it (Apex: Sun/ Mon/Tue around a Monday holiday is ONE day), and on the later sessions of the stretch the earlier sessions' booked P&L carries into realized — so day targets, already-traded gates, target-hit status and the panel's day P&L all treat the stretch as a single day. Off by default; older masters that don't send the flag behave exactly as before. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
81 lines
3.7 KiB
TypeScript
81 lines
3.7 KiB
TypeScript
export interface AccountConfig {
|
|
/** Master's account type id — what a manual assignment pins to. */
|
|
id: string;
|
|
label: string;
|
|
prefix: string;
|
|
profitTarget: number;
|
|
consistency: number;
|
|
minDayPnL: number;
|
|
minTradingDays: number;
|
|
accountSize: number;
|
|
maxLoss: number; // 0 = no limit; positive = account is "Dead" when loss exceeds this
|
|
maxPositionSize: number; // 0 = no limit; positive = max contracts per trade
|
|
targetSameEquity: boolean; // if true, reduce profitTarget by priorProfit after withdrawal
|
|
splitEnabled: boolean; // false = big days trade as one unsplit leg instead of random ≥$800 pieces
|
|
combineCmeHolidays: boolean; // true = CME holiday sessions count with the next full trading day (Apex-style)
|
|
withdrawalStages: { profit: number; consistency: number; minTradingDays: number }[]; // per-stage fresh profit + consistency (empty = use base values)
|
|
}
|
|
|
|
export interface FirmConfig {
|
|
/** Master's firm id (uuid). */
|
|
id: string;
|
|
firm: string;
|
|
/** Blank when this machine has no credentials for the firm. */
|
|
username: string;
|
|
/** True once a Tradovate username and password are stored locally. Firms
|
|
* without them are shown greyed out with an inline credential form. */
|
|
hasCredentials: boolean;
|
|
bannedSymbols: string[];
|
|
/** The firm's account types, straight from the catalog. Doubles as the
|
|
* option list for a manual account-type override. */
|
|
accounts: AccountConfig[];
|
|
catalogUpdatedAt: string;
|
|
}
|
|
|
|
export interface AccountState {
|
|
id: number;
|
|
name: string;
|
|
active: boolean;
|
|
amount: number;
|
|
realizedPnL: number;
|
|
daysTraded: number;
|
|
positionDirection: 'long' | 'short' | null;
|
|
/** Balance floor from Tradovate's auto-liquidation profile (0 = not set) */
|
|
autoLiqThreshold: number;
|
|
/** Sum of all historical daily P&L entries */
|
|
totalProfit: number;
|
|
/** True when today's realizedPnL has met or exceeded the computed daily target */
|
|
targetHit: boolean;
|
|
/** Current stage = 1 + number of withdrawals (negative fund transactions). Stage 1 = fresh account. */
|
|
stage: number;
|
|
/** Next trading day's target, computed server-side. null when account is dead or config is missing. */
|
|
dailyTarget: { amount: number; path: 'first_day' | 'normal_day' | 'reduced_day' } | null;
|
|
/** Actual profit target to hit — max(stage profit target, consistency realTarget = maxDay/consistency). */
|
|
effectiveProfitTarget: number | null;
|
|
/** Current cycle daily P&L — used for target calculations. */
|
|
dailyPnL: { date: string; pnl: number }[];
|
|
/** Full P&L history across all cycles — used for calendar and equity curve display. */
|
|
fullDailyPnL: { date: string; pnl: number }[];
|
|
/** Fund transactions (deposits/withdrawals) — used by the calendar and equity curve. */
|
|
fundTransactions: { date: string; amount: number }[];
|
|
/** Master account type this account resolved to. null = Unassigned. */
|
|
accountTypeId: string | null;
|
|
accountTypeLabel: string | null;
|
|
assignmentSource: 'manual' | 'auto' | 'unassigned';
|
|
/** The resolved config inlined, so client components need no second lookup. */
|
|
accountType: AccountConfig | null;
|
|
/** Size from the initial funding transaction; null until reports return. */
|
|
inferredAccountSize: number | null;
|
|
/** True when more than one account type matched and updatedAt decided it. */
|
|
accountTypeAmbiguous: boolean;
|
|
}
|
|
|
|
export interface FirmState {
|
|
/** Master's firm id — join state to config on this, not on the name, which
|
|
* changes the moment someone renames a firm on the master. */
|
|
firmId: string;
|
|
firm: string;
|
|
connected: boolean;
|
|
accounts: AccountState[];
|
|
}
|