diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 38eab3960..52efce6db 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -1,30 +1,85 @@ -using bts.api; +using bts; using bts.api.admin; -using bts.api.core; -using bts.spark; -using mbts.spark.utilities; -using mbts.utils; using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.ComponentModel.Composition; using System.Linq; using System.Reactive.Linq; -using System.Threading.Tasks; +using System.Reactive.Subjects; namespace mbts.spark { [Export] - class AdminModel { - readonly AdminService _service; + class AdminModel : IDisposable { + readonly string _user_name; + readonly BehaviorSubject> + _accounts_subject = new BehaviorSubject>(new Dictionary()), + _users_subject = new BehaviorSubject>(new Dictionary()); + IReadOnlyDictionary + _account_map = new Dictionary(), + _user_map = new Dictionary(); + IDisposable _dispose; [ImportingConstructor] - private AdminModel(AdminService service) { - _service = service; + AdminModel(AdminService service, [Import("username")]string user_name) { + _user_name = user_name; + _dispose = service.subscribei_admin_data().Select(update => { + IEnumerable active_users = + from admin_data in update.all + from bts_user in admin_data.Users + where bts_user.Name == user_name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions + select bts_user; - on_admin_data = _service.subscribei_admin_data().Table().Replay(1).RefCount(); + IEnumerable active_accounts = + from admin_data in update.all + from bts_account in admin_data.Accounts + where bts_account.IsPresent + join account_id in ( + from bts_user in active_users + from account_id in bts_user.UserData.AccountPermissions.AccountPermissions.Keys + select account_id + ) on bts_account.Id equals account_id + select bts_account; + + var users = active_users.ToDictionary(u => u.Id, u => u.Name); + var accounts = active_accounts.ToDictionary(a => a.Id, a => a.Name); + return (users, accounts); + }).Subscribe(t => { + _account_map = t.accounts; + _user_map = t.users; + _users_subject.OnNext(_user_map = t.users); + _accounts_subject.OnNext(_account_map = t.accounts); + }); } - public IObservable> on_admin_data { get; } + public IObservable> on_users => _users_subject.AsObservable(); + public IObservable> on_accounts => _accounts_subject.AsObservable(); + public IObservable> on_user_tuples => on_users.Select(d => d.Select(kv => new UserTuple(kv.Key, kv.Value)).ToList()); + public IObservable> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList()); + public UserTuple? get_current_user() { + foreach (var kv in _user_map) { + // just for good measure, there should never be > 1 element in _user_map, and it should always match _user_name + if (kv.Value == _user_name) + return new UserTuple(kv.Key, kv.Value); + } + return null; + } + public AccountTuple? get_default_account() { + foreach (var kv in _account_map) { + return new AccountTuple(kv.Key, kv.Value); + } + return null; + } + public uint? get_user_id(string user) => _id_for_name(user, _user_map); + public uint? get_account_id(string account) => _id_for_name(account, _account_map); + public void Dispose() => Disposable.dispose(ref _dispose); + + static uint? _id_for_name(string name, IReadOnlyDictionary map) { + foreach (var kv in map) { + if (kv.Value == name) + return kv.Key; + } + return null; + } } } \ No newline at end of file diff --git a/src/client/spark/Daemons/ShellLatencyDaemon.cs b/src/client/spark/Daemons/ShellLatencyDaemon.cs index 4e7c09760..827e80d49 100644 --- a/src/client/spark/Daemons/ShellLatencyDaemon.cs +++ b/src/client/spark/Daemons/ShellLatencyDaemon.cs @@ -29,7 +29,7 @@ namespace bts.perf { } void on_tick(Update update) { - if (update.added.Count > 0) { + if (update.added.Any()) { var tick = update.added.Last(); _service.report_async(new Report() { HostName = _hostname, diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index 960b2819e..25a8e9f8e 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -1,23 +1,16 @@ -using bts.api.core; -using System; -using System.Collections.Generic; -using System.ComponentModel.Composition; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using bts.api.user; -using bts.api.persistence; -using bts.support; +using bts.api.admin; +using bts.api.core; using bts.api.orderman; +using bts.api.persistence; +using bts.api.position; using bts.api.synthetic; -using bts.api.diagnostic; -using bts.api.admin; +using bts.api.user; using bts.metrics; +using bts.support; +using System.ComponentModel.Composition; -namespace Spark -{ - public class ShellServices - { +namespace Spark { + public class ShellServices { [Export] public static ServiceContext context { get; } = new ServiceContext(); @@ -45,6 +38,7 @@ namespace Spark [Export] public ShellLatencyService shell_latency_service => context.locate(); - + [Export] + public PositionService position_service => context.locate(); } -} +} \ No newline at end of file diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 97414d6ea..a4bd1d091 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; @@ -6,8 +7,9 @@ using System.Windows.Media.Imaging; namespace mbts.ui { public class Icons { public const string - PaymentGeometryKey = "PaymentGeometry", - OrdersGeometryKey = "OrdersGeometry"; + PaymentGeometryKey = nameof(PaymentGeometryKey), + OrdersGeometryKey = nameof(OrdersGeometryKey), + ToolsGeometryKey = nameof(ToolsGeometryKey); static readonly string base_uri = "pack://application:,,,/Images/Icons/"; private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute)); @@ -106,6 +108,7 @@ namespace mbts.ui { public static ImageSource Spawn { get { return (DrawingImage)_resources["Spawn"]; } } public static ImageSource Target { get { return (DrawingImage)_resources["Target"]; } } public static ImageSource Tetris { get { return (DrawingImage)_resources["Tetris"]; } } + public static ImageSource Tools => create_icon(ToolsGeometryKey); public static ImageSource ViewSettings => (DrawingImage)_resources["ViewSettings"]; public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } } public static ImageSource UpArrow { get { return (DrawingImage)_resources["UpArrow"]; } } @@ -114,12 +117,21 @@ namespace mbts.ui { public static ImageSource create_icon(string geometric_path_key) => create_icon(geometric_path_key, Brushes.Black); public static ImageSource create_icon(string geometric_path_key, Brush brush, Pen pen = null) { - string path = _resources[geometric_path_key] as string; - if (string.IsNullOrEmpty(path)) - throw new ArgumentException($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); - var geometry = Geometry.Parse(path); + object obj = _resources[geometric_path_key]; + if (obj is string path) { + if (string.IsNullOrEmpty(path)) + throw new ArgumentException($"Resource lookup of '{geometric_path_key}' did not return a valid string.", nameof(geometric_path_key)); + return _create_icon(new[] { path }, brush, pen); + } else if (obj is string[] paths) { + return _create_icon(paths, brush, pen); + } else return null; + } + + static ImageSource _create_icon(IEnumerable paths, Brush brush, Pen pen = null) { var drawing_group = new DrawingGroup(); - drawing_group.Children.Add(new GeometryDrawing(brush, pen, geometry)); + foreach (string p in paths) { + drawing_group.Children.Add(new GeometryDrawing(brush, pen, Geometry.Parse(p))); + } return new DrawingImage(drawing_group); } } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 39331734b..487fb4425 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -5,13 +5,16 @@ xmlns:mbts="clr-namespace:mbts.ui" xmlns:sys="clr-namespace:System;assembly=mscorlib" > + + M50.14375,33.389126C50.416863,33.394688,50.653496,33.587773,50.705998,33.864617L50.015995,45.114388C49.810295,46.291462,49.130394,45.097489,49.130394,45.097489L47.65659,42.640538C42.747776,49.635197 34.633152,54.221001 25.433924,54.221001 14.884193,54.221001 5.7437552,48.204125 1.2449617,39.419205 0.80087067,38.552021 0.21358696,37.705738 0.052086769,36.736958 -0.49735315,33.490925 3.4507786,32.901036 4.8049124,34.432404 5.3674143,35.067692 6.034036,36.16407 6.5079177,37.026051 10.106778,43.799416 17.2321,48.413819 25.433924,48.413819 32.656544,48.413819 39.026364,44.826695 42.903977,39.351506L40.229367,38.854115C40.229367,38.854115,38.677464,38.647118,39.742466,37.996033L50.024895,33.398526C50.064972,33.391365,50.104733,33.388333,50.14375,33.389126z M23.030291,9.0310004L27.889918,9.0310004 27.889918,13.028299C30.539786,13.205498,32.324932,13.958096,33.464161,14.528294L33.964176,14.775793 32.417435,20.038878 31.706417,19.68068C30.579987,19.11958 28.839241,18.244583 26.149073,18.244583 24.006916,18.244583 22.723183,19.122181 22.723183,20.590876 22.723183,21.894272 23.943314,22.804369 27.551308,24.187165 32.706444,26.124659 34.911,28.702853 34.911,32.817341 34.911,36.892929 32.090527,40.05172 27.673611,40.989117L27.673611,45.540001 22.767485,45.540001 22.767485,41.330414C20.252919,41.155815,17.695551,40.424118,16.101811,39.404721L15.683999,39.137619 17.221739,33.731438 17.969059,34.180634C19.088988,34.851235 21.402748,35.97873 24.340325,35.97873 26.734886,35.97873 28.276728,34.921635 28.276728,33.291336 28.276728,31.986641 27.547409,30.853846 23.986016,29.57255 20.083815,28.144253 16.095511,26.04406 16.095511,21.239174 16.095511,17.280985 18.737379,14.291395 23.030291,13.329098z M25.268765,0C35.819447,2.7347414E-07 44.961449,6.0155495 49.458798,14.804573 49.902695,15.669173 50.490094,16.516972 50.651287,17.48427 51.198281,20.734265 47.255726,21.318962 45.901341,19.789065 45.336346,19.153567 44.669552,18.051968 44.19566,17.19517 40.5957,10.421881 33.473275,5.8072398 25.268765,5.8072393 18.047545,5.8072398 11.678013,9.3918336 7.8003562,14.867073L10.474627,15.367072C10.474627,15.367072,12.026909,15.574172,10.962921,16.223872L0.67933281,20.826762C0.36037083,20.880062,0.057029126,20.669165,0.00099972012,20.354063L0.69093342,9.1118043C0.89552094,7.9296158,1.5738537,9.124924,1.5738539,9.124924L3.0452772,11.583379C7.9566038,4.584462,16.073666,2.7347414E-07,25.268765,0z + M28.000001,6.0000026L28.000001,15 6.0010006,15 6.0010006,17.000003 30.001,17.000003 30.001,6.0000026z M14.231,2.9540056L14.979999,2.9540056 14.979999,3.987005C15.704998,4.009005,16.200997,4.178005,16.550998,4.3600049L16.248998,5.0620046C15.994998,4.9340047 15.499998,4.7010047 14.725999,4.7010047 13.796,4.7010047 13.445001,5.1900046 13.445001,5.6160046 13.445001,6.1710043 13.893,6.4470041 14.943999,6.8310037 16.187998,7.2780037 16.816998,7.8320036 16.816998,8.7800031 16.816998,9.6210027 16.151998,10.409003 14.907999,10.591002L14.907999,11.698002 14.146,11.698002 14.146,10.622003C13.445001,10.611002,12.720001,10.420002,12.297002,10.154003L12.587001,9.4400029C13.022001,9.696003 13.651,9.8980026 14.328,9.8980026 15.185999,9.8980026 15.765998,9.4620028 15.765998,8.8540034 15.765998,8.2680035 15.293999,7.9060035 14.4,7.5870035 13.167001,7.1610038 12.406001,6.6710041 12.406001,5.7440041 12.406001,4.8600047 13.119,4.189005 14.231,4.0290052z M2,2.0000002L2,13 26.000001,13 26.000001,2.0000002z M0,0L28.000001,0 28.000001,4.0000031 32.001,4.0000031 32.001,19.000003 4.0010006,19.000003 4.0010006,15 0,15z - - M50.14375,33.389126C50.416863,33.394688,50.653496,33.587773,50.705998,33.864617L50.015995,45.114388C49.810295,46.291462,49.130394,45.097489,49.130394,45.097489L47.65659,42.640538C42.747776,49.635197 34.633152,54.221001 25.433924,54.221001 14.884193,54.221001 5.7437552,48.204125 1.2449617,39.419205 0.80087067,38.552021 0.21358696,37.705738 0.052086769,36.736958 -0.49735315,33.490925 3.4507786,32.901036 4.8049124,34.432404 5.3674143,35.067692 6.034036,36.16407 6.5079177,37.026051 10.106778,43.799416 17.2321,48.413819 25.433924,48.413819 32.656544,48.413819 39.026364,44.826695 42.903977,39.351506L40.229367,38.854115C40.229367,38.854115,38.677464,38.647118,39.742466,37.996033L50.024895,33.398526C50.064972,33.391365,50.104733,33.388333,50.14375,33.389126z M23.030291,9.0310004L27.889918,9.0310004 27.889918,13.028299C30.539786,13.205498,32.324932,13.958096,33.464161,14.528294L33.964176,14.775793 32.417435,20.038878 31.706417,19.68068C30.579987,19.11958 28.839241,18.244583 26.149073,18.244583 24.006916,18.244583 22.723183,19.122181 22.723183,20.590876 22.723183,21.894272 23.943314,22.804369 27.551308,24.187165 32.706444,26.124659 34.911,28.702853 34.911,32.817341 34.911,36.892929 32.090527,40.05172 27.673611,40.989117L27.673611,45.540001 22.767485,45.540001 22.767485,41.330414C20.252919,41.155815,17.695551,40.424118,16.101811,39.404721L15.683999,39.137619 17.221739,33.731438 17.969059,34.180634C19.088988,34.851235 21.402748,35.97873 24.340325,35.97873 26.734886,35.97873 28.276728,34.921635 28.276728,33.291336 28.276728,31.986641 27.547409,30.853846 23.986016,29.57255 20.083815,28.144253 16.095511,26.04406 16.095511,21.239174 16.095511,17.280985 18.737379,14.291395 23.030291,13.329098z M25.268765,0C35.819447,2.7347414E-07 44.961449,6.0155495 49.458798,14.804573 49.902695,15.669173 50.490094,16.516972 50.651287,17.48427 51.198281,20.734265 47.255726,21.318962 45.901341,19.789065 45.336346,19.153567 44.669552,18.051968 44.19566,17.19517 40.5957,10.421881 33.473275,5.8072398 25.268765,5.8072393 18.047545,5.8072398 11.678013,9.3918336 7.8003562,14.867073L10.474627,15.367072C10.474627,15.367072,12.026909,15.574172,10.962921,16.223872L0.67933281,20.826762C0.36037083,20.880062,0.057029126,20.669165,0.00099972012,20.354063L0.69093342,9.1118043C0.89552094,7.9296158,1.5738537,9.124924,1.5738539,9.124924L3.0452772,11.583379C7.9566038,4.584462,16.073666,2.7347414E-07,25.268765,0z + + M4.9629898,25.440168C4.564003,25.440168 4.0650101,25.640182 3.7659989,25.939165 3.0680008,26.638176 3.0680008,27.635191 3.7659989,28.3342 4.4639969,29.032204 5.4620133,29.032204 6.1600113,28.3342 6.8589859,27.635191 6.8589859,26.638176 6.1600113,25.939165 5.760994,25.640182 5.3620072,25.440168 4.9629898,25.440168z M18.432014,18.457121L22.422005,22.447138 24.816994,22.946165 29.107002,29.431192 27.509987,31.027212 21.025002,26.737175 20.526985,24.343178 16.535988,20.352123z M8.1560135,18.357115L13.643013,23.84415C11.048988,26.638176 8.9539872,28.932196 7.9560013,29.930189 6.359993,31.526207 3.6659928,31.626215 2.070015,29.930189 0.47400668,28.3342 0.47400668,25.640182 2.070015,24.044165z M2.967995,6.7840408C2.768013,6.7840408 2.5690079,6.8840479 2.4690018,6.9840545 2.1699906,7.2830371 2.1699906,7.7820638 2.4690018,8.0810469L11.746986,17.359123C12.047005,17.659113 12.544991,17.659113 12.845009,17.359123 13.14399,17.06011 13.14399,16.561113 12.845009,16.2621L3.5659867,6.9840545C3.3670121,6.8840479,3.1669998,6.7840408,2.967995,6.7840408z M5.2620011,4.4890431C5.0629959,4.4890431 4.8630143,4.5890192 4.7640152,4.6890262 4.3649979,4.9880394 4.3649979,5.4870356 4.7640152,5.8860554L14.042,15.164101C14.341011,15.46409 14.840004,15.46409 15.139015,15.164101 15.439003,14.865087 15.439003,14.366092 15.139015,14.067109L5.8610001,4.6890262C5.661995,4.5890192,5.4620133,4.4890431,5.2620011,4.4890431z M4.3649979,2.3940283C5.4620133,2.3940281,6.5589981,2.7930175,7.3580094,3.5920337L19.328987,15.46409 13.342995,21.450153 1.2720107,9.6770657C-0.42400357,7.9810704 -0.42400357,5.2880291 1.2720107,3.6910337 2.1699906,2.7930175 3.267006,2.3940281 4.3649979,2.3940283z M24.217995,0C25.31501,-8.5992724E-08,26.312996,0.20001344,27.211006,0.59900296L23.021004,4.7890328C22.223,5.5870422,22.223,6.7840408,23.021004,7.4820436L24.617012,9.079069C25.414986,9.8770789,26.612007,9.8770789,27.311012,9.079069L31.501015,4.9880394C31.799995,5.8860554 32.000008,6.7840408 32.000008,7.7820638 32.000008,12.07207 28.508003,15.564097 24.217995,15.564097 19.927986,15.564097 16.436012,12.07207 16.436012,7.7820638 16.436012,3.4920272 19.927986,-8.5992724E-08 24.217995,0z diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml index 0094ac79f..4dcc5f268 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml @@ -256,14 +256,27 @@ + > + + + + + @@ -272,6 +285,9 @@ + + + - - - - - - - - - - Sounds - - - No Sounds - - - - - (click to add) - - - - + + + + + + + + + + + + Play Sound + - - Enable Toast Notifications + + + + Show Notification + + @@ -492,10 +513,6 @@ - - - - diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 0fb815cbe..2adbb7390 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -1,8 +1,11 @@ - + @@ -13,6 +16,8 @@ + 4 + 4 + @@ -53,20 +71,94 @@ + + + + + + - + - + + + - Order Badge Style - - Alternate Order Qty - - + Order Badge Style + + + Alternate Order Qty + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,7 +231,7 @@ - + @@ -180,7 +272,7 @@ Palettes="{Binding palettes}" SelectedColor="{Binding color}" /> - + @@ -194,49 +286,60 @@ - + + + + Opacity="0.2" + Visibility="{Binding show_session_range, Converter={StaticResource BooleanToVisibilityConverter}}" + Style="{StaticResource ColumnBackground}" + > + + + + + + + - - - - - + VerticalAlignment="Bottom" + Height="2" + Visibility="{Binding column_span, Converter={StaticResource ColumnSpanToVisibilityConverter}}" + > + + + + + + @@ -246,17 +349,5 @@ - \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs index 4a229cc3c..c95184598 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs @@ -1,4 +1,7 @@ -using System.Windows.Controls; +using mbts.ui.converters; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; namespace mbts.ui.spark { /// @@ -9,5 +12,8 @@ namespace mbts.ui.spark { public LadderSettingsView() => InitializeComponent(); + + public static IMultiValueConverter MktBreakLineBrushConverter = + ValueConverter.create((color, show) => show ? new SolidColorBrush(color) : Brushes.Transparent); } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 5ea6cc9d2..c3bee34a9 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -21,7 +21,7 @@ namespace mbts.spark { class LadderVM : DisposableViewModelBase, IKeyListener { readonly IBus _bus; readonly LadderModel _model; - readonly Property _high, _low, _change, _open, _settlement; + readonly Property _high, _low, _change, _open, _settlement, _position; readonly Property _volume; readonly Property _auto_clear; readonly Property _bid_background, _bid_foreground, _ask_background, _ask_foreground; @@ -36,11 +36,15 @@ namespace mbts.spark { _equality = TickUtils.tick_equality_comparer(_model.security.ContractSpec); _slot_price_vs_orders = new Dictionary(_equality); _settings_manager = settings_manager; + order_properties_vm = new OrderPropertiesEditorVM(_model.order_gateway, Observable.Return(_model.security_md), _settings_manager.subscribe_current().Select(s => new InlineOrderProperties(_model.order_gateway, s))); _high = backing(nameof(high), double.NaN); _low = backing(nameof(low), double.NaN); _change = backing(nameof(change), double.NaN); _open = backing(nameof(open), double.NaN); _settlement = backing(nameof(settlement), double.NaN); + _position = backing(nameof(position), order_properties_vm.observe_account(true).Select(a => a.name) + .SelectMany(a => _model.order_gateway.security_total_position(security.Id, a)) + .OnDispatcher()); _volume = backing(nameof(volume), 0ul); _auto_clear = backing(nameof(auto_clear), false); _status = backing(nameof(status_message), ""); @@ -53,6 +57,7 @@ namespace mbts.spark { Property brush_prop(string name, Func get_brush) => backing(name, settings_manager.subscribe_current().OnDispatcher(), get_brush); // + position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(position))); send_order_command = new DelegateCommand<(double price, Side? side, bool size_from_alternate)>(send_order); cancel_command = new AsyncCommand(_model.cancel_orders, true); show_book_command = new DelegateCommand(_show_book); @@ -71,14 +76,14 @@ namespace mbts.spark { _dispose = Disposable.Create( settings_command, - order_properties_vm = new OrderPropertiesEditorVM(model.order_gateway, Observable.Return(model.security_md), _settings_manager.subscribe_current().Select(s => new InlineOrderProperties(model.order_gateway, s))), + order_properties_vm, size_calculator = new CalculatorLogic(0, _settings_manager.subscribe_current().Select(s => s.calculator_buttons)), bus.subscribe(SparkTags.LogActivity).OnDispatcher().Subscribe(status_update), model.order_gateway.working_orders.OnDispatcher().Subscribe(working => { // Here we manage N orders to 1 price slot in the ladder Dictionary> orders_used_in_this_update = new Dictionary>(_equality); - var ladders_orders = working.Values.Where(o => o.Def.SecurityKey == security.Id); + var ladders_orders = working.Values.Where(o => o.Def.SecurityKey == security.Id && (o.HasState && o.State.DisplayStatus == OrderState.Types.DisplayStatus.Visible)); foreach (var wo in ladders_orders) { var slot_price_target = wo.price(); var order_type = wo.order_type(); @@ -122,6 +127,26 @@ namespace mbts.spark { // update dirty brushes and text foreach (var lovm in _slot_price_vs_orders.Values) { + // the parent algo is only valid when there is only a single order at a level + if (lovm.orders.Count() == 1) { + var only_order = lovm.orders.First(); + + if (only_order.has_parent()) { + var traversal_candidate = only_order; + bool exit_early = false; + while (!exit_early && traversal_candidate.ParentKey != 0) { + var found_parent = working.Where(o => o.Key == traversal_candidate.ParentKey); + if (found_parent.Count() == 1) + traversal_candidate = found_parent.First().Value; + else + exit_early = true; + } + if (!exit_early) + // we have successfully reached the root + lovm.parent_algo_type = traversal_candidate.Def.CustomDef.CustomCase; + } + // else this a single order, so do nothing + } lovm.update(); } @@ -155,6 +180,7 @@ namespace mbts.spark { Property _status_brush; public Brush status_background => _status_brush.Value; + public ICommand position_click_command { get; } public ICommand status_click_command => SparkCommands.ShowActivityLog.ICommand(_bus); public async void status_update(Activity a) { @@ -175,6 +201,7 @@ namespace mbts.spark { public double change => _change.Value; public double open => _open.Value; public double settlement => _settlement.Value; + public double position => _position.Value; public ulong volume => _volume.Value; public bool auto_clear { get => _auto_clear.Value; set => _auto_clear.set(value); } public CalculatorLogic size_calculator { get; } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 3f5f82027..933b75260 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -372,11 +372,22 @@ ItemsSource="{Binding order_types}" SelectedItem="{Binding selected_order_type}" /> + @@ -451,6 +462,11 @@ + + + + + diff --git a/src/client/spark/view/Spark/Ladder/LaderRender.cs b/src/client/spark/view/Spark/Ladder/LaderRender.cs index 8a391b491..67afb3566 100644 --- a/src/client/spark/view/Spark/Ladder/LaderRender.cs +++ b/src/client/spark/view/Spark/Ladder/LaderRender.cs @@ -171,6 +171,12 @@ namespace mbts.spark { } } + public static void render_session_range(DrawingVisual dv, uint color, LadderColumnSettings settings, int low_index, int high_index, double[] prices, double row_height) { + using (var dc = dv.RenderOpen()) + using (_draw_with_clip(dc, settings, row_height, prices.Length)) + dc.DrawRectangle(new SolidColorBrush(color.rgb_color()) { Opacity = 0.2 }, null, new Rect(0, high_index * row_height, settings.width, (low_index - high_index) * row_height)); + } + static IDisposable _draw_with_clip(DrawingContext dc, LadderColumnSettings settings, double row_height, int row_count) { dc.PushClip(new RectangleGeometry(new Rect(0, 0, settings.width, row_height * row_count))); return Disposable.Create(dc.Pop); diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index d6917b3c1..6a3305db3 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -15,7 +15,7 @@ using static bts.api.orderman.Fill.Types; namespace mbts.spark { class PAndLVM : DisposableViewModelBase { - + public PAndLVM(IBus bus, PAndLModel model, PAndLStartupData startup_data) { _bus = bus; _model = model; @@ -30,13 +30,12 @@ namespace mbts.spark { // since we'll need to create a new PnLCalculator when this changes. (infrequent, if ever) _selected_pnl_calc_type.Value = (startup_data != null && startup_data.calc_type != pnl_calc_type.none) ? startup_data.calc_type : pnl_calc_type.midpoint; _selected_pnl_calc_type.Changed += pnl_calc_type_changed; - _start_of_day_ts = (startup_data != null && startup_data.start_of_day_time.HasValue) ? startup_data.start_of_day_time.Value : new TimeSpan(16, 30, 0); var pnl = model.on_pnl_data .Sample(_POSITION_UPDATE_PERIOD) .OnDispatcher() .Subscribe(p => { if (p != null) { - PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value, _start_of_day_ts); + PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value); var summary_position_rows = calc.get_summary_position(); _pnl_data.sync_with(summary_position_rows); _last_pnl_update_time = DateTime.Now; @@ -113,6 +112,7 @@ namespace mbts.spark { void _update_totals() { if (pnl_view != null) { total_aggregate_pnl = pnl_view.Cast().Where(r => !Double.IsNaN(r.total_pnl)).Sum(r => r.total_pnl); + total_aggregate_day_pnl = pnl_view.Cast().Where(r => !Double.IsNaN(r.total_pnl)).Sum(r => r.day_pnl); total_aggregate_net_pos = pnl_view.Cast().Sum(r => r.total_net_position); total_aggregate_buy_qty = pnl_view.Cast().Sum(r => r.day_long_quantity); total_aggregate_sell_qty = pnl_view.Cast().Sum(r => r.day_short_quantity); @@ -153,6 +153,14 @@ namespace mbts.spark { } } + public double total_aggregate_day_pnl { + get { return _total_aggregate_day_pnl; } + set { + _total_aggregate_day_pnl = value; + RaisePropertyChanged(); + } + } + public double total_aggregate_net_pos { get { return _total_aggregate_net_pos; } set { @@ -177,10 +185,6 @@ namespace mbts.spark { } } - public TimeSpan start_of_day { - get { return _start_of_day_ts; } - } - #region Filters public IDataGridColumnPersistentFilter account_filter { get; } = new RegexFilterVM(r => r.account, nameof(PnLSummaryRow.account)); @@ -227,8 +231,7 @@ namespace mbts.spark { static readonly TimeSpan _POSITION_UPDATE_PERIOD = TimeSpan.FromMilliseconds(333); readonly Property _selected_pnl_calc_type; - double _total_aggregate_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; - TimeSpan _start_of_day_ts; + double _total_aggregate_pnl, _total_aggregate_day_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; DateTime _last_pnl_update_time = DateTime.MinValue; ObservableCollection _pnl_data = new ObservableCollection(); diff --git a/src/client/spark/view/Spark/PAndL/PAndLView.xaml b/src/client/spark/view/Spark/PAndL/PAndLView.xaml index 1ba3817a1..3f75eaa5a 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLView.xaml +++ b/src/client/spark/view/Spark/PAndL/PAndLView.xaml @@ -175,7 +175,7 @@ - + @@ -183,14 +183,40 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201,23 +227,13 @@ - - - - - - - - - - - - - - + + + + diff --git a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs index 9b2d09dc0..0fa58bd01 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs @@ -30,8 +30,7 @@ namespace mbts.spark { new PAndLWindowFactory.PAndLStartupData( _vm.get_sorting_states(), _vm.get_filters_states(), - _vm.selected_pnl_calc_type, - _vm.start_of_day + _vm.selected_pnl_calc_type ); public override UIElement Content => _view; public override double MinWidth => 894; diff --git a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs index aef487543..4376bba24 100644 --- a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs +++ b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs @@ -17,41 +17,46 @@ namespace mbts.spark { } class MarketSchedule { - public string product_complex; // FIX 1227 - public int market_segment_id; // FIX 1300 - public string security_group; // FIX 1151 - // trade date FIX 75 vs (FIX 336, FIX 341) - public Dictionary> sessions; static readonly double _cme_gen_open_hrs; + + const string cst_id = "Central Standard Time"; + // the sod time in config says it's stored in UTC, but it really represents 16:30 Central Daylight Time + // i.e. 21:30 UTC corresponds to 16:30 Central (4:30 PM), but only during *CDT* + // CDT it UTC -5 + // CST is UTC -6 + static readonly int sod_hh = (int)config.Configuration.get().sod_hh; + static readonly int sod_mm = (int)config.Configuration.get().sod_mm; + static readonly TimeZoneInfo central_tzi = TimeZoneInfo.FindSystemTimeZoneById(cst_id); + static readonly DateTime _start_of_trading_day_utc; + static readonly DateTime _adjusted_central_sod; + + + static readonly DateTime unadjusted_central_sod = TimeZoneInfo.ConvertTimeFromUtc( + DateTime.UtcNow.Date.Add(new TimeSpan(sod_hh, sod_mm, 0)), + central_tzi + ); + static MarketSchedule() { var cme_schedule = config.Configuration.get(); _cme_gen_open_hrs = cme_schedule?.gen_open_hour ?? 8.5; + + _adjusted_central_sod = !central_tzi.IsDaylightSavingTime(unadjusted_central_sod) ? unadjusted_central_sod.AddHours(1) : unadjusted_central_sod; + + // Note that this isn't the acutal start of the trading day + // but it's close enough for pnl purposes. + // In reality, instruments have different schedules + + // if now is less than the current sod, then we me move the sod back a day to account for the trading day start + if (_adjusted_central_sod >= TimeZoneInfo.ConvertTime(DateTime.Now, central_tzi)) { + _adjusted_central_sod = _adjusted_central_sod.AddDays(-1); + } + var local_time_zone_sod = TimeZoneInfo.ConvertTime(_adjusted_central_sod, central_tzi, TimeZoneInfo.Local); + _start_of_trading_day_utc = local_time_zone_sod.ToUniversalTime(); } // for object initializers public MarketSchedule() { } - public static MarketSchedule es_schedule { - get { - return new MarketSchedule { - product_complex = "MINI S&P FUTURES", - market_segment_id = 64, - security_group = "ES", - sessions = new Dictionary>() { - { DateTime.ParseExact("20180301","yyyyMMdd", null), new List<(trading_session_state session_state, DateTime session_start_time)>() { - (trading_session_state.ReadyToTrade, get_utctimestamp_as_localtime("20180301213000000000")), - } - }, // single day dict entry - { DateTime.ParseExact("20180302","yyyyMMdd", null), new List<(trading_session_state session_state, DateTime session_start_time)>() { - (trading_session_state.ReadyToTrade, get_utctimestamp_as_localtime("20180301230000000000")), - (trading_session_state.Close, get_utctimestamp_as_localtime("20180302220000000000")) - } - } // single day dict entry - } // all sessions for the week - }; // specific market schedule - } // get - } - /// /// Returns the CME general open time of the most recent trading date (i.e today, or last Friday if today is not a weekday). /// @@ -78,30 +83,21 @@ namespace mbts.spark { class PnLCalculator { readonly IEnumerable _data; readonly pnl_calc_type _calc_type; - readonly DateTime _start_of_trading_day_utc; - public PnLCalculator(IEnumerable data, pnl_calc_type calc_type, TimeSpan start_of_day_ts) { + public PnLCalculator(IEnumerable data, pnl_calc_type calc_type) { _data = data; _calc_type = calc_type; - // Note that this isn't the acutal start of the trading day - // but it's close enough for pnl purposes. - // In reality, instruments have different schedules - var _start_of_trading_day_local = DateTime.Now.Date.Add(start_of_day_ts); - if (_start_of_trading_day_local >= DateTime.Now) { - _start_of_trading_day_local = _start_of_trading_day_local.AddDays(-1); - } - _start_of_trading_day_utc = _start_of_trading_day_local.ToUniversalTime(); } public IEnumerable get_summary_position() { return (from pnl_item in _data group pnl_item by (pnl_item.account, pnl_item.exchange, pnl_item.symbol, pnl_item.security, pnl_item.sec_md, pnl_item.security_type) into grouping /* let start_of_day = _get_start_of_day(grouping.Key.symbol) */ - select new PnLSummaryRow(_calc_type, _start_of_trading_day_utc, grouping.Key, - grouping.Where(y => y.fill.Timestamp.ToDateTime() >= _start_of_trading_day_utc).Sum(y => (uint)y.buy_quantity), - grouping.Where(y => y.fill.Timestamp.ToDateTime() >= _start_of_trading_day_utc).Sum(y => (uint)y.sell_quantity), + select new PnLSummaryRow(_calc_type, grouping.Key, + grouping.Where(y => y.fill.FillKind != Fill.Types.FillKind.Sod).Sum(y => (uint)y.buy_quantity), + grouping.Where(y => y.fill.FillKind != Fill.Types.FillKind.Sod).Sum(y => (uint)y.sell_quantity), grouping.Sum(y => (int)(y.buy_quantity - y.sell_quantity)), - grouping.Where(y => y.fill.Timestamp.ToDateTime() < _start_of_trading_day_utc).Sum(y => (int)(y.buy_quantity - y.sell_quantity)), + grouping.Where(y => y.fill.FillKind == Fill.Types.FillKind.Sod).Sum(y => (int)(y.buy_quantity - y.sell_quantity)), grouping.weighted_average(y => y.fill.LastPrice, y => y.buy_quantity), grouping.weighted_average(y => y.fill.LastPrice, y => y.sell_quantity), grouping.Select(i => i.fill) diff --git a/src/client/spark/view/Spark/PAndL/PnLData.cs b/src/client/spark/view/Spark/PAndL/PnLData.cs index b4096f6e2..99c441c16 100644 --- a/src/client/spark/view/Spark/PAndL/PnLData.cs +++ b/src/client/spark/view/Spark/PAndL/PnLData.cs @@ -2,6 +2,7 @@ using bts.api.orderman; using System; using System.ComponentModel; +using static bts.api.orderman.Fill.Types; namespace mbts.spark { @@ -35,8 +36,8 @@ namespace mbts.spark { public FillImmutable fill => _fill_tuple.fill; public SecurityMD? sec_md => _fill_tuple.security_md; public OrderRecordImmutable? order => _fill_tuple.order; - // - public string account => order?.Def.Account; + + public string account => _fill_tuple.account; public Venue? exchange => sec_md?.security.Exchange; public string symbol => sec_md?.security.Symbol; public SecurityImmutable? security => sec_md?.security; diff --git a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs index 10c4cc8d3..b2de339a5 100644 --- a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs +++ b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs @@ -12,7 +12,6 @@ namespace mbts.spark { internal class PnLSummaryRow : ViewModelBase, IEquatable { - DateTime _start_of_day; (string account, Venue? exchange, string symbol, SecurityImmutable? security, SecurityMD? sec_md, SecurityType? sec_type) key; int _start_net_position, _total_net_position; uint _day_long_quantity, _day_short_quantity; @@ -23,10 +22,8 @@ namespace mbts.spark { public PnLSummaryRow(pnl_calc_type calc_type, - DateTime start_of_day, (string, Venue?, string, SecurityImmutable?, SecurityMD?, SecurityType?) key, uint day_buy_quant, uint day_sell_quant, int net_pos, int sod_pos, double wavg_buy, double wavg_sell, IEnumerable fills) { - this._start_of_day = start_of_day; this.key = key; day_long_quantity = day_buy_quant; day_short_quantity = day_sell_quant; @@ -83,7 +80,7 @@ namespace mbts.spark { foreach (var fill in _fills) { double _tick_pnl = PnLCalculator.get_pnl(bid.price, ask.price, fill, cpp); summary_pnl += _tick_pnl; - if (fill.Timestamp.ToDateTime() >= _start_of_day) { + if (fill.FillKind != Fill.Types.FillKind.Sod) { day_pnl_total += _tick_pnl; } else { start_pnl_total += _tick_pnl; @@ -101,7 +98,7 @@ namespace mbts.spark { foreach (var fill in _fills) { double _tick_pnl = PnLCalculator.get_pnl(_driver, fill, cpp); summary_pnl += _tick_pnl; - if (fill.Timestamp.ToDateTime() >= _start_of_day) { + if (fill.FillKind != Fill.Types.FillKind.Sod) { day_pnl_total += _tick_pnl; } else { start_pnl_total += _tick_pnl; diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index 07554caae..f22d53d7f 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -1,4 +1,6 @@ -using bts.api; +using bts; +using bts.api; +using bts.api.admin; using bts.api.orderman; using bts.spark; using Google.Protobuf; @@ -32,88 +34,30 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Trigger, + CustomOrderDefinition.CustomOneofCase.Dynamic, }, _spreader_types = new[] { CustomOrderDefinition.CustomOneofCase.Spreader, CustomOrderDefinition.CustomOneofCase.Iceberg, CustomOrderDefinition.CustomOneofCase.TimeBox, CustomOrderDefinition.CustomOneofCase.Trigger, + CustomOrderDefinition.CustomOneofCase.Dynamic, }; - readonly string _user; readonly AdminModel _admin_model; IDisposable _dispose; [ImportingConstructor] - public OrderFactory([Import("username")]string user, AdminModel admin_model) { - _user = user; - users = new[] { user }; // might as well initialize it with the one user we know exists - accounts = Enumerable.Empty(); + public OrderFactory(AdminModel admin_model) { _admin_model = admin_model; - _user_map = new Dictionary(); - _account_map = new Dictionary(); - - var admin_data_sequence = _admin_model.on_admin_data - .OnDispatcher() - .Subscribe(admin_data => { - List account_names = new List(); - List user_names = new List(); - foreach (var i in admin_data.state.Values) { - var current_user = i.Users - .Where(bts_user => bts_user.Name == user) - .TakeWhile(bts_user => bts_user.HasUserData && bts_user.UserData.HasAccountPermissions); - foreach (var u in current_user) { - var tradeable_account_ids = u.UserData.AccountPermissions.AccountPermissions.Keys; - foreach (var account in i.Accounts.Where(acc => acc.IsPresent && tradeable_account_ids.Contains(acc.Id))) { - _account_map[account.Name] = (uint)account.Id; - account_names.Add(account.Name); - } - } - foreach (var bts_user in i.Users.Where(u => u.IsPresent)) { - _user_map[bts_user.Name] = (uint)bts_user.Id; - user_names.Add(bts_user.Name); - } - } - accounts = account_names; - _accounts_subject.OnNext(accounts); - users = new HashSet(user_names).Ordered().ToArray(); - _users_subject.OnNext(users); - }); - _dispose = Disposable.Create(admin_data_sequence); } - readonly ReplaySubject> - _accounts_subject = new ReplaySubject>(1), - _users_subject = new ReplaySubject>(1); - - public IObservable> subscribe_accounts() => _accounts_subject.AsObservable(); - - public IObservable> subscribe_account_ids() => - subscribe_accounts().Select(accounts => accounts.Select(u => (u, get_account_id(u)))); - - public IObservable> subscribe_users() => _users_subject.AsObservable(); - - public IObservable> subscribe_user_ids() => - subscribe_users().Select(users => users.Select(u => (u, get_user_id(u)))); + public IObservable> subscribe_accounts() => _admin_model.on_accounts; + public IObservable> subscribe_users() => _admin_model.on_users; + public IObservable> subscribe_user_tuples() => _admin_model.on_user_tuples; + public IObservable> subscribe_account_tuples() => _admin_model.on_account_tuples; #region Defaults - public string default_account { - get { - return (!accounts.is_null_or_empty()) ? accounts.First() : string.Empty; - } - } - - readonly Dictionary _account_map; - /// - /// Warning: These values may change while the app is running, use subscribe_accounts() to observe changes. - /// - public IEnumerable accounts { get; private set; } - - readonly Dictionary _user_map; - /// - /// Warning: These values may change while the app is running, use subscribe_users() to observe changes. - /// - public string[] users { get; private set; } - public CustomOrderDefinition.CustomOneofCase default_order_type() => CustomOrderDefinition.CustomOneofCase.Limit; @@ -147,8 +91,18 @@ namespace mbts.spark.utilities { } } - public IEnumerable default_order_type_defs(SecurityImmutable security, bool is_child = false) => - default_order_types(security, is_child).Select(ot => new CustomOrderDefinitionImmutable(custom_order(ot))); + public IEnumerable default_order_type_defs(SecurityImmutable security, bool is_child = false) + { + var types = default_order_types(security, is_child); + List defs = new List(); + foreach (var ot in types) + { + if(ot != CustomOrderDefinition.CustomOneofCase.Dynamic) + defs.Add(new CustomOrderDefinitionImmutable(custom_order(ot))); + } + DynamicOrderHelper.add_dynamic_order_defs(defs, ott => custom_order(ott)); + return defs; + } public IEnumerable default_order_types(SecurityImmutable? security, bool is_child=false) => security.HasValue ? default_order_types(security.Value, is_child) : default_order_types(); @@ -159,6 +113,14 @@ namespace mbts.spark.utilities { public IEnumerable default_time_in_forces(SecurityImmutable security, bool is_child=false) => default_time_in_forces(); + public IEnumerable default_time_in_forces(SecurityImmutable security, CustomOrderDefinition.CustomOneofCase order_type, bool is_child = false) { + var tifs = default_time_in_forces(security, is_child); + if (order_type != CustomOrderDefinition.CustomOneofCase.Limit) { + tifs = tifs.Except(new[] { TimeInForce.Ioc }); + } + return tifs; + } + public IEnumerable default_time_in_forces(SecurityImmutable? security, bool is_child=false) => security.HasValue ? default_time_in_forces(security.Value, is_child) : default_time_in_forces(); @@ -170,27 +132,31 @@ namespace mbts.spark.utilities { } #endregion - public uint get_user_id(string user) { return _user_map[user]; } - public string get_user_name(uint id) => _user_map.FirstOrDefault(kv => kv.Value == id).Key; - public uint get_account_id(string account) { return _account_map[account]; } - public string get_account_name(uint id) => _account_map.FirstOrDefault(kv => kv.Value == id).Key; - - public OrderDefinition order(SecurityImmutable security) => new OrderDefinition { - User = _user, - UserId = get_user_id(_user), - Account = accounts.First(), - AccountId = get_account_id(accounts.First()), - SecurityKey = security.Id, - Side = Side.Buy, - TimeInForce = TimeInForce.Day, - CustomDef = custom_order(), - CtiCode = CTICode.CtiCode1, - CustomerOrFirm = CustomerOrFirm.Firm, - // this will be the tag 50 on CME orders - // current user might be okay, but we might also want to get it - // from the store that serves the risk admin gui - ManualOrderIndicator = ManualOrderIndicator.Yes - }; + public OrderDefinition order(SecurityImmutable security) => order(security, _admin_model.get_default_account()); + public OrderDefinition order(SecurityImmutable security, AccountTuple? account) { + var rv = new OrderDefinition { + SecurityKey = security.Id, + Side = Side.Buy, + TimeInForce = TimeInForce.Day, + CustomDef = custom_order(), + CtiCode = CTICode.CtiCode1, + CustomerOrFirm = CustomerOrFirm.Firm, + // this will be the tag 50 on CME orders + // current user might be okay, but we might also want to get it + // from the store that serves the risk admin gui + ManualOrderIndicator = ManualOrderIndicator.Yes + }; + if (account.HasValue) { + rv.Account = account.Value.name; + rv.AccountId = account.Value.id; + } + var user = _admin_model.get_current_user(); + if (user.HasValue) { + rv.User = user.Value.name; + rv.UserId = user.Value.id; + } + return rv; + } public CustomOrderDefinition custom_order() => new CustomOrderDefinition { Limit = limit_order() }; public MarketOrderDefinition market_order() => new MarketOrderDefinition { }; @@ -225,13 +191,25 @@ namespace mbts.spark.utilities { TopThreshold = new QuantityMeasure(), Hedge = custom_order(), }; + public CoverOrderDefinition cover_order() => new CoverOrderDefinition + { + Child = custom_order(), + Hedge = custom_order(), + }; + public TriggerOrderDefinition trigger_order() => new TriggerOrderDefinition { Child = custom_order(), TriggerCondition = new TriggerCondition(), TriggerAction = new TriggerAction(), - }; - + }; + + public DynamicOrderDefinition dynamic_order() => new DynamicOrderDefinition + { + Child = custom_order(), + }; + + public SpreaderOrderDefinition spreader_order() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() }; @@ -248,8 +226,10 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Lean: rv.Lean = lean_order(); break; case CustomOrderDefinition.CustomOneofCase.Join: rv.Join = join_order(); break; case CustomOrderDefinition.CustomOneofCase.Top: rv.Top = top_order(); break; + case CustomOrderDefinition.CustomOneofCase.Cover: rv.Cover = cover_order(); break; case CustomOrderDefinition.CustomOneofCase.Trigger: rv.Trigger = trigger_order(); break; case CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = spreader_order(); break; + case CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = dynamic_order(); break; } return rv; } @@ -268,8 +248,10 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Lean: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.Orders.lean_order }; case CustomOrderDefinition.CustomOneofCase.Join: return new OrderMetadata { KeyBinding = "J", Color = BTSColors.Orders.join_order }; case CustomOrderDefinition.CustomOneofCase.Top: return new OrderMetadata { KeyBinding = "D", Color = BTSColors.Orders.top_order }; + case CustomOrderDefinition.CustomOneofCase.Cover: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.Spreader: goto default; + case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: goto default; default: return _default_order_metadata; } @@ -286,8 +268,10 @@ namespace mbts.spark.utilities { case OrderState.CustomOneofCase.Lean: return new OrderMetadata { KeyBinding = "L", Color = BTSColors.Orders.lean_order }; case OrderState.CustomOneofCase.Join: return new OrderMetadata { KeyBinding = "J", Color = BTSColors.Orders.join_order }; case OrderState.CustomOneofCase.Top: return new OrderMetadata { KeyBinding = "D", Color = BTSColors.Orders.top_order }; + case OrderState.CustomOneofCase.Cover: return new OrderMetadata { KeyBinding = "C", Color = BTSColors.Orders.top_order }; case OrderState.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.top_order }; case OrderState.CustomOneofCase.Spreader: goto default; + case OrderState.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.top_order }; case OrderState.CustomOneofCase.None: goto default; default: return _default_order_metadata; } @@ -322,7 +306,9 @@ namespace mbts.spark.utilities { case nameof(LeanOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Lean; case nameof(JoinOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Join; case nameof(TopOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Top; + case nameof(CoverOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Cover; case nameof(TriggerOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Trigger; + case nameof(DynamicOrderDefinition): return CustomOrderDefinition.CustomOneofCase.Dynamic; default: throw new ArgumentException($"Unable to match '{order_type_def?.Descriptor.Name}' to an order definition type"); } } diff --git a/src/client/spark/view/Utility/EnumHelper.cs b/src/client/spark/view/Utility/EnumHelper.cs index 7b4f7507f..082914c82 100644 --- a/src/client/spark/view/Utility/EnumHelper.cs +++ b/src/client/spark/view/Utility/EnumHelper.cs @@ -1,4 +1,5 @@ using mbts.ui.utilities; +using mbts.utils; using System; using System.Collections; using System.Collections.Generic; @@ -23,6 +24,17 @@ namespace mbts.ui.utility { public static T parse_or_default(string value) where T : struct /*(Enum, more specifically)*/ => typeof(T).IsEnum && Enum.TryParse(value, true, out T result) ? result : default; + public static object try_parse(Type enum_type, string value, bool ignore_case = true) { + ExceptionAssert.Argument.must_be_so(enum_type.IsEnum, "an enum type", nameof(enum_type)); + Array vals = Enum.GetValues(enum_type); + var str_comp = ignore_case ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture; + foreach (object v in vals) { + if (string.Equals(v.ToString(), value, str_comp)) + return v; + } + return Activator.CreateInstance(enum_type); + } + public static string get_display_name(object enum_obj, TextCapitalizationFormat capitalization_format = TextCapitalizationFormat.Default) { string str = enum_obj.ToString(); MemberInfo[] mi = enum_obj.GetType().GetMember(str); diff --git a/src/client/spark/view/Utility/RXCollection.cs b/src/client/spark/view/Utility/RXCollection.cs index 42d2e4f2d..135dbb0e3 100644 --- a/src/client/spark/view/Utility/RXCollection.cs +++ b/src/client/spark/view/Utility/RXCollection.cs @@ -52,17 +52,6 @@ namespace mbts.ui.utility { } }); - public static ITableUpdateCollection CreateTableUpdate(IObservable> source) where TKey : IEquatable => - CreateTableUpdate(source, _ => true); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source, Func collection_filter) where TKey : IEquatable => - new TableUpdateCollection(source, collection_filter ?? new Func(_ => true)); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source) where TKey : IEquatable => - CreateTableUpdate(source, _ => true); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source, Func collection_filter) where TKey : IEquatable => - new TableUpdateTransformCollection(source, collection_filter ?? new Func(_ => true)); public static IRXCollection CreateIncrementalUpdate(IObservable> source) where TKey : IEquatable => new IncrementalUpdateCollection(source); @@ -83,24 +72,6 @@ namespace mbts.ui.utility { public void Dispose() => Disposable.dispose(ref _sub); } - class TableUpdateCollection : ObservableCollection, ITableUpdateCollection where TKey : IEquatable { - readonly Func _collection_filter; - IReadOnlyDictionary _raw_state = new ReadOnlyDictionary(new Dictionary()); - IDisposable _sub; - - internal TableUpdateCollection(IObservable> source, Func collection_filter) { - _collection_filter = collection_filter; - _sub = source.OnDispatcher().Subscribe(u => { - _raw_state = u.state; - foreach (T val in u.removed.Where(_collection_filter)) Remove(val); - foreach (T val in u.added.Where(_collection_filter)) Add(val); - }); - } - - public bool TryGetValue(TKey key, out T result) => _raw_state.TryGetValue(key, out result); - public void Dispose() => Disposable.dispose(ref _sub); - } - class TableUpdateTransformCollection : ObservableCollection, ITableUpdateCollection where TKey : IEquatable { readonly Func _collection_filter; IReadOnlyDictionary _raw_state = new ReadOnlyDictionary(new Dictionary()); diff --git a/src/client/spark/view/Utility/WPFHelper.cs b/src/client/spark/view/Utility/WPFHelper.cs index fef3f7c9f..ea2b51498 100644 --- a/src/client/spark/view/Utility/WPFHelper.cs +++ b/src/client/spark/view/Utility/WPFHelper.cs @@ -28,6 +28,9 @@ namespace mbts.ui { public static DependencyProperty create_dp(string name, FrameworkPropertyMetadataOptions options, Action callback, TValue default_value = default) => DependencyProperty.Register(name, typeof(TValue), typeof(TOwner), new FrameworkPropertyMetadata(default_value, options, prop_changed_callback(callback))); + public static DependencyProperty create_dp(string name, FrameworkPropertyMetadataOptions options, Func coerce_value, TValue default_value = default) => + DependencyProperty.Register(name, typeof(TValue), typeof(TOwner), new FrameworkPropertyMetadata(default_value, options, null, coerce_value_callback(coerce_value))); + public static DependencyProperty create_dp(string name, FrameworkPropertyMetadataOptions options, Action callback, Func coerce_value, TValue default_value = default) => DependencyProperty.Register(name, typeof(TValue), typeof(TOwner), new FrameworkPropertyMetadata(default_value, options, prop_changed_callback(callback), coerce_value_callback(coerce_value))); @@ -258,7 +261,7 @@ namespace mbts.ui { (d, e) => callback(ObjectHelper.try_convert(d), ObjectHelper.try_convert(e.NewValue)); public static CoerceValueCallback coerce_value_callback(Func coerce_value) => - (d, v) => coerce_value(ObjectHelper.try_convert(d), ObjectHelper.try_convert(v)); + (d, obj) => coerce_value(ObjectHelper.try_convert(d), ObjectHelper.try_convert(obj)); public static double control_base_width(Thickness border_thickness, Thickness padding) => border_thickness.Left + padding.Left + padding.Right + border_thickness.Right; @@ -357,4 +360,4 @@ namespace mbts.ui { resultant_size = new Size(result_width, result_height); } } -} \ No newline at end of file +} diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 52ccac268..6cf3ecb6b 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,30 +57,34 @@ namespace bts.api.core { } public unsafe override IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter) { - bool first_update = true; var result = Observable.Create>(observer => { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); try { if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - var added_items = new List(change_count); - var added_keys = new List(change_count); - var removed_keys = new List(change_count); foreach (var change in changes) { - if (change.type != ApiNativeMethods.ChangeType.REMOVE) { - // create or change - added_items.Add( converter( parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - added_keys.Add(change.key); - } - if (change.type != ApiNativeMethods.ChangeType.CREATE) { - // removed or changed - removed_keys.Add(change.key); + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; } } - observer.OnNext(new RawUpdate(added_items, added_keys, removed_keys)); + observer.OnNext(the_update); } else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { if (!first_update) { - observer.OnNext(RawUpdate.Reset()); + observer.OnNext(the_update.MarkAsReset()); } first_update = false; } @@ -88,7 +92,7 @@ namespace bts.api.core { catch (Exception e) { ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); // Sleep to let the log message get asyncronously written to disk - System.Threading.Thread.Sleep(100); + Thread.Sleep(100); Environment.Exit(-1); } }; diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 85056d0e0..075485975 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -1,84 +1,204 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; +using System.Reactive.Concurrency; +using System.Reactive.Disposables; using System.Reactive.Linq; namespace bts.api.core { - public struct RawUpdate { + class RawUpdate { // RawUpdate uses List instead of IReadonlyList to avoid virtual dispatch on a type not likely to be see in a public api surface - public RawUpdate(List added_items, List added_keys, List removed_keys) : this() { + // There is a single stack allocated RawUpdate per subscription + public RawUpdate() { is_reset = false; - this.added_items = added_items; - this.added_keys = added_keys; - this.removed_keys = removed_keys; + added_items = new List(); + added_keys = new List(); + changed_items = new List(); + changed_keys = new List(); + removed_keys = new List(); + } + public RawUpdate MarkAsReset() { + Clear(); + is_reset = true; + return this; } - public static RawUpdate Reset() { - return new RawUpdate() { is_reset = true }; + public void Clear() { + is_reset = false; + added_items.Clear(); + added_keys.Clear(); + changed_items.Clear(); + changed_keys.Clear(); + removed_keys.Clear(); } + public bool is_reset { get; private set; } + public List added_items { get; } + public List added_keys { get; } + public List changed_items { get; } + public List changed_keys { get; } + public List removed_keys { get; } - public bool is_reset; - public List added_items { get; private set; } - public List added_keys { get; private set; } - public List removed_keys { get; private set; } +#if DEBUG + public override string ToString() { + var added = string.Join(", ", added_items); + var changed = string.Join(", ", changed_items); + var removed = string.Join(", ", removed_keys); + return $"added [{added}] changed [{changed}] removed [{removed}]"; + } +#endif } public class Update where TKey : IEquatable { private Func _key; - public Update(IReadOnlyCollection all, IReadOnlyList added, IReadOnlyList removed, Func key_extractor) { + internal Update( + IReadOnlyCollection all, + IEnumerable added, + IEnumerable<(T New,T Old)> changes, + IEnumerable removed, + Func key_extractor) { this.added = added; this.removed = removed; + this.changes = changes; this.all = all; _key = key_extractor; } - public IReadOnlyCollection all { get; private set; } - public IReadOnlyList added { get; private set; } - public IReadOnlyList removed { get; private set; } + public static Update empty(Func key_extractor) => + new Update(new T[0], new T[0], new (T,T)[0], new T[0], key_extractor); + + public Update merge(Update next) { + var comp = new RowEqualityComparer(_key); + var added = this.added as HashSet ?? new HashSet(this.added, comp); + var changes = this.changed as HashSet<(T New,T Old)> ?? new HashSet<(T,T)>(this.changes, comp); + var removed = this.removed as HashSet ?? new HashSet(this.removed, comp); + + // Add + added.UnionWith(next.added); + + // Change + foreach (var c in next.changes) { + if (added.Contains(c.Old)) { + added.Remove(c.Old); + added.Add(c.New); + } + else { + // Remove does not error if it was not present + changes.Remove(c); + changes.Add(c); + } + } + + // Remove + foreach (var r in next.removed) { + if (!added.Remove(r)) { + removed.Add(r); + } + changes.Remove((r,r)); + } + + return new Update( + next.all, + added, changes, removed, + _key + ); + } + + public IReadOnlyCollection all { get; } + public IEnumerable added { get; } + public IEnumerable<(T New,T Old)> changes { get; } + public IEnumerable changed => changes.Select(c => c.New); + public IEnumerable removed { get; } public TKey key(T t) { return _key(t); } } + struct RowEqualityComparer : IEqualityComparer, IEqualityComparer<(T,T)> + where TKey : IEquatable { + readonly Func _key; + + public RowEqualityComparer(Func key) { + _key = key; + } + + public bool Equals(T x, T y) { + return _key(x).Equals(_key(y)); + } + + public bool Equals((T, T) x, (T, T) y) { + return Equals(x.Item1, y.Item1); + } + + public int GetHashCode(T obj) { + return _key(obj).GetHashCode(); + } + + public int GetHashCode((T, T) obj) { + return GetHashCode(obj.Item1); + } + } + public class TableUpdate where TKey : IEquatable { - ImmutableDictionary _state; + readonly ImmutableDictionary _state; - internal TableUpdate(ImmutableDictionary init, IReadOnlyList added, IReadOnlyList removed) { + internal TableUpdate( + ImmutableDictionary init, + IEnumerable added, + IEnumerable<(T,T)> changed, + IEnumerable removed) { _state = init; this.added = added; + this.changes = changed; this.removed = removed; } public IReadOnlyDictionary state { get { return _state; } } - public IReadOnlyList added { get; } - public IReadOnlyList removed { get; } + public IEnumerable added { get; } + public IEnumerable<(T New,T Old)> changes { get; } + public IEnumerable changed => changes.Select(c => c.New); - internal TableUpdate update(Update update) => - this.update(update.removed, update.added, update.key); + public IEnumerable removed { get; } - internal TableUpdate update(IReadOnlyList removed, IReadOnlyList added, Func key) { - var builder = _state.ToBuilder(); - builder.RemoveRange(removed.Select(i => key(i))); - builder.AddRange(added.Select(i => new KeyValuePair(key(i), i))); - return new TableUpdate(builder.ToImmutableDictionary(), added, removed); + internal static TableUpdate update(TableUpdate table, Update update) { + var builder = table._state.ToBuilder(); + builder.RemoveRange(update.removed.Select(i => update.key(i))); + builder.AddRange(update.added.Select(i => new KeyValuePair(update.key(i), i))); + foreach (var i in update.changed) { + builder[update.key(i)] = i; + } + return new TableUpdate(builder.ToImmutableDictionary(), update.added, update.changes, update.removed); } internal TableUpdate as_snapshot() { - return new TableUpdate(_state, _state.Values.ToList(), new T[0]); + return new TableUpdate(_state, _state.Values.ToList(), new (T,T)[0], new T[0]); } } + internal class LegacyTableUpdate where TKey : IEquatable { + public LegacyTableUpdate( + TableUpdate update) { + this.state = update.state; + this.added = update.added.Concat(update.changes.Select(t => t.New)); + this.removed = update.removed.Concat(update.changes.Select(t => t.Old)); + } + public IReadOnlyDictionary state { get; } + public IEnumerable added { get; } + public IEnumerable removed { get; } + } + public static class ObservableUpdateExtensions { - public static IObservable> reconstitute(this IObservable> source, Func key_extractor) where TKey : IEquatable { + internal static IObservable> reconstitute(this IObservable> source, Func key_extractor) where TKey : IEquatable { var state = new Dictionary(); return source.Select(raw => { if (raw.is_reset) { var removed = state.Values.ToList(); state.Clear(); - return new Update(new T[0], new T[0], removed, key_extractor); + return new Update(new T[0], new T[0], new (T,T)[0], removed, key_extractor); } else { var removed = new List(raw.removed_keys.Count); @@ -92,15 +212,56 @@ namespace bts.api.core { for (int x = 0; x < raw.added_items.Count; ++x) { state[raw.added_keys[x]] = raw.added_items[x]; } - return new Update(state.Values, raw.added_items, removed, key_extractor); + List<(T, T)> changes = new List<(T, T)>(raw.changed_items.Count); + for (int x = 0; x < raw.changed_items.Count; ++x) { + var old = state[raw.changed_keys[x]]; + state[raw.changed_keys[x]] = raw.changed_items[x]; + changes.Add((raw.changed_items[x], old)); + } + return new Update(state.Values.ToList(), raw.added_items.ToList(), changes, removed, key_extractor); } }); } public static IObservable> Table(this IObservable> source) where TKey : IEquatable => source.Scan( - new TableUpdate(ImmutableDictionary.Empty, new List(), new List()), - (table, update) => table.update(update)); + new TableUpdate(ImmutableDictionary.Empty, new T[0], new (T,T)[0], new T[0]), + (table, update) => TableUpdate.update(table,update)); + + // Fold updates and emit at max 1/interval + public static IObservable> Naggle(this IObservable> source, TimeSpan interval, IScheduler scheduler) where TKey : IEquatable { + // fold updates together and emit on TimeSpan (max) interval. Emit on threadpool + return Observable.Create>(observer => { + object guard = new object(); + Update cache = null; + bool finished = false; + + var d1 = source.Subscribe(update => { + // subscribe to the source, merge updates (Quickbus thread) + lock (guard) { + if (cache == null) cache = update; + else cache = cache.merge(update); + } + }, + () => { finished = true; }); + // publish on interval + var d2 = Observable.Interval(interval, scheduler).Subscribe(_ => { + Update update; + lock (guard) { + update = cache; + cache = null; + } + if (update != null) { + observer.OnNext(update); + } + if (finished) { + observer.OnCompleted(); + } + }); + + return new CompositeDisposable(d1, d2); + }); + } public static IObservable> Cache(this IObservable> source) where TKey : IEquatable { var inner = source.Replay(1).RefCount(); @@ -118,5 +279,9 @@ namespace bts.api.core { }); } + internal static IObservable> AddRemoveOnly(this IObservable> source) where TKey : IEquatable { + return source.Select(t => new LegacyTableUpdate(t)); + } + } } \ No newline at end of file diff --git a/src/client/spark_core/TestRunner/ConsoleEx.cs b/src/client/spark_core/TestRunner/ConsoleEx.cs index 9e789c179..0e3391e15 100644 --- a/src/client/spark_core/TestRunner/ConsoleEx.cs +++ b/src/client/spark_core/TestRunner/ConsoleEx.cs @@ -20,5 +20,20 @@ namespace bts.test { } } + public static T prompt(string prompt, params T[] options) { + Console.WriteLine(prompt); + for (int x = 1; x <= options.Length; ++x) { + Write($"{x}. ", ConsoleColor.Yellow); + WriteLine(options[x].ToString()); + } + int response; + do { + Int32.TryParse(Console.ReadKey().ToString(), out response); + if (response > options.Length) response = 0; + } while (response == 0); + return options[response]; + } + + } } \ No newline at end of file diff --git a/src/client/spark_core/TestRunner/InProcessTestRunner.cs b/src/client/spark_core/TestRunner/InProcessTestRunner.cs index 7e3a22f45..4bab68419 100644 --- a/src/client/spark_core/TestRunner/InProcessTestRunner.cs +++ b/src/client/spark_core/TestRunner/InProcessTestRunner.cs @@ -37,11 +37,11 @@ namespace bts.test { result.Status = TestResult.Types.Step.Pass; } catch (AssertFailture af) { - result.Message = $"Assertion Failure: {af.Message}\nLocation:{af._filename}:{af._line}"; + result.Message = $"Assertion Failure:\n{af.Message}\nLocation:{af._filename}:{af._line}"; } catch (Exception ue) { if (ue.InnerException is AssertFailture af) { - result.Message = $"Assertion Failure: {af.Message}\nLocation:{af._filename}:{af._line}"; + result.Message = $"Assertion Failure:\n{af.Message}\nLocation:{af._filename}:{af._line}"; } else { result.Message = $"Unexpected error: {ue.Message}\n\n{ue.StackTrace}"; diff --git a/src/client/spark_core/TestRunner/TestAssert.cs b/src/client/spark_core/TestRunner/TestAssert.cs index 6c0267d1b..9351f1d79 100644 --- a/src/client/spark_core/TestRunner/TestAssert.cs +++ b/src/client/spark_core/TestRunner/TestAssert.cs @@ -18,28 +18,32 @@ namespace bts.test { } public static void IsTrue(bool test, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!test) { - throw new AssertFailture($"Expected 'true' got 'false'. {msg}", file, line); + throw new AssertFailture($"Expected: 'true' got 'false'. {msg}", file, line); } } + public static void That(bool test, string msg = "", [CallerFilePath] string file = "", [CallerLineNumber] int line = 0) { + Assert.IsTrue(test, msg, file, line); + } public static void IsFalse(bool test, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (test) { - throw new AssertFailture($"Expected 'false' got 'true'. {msg}", file, line); + throw new AssertFailture($"Expected: 'false' got 'true'. {msg}", file, line); } } public static void AreEqual(T a, T b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!a.Equals(b)) { throw new AssertFailture( - $"Expected '{a}' == '{b}'. {msg}", file, line); + $"Expected: '{a}' == '{b}'. {msg}", file, line); } } - public static void AreEqual(IEnumerable a, IEnumerable b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { + public static void SequenceEqual(IEnumerable a, IEnumerable b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!a.SequenceEqual(b)) { var aa = string.Join(", ", a); var bb = string.Join(", ", b); throw new AssertFailture( - $"Expected [{aa}] == [{bb}]. {msg}", file, line); + $"Expected: [{aa}]\nGot: [{bb}]. {msg}", file, line); } } + public static void IsNotNull(T a, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) where T : class { @@ -53,7 +57,7 @@ namespace bts.test { if (!items.Contains(item)) { var aa = string.Join(", ", items); throw new AssertFailture( - $"Expected {item} in [{aa}]. {msg}", file, line); + $"Expected: {item} in [{aa}]. {msg}", file, line); } } } diff --git a/src/client/spark_core/TestRunner/TestResultReceiver.cs b/src/client/spark_core/TestRunner/TestResultReceiver.cs index 1afd28780..72a052c84 100644 --- a/src/client/spark_core/TestRunner/TestResultReceiver.cs +++ b/src/client/spark_core/TestRunner/TestResultReceiver.cs @@ -61,6 +61,7 @@ namespace bts.test { if (!string.IsNullOrEmpty(type)) { ConsoleEx.Write($" - {type}", ConsoleColor.DarkRed); } + Console.WriteLine(); if (!string.IsNullOrEmpty(result.Message)) { ConsoleEx.Write("==>", ConsoleColor.White, ConsoleColor.DarkRed); Console.Write(" "); diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_core/utils/AnonymousDisposable.cs index 01b7e313b..5948d6484 100644 --- a/src/client/spark_core/utils/AnonymousDisposable.cs +++ b/src/client/spark_core/utils/AnonymousDisposable.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -93,65 +94,32 @@ namespace mbts } } - // be advised to use ThreadSafeDisposable instead - // TODO: remove this deprecated class - [Obsolete] - public class DisposableSingle : IDisposable - { - public DisposableSingle() : this((string)null, (IDisposable)null) { } - public DisposableSingle(Action dispose) : this(null, dispose) { } - public DisposableSingle(string name, params Action[] dispose) : this(name, Disposable.Create(dispose)) { } - public DisposableSingle(params IDisposable[] dispose) : this(null, dispose) { } - public DisposableSingle(string name, params IDisposable[] dispose) : this(name, Disposable.Create(dispose)) { } - public DisposableSingle(string name, object lock_obj) : this(name, lock_obj, (IDisposable)null) { } - public DisposableSingle(string name, object lock_obj, params IDisposable[] dispose) : this(name, lock_obj, Disposable.Create(dispose)) { } - private DisposableSingle(string name, IDisposable dispose) : this(name, new object(), dispose) { } - private DisposableSingle(string name, object lock_obj, IDisposable dispose) { - _name = name ?? GetType().FullName; - _lock = lock_obj; - _dispose = dispose; - } - - private readonly string _name; - private readonly object _lock; - private IDisposable _dispose; - private bool _is_disposing, _is_disposed; - - public bool is_disposed { get { lock(_lock) return _is_disposing || _is_disposed; } } - public void check_not_disposed() { if (is_disposed) throw new ObjectDisposedException(_name); } - - public void Dispose() { - lock(_lock) { - if (_is_disposed) throw new ObjectDisposedException(_name); - if (_is_disposing) return; - _is_disposing = true; - } - Disposable.dispose(ref _dispose); - _is_disposed = true; - _is_disposing = false; - } - } - + // inspired by: https://blogs.msdn.microsoft.com/blambert/2009/07/24/a-simple-and-totally-thread-safe-implementation-of-idisposable/ /// - /// Uses lock-free [Interlocked] code to ensure that a dispose action is only executed once. + /// Uses lock-free [Interlocked] code to ensure that a dispose-action is only executed once. /// class ThreadSafeDisposable : IDisposable { - int _state = 0; readonly Action _dispose_once; + /// + /// A value which indicates the disposable state. 0 indicates undisposed, 1 indicates disposing + /// or disposed. + /// + int _state; + public ThreadSafeDisposable(Action dispose_once) => _dispose_once = dispose_once; - public bool has_dispose_started => _state > 0; - public bool has_disposed_finished { get; private set; } + public bool has_dispose_started => Thread.VolatileRead(ref _state) != 0; + /// + /// Guarenteed to only execute the dispose-action once. This is thread-safe. + /// public void Dispose() { - if (Interlocked.Increment(ref _state) == 1) { + // Attempt to move the disposable state from 0 to 1. If successful, we can be assured that + // this thread is the first thread to do so, and can safely dispose of the object. + if (Interlocked.CompareExchange(ref _state, 1, 0) == 0) _dispose_once(); - has_disposed_finished = true; - } else { - Interlocked.Decrement(ref _state); - } } } -} \ No newline at end of file +} diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index 1bd8a164e..3c05994a1 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using System.Runtime.InteropServices; using System.Text; @@ -17,6 +19,10 @@ namespace mbts { } return sb.ToString(); } + public static T choose(this Random r, IEnumerable range) { + var index = r.Next(0, range.Count()); + return range.Skip(index).First(); + } [DllImport("libspark")] private static extern void ll_to_parts(UInt64 ll_time, out int year, out int month, out int day, out int hour, out int minute, out int second, out int ms); diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index d0f1d3e12..d1682bdb7 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -77,16 +77,16 @@ namespace mbts.api.Test { var response = h.say_hello(new HelloRequest() { Name = "UnitTest 1" }); Assert.AreEqual("Hello UnitTest 1", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 0); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 0); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "Hello UnitTest 1"); last_update = null; response = h.yell_hello(new HelloRequest() { Name = "UnitTest 2" }); Assert.AreEqual("HELLO UNITTEST 2", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 2"); last_update = null; @@ -97,8 +97,8 @@ namespace mbts.api.Test { response = h.yell_hello(new HelloRequest() { Name = "UnitTest 3" }); Assert.AreEqual("HELLO UNITTEST 3", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 3"); last_update = null; @@ -108,8 +108,8 @@ namespace mbts.api.Test { _ntest.run_shout_service(null); response = h.yell_hello(new HelloRequest() { Name = "UnitTest 4" }); Assert.AreEqual("HELLO UNITTEST 4", response.Message); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 4"); last_update = null; diff --git a/src/client/spark_test/api/ApiUpdateTests.cs b/src/client/spark_test/api/ApiUpdateTests.cs new file mode 100644 index 000000000..e9c28d5a2 --- /dev/null +++ b/src/client/spark_test/api/ApiUpdateTests.cs @@ -0,0 +1,231 @@ +using bts.api.core; +using System.Collections.Generic; +using bts.test; +using System; +using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Linq; +using System.Reactive.Concurrency; + +namespace mbts.api.Test { + [TestGroup] + public class ApiUpdateTests { + int _id = 0; + List _item_pool; + + public ApiUpdateTests() { + // Generate a pool of items + _item_pool = Enumerable.Range(1, 50).Select(i => mkitem()).ToList(); + } + + class Item : IEquatable { + public Item(int id, string name) { + this.id = id; + this.name = name; + } + public int id { get; } + public string name { get; } + public override string ToString() => $"{id}-{name}"; + public override bool Equals(object obj) { + if (obj is Item i) { + return this.Equals(i); + } + return false; + } + public override int GetHashCode() { + return ToString().GetHashCode(); + } + + public bool Equals(Item other) { + return id == other.id && name == other.name; + } + } + static int id(Item i) => i.id; + + Item mkitem() { + return new Item(++_id, Guid.NewGuid().ToString().Substring(0,8)); + } + + IObservable> validate_incremental(IObservable> source) { + // strip the state from source and turn it back into a 'raw' update + // then use the (well tested) reconstitute function to re-build the state from the increments + return source.Select(u => { + var r = new RawUpdate(); + r.added_items.AddRange(u.added); + r.added_keys.AddRange(u.added.Select(id)); + r.changed_items.AddRange(u.changed); + r.changed_keys.AddRange(u.changed.Select(id)); + r.removed_keys.AddRange(u.removed.Select(id)); + return r; + }).reconstitute(id); + } + + async Task validate_naggle(IObservable> raw) { + var total = raw.ToEnumerable().Count(); + + // Validate that update is right at each point + // This will mostly be collapsing to add() + for (var count = 1; count < total; ++count) { + var orig = raw.Take(count).reconstitute(id).ToEnumerable().Last(); + var nag = await + validate_incremental( + raw + .Take(count) + .reconstitute(i => i.id) + .Naggle(TimeSpan.FromMilliseconds(1), CurrentThreadScheduler.Instance)).LastAsync(); + Assert.SequenceEqual(orig.all.OrderBy(id), nag.all.OrderBy(id)); + } + + // Do it again with TableUpdate + for (var count = 1; count < total; ++count) { + var orig = raw.Take(count).reconstitute(id).Table().ToEnumerable().Last(); + var nag = await + validate_incremental( + raw + .Take(count) + .reconstitute(i => i.id) + .Naggle(TimeSpan.FromMilliseconds(1), CurrentThreadScheduler.Instance)) + .Table() + .LastAsync(); + Assert.SequenceEqual(orig.state.Values.OrderBy(id), nag.state.Values.OrderBy(id)); + } + + // collapse rolling window + var update_list = raw.reconstitute(id).ToEnumerable().ToList(); + var window = 10; + for (int x = 0; x+window < total; x += 5) { + var start = update_list[x]; + var end = update_list[x + window]; + + var super_update = update_list.Skip(x).Take(window+1).Aggregate((u1, u2) => u1.merge(u2)); + start.merge(super_update); + Assert.SequenceEqual(end.all, super_update.all); + } + + } + + [Test] + public async Task test_add() { + // Add 1 item 10x + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + for (int x = 0; x < 50; ++x) { + rup.Clear(); + var item = _item_pool[x]; + rup.added_items.Add(item); + rup.added_keys.Add(item.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + await validate_naggle(raw); + } + + [Test] + public Task test_remove() { + // Add 20 items, then remove 10 one at a time + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + // add 20 items + rup.added_items.AddRange(_item_pool.Take(20)); + rup.added_keys.AddRange(_item_pool.Take(20).Select(id)); + observer.OnNext(rup); + + for (int x = 0; x < 50; x+=2) { + rup.Clear(); + var item = _item_pool[x]; + rup.removed_keys.Add(item.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + return validate_naggle(raw); + } + + [Test] + public Task test_update() { + // Add 20 items, then change all of their names to Taha + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + // add 20 items + rup.added_items.AddRange(_item_pool.Take(20)); + rup.added_keys.AddRange(_item_pool.Take(20).Select(id)); + observer.OnNext(rup); + + for (int x = 0; x < 20; x++) { + rup.Clear(); + var item = _item_pool[x]; + var item2 = new Item(item.id, "Taha"); + rup.changed_items.Add(item2); + rup.changed_keys.Add(item2.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + return validate_naggle(raw); + } + + [Test] + public async Task test_random_walk() { + // Split items in half. + // Permute one collection in the direction of the other + var raw = Observable.Create>((observer) => { + Random r = new Random(42); + var even = _item_pool.Where(i => i.id % 2 == 0).Take(10).ToList(); + var odd = _item_pool.Where(i => i.id % 2 == 1).ToList(); + + RawUpdate rup = new RawUpdate(); + rup.added_items.AddRange(even); + rup.added_keys.AddRange(even.Select(i => i.id)); + observer.OnNext(rup); + + for (var x = 0; x < 200; ++x) { + rup = new RawUpdate(); + switch (r.Next(0, 3)) { + case 0: // add + if (odd.Count > 0) { + even.Add(odd[0]); + rup.added_items.Add(odd[0]); + rup.added_keys.Add(odd[0].id); + odd.RemoveAt(0); + observer.OnNext(rup); + } + break; + case 1: // remove + if (even.Count > 0) { + var item = r.choose(even); + even.Remove(item); + rup.removed_keys.Add(item.id); + observer.OnNext(rup); + } + break; + case 2: // change + if (even.Count > 0) { + var item = r.choose(even); + var item2 = new Item(item.id, "Jake"); + var index = even.IndexOf(item); + even[index] = item2; + rup.changed_items.Add(item2); + rup.changed_keys.Add(item2.id); + observer.OnNext(rup); + } + break; + } + } + + observer.OnCompleted(); + return Disposable.empty; + }); + + // Since this is deterministic randomness get the final collection + await validate_naggle(raw); + } + + } +} diff --git a/src/client/spark_test/api/SomeTests.cs b/src/client/spark_test/api/SomeTests.cs index 4b4602f7e..30c4ffcb5 100644 --- a/src/client/spark_test/api/SomeTests.cs +++ b/src/client/spark_test/api/SomeTests.cs @@ -6,8 +6,15 @@ using System.Threading.Tasks; namespace bts.test { //[TestGroup] - public class SomeTests { - // Tests for testing the tester + public class SomeTests : IDisposable { + SomeTests() { + // You can run common setup code here. + } + + public void Dispose() { + // Implement dispose if you need to clean up + } + [Test] public void test1() { Assert.IsTrue(true); diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 1c2375581..1c755b687 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -3,6 +3,7 @@ net471 x64 + x64 diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 3f693b548..dfad6cc5d 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -8,11 +8,13 @@ namespace bts { public class ServiceTest : ConsoleCommand { bool _synthetic; bool _user; + bool _admin; public ServiceTest() { IsCommand("service", "Put code here for testing during service development"); HasOption("synthetic", "Run synthetic test", _ => _synthetic = true); HasOption("user", "user test", _ => _user = true); + HasOption("admin", "admin test", _ => _admin = true); } public override int Run(string[] remainingArguments) { if (_synthetic) { @@ -21,6 +23,9 @@ namespace bts { if (_user) { user_test(); } + if (_admin) { + admin_test(); + } return 0; } private static void synthetic_test() { @@ -82,5 +87,13 @@ namespace bts { var resp = s.get_users(r); Console.WriteLine("{0}", resp); } + + private static void admin_test() { + var ctx = new ServiceContext(); + + var s = ctx.locate(); + var resp = s.get_admin_data(new VoidMessage()); + Console.WriteLine("{0}", resp); + } } } diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 2c2241ba3..1c40c63e4 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -4,7 +4,7 @@ Exe net471 - win7-x64;ubuntu.16.04-x64 + win7-x64;ubuntu.16.04-x64;win7-x86 Blue Trading Systems Blue Trading Systems Spark diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 25cb49768..21329f623 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 2ba73bea9..b0b41d0bd 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -125,3 +125,4 @@ if (WIN32) endif() + diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 89b2679de..5642927e4 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -307,15 +307,32 @@ void AdminServiceUtils::validate_account_update (const bts::api::admin::AdminDat // validate account exchange changes validate_account_exchange_data (updated_account, result); } -void AdminServiceUtils::validate_account_exchange_data (const bts::api::admin::BTSAccount& account, - bts::api::admin::AdminServiceOperationResult& result){ +void AdminServiceUtils::validate_account_exchange_data ( + const bts::api::admin::BTSAccount& account, + bts::api::admin::AdminServiceOperationResult& result){ result.set_is_success(true); if (account.has_exchange_account_data()){ if (account.exchange_account_data().has_cme_account_data()){ - const bts::api::admin::CMEAccountData& cme_account_data = account.exchange_account_data().cme_account_data(); + const bts::api::admin::CMEAccountData& cme_account_data = + account.exchange_account_data().cme_account_data(); if (cme_account_data.clearing_account().size() > 12){ result.set_is_success(false); - result.set_error_text("CME account can not be more 12 characters long"); + result.set_error_text("CME account can not be more " + "12 characters long"); + } + if(cme_account_data.clearing_account() != account.name()){ + result.set_is_success(false); + result.set_error_text("Clearing account name has to " + "match the account name"); + } + } + if (account.exchange_account_data().has_sim_account_data()){ + const bts::api::admin::SIMAccountData& sim_account_data = + account.exchange_account_data().sim_account_data(); + if(sim_account_data.clearing_account() != account.name()){ + result.set_is_success(false); + result.set_error_text("Clearing account name has to " + "match the account name"); } } } @@ -1189,23 +1206,23 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ bts::api::admin::ExchangeAccountData exchange_account_data; exchange_account_data.mutable_cme_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); exchange_account_data.mutable_cme_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); - exchange_account_data.mutable_cme_account_data()->set_clearing_account("ca_" + parent_account->name()); + exchange_account_data.mutable_cme_account_data()->set_clearing_account(parent_account->name()); exchange_account_data.mutable_sim_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); exchange_account_data.mutable_sim_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); - exchange_account_data.mutable_sim_account_data()->set_clearing_account("ca_" + parent_account->name()); + exchange_account_data.mutable_sim_account_data()->set_clearing_account(parent_account->name()); set_account_exchange_data(parent_account, exchange_account_data); - exchange_account_data.mutable_cme_account_data()->set_clearing_account("ca_" + account_1->name()); - exchange_account_data.mutable_sim_account_data()->set_clearing_account("ca_" + account_1->name()); + exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_1->name()); + exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_1->name()); set_account_exchange_data(account_1, exchange_account_data); - exchange_account_data.mutable_cme_account_data()->set_clearing_account("ca_" + account_2->name()); - exchange_account_data.mutable_sim_account_data()->set_clearing_account("ca_" + account_2->name()); + exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_2->name()); + exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_2->name()); set_account_exchange_data(account_2, exchange_account_data); - exchange_account_data.mutable_cme_account_data()->set_clearing_account("ca_" + account_3->name()); - exchange_account_data.mutable_sim_account_data()->set_clearing_account("ca_" + account_3->name()); + exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_3->name()); + exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_3->name()); set_account_exchange_data(account_3, exchange_account_data); // add cme and sim user data diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 7a9cba44b..b7d77828b 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -69,7 +69,9 @@ message CustomOrderDefinition JoinOrderDefinition join = 20; TopOrderDefinition top = 21; TriggerOrderDefinition trigger = 22; - DynamicOrderDefinition dynamic = 23; + CoverOrderDefinition cover = 23; + + DynamicOrderDefinition dynamic = 1000; } } @@ -128,10 +130,17 @@ message TriggerOrderDefinition { TriggerCondition trigger_condition=1; TriggerAction trigger_action=2; CustomOrderDefinition child=3; + TriggerExitCondition exit_condition=4; +} +message CoverOrderDefinition { + CustomOrderDefinition hedge = 1; + int32 hedge_ticks = 2; + CustomOrderDefinition child = 3; } message DynamicOrderDefinition { string dynamic_order_type = 1; map parameters = 2; + CustomOrderDefinition child = 3; } // End custom order definitions @@ -155,6 +164,12 @@ message OrderState { google.protobuf.Timestamp created = 16; google.protobuf.Timestamp last_change = 8; + enum DisplayStatus { + VISIBLE = 0; + HIDDEN = 1; + } + DisplayStatus display_status=23; + oneof custom { // native order types MarketOrderState market = 9; // OrdType = 1 @@ -170,7 +185,9 @@ message OrderState { JoinOrderState join = 19; TopOrderState top = 20; TriggerOrderState trigger = 21; - DynamicOrderState dynamic = 22; + CoverOrderState cover = 22; + + DynamicOrderState dynamic = 1000; } } @@ -239,6 +256,7 @@ message LeanOrderState {} message JoinOrderState {} message TopOrderState {} message TriggerOrderState {} +message CoverOrderState {} message DynamicOrderState { map state = 2; } @@ -283,6 +301,7 @@ enum TimeInForce { TIME_IN_FORCE_UNDEFINED = 0; TIME_IN_FORCE_DAY = 48; TIME_IN_FORCE_GTC = 49; + TIME_IN_FORCE_IOC = 51; } enum ManualOrderIndicator { @@ -389,40 +408,59 @@ enum TriggerType{ STOP = 0; INVERSE_STOP = 1; } +// this is the maket the trigger order +// watches for the trigger condition enum TriggerPriceType{ BID = 0; ASK = 1; - LAST_TRADE_PRICE = 2; + LAST_TRADE_PRICE = 2; //unused->assert } message TriggerQuantity{ spark.QuantityMeasure quantity_measure = 10; uint32 threshold_quantity = 20; } -message AbsolutePriceTrigger{ +message AbsolutePriceTrigger{ // we can leave out qty for now - TriggerQuantity trigger_quantity = 10; + TriggerQuantity trigger_quantity = 10; //unused } message TrailingTrigger{ TriggerType trigger_type = 10; int32 number_of_ticks = 20; } -message TriggerCondition{ +message TriggerCondition{ TriggerPriceType price_type = 10; oneof trigger{ AbsolutePriceTrigger absolute_price_trigger = 20; - TrailingTrigger trailing_trigger = 30; - } + TrailingTrigger trailing_trigger = 30; //unused + } } // Trigger Action //////////////////////////////////// ////////////////////////////////////////////////////// +// if TriggerAction.orderprice is payup +// then the payup price will be calc'ed +// with respect to this price message TriggerPayupPrice{ - TriggerPriceType price_type = 10; - int32 payup_ticks = 20; + enum TriggerPayupPriceType{ + BID = 0; + ASK = 1; + LAST_TRADE_PRICE = 2; //unused + TRIGGER=3; + } + TriggerPriceType price_type = 10; // defunct + TriggerPayupPriceType payup_price_type = 15; + int32 payup_ticks = 20; } message TriggerAction{ - uint32 security_id = 10; + uint32 security_id = 10; //unused oneof orderprice{ TriggerPayupPrice payup = 20; double price = 30; - } -} \ No newline at end of file + } +} +// Trigger Exit Condition //////////////////////////// +////////////////////////////////////////////////////// +message TriggerExitCondition{ + bool timeout_enabled = 10; + uint32 timeout_seconds=20; //seconds + bool conditional_cancel=30; +} diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index f37d2c810..68263734c 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -19,8 +19,7 @@ message PositionUnit{ } service PositionService { - option (bts.api.service_description) = "Provides a management interface to the user model"; + option (bts.api.service_description) = "Provides Position and PNL, per security, per account"; // subscription rpc position_data(bts.api.VoidMessage) returns (stream PositionUnit); - //rpc get_admin_data(bts.api.VoidMessage) returns (PositionUnit); } \ No newline at end of file diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index 1e2f217d6..0f4fb61f8 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -62,11 +62,11 @@ CppConfig cpp_entry { key: "5Y" value: 42000 } cpp_entry { key: "5ZN" value: 2500 } cpp_entry { key: "63" value: 1000 } - cpp_entry { key: "6A" value: 1000 } - cpp_entry { key: "6B" value: 625 } + cpp_entry { key: "6A" value: 100000 } + cpp_entry { key: "6B" value: 62500 } cpp_entry { key: "6C" value: 100000 } - cpp_entry { key: "6E" value: 1250 } - cpp_entry { key: "6J" value: 1250 } + cpp_entry { key: "6E" value: 125000 } + cpp_entry { key: "6J" value: 12500000 } cpp_entry { key: "6L" value: 100000 } cpp_entry { key: "6M" value: 500000 } cpp_entry { key: "6N" value: 100000 } @@ -357,9 +357,6 @@ CppConfig cpp_entry { key: "BSW" value: 136 } cpp_entry { key: "BTC" value: 5 } cpp_entry { key: "BTT" value: 50 } - cpp_entry { key: "BU2" value: 20000 } - cpp_entry { key: "BU3" value: 30000 } - cpp_entry { key: "BU5" value: 50000 } cpp_entry { key: "BUC" value: 42000 } cpp_entry { key: "BUS" value: 20 } cpp_entry { key: "BUW" value: 20 } @@ -448,6 +445,7 @@ CppConfig cpp_entry { key: "DBB" value: 1000 } cpp_entry { key: "DBI" value: 1000 } cpp_entry { key: "DBL" value: 100 } + cpp_entry { key: "DBR" value: 1000 } cpp_entry { key: "DBT" value: 100 } cpp_entry { key: "DC" value: 2000 } cpp_entry { key: "DCB" value: 1000 } @@ -461,12 +459,13 @@ CppConfig cpp_entry { key: "DDO" value: 1000 } cpp_entry { key: "DEB" value: 744 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 264 } + cpp_entry { key: "DEP" value: 276 } cpp_entry { key: "DES" value: 1000 } cpp_entry { key: "DFL" value: 100 } cpp_entry { key: "DFT" value: 100 } cpp_entry { key: "DG2" value: 100 } cpp_entry { key: "DG3" value: 100 } + cpp_entry { key: "DGH" value: 1000 } cpp_entry { key: "DGI" value: 100 } cpp_entry { key: "DGS" value: 100 } cpp_entry { key: "DGT" value: 100 } @@ -476,11 +475,17 @@ CppConfig cpp_entry { key: "DIH" value: 2500 } cpp_entry { key: "DJR" value: 100 } cpp_entry { key: "DKR" value: 1000 } + cpp_entry { key: "DMB" value: 100 } + cpp_entry { key: "DOB" value: 1000 } + cpp_entry { key: "DOP" value: 1000 } + cpp_entry { key: "DRB" value: 1000 } cpp_entry { key: "DRS" value: 100 } cpp_entry { key: "DSD" value: 1000 } cpp_entry { key: "DSE" value: 1000 } + cpp_entry { key: "DSG" value: 1000 } cpp_entry { key: "DSI" value: 1000 } cpp_entry { key: "DSM" value: 1000 } + cpp_entry { key: "DUA" value: 6350 } cpp_entry { key: "DUP" value: 1000 } cpp_entry { key: "DVE" value: 200 } cpp_entry { key: "DVT" value: 200 } @@ -498,7 +503,6 @@ CppConfig cpp_entry { key: "EAE" value: 5 } cpp_entry { key: "EAF" value: 1000 } cpp_entry { key: "EAW" value: 80 } - cpp_entry { key: "EB" value: 2500 } cpp_entry { key: "EBE" value: 1000 } cpp_entry { key: "ECD" value: 125000 } cpp_entry { key: "ECK" value: 4000000 } @@ -550,7 +554,6 @@ CppConfig cpp_entry { key: "EWG" value: 1000 } cpp_entry { key: "EWN" value: 1000 } cpp_entry { key: "EXR" value: 350000 } - cpp_entry { key: "F1E" value: 1000 } cpp_entry { key: "F1U" value: 1000 } cpp_entry { key: "F3" value: 1000 } cpp_entry { key: "FAL" value: 5 } @@ -612,6 +615,7 @@ CppConfig cpp_entry { key: "GDK" value: 2000 } cpp_entry { key: "GDL" value: 1000 } cpp_entry { key: "GE" value: 2500 } + cpp_entry { key: "GES" value: 1000 } cpp_entry { key: "GF" value: 500 } cpp_entry { key: "GFC" value: 1000 } cpp_entry { key: "GFT" value: 500 } @@ -621,8 +625,11 @@ CppConfig cpp_entry { key: "GKS" value: 1000 } cpp_entry { key: "GLB" value: 2500 } cpp_entry { key: "GLI" value: 100 } + cpp_entry { key: "GNB" value: 1000 } cpp_entry { key: "GNF" value: 440 } cpp_entry { key: "GNL" value: 80 } + cpp_entry { key: "GNO" value: 1000 } + cpp_entry { key: "GNS" value: 1000 } cpp_entry { key: "GOC" value: 7450 } cpp_entry { key: "GPS" value: 100 } cpp_entry { key: "GSI" value: 42000 } @@ -655,7 +662,7 @@ CppConfig cpp_entry { key: "HB" value: 2500 } cpp_entry { key: "HE" value: 400 } cpp_entry { key: "HET" value: 400 } - cpp_entry { key: "HG" value: 5000 } + cpp_entry { key: "HG" value: 25000 } cpp_entry { key: "HG0" value: 25000 } cpp_entry { key: "HGS" value: 25000 } cpp_entry { key: "HGT" value: 25000 } @@ -693,20 +700,20 @@ CppConfig cpp_entry { key: "IBE" value: 1000 } cpp_entry { key: "IBS" value: 1000 } cpp_entry { key: "IBV" value: 1 } - cpp_entry { key: "IC" value: 5000 } + cpp_entry { key: "IC" value: 50 } cpp_entry { key: "ICI" value: 1000 } cpp_entry { key: "IDL" value: 5 } - cpp_entry { key: "IH" value: 5000 } + cpp_entry { key: "IH" value: 50 } cpp_entry { key: "ILB" value: 1750 } cpp_entry { key: "ILS" value: 1000000 } cpp_entry { key: "IN" value: 2500 } - cpp_entry { key: "IP" value: 5000 } + cpp_entry { key: "IP" value: 50 } cpp_entry { key: "IPO" value: 10 } cpp_entry { key: "IPT" value: 10 } - cpp_entry { key: "IS" value: 5000 } + cpp_entry { key: "IS" value: 50 } cpp_entry { key: "ITB" value: 744 } - cpp_entry { key: "ITP" value: 264 } - cpp_entry { key: "IW" value: 5000 } + cpp_entry { key: "ITP" value: 276 } + cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } cpp_entry { key: "JA" value: 1000 } @@ -716,7 +723,7 @@ CppConfig cpp_entry { key: "JFB" value: 1000 } cpp_entry { key: "JFC" value: 1000 } cpp_entry { key: "JKM" value: 10000 } - cpp_entry { key: "JML" value: 40 } + cpp_entry { key: "JML" value: 440 } cpp_entry { key: "JNC" value: 1000 } cpp_entry { key: "JNG" value: 10000 } cpp_entry { key: "JNL" value: 80 } @@ -744,8 +751,8 @@ CppConfig cpp_entry { key: "K5" value: 20 } cpp_entry { key: "K5K" value: 20 } cpp_entry { key: "K5N" value: 20 } - cpp_entry { key: "KE" value: 5000 } - cpp_entry { key: "KET" value: 5000 } + cpp_entry { key: "KE" value: 50 } + cpp_entry { key: "KET" value: 50 } cpp_entry { key: "KQ" value: 20 } cpp_entry { key: "KQK" value: 20 } cpp_entry { key: "KQN" value: 20 } @@ -778,11 +785,12 @@ CppConfig cpp_entry { key: "M5F" value: 10 } cpp_entry { key: "M6A" value: 10000 } cpp_entry { key: "M6B" value: 6250 } - cpp_entry { key: "M6E" value: 125 } + cpp_entry { key: "M6E" value: 12500 } cpp_entry { key: "MAA" value: 100 } cpp_entry { key: "MAB" value: 1000 } cpp_entry { key: "MAC" value: 833 } cpp_entry { key: "MAE" value: 100 } + cpp_entry { key: "MAF" value: 10 } cpp_entry { key: "MAS" value: 100 } cpp_entry { key: "MB" value: 1000 } cpp_entry { key: "MBB" value: 100000 } @@ -795,7 +803,7 @@ CppConfig cpp_entry { key: "MCC" value: 1000 } cpp_entry { key: "MCD" value: 10000 } cpp_entry { key: "MCT" value: 80 } - cpp_entry { key: "MCX" value: 5000 } + cpp_entry { key: "MCX" value: 50 } cpp_entry { key: "MDB" value: 100 } cpp_entry { key: "MDD" value: 5 } cpp_entry { key: "MDL" value: 80 } @@ -804,6 +812,7 @@ CppConfig cpp_entry { key: "ME" value: 42000 } cpp_entry { key: "MEB" value: 100 } cpp_entry { key: "MEE" value: 100 } + cpp_entry { key: "MEF" value: 10 } cpp_entry { key: "MEL" value: 840 } cpp_entry { key: "MEO" value: 100 } cpp_entry { key: "MEW" value: 100 } @@ -830,7 +839,7 @@ CppConfig cpp_entry { key: "MJN" value: 100 } cpp_entry { key: "MJP" value: 25 } cpp_entry { key: "MJY" value: 1250000 } - cpp_entry { key: "MKC" value: 1000 } + cpp_entry { key: "MKC" value: 10 } cpp_entry { key: "MLD" value: 80 } cpp_entry { key: "MM" value: 1000 } cpp_entry { key: "MME" value: 100 } @@ -867,13 +876,12 @@ CppConfig cpp_entry { key: "MTI" value: 80 } cpp_entry { key: "MTS" value: 100 } cpp_entry { key: "MUD" value: 100 } - cpp_entry { key: "MWE" value: 5000 } + cpp_entry { key: "MWE" value: 50 } cpp_entry { key: "MX" value: 1000 } cpp_entry { key: "MXB" value: 35000 } cpp_entry { key: "MXL" value: 5 } cpp_entry { key: "MXR" value: 35000 } cpp_entry { key: "N1B" value: 1000 } - cpp_entry { key: "N1E" value: 1000 } cpp_entry { key: "N1U" value: 1000 } cpp_entry { key: "N3L" value: 80 } cpp_entry { key: "N3P" value: 80 } @@ -894,7 +902,7 @@ CppConfig cpp_entry { key: "NFG" value: 1000 } cpp_entry { key: "NFN" value: 2500 } cpp_entry { key: "NFO" value: 5 } - cpp_entry { key: "NG" value: 100 } + cpp_entry { key: "NG" value: 10000 } cpp_entry { key: "NGT" value: 10000 } cpp_entry { key: "NHH" value: 5000 } cpp_entry { key: "NHN" value: 2500 } @@ -1046,6 +1054,7 @@ CppConfig cpp_entry { key: "REB" value: 1000 } cpp_entry { key: "REX" value: 100 } cpp_entry { key: "RF" value: 125000 } + cpp_entry { key: "RGF" value: 349860 } cpp_entry { key: "RGI" value: 1000 } cpp_entry { key: "RGT" value: 50 } cpp_entry { key: "RHB" value: 1000 } @@ -1068,10 +1077,10 @@ CppConfig cpp_entry { key: "RY" value: 125000 } cpp_entry { key: "RYA" value: 42000 } cpp_entry { key: "S1U" value: 1000 } - cpp_entry { key: "SBT" value: 5000 } + cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1680 } + cpp_entry { key: "SDD" value: 1840 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1087,6 +1096,7 @@ CppConfig cpp_entry { key: "SG" value: 250 } cpp_entry { key: "SGB" value: 1000 } cpp_entry { key: "SGE" value: 42000 } + cpp_entry { key: "SGF" value: 1000 } cpp_entry { key: "SGG" value: 1000 } cpp_entry { key: "SGT" value: 250 } cpp_entry { key: "SI" value: 5000 } @@ -1103,7 +1113,7 @@ CppConfig cpp_entry { key: "SP" value: 250 } cpp_entry { key: "SR1" value: 4167 } cpp_entry { key: "SR3" value: 2500 } - cpp_entry { key: "SRT" value: 1680 } + cpp_entry { key: "SRT" value: 1840 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1114,28 +1124,27 @@ CppConfig cpp_entry { key: "STY" value: 1000 } cpp_entry { key: "SU" value: 250 } cpp_entry { key: "SUT" value: 250 } - cpp_entry { key: "T01" value: 800 } - cpp_entry { key: "T02" value: 800 } - cpp_entry { key: "T03" value: 800 } - cpp_entry { key: "T06" value: 800 } - cpp_entry { key: "T07" value: 800 } cpp_entry { key: "T08" value: 800 } cpp_entry { key: "T09" value: 800 } cpp_entry { key: "T10" value: 800 } cpp_entry { key: "T13" value: 800 } - cpp_entry { key: "T1E" value: 1000 } + cpp_entry { key: "T14" value: 800 } + cpp_entry { key: "T15" value: 800 } + cpp_entry { key: "T16" value: 800 } + cpp_entry { key: "T17" value: 800 } cpp_entry { key: "T1U" value: 1000 } cpp_entry { key: "T20" value: 800 } + cpp_entry { key: "T21" value: 800 } + cpp_entry { key: "T22" value: 800 } cpp_entry { key: "T23" value: 800 } cpp_entry { key: "T24" value: 800 } - cpp_entry { key: "T25" value: 800 } - cpp_entry { key: "T26" value: 800 } cpp_entry { key: "T27" value: 800 } + cpp_entry { key: "T28" value: 800 } + cpp_entry { key: "T29" value: 800 } cpp_entry { key: "T2B" value: 1000 } cpp_entry { key: "T2D" value: 1000 } cpp_entry { key: "T2M" value: 100 } cpp_entry { key: "T30" value: 800 } - cpp_entry { key: "T31" value: 800 } cpp_entry { key: "T3B" value: 1000 } cpp_entry { key: "T3L" value: 80 } cpp_entry { key: "T4B" value: 1000 } @@ -1256,7 +1265,7 @@ CppConfig cpp_entry { key: "WHD" value: 1000 } cpp_entry { key: "WMB" value: 1000 } cpp_entry { key: "WMD" value: 1000 } - cpp_entry { key: "WMK" value: 5000 } + cpp_entry { key: "WMK" value: 50 } cpp_entry { key: "WMR" value: 1000 } cpp_entry { key: "WNC" value: 1000 } cpp_entry { key: "WNT" value: 1000 } @@ -1283,13 +1292,13 @@ CppConfig cpp_entry { key: "XAV" value: 100 } cpp_entry { key: "XAY" value: 100 } cpp_entry { key: "XBT" value: 100 } - cpp_entry { key: "XC" value: 1000 } + cpp_entry { key: "XC" value: 10 } cpp_entry { key: "XER" value: 1000 } cpp_entry { key: "XET" value: 100 } cpp_entry { key: "XFT" value: 250 } cpp_entry { key: "XH" value: 2500 } cpp_entry { key: "XIT" value: 100 } - cpp_entry { key: "XK" value: 1000 } + cpp_entry { key: "XK" value: 10 } cpp_entry { key: "XKT" value: 100 } cpp_entry { key: "XPP" value: 80 } cpp_entry { key: "XPT" value: 100 } @@ -1298,7 +1307,7 @@ CppConfig cpp_entry { key: "XRT" value: 250 } cpp_entry { key: "XUT" value: 100 } cpp_entry { key: "XVT" value: 100 } - cpp_entry { key: "XW" value: 1000 } + cpp_entry { key: "XW" value: 10 } cpp_entry { key: "XX" value: 2500 } cpp_entry { key: "XYT" value: 100 } cpp_entry { key: "YF" value: 42000 } @@ -1363,7 +1372,7 @@ CppConfig cpp_entry { key: "ZC9906" value: 1000 } cpp_entry { key: "ZC9909" value: 1000 } cpp_entry { key: "ZC9912" value: 1000 } - cpp_entry { key: "ZCT" value: 5000 } + cpp_entry { key: "ZCT" value: 50 } cpp_entry { key: "ZD0030" value: 1000 } cpp_entry { key: "ZD9112" value: 1000 } cpp_entry { key: "ZD9115" value: 1000 } @@ -1392,12 +1401,12 @@ CppConfig cpp_entry { key: "ZMT" value: 100 } cpp_entry { key: "ZN" value: 1000 } cpp_entry { key: "ZNC" value: 25 } - cpp_entry { key: "ZO" value: 5000 } + cpp_entry { key: "ZO" value: 50 } cpp_entry { key: "ZQ" value: 4167 } cpp_entry { key: "ZR" value: 2000 } cpp_entry { key: "ZS" value: 50 } cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } - cpp_entry { key: "ZWT" value: 5000 } + cpp_entry { key: "ZWT" value: 50 } } } diff --git a/src/lib/config/defaults/dynamic_orders.conf b/src/lib/config/defaults/dynamic_orders.conf new file mode 100644 index 000000000..0330c6de3 --- /dev/null +++ b/src/lib/config/defaults/dynamic_orders.conf @@ -0,0 +1,18 @@ + + +DynamicOrderList { + value { + dynamic_orders + { + type_name: 'DynamicOrder1' + parameter_keys: 'param1' + parameter_keys: 'param2' + } +# dynamic_orders +# { +# type_name: 'DynamicOrder2' +# parameter_keys: 'param3' +# parameter_keys: 'param4' +# } + } +} \ No newline at end of file diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 07979333a..eaf069a98 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -1,160 +1,160 @@ -syntax='proto2'; -package bts.md; - -message MarketDataConfig { - // Allows you to turn off in-proc market data entirely - optional bool use_md = 1 [default = true]; - optional bool use_replay = 2 [default=false]; -} - -message PlatformMap -{ - // PLATFORM_MDP3ONIXS - optional string glbx_platform = 1 [default = "PLATFORM_SIM"]; -} - - -// -// Options that apply to market data server -// - -message PublisherOptions -{ - // removed 2 - optional string network_interface = 3 [default = "0.0.0.0"]; - // Supply either network_interface -or- network_interface_[a,b] - optional string network_interface_a = 30; - optional string network_interface_b = 31; - // removed 4,5 - // removed 6,7,8 - optional string channel_prefix = 9 [default = ""]; - - // Co2 options - - // How old can the heartbeat be before it's considered dead - optional uint32 heartbeat_ms = 10 [default = 5000]; - optional bool disable_heartbeat = 11 [default = false]; - optional uint32 heartbeat_boot_seconds = 12 [default = 60]; // 1 minute grace period from shm creation - - optional bool skip_options = 13 [default = true]; -} - -message PlatformConfig -{ - required string platform = 1; - optional string exchange = 2 [default = "VENUE_UNSET"]; - optional string type = 3 [default = "SECURITYTYPE_UNSET"]; -} - -message StreamOptions -{ - optional uint32 trade_log_stream_size = 2 [default = 1024]; -} - -message PublisherNamespace { - optional string shared_memory_namespace = 1; -} - -// -// CME Options -// -message CMEOptions -{ - enum OnixSLogMode { - None = 0; - Important = 10; - Regular = 50; - Debug = 100; - } - message FeedEngineSettings { - optional string name = 1; - // If num_threads is set it will use that - otherwise it will use channels_per_thread and the number of threads configured for this channel to determine the number of threads - optional uint32 num_threads = 2 [default = 1]; - // Defines amount of time Feed Engine spends on socket waiting for I/O while running master processing loop. - optional uint32 data_wait = 3 [default = 10]; - // Defines amount of time Feed Engine keeps cycling before going to sleep when no useful activity can be done - optional uint32 spin_time = 4 [default = 1]; - optional uint32 channels_per_thread = 5 [default = 3]; - repeated uint32 affinity = 10; - optional uint32 udp_socket_buffer_size = 11 [default = 33554432]; //32mb - } - enum BookType { - BOOKTYPE_CONSOLIDATED = 0; - BOOKTYPE_DIRECT = 1; - } - message CMEChannel { - repeated string id = 2; - optional string feed_engine = 3 [default = "default"]; - - - optional uint32 max_gap_recovery_cache_size = 11 [default = 6]; - optional uint32 lost_packet_wait_timeout_ms = 12 [default = 10]; - optional OnixSLogMode onixs_log_mode = 13 [default = Important]; - optional bool prefer_backup_feeds = 15 [default = false]; - - optional bool use_tcp_replay = 20 [default = true]; - optional string tcp_replay_username = 21 [default = "MDPFFBLUE"]; - optional string tcp_replay_password = 22 [default = "password01"]; - optional int32 tcp_replay_connect_attempts = 23 [default = 3]; - optional int32 tcp_replay_reconnect_interval_ms = 24 [default = 30000]; - optional int32 tcp_replay_timeout_s = 25 [default = 10]; - - optional uint32 recovery_queue_size = 30 [default = 640000]; - optional bool use_natural_refresh = 31 [default = false]; - optional bool join_snapshot_on_gap = 32 [default = false]; - - optional bool load_security_db = 33 [default = true]; - optional BookType book_type = 34 [default = BOOKTYPE_CONSOLIDATED]; - - } - optional string onixs_license = 1 [default = "{default}"]; - repeated CMEChannel channel = 3; - repeated FeedEngineSettings feed_engine = 5; - - // Prevents parsing trades/rfqs/doing anything not required for quoting - optional bool quoter_mode = 6; -} - -message RecordOptions { -// optional string output_path = 2 [default = "/home/bts/md/today"]; - optional bool enable_depth = 3 [default = false]; - optional bool enable_future_depth = 4 [default = true]; -} - -// -// Replay options -// -message ReplayOptions { - optional string host = 1 [default = "mdreplay"]; - optional string base_path = 2 [default = "/md"]; - optional string file_name = 3 [default = "options.coconut"]; - - // 2.0 = double speed, 0.5 = half speed - optional double speed = 11 [default = 1.0]; - - optional bool interactive = 12 [default = false]; -} - -message RelayOptions { - optional uint32 naggle_ms = 1 [default = 100]; - optional uint32 security_scan_interval = 2 [default = 500]; - optional uint32 recovery_interval = 3 [default = 30000]; -} - -message CMETradingSchedule { - // we can elaborate later, but for now it's very simple: - // this is "hours after midnight, in Central Time" - optional double gen_open_hour = 1 [default = 8.5]; // 8:30 am CT -} - -message SimSource { - oneof source { - string replay_url = 1 [default = "http://mdreplay.bluetradesys.local/spark/futures.coconut"]; - string replay_file = 2 [default = "futures.coconut"]; - bool local_relay = 3; - } -} - -message SecurityExpirationCutoff { - optional uint32 max_days_after_expiration =1 [default = 7]; -} +syntax='proto2'; +package bts.md; + +message MarketDataConfig { + // Allows you to turn off in-proc market data entirely + optional bool use_md = 1 [default = true]; + optional bool use_replay = 2 [default=false]; +} + +message PlatformMap +{ + // PLATFORM_MDP3ONIXS + optional string glbx_platform = 1 [default = "PLATFORM_SIM"]; +} + + +// +// Options that apply to market data server +// + +message PublisherOptions +{ + // removed 2 + optional string network_interface = 3 [default = "0.0.0.0"]; + // Supply either network_interface -or- network_interface_[a,b] + optional string network_interface_a = 30; + optional string network_interface_b = 31; + // removed 4,5 + // removed 6,7,8 + optional string channel_prefix = 9 [default = ""]; + + // Co2 options + + // How old can the heartbeat be before it's considered dead + optional uint32 heartbeat_ms = 10 [default = 5000]; + optional bool disable_heartbeat = 11 [default = false]; + optional uint32 heartbeat_boot_seconds = 12 [default = 60]; // 1 minute grace period from shm creation + + optional bool skip_options = 13 [default = true]; +} + +message PlatformConfig +{ + required string platform = 1; + optional string exchange = 2 [default = "VENUE_UNSET"]; + optional string type = 3 [default = "SECURITYTYPE_UNSET"]; +} + +message StreamOptions +{ + optional uint32 trade_log_stream_size = 2 [default = 1024]; +} + +message PublisherNamespace { + optional string shared_memory_namespace = 1; +} + +// +// CME Options +// +message CMEOptions +{ + enum OnixSLogMode { + None = 0; + Important = 10; + Regular = 50; + Debug = 100; + } + message FeedEngineSettings { + optional string name = 1; + // If num_threads is set it will use that - otherwise it will use channels_per_thread and the number of threads configured for this channel to determine the number of threads + optional uint32 num_threads = 2 [default = 1]; + // Defines amount of time Feed Engine spends on socket waiting for I/O while running master processing loop. + optional uint32 data_wait = 3 [default = 10]; + // Defines amount of time Feed Engine keeps cycling before going to sleep when no useful activity can be done + optional uint32 spin_time = 4 [default = 1]; + optional uint32 channels_per_thread = 5 [default = 3]; + repeated uint32 affinity = 10; + optional uint32 udp_socket_buffer_size = 11 [default = 33554432]; //32mb + } + enum BookType { + BOOKTYPE_CONSOLIDATED = 0; + BOOKTYPE_DIRECT = 1; + } + message CMEChannel { + repeated string id = 2; + optional string feed_engine = 3 [default = "default"]; + + + optional uint32 max_gap_recovery_cache_size = 11 [default = 6]; + optional uint32 lost_packet_wait_timeout_ms = 12 [default = 10]; + optional OnixSLogMode onixs_log_mode = 13 [default = Important]; + optional bool prefer_backup_feeds = 15 [default = false]; + + optional bool use_tcp_replay = 20 [default = true]; + optional string tcp_replay_username = 21 [default = "MDPFFBLUE"]; + optional string tcp_replay_password = 22 [default = "password01"]; + optional int32 tcp_replay_connect_attempts = 23 [default = 3]; + optional int32 tcp_replay_reconnect_interval_ms = 24 [default = 30000]; + optional int32 tcp_replay_timeout_s = 25 [default = 10]; + + optional uint32 recovery_queue_size = 30 [default = 640000]; + optional bool use_natural_refresh = 31 [default = false]; + optional bool join_snapshot_on_gap = 32 [default = false]; + + optional bool load_security_db = 33 [default = true]; + optional BookType book_type = 34 [default = BOOKTYPE_CONSOLIDATED]; + + } + optional string onixs_license = 1 [default = "{default}"]; + repeated CMEChannel channel = 3; + repeated FeedEngineSettings feed_engine = 5; + + // Prevents parsing trades/rfqs/doing anything not required for quoting + optional bool quoter_mode = 6; +} + +message RecordOptions { +// optional string output_path = 2 [default = "/home/bts/md/today"]; + optional bool enable_depth = 3 [default = false]; + optional bool enable_future_depth = 4 [default = true]; +} + +// +// Replay options +// +message ReplayOptions { + optional string host = 1 [default = "mdreplay"]; + optional string base_path = 2 [default = "/md"]; + optional string file_name = 3 [default = "options.coconut"]; + + // 2.0 = double speed, 0.5 = half speed + optional double speed = 11 [default = 1.0]; + + optional bool interactive = 12 [default = false]; +} + +message RelayOptions { + optional uint32 naggle_ms = 1 [default = 100]; + optional uint32 security_scan_interval = 2 [default = 500]; + optional uint32 recovery_interval = 3 [default = 30000]; +} + +message CMETradingSchedule { + // we can elaborate later, but for now it's very simple: + // this is "hours after midnight, in Central Time" + optional double gen_open_hour = 1 [default = 8.5]; // 8:30 am CT +} + +message SimSource { + oneof source { + string replay_url = 1 [default = "http://mdreplay.bluetradesys.local/spark/futures.coconut"]; + string replay_file = 2 [default = "futures.coconut"]; + bool local_relay = 3; + } +} + +message SecurityExpirationCutoff { + optional uint32 max_days_after_expiration =1 [default = 7]; +} diff --git a/src/lib/config/protos/dynamic_orders.proto b/src/lib/config/protos/dynamic_orders.proto new file mode 100644 index 000000000..8b0b65261 --- /dev/null +++ b/src/lib/config/protos/dynamic_orders.proto @@ -0,0 +1,13 @@ +syntax='proto2'; + +package bts.config.dynamic_orders; + +message DynamicOrderList +{ + message DynamicOrderInfo + { + optional string type_name = 1; + repeated string parameter_keys = 2; + } + repeated DynamicOrderInfo dynamic_orders = 1; +} diff --git a/src/lib/config/protos/orders_fills_cleanup.proto b/src/lib/config/protos/orders_fills_cleanup.proto index d56b5629b..e7d77781e 100644 --- a/src/lib/config/protos/orders_fills_cleanup.proto +++ b/src/lib/config/protos/orders_fills_cleanup.proto @@ -12,4 +12,10 @@ message OrdersSoftCleanupCutoff{ // utc time optional uint32 sod_hh = 20 [default=21]; optional uint32 sod_mm = 30 [default=30]; +} + +message SODTime{ + // utc time + optional uint32 sod_hh = 20 [default=21]; + optional uint32 sod_mm = 30 [default=30]; } \ No newline at end of file diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib/config/tests/config_tests.cpp index ce8d0ee73..3b4d8a917 100755 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib/config/tests/config_tests.cpp @@ -12,6 +12,7 @@ #include "lib/config/invalid/invalid.pb.h" #include "lib/config/protos/system.pb.h" #include "lib/config/protos/testkeys.pb.h" +#include "lib/config/protos/dynamic_orders.pb.h" #include #include @@ -32,12 +33,14 @@ using bts::config::test::FooGroup; using bts::config::test::StringTable; + namespace bts { int config_tests = 0; TEST_CASE("Configuration Tests","[config]") { bts::utils::internal::force_unittest_environment(); + bts::config::dynamic_orders::DynamicOrderList(); SECTION("basic_get_value_test") { diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 9fa8ffd6f..f88a63be4 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -32,7 +32,7 @@ inline Price encode_exchange_price(api::Security const&sec, Price in) { inline double raw_round_to_quote_price (double raw_price, double tick_size, api::Side side) { - double factor = 1000000; + double factor = 1000000000; auto i_price = llround (factor * raw_price); auto i_tick_size = llround (tick_size * factor); @@ -95,4 +95,7 @@ inline bool test_price_equality (double price_1, double price_2, double tick_siz { return std::fabs(price_2 - price_1) < 0.01 * tick_size; } +inline bool gr_than_eq(double p1, double p2, double tick_size){ + return test_price_equality(p1,p2,tick_size) || p1>=p2; +} }} diff --git a/src/lib/domain_model/tests/domain_tests.cpp b/src/lib/domain_model/tests/domain_tests.cpp new file mode 100644 index 000000000..bba06ac39 --- /dev/null +++ b/src/lib/domain_model/tests/domain_tests.cpp @@ -0,0 +1,57 @@ + +#include "catch/catch.hpp" +#include "../Security.h" + +namespace bts { +namespace test { + +TEST_CASE("rounding_tests", "[md]") { + SECTION("test_price_size") { + + const double tick_sizes[] { + // Dan's production system + // ./sparkd configcheck Symbols | grep future | sed -e 's/.*future: \"\(.*\)\"/\1/' | xargs -I{} sh -c "./sparkd md dump {} future glbx" | grep -o low_tick': [0-9.]\+ + 0.0078125, + 0.015625, + 0.03125, + 0.1, + 0.25, + 1, + // From Kevin's ramblings + // 2.5/320, + // 31./32, + // 10./32, + // 10.25/32, + // 10.375/32, + // 10.125/32, + // 10.25/32, + // .0025, + // .0000001, + // 1./32, + // 0.5/32, + // 0.25/32, + // 0.125/32, + // 0.01, + // 0.005, + // 1./100000, + // 1./16, + }; + + for (double tick : tick_sizes) { + // For valid prices from -101 to 101 + std::vector prices; + for (double price = 0; price < 101; price += tick) { + // Since all prices are valid ticks rounding should not change them + const double epsilon = 1e-9; + for (api::Side side : { api::Side::SIDE_BUY, api::Side::SIDE_SELL }) { + double rounded = securities::raw_round_to_quote_price(price, tick, side); + REQUIRE(std::abs(price-rounded) <= epsilon); + } + } + } + } +} + + + +}} \ No newline at end of file diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index b0c4cad54..9bf690d38 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -16,7 +16,9 @@ #include "lib/orderman/orders/book_algos/LeanOrder.h" #include "lib/orderman/orders/book_algos/JoinOrder.h" #include "lib/orderman/orders/book_algos/TopOrder.h" +#include "lib/orderman/orders/book_algos/CoverOrder.h" #include "lib/orderman/orders/TriggerOrder.h" +#include "lib/orderman/orders/DynamicOrder.h" #include #include @@ -140,7 +142,11 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kTrigger: order_ptr.reset (new orderman::TriggerOrder()); break; + case CustomOrderDefinition::kCover: + order_ptr.reset (new orderman::CoverOrder()); + break; case CustomOrderDefinition::kDynamic: + order_ptr.reset (new orderman::DynamicOrder()); break; case CustomOrderDefinition::CUSTOM_NOT_SET: bts_assert(false); diff --git a/src/lib/orderman/orders/IcebergOrder.cpp b/src/lib/orderman/orders/IcebergOrder.cpp index 01acc949b..8771866e4 100644 --- a/src/lib/orderman/orders/IcebergOrder.cpp +++ b/src/lib/orderman/orders/IcebergOrder.cpp @@ -209,7 +209,6 @@ void IcebergOrder::report_state() { void IcebergOrder::merge_states(api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, api::orderman::OrderState *merged) { - bts_assert(child_state.filled_quantity()); auto child_order_fills = child_state.filled_quantity(); auto child_order_avg_price = child_state.avg_price(); auto child_order_last_price = child_state.last_price(); @@ -254,7 +253,6 @@ void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { break; case ORDER_STATUS_COMPLETED: { - if (me->child.state.filled_quantity() > 0) { api::orderman::OrderState merged_state; merge_states(me->state, me->child.state, &merged_state); me->state = merged_state; @@ -263,11 +261,6 @@ void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { send_next_child_order(); else transition(ORDER_STATUS_COMPLETED); - } else { - me->child.clear(); - transition(ORDER_STATUS_ERROR, - "Child order completed without fills"); - } break; } diff --git a/src/lib/orderman/orders/TriggerOrder.cpp b/src/lib/orderman/orders/TriggerOrder.cpp index 7790f490d..4afdc5e59 100644 --- a/src/lib/orderman/orders/TriggerOrder.cpp +++ b/src/lib/orderman/orders/TriggerOrder.cpp @@ -16,29 +16,45 @@ struct TriggerOrder::PImpl { OrderServices *services; api::orderman::OrderDefinition order_def; double tick_size; + // true if timeout_exit is enabled + bool timeout_exit; + uint32_t timeout_msecs; + // true position cond exit is enabled + bool price_cond_exit; api::orderman::OrderState state; + // child state copied directly from the + // child order udpate callback api::orderman::OrderState child_state; OrderBuilder order_builder; ChildOrder child_order; + // true if child order has been placed once + bool order_placed; Book book; + CancelMode cancel_mode; // this tells that when the order is placed // initially, if the trigger price above the // market (trigger_condition's chosen market) bool trigger_above_market; + // true is non 0 market corresponding + // to the trigger market is obs'ed once bool market_observed_once; - bool is_cxled; bool is_recovered; bool is_succ_inited; + bts::TimeStamp child_order_time; PImpl() : services(nullptr), order_def(), + timeout_exit(false), + timeout_msecs(std::numeric_limits::max()), + price_cond_exit(false), state(), child_state(), child_order(), + order_placed(false), book(), + cancel_mode(CancelMode::none), market_observed_once(false), - is_cxled(false), is_recovered(false), is_succ_inited(false){ } @@ -63,6 +79,7 @@ void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, me->is_succ_inited=_on_init_new(order_def,pre_os); break; case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: case State::STEADY: case State::END: std::ostringstream oss; @@ -87,6 +104,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, me->is_recovered=true; break; case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: case State::STEADY: case State::END: std::ostringstream oss; @@ -117,10 +135,13 @@ void TriggerOrder::on_activate(Price price, services.book_updates.sub(SecurityKey(me->order_def.security_key()), [this](const BookUpdateEvent& bk_event) { this->_on_book_update (bk_event);}); + services.time_change.sub([this](const bts::mercury::TimerEvent& te) + {_on_time(te);}); _switch_state(State::WAITING_FOR_TRIGGER); } break; case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: case State::STEADY: case State::END:{ std::ostringstream oss; @@ -146,15 +167,14 @@ void TriggerOrder::on_update(Price price, me->state.set_price(price.value()); me->state.set_quantity(qty.value()); _report_state(); - _analyze_trigger(); + _analyze_trigger_and_shoot(); break; - case State::STEADY: + case State::WAITING_FOR_FIRST_ACK: + case State::STEADY: me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); _report_state(); break; case State::END: - LOG(OrderMan, Warn, "TriggerOrder::on_update key:{} state:{}", - key(),_state); break; } } @@ -164,7 +184,7 @@ void TriggerOrder::on_crack(TickToTradeCorID){ void TriggerOrder::on_cancel(TickToTradeCorID){ LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(),_state); - me->is_cxled=true; + me->cancel_mode=CancelMode::external; switch (_state){ case State::START: _switch_state(State::END); @@ -172,44 +192,83 @@ void TriggerOrder::on_cancel(TickToTradeCorID){ case State::WAITING_FOR_TRIGGER: _switch_state(State::END); break; - case State::STEADY: - me->child_order.cancel(); - _switch_state(State::END); + case State::WAITING_FOR_FIRST_ACK: + // we dont have a WAITING_FOR_ACK_CANCELLED + // (like the Quoter), so this message is + // rejected and reported + me->state.set_last_msg("Order is in flight"); + _report_state(); break; - case State::END: + case State::STEADY: + _cancel_order(CancelMode::external); + break; + case State::END: break; } } void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ switch (_state){ - case State::WAITING_FOR_TRIGGER: - if(b_event.key().value()==me->order_def.security_key()){ + case State::START: + break; + case State::WAITING_FOR_TRIGGER: + if(b_event.key().value()==me->order_def.security_key()){ me->book=b_event.book; _observe_market_once(); - _analyze_trigger(); + _analyze_trigger_and_shoot(); } break; - case State::START: + case State::WAITING_FOR_FIRST_ACK: + break; case State::STEADY: + if(b_event.key().value()==me->order_def.security_key()){ + if(me->price_cond_exit){ + me->book=b_event.book; + _analyze_trigger_and_cancel(); + } + } case State::END: break; } } void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ if(o_ev.key==me->child_order.key()){ + me->child_state=o_ev.state; switch (_state){ case State::START: case State::WAITING_FOR_TRIGGER: bts_assert(false); break; + case State::WAITING_FOR_FIRST_ACK: + if(SpreaderUtils::order_acknowledged(o_ev.state.status())){ + if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) + _switch_state(State::END); + else + _switch_state(State::STEADY); + } + break; case State::STEADY: - me->child_state=o_ev.state; if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) _switch_state(State::END); break; case State::END: break; } + _report_state(); + } +} +void TriggerOrder::_on_time(const bts::mercury::TimerEvent&){ + switch (_state){ + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: + break; + case State::STEADY:{ + if(me->timeout_exit) + _analyze_trigger_and_cancel(); + break; + } + case State::END: + break; } } bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, @@ -237,13 +296,22 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, me->state.set_last_msg("Could not resolve Trigger Order child security"); return false; } - if (bts::os::is_nan(trigger_order_def.trigger_action().price())){ + if (!trigger_order_def.trigger_action().has_payup() && + bts::os::is_nan(trigger_order_def.trigger_action().price())){ LOG(OrderMan, Error, "TriggerOrder::_on_init_new key:{} state:{} " "illegal child order price", key(),_state); me->state.set_last_msg("Illegal Child Order price"); return false; } + me->timeout_exit = trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().timeout_enabled(); + me->timeout_msecs = trigger_order_def.has_exit_condition() ? + 1000.0*trigger_order_def.exit_condition().timeout_seconds () : + std::numeric_limits::max(); + me->price_cond_exit = trigger_order_def.has_exit_condition() && + trigger_order_def.exit_condition().conditional_cancel(); + api::orderman::OrderDefinition child_order_def = order_def; child_order_def.set_security_key(trigger_order_def.trigger_action().security_id()); child_order_def.mutable_custom_def()->CopyFrom(trigger_order_def.child()); @@ -251,6 +319,12 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(),_state, + trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); + return true; } void TriggerOrder::_report_state(){ @@ -266,9 +340,12 @@ void TriggerOrder::_switch_state(State new_state){ case State::WAITING_FOR_TRIGGER: bts_assert(_state==State::START); break; - case State::STEADY: + case State::WAITING_FOR_FIRST_ACK: bts_assert(_state==State::WAITING_FOR_TRIGGER); break; + case State::STEADY: + bts_assert(_state==State::WAITING_FOR_FIRST_ACK); + break; case State::END: bts_assert(_state!=State::END); break; @@ -279,15 +356,55 @@ void TriggerOrder::_switch_state(State new_state){ _state=new_state; _report_state(); } -void TriggerOrder::_analyze_trigger(){ +void TriggerOrder::_analyze_trigger_and_shoot(){ if(me->market_observed_once){ double trigger_price=_trigger_price(); const md::PriceSize* obs_md=_observed_market(); - if((me->trigger_above_market && _gr_than_eq(obs_md->price(),trigger_price)) || - (!me->trigger_above_market && _gr_than_eq(trigger_price,obs_md->price()))){ - me->child_order.activate(Price(_child_order_price()), + if (_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + me->child_order_time=bts::Timer::now(); + me->order_placed=true; + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_shoot" + "key:{} state:{} " + "trigger_above_md:{} trigger_price:{} md:{} " + "order_price:{} order_qty:{}", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price(), + _child_order_price(), + me->state.quantity()); + me->child_order.activate(Price(_child_order_price()), Quantity(me->state.quantity())); - _switch_state(State::STEADY); + _switch_state(State::WAITING_FOR_FIRST_ACK); + } + } +} +void TriggerOrder::_analyze_trigger_and_cancel(){ + if(me->timeout_exit){ + int64_t time_diff = ms_diff (bts::Timer::now(), me->child_order_time); + if(time_diff > me->timeout_msecs){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel " + "key:{} state:{} msecs:{} " + "time out, cancelling order", + key(),_state, time_diff); + _cancel_order(CancelMode::trigger); + return; + } + } + if(me->price_cond_exit){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (!_trigger_met(obs_md,trigger_price, + me->tick_size,me->trigger_above_market)){ + LOG(OrderMan, Info, "TriggerOrder::_analyze_trigger_and_cancel" + "key:{} state:{} " + "price condition untrue, cancelling order" + "trigger_above_md:{} trigger_price:{} md:{} ", + key(),_state, + me->trigger_above_market,trigger_price, + obs_md->price()); + _cancel_order(CancelMode::trigger); + return; } } } @@ -297,20 +414,38 @@ api::orderman::OrderStatus TriggerOrder::_status() const{ // has been activated case State::START: case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_FIRST_ACK: case State::STEADY: return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if(me->is_cxled || - SpreaderUtils::order_in_cancelled_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - else if(!me->is_succ_inited) + case State::END: + if(!me->is_succ_inited) return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - default: - bts_assert(false); - return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; + else{ + if(me->order_placed){ + if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else{ + if (SpreaderUtils::order_in_error_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ + switch (me->cancel_mode){ + case CancelMode::none: //this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } + } + } + } + else + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } } + bts_assert(false); + return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } void TriggerOrder::_compute_state(){ if (!me->is_recovered){ @@ -318,6 +453,11 @@ void TriggerOrder::_compute_state(){ me->state.set_filled_quantity(me->child_state.filled_quantity()); me->state.set_last_price(me->child_state.last_price()); me->state.set_avg_price(me->child_state.avg_price()); + if(_state==State::STEADY) + me->state.set_display_status(bts::api::orderman::OrderState::HIDDEN); + else + me->state.set_display_status(bts::api::orderman::OrderState::VISIBLE); + } } void TriggerOrder::_observe_market_once(){ @@ -326,6 +466,12 @@ void TriggerOrder::_observe_market_once(){ if(obs_md != nullptr && obs_md->size()>0){ me->market_observed_once=true; me->trigger_above_market=_trigger_price()>=obs_md->price(); + LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(),_state, + obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } @@ -349,12 +495,35 @@ double TriggerOrder::_trigger_price() const{ return me->state.price(); } double TriggerOrder::_child_order_price() const{ - return me->order_def.custom_def().trigger().trigger_action().price(); + // TODO:round to trading price + const bts::api::orderman::TriggerAction& trigger_action= + me->order_def.custom_def().trigger().trigger_action(); + if(trigger_action.has_payup()) + return (trigger_action.payup().payup_ticks()*me->tick_size) + + _trigger_price(); + else + return trigger_action.price(); +} +void TriggerOrder::_cancel_order(CancelMode cancel_mode){ + me->cancel_mode=cancel_mode; + me->child_order.cancel(); + LOG(OrderMan, Info, "TriggerOrder::_cancel_order key:{} state:{} mode:{}", + key(),_state,cancel_mode); + _switch_state(State::END); } bool TriggerOrder::_activated() const{ return me->services!=nullptr; } -bool TriggerOrder::_gr_than_eq(double p1, double p2) const{ - return bts::securities::test_price_equality(p1,p2,me->tick_size) || p1>=p2; +bool TriggerOrder::_gr_than_eq(double p1, double p2, double tick_size){ + return bts::securities::test_price_equality(p1,p2,tick_size) || p1>=p2; +} +bool TriggerOrder::_trigger_met(const md::PriceSize* obs_md, + double trpr, + double tick_size, + bool trigger_above_md){ + if (obs_md != nullptr) + return (trigger_above_md && _gr_than_eq(obs_md->price(),trpr, tick_size)) || + (!trigger_above_md && _gr_than_eq(trpr,obs_md->price(),tick_size)); + return false; } }} diff --git a/src/lib/orderman/orders/TriggerOrder.h b/src/lib/orderman/orders/TriggerOrder.h index 07a3d5973..3369ba379 100644 --- a/src/lib/orderman/orders/TriggerOrder.h +++ b/src/lib/orderman/orders/TriggerOrder.h @@ -6,6 +6,7 @@ namespace bts { namespace api {namespace orderman {class OrderDefinition;}} +namespace mercury {class TimerEvent;} namespace md {class PriceSize;} namespace orderman { @@ -16,16 +17,39 @@ class PreActivationOrderServices; class TriggerOrder : public Order { private: - enum State{ - START=0, - WAITING_FOR_TRIGGER=1, - STEADY=2, - END=3 - }; + +enum State{ + // remains here till on_actiavte is called + START=0, + // waiting for trigger conditions, sends + // order and waits to steady + WAITING_FOR_TRIGGER=1, + // once the order is submitted it gets into + // this state until getting a callback + // from the child order + WAITING_FOR_FIRST_ACK=2, + // order is out + STEADY=3, + END=4 +}; +// this is the ways a child order +// can be cancelled +enum CancelMode{ + // not cancelled, initial value + none=0, + // meaning the trigger order + // cancelled the child order because + // of time or conditional reasons + trigger, + // the trigger order is itself + // externally cancelled + // through the cancel call + external +}; public: TriggerOrder(); ~TriggerOrder(); - api::orderman::OrderDefinition const&definition() const override; + api::orderman::OrderDefinition const& definition() const override; void on_init_new(api::orderman::OrderDefinition const&, const PreActivationOrderServices&) override; void on_init_recovered(api::orderman::OrderRecord const&, @@ -40,13 +64,23 @@ private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); void _on_child_order_update(OrderStateUpdateEvent const&); + void _on_time (const bts::mercury::TimerEvent&); private: // called from init_new bool _on_init_new(const api::orderman::OrderDefinition& order_def, const PreActivationOrderServices& pre_os); void _report_state(); void _switch_state(State new_state); - void _analyze_trigger(); + // this is called in the WAITING_FOR_TRIGGER state, + // to check for the trigger condition and shoot + // an order if the condition is met + void _analyze_trigger_and_shoot(); + // this is called in the STEADY state when the + // child order is working. (Based on the + // parameters) if timed-out or the trigger + // condition being false, the + // child order is cancelled + void _analyze_trigger_and_cancel(); api::orderman::OrderStatus _status() const; void _compute_state(); // for non trailing trigger prices, we need a @@ -58,11 +92,19 @@ private: // present returns a nullptr const md::PriceSize* _observed_market() const; // this is the price of the parent order + // (the trigger price) double _trigger_price() const; // this is in the trigger action double _child_order_price() const; + void _cancel_order(CancelMode cancel_mode); bool _activated() const; - bool _gr_than_eq(double p1, double p2) const; + //returns true is the trigger condition is met + static bool _trigger_met(const md::PriceSize* obs_md, + double trigger_price, + double tick_size, + bool trigger_above_md); + //returns true is p1 >= p2 + static bool _gr_than_eq(double p1, double p2, double tick_size); private: State _state; struct PImpl; diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.cpp b/src/lib/orderman/orders/book_algos/CoverOrder.cpp new file mode 100644 index 000000000..886598e94 --- /dev/null +++ b/src/lib/orderman/orders/book_algos/CoverOrder.cpp @@ -0,0 +1,121 @@ +#include "CoverOrder.h" + +#include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/utils/PBUtils.h" +#include + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +struct CoverOrder::PImpl +{ + PImpl() {} + + int hedge_ticks; + OrderDefinition hedge_def; +}; + + +CoverOrder::CoverOrder() : me(new PImpl()) {} + +CoverOrder::~CoverOrder() {} + +void CoverOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) +{ + initial_state.mutable_cover(); + auto const &cover_def = this_def.custom_def().cover(); + *out_child->mutable_custom_def() = cover_def.child(); + + me->hedge_ticks = cover_def.hedge_ticks(); +} + +bool CoverOrder::setup_hedge(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, + api::orderman::OrderDefinition* out_hedge) +{ + auto const &cover_def = this_def.custom_def().cover(); + if(cover_def.has_hedge()) + { + *out_hedge->mutable_custom_def() = cover_def.hedge(); + if(definition().side() == api::SIDE_BUY) + out_hedge->set_side(api::SIDE_SELL); + else + out_hedge->set_side(api::SIDE_BUY); + return true; + } + else + return false; +} + +void CoverOrder::send_hedge_if_new_fills(const api::orderman::OrderState& orig_state, const OrderStateUpdateEvent& new_state) +{ + uint32_t qty = new_state.state.filled_quantity() - orig_state.filled_quantity(); + if(qty > 0) + { + double prx = new_state.state.last_price(); + if(definition().side() == api::SIDE_BUY) //if this is a buy, I'm going to sell my hedge, nticks higher than the fill price + prx = prx + tick_size() * me->hedge_ticks; + else + prx = prx - tick_size() * me->hedge_ticks; + + build_and_send_hedge(Price(prx), Quantity(qty)); + } +} + +void CoverOrder::on_book_update(const bts::orderman::BookUpdateEvent& ) +{ + switch (this_state().status()) + { + case ORDER_STATUS_WORKING: + switch (child_state().status()) + { + case ORDER_STATUS_INACTIVE: + { + activate_child(Price(this_state().price()), Quantity(this_state().quantity())); + transition(ORDER_STATUS_WORKING); + report_state(); + } + break; + case ORDER_STATUS_WORKING: + { + } + break; + + case ORDER_STATUS_PENDING_WORKING: + break; + + // child cannot be in any of these states if we are in the working state + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + break; + + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + break; + + case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } +} + +} +} + diff --git a/src/lib/orderman/orders/book_algos/CoverOrder.h b/src/lib/orderman/orders/book_algos/CoverOrder.h new file mode 100644 index 000000000..9b831f6dd --- /dev/null +++ b/src/lib/orderman/orders/book_algos/CoverOrder.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/orderman/orders/book_algos/BookAlgo.h" + +namespace bts { +namespace orderman { + +class OrderStateUpdateEvent; +class BookUpdateEvent; + +//CoverOrder initializes the child order as normal +//Fills trigger hedge orders to the opposite side of the market, n ticks away. + +class CoverOrder : public BookAlgo +{ +public: + CoverOrder(); + virtual ~CoverOrder(); + +protected: + void setup_child(const api::orderman::OrderDefinition&, const PreActivationOrderServices&, + api::orderman::OrderState&, api::orderman::OrderDefinition*) override; + bool setup_hedge(const api::orderman::OrderDefinition& parent, const PreActivationOrderServices&, + api::orderman::OrderDefinition*) override; + void send_hedge_if_new_fills(const api::orderman::OrderState&, const OrderStateUpdateEvent&) override; + void on_book_update(const bts::orderman::BookUpdateEvent&) override; + +private: + struct PImpl; + std::unique_ptr me; +}; + +}} diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 78388d3df..56a03c6ad 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -34,7 +34,7 @@ const api::orderman::OrderDefinition& SpreaderOrder::definition() const{ bts_assert(_inited()); return _bookkeeping_data().order_def(); } -void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def, +void SpreaderOrder::on_init_new(const bts::api::orderman::OrderDefinition& order_def, const PreActivationOrderServices& pao_services){ if (!_active) return; _on_init_new(order_def, SpreaderPreActivationOrderServices(&pao_services)); @@ -42,8 +42,10 @@ void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def, } void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, const PreActivationOrderServices& pao_services){ - LOG(OrderMan, Info, "SpreaderOrder.on_init_recovered order_key: {}", key().value()); - _state_worker->on_init_recovered(order_record, SpreaderPreActivationOrderServices(&pao_services)); + LOG(OrderMan, Info, "SpreaderOrder.on_init_recovered order_key:{}", + key().value()); + _state_worker->on_init_recovered(order_record, + SpreaderPreActivationOrderServices(&pao_services)); _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, @@ -55,7 +57,8 @@ void SpreaderOrder::on_activate(Price price, Quantity quantity, } void SpreaderOrder::on_update(Price price, Quantity quantity,TickToTradeCorID){ if (!_active) return; - LOG(OrderMan, Info, "SpreaderOrder.on_update key: {} price: {} quantity: {}", key().value(), price.value(), quantity.value()); + LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", + key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } @@ -74,7 +77,8 @@ void SpreaderOrder::on_crack(TickToTradeCorID){ // ISpreaderManager //////////////////// //////////////////////////////////////// void SpreaderOrder::setup_new_quoter_order(size_t leg_index){ - LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key: {} leg: {}", key().value(), leg_index); + LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key:{} leg:{}", + key().value(), leg_index); SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(leg_index); bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); leg_data.order_update_message().re_init(child_order); @@ -114,14 +118,18 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ Price last_price = Price(ord_ev.state.last_price()), order_price=Price(ord_ev.state.price()); if (!SpreaderUtils::order_acknowledged(status)){ - LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed callback for key: {} sec_key: {} order_key: {} status: {} ignoring", key(), sec_key, order_key, status); + LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed " + "callback for key:{} sec_key:{} order_key:{} " + "status:{} ignoring", + key(), sec_key, order_key, status); bts_assert(filled_qty.value() == 0); return; } - SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); // can also be found through sec_key + SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); if (leg_data_ptr != nullptr){ SpreaderLegData& leg_data = *leg_data_ptr; - ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); + ChildOrderError order_error = _get_order_error (ord_ev, + leg_data.quoter().expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " "key:{} sec_key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " @@ -144,7 +152,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ // should be a hedge order then SingleFillHedger* hedger = _bookkeeping_data().find_hedger_from_orderkey(order_key); if (hedger != nullptr){ - ChildOrderError order_error = _get_order_error (ord_ev, hedger->expecting_cancel_update()); + ChildOrderError order_error = _get_order_error (ord_ev, + hedger->expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " "key:{} sec_key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " @@ -160,8 +169,11 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _state_worker->on_hedger_order_error (*hedger); } else - LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown order key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg ()); + LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown ord " + "key:{} sec_key:{} order_key:{} status:{} " + "filled_qty:{} last_price:{} msg:{}", + key(), sec_key, order_key, status, filled_qty, + last_price, ord_ev.state.last_msg ()); } _send_check_termination(true); _report_state(); @@ -196,15 +208,17 @@ void SpreaderOrder::_switch_state (ISpreaderStateWorker* new_state){ void SpreaderOrder::_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services){ - LOG(OrderMan, Info, "SpreaderOrder.on_init_new key: {} order_def: {}", + LOG(OrderMan, Info, "SpreaderOrder.on_init_new key:{} order_def:{}", key().value(), bts::utils::pb::to_string(order_def)); bts_assert(!_inited()); _state_worker->on_init_new(order_def, spreader_pao_services); } -void SpreaderOrder::_on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services){ +void SpreaderOrder::_on_activate(Price price, + Quantity quantity, + SpreaderOrderServices& order_services){ bts_assert(_inited()); bts_assert(!_activated()); - LOG(OrderMan, Info, "SpreaderOrder.on_activate key: {} price: {} quantity: {}", + LOG(OrderMan, Info, "SpreaderOrder.on_activate key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _order_services = new SpreaderOrderServices(order_services); _state_worker->on_activate(price, quantity, *_order_services); @@ -338,14 +352,18 @@ void SpreaderOrder::_report_state (){ } // if order is cons'ed from disc, with inited_new==false, // we just publish what was given to us - LOG(OrderMan, Info, "SpreaderOrder::_report_state key: {} status: {} price: {} qty: {} filled: {} avg_price: {}", - key(), status, reported_state.price(), reported_state.quantity(), - reported_state.filled_quantity(), reported_state.avg_price()); + LOG(OrderMan, Info, "SpreaderOrder::_report_state key:{} status:{} " + "price:{} qty:{} filled:{} avg_price:{}", + key(), status, reported_state.price(), + reported_state.quantity(), + reported_state.filled_quantity(), + reported_state.avg_price()); _order_services->report_state(reported_state); } } bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status () const{ - SpreaderState curr_state = _state_worker == nullptr ? SpreaderState::START : _state_worker->state(); + SpreaderState curr_state = _state_worker == nullptr ? + SpreaderState::START : _state_worker->state(); switch (curr_state){ case SpreaderState::WORKING: return bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index ff443d9a5..56060f489 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -200,10 +200,18 @@ private: bts::api::orderman::OrderStatus order_status = ord_ev.state.status(); if (SpreaderUtils::order_in_error_state(order_status)) return ChildOrderError::ORDER_STATE_ERROR; - if (SpreaderUtils::SpreaderUtils::order_in_cancelled_state(order_status) && !expecting_cancel) - return ChildOrderError::UNEXPECTED_CANCEL_ERROR; + if (SpreaderUtils::SpreaderUtils::order_in_cancelled_state(order_status)){ + // the message is a bad way to decipher an error state. + // what we are saying here is + // i. cancels with messages are always an error state + // ii. when we get a cancel when not expecting thats also + // an error state + if(ord_ev.state.last_msg().length() > 0 || !expecting_cancel) + return ChildOrderError::UNEXPECTED_CANCEL_ERROR; + } // this is an inelegant way to detect modify errors - if (!SpreaderUtils::order_in_terminal_state(order_status) && ord_ev.state.last_msg().length() > 0) + if (!SpreaderUtils::order_in_terminal_state(order_status) && + ord_ev.state.last_msg().length() > 0) return ChildOrderError::MODIFY_ERROR; return ChildOrderError::NONE; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 666cd31cd..1f1d6dfe2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -16,6 +16,8 @@ SingleLegQuoter::SingleLegQuoter(ISpreaderManager& spreader, : _two_legged (n_spreader_legs == 2), _active_quoting(this_leg_property.is_active_quoting()), +_hidden_order(this_leg_property.leg_params().has_quote_params() && + this_leg_property.leg_params().quote_params().has_quote_hidden()), _spreader(spreader), _this_leg_data (this_leg_property), _n_spreader_legs (n_spreader_legs), @@ -27,6 +29,7 @@ _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), _waiting_for_first_ack_state_worker(this), +_waiting_for_ioc_worker(this), _waiting_for_first_ack_cancelled_state_worker(this), _waiting_for_cancel_ack_state_worker(this), _working_state_worker(this), @@ -44,6 +47,7 @@ SingleLegQuoter::SingleLegQuoter(SingleLegQuoter&& other) : _two_legged (other._two_legged), _active_quoting(other._active_quoting), +_hidden_order(other._hidden_order), _spreader(other._spreader), _this_leg_data (other._this_leg_data), _n_spreader_legs (other._n_spreader_legs), @@ -58,6 +62,7 @@ _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), _waiting_for_first_ack_state_worker(this), +_waiting_for_ioc_worker(this), _waiting_for_first_ack_cancelled_state_worker(this), _waiting_for_cancel_ack_state_worker(this), _working_state_worker(this), @@ -122,50 +127,76 @@ void SingleLegQuoter::on_time (const bts::TimeStamp& ts){ } bool SingleLegQuoter::is_active_order() const{ QuoterState state = _worker->state(); - return state == QuoterState::WAITING_FOR_FIRST_ACK || state == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED || - state == QuoterState::WORKING || state == QuoterState::WAITING_FOR_CANCEL_ACK; + return state == QuoterState::WAITING_FOR_FIRST_ACK || + state == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED || + state == QuoterState::WORKING || + state == QuoterState::WAITING_FOR_CANCEL_ACK; } bool SingleLegQuoter::is_terminal_state () const { return _worker->state() == QuoterState::END; } bool SingleLegQuoter::accept_modifications() const { - return _worker->state() == QuoterState::WAITING_FOR_SIZE || _worker->state() == QuoterState::WORKING; + return _worker->state() == QuoterState::WAITING_FOR_SIZE || + _worker->state() == QuoterState::WORKING; } void SingleLegQuoter::_incorporate_other_leg_fill (size_t, Quantity hedge_reduction){ _price_quantity_state.add_hedged_reduction (hedge_reduction); } -void SingleLegQuoter::_compute_price_quantity(Price& price, Quantity& quantity){ +void SingleLegQuoter::_compute_price_quantity(Price& price, + Quantity& quantity){ Quantity remaining_quantity = _price_quantity_state.remaining_to_fill(); if (_two_legged){ size_t other_leg_index = _this_leg_data.leg_index() == 0 ? 1 : 0; - SpreaderUtils::compute_price_quantity_2_legs (_price_quantity_state.target_spread_price(), remaining_quantity, - _this_leg_data, _spreader.get_leg_data(other_leg_index), _spreader.get_book(other_leg_index), + SpreaderUtils::compute_price_quantity_2_legs (_price_quantity_state.target_spread_price(), + remaining_quantity, + _this_leg_data, + _spreader.get_leg_data(other_leg_index), + _spreader.get_book(other_leg_index), price, quantity); bts_assert (quantity.value() <= remaining_quantity.value()); } else - SpreaderUtils::compute_quoting_price_size_n_legs (_price_quantity_state.target_spread_price(), remaining_quantity, - _this_leg_data.leg_index(), _spreader, _drivers_temp_usage, price, quantity); + SpreaderUtils::compute_quoting_price_size_n_legs (_price_quantity_state.target_spread_price(), + remaining_quantity, + _this_leg_data.leg_index(), + _spreader, + _drivers_temp_usage, + price, + quantity); +} +void SingleLegQuoter::_adjust_for_hidden_order(Price& price, + Quantity& quantity){ + if(_hidden_order){ + const Book& book=_spreader.get_book(_this_leg_data.leg_index()); + SpreaderUtils::adjust_for_hidden_order(_this_leg_data, + book, + price,quantity); + } } void SingleLegQuoter::_commit_drivers(Price quote_price){ if (!_two_legged) _driver_cache.add(_drivers_temp_usage,quote_price); } -/*********************************************************************************/ -/*******************************state transformations*****************************/ -/*********************************************************************************/ +/*****************************************************************************/ +/*******************************state transformations*************************/ +/*****************************************************************************/ void SingleLegQuoter::_transform_to_START (){ bts_assert (_worker == nullptr); _switch_state (&_start_state_worker); } void SingleLegQuoter::_transform_to_WAITING_FOR_SIZE (){ - bts_assert (_worker->state() == QuoterState::START || _worker->state() == QuoterState::END); + bts_assert (_worker->state() == QuoterState::START || + _worker->state() == QuoterState::END); _switch_state (&_waiting_for_size_state_worker); } void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK (){ bts_assert (_worker->state() == QuoterState::WAITING_FOR_SIZE); _switch_state (&_waiting_for_first_ack_state_worker); } +void SingleLegQuoter::_transform_to_WAITING_FOR_IOC (){ + bts_assert (_worker->state() == QuoterState::WAITING_FOR_SIZE); + _switch_state (&_waiting_for_ioc_worker); +} void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED(){ bts_assert (_worker->state() == QuoterState::WAITING_FOR_FIRST_ACK); _switch_state (&_waiting_for_first_ack_cancelled_state_worker); @@ -175,7 +206,9 @@ void SingleLegQuoter::_transform_to_WORKING(){ _switch_state (&_working_state_worker); } void SingleLegQuoter::_transform_to_WAITING_FOR_CANCEL_ACK(){ - bts_assert (_worker->state() == QuoterState::WORKING || _worker->state() == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED); + bts_assert (_worker->state() == QuoterState::WORKING || + _worker->state() == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED || + _worker->state() == QuoterState::WAITING_FOR_IOC); _switch_state (&_waiting_for_cancel_ack_state_worker); } void SingleLegQuoter::_transform_to_END(){ @@ -184,7 +217,8 @@ void SingleLegQuoter::_transform_to_END(){ } void SingleLegQuoter::_switch_state (IQuoterStateWorker* new_state){ std::string curr_state = _worker == nullptr ? "NULL" : _worker->state_text(); - LOG(OrderMan, Info, "SingleLegQuoter::_switch_state {} {} -> {} ", _log_prefix(), curr_state, new_state->state_text()); + LOG(OrderMan, Info, "SingleLegQuoter::_switch_state {} {} -> {} ", + _log_prefix(), curr_state, new_state->state_text()); _worker = new_state; _worker->on_transition(); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 7842c3770..6f4212aa1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -10,6 +10,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.h" +#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.h" @@ -30,6 +31,7 @@ class SingleLegQuoter friend QuoterStartStateWorker; friend QuoterWaitingForSizeStateWorker; friend QuoterWaitingForFirstAckWorker; +friend QuoterWaitingForIOCWorker; friend QuoterWaitingForFirstAckCancelledWorker; friend QuoterWaitingForCancelAckStateWorker; friend QuoterWorkingStateWorker; @@ -37,6 +39,7 @@ friend QuoterEndStateWorker; private: const bool _two_legged; const bool _active_quoting; + const bool _hidden_order; ISpreaderManager& _spreader; const LegPropertyData& _this_leg_data; const size_t _n_spreader_legs; @@ -54,6 +57,7 @@ private: QuoterStartStateWorker _start_state_worker; QuoterWaitingForSizeStateWorker _waiting_for_size_state_worker; QuoterWaitingForFirstAckWorker _waiting_for_first_ack_state_worker; + QuoterWaitingForIOCWorker _waiting_for_ioc_worker; QuoterWaitingForFirstAckCancelledWorker _waiting_for_first_ack_cancelled_state_worker; QuoterWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; QuoterWorkingStateWorker _working_state_worker; @@ -65,7 +69,8 @@ public: SpreaderChildOrderState& child_order_state); public: SingleLegQuoter() = delete; - SingleLegQuoter(SingleLegQuoter&&); // implementation has an assert since it will not be called + // implementation has an assert since it will not be called + SingleLegQuoter(SingleLegQuoter&&); SingleLegQuoter(const SingleLegQuoter&) = delete; SingleLegQuoter& operator=(const SingleLegQuoter&) = delete; SingleLegQuoter& operator=(SingleLegQuoter&&) = delete; @@ -84,7 +89,9 @@ public: void update_order_status(const SpreaderChildOrderState& u); //c. called when the market data associated // with this security is changed - void on_book(bts::orderman::TickToTradeCorID cid, size_t leg_index, const bts::orderman::Book&); + void on_book(bts::orderman::TickToTradeCorID cid, + size_t leg_index, + const bts::orderman::Book&); //d. called when the order is cancelled, either // manually or automatically void cancel_order(); @@ -115,25 +122,30 @@ public: } // tells if it is expecting to get a cancel (this helps catch // unsolicited cancels). returns true is its expecting a cancel - bool expecting_cancel_update() const {return _worker->state() == QuoterState::WAITING_FOR_CANCEL_ACK;} + bool expecting_cancel_update() const { + return _worker->state() == QuoterState::WAITING_FOR_CANCEL_ACK || + (_hidden_order && _worker->state() == QuoterState::WAITING_FOR_IOC); + } public: // test only functions QuoterState test_only_func_quoter_state() const { return _worker->state (); } - const QuoteLegPriceQuantityState& test_only_func_price_quantity_state () const {return _price_quantity_state;} - bool test_only_func_ended_by_spreader () const {return _is_permenantly_cancelled;} + const QuoteLegPriceQuantityState& test_only_func_price_quantity_state () const { + return _price_quantity_state; + } + bool test_only_func_ended_by_spreader () const { + return _is_permenantly_cancelled; + } private: bts::orderman::OrderKey _key() {return _child_order_state.order_key();} TimeStamp _current_time () const {return _spreader.current_time();} // TODO: state out and move the string to a const std::string _log_prefix(){ std::ostringstream oss; - oss << " spreader_order_key: " << _spreader.spreader_order_key(); - oss << " sec_key: " << _this_leg_data.security_key(); - oss << " leg_idx: " << _this_leg_data.leg_index(); - //oss << " order:key: " << (_worker == nullptr || _worker->state() == QuoterState::START) ? "NULL" : _worker->state_text(); - oss << " state: " << (_worker == nullptr ? "NULL" : _worker->state_text()); + oss << " spreader_order_key:" << _spreader.spreader_order_key(); + oss << " sec_key:" << _this_leg_data.security_key(); + oss << " leg_idx:" << _this_leg_data.leg_index(); + oss << " state:" << (_worker == nullptr ? "NULL" : _worker->state_text()); return oss.str(); - return ""; } void _update_target(Price price, Quantity quantity){ _price_quantity_state.update_target_price_quantity(price, quantity); @@ -153,11 +165,17 @@ private: // this is the function that computes the quoting price and the // quantity for this leg. void _compute_price_quantity(Price& price, Quantity& quantity); - // copies the computed driver to committed dri + // this takes in a price and qty that already has + // computed values and applies the hidden order logic + // to them (ie if the price results in a cross, and adjusts + // the qty value) + void _adjust_for_hidden_order(Price& price, Quantity& quantity); + // copies the computed driver to committed drivers void _commit_drivers (Price quote_price); void _transform_to_START (); void _transform_to_WAITING_FOR_SIZE (); void _transform_to_WAITING_FOR_FIRST_ACK (); + void _transform_to_WAITING_FOR_IOC (); void _transform_to_WAITING_FOR_FIRST_ACK_CANCELLED(); void _transform_to_WORKING(); void _transform_to_WAITING_FOR_CANCEL_ACK(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index b4efa20b8..d6b5d3253 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -35,6 +35,7 @@ bool SpreaderUtils::resolve_synthetic_spread (const SpreaderPreActivationOrderSe LOG(OrderMan, Info, "resolve_synthetic_spread resolved leg key {}", leg_sec_ptr->id()); auto leg_exec_strategy_it = execution_strategy.leg_params_map().find(leg.security().id()); bts_assert(leg_exec_strategy_it != execution_strategy.leg_params_map().end()); + const auto& leg_params=leg_exec_strategy_it->second; api::Side leg_order_side = SpreaderUtils::get_leg_side(order_def.side(), leg); // quoter order def api::orderman::OrderDefinition quoter_order_def = order_def; @@ -42,10 +43,14 @@ bool SpreaderUtils::resolve_synthetic_spread (const SpreaderPreActivationOrderSe quoter_order_def.set_side(leg_order_side); quoter_order_def.set_sub_type(bts::api::orderman::OrderSubType::ORDER_SUB_TYPE_QUOTING_LEG); quoter_order_def.mutable_custom_def()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); + if(leg_params.quote_params().has_quote_hidden()) + quoter_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_IOC); + else + quoter_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_DAY); // hedger order def api::orderman::OrderDefinition hedger_order_def = quoter_order_def; hedger_order_def.set_sub_type(bts::api::orderman::OrderSubType::ORDER_SUB_TYPE_HEDGING_LEG); - LegPropertyData leg_property_data(leg_idx, leg, leg_exec_strategy_it->second, leg_order_side, quoter_order_def, hedger_order_def); + LegPropertyData leg_property_data(leg_idx, leg, leg_params, leg_order_side, quoter_order_def, hedger_order_def); out_resolved.push_back(leg_property_data); leg_idx++; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 599ba7c64..37906c962 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -88,6 +88,9 @@ public: order_status == api::orderman::OrderStatus::ORDER_STATUS_PENDING_WORKING; return !un_acked; } + static bool order_in_completed_state (bts::api::orderman::OrderStatus order_status){ + return order_status == api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } static bool order_in_cancelled_state (bts::api::orderman::OrderStatus order_status){ return order_status == api::orderman::OrderStatus::ORDER_STATUS_CANCELED; } @@ -146,7 +149,8 @@ public: api::Side book_side, Price target_price, double tick_size, - Quantity& price_qty, Quantity& cumm_qty){ + Quantity& price_qty, + Quantity& cumm_qty){ price_qty = Quantity(0); cumm_qty = Quantity(0); const size_t n_levels = book.n_levels(); const bts::orderman::BookSide& book_depth = book.side(book_side); @@ -155,7 +159,9 @@ public: double level_price = level_price_qty.price(); price_qty = Quantity(level_price_qty.size()); cumm_qty = Quantity(cumm_qty.value() + price_qty.value()); - if (bts::securities::test_price_equality (level_price, target_price.value(), tick_size)) + if (bts::securities::test_price_equality (level_price, + target_price.value(), + tick_size)) return true; } price_qty = Quantity(0); cumm_qty = Quantity(0); @@ -459,6 +465,25 @@ public: else out_avg_price = Price((base_price.value() * base_qty.value() + inc_price.value() * inc_qty.value())/out_total_qty.value()); } + static void adjust_for_hidden_order(const LegPropertyData& leg, + const Book& book, + Price& price, + Quantity& quantity){ + Quantity out_qty(0), out_cum_qty(0); + if(leg.trading_side()==api::Side::SIDE_BUY) + find_qty_at_price_level(book,api::Side::SIDE_SELL, + price, + leg.tick_size(), + out_qty, + out_cum_qty); + else if(leg.trading_side()==api::Side::SIDE_SELL) + find_qty_at_price_level(book,api::Side::SIDE_BUY, + price, + leg.tick_size(), + out_qty, + out_cum_qty); + quantity = Quantity(std::min(quantity.value(),out_cum_qty.value())); + } ////////////////////////2 legged spreads // given a quoting target qty, finds the "driver" price // and qty, thats needed to hedge the quote. It also diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp index f7ae00a94..55bdcae49 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp @@ -11,19 +11,23 @@ QuoterState QuoterEndStateWorker::state () const { return QuoterState::END; } void QuoterEndStateWorker::on_transition (){ - bool is_final = _quoter->_is_permenantly_cancelled || _quoter->_price_quantity_state.target_reached (); + bool is_final = _quoter->_is_permenantly_cancelled || + _quoter->_price_quantity_state.target_reached (); if (!is_final){ // getting new order - _quoter->_spreader.setup_new_quoter_order(_quoter->_this_leg_data.leg_index()); + _quoter->_spreader.setup_new_quoter_order(_quoter->_this_leg_data.leg_index()); _quoter->_transform_to_WAITING_FOR_SIZE (); } } void QuoterEndStateWorker::one_time_activate (Price, Quantity){ - bts_assert_msg (false, "QuoterEndStateWorker::one_time_activate is an illegal operation"); + bts_assert_msg (false, "QuoterEndStateWorker::one_time_activate " + "is an illegal operation"); } void QuoterEndStateWorker::on_order_update (const SpreaderChildOrderState&) {} -void QuoterEndStateWorker::on_book (bts::orderman::TickToTradeCorID, size_t, const bts::orderman::Book&) +void QuoterEndStateWorker::on_book (bts::orderman::TickToTradeCorID, + size_t, + const bts::orderman::Book&) {} void QuoterEndStateWorker::cancel() {} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h index db47ca043..da6049d02 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h @@ -7,6 +7,7 @@ enum class QuoterState START, WAITING_FOR_SIZE, WAITING_FOR_FIRST_ACK, + WAITING_FOR_IOC, WAITING_FOR_FIRST_ACK_CANCELLED, WORKING, WAITING_FOR_CANCEL_ACK, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp new file mode 100644 index 000000000..f5b0444e6 --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -0,0 +1,43 @@ +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" +#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h" +#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h" + +namespace bts{ +namespace orderman{ + +QuoterState QuoterWaitingForIOCWorker::state () const { + return QuoterState::WAITING_FOR_IOC; +} +void QuoterWaitingForIOCWorker::one_time_activate (Price, + Quantity){ + bts_assert_msg (false, "QuoterWaitingForIOCWorker::one_time_activate " + "is an illegal operation"); +} +void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& u){ + bts_assert (u.acknowledged()); + if (u.terminal_status()) + _quoter->_transform_to_END (); +} +void QuoterWaitingForIOCWorker::on_book (bts::orderman::TickToTradeCorID, + size_t, + const bts::orderman::Book&){ +} +void QuoterWaitingForIOCWorker::cancel(){ + _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); +} +void QuoterWaitingForIOCWorker::terminate(){ + _quoter->_transform_to_END (); +} +void QuoterWaitingForIOCWorker::on_time(const TimeStamp&){ +} +void QuoterWaitingForIOCWorker::on_other_leg_quoter_fill (size_t leg_index, + Quantity filled_quantity){ + _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); +} +void QuoterWaitingForIOCWorker::update_spreader_order (Price price, + Quantity quantity){ + _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); +} +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h new file mode 100644 index 000000000..dfd383adc --- /dev/null +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.h @@ -0,0 +1,42 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/utils/bts_chrono.h" +#include "lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterState.h" +#include "lib/orderman/orders/spreader_orders/spreader/quoter/IQuoterStateWorker.h" + +namespace bts { +namespace orderman { +class SpreaderChildOrderState; +class Book; +class SingleLegQuoter; +// When the quoter is in the hidden mode, it will +// enter this state after sending the IOC order. +// It waits for the IOC to get to a terminal state +// before going to the END state (mostly) +// exit : +// END (terminal order) +// WAITING_FOR_FIRST_ACK_CANCELLED (cancel) +class QuoterWaitingForIOCWorker : public IQuoterStateWorker +{ +private: + SingleLegQuoter* const _quoter; +public: + QuoterWaitingForIOCWorker (SingleLegQuoter* quoter) :_quoter(quoter){} + QuoterState state () const override; + const std::string state_text () const override { + return "WAITING_FOR_IOC"; + } + virtual void on_transition () override {} + void one_time_activate (Price, Quantity) override; + void on_order_update (const SpreaderChildOrderState& order_update) override; + void on_book (bts::orderman::TickToTradeCorID corid, + size_t leg_id, + const bts::orderman::Book& book) override; + void cancel() override; + void terminate() override; + void on_time(const TimeStamp& ts) override; + void on_other_leg_quoter_fill (size_t leg_id, Quantity fill_quantity) override; + void update_spreader_order (Price price, Quantity quantity) override; +}; +}} diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index 6c02fa0a9..b247e5279 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -11,15 +11,17 @@ QuoterState QuoterWaitingForSizeStateWorker::state () const { return QuoterState::WAITING_FOR_SIZE; } void QuoterWaitingForSizeStateWorker::one_time_activate (Price, Quantity){ - bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::one_time_activate is an illegal operation"); + bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::one_time_activate " + "is an illegal operation"); } void QuoterWaitingForSizeStateWorker::on_order_update (const SpreaderChildOrderState&){ // no order has been sent yet - bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::on_order_update is an illegal operation"); + bts_assert_msg (false, "QuoterWaitingForSizeStateWorker::on_order_update " + "is an illegal operation"); } -void QuoterWaitingForSizeStateWorker::on_book (bts::orderman::TickToTradeCorID corid, +void QuoterWaitingForSizeStateWorker::on_book (TickToTradeCorID corid, size_t, - const bts::orderman::Book&){ + const Book&){ _longpath_analyze_and_act (corid); } void QuoterWaitingForSizeStateWorker::cancel(){ @@ -38,25 +40,32 @@ void QuoterWaitingForSizeStateWorker::on_other_leg_quoter_fill (size_t leg_index _quoter->_incorporate_other_leg_fill (leg_index, filled_quantity); _longpath_analyze_and_act (orderman::NullTickToTradeCorID); } -void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, Quantity quantity){ +void QuoterWaitingForSizeStateWorker::update_spreader_order (Price price, + Quantity quantity){ _quoter->_price_quantity_state.update_target_price_quantity (price, quantity); _longpath_analyze_and_act (orderman::NullTickToTradeCorID); } -void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act (orderman::TickToTradeCorID cid){ +void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(TickToTradeCorID cid){ if (_quoter->_price_quantity_state.target_reached()){ - LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key: {}, target reached, transforming to end", _quoter->_key().value()); + LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker key:{} " + "target reached, transforming to end", + _quoter->_key().value()); _quoter->_transform_to_END (); } else{ Price out_price; Quantity out_quantity; _quoter->_compute_price_quantity (out_price, out_quantity); + _quoter->_adjust_for_hidden_order(out_price, out_quantity); if (out_quantity.value() > 0){ _quoter->_commit_drivers (out_price); - LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker sending order key: {} price: {} quantity: {}", _quoter->_key(), out_price, out_quantity); + LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker sending order " + "key:{} price:{} quantity:{}", + _quoter->_key(), out_price, out_quantity); // this is the only place where a quoter order is entered _quoter->_place_order(out_price, out_quantity, cid); - _quoter->_transform_to_WAITING_FOR_FIRST_ACK (); + if(_quoter->_hidden_order) _quoter->_transform_to_WAITING_FOR_IOC(); + else _quoter->_transform_to_WAITING_FOR_FIRST_ACK (); } } } -}} +}} \ No newline at end of file diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index bd6937bf5..e30e01b2e 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -55,6 +55,7 @@ message QuoteParams QuoteInsideMarketDistance quote_inside_market_distance = 1020; QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; QuoteMaxOrderMove quote_max_order_move = 1040; + QuoteHidden quote_hidden = 1050; } /*************************************Quote MuteZone*********************************** @@ -197,7 +198,9 @@ message QuoteMaxOrderMove uint32 max_order_move_threshold = 10; } +message QuoteHidden{ +} // /************************************************************************************************* // ******************************************PreHedge*********************************************** // *************************************************************************************************/ diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index a7d13f0d3..ef1eac047 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -5,6 +5,7 @@ #include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" +#include #include #include #include @@ -50,7 +51,8 @@ me(new PImpl(context, const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - PositionUnit& pu=_get_or_add(f.account(),f.security_key()); + std::string fill_account=_fill_account(f); + PositionUnit& pu=_get_or_add(fill_account,f.security_key()); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -146,7 +148,9 @@ void PositionServiceServer::_avg_price_qty(double base_p, } } } - +std::string PositionServiceServer::_fill_account(const Fill& fill){ + return boost::trim_right_copy(fill.account()); +} PositionServiceServer::~PositionServiceServer(){ } }} \ No newline at end of file diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index 93efa9063..e5b6c441a 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -35,6 +35,7 @@ private: const std::string& fill_id, double& avg_price, double& tot_qty); + static std::string _fill_account(const Fill& fill); public: PositionServiceServer(bts::api::ServiceContext& context); ~PositionServiceServer(); diff --git a/testing/manual/algos/trigger.txt b/testing/manual/algos/trigger.txt index 1d7082f99..87745f047 100644 --- a/testing/manual/algos/trigger.txt +++ b/testing/manual/algos/trigger.txt @@ -1,10 +1,11 @@ 0. This needs sim market data **not** to be merged with replay (or cert), so we can create our own markets. 1. Bring up a ladder, lets say in SIN1 (does not matter which security) -2. Enter a 5 lot limit order at 20.00 (buy) (if there are no markets use the M View and the ticket to enter the order) +2. Enter a 5 lot limit order at 20.00 (buy) (if there are no markets use the M View and the ticket to enter + the order) 3. In the dropdown select Trigger. For the trigger details, enter the following : - a. Trigger Price Type : Bid - b. Order Price : 19.975 + a. Trigger Condition->Price Type : Bid + b. Trigger Action->Price->Fixed : 19.975 c. Child Limit 4. Enter a 2 lot buy trigger order at 20.025. This means thats when the bid price (3.a) becomes >= trigger price (20.025) a child order of type Limit (3.c) will be sent at 19.975 (3.b). @@ -13,10 +14,16 @@ Please note that if the trigger price >= market price, at time of order entry, t market price >= trigger price. If the trigger price <= market price at the time of order entry then the trigger condition is market price <= trigger price - where market price is 3.a (could be bid or ask). -5. Now start moving the market toward the market (the market is the 5 lot limit order in 2.) -6. As soon as it >= 20.025, a buy child limit order should be sent at 19.975. +5. Now start moving the market toward the trigger (the market is the 5 lot limit order in 2.) +6. As soon as it >= 20.025, a buy child limit order should be sent at 19.975 (the trigger order should dissapear +from the ladder) 7. Cancel the child order, and make sure the parent trigger order also gets cancelled. 8. Take a look at the Orderbook, and make sure it makes sense. +9. Now make these 2 changes for the next trigger order. Change the price to Payup/less and enter -3, and +enter a Timeout of 10 seconds. Now enter a 2 lot at 20.015, move your limit order (market) to cross the trigger. +Validate the child order is sent at trigger price 20.015 - 3 ticks. Now if the child order doesnt get filled +in 10 seconds the trigger order should cancel (along with its child order) + Now that you know how Trigger Orders work, spend 60 seconds more, and enter a sell trigger order (such that it gets filled), with the child order being Iceberg. \ No newline at end of file diff --git a/testing/manual/orders/ioc.txt b/testing/manual/orders/ioc.txt new file mode 100644 index 000000000..deebf75b5 --- /dev/null +++ b/testing/manual/orders/ioc.txt @@ -0,0 +1,15 @@ + +IOC Test + +Connect to Cert + +Bring up a ladder with a market + +Select a 1 lot, time in force = IOC + +Try to join a bid, it should cancel + +Try to lift an offer, it should fill + +If you don't know what join or lift means, ask Kevin + diff --git a/testing/manual/settings/GridSettings.txt b/testing/manual/settings/GridSettings.txt new file mode 100644 index 000000000..d8bb1a3f9 --- /dev/null +++ b/testing/manual/settings/GridSettings.txt @@ -0,0 +1,66 @@ +----Grid Settings Test (11 minutes) --------- + +1) Open the Orderbook +2) Click the Window Settings button at the bottom of the Spark menu to open the settings dialog + +----Columns---------------------------------- + +Note: + - some steps are to be performed on a specific set of columns. + - you will repeat the step to test each column. + - in these steps, the variable column will be referred to as 'X.' + +3) Toggle Visibility: + - uncheck several columns, then click apply, verify the columns have been hidden/removed. + +4) Column Width Unaffected: + - adjust a column's width on the grid by dragging the column header border (change the width enough so that it is easily noticable). + - look at the column as you click apply; its width should NOT change. + +5) Column Sorting Unaffected: + - click any column header to change the column sorting. + - Remember the change you made, then click apply; the column sorting should not change. + +6) Reorder Columns: + Note: you will be drag/dropping column-items in the listbox in the settings dialog, not the actual grid. + - move the mouse over the column that you wish to move, you can drag the column by clicking in the dot-area left of the column's name. + - drop it into a new position, the click apply. + - look at the grid to verify that the column move was successful. + +7) Horizontal Alignment: + Test the following columns: Security, Time, Account, Order Type, Qty, and Price + - there are 3 values for Horizontal Alignment (left, center, and right); test all 3 values for each column. + - (at the risk of being redundant, the variable column will be referred to as 'X') + - select 'X' in the columns list box + - click on the horizontal alignment dropdown to change the value + - click apply, and verify that the alignment change was successful + (Note: you may need to widen the column to notice the change in alignment) + +8) Font Color: + A) + Test the following columns: Side, Qty, Filled + - select 'X,' the "Override Font Color" checkbox should be disabled + - notice they are specially color-coded with buy/sell colors; + - the user cannot change this + B) + Test the following columns: Security, Time, Account, Order Type, Price + - select 'X' in the columns list box + - check "Override Font Color" and select a color that is noticeably different from the current one. + - click apply, and verify that the font color change was successful. + C) + - at this point, all of the columns from (B) have their own font color. + - the ones in 'A' have colors that cannot change. + - now you will test the grid-level default font-color (GLDFC). + - in the "Grid" section at the top of the window, click the font color button to change the GLDFC, then click apply + - Verify that: + i) the columns in 'B' ignored this change, as they are overriding the GLDFC, + ii) the columns in 'A' also ignored this change, as they are specially color-coded, + iii) every other column has the new grid-level font color + +----Grid-------------------------------------- + +9) Selection Highlight: + - in the "Grid" section, click the Selection Highlight color button to change the row-selection-highlight color. + - click apply, then select some rows to verify that the selection-highlight color change was successful. + +10) Be glad you got the Grid Settings test this cycle, because next time there will be a LOT more to test. MUAHAHAHAHAHAH!!! \ No newline at end of file diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index bcdf10e21..07d324706 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -1,36 +1,23 @@ $known_good = @{ - "6A" = 1000 - "6B" = 625 - "6D" = 1000 - "6E" = 1250 - "6J" = 1250 - "CL" = 1000 - "EMD" = 100 - "ES" = 50 - "GC" = 100 - "GE" = 2500 - "HE" = 400 - "HG" = 5000 - "HO" = 42000 - "LE" = 400 - "M6E" = 125 - "NG" = 100 - "NQ" = 20 - "QM" = 500 - "RB" = 42000 - "RTY" = 50 - "SI" = 5000 - "VX" = 1000 - "YI" = 10 - "YM" = 5 - "ZB" = 1000 + "IC" = 50 + "IH" = 50 + "IP" = 50 + "IS" = 50 + "IW" = 50 + "KE" = 50 + "KET" = 50 + "MCX" = 50 + "MKC" = 10 + "MWE" = 50 + "SBT" = 50 + "WMK" = 50 + "XC" = 10 + "XK" = 10 + "XW" = 10 "ZC" = 50 - "ZF" = 1000 - "ZL" = 600 - "ZM" = 100 - "ZN" = 1000 - "ZQ" = 4167 + "ZO" = 50 "ZS" = 50 - "ZT" = 2000 "ZW" = 50 + "ZCT" = 50 + "ZWT" = 50 } \ No newline at end of file diff --git a/tools/cpp_helper/Generate-Cpps.ps1 b/tools/cpp_helper/Generate-Cpps.ps1 index 77ec00238..a7a71a1fe 100644 --- a/tools/cpp_helper/Generate-Cpps.ps1 +++ b/tools/cpp_helper/Generate-Cpps.ps1 @@ -32,4 +32,4 @@ Remove-Item $csv_save_path -Force # You can now copy the output file to defaults assuming all looks good # Copy-Item .\cpp_config.conf ..\..\src\lib\config\defaults\ -Force -# Remove-Item cpp-config.conf \ No newline at end of file +# Remove-Item cpp_config.conf \ No newline at end of file