From a8fb11ca86d5ca6dca42975ec34ca2848a23b503 Mon Sep 17 00:00:00 2001 From: Taha Date: Fri, 21 Mar 2025 00:00:44 -0400 Subject: [PATCH] Fixing vol time for SPX/W, and filtering expired exps --- .../Misc/VolSurfaceTimeCalculatorFactory.cs | 12 +++++++++++- .../spark/Security/SecurityExpirationHelper.cs | 13 ++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Analytics/Misc/VolSurfaceTimeCalculatorFactory.cs b/src/client/spark/Analytics/Misc/VolSurfaceTimeCalculatorFactory.cs index cbdb2dcb7..8b0520128 100644 --- a/src/client/spark/Analytics/Misc/VolSurfaceTimeCalculatorFactory.cs +++ b/src/client/spark/Analytics/Misc/VolSurfaceTimeCalculatorFactory.cs @@ -21,13 +21,23 @@ namespace mbts.analytics { private class TimeCalculator : IVolSurfaceTimeCalculator { // TODO, this should be passed in the exp itself private Dictionary utc_time_of_exp_map = new Dictionary() { + // TODO: get it from config {"BTC", TimeSpan.FromHours(8)}, - {"ETH", TimeSpan.FromHours(8)} + {"ETH", TimeSpan.FromHours(8)}, + {"SPXW", TimeSpan.FromHours(20)}, + {"SPX", new TimeSpan(13, 30, 0)} }; public void compute_vol_time(VolSurfaceInput vs_input, VolSurfaceExpiration exp, DateTime voltime, double days_shift, out double yrs, out double days_per_yr) { + days_per_yr = 365; + if (vs_input != null && vs_input.surface_settings != null && vs_input.surface_settings.core_settings != null + && vs_input.surface_settings.core_settings.time_settings != null) { + if (vs_input.surface_settings.core_settings.time_settings.vol_time_measure.account_for_holidays_and_weekends) { + days_per_yr = vs_input.surface_settings.core_settings.time_settings.vol_time_measure.days_per_year; + } + } TimeSpan time_of_exp = TimeSpan.Zero; utc_time_of_exp_map.TryGetValue(exp.symbol, out time_of_exp); // assumes exp is the utc date of expiration diff --git a/src/client/spark/Security/SecurityExpirationHelper.cs b/src/client/spark/Security/SecurityExpirationHelper.cs index 64101308e..28acd4327 100644 --- a/src/client/spark/Security/SecurityExpirationHelper.cs +++ b/src/client/spark/Security/SecurityExpirationHelper.cs @@ -36,9 +36,8 @@ namespace mbts { } public static bool is_unexpired(bts.api.SecurityTuple st, DateTime exp_date) { - if (st.Venue == Venue.Cboe || st.Venue == Venue.Glbx) { - // server is already getting teh righ contracts - return true; + if (st.Venue == Venue.Cboe) { + return exp_date.Date >= DateTime.Now.Date; } TimeSpan exp_time = get_exp_time(st); DateTime full_exp_utc = exp_date.ToUniversalTime().Date.Add(exp_time); @@ -47,8 +46,12 @@ namespace mbts { } public static bool is_unexpired(bts.api.SecurityImmutable sec) { - if (sec.security_tuple().Venue == Venue.Cboe || sec.security_tuple().Venue == Venue.Glbx) - return true; + if (sec.security_tuple().Venue == Venue.Cboe || sec.security_tuple().Venue == Venue.Glbx) { + var exp = sec.to_sec_exp().expiration; + bool is_unexp = exp.Date >= DateTime.Now.Date; + Log.Gen.info($"SecurityExpirationMapper.is_unexpired exp: {exp} is_unexp: {is_unexp}"); + return is_unexp; + } var sec_type = sec.security_type(); switch (sec_type) { case bts.api.SecurityType.Future: