Fix cooldown
This commit is contained in:
@@ -502,7 +502,8 @@ public class TradingBotBase : ITradingBot
|
||||
if (secondsSinceOpenRequest < NEW_POSITION_GRACE_SECONDS)
|
||||
{
|
||||
var remaining = NEW_POSITION_GRACE_SECONDS - secondsSinceOpenRequest;
|
||||
await LogInformation($"⏳ Waiting for broker confirmation\nElapsed: `{secondsSinceOpenRequest:F0}s`\nGrace left: `{remaining:F0}s`");
|
||||
await LogInformation(
|
||||
$"⏳ Waiting for broker confirmation\nElapsed: `{secondsSinceOpenRequest:F0}s`\nGrace left: `{remaining:F0}s`");
|
||||
return; // skip early checks until grace period elapses
|
||||
}
|
||||
|
||||
@@ -1377,8 +1378,9 @@ public class TradingBotBase : ITradingBot
|
||||
|
||||
// Skip the candle-based PnL calculation since we have actual GMX data
|
||||
goto SkipCandleBasedCalculation;
|
||||
}else{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1762,12 +1764,15 @@ public class TradingBotBase : ITradingBot
|
||||
{
|
||||
var position = Positions.Values.First(p => p.SignalIdentifier == signalIdentifier);
|
||||
|
||||
if (positionStatus.Equals(PositionStatus.Canceled)){
|
||||
if (positionStatus.Equals(PositionStatus.Canceled))
|
||||
{
|
||||
var stackTrace = new StackTrace(true);
|
||||
var callingMethod = stackTrace.GetFrame(1)?.GetMethod();
|
||||
var callingMethodName = callingMethod?.DeclaringType?.Name + "." + callingMethod?.Name;
|
||||
|
||||
var exception = new InvalidOperationException($"Position {signalIdentifier} is already canceled for User {Account.User.Name}");
|
||||
var exception =
|
||||
new InvalidOperationException(
|
||||
$"Position {signalIdentifier} is already canceled for User {Account.User.Name}");
|
||||
exception.Data["SignalIdentifier"] = signalIdentifier;
|
||||
exception.Data["PositionId"] = position.Identifier;
|
||||
exception.Data["CurrentStatus"] = position.Status.ToString();
|
||||
@@ -2360,7 +2365,7 @@ public class TradingBotBase : ITradingBot
|
||||
// Calculate cooldown end time based on last position closing time
|
||||
var baseIntervalSeconds = CandleHelpers.GetBaseIntervalInSeconds(Config.Timeframe);
|
||||
var cooldownEndTime = LastPositionClosingTime.Value.AddSeconds(baseIntervalSeconds * Config.CooldownPeriod);
|
||||
var isInCooldown = LastCandle.Date < cooldownEndTime;
|
||||
var isInCooldown = (Config.IsForBacktest ? LastCandle.Date : DateTime.UtcNow) < cooldownEndTime;
|
||||
|
||||
if (isInCooldown)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user