diff --git a/.vscode/launch.json b/.vscode/launch.json index f3c362de0..17ef37c0b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -281,5 +281,42 @@ "RedirectOutput" ] }, + { + "name": ".NET Core Remote Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickRemoteProcess}", + "pipeTransport": { + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@sparkvm"], + "debuggerPath": "/home/bts/vsdbg/vsdbg", + "pipeCwd": "${workspaceRoot}", + "quoteArgs": true + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + }, + "justMyCode": true + }, + { + "name": ".NET Core Remote Launch", + "type": "coreclr", + "request": "launch", + "program": "/usr/bin/dotnet", + "args": ["sparkcmd.dll", "test", "test_join_create_and_takeout_market"], + "stopAtEntry": false, + "cwd": "/home/bts/spark/build/ninja_debug/server", + "pipeTransport": { + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["bts@sparkvm"], + "debuggerPath": "/home/bts/vsdbg/vsdbg", + "pipeCwd": "${workspaceRoot}", + "quoteArgs": true + }, + "sourceFileMap": { + "/home/bts/spark/": "${workspaceRoot}" + }, + "justMyCode": false + }, ] } \ No newline at end of file diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 3c158addf..e7be97cc7 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,34 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.0.0 +### User Visible Changes + - Support for attaching and detaching algos to existing orders + - Support for display and update of all parameters in running algos + - Streamlining of order badge decorations in ladder + - New order search/filtering algorithm for order book + - Simpler representation of complex algo chains in order book and mini order book + - Visual and usability improvements to mini order book + - Streamlining of algo parameter dialog in ladder + - New spreader queue holder behaviour + - Visual improvements to the order book + - New server side API + - Improved admin UI performance + - Optimized PIQ rendering +### Internal changes + - Exchange simulator no longer requires daily sequence number reset + - Improved MD resiliance to corrupted shared memory + - Native orders can now buffer updates/cancels when disconected or pending first acknowledgment + - Improved settings manager tool output + - Added diagnostics in the event MD memory corruption is detected + - Added systems tests for join,lean, iceberg and spreader orders + - Made exchange order recovery more resiliant in the presence of database loss + +## 1.6.2 +### User Visible Changes +### Exchange simulator + - Exchange simulator now now produce position in queue data + ## 1.6.0 ### User Visible Changes #### New Features diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 297cf49d9..8af2dcfdf 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -73,7 +73,7 @@ namespace mbts.spark { _has_working_orders = backing(nameof(has_working_orders), false); contract_picker_model = new ContractPickerModel(bus, false, null, new SecurityCriteria(new[] { new SecurityCriteriaClause() { - exchanges = EnumHelper.get_values_except(Venue.Bts).ToLArray() + exchanges = EnumHelper.get_values_except(Venue.Bts).ToArray() } })); contract_picker_model.cancel_action = _close_new_leg_popup; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs index 2ad70d0b7..3acd47fcc 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs @@ -2,6 +2,7 @@ using bts.utils; using mbts.spark.utilities; using System; +using System.Windows.Media; namespace mbts.spark { struct AlgoData : IEquatable { @@ -39,20 +40,28 @@ namespace mbts.spark { struct AlgoDataVM : IEquatable { public readonly AlgoData data; + public readonly AlgoDefinitionMetadata? meta; - public AlgoDataVM(AlgoData data) => + public AlgoDataVM(AlgoData data, AlgoDefinitionMetadata? meta = null) { this.data = data; + this.meta = meta; + } + public string name => data.name; + public Brush badge_fill => OrderUtils.badge_fill(meta, OrderDataHelper.get_metadata(data.value.CustomCase)); public AlgoDisplayGroup group => data.key.display_group(); public override string ToString() => data.name; - public static AlgoDataVM from_data(AlgoData data) => - new AlgoDataVM(data); + public static AlgoDataVM from_data(AlgoData data, AlgoDefinitionMetadata? meta) => + new AlgoDataVM(data, meta); - public bool Equals(AlgoDataVM other) => data == other.data; + public static AlgoDataVM from_data((AlgoData algo, AlgoDefinitionMetadata? meta) tup) => + new AlgoDataVM(tup.algo, tup.meta); + + public bool Equals(AlgoDataVM other) => data == other.data && meta == other.meta; public override bool Equals(object obj) => obj is AlgoDataVM other && Equals(other); - public override int GetHashCode() => data.GetHashCode(); + public override int GetHashCode() => EqualityComparer.aggregate_hash(data.GetHashCode(), meta.GetHashCode()); } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/Metadata/AlgoDefinitionMetadata.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/Metadata/AlgoDefinitionMetadata.cs index 940b0aa92..aa536d1bf 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/Metadata/AlgoDefinitionMetadata.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/Metadata/AlgoDefinitionMetadata.cs @@ -70,7 +70,7 @@ namespace mbts.spark { is_hidden.GetHashCode(), abbreviation == null ? 0 : abbreviation.GetHashCode(), badge_color?.GetHashCode() ?? 0, - EqualityComparer.aggregate_hash_limited(_favorite_templates)); + _favorite_templates == null ? 0 : EqualityComparer.aggregate_hash_limited(_favorite_templates)); public static bool operator ==(AlgoDefinitionMetadata a, AlgoDefinitionMetadata b) => a.Equals(b); public static bool operator !=(AlgoDefinitionMetadata a, AlgoDefinitionMetadata b) => !a.Equals(b); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs index 66219f985..b66b82839 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Utils/AlgoCollectionHelper.cs @@ -47,15 +47,19 @@ namespace mbts.spark { } } - public static void update_persisted_definition_wrappers(ObservableKeyedCollection target, TableUpdate update, Func factory) { + public static void update_persisted_definition_wrappers(IDictionary target, TableUpdate update, Func factory) { foreach (var d in update.removed) target.Remove(d.key); - foreach (var d in update.changed) - target[d.key].load_from(d.value); + foreach (var d in update.changed) { + var vm = target[d.key]; + if (vm is AlgoVMWrapper wrapper) { + wrapper.value.load(d); + } else vm.load_from(d.value); + } foreach (var d in update.added) { if (target.TryGetValue(d.key, out IAlgoVM def)) { def.load_from(d.value); - } else target.Add(new AlgoVMWrapper(factory(d))); + } else target.Add(d.key, new AlgoVMWrapper(factory(d))); } } @@ -114,4 +118,4 @@ namespace mbts.spark { DisplayNameHelper.compare_alpha_numeric(a.display_name, b.display_name); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 008e6cbd3..7ec794043 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -202,6 +202,7 @@ namespace mbts.spark { public string name { get => _name.Value; set => _name.set(value); } public string abbreviation { get => _abbreviation.Value; set => _abbreviation.set(value); } public ObservableCollection algo_roots => _algo_roots; + public IDictionary algo_roots_index => _algo_roots; public IReadOnlyObservableCollection algos_view { get; } public IAlgoVM algo_root { get => _algo_root.Value; set => _algo_root.set(value); } public IAlgoVM visible_algo_root => _visible_algo_root.Value; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs index ae497709a..e7ebaa288 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs @@ -18,12 +18,16 @@ namespace mbts.spark { this.algo = algo; this.parent = parent; _template_key = template_key; + param.permissions_changed += on_permissions_changed; + _dispose = Disposable.Create(() => param.permissions_changed -= on_permissions_changed); + void on_permissions_changed(AlgoParamPermissions oldval, AlgoParamPermissions newval) => RaisePropertyChanged(nameof(permissions)); } public event Action invalidated; public IAlgoVM algo { get; set; } public IAlgoParamVM param { get; } + public AlgoParamPermissions permissions => param.permissions; public AlgoParamRowVM parent { get; } public int level => parent == null ? 0 : parent.level + 1; public string path_disambiguation { diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs index 88cac97ec..aa97940d2 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoVMWrapper.cs @@ -29,13 +29,12 @@ namespace mbts.spark { nameof(editing_permissions), nameof(definition), nameof(display_name) - }, - _value_echo_props = new HashSet { - nameof(AlgoDefinitionVM.name), - nameof(AlgoDefinitionVM.abbreviation), - nameof(AlgoDefinitionVM.badge_fill), - nameof(AlgoDefinitionVM.can_undo), - nameof(AlgoDefinitionVM.can_redo) + }; + static readonly IReadOnlyDictionary + _value_echo_props = new Dictionary { + { nameof(AlgoDefinitionVM.name), nameof(display_name) }, + { nameof(AlgoDefinitionVM.abbreviation), nameof(abbreviation) }, + { nameof(AlgoDefinitionVM.badge_fill), nameof(meta) } }; readonly ObservableAggregateCollection _child_algo_selectors = new ObservableAggregateCollection(); readonly ObservableAggregateCollection _algo_params = new ObservableAggregateCollection(); @@ -143,8 +142,8 @@ namespace mbts.spark { RaisePropertyChanged(e.PropertyName); } void on_value_prop_changed(object sender, PropertyChangedEventArgs e) { - if (_value_echo_props.Contains(e.PropertyName)) - RaisePropertyChanged(e.PropertyName); + if (_value_echo_props.TryGetValue(e.PropertyName, out string wrapper_prop)) + RaisePropertyChanged(wrapper_prop); } } diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml.cs b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml.cs index f45e2849b..c8dbb61a0 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml.cs @@ -52,6 +52,8 @@ namespace mbts.ui.spark { // AlgoParamRows AlgoParamRowsViewSource = new CollectionViewSource>(); BindingOperations.SetBinding(AlgoParamRowsViewSource, CollectionViewSource.SourceProperty, new Binding(nameof(AlgoParamRows)) { Source = this }); + AlgoParamRowsViewSource.IsLiveFilteringRequested = true; + AlgoParamRowsViewSource.LiveFilteringProperties.Add(nameof(AlgoParamRowVM.permissions)); AlgoParamRowsViewSource.Filter += param_rows_filter; DataGridEditHelper.set_hooks(this); void param_rows_filter(object sender, FilterEventArgs e) => diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 841e32391..d3a47734d 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -233,7 +233,7 @@ namespace mbts.spark { public OrderType order_type => _order.order_type(); public string display_name => OrderUtils.display_name(_order, _fill_tuple.algo); public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase)); - public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(_order, _fill_tuple.algo_meta, order_metadata)); + public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(_fill_tuple.algo_meta, order_metadata)); public string account { get; private set; } public string user => _order.user(); public Venue exchange => security.Exchange; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 6a61afb29..c7f1a79f7 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -44,6 +44,9 @@ namespace mbts.spark { double _real_price = double.NaN, _phantom_price = double.NaN; uint filled, quantity, num_root_orders; int working_quantity; + uint? _min_piq = UInt32.MaxValue; + + public event Action piq_changed; LadderModel model => _owner.model; Dictionary _orders = new Dictionary(); @@ -168,10 +171,22 @@ namespace mbts.spark { public void add_order((OrderRecordImmutable order, uint? p, AlgoData? algo, AlgoDefinitionMetadata? meta) new_op) { _orders[new_op.order.Key] = new_op; + // reevaluate min piq if this order's piq is less + if (new_op.p.HasValue) { + if (new_op.p.Value < min_piq) { + min_piq = new_op.p.Value; + } + } } public void remove_order(uint order_key) { _orders.Remove(order_key); + // on a remove, potentially the order w/ the lowest piq has been removed, so + // if the min() is now > than the current min_piq, update the min_piq + var prospective_piq = _orders.Select(op => op.Value.p).Where(piq => piq.HasValue).Min(); + if (prospective_piq > min_piq) { + min_piq = prospective_piq; + } } //public void update(OrderRecordImmutable neworder) { @@ -183,7 +198,16 @@ namespace mbts.spark { public uint security_key => _owner.security.Id; public double price { get => double.IsNaN(_phantom_price) ? _real_price : _phantom_price; } - public uint? min_piq => _orders.Select(op => op.Value.p).Where(piq => piq.HasValue).Min(); + public uint? min_piq { + get { + return _min_piq; + } + set { + if (Set(ref _min_piq, value)) { + piq_changed?.Invoke(); + } + } + } public double real_price => _real_price; public Side side { get { diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index b1520e9f2..48bc9fe75 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -56,7 +56,7 @@ namespace mbts.spark { LadderTactileAdorner _tactile_adorner; ulong _prices_updated; NativePriceSize[] _bids = new NativePriceSize[NativePriceHelpers.COCONUT_MAX_DEPTH], _asks = new NativePriceSize[NativePriceHelpers.COCONUT_MAX_DEPTH]; - bool _price_dirty = false; + bool _price_dirty = false, _piq_dirty = false; double[] _price_list = null; IComparer _price_comparer; double _last_origin_price; @@ -262,11 +262,15 @@ namespace mbts.spark { case NotifyCollectionChangedAction.Add: foreach (LadderOrderVM item in e.NewItems) { _ordershost.add_order(item); + item.piq_changed += _set_piq_dirty; + _set_piq_dirty(); } break; case NotifyCollectionChangedAction.Remove: foreach (LadderOrderVM item in e.OldItems) { _ordershost.remove_order(item); + item.piq_changed -= _set_piq_dirty; + _set_piq_dirty(); } break; case NotifyCollectionChangedAction.Reset: @@ -277,6 +281,9 @@ namespace mbts.spark { throw new NotImplementedException(); } } + + void _set_piq_dirty() { _piq_dirty = true; } + #endregion Column[] columns { get; set; } = new Column[0]; @@ -502,6 +509,7 @@ namespace mbts.spark { _prices_updated = 0; _price_comparer = Comparer.Create((x, y) => security.ContractSpec.tick_equals(x, y) ? 0 : y.CompareTo(x)); _price_dirty = true; + _piq_dirty = true; _vm.on_tick += _tick; _settings_sub = _vm.settings.OnDispatcher().Subscribe(_settings_updated); _volume_sub = _vm.model.order_gateway.md_auxiliary_model.security_volume_at_price(security.Id).Subscribe(t => _volume_container.write_value(t.state.Values)); @@ -661,8 +669,10 @@ namespace mbts.spark { if (depth_changed) _refresh_sizes(); } - // TODO - detect changes in PIQ to selectively redraw - _refresh_piq(); + if (_piq_dirty) { + _refresh_piq(); + _piq_dirty = false; + } _refresh_volume_at_price(); _last_origin_price = _mkt_break_lines.origin; _price_dirty = false; @@ -703,8 +713,7 @@ namespace mbts.spark { if (!_settings.piq_column.show) return; int origin_index = LadderRender.index_of(_price_list, _mkt_break_lines.origin, _price_comparer); - var piq_list = _vm.price_vs_piq; - LadderRender.render_piqs(_piq_vis_tup.visual, _last_vis_tup.glyph_context, origin_index, _price_list, piq_list.ToArray(), _settings.row_height, security.ContractSpec, _settings.piq_column); + LadderRender.render_piqs(_piq_vis_tup.visual, _last_vis_tup.glyph_context, origin_index, _price_list, _vm.price_vs_piq, _settings.row_height, security.ContractSpec, _settings.piq_column); } void _refresh_sizes() { diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 557dfb43c..0c7511bcd 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -312,22 +312,22 @@ namespace mbts.spark { } // this is basically a copy of redner_sizes up above - internal static void render_piqs(DrawingVisual dv, GlyphContext glyph_context, int origin_index, double[] prices, (double price, uint piq)[] piqs, double row_height, ContractSpecificationImmutable spec, LadderColumnSettings settings) { + internal static void render_piqs(DrawingVisual dv, GlyphContext glyph_context, int origin_index, double[] prices, IEnumerable<(double price, uint piq)> pvp, double row_height, ContractSpecificationImmutable spec, LadderColumnSettings settings) { using (var dc = dv.RenderOpen()) { using (_draw_with_clip(dc, settings, row_height, prices.Length)) { - if (!prices.within_range(origin_index) || piqs.is_null_or_empty()) + if (!prices.within_range(origin_index) || pvp.is_null_or_empty()) return; var foreground = settings.foreground.rgb_brush(); int curr_index = origin_index; double curr_price = prices[curr_index]; - for (int i = 0; i < piqs.Length; i++) { - double price = piqs[i].price; + foreach (var entry in pvp) { + double price = entry.price; // prices are in descending order, so get diff from curr_price - price int tick_diff = spec.tickdiff_unchecked(curr_price, price); curr_index += tick_diff; curr_price = price; if (curr_index >= 0 && curr_index < prices.Length) { - var gr = format_text(piqs[i].piq.ToString(), curr_index, row_height, settings, glyph_context); + var gr = format_text(entry.piq.ToString(), curr_index, row_height, settings, glyph_context); dc.DrawGlyphRun(foreground, gr); } else break; } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 760b8a52f..85f7222d4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -65,11 +65,9 @@ namespace mbts.spark { partial class OrderBookVM { public class OrderBookColumnCollection : ObservableCollection, IValueFactory<(FilterStates filters, IReadOnlyList sorting)>, IDisposable { readonly List _active_comparers = new List(); - readonly OrderBookVM _owner; CompositeDisposable _resources = new CompositeDisposable(); - public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities, OrderBookVM owner) { - _owner = owner; + public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { // security Add(security_column = new SecurityColumn( DiscreteValuesFilterVM.Create( @@ -192,7 +190,8 @@ namespace mbts.spark { DiscreteValuesFilterVM.CreateTableUpdate( o => new AlgoDataVM(o.root_algo), o => AlgoID.from_algo_key(o.root_algo.key), - vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view))); + vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view), + DefaultColumnHeaders.RootAlgoType)); _resources.Add(algo_items_source.Subscribe(root_algo_type_observer)); root_algo_type_items_view.CustomSort = algo_items_comp; root_algo_type_items_view.GroupDescriptions.Add(algo_items_group_desc); @@ -567,7 +566,7 @@ namespace mbts.spark { public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text(dc, _get_glyph_context(row), font_size, _get_text(row), position, row_height, - font_brush, null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); + RenderUtils.get_foreground(row, font_brush), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } #region Explicit Column Defs @@ -599,12 +598,15 @@ namespace mbts.spark { } public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn { + readonly BindingBase _foreground_binding; ListSortDirection? _cached_sort_direction; + public OrderBookOrderTypeColumn(Columns key, string badge_fill_binding_path, string display_name_binding_path, IComparer row_comparer, IDataGridColumnPersistentFilter filter, string header = DefaultColumnHeaders.OrderType) : base(key, new Binding(badge_fill_binding_path), new Binding(display_name_binding_path), filter, header) { id = key.ToString(); this.filter = filter; font_weight_binding = RenderUtils.get_font_weight_binding(); + _foreground_binding = RenderUtils.get_foreground_binding(this); _cached_sort_direction = SortDirection; this.comparer = row_comparer; } @@ -616,6 +618,12 @@ namespace mbts.spark { IDataGridColumnFilter ICVOrderBookColumn.filter => filter; ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; } + public override FrameworkElement view_factory() { + var view = base.view_factory(); + view.SetBinding(OrderTypeItem.ForegroundProperty, _foreground_binding); + return view; + } + protected override void OnSortDirectionChanged(ListSortDirection? new_value) { _cached_sort_direction = new_value; base.OnSortDirectionChanged(new_value); @@ -647,7 +655,7 @@ namespace mbts.spark { } public class SecurityColumn : FrameworkElementColumnBase, ICVOrderBookColumn, IFilterableColumn { - readonly BindingBase _font_weight_binding = RenderUtils.get_font_weight_binding(); + readonly BindingBase _font_weight_binding = RenderUtils.get_font_weight_binding(), _foreground_binding; readonly IValueConverter _expander_visiblilty_converter = new ui.converters.BooleanToVisibilityConverter { VisibilityForFalse = Visibility.Hidden }; readonly IValueConverter _margin_converter = new AnonymousValueConverter(level => new Thickness(10 * level, 0, 0, 0)); @@ -656,6 +664,7 @@ namespace mbts.spark { public SecurityColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Security) { id = key.ToString(); this.filter = filter; + _foreground_binding = RenderUtils.get_foreground_binding(this); Header = DefaultColumnHeaders.Security; Width = DefaultColumnWidths.Security; _cached_sort_direction = SortDirection; @@ -682,7 +691,7 @@ namespace mbts.spark { security_view.SetBinding(TextBlock.FontSizeProperty, new Binding(nameof(font_size)) { Source = this }); security_view.SetBinding(TextBlock.TextProperty, nameof(OrderBookRowVM.security_text)); security_view.SetBinding(TextBlock.HorizontalAlignmentProperty, new Binding(nameof(horizontal_alignment)) { Source = this }); - security_view.SetBinding(TextBlock.ForegroundProperty, new Binding(nameof(font_brush)) { Source = this }); + security_view.SetBinding(TextBlock.ForegroundProperty, _foreground_binding); security_view.SetBinding(TextBlock.FontFamilyProperty, new Binding(nameof(font_family)) { Source = this }); security_view.SetBinding(TextBlock.FontWeightProperty, _font_weight_binding); // @@ -1063,6 +1072,10 @@ namespace mbts.spark { popup.SetBinding(Popup.DataContextProperty, new Binding("PlacementTarget.DataContext") { RelativeSource = new RelativeSource(RelativeSourceMode.Self) }); + popup.Closed += (s, e) => { + if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) + ob_vm.is_attaching_orders = false; + }; var the_whole_thing = new Grid(); the_whole_thing.Children.Add(update_button); @@ -1150,19 +1163,24 @@ namespace mbts.spark { static class RenderUtils { public static FontWeight root_font_weight = FontWeights.Normal, - child_font_weight = FontWeights.Light; + child_font_weight = FontWeights.Normal; + static readonly IMultiValueConverter _foreground_converter = + ValueConverter.create(_get_foreground); public static double font_size = FontSizes.Small; public static readonly IValueConverter _sub_type_text_converter = new ui.spark.converters.OrderSubTypeDisplayTextConverter(), _side_brush_converter = new AnonymousValueConverter(s => s == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask), - _font_weight_converter = new AnonymousValueConverter(is_child => is_child ? FontWeights.Light : FontWeights.Normal); + _font_weight_converter = new AnonymousValueConverter(is_child => is_child ? child_font_weight : root_font_weight); + public static readonly IMultiValueConverter _price_text_converter = new ui.spark.converters.TickDisplayConverter(), _background_converter = new AnonymousMultiValueConverter( (selected, status) => selected || status != OrderStatus.Working ? Brushes.Transparent : BTSColors.Orders.working_order_background_brush); + static readonly bool _animate_child_order_rows = mbts.config.Configuration.get().animate_child_order_rows; + public static BindingBase _get_background_binding() { var mb = new MultiBinding { Converter = _background_converter }; mb.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); @@ -1170,9 +1188,29 @@ namespace mbts.spark { return mb; } - public static Brush get_side_brush(OrderBookRowVM r) => r.side == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask; - public static BindingBase get_font_weight_binding() => new Binding(nameof(OrderBookRowVM.is_child)) { Converter = _font_weight_converter }; - } + public static BindingBase get_foreground_binding(ColumnBase col) { + var col_font_brush_binding = new Binding(nameof(ColumnBase.font_brush)) { Source = col }; + if (!_animate_child_order_rows) + return col_font_brush_binding; + var mb = new MultiBinding { Converter = _foreground_converter }; + mb.Bindings.Add(new Binding(nameof(OrderBookRowVM.is_child))); + mb.Bindings.Add(col_font_brush_binding); + return mb; + } + public static Brush get_side_brush(OrderBookRowVM r) => get_foreground(r, r.side == Side.Buy ? BTSColors.MarketData.bid : BTSColors.MarketData.ask); + public static BindingBase get_font_weight_binding() => new Binding(nameof(OrderBookRowVM.is_child)) { Converter = _font_weight_converter }; + + public static Brush get_foreground(OrderBookRowVM row, Brush brush) => + _animate_child_order_rows ? _get_foreground(row.is_child, brush) : brush; + + static Brush _get_foreground(bool is_child, Brush brush) { + if (is_child) { + brush = brush.Clone(); + brush.Opacity = 0.75; + } + return brush; + } + } } } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index eceb5a03b..97314434b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -18,18 +18,16 @@ namespace mbts.spark { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; + Color? _root_algo_badge_color_backing; Brush _badge_fill, _root_algo_badge_fill; IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; int _depth_level; SecurityImmutable? _security => order_tuple.security; - - // for mini-ob uint _prospective_quantity; double _prospective_price; - public OrderBookRowVM(OrderBookVM owner, OrderSecurityAlgoMeta order_tuple, bool is_expanded) { _owner = owner; this.order_tuple = order_tuple; @@ -37,11 +35,6 @@ namespace mbts.spark { _is_expanded = is_expanded; prospective_quantity = this.quantity; prospective_price = this.price; - this.invalidated += OrderBookRowVM_invalidated; - } - - private void OrderBookRowVM_invalidated() { - modify_order_quantity_andor_price?.TryRaiseCanExecuteChanged(); } //// This takes care of the case where the OB has all rows visible @@ -65,7 +58,7 @@ namespace mbts.spark { public OrderSecurityAlgoMeta order_tuple { get; private set; } public OrderRecordImmutable order => order_tuple.order; public OrderMetadata order_metadata => _owner.get_metadata(this); - public Brush badge_fill => _badge_fill ?? (_badge_fill = order_tuple.badge_fill(order_metadata)); + public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(order_tuple.meta, order_metadata)); public uint order_key => order.Key; public uint parent_order_key => order.ParentKey; public uint security_key => order.security_key(); @@ -106,7 +99,7 @@ namespace mbts.spark { // Root Algo public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root_algo.value.CustomCase; public OrderMetadata root_algo_order_metadata => _owner.get_metadata(root_algo_order_type); - public Brush root_algo_badge_fill => _root_algo_badge_fill ?? (_root_algo_badge_fill = order_tuple.root_badge_fill(root_algo_order_metadata)); + public Brush root_algo_badge_fill => _root_algo_badge_fill ?? (_root_algo_badge_fill = new SolidColorBrush(_root_algo_badge_color)); public string root_algo_display_name => order_tuple.root_algo.name; // Tree @@ -154,32 +147,38 @@ namespace mbts.spark { public ICommand cancel_command => _cancel_cmd ?? (_cancel_cmd = new DelegateCommand(() => _owner.cancel_order(this), () => status == OrderStatus.Working || status == OrderStatus.Disconnected)); - public ICommand modify_order_quantity_andor_price => _modify_order_quantity_andor_price ?? - (_modify_order_quantity_andor_price = new DelegateCommand( - () => { - if (is_qty_dirty && is_price_dirty) { - _owner.modify_order_price_and_quantity(this, prospective_price, prospective_quantity); - } else if (is_qty_dirty) { - _owner.modify_order_quantity(this, prospective_quantity); - } else if (is_price_dirty) { - _owner.modify_order_price(this, this.prospective_price); + public ICommand modify_order_quantity_andor_price { + get { + if (_modify_order_quantity_andor_price == null) { + _modify_order_quantity_andor_price = new DelegateCommand(execute, can_execute); + invalidated += _modify_order_quantity_andor_price.RaiseCanExecuteChanged; + // impl + void execute() { + if (is_qty_dirty && is_price_dirty) { + _owner.modify_order_price_and_quantity(this, prospective_price, prospective_quantity); + } else if (is_qty_dirty) { + _owner.modify_order_quantity(this, prospective_quantity); + } else if (is_price_dirty) { + _owner.modify_order_price(this, this.prospective_price); + } + _unselect_me(); } - _unselect_me(); - }, + bool can_execute() => status == OrderStatus.Working && (is_price_dirty || is_qty_dirty); + } + return _modify_order_quantity_andor_price; + } + } + + public ICommand revert_prospective_order_quantity_andor_price => _revert_prospective_order_quantity_andor_price ?? + (_revert_prospective_order_quantity_andor_price = new DelegateCommand( + () => { + prospective_price = price; + prospective_quantity = quantity; + }, () => this.status == OrderStatus.Working && (is_price_dirty || is_qty_dirty) ) ); - public ICommand revert_prospective_order_quantity_andor_price => _revert_prospective_order_quantity_andor_price ?? - (_revert_prospective_order_quantity_andor_price = new DelegateCommand( - () => { - prospective_price = price; - prospective_quantity = quantity; - }, - () => this.status == OrderStatus.Working && (is_price_dirty || is_qty_dirty) - ) -); - public ICommand detach_command => _detach_command ?? (_detach_command = new DelegateCommand(() => { _owner.detach_orders(this); @@ -199,6 +198,18 @@ namespace mbts.spark { _select_me(); }) ); + + // private props + Color _root_algo_badge_color { + get => _root_algo_badge_color_backing ?? (_root_algo_badge_color_backing = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata)).Value; + set { + if (_root_algo_badge_color_backing != value) { + _root_algo_badge_color_backing = value; + _root_algo_badge_fill = null; + } + } + } + #region IHierarchicalRow bool IHierarchicalRow.is_parent => is_parent; bool IHierarchicalRow.is_expanded => is_expanded; @@ -269,9 +280,9 @@ namespace mbts.spark { if (old_order_tuple.display_name() != order_tuple.display_name()) RaisePropertyChanged(nameof(display_name)); // root badge fill - if (old_order_tuple.root_meta?.badge_color != order_tuple.root_meta?.badge_color) { - // invalidate by setting to null (will be re-instantiated in the public getter) - _root_algo_badge_fill = null; + if (_root_algo_badge_color_backing.HasValue) { + // only need to invalidate it if it had a value (it is lazily instantiated) + _root_algo_badge_color = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata); RaisePropertyChanged(nameof(root_algo_badge_fill)); } // root display name @@ -303,7 +314,6 @@ namespace mbts.spark { // this will update the cancel column in the mini ob cancel_command.TryRaiseCanExecuteChanged(); } - // always refresh attach and detach b/c // conditionally raise invalidated if ((dirty & ViewRefresh.invalidate_mask) != 0) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e3b184fe7..2364208b9 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -87,7 +87,7 @@ namespace mbts.spark { init_format: AlgoFormats.Attachable, editing_permissions: AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues)); _settings_manager = settings_manager; - _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values)), this); + _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values))); // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front columns = new ObservableAppendCollection(_columns); _row_collection = new OperableHierarchicalCollection( @@ -248,10 +248,7 @@ namespace mbts.spark { var order_tups = selected_rows.Select(r => r.order_tuple).ToList(); var mod_algo_vm = attach_vm.algo_vm.algo_root; await Task.WhenAll(order_tups.Select(t => { - var algo = t.order.Def.CustomDef.CloneToMutable(); - if (algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) { - algo = algo.Composite.Definition; - } + var algo = t.order.Def.CustomDef.actual().CloneToMutable(); mod_algo_vm.assign_to(algo); if (algo_template_key != 0) { algo = new CustomOrderDefinition { @@ -278,15 +275,14 @@ namespace mbts.spark { Disposable.replace(ref attach_vm_hooks, Disposable.Create( connect_common_selected_params(attach_vm), - _selected_params_mon.subscribe_algos().Subscribe(algos => { + attach_vm.algo_vm.observe_algo_root().Subscribe(algo_root => { bool show_price, show_size; - using (var en = algos.Select(a => a.CustomCase).Distinct().GetEnumerator()) { - if (show_price = show_size = en.MoveNext()) { - do { - if (show_price) show_price = AttachConf.show_price(en.Current); - if (show_size) show_size = AttachConf.show_size(en.Current); - } while ((show_price || show_size) && en.MoveNext()); - } + if (algo_root == null) { + show_price = false; + show_size = false; + } else { + show_price = AttachConf.show_price(algo_root.order_type); + show_size = AttachConf.show_size(algo_root.order_type); } attach_vm.price_permissions = bool_to_perm(show_price); attach_vm.size_permissions = bool_to_perm(show_size); @@ -295,7 +291,7 @@ namespace mbts.spark { }), // custom templates (created by user) _model.algo_model.definitions.OnDispatcher().Subscribe(u => - AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots as ObservableKeyedCollection, u, mk_factory(true))))); + AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_factory(true))))); // vm factory Func mk_factory(bool connect) => fd => { @@ -515,11 +511,11 @@ namespace mbts.spark { if (!new_sort.Equals(old_sort)) { /// Both filter and sort have changed, use to avoid syncing twice. using (_row_collection.defer_refresh()) { - _row_collection.filter = new_filter.build_predicate(this); + _row_collection.filter = new_filter.build_predicate(); _row_collection.comparer = new_sort.comparer; } } else { - _row_collection.filter = new_filter.build_predicate(this); + _row_collection.filter = new_filter.build_predicate(); } } else if (!new_sort.Equals(old_sort)) _row_collection.comparer = new_sort.comparer; @@ -590,7 +586,7 @@ namespace mbts.spark { var fd = new FilterData(grid_settings_manager.algo_tree_display_mode, _columns.create_filter_states()); if (!fd.Equals(_cached_filter_data)) { _cached_filter_data = fd; - _row_collection.filter = fd.build_predicate(this); + _row_collection.filter = fd.build_predicate(); } } @@ -900,8 +896,8 @@ namespace mbts.spark { this.column_filters = column_filters; } - public Func build_predicate(OrderBookVM owner) { - var pred = column_filters.build_predicate(owner); + public Func build_predicate() { + var pred = column_filters.build_predicate(); if (algo_tree_display_mode == AlgoTreeDisplayMode.RootAndLeafNodes) { if (pred == null) { pred = tree_disp_pred; diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 30068f043..2e210f265 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -116,7 +116,7 @@ namespace bts.shell.orderbook { } static class FilterStatesExtensions { - public static Func build_predicate(this FilterStates fs, OrderBookVM owner) { + public static Func build_predicate(this FilterStates fs) { var predicates = new List>(); // security if (fs.security_criteria?.is_defined() ?? false) diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs index 2be037993..d15c1c303 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs @@ -140,28 +140,28 @@ namespace bts.shell.orderbook { static class DefaultColumns { public static GridColumnSettings security => new GridColumnSettings(Columns.Security.ToString(), DIYGrid.DefaultColumnHeaders.Security, width: DIYGrid.DefaultColumnWidths.Security); - public static GridColumnSettings symbol => new GridColumnSettings(Columns.Symbol.ToString(), DIYGrid.DefaultColumnHeaders.Symbol, width: DIYGrid.DefaultColumnWidths.Symbol, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings time_created => new GridColumnSettings(Columns.Time.ToString(), "Time", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings last_change => new GridColumnSettings(Columns.LastChange.ToString(), "Last Change", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings user => new GridColumnSettings(Columns.User.ToString(), DIYGrid.DefaultColumnHeaders.User, width: DIYGrid.DefaultColumnWidths.User, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings account => new GridColumnSettings(Columns.Account.ToString(), DIYGrid.DefaultColumnHeaders.Account, width: DIYGrid.DefaultColumnWidths.Account, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings exchange => new GridColumnSettings(Columns.Exchange.ToString(), DIYGrid.DefaultColumnHeaders.Exchange, width: DIYGrid.DefaultColumnWidths.Exchange, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings symbol => new GridColumnSettings(Columns.Symbol.ToString(), DIYGrid.DefaultColumnHeaders.Symbol, width: DIYGrid.DefaultColumnWidths.Symbol, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings time_created => new GridColumnSettings(Columns.Time.ToString(), "Time", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings last_change => new GridColumnSettings(Columns.LastChange.ToString(), "Last Change", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings user => new GridColumnSettings(Columns.User.ToString(), DIYGrid.DefaultColumnHeaders.User, width: DIYGrid.DefaultColumnWidths.User, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings account => new GridColumnSettings(Columns.Account.ToString(), DIYGrid.DefaultColumnHeaders.Account, width: DIYGrid.DefaultColumnWidths.Account, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings exchange => new GridColumnSettings(Columns.Exchange.ToString(), DIYGrid.DefaultColumnHeaders.Exchange, width: DIYGrid.DefaultColumnWidths.Exchange, horizontal_alignment: HorizontalAlignment.Left); public static GridColumnSettings time_in_force => new GridColumnSettings(Columns.TimeInForce.ToString(), DIYGrid.DefaultColumnHeaders.TimeInForce, width: DIYGrid.DefaultColumnWidths.TimeInForce); public static GridColumnSettings order_type => new GridColumnSettings(Columns.OrderType.ToString(), DIYGrid.DefaultColumnHeaders.OrderType, width: DIYGrid.DefaultColumnWidths.OrderType); public static GridColumnSettings root_algo_type => new GridColumnSettings(Columns.RootAlgoType.ToString(), DIYGrid.DefaultColumnHeaders.RootAlgoType, width: DIYGrid.DefaultColumnWidths.OrderType); - public static GridColumnSettings sub_type => new GridColumnSettings(Columns.SubType.ToString(), "Sub Type", width: 80, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings side => new GridColumnSettings(Columns.Side.ToString(), "B/S", width: DIYGrid.DefaultColumnWidths.Side, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings sub_type => new GridColumnSettings(Columns.SubType.ToString(), "Sub Type", width: 80, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings side => new GridColumnSettings(Columns.Side.ToString(), "B/S", width: DIYGrid.DefaultColumnWidths.Side, horizontal_alignment: HorizontalAlignment.Left); public static GridColumnSettings quantity => new GridColumnSettings(Columns.Size.ToString(), "Qty", width: DIYGrid.DefaultColumnWidths.Size, horizontal_alignment: HorizontalAlignment.Right); public static GridColumnSettings price => new GridColumnSettings(Columns.Price.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right); public static GridColumnSettings filled_quantity => new GridColumnSettings(Columns.Filled.ToString(), "Filled Qty", width: DIYGrid.DefaultColumnWidths.Filled, horizontal_alignment: HorizontalAlignment.Right); public static GridColumnSettings avg_price => new GridColumnSettings(Columns.AvgFilled.ToString(), "Avg Filled", width: DIYGrid.DefaultColumnWidths.AveragePrice, horizontal_alignment: HorizontalAlignment.Right); public static GridColumnSettings last_price => new GridColumnSettings(Columns.LastPrice.ToString(), "Last Filled", width: DIYGrid.DefaultColumnWidths.LastPrice, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings status => new GridColumnSettings(Columns.Status.ToString(), "Status", width: 80, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings last_message => new GridColumnSettings(Columns.LastMessage.ToString(), "Last Message", width: DIYGrid.DefaultColumnWidths.LastMessage, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.ToString(), DIYGrid.DefaultColumnHeaders.SecurityKey, is_visible: false, width: DIYGrid.DefaultColumnWidths.SecurityKey, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings order_key => new GridColumnSettings(Columns.OrderKey.ToString(), DIYGrid.DefaultColumnHeaders.OrderKey, width: DIYGrid.DefaultColumnWidths.OrderKey, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings status => new GridColumnSettings(Columns.Status.ToString(), "Status", width: 80, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings last_message => new GridColumnSettings(Columns.LastMessage.ToString(), "Last Message", width: DIYGrid.DefaultColumnWidths.LastMessage, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.ToString(), DIYGrid.DefaultColumnHeaders.SecurityKey, is_visible: false, width: DIYGrid.DefaultColumnWidths.SecurityKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings order_key => new GridColumnSettings(Columns.OrderKey.ToString(), DIYGrid.DefaultColumnHeaders.OrderKey, width: DIYGrid.DefaultColumnWidths.OrderKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); public static IEnumerable sorting_criterion { get { diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml index 94f2043e5..b9c7a1421 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml @@ -4,13 +4,12 @@ x:Name="_grid" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api" xmlns:sp="clr-namespace:mbts.spark" - xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:sys="clr-namespace:System;assembly=mscorlib" + InactiveSelectionOpacity="0.3" > @@ -109,63 +108,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs index d5e489c78..e718abc21 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -1,4 +1,11 @@ +using bts.api.orderman; +using mbts.ui; using mbts.ui.controls; +using mbts.ui.converters; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; namespace mbts.spark { internal partial class OrderBookGridView : DIYGrid { @@ -45,8 +52,49 @@ namespace mbts.spark { RootAlgoType = 1 << 29 } - public OrderBookGridView() => + public OrderBookGridView() { InitializeComponent(); + var row_template_factory = new FrameworkElementFactory(typeof(OrderBookRowView)); + row_template_factory.SetValue(OrderBookRowView.BackgroundProperty, RowBackgroundHelper.row_background_binding); + RowTemplate = new DataTemplate { VisualTree = row_template_factory }; + } + + static class RowBackgroundHelper { + public static readonly BindingBase row_background_binding; + + static RowBackgroundHelper() { + var bg_binding = new MultiBinding(); + bg_binding.Bindings.Add(new Binding(nameof(OrderBookRowVM.status))); + bg_binding.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); + double overlay_opacity = config.Configuration.get().status_color_opacity_when_selected; + if (overlay_opacity > 0.1 && overlay_opacity < 0.9) { + bg_binding.Converter = ValueConverter.create((status, is_selected) => { + var color = _status_color(status); + return color.HasValue ? new SolidColorBrush(color.Value) { Opacity = is_selected ? overlay_opacity : 1.0 } : null; + }); + } else { + bg_binding.Converter = ValueConverter.create((status, is_selected) => { + if (is_selected) + return null; + var color = _status_color(status); + return color.HasValue ? new SolidColorBrush(color.Value) : null; + }); + } + row_background_binding = bg_binding; + } + + static Color? _status_color(OrderStatus status) { + switch (status) { + case OrderStatus.Canceled: return BTSColors.Orders.canceled_order_background; + case OrderStatus.Completed: return BTSColors.Orders.completed_order_background; + case OrderStatus.Disconnected: + case OrderStatus.RejectedBySpark: + case OrderStatus.Error: + return BTSColors.Orders.error_order_background; + default: return null; + } + } + } } class OrderBookRowView : DIYGrid.HighPerformanceRow { diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index 7408057bb..c5cf0da00 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -6,6 +6,7 @@ using mbts.ui; using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; +using System.Linq; using System.Threading.Tasks; using System.Windows.Media; using static mbts.ui.shell.ProtoBufSerializationHelper; @@ -52,9 +53,8 @@ namespace bts.shell { yield return _aswf; } - public Task create(Stream load_stream) { - return dispatch_to_factory(load_stream, window_factories().ToLArray()); - } + public Task create(Stream load_stream) => + dispatch_to_factory(load_stream, window_factories().ToArray()); public void Dispose() { foreach (var i in window_factories()) diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index 3eb377cc1..d8096a508 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -240,19 +240,12 @@ namespace mbts.spark { } return false; } - public static Brush badge_fill(this OrderSecurityAlgoMeta order_sam, OrderMetadata order_meta) => - badge_fill(order_sam.order, order_sam.meta, order_meta); - public static Brush badge_fill(OrderRecordImmutable order, AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) { - if (algo_meta?.badge_color is Color c) { - return c.to_brush(); - } else { - return order_meta.Color.rgb_brush(); - } - } + public static Brush badge_fill(AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) => + new SolidColorBrush(badge_color(algo_meta, order_meta)); - public static Brush root_badge_fill(this OrderSecurityAlgoMeta order_sam, OrderMetadata root_order_meta) => - order_sam.root_meta?.badge_color is Color c ? c.to_brush() : root_order_meta.Color.rgb_brush(); + public static Color badge_color(AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) => + algo_meta?.badge_color ?? order_meta.Color.rgb_color(); public static string order_collection_summary(double best_price, int best_price_volume, int total_volume, ContractSpecificationImmutable spec) { if (total_volume == 0) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 251f1966b..078da0e39 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -84,15 +84,16 @@ namespace mbts.spark { _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); _security_working_orders_with_piq_demuxer = new TableUpdateDemuxer(o => o.order.Key, o => o.order.security_key()); _security_positions_demuxer = new TableUpdateDemuxer(o => o.RecordId, p => p.SecurityId); - var algo_meta_join = algo_model.definitions.LeftJoin( + studio_algos_with_meta = algo_model.definitions.LeftJoin( algo_model.metadata_service.subscribe_metadata().Table(m => m.id), d => d.key, m => m.id, (algo, k, meta) => (algo, meta), (algo, k) => (algo, null), - t => t.algo.key); + t => t.algo.key) + .Cache(); var order_secs_algo_meta_join = on_orders.LeftJoin( - algo_meta_join, + studio_algos_with_meta, t => t.order.Key, am => am.algo.key, t => new AlgoKey(new bts.persist.algo.AlgoPersistedKey(t.order.algo_template_key())), @@ -178,6 +179,7 @@ namespace mbts.spark { public IObservable> on_fill_tuples { get; } public IObservable> working_orders { get; } public IObservable> on_positions { get; } + public IObservable> studio_algos_with_meta { get; } public AdminModel admin_model { get; } public IAlgoStudioModel algo_model { get; } @@ -436,16 +438,18 @@ namespace mbts.spark { return rod; }).Select(r => r.last_update); - public static IObservable> subscribe_all_algos(this OrdersModel orders_model) => - orders_model.algo_model.definitions.MergeTable(Observable.Return( - new TableUpdate( - ImmutableDictionary.Empty.AddRange(orders_model.factory.default_algos(OrderDataHelper.all_order_types)), - Array.Empty(), - Array.Empty>(), - Array.Empty(), - d => d.key + public static IObservable> subscribe_all_algos(this OrdersModel orders_model) => + orders_model.studio_algos_with_meta.MergeTable(Observable.Return( + new TableUpdate<(AlgoData algo, AlgoDefinitionMetadata? meta), AlgoKey>( + ImmutableDictionary.Empty.AddRange(orders_model.factory.default_algos(OrderDataHelper.all_order_types).Select(kv => new KeyValuePair(kv.Key, (kv.Value, null)))), + Array.Empty<(AlgoData,AlgoDefinitionMetadata?)>(), + Array.Empty>(), + Array.Empty<(AlgoData,AlgoDefinitionMetadata?)>(), + d => d.algo.key ).as_snapshot())); + //public static IObservable> subscribe_all_algos_with_meta(this OrdersModel orders_model) => + public static async Task order_from_key(this OrdersModel orders_model, uint order_key) { (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3)); if (success && tu.state.TryGetValue(order_key, out var rec)) { diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 00e3060e3..914c9f524 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -18,9 +18,9 @@ bts 7.2 true - - 1.0.0 - + + 1.0.0 + @@ -121,6 +121,7 @@ MSBuild:Compile + diff --git a/src/client/spark/core/Collections/ObservantDictionary.cs b/src/client/spark/core/Collections/ObservantDictionary.cs index cd05ae51d..b63029364 100644 --- a/src/client/spark/core/Collections/ObservantDictionary.cs +++ b/src/client/spark/core/Collections/ObservantDictionary.cs @@ -42,7 +42,7 @@ namespace mbts.collections foreach (TModel m in e.OldItems) _remove(m); break; case NotifyCollectionChangedAction.Reset: - var old_views = Values.ToLArray(); + var old_views = Values.ToArray(); Clear(); foreach (TValue v in old_views) ValueDestroyed?.Invoke(v); foreach (TModel m in _models) _add(m); diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index e1077760c..b3ff38bfa 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -242,6 +242,7 @@ namespace mbts.ui.controls { public static readonly SolidColorBrush DefaultSelectionHighlight = new SolidColorBrush(Colors.MediumSlateBlue) { Opacity = 0.4 }; public static readonly Pen DefaultSelectionStroke = new Pen(Brushes.MediumSlateBlue, 1); readonly NotifyCollectionChangedEventHandler _sort_descriptions_collection_changed_cb; + double _inactive_selection_opacity = 0.2; DataContextHooks _data_context_hooks; public static readonly DependencyProperty SelectionHighlightProperty = @@ -249,7 +250,7 @@ namespace mbts.ui.controls { nameof(SelectionHighlight), (o, v) => { o.Resources[ActiveSelectionHighlightKey] = v; - o.Resources[InactiveSelectionHighlightKey] = new SolidColorBrush(v.Color) { Opacity = 0.2 }.frozen(); + o._reset_inactive_selection_brush(); o.Resources[SelectionStrokeKey] = new Pen(o.SelectionHighlight.Color.to_solid_brush().frozen(), 1).frozen(); foreach (var col in o.Columns.empty_if_null().OfType()) col.on_selection_fill(v); @@ -322,14 +323,24 @@ namespace mbts.ui.controls { } } })); - Resources[InactiveSelectionHighlightKey] = new SolidColorBrush(SelectionHighlight.Color) { Opacity = 0.2 }; Resources[ActiveSelectionHighlightKey] = SelectionHighlight; + _reset_inactive_selection_brush(); _data_context_hooks = new DataContextHooks(this, DataContext); DataContextChanged += OnDataContextChanged; } public event DIYGridSortingEventHandler Sorting; + public double InactiveSelectionOpacity { + get => _inactive_selection_opacity; + set { + if (value != _inactive_selection_opacity && value.is_within_range(0.1, 0.9)) { + _inactive_selection_opacity = value; + _reset_inactive_selection_brush(); + } + } + } + public ItemContainerGenerator RowContainerGenerator => _row_presenter.ItemContainerGenerator; @@ -376,6 +387,18 @@ namespace mbts.ui.controls { void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e) => Disposable.replace(ref _data_context_hooks, new DataContextHooks(this, e.NewValue)); + void _reset_inactive_selection_brush() { + try { + if (TryFindResource(ActiveSelectionHighlightKey) is SolidColorBrush brush) { + var clone = brush.Clone(); + if (_inactive_selection_opacity < clone.Opacity) { + clone.Opacity = _inactive_selection_opacity; + } + Resources[InactiveSelectionHighlightKey] = clone; + } + } catch { } + } + #region Column Handling private void invalidate_column_layout(object sender = null, EventArgs args = null) { var geometry = GetColumnGeometry().ToList(); @@ -591,7 +614,7 @@ namespace mbts.ui.controls { _row_presenter.ItemContainerStyle = _row_style; } - public Style RowStyle { get => GetValue(RowStyleProperty) as Style; set => SetValue(StyleProperty, value); } + public Style RowStyle { get => GetValue(RowStyleProperty) as Style; set => SetValue(RowStyleProperty, value); } #endregion public static readonly DependencyProperty CurrentRowProperty = DependencyProperty.Register( @@ -915,4 +938,4 @@ namespace mbts.ui.controls { } }); } -} \ No newline at end of file +} diff --git a/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs b/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs index 77b375065..eb1213a7c 100644 --- a/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs +++ b/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs @@ -11,7 +11,22 @@ using System.Windows.Media; namespace mbts.ui.controls { partial class DIYGrid { - public class HighPerformanceRow : FrameworkElement where TRowVM : class, IRowVM { + public class HighPerformanceRowBase : FrameworkElement { + protected Brush cached_background; + + public static readonly DependencyProperty BackgroundProperty = + WPFHelper.create_dp( + nameof(Background), + FrameworkPropertyMetadataOptions.AffectsRender, + (o, v) => o.cached_background = v); + + public Brush Background { + get => GetValue(BackgroundProperty) as Brush; + set => SetValue(BackgroundProperty, value); + } + } + + public class HighPerformanceRow : HighPerformanceRowBase where TRowVM : class, IRowVM { double _row_height; ObservableCollection _columns; List _column_layout = new List(); @@ -85,6 +100,9 @@ namespace mbts.ui.controls { _element_cells.VisualAtIndex(index); protected override void OnRender(DrawingContext dc) { + if (cached_background != null) { + dc.DrawRectangle(cached_background, null, new Rect(0, 0, ActualWidth, ActualHeight)); + } if (_row != null) { foreach (var cell in _column_layout) { if (!cell.column.is_collapsed && cell.column is IRenderColumn rc) diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 5d9eb34e4..3658c5413 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -3,17 +3,14 @@ using bts.collections; using bts.utils; using mbts.collections; using mbts.ui.shell; -using mbts.ui.utilities; using mbts.ui.utility; using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; using System.Linq; using System.Reactive.Linq; -using System.Windows.Data; namespace mbts.spark.filters { static class DiscreteValuesFilterVM { @@ -87,7 +84,7 @@ namespace mbts.spark.filters { public IReadOnlyCollection items { get; } public ObservableCollectionEx selected_items { get; } = new ObservableCollectionEx(); - public override TValue[] get_state() => selected_items.ToLArray(); + public override TValue[] get_state() => selected_items.ToArray(); protected override void _clear() { _destroy_snapshot(); selected_items.Clear(); @@ -147,10 +144,10 @@ namespace mbts.spark.filters { ) : this(get_row_val, get_state, load_state, prop_name, equality_comparer, comparer) { // _items_sub = items.OnDispatcher().Subscribe(update => { - foreach (var v in update.added) - _items_set.Add(v); foreach (var v in update.removed.Except(_selected_items_set)) _items_set.Remove(v); + foreach (var v in update.added) + _items_set.Add(v); _unsorted_items.sync_with(_items_set); }); } @@ -262,7 +259,7 @@ namespace mbts.spark.filters { readonly Func> _load_state; readonly Func, TState> _get_state; readonly IEqualityComparer _comparer; - readonly HashSet _selected_keys = new HashSet(); + readonly HashSet _selected_keys = new HashSet(), _desired_keys = new HashSet(); ListCollectionView _items_view; public TableUpdateItemsFilter(Func factory, Func row_key, Func key, Func> load_state, Func, TState> get_state) @@ -290,6 +287,12 @@ namespace mbts.spark.filters { _items.Replace(_key(ch.Old), ch.New); foreach (var v in table.added) _items.Add(v); + var newly_selected_keys = _desired_keys.Where(_selection_model.try_select).ToList(); + if (newly_selected_keys.Count > 0) { + _selected_keys.AddRange(newly_selected_keys); + _desired_keys.removeRange(newly_selected_keys); + _raise_filter_changed(); + } } public override TState get_state() => _get_state(_selection_model.selected_items.Select(_key)); @@ -309,8 +312,10 @@ namespace mbts.spark.filters { protected override bool _filter(TValue value) => _selected_keys.Contains(_key(value)); protected override void _load_state_internal(TState state) { - foreach (var k in _load_state(state).empty_if_null()) - _selection_model.try_select(k); + foreach (var k in _load_state(state).empty_if_null()) { + if (!_selection_model.try_select(k)) + _desired_keys.Add(k); + } } } #endregion @@ -337,4 +342,4 @@ namespace mbts.spark.filters { } } } -} \ No newline at end of file +} diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml index 7b6e6fb47..b21f8c206 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml @@ -163,6 +163,11 @@ + + + + + diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml index 278e0d264..dc6226536 100644 --- a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml +++ b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml @@ -289,7 +289,7 @@ - Make current paramaters the local defaults + Make current paramaters the local defaults. These values will be lost when the ladder closes. diff --git a/src/client/spark/view/Converters/EnumConverters/EnumCaseStringConverter.cs b/src/client/spark/view/Converters/EnumConverters/EnumCaseStringConverter.cs index b267e2d86..696313310 100644 --- a/src/client/spark/view/Converters/EnumConverters/EnumCaseStringConverter.cs +++ b/src/client/spark/view/Converters/EnumConverters/EnumCaseStringConverter.cs @@ -1,28 +1,15 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Data; -namespace mbts.ui.converters -{ - public class EnumCaseStringConverter : IValueConverter where T : struct - { +namespace mbts.ui.converters { + class EnumCaseStringConverter : IValueConverter where T : struct { public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - T t = default(T); - if (value is T) - t = (T)value; - string raw_str = t.ToString(); - return raw_str.Substring(0, 1) + new String(raw_str.Skip(1).Select(Char.ToLower).ToLArray()); + string raw_str = (value is T t ? t : default).ToString(); + return raw_str.Substring(0, 1) + new string(raw_str.Skip(1).Select(char.ToLower).ToArray()); } - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - T t = default(T); - string str = value as string; - if (str != null) - Enum.TryParse(str, true, out t); - return t; - } + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) => + value is string str && Enum.TryParse(str, true, out T result) ? result : default; } -} +} \ No newline at end of file diff --git a/src/client/spark/view/DragDrop/DragDropHelper.cs b/src/client/spark/view/DragDrop/DragDropHelper.cs index efd4ce573..3fdc56532 100644 --- a/src/client/spark/view/DragDrop/DragDropHelper.cs +++ b/src/client/spark/view/DragDrop/DragDropHelper.cs @@ -106,12 +106,20 @@ namespace mbts.ui var effect = DragDrop.DoDragDrop(_source, data, DragDropEffects.Move); } catch (Exception error) { Log.Ui.warn("Dragdrop failed: " + error.ToString()); } - await show_document(_source, _source_window, true); - _source = null; - _source_window = null; + /// Reentrancy Risk: + /// During the await period for , + /// the new window hooks up to the dragdrop events via . + /// It must be assured that the new window does not get a callback into + /// and attempt to create a second for the same instance . + /// For this reason, is set to null before is called. _source_image = null; _target = null; _dddp = null; + var src = _source; + var src_win = _source_window; + _source = null; + _source_window = null; + await show_document(src, src_win, true); } } } diff --git a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs index d25162176..d8e5d5a97 100644 --- a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs +++ b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs @@ -19,6 +19,21 @@ namespace bts.settings { var from_persist = new UserUISettings(user_list.Users.First(u => u.Login == from).Id, persist, null); var workspaces = from_persist.query(WorkspacesModel.WORKSPACE_NAMESPACE, ".*").Result; + + ConsoleEx.WriteLine("Workspace Descriptions", ConsoleColor.Cyan); + foreach(var w in workspaces) { + var r = from ws in w.value.windows + group ws by ws.owner into grouping + select new { key = grouping.Key.Replace("bts.shell.", ""), window_count = grouping.Count() }; + string desc = string.Empty; + foreach(var i in r) { + desc += $"{Environment.NewLine}\t{i.window_count} - {i.key}"; + } + ConsoleEx.Write($"{w.key}", ConsoleColor.Yellow); + ConsoleEx.WriteLine($" - {w.value.windows.Count} windows - {w.value.named_windows.Count} named windows - {desc}"); + } + ConsoleEx.WriteLine(""); + var selected_ws = ConsoleEx.prompt("Choose workspace:", workspaces.Select(w => w.key)); var to = ConsoleEx.prompt("To User", user_names); diff --git a/src/client/spark_api/Co2/Co2NativeMethods.cs b/src/client/spark_api/Co2/Co2NativeMethods.cs index f744b9963..b2ae76044 100644 --- a/src/client/spark_api/Co2/Co2NativeMethods.cs +++ b/src/client/spark_api/Co2/Co2NativeMethods.cs @@ -67,6 +67,10 @@ namespace mbts.co2 [DllImport("libspark")] internal unsafe static extern void md_consumer_get_system_md_symbols(raw_usersymbol_callback cb); + + [DllImport("libspark")] + internal unsafe static extern void dump_co2_memory_to_disk(IntPtr consumer, string path); + // // Relay control diff --git a/src/client/spark_api/Co2/MDConsumer.cs b/src/client/spark_api/Co2/MDConsumer.cs index 439d65af0..3d92f6e69 100644 --- a/src/client/spark_api/Co2/MDConsumer.cs +++ b/src/client/spark_api/Co2/MDConsumer.cs @@ -37,7 +37,10 @@ namespace mbts.co2 unsafe void init() { _raw_sec_cb = (key, buf, len, handle) => { var security = Co2NativeMethods.deserialize(buf, len); - var next = new SecurityAndHandle() { security = security, handle = new MDConsumerHandle(handle) }; + var next = new SecurityAndHandle() { + security = security, + handle = new MDConsumerHandle(_consumer, security, handle) + }; _securities.Add(next); _on_security?.Invoke(new List(1) { next }); }; @@ -67,7 +70,7 @@ namespace mbts.co2 public MDConsumerHandle try_get_handle(security_key key) { Co2NativeMethods.BlitPointerTuple raw; if (Co2NativeMethods.md_consumer_get_handle(_consumer, key, out raw)) { - return new MDConsumerHandle(raw); + return new MDConsumerHandle(this._consumer, null, raw); } return null; } @@ -77,7 +80,10 @@ namespace mbts.co2 List result = new List(); Co2NativeMethods.raw_security_callback cb = (key, buf, len, handle) => { var security = Co2NativeMethods.deserialize(buf, len); - result.Add(new SecurityAndHandle() { security = new Security(security), handle = new MDConsumerHandle(handle) }); + result.Add( + new SecurityAndHandle() { + security = new Security(security), + handle = new MDConsumerHandle(_consumer, security, handle) }); }; Co2NativeMethods.md_consumer_walk_security_list(_consumer, cb); return result; diff --git a/src/client/spark_api/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs index 4a12f2f99..7b03bdaee 100644 --- a/src/client/spark_api/Co2/MDConsumerHandle.cs +++ b/src/client/spark_api/Co2/MDConsumerHandle.cs @@ -156,13 +156,22 @@ namespace mbts.co2 { // // Internal - internal MDConsumerHandle(Co2NativeMethods.BlitPointerTuple tuple) { + internal MDConsumerHandle( + IntPtr consumer, + Security security, + Co2NativeMethods.BlitPointerTuple tuple) { _header = (ColdHeader*)tuple.cold_header.ToPointer(); _cold = (ColdEntry*)tuple.cold_data.ToPointer(); if (has_depth) { _hot_depth = (HotDepthEntry*)tuple.hot.ToPointer(); - Log.assert(_hot_depth->key == _cold->security_key); + if (_hot_depth->key != _cold->security_key) { + var temp_path = Path.Combine(Path.GetTempPath(), "btsshm"); + Co2NativeMethods.dump_co2_memory_to_disk(consumer, temp_path); + Log.assert( + _hot_depth->key == _cold->security_key, + $"Please attach the contents of '${temp_path}' to the bug report you are about to file. security:{security?.Id} cold:{_cold->security_key} hot:{_hot->key}"); + } } else { _hot = (HotEntry*)tuple.hot.ToPointer(); diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 593edf9f7..6fae3ce12 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -67,8 +67,8 @@ namespace bts.api.core { while (true) { var response = await check_stream_access(method_id, qualifier); if (response.success) { - if (response.value.Authorized) { - // success. Break loop and subscribe + if (response.value.Authorized) { + // success. Break loop and subscribe break; } else { @@ -94,7 +94,8 @@ namespace bts.api.core { // Authorized. Stream events unsubscribe_temp_sub(); return SubscribeNative(method, qualifier, parser, converter, observer); - }); + }); + Log.QBus.diag($"Subscribing for sub: '{method}/{qualifier}'"); return result; } private Task> check_stream_access(int method_id, string qualifier) { @@ -145,6 +146,7 @@ namespace bts.api.core { }; var subscription = ApiNativeMethods.api_client_subscribe(_client, method, qualifier, cb, IntPtr.Zero); return FinalizeableAnonymousDisposable.Create((disposing) => { + Log.QBus.diag($"Unsubscribing for sub: '{method}/{qualifier}'"); ApiNativeMethods.api_client_unsubscribe(_client, subscription); subscription = IntPtr.Zero; GC.KeepAlive(cb); diff --git a/src/client/spark_api/utils/MathUtils.cs b/src/client/spark_api/utils/MathUtils.cs index 34b80caf2..7c2ebfaf4 100644 --- a/src/client/spark_api/utils/MathUtils.cs +++ b/src/client/spark_api/utils/MathUtils.cs @@ -53,6 +53,10 @@ namespace bts.utils { for (int i = 1; i < num2; i++) if ((num1 * i) % num2 == 0) return i * num1; return num1 * num2; } + + public static bool is_within_range(this double value, double min, double max) => + value >= min && value <= max; + public static int within_range(int min, int max, int value) { if (value < min) return min; if (value > max) return max; diff --git a/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs b/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs index 6f7d59c46..d2f85f273 100644 --- a/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs @@ -30,11 +30,8 @@ namespace System.Collections.Generic { public static IEnumerable OfTypeSafe(this IEnumerable source) => source == null ? Enumerable.Empty() : source.OfType(); - public static T[] ToLArray(this IEnumerable enumerable) => - enumerable.ToList().ToArray(); - public static TAccumulate AggregateWhile(this IEnumerable source, TAccumulate seed, Func aggregate, Func predicate) => - AggregateWhile(source, seed, aggregate, predicate, (curr, el, next) => curr); + AggregateWhile(source, seed, aggregate, predicate, (curr, el, next) => curr); public static TAccumulate AggregateWhile(this IEnumerable source, TAccumulate seed, Func aggregate, Func predicate, TAccumulate early_break_rv) => AggregateWhile(source, seed, aggregate, predicate, (curr, el, next) => early_break_rv); diff --git a/src/client/spark_test/System/AlgoDefinitionTests.cs b/src/client/spark_test/System/AlgoDefinitionTests.cs new file mode 100644 index 000000000..3268a5a72 --- /dev/null +++ b/src/client/spark_test/System/AlgoDefinitionTests.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; +using bts.api.orderman.algo; + +namespace bts.tests { + [TestGroup(TestType = TestType.System)] + public class AlgoDefinitionTests : IDisposable { + List _resources; + ServiceContext _context; + //OrderService _order_service; + AdminService _admin_service; + AlgoDefinitionService _algo_definition_service; + IEnumerable _non_deleted_defs; + Random _rng = new Random(); + + public AlgoDefinitionTests() { + _context = new ServiceContext(); + //_order_service = _context.locate(); + _admin_service = _context.locate(); + _algo_definition_service = _context.locate(); + + _resources = new List { + _context, + _admin_service, + _algo_definition_service, + _algo_definition_service.subscribei_algo_definitions().Subscribe(defs => _non_deleted_defs = defs.all.Where( x => x.Metadata.IsActive)) + }; + + var auth = _context.login("bts", ""); + auth.Wait(3000); + } + + [Test(Timeout = 25)] + public async Task test_crud_algo_definitions() { + var created_algo_records = new List(); + var watch = new System.Diagnostics.Stopwatch(); + watch.Start(); + var user_data = await AdminUtilities.get_user_data(_admin_service, "bts"); + int num_created = 0; + if (user_data.HasValue) { + // create 100 algo defs + while (num_created < 100) { + var result = await _algo_definition_service.save_algo_definition_async( + new AlgoDefinitionUpdateRequest { + UserId = user_data.Value.Id, + Key = 0, + Algo = generate_random_algo_definition() + } + ); + Assert.IsTrue(result.value.Success, "There was a problem creating an algo defintion"); + created_algo_records.Add(result.value.Record); + num_created++; + } + + // update the 100 we just created algo defs + foreach(var r in created_algo_records) { + var def = r.Algo; + def.Name += " modified"; + await _algo_definition_service.save_algo_definition_async( + new AlgoDefinitionUpdateRequest { + UserId = user_data.Value.Id, + Key = r.Key, + Algo = def + } + ); + } + + // delete all non-deleted algo defs + Assert.IsTrue(_non_deleted_defs.Count() > 0, "There are no algo definitions to delete."); + foreach (var i in _non_deleted_defs.Select(x => x.Key).ToList()) { + var result = await _algo_definition_service.remove_algo_definition_async(new AlgoDefinitionRemoveRequest { Key = i }); + Assert.IsTrue(result.value.Success, "There was a problem removing an algo definition"); + } + Assert.IsTrue(_non_deleted_defs.Count() == 0, "There was a problem removing all algo definitions"); + + watch.Stop(); + Console.WriteLine($"Execution Time: {watch.ElapsedMilliseconds} ms"); + } + } + + // not quite random yet + private AlgoDefinition generate_random_algo_definition() { + return new AlgoDefinition { + Definition = new CustomOrderDefinition { + Iceberg = new IcebergOrderDefinition { + ShowQuantity = _rng.NextDouble() * 100, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } + } + }, + }, + Name = $"Test Algo Def: {generate_name(_rng, _rng.Next(4, 15))}" + }; + } + + // https://stackoverflow.com/questions/14687658/random-name-generator-in-c-sharp + public static string generate_name(Random r, int len) { + string[] consonants = { "b", "c", "d", "f", "g", "h", "j", "k", "l", "m", "l", "n", "p", "q", "r", "s", "sh", "zh", "t", "v", "w", "x" }; + string[] vowels = { "a", "e", "i", "o", "u", "ae", "y" }; + string name = ""; + name += consonants[r.Next(consonants.Length)].ToUpper(); + name += vowels[r.Next(vowels.Length)]; + int b = 2; //b tells how many times a new letter has been added. It's 2 right now because the first two letters are already in the name. + while (b < len) { + name += consonants[r.Next(consonants.Length)]; + b++; + name += vowels[r.Next(vowels.Length)]; + b++; + } + return name; + } + + public void Dispose() { + Disposable.dispose(_resources); + } + + } + +} diff --git a/src/client/spark_test/System/IcebergAlgoTests.cs b/src/client/spark_test/System/IcebergAlgoTests.cs new file mode 100644 index 000000000..fc4e073aa --- /dev/null +++ b/src/client/spark_test/System/IcebergAlgoTests.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.test; +using bts.api.orderman; +using mbts; +using bts.co2; +using bts.tests.utils; + +namespace bts.tests { + + [TestGroup(TestType = TestType.System)] + class IcebergAlgoTests : TestBase { + public IcebergAlgoTests() { } + + [Test(Timeout = 25)] + public async Task test_ib_create_and_takeout_market() { + // find a security with no market + var s = await MarketDataUtilities.get_security(_md_relay, "CL", SecurityType.Future, update => update.Direct.Asks.Count == 0 && update.Direct.Bids.Count == 0); + Assert.IsTrue(s.HasValue, "Could not find a security with no maket"); + + // create a market in the instrument + List> orders_response_list = new List>(); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, _test_account, _test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, _test_account, _test_user); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 55.00, 50)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 55.05, 50)); + List test_orders = new List(); + foreach (var i in orders_response_list) { + var iret = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == i.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == i.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(iret.Count() == 1, "This order should have been 'working'"); + test_orders.AddRange(iret); + } + + // create an IB that will cross this market + var ib_order_def = OrderDefinitionUtilities.create_iceberg_order_def(s.Value.Id, Side.Buy, _test_account, _test_user, 3); + var ib_order_result = await OrderUtilities.send_order(_order_service, ib_order_def, 55.05, 30); + var ib_filtered_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(x => x.Key == ib_order_result.value.OrderKey && x.HasState && x.State.Status == OrderStatus.Completed).Count() == 1, + rows => rows.Where(x => x.Key == ib_order_result.value.OrderKey))).result ?? Enumerable.Empty(); + var ib_child_orders = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(x => x.ParentKey == ib_order_result.value.OrderKey && x.HasState && x.State.Status == OrderStatus.Completed).Count() == 10, + rows => rows.Where(x => x.ParentKey == ib_order_result.value.OrderKey))).result ?? Enumerable.Empty(); + + Assert.IsTrue(ib_filtered_order.Count() == 1, "This IB order should have been 'Completed'"); + Assert.IsTrue(ib_child_orders.Count() == 10, "There should have been 10 completed child orders"); + + var filled_childen = (await OrderUtilities.wait_for_filtered_fills( + _order_service, + rows => rows.Where(x => ib_child_orders.Select(o => o.Key).Contains(x.OrderKey)).Count() == 10, + rows => rows.Where(x => ib_child_orders.Select(o => o.Key).Contains(x.OrderKey)))).result ?? Enumerable.Empty(); + + Assert.IsTrue(filled_childen.Count() == 10, "There should have been 10 fills"); + Assert.IsTrue(filled_childen.All(x => + TestUtils.test_price_equality(x.LastPrice, 55.05, s.Value.ContractSpec.ticksize(x.LastPrice)) && x.LastShares == 3), "All child fills should have been filled at price 55.50 with quantity 3"); + + // cleanup + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, test_orders), "Unable to cancel test orders"); + } + + [Test(Timeout = 25)] + public async Task test_ib_avg_fill() { + // find a security with no market + var s = await MarketDataUtilities.get_security(_md_relay, "CL", SecurityType.Future, update => update.Direct.Asks.Count == 0 && update.Direct.Bids.Count == 0); + Assert.IsTrue(s.HasValue, "Could not find a security with no maket"); + + // create a market in the instrument + List> orders_response_list = new List>(); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, _test_account, _test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, _test_account, _test_user); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 56.02, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 56.01, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 56.00, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 55.50, 5)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 55.01, 20)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 55.00, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.99, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.98, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.97, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.96, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.95, 1)); + List test_orders = new List(); + foreach (var i in orders_response_list) { + var iret = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == i.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == i.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(iret.Count() == 1, "This order should have been 'working'"); + test_orders.AddRange(iret); + } + + // create an IB that will cross this market + var ib_order_def = OrderDefinitionUtilities.create_iceberg_order_def(s.Value.Id, Side.Buy, _test_account, _test_user, 1); + var ib_order_result = await OrderUtilities.send_order(_order_service, ib_order_def, 56.02, 26); + var ib_filtered_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(x => x.Key == ib_order_result.value.OrderKey && x.HasState && x.State.Status == OrderStatus.Completed).Count() == 1, + rows => rows.Where(x => x.Key == ib_order_result.value.OrderKey))).result ?? Enumerable.Empty(); + var ib_child_orders = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(x => x.ParentKey == ib_order_result.value.OrderKey && x.HasState && x.State.Status == OrderStatus.Completed).Count() == 10, + rows => rows.Where(x => x.ParentKey == ib_order_result.value.OrderKey))).result ?? Enumerable.Empty(); + + Assert.IsTrue(ib_filtered_order.Count() == 1, "This IB order should have been 'Completed'"); + Assert.IsTrue(ib_filtered_order.All(x => + TestUtils.test_price_equality(x.State.AvgPrice, 55.1423, s.Value.ContractSpec.ticksize(x.State.AvgPrice))), "IB avg price should be 55.1423"); + + // cleanup + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, test_orders), "Unable to cancel test orders"); + } + + } +} diff --git a/src/client/spark_test/System/JoinAlgoTests.cs b/src/client/spark_test/System/JoinAlgoTests.cs new file mode 100644 index 000000000..859904888 --- /dev/null +++ b/src/client/spark_test/System/JoinAlgoTests.cs @@ -0,0 +1,182 @@ +using bts.api; +using bts.api.core; +using bts.api.orderman; +using bts.test; +using bts.tests.utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace bts.tests { + + [TestGroup(TestType = TestType.System)] + public class JoinAlgoTests : TestBase { + public JoinAlgoTests() { } + + [Test(Timeout = 25)] + public async Task test_join_price() { + double initial_price = 54.99; + double ask_price = 55.01; + + + // find a security with no market + var s = await MarketDataUtilities.get_security(_md_relay, "CL", SecurityType.Future, update => update.Direct.Asks.Count == 0 && update.Direct.Bids.Count == 0); + Assert.IsTrue(s.HasValue, "Could not find a security with no maket"); + + // create a market in the instrument + List> orders_response_list = new List>(); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, _test_account, _test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, _test_account, _test_user); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 55.00, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price, 1)); + List test_orders = new List(); + foreach (var i in orders_response_list) { + var iret = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == i.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == i.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(iret.Count() == 1, "This order should have been 'working'"); + test_orders.AddRange(iret); + } + + // create a join order + var join_order_def = OrderDefinitionUtilities.create_join_order_definition(s.Value.Id, Side.Buy, _test_account, _test_user, new spark.QuantityMeasure() { Absolute = 1 }); + var join_order_response = await OrderUtilities.send_order(_order_service, join_order_def, initial_price, 1); + var join_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == join_order_response.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == join_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_order.Count() == 1, "The join order should have 'working'"); + test_orders.Add(join_order.First()); + + // verify the join order's child is working at the specefied price + // note: the price doesn't actually matter in the join order + var join_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == join_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, initial_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == join_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_child_order.Count() == 1, $"The join child order should have been 'working' at {initial_price}"); + + // now we move the best bid to become the best offer + var original_bid_order = test_orders.Where(o => o.Def.Side == Side.Buy).First(); + var bid_order_response = await OrderUtilities.modify_order(_order_service, original_bid_order, ask_price); + var modified_bid_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey && o.HasState && + TestUtils.test_price_equality(o.State.Price, ask_price, s.Value.ContractSpec.ticksize(o.State.Price))).Count() == 1, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(modified_bid_order.Count() == 1, "The working bid should have become the best offer"); + + // and we finally verify that the child order has joined the market at the appropriate price + join_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == join_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, ask_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == join_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_child_order.Count() == 1, $"The join child order should now have been 'working' at {ask_price}"); + test_orders.Add(join_child_order.First()); + + // cleanup + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, test_orders), "Unable to cancel test orders"); + + } + + [Test(Timeout = 25)] + public async Task test_join_qty_threshold() { + double initial_price = 54.99; + double ask_price = 55.01; + uint qty_threshold = 15; + + + // find a security with no market + var s = await MarketDataUtilities.get_security(_md_relay, "CL", SecurityType.Future, update => update.Direct.Asks.Count == 0 && update.Direct.Bids.Count == 0); + Assert.IsTrue(s.HasValue, "Could not find a security with no maket"); + + // create a market in the instrument + List> orders_response_list = new List>(); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, _test_account, _test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, _test_account, _test_user); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 55.00, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price, 1)); + List test_orders = new List(); + foreach (var i in orders_response_list) { + var iret = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == i.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == i.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(iret.Count() == 1, "This order should have been 'working'"); + test_orders.AddRange(iret); + } + + // create a join order + var join_order_def = OrderDefinitionUtilities.create_join_order_definition(s.Value.Id, Side.Buy, _test_account, _test_user, new spark.QuantityMeasure() { Absolute = qty_threshold }); + var join_order_response = await OrderUtilities.send_order(_order_service, join_order_def, initial_price, 1); + var join_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == join_order_response.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == join_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_order.Count() == 1, "The join order should have 'working'"); + test_orders.Add(join_order.First()); + + // verify the join order's child is working at the specefied price + // note: the price doesn't actually matter in the join order + var join_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == join_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, initial_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == join_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_child_order.Count() == 1, $"The join child order should have been 'working' at {initial_price}"); + + // now we move the best bid to become the best offer + var top_bid_order = test_orders.Where(o => o.Def.Side == Side.Buy).First(); + var bid_order_response = await OrderUtilities.modify_order(_order_service, top_bid_order, ask_price); + var modified_bid_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey && o.HasState && + TestUtils.test_price_equality(o.State.Price, ask_price, s.Value.ContractSpec.ticksize(o.State.Price))).Count() == 1, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(modified_bid_order.Count() == 1, "The working bid should have become the best offer"); + + // verify the join order's child is *still* working at the initial price + // b/c the quantity threshold has not yet been met + join_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == join_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, initial_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == join_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_child_order.Count() == 1, $"The join child order should still have been 'working' at {initial_price}"); + + // now we modify our top bid's volume to meet the join's threshold + bid_order_response = await OrderUtilities.modify_order(_order_service, modified_bid_order.First(), qty_threshold); + modified_bid_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey && o.HasState && o.State.Quantity == qty_threshold).Count() == 1, + rows => rows.Where(o => o.Key == bid_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(modified_bid_order.Count() == 1, $"The working bid should have its quantity modified to {qty_threshold}"); + + // now that the qty threshold has been met, verify that the child order has joined the market at the appropriate price + join_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == join_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, ask_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == join_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(join_child_order.Count() == 1, $"The join child order should now have been 'working' at {ask_price}"); + test_orders.Add(join_child_order.First()); + + // cleanup + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, test_orders), "Unable to cancel test orders"); + } + + + } + +} diff --git a/src/client/spark_test/System/LeanAlgoTests.cs b/src/client/spark_test/System/LeanAlgoTests.cs new file mode 100644 index 000000000..2f39c7331 --- /dev/null +++ b/src/client/spark_test/System/LeanAlgoTests.cs @@ -0,0 +1,144 @@ +using bts.api; +using bts.api.core; +using bts.api.orderman; +using bts.test; +using bts.tests.utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace bts.tests { + + [TestGroup(TestType = TestType.System)] + public class LeanAlgoTests : TestBase { + + public LeanAlgoTests() { } + + [Test(Timeout = 25)] + public async Task test_lean_price() { + double initial_price = 54.98; + double ask_price_1 = 55.00; + double ask_price_2 = 55.01; + uint ask_size = 10; + uint lean_order_size = 30; + uint cross_threshold = ask_size - 1; + + // find a security with no market + var s = await MarketDataUtilities.get_security(_md_relay, "CL", SecurityType.Future, update => update.Direct.Asks.Count == 0 && update.Direct.Bids.Count == 0); + Assert.IsTrue(s.HasValue, "Could not find a security with no maket"); + + // create a market in the instrument + List> orders_response_list = new List>(); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, _test_account, _test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, _test_account, _test_user); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 54.99, 1)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price_1, ask_size)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price_2, ask_size)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price_2 + 0.01, ask_size)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, ask_price_2 + 0.02, ask_size)); + List test_orders = new List(); + foreach (var i in orders_response_list) { + var iret = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == i.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == i.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(iret.Count() == 1, "This order should have been 'working'"); + test_orders.AddRange(iret); + } + + // create a lean order, 2 tick chase (default) + var lean_order_def = OrderDefinitionUtilities.create_lean_order_definition(s.Value.Id, Side.Buy, _test_account, _test_user, new spark.QuantityMeasure() { Absolute = cross_threshold }); + var lean_order_response = await OrderUtilities.send_order(_order_service, lean_order_def, initial_price, lean_order_size); + var lean_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == lean_order_response.value.OrderKey && o.HasState && o.State.Status == OrderStatus.Working).Count() == 1, + rows => rows.Where(o => o.Key == lean_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(lean_order.Count() == 1, "The lean order should have 'working'"); + test_orders.Add(lean_order.First()); + + // verify the lean order's child is working at the specified price + // note: the price doesn't actually matter in the lean order + var lean_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key && + o.HasState && (o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, initial_price, s.Value.ContractSpec.ticksize(o.State.Price)))).Count() == 1, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(lean_child_order.Count() == 1, $"The lean child order should have been 'working' at {initial_price}"); + + // now we modify the opposite inside market qty to breach the lean threshold + var target_ask_order = test_orders.Where(o => o.Def.Side == Side.Sell && + TestUtils.test_price_equality(o.State.Price, ask_price_1, s.Value.ContractSpec.ticksize(o.State.Price))).First(); + var ask_order_response = await OrderUtilities.modify_order(_order_service, target_ask_order, cross_threshold); + var modified_ask_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == ask_order_response.value.OrderKey && o.HasState && + o.State.Quantity == cross_threshold).Count() == 1, + rows => rows.Where(o => o.Key == ask_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(modified_ask_order.Count() == 1, "The opposite inside market should have been adjusted to the Lean's cross threshold"); + + // verify that the child order has leaned into the market at the appropriate price and been parially filled appropriately + // this is the initial trigger payup + lean_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key && + o.HasState && ( + o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, ask_price_1, s.Value.ContractSpec.ticksize(o.State.Price)) && + o.State.FilledQuantity == 9) + ).Count() == 1, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(lean_child_order.Count() == 1, $"Initial trigger: The lean child order should now have been 'working' at {ask_price_1}"); + test_orders.Add(lean_child_order.First()); + + // now we modify the opposite inside market qty again to start checking that the case is working + target_ask_order = test_orders.Where(o => o.Def.Side == Side.Sell && + TestUtils.test_price_equality(o.State.Price, ask_price_2, s.Value.ContractSpec.ticksize(o.State.Price))).First(); + ask_order_response = await OrderUtilities.modify_order(_order_service, target_ask_order, cross_threshold); + modified_ask_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.Key == ask_order_response.value.OrderKey && o.HasState && + o.State.Quantity == cross_threshold).Count() == 1, + rows => rows.Where(o => o.Key == ask_order_response.value.OrderKey))).result ?? Enumerable.Empty(); + Assert.IsTrue(modified_ask_order.Count() == 1, "The opposite inside market should have been adjusted to the Lean's cross threshold"); + + // verify that the child order has chased and that it's filled quantity has increased + lean_child_order = (await OrderUtilities.wait_for_filtered_orders( + _order_service, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key && + o.HasState && ( + o.State.Status == OrderStatus.Working && + TestUtils.test_price_equality(o.State.Price, ask_price_2, s.Value.ContractSpec.ticksize(o.State.Price)) && + o.State.FilledQuantity == 9) + ).Count() == 1, + rows => rows.Where(o => o.ParentKey == lean_order.First().Key))).result ?? Enumerable.Empty(); + Assert.IsTrue(lean_child_order.Count() == 1, $"First Chase: The lean child order should now have been 'working' at {ask_price_1}"); + test_orders.Add(lean_child_order.First()); + + // TODO: + // verify the parent order also reflects the increase filled quantity from the child order + + // TODO: + // instigate another chase + + // TODO: + // verify parent order again reflects + + // TODO: + // instigate another chanse + + // TODO: + // verify we are *not* chasing any longer, verify appropriate order statuses + + + + // cleanup + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, test_orders), "Unable to cancel test orders"); + + } + + } +} diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs index c5f6807cc..0a3357561 100644 --- a/src/client/spark_test/System/LimitsTests.cs +++ b/src/client/spark_test/System/LimitsTests.cs @@ -13,6 +13,7 @@ using bts.api.orderman; using mbts; using mbts.tests; using bts.co2; +using bts.tests.utils; namespace bts.tests { @@ -43,6 +44,7 @@ namespace bts.tests Disposable.dispose(ref _order_service); Disposable.dispose(ref _admin_service); Disposable.dispose(ref _context); + Disposable.dispose(ref _order_subscription); } async Task> all_futures(string symbol) { @@ -78,28 +80,31 @@ namespace bts.tests return securities; } - [Test(Timeout = 30)] + [Test(Timeout = 300)] public async Task test_position_limits() { + bool system_ready = await TestUtils.test_for_system_ready(_context, TimeSpan.FromMinutes(5)); + Assert.IsTrue(system_ready, "System is not ready"); + string test_symbol = "CL"; var test_user = ( name: "bts", id: 0u ); var test_account = ( name: "ACC A", id: 0u ); - BTSAccountImmutable? account_data = await AdminUtilities.get_account_data(_admin_service, test_account.name); + var account_task = AdminUtilities.get_account_data(_admin_service, test_account.name); + BTSAccountImmutable? account_data = await TestUtils.await_with_timeout(account_task, TimeSpan.FromMinutes(0.5)); + Assert.IsTrue(account_data.HasValue); test_account.id = account_data.Value.Id; - var user_data = await AdminUtilities.get_user_data(_admin_service, test_user.name); Assert.IsTrue(user_data.HasValue); test_user.id = user_data.Value.Id; - var clip_set_success = await AdminUtilities.set_clip_limit(_admin_service, 10000, account_data, test_symbol); Assert.IsTrue(clip_set_success, "Failed to set clip limit "); var all_securities = await all_futures(test_symbol); List security_list = all_securities.ToList(); - Assert.IsTrue(all_securities.Count() >= 2); + Assert.IsTrue(all_securities.Count() >= 2, "At least two securities are needed"); SecurityImmutable first_sec = security_list[0]; SecurityImmutable second_sec = security_list[1]; @@ -109,10 +114,11 @@ namespace bts.tests var second_order_def = create_order_def(second_sec.Id, Side.Buy, test_account, test_user); - Result no_limit_order_result = await send_order(first_order_def, 5, 1); + Result no_limit_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 1); IEnumerable no_limit_filtered_orders = await get_filtered_orders(x => x.Key == no_limit_order_result.value.OrderKey); + Assert.IsNotNull(no_limit_filtered_orders, "No orders retrieved"); Assert.IsTrue(no_limit_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "'Absent Limit' Order is not 'Rejected by Spark'"); bool position_set_success = await AdminUtilities.set_position_limit(_admin_service, test_account.name, test_symbol, 60, 120); @@ -121,11 +127,11 @@ namespace bts.tests List> orders_response_list = new List>(); for(int i = 0; i <3; i++){ - orders_response_list.Add(await send_order(first_order_def, 5, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, first_order_def, 5, 10)); } for(int i = 0; i <3; i++){ - orders_response_list.Add(await send_order(second_order_def, 5, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, second_order_def, 5, 10)); } foreach(var i in orders_response_list){ @@ -133,24 +139,24 @@ namespace bts.tests Assert.IsTrue(iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); } - var fail_order_result = await send_order(first_order_def, 5, 1); + var fail_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 1); var fail_order_filtered_orders = await get_filtered_orders(x => x.Key == fail_order_result.value.OrderKey); Assert.IsTrue(fail_order_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); bool position_increase_success = await AdminUtilities.set_position_limit(_admin_service, test_account.name, test_symbol, 70, 120); Assert.IsTrue(position_increase_success); - var increased_order_result = await send_order(first_order_def, 5, 10); + var increased_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 10); var increased_order_filtered_orders = await get_filtered_orders(x => x.Key == increased_order_result.value.OrderKey); Assert.IsTrue(increased_order_filtered_orders.First().State.Status == OrderStatus.Working, "This order should have been 'Working'"); - var second_fail_order_result = await send_order(first_order_def, 5, 10); + var second_fail_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 10); var second_fail_filtered_orders = await get_filtered_orders(x => x.Key == second_fail_order_result.value.OrderKey); Assert.IsTrue(second_fail_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); /* Test Short Position Limit */ - Assert.IsTrue(await cancel_orders(), "Unable to cancel orders"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); await AdminUtilities.remove_position_limit(_admin_service, test_account.name, test_symbol); @@ -162,7 +168,7 @@ namespace bts.tests uint short_no_limit_order_key; - Result short_no_limit_order_result = await send_order(first_short_order_def, 50000, 7); + Result short_no_limit_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 7); short_no_limit_order_key = short_no_limit_order_result.value.OrderKey; IEnumerable short_no_limit_filtered_orders = await get_filtered_orders(x => x.Key == short_no_limit_order_key); @@ -175,11 +181,11 @@ namespace bts.tests List> short_orders_response_list = new List>(); for(int i = 0; i <3; i++){ - short_orders_response_list.Add(await send_order(first_short_order_def, 50000, 10)); + short_orders_response_list.Add(await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10)); } for(int i = 0; i <3; i++){ - short_orders_response_list.Add(await send_order(second_short_order_def, 50000, 10)); + short_orders_response_list.Add(await OrderUtilities.send_order(_order_service, second_short_order_def, 50000, 10)); } foreach(var i in short_orders_response_list){ @@ -187,22 +193,22 @@ namespace bts.tests Assert.IsTrue(iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); } - var short_fail_order_result = await send_order(first_short_order_def, 50000, 1); + var short_fail_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 1); var short_fail_order_filtered_orders = await get_filtered_orders(x => x.Key == short_fail_order_result.value.OrderKey); Assert.IsTrue(short_fail_order_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); bool short_position_increase_success = await AdminUtilities.set_position_limit(_admin_service, test_account.name, test_symbol, 120, 70); Assert.IsTrue(short_position_increase_success); - var short_increased_order_result = await send_order(first_short_order_def, 50000, 10); + var short_increased_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10); var short_increased_order_filtered_orders = await get_filtered_orders(x => x.Key == short_increased_order_result.value.OrderKey); Assert.IsTrue(short_increased_order_filtered_orders.First().State.Status == OrderStatus.Working, "This order should have been 'Working'"); - var short_second_fail_order_result = await send_order(first_short_order_def, 50000, 10); + var short_second_fail_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10); var short_second_fail_filtered_orders = await get_filtered_orders(x => x.Key == short_second_fail_order_result.value.OrderKey); Assert.IsTrue(short_second_fail_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); - Assert.IsTrue(await cancel_orders(), "Unable to cancel orders"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); } @@ -286,6 +292,7 @@ namespace bts.tests } Assert.IsTrue(success, "Failed to restore Limit"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); } @@ -305,40 +312,12 @@ namespace bts.tests } await Task.Delay(100); } - while(it < 100 &&(_orders == null || current_count < count)); + while(it < 100 && (_orders == null || current_count < count)); return null; } - - public async Task> send_order(OrderDefinition order_def, double price, uint size){ - return await _order_service.create_order_async(new Create() { - NewOrder = order_def, - Price = price, - Quantity = size - }); - } - - public async Task cancel_orders(uint key = 0){ - if (key > 0) { - Result resp = await _order_service.cancel_order_async(new Cancel() { OrderKey = key }); - return resp.success; - } - else { - bool suc = true; - var working_orders = await get_filtered_orders(x => x.State.Status == OrderStatus.Working); - if(working_orders != null){ - foreach (var o in working_orders){ - Result resp = await _order_service.cancel_order_async(new Cancel() { OrderKey = o.Key }); - suc &= resp.success; - } - return suc; - } - return true;// there are no working orders... so true enough - } - } - public OrderDefinition create_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user){ return new OrderDefinition { SecurityKey = security_id, @@ -358,218 +337,4 @@ namespace bts.tests } - public class AdminUtilities { - - public static async Task get_account_data (AdminService admin_service, string account_name) - { - Update update = await admin_service.subscribei_admin_data().FirstAsync(); - - foreach (var acc in update.all.First().Accounts) { - if(acc.Name == account_name) { - return acc; - } - } - return null; - } - - public static async Task get_user_data (AdminService admin_service, string user_name) - { - Update update = await admin_service.subscribei_admin_data().FirstAsync(); - - foreach (var usr in update.all.First().Users) { - if(usr.Name == user_name) { - return usr; - } - } - return null; - } - - public static AccountSecurityClipLimitUnitImmutable? get_clip_limit_row(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - IEnumerable clip_limit_rows = account_data.Value.SecurityClipLimits.Limit.Where( - r => r.Security.SecuritySymbol == symbol - && r.Security.Exchange == venue - && r.Security.SecurityType == security_type); - return clip_limit_rows.Any() ? clip_limit_rows.First() : (AccountSecurityClipLimitUnitImmutable?) null; - } - - public static uint? get_clip_limit(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var row = get_clip_limit_row(account_data,symbol,security_type,venue); - return row.HasValue ? row.Value.ClipSize : (uint?) null; - } - - public static async Task get_clip_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return get_clip_limit(account_data, symbol, security_type, venue); - } - - public static async Task set_clip_limit(AdminService admin_service, uint clip_value, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return await set_clip_limit(admin_service, clip_value,account_data, symbol,security_type, venue); - } - - public static async Task set_clip_limit(AdminService admin_service, uint clip_value, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - - AccountSecurityClipLimitUnitImmutable? origin_clip_limit_row = get_clip_limit_row(account_data,symbol,security_type,venue); - AccountSecurityClipLimitUnitImmutable new_clip_limit_row; - - List clip_limits_list = account_data.Value.SecurityClipLimits.Limit.ToList(); - - if(origin_clip_limit_row.HasValue) { - clip_limits_list.Remove(origin_clip_limit_row.Value); - } - - new_clip_limit_row = (AccountSecurityClipLimitUnitImmutable) new AccountSecurityClipLimitUnit { - Security = new SecurityScope(){ SecuritySymbol = symbol, Exchange = venue, SecurityType = security_type }, - ClipSize = clip_value - }; - - clip_limits_list.Add(new_clip_limit_row); - - AccountSecurityClipLimits temp_scl = new AccountSecurityClipLimits(); - temp_scl.Limit.AddRange(clip_limits_list.Select(x => x.CloneToMutable())); - - var new_account_data = account_data.Value.with(security_clip_limits: temp_scl); - - var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { - CompleteData = new_account_data.CloneToMutable() - }); - - return update_ret.success; - } - - public static async Task clear_all_limits(AdminService admin_service, string account_name) { - var account_data = await get_account_data(admin_service, account_name); - return await clear_all_limits(admin_service, account_data); - } - - public static async Task clear_all_limits(AdminService admin_service, BTSAccountImmutable? account_data) { - var new_account_data = account_data.Value.with(security_clip_limits: new AccountSecurityClipLimits(), product_position_limits: new List()); - - var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { - CompleteData = new_account_data.CloneToMutable() - }); - - return update_ret.success; - } - - - public static async Task remove_clip_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return await remove_clip_limit(admin_service, account_data, symbol, security_type, venue); - } - - public static async Task remove_clip_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - - AccountSecurityClipLimitUnitImmutable? origin_clip_limit_row = get_clip_limit_row(account_data,symbol,security_type,venue); - List clip_limits_list = account_data.Value.SecurityClipLimits.Limit.ToList(); - - if(origin_clip_limit_row.HasValue) { - clip_limits_list.Remove(origin_clip_limit_row.Value); - AccountSecurityClipLimits temp_scl = new AccountSecurityClipLimits(); - temp_scl.Limit.AddRange(clip_limits_list.Select(x => x.CloneToMutable())); - var new_account_data = account_data.Value.with(security_clip_limits: temp_scl); - - var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { - CompleteData = new_account_data.CloneToMutable() - }); - - return update_ret.success; - } - else - { - return false; - } - } - - - public static async Task get_position_limit_row(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return get_position_limit_row(account_data, symbol, security_type, venue); - } - - public static AccountProductPositionLimitUnitImmutable? get_position_limit_row(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - IEnumerable limit_rows = account_data.Value.ProductPositionLimits.Where( - r => r.Product.SecuritySymbol == symbol - && r.Product.Exchange == venue - && r.Product.SecurityType == security_type); - return limit_rows.Any() ? limit_rows.First() : (AccountProductPositionLimitUnitImmutable?) null; - - } - - public static async Task remove_position_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return await remove_position_limit(admin_service, account_data, symbol, security_type, venue); - } - - public static async Task remove_position_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - - AccountProductPositionLimitUnitImmutable? origin_limit_row = get_position_limit_row(account_data,symbol,security_type,venue); - List limits_list = account_data.Value.ProductPositionLimits.ToList(); - - if(origin_limit_row.HasValue) { - limits_list.Remove(origin_limit_row.Value); - List temp_plu = new List(); - temp_plu.AddRange(limits_list.Select(x => x.CloneToMutable())); - var new_account_data = account_data.Value.with(product_position_limits: temp_plu); - - var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { - CompleteData = new_account_data.CloneToMutable() - }); - - return update_ret.success; - } - else - { - return false; - } - } - - public static async Task set_position_limit(AdminService admin_service, string account_name, string symbol, uint long_limit, uint short_limit, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - var account_data = await get_account_data(admin_service, account_name); - return await set_position_limit(admin_service, account_data, symbol, long_limit, short_limit, security_type, venue); - } - - public static async Task set_position_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, uint long_limit, uint short_limit, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { - - AccountProductPositionLimitUnitImmutable? limit_row = get_position_limit_row(account_data,symbol,security_type,venue); - List limits_list = account_data.Value.ProductPositionLimits.ToList(); - - if(limit_row.HasValue) { - // update the row - limits_list.Remove(limit_row.Value); - limit_row = limit_row.Value.with(long_position_limit: long_limit, short_position_limit: short_limit); - } - else { - // create a new row - AccountProductPositionLimitUnit acplu = new AccountProductPositionLimitUnit(); - acplu.LongPositionLimit = long_limit; - acplu.ShortPositionLimit = short_limit; - acplu.Product = new ProductScope { - SecuritySymbol = symbol, - SecurityType = security_type, - Exchange = venue - }; - - limit_row = acplu; - } - - limits_list.Add(limit_row.Value); - - List temp_plu = new List(); - temp_plu.AddRange(limits_list.Select(x => x.CloneToMutable())); - - var new_account_data = account_data.Value.with(product_position_limits: temp_plu); - - var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { - CompleteData = new_account_data.CloneToMutable() - }); - - return update_ret.success; - } - - - } - - - } diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs new file mode 100644 index 000000000..10a8a42d5 --- /dev/null +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; +using bts.tests.utils; +using bts.api.synthetic; +using bts.spark; + +namespace bts.tests +{ + [TestGroup(TestType = TestType.System)] + public class SpreaderTests : IDisposable { + ServiceContext _context; + OrderService _order_service; + AdminService _admin_service; + MarketDataRelay _md_relay; + SyntheticSecurityService _synthetic_service; + IDisposable _order_subscription; + Update _orders; + public SpreaderTests (){ + _context = new ServiceContext(); + + _order_service = _context.locate(); + _admin_service = _context.locate(); + _md_relay = _context.locate(); + _synthetic_service = _context.locate(); + + var auth = _context.login("bts",""); + auth.Wait(3000); + + _order_subscription = _order_service.subscribei_orders().Subscribe(ords => + { + _orders = ords; + }); + } + + public void Dispose() { + Disposable.dispose(ref _order_service); + Disposable.dispose(ref _admin_service); + Disposable.dispose(ref _context); + Disposable.dispose(ref _order_subscription); + } + + [Test(Timeout = 30)] + public async Task spreader_simple_sanity() { + bool system_ready = await TestUtils.test_for_system_ready(_context, TimeSpan.FromMinutes(5)); + Assert.IsTrue(system_ready, "System is not ready"); + + string test_symbol = "SI";// don't use ES, the prices will be rounded to the same number and the result will be off + var test_user = (name: "bts", id: 1u); + var test_account = (name: "ACC A", id: 1u); + + (SecurityImmutable s1, SecurityImmutable s2) test_securities = await SpreaderUtilities.get_securities_for_common_setup_one(_md_relay, test_symbol); + + var setup_product = await SpreaderUtilities.common_setup_one(_order_service, _synthetic_service, test_securities, test_account, test_user); + + var order1_def = OrderDefinitionUtilities.create_spreader_order_def( + setup_product.synthetic.security, + Side.Buy, + setup_product.synthetic.strategy, + test_account, + test_user + ); + + var spreader_order1_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); + Assert.IsTrue(spreader_order1_response.success, "Failed to send first spreader order"); + + var (spreader_order_is_working, working_spreader_order1) = await verify_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order_is_working, "Spreader order is not Working"); + + var (quoting_order_is_working, working_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order.Value.State.Price == 18.6, "Quoting order has the wrong price"); + + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order1.Value}), "Failed to cancel order"); + + var (quoting_order_is_canceled, canceled_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order_is_canceled, "Quoting order may not have been canceled"); + + // Spreader Order 2 + var spreader_order2_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); + Assert.IsTrue(spreader_order2_response.success, "Failed to send spreader order 2"); + + var (spreader_order2_is_working, working_spreader_order2) = await verify_order_status(spreader_order2_response.value.OrderKey, OrderStatus.Working); + + Assert.IsTrue(spreader_order2_is_working, "Spreader order 2 is not 'Working'"); + + var spreader_order2_change_response = await OrderUtilities.modify_order(_order_service, working_spreader_order2.Value, -0.6); + Assert.IsTrue(spreader_order2_change_response.success, "failed to modify spreader order"); + + Assert.IsTrue(await verify_order_price(spreader_order2_response.value.OrderKey, -0.6), "Failed to change price of spreader order"); + + // verify quoting order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.9), "Quoting order incorrect or not found"); + + //fill spreader order + var spreader_order2_fill_change_response = await OrderUtilities.modify_order(_order_service, working_spreader_order2.Value, -0.2); + Assert.IsTrue(spreader_order2_fill_change_response.success, "failed to modify spreader order"); + + Assert.IsTrue(await verify_order_price(spreader_order2_response.value.OrderKey, -0.2), "Failed to change price of spreader order"); + + // verify quoting order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.5), "Quoting order incorrect or not found"); + + // verify Hedging order price + Assert.IsTrue(await verify_child_order_price(spreader_order2_response.value.OrderKey, 18.3), "Hedging order incorrect or not found"); + + } + + private async Task<(Boolean, OrderRecordImmutable?)> verify_child_order_status(uint parent_order_key, OrderStatus expected_status) { + var order = await get_order(ordi => ordi.ParentKey == parent_order_key && ordi.State.Status == expected_status); + return (order.HasValue && order.Value.State.Status == expected_status, order); + } + private async Task<(Boolean, OrderRecordImmutable?)> verify_order_status(uint order_key, OrderStatus expected_status) { + var order = await get_order(ordi => ordi.Key == order_key); + return (order.HasValue && order.Value.State.Status == expected_status, order); + } + + private async Task verify_order_price(uint order_key, double expected_price, double precision = 10) { + var order = await get_order(ordi => ordi.Key == order_key && Math.Truncate(ordi.State.Price * precision) == precision * expected_price); + return order.HasValue && (Math.Truncate(order.Value.State.Price * precision) == precision * expected_price); + } + + private async Task verify_child_order_price(uint parent_order_key, double expected_price, double precision = 10.0) + { + var order = await get_order(ordi => ordi.ParentKey == parent_order_key && Math.Truncate(ordi.State.Price * precision) == precision * expected_price); + return order.HasValue && (Math.Truncate(order.Value.State.Price * precision) == precision * expected_price); + } + + private async Task get_order(Func predicate) + { + var orders = await OrderUtilities.wait_for_filtered_orders(_order_service, + o => o.Where(predicate).Count() > 0, + ord => ord.Where(predicate), + TimeSpan.FromSeconds(30)); + return orders.result.TryFirst(); + } + + + } +} \ No newline at end of file diff --git a/src/client/spark_test/System/TestBase.cs b/src/client/spark_test/System/TestBase.cs new file mode 100644 index 000000000..dad725590 --- /dev/null +++ b/src/client/spark_test/System/TestBase.cs @@ -0,0 +1,59 @@ +using bts.api.admin; +using bts.api.core; +using bts.api.orderman; +using bts.co2; +using bts.test; +using mbts; +using System; +using System.Collections.Generic; +using System.Text; + +namespace bts.tests { + public abstract class TestBase : IDisposable { + + protected (string name, uint id) _test_account = ("ACC A", 0u); + protected (string name, uint id) _test_user = ("bts", 0u); + protected ServiceContext _context; + protected AdminService _admin_service; + protected OrderService _order_service; + protected MarketDataRelay _md_relay; + protected List _resources; + + public TestBase() { + _context = new ServiceContext(); + _admin_service = _context.locate(); + _order_service = _context.locate(); + _md_relay = _context.locate(); + + _resources = new List { + _context, + _admin_service, + _order_service, + _md_relay + }; + + var auth = _context.login("bts", ""); + auth.Wait(3000); + + // get the ACC A account + var account_data = AdminUtilities.get_account_data(_admin_service, _test_account.name); + account_data.Wait(3000); + Assert.IsTrue(account_data.Result.HasValue); + _test_account.id = account_data.Result.Value.Id; + + // get the bts user + var user_data = AdminUtilities.get_user_data(_admin_service, _test_user.name); + user_data.Wait(3000); + Assert.IsTrue(user_data.Result.HasValue); + _test_user.id = user_data.Result.Value.Id; + + } + + public void Dispose() { + // seg faults on linux during this dispose, not sure why yet + if (System.Environment.OSVersion.Platform == PlatformID.Win32NT) { + Disposable.dispose(_resources); + } + } + } +} diff --git a/src/client/spark_test/Utils/AdminUtilities.cs b/src/client/spark_test/Utils/AdminUtilities.cs new file mode 100644 index 000000000..d46160b16 --- /dev/null +++ b/src/client/spark_test/Utils/AdminUtilities.cs @@ -0,0 +1,230 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; + +namespace bts.tests +{ + public class AdminUtilities { + + public static async Task get_account_data (AdminService admin_service, string account_name) + { + Update update = await admin_service.subscribei_admin_data().FirstAsync(); + + foreach (var acc in update.all.First().Accounts) { + if(acc.Name == account_name) { + return acc; + } + } + return null; + } + + public static async Task get_user_data (AdminService admin_service, string user_name) + { + Update update = await admin_service.subscribei_admin_data().FirstAsync(); + + foreach (var usr in update.all.First().Users) { + if(usr.Name == user_name) { + return usr; + } + } + return null; + } + + public static AccountSecurityClipLimitUnitImmutable? get_clip_limit_row(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + IEnumerable clip_limit_rows = account_data.Value.SecurityClipLimits.Limit.Where( + r => r.Security.SecuritySymbol == symbol + && r.Security.Exchange == venue + && r.Security.SecurityType == security_type); + return clip_limit_rows.Any() ? clip_limit_rows.First() : (AccountSecurityClipLimitUnitImmutable?) null; + } + + public static uint? get_clip_limit(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var row = get_clip_limit_row(account_data,symbol,security_type,venue); + return row.HasValue ? row.Value.ClipSize : (uint?) null; + } + + public static async Task get_clip_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return get_clip_limit(account_data, symbol, security_type, venue); + } + + public static async Task set_clip_limit(AdminService admin_service, uint clip_value, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return await set_clip_limit(admin_service, clip_value,account_data, symbol,security_type, venue); + } + + public static async Task set_clip_limit(AdminService admin_service, uint clip_value, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + + AccountSecurityClipLimitUnitImmutable? origin_clip_limit_row = get_clip_limit_row(account_data,symbol,security_type,venue); + AccountSecurityClipLimitUnitImmutable new_clip_limit_row; + + List clip_limits_list = account_data.Value.SecurityClipLimits.Limit.ToList(); + + if(origin_clip_limit_row.HasValue) { + clip_limits_list.Remove(origin_clip_limit_row.Value); + } + + new_clip_limit_row = (AccountSecurityClipLimitUnitImmutable) new AccountSecurityClipLimitUnit { + Security = new SecurityScope(){ SecuritySymbol = symbol, Exchange = venue, SecurityType = security_type }, + ClipSize = clip_value + }; + + clip_limits_list.Add(new_clip_limit_row); + + AccountSecurityClipLimits temp_scl = new AccountSecurityClipLimits(); + temp_scl.Limit.AddRange(clip_limits_list.Select(x => x.CloneToMutable())); + + var new_account_data = account_data.Value.with(security_clip_limits: temp_scl); + + var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + return update_ret.success; + } + + public static async Task clear_all_limits(AdminService admin_service, string account_name) { + var account_data = await get_account_data(admin_service, account_name); + return await clear_all_limits(admin_service, account_data); + } + + public static async Task clear_all_limits(AdminService admin_service, BTSAccountImmutable? account_data) { + var new_account_data = account_data.Value.with(security_clip_limits: new AccountSecurityClipLimits(), product_position_limits: new List()); + + var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + return update_ret.success; + } + + + public static async Task remove_clip_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return await remove_clip_limit(admin_service, account_data, symbol, security_type, venue); + } + + public static async Task remove_clip_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + + AccountSecurityClipLimitUnitImmutable? origin_clip_limit_row = get_clip_limit_row(account_data,symbol,security_type,venue); + List clip_limits_list = account_data.Value.SecurityClipLimits.Limit.ToList(); + + if(origin_clip_limit_row.HasValue) { + clip_limits_list.Remove(origin_clip_limit_row.Value); + AccountSecurityClipLimits temp_scl = new AccountSecurityClipLimits(); + temp_scl.Limit.AddRange(clip_limits_list.Select(x => x.CloneToMutable())); + var new_account_data = account_data.Value.with(security_clip_limits: temp_scl); + + var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + return update_ret.success; + } + else + { + return false; + } + } + + + public static async Task get_position_limit_row(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return get_position_limit_row(account_data, symbol, security_type, venue); + } + + public static AccountProductPositionLimitUnitImmutable? get_position_limit_row(BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + IEnumerable limit_rows = account_data.Value.ProductPositionLimits.Where( + r => r.Product.SecuritySymbol == symbol + && r.Product.Exchange == venue + && r.Product.SecurityType == security_type); + return limit_rows.Any() ? limit_rows.First() : (AccountProductPositionLimitUnitImmutable?) null; + + } + + public static async Task remove_position_limit(AdminService admin_service, string account_name, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return await remove_position_limit(admin_service, account_data, symbol, security_type, venue); + } + + public static async Task remove_position_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + + AccountProductPositionLimitUnitImmutable? origin_limit_row = get_position_limit_row(account_data,symbol,security_type,venue); + List limits_list = account_data.Value.ProductPositionLimits.ToList(); + + if(origin_limit_row.HasValue) { + limits_list.Remove(origin_limit_row.Value); + List temp_plu = new List(); + temp_plu.AddRange(limits_list.Select(x => x.CloneToMutable())); + var new_account_data = account_data.Value.with(product_position_limits: temp_plu); + + var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + return update_ret.success; + } + else + { + return false; + } + } + + public static async Task set_position_limit(AdminService admin_service, string account_name, string symbol, uint long_limit, uint short_limit, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + var account_data = await get_account_data(admin_service, account_name); + return await set_position_limit(admin_service, account_data, symbol, long_limit, short_limit, security_type, venue); + } + + public static async Task set_position_limit(AdminService admin_service, BTSAccountImmutable? account_data, string symbol, uint long_limit, uint short_limit, SecurityType security_type = SecurityType.Future, Venue venue = Venue.Sim) { + + AccountProductPositionLimitUnitImmutable? limit_row = get_position_limit_row(account_data,symbol,security_type,venue); + List limits_list = account_data.Value.ProductPositionLimits.ToList(); + + if(limit_row.HasValue) { + // update the row + limits_list.Remove(limit_row.Value); + limit_row = limit_row.Value.with(long_position_limit: long_limit, short_position_limit: short_limit); + } + else { + // create a new row + AccountProductPositionLimitUnit acplu = new AccountProductPositionLimitUnit(); + acplu.LongPositionLimit = long_limit; + acplu.ShortPositionLimit = short_limit; + acplu.Product = new ProductScope { + SecuritySymbol = symbol, + SecurityType = security_type, + Exchange = venue + }; + + limit_row = acplu; + } + + limits_list.Add(limit_row.Value); + + List temp_plu = new List(); + temp_plu.AddRange(limits_list.Select(x => x.CloneToMutable())); + + var new_account_data = account_data.Value.with(product_position_limits: temp_plu); + + var update_ret = await admin_service.update_account_async(new AccountUpdateAPIArgument { + CompleteData = new_account_data.CloneToMutable() + }); + + return update_ret.success; + } + + + } +} diff --git a/src/client/spark_test/Utils/MarketDataUtilities.cs b/src/client/spark_test/Utils/MarketDataUtilities.cs new file mode 100644 index 000000000..5ab58171a --- /dev/null +++ b/src/client/spark_test/Utils/MarketDataUtilities.cs @@ -0,0 +1,74 @@ +using bts.api; +using bts.co2; +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; + +namespace bts.tests { + class MarketDataUtilities { + + const string _MD_HOST = "system_test"; + + public static async Task get_security(MarketDataRelay relay, string symbol, SecurityType security_type, Func match, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) { + var request = new MDRequest() { + Host = _MD_HOST, + Channels = { + new SecurityChannel() { + Time = 0, + Flags = (uint)flags, + Type = security_type, + Exchange = v, + Symbol = symbol, + TradeCursor = 0, + RfqCursor = 0 + } + } + }; + var result = await relay.requestmd_async(request); + + if (result.success) { + foreach (var ch in result.value.Channels) { + foreach (var update in ch.Updates) { + if (match(update)) { + return new SecurityImmutable(update.Security); + } + } + } + } + return null; + } + + public static async Task> get_expirations(MarketDataRelay relay, string symbol, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) { + var request = new MDRequest() { + Host = _MD_HOST, + Channels = { + new SecurityChannel() { + Time = 0, + Flags = (uint)flags, + Type = security_type, + Exchange = v, + Symbol = symbol, + TradeCursor = 0, + RfqCursor = 0 + } + } + }; + + var result = await relay.requestmd_async(request); + + var futures = new List(); + + if (result.success) { + foreach (var ch in result.value.Channels) { + foreach (var update in ch.Updates) { + futures.Add(update.Security.Future); + } + } + } + + return (IEnumerable) futures; + } + + } +} diff --git a/src/client/spark_test/Utils/OrderUtilities.cs b/src/client/spark_test/Utils/OrderUtilities.cs new file mode 100644 index 000000000..031484a5c --- /dev/null +++ b/src/client/spark_test/Utils/OrderUtilities.cs @@ -0,0 +1,200 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; +using bts.tests.utils; +using bts.spark; + +namespace bts.tests +{ + public class OrderUtilities { + public static async Task> send_order(OrderService order_service, OrderDefinition order_def, double price, uint size){ + return await order_service.create_order_async(new Create() { + NewOrder = order_def, + Price = price, + Quantity = size + }); + } + public static async Task> modify_order(OrderService order_service, OrderRecordImmutable o, uint size) { + return await modify_order(order_service, o.Key, o.State.Price, size); + } + public static async Task> modify_order(OrderService order_service, OrderRecordImmutable o, double price) { + return await modify_order(order_service, o.Key, price, o.State.Quantity); + } + public static async Task> modify_order(OrderService order_service, OrderRecordImmutable o, double price, uint size) { + return await modify_order(order_service, o.Key, price, size); + } + private static async Task> modify_order(OrderService order_service, uint order_key, double price, uint size) { + return await order_service.update_order_async(new Update() { + OrderKey = order_key, + Price = price, + Quantity = size + }); + } + + public static async Task cancel_orders(OrderService order_service, IEnumerable orders, uint key = 0){ + if (key > 0) { + Result resp = await order_service.cancel_order_async(new Cancel() { OrderKey = key }); + return resp.success; + } + else { + bool suc = true; + var working_orders = orders.Where(x => x.State.Status == OrderStatus.Working); + if(working_orders != null){ + foreach (var o in working_orders){ + Result resp = await order_service.cancel_order_async(new Cancel() { OrderKey = o.Key }); + suc &= resp.success; + } + return suc; + } + return true;// there are no working orders... so true enough + } + } + + public async static Task>> + wait_for_filtered_orders(OrderService order_service, Func, bool> match, Func, IEnumerable> selector, TimeSpan? timeout = null) { + if (timeout == null) { + timeout = TimeSpan.FromSeconds(3); + } + var tcs = new TaskCompletionSource>(); + var sub = order_service.subscribei_orders().Subscribe(update => { + if (match(update.all)) { + tcs.TrySetResult(selector(update.all)); + } + }); + var tr = await tcs.Task.timeout(timeout.Value); + sub.Dispose(); + return tr; + } + + public async static Task>> + wait_for_filtered_fills(OrderService order_service, Func, bool> match, Func, IEnumerable> selector, TimeSpan? timeout = null) { + if (timeout == null) { + timeout = TimeSpan.FromSeconds(3); + } + var tcs = new TaskCompletionSource>(); + var sub = order_service.subscribei_fills().Subscribe(update => { + if (match(update.all)) { + tcs.TrySetResult(selector(update.all)); + } + }); + var tr = await tcs.Task.timeout(timeout.Value); + sub.Dispose(); + return tr; + } + + public async static Task> create_book(OrderService order_service, (OrderDefinition order_def, double price, uint size)[] order_defs) { + + List> results = new List>(); + + foreach(var ord in order_defs) { + Assert.IsTrue(ord.order_def != null, "Order definition can not be null"); + results.Add(await send_order(order_service, ord.order_def, ord.price, ord.size)); + } + + Func, IEnumerable> selector = existing_orders => { + return existing_orders.Where(z => results.Exists(y => z.Key == y.value.OrderKey)); + }; + + Func, bool> match = existing_orders => { + return selector(existing_orders).Count() > 0; + }; + + await Task.Delay(5000);// I'm not sure how to get around this + + utils.TestUtils.TimeoutResult> filtered_orders = await wait_for_filtered_orders(order_service, match, selector, TimeSpan.FromSeconds(30)); + + Assert.IsNotNull(filtered_orders.result, "Book is incomplete"); + Assert.IsTrue(filtered_orders.result.Count() == order_defs.Length, "Book is incomplete"); + + return filtered_orders.result; + } + + } + + /// + /// We should replace with something like the OrderDataHeler from the Spark project. + /// + public static class OrderDefinitionUtilities { + + private static OrderDefinition create_base_order(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { + return new OrderDefinition { + SecurityKey = security_id, + Side = side, + TimeInForce = TimeInForce.Day, + CtiCode = CTICode.CtiCode1, + CustomerOrFirm = CustomerOrFirm.Firm, + ManualOrderIndicator = ManualOrderIndicator.Yes, + Account = account.name, + AccountId = account.id, + User = user.name, + UserId = user.id + }; + } + public static OrderDefinition create_limit_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { Limit = new LimitOrderDefinition { } }; + return def; + } + + public static OrderDefinition create_spreader_order_def(Security security, Side side, ExecutionStrategy strategy, (String name, uint id) account, (String name, uint id) user) { + var def = create_base_order(security.Id, side, account, user); + def.CustomDef = new CustomOrderDefinition { Spreader = new SpreaderOrderDefinition {Security = security, ExecutionStrategy = strategy} }; + return def; + } + + public static OrderDefinition create_iceberg_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user, double show_quantity) { + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { + Iceberg = new IcebergOrderDefinition { + ShowQuantity = show_quantity, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } + } + } + }; + return def; + } + + public static OrderDefinition create_join_order_definition(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user, spark.QuantityMeasure join_threshold) { + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { + Join = new JoinOrderDefinition { + JoinThreshold = join_threshold, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } + } + } + }; + return def; + } + + public static OrderDefinition create_lean_order_definition(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user, spark.QuantityMeasure lean_threshold, uint max_chase_ticks = 2, LeanOrderDefinition.Types.OnToward ontoward_behavor = LeanOrderDefinition.Types.OnToward.NoChange) { + var def = create_base_order(security_id, side, account, user); + def.CustomDef = new CustomOrderDefinition { + Lean = new LeanOrderDefinition { + CrossThreshold = lean_threshold, + MaxChaseTicks = max_chase_ticks, + TradeTowardBehavior = ontoward_behavor, + Child = new CustomOrderDefinition { + Limit = new LimitOrderDefinition { } + } + } + }; + return def; + } + + } + +} \ No newline at end of file diff --git a/src/client/spark_test/Utils/SpreaderUtilities.cs b/src/client/spark_test/Utils/SpreaderUtilities.cs new file mode 100644 index 000000000..db2f830f6 --- /dev/null +++ b/src/client/spark_test/Utils/SpreaderUtilities.cs @@ -0,0 +1,180 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; +using bts.tests.utils; +using bts.api.synthetic; +using bts.spark; + +namespace bts.tests +{ + public class SpreaderUtilities { + + public static async Task<(SecurityImmutable s1, SecurityImmutable s2)> get_securities_for_common_setup_one(MarketDataRelay relay, string symbol) { + var exps = (await MarketDataUtilities.get_expirations(relay, symbol, SecurityType.Future)).ToList(); + + Assert.IsNotNull(exps); + Assert.IsTrue(exps.Count() > 2, "Need at least two expirations"); + + var exp1 = exps[0]; + var exp2 = exps[1]; + + Func sec1_match = ch => + ch.Security.Future.ExpirationYear == exp1.ExpirationYear && + ch.Security.Future.ExpirationMonth == exp1.ExpirationMonth && + ch.Security.Future.ExpirationDay == exp1.ExpirationDay; + + Func sec2_match = ch => + ch.Security.Future.ExpirationYear == exp2.ExpirationYear && + ch.Security.Future.ExpirationMonth == exp2.ExpirationMonth && + ch.Security.Future.ExpirationDay == exp2.ExpirationDay; + + var sec_task1 = MarketDataUtilities.get_security(relay, symbol, SecurityType.Future, sec1_match); + var sec_task2 = MarketDataUtilities.get_security(relay, symbol, SecurityType.Future, sec2_match); + + var sec1 = await sec_task1; + var sec2 = await sec_task2; + + Assert.IsFalse(sec1 == null, "security is null"); + Assert.IsFalse(sec2 == null, "security is null"); + + return (s1: sec1.Value, s2: sec2.Value); + } + public static async Task<(IEnumerable book, (Security security, ExecutionStrategy strategy) synthetic)> common_setup_one(OrderService order_service, SyntheticSecurityService synthetic_service, (SecurityImmutable? s1, SecurityImmutable? s2) securities, (String name, uint id) account, (String name, uint id) user) { + var order_defs = new (OrderDefinition order_def, double price, uint size)[10]; + + for (int i = 0; i < 4; i ++) { + double p = (0.01 * i) + 18.230; + order_defs[i] = ( + order_def: OrderDefinitionUtilities.create_limit_order_def(securities.s1.Value.Id, Side.Buy, account, user), + price: p, + size: 1 + ); + } + + for (int i = 4; i < 8; i ++) { + double p = (0.01 * (i - 4)) + 18.300; + order_defs[i] = ( + order_def: OrderDefinitionUtilities.create_limit_order_def(securities.s1.Value.Id, Side.Sell, account, user), + price: p, + size: 1 + ); + } + + order_defs[8] = ( + order_def: OrderDefinitionUtilities.create_limit_order_def(securities.s2.Value.Id, Side.Buy, account, user), + price: 18.500, + size: 5 + ); + + order_defs[9] = ( + order_def: OrderDefinitionUtilities.create_limit_order_def(securities.s2.Value.Id, Side.Sell, account, user), + price: 18.53, + size: 5 + ); + + var book = await OrderUtilities.create_book(order_service, order_defs); + + List<(ContractLeg contract, LegSpreaderParams parameters)> legs = new List<(ContractLeg, LegSpreaderParams)>(); + + legs.Add(create_leg(securities.s1.Value.CloneToMutable(),1,1,false,1)); + legs.Add(create_leg(securities.s2.Value.CloneToMutable(),-1,-1,true,1)); + + (Security security, ExecutionStrategy strategy) synthetic = await create_synthetic(synthetic_service, legs); + + return(book, synthetic); + + } + + public static async Task<(Security, ExecutionStrategy)> create_synthetic(SyntheticSecurityService service, IEnumerable<(ContractLeg contract, LegSpreaderParams parameters)> legs) { + var new_synth = new Security(){}; + new_synth.Synthetic = new SyntheticContract(); + new_synth.Synthetic.Legs.Add(legs.Select(l => l.contract)); + new_synth.Symbol = deduce_symbol(new_synth); + new_synth.ContractSpec = new ContractSpecification(); + new_synth.ContractSpec.LowTick = 0.01; + new_synth.ContractSpec.HighTick = 0.01; + new_synth.ContractSpec.PriceBreak = double.MaxValue; + new_synth.ContractSpec.MainFraction = 1u; + new_synth.ContractSpec.PriceDisplayFormat = 3u; + new_synth.Exchange = Venue.Bts; + new_synth.Synthetic.Name = "TEST_SYNTH" + DateTime.Now.ToString(); + + var result = await service.create_synthetic_async(new_synth); + Assert.IsTrue(result.success, "Unable to create synthetic"); + Assert.IsTrue(result.value.Error == CreateResult.Types.Error.Ok, "Create synthetic was not OK"); + + uint? id = result.value.Key; + Assert.IsTrue(id.HasValue && id.Value != 0, "Failed to get synthetic security key"); + + new_synth.Id = result.value.Key; + + ExecutionStrategy strategy = new ExecutionStrategy(); + foreach(var leg in legs){ + strategy.LegParamsMap.Add(leg.contract.Security.Id, leg.parameters); + } + bool success = await save_strategy(service, new_synth.Id, new ExecutionStrategyImmutable(strategy)); + Assert.IsTrue(success, "Failed to save synthetic strategy"); + + return (new_synth, strategy); + + } + + public static (ContractLeg contract, LegSpreaderParams parameters) create_leg( + Security security, + double quantity, + double price_multiplier, + bool is_quoting, + double lean_qty_factor, + LegSpreaderParams.Types.MarketDataType market_data_type = 0 + ) + { + var contract = new ContractLeg(); + contract.Security = security; + contract.PriceMultiplier = price_multiplier; + contract.Side = quantity > 0 ? Side.Buy : Side.Sell; + contract.Quantity = Math.Abs(quantity); + + var parameters = new LegSpreaderParams(); + parameters.IsActiveQuoting = is_quoting; + parameters.MarketDataType = market_data_type; // 0 == Merged, 1 == Direct + parameters.EnableHedging = !is_quoting; + parameters.PostHedgeParams = new PostHedgeParams(); + parameters.PreHedgeParams = new PreHedgeParams(); + + parameters.QuoteParams = new QuoteParams(); + parameters.QuoteParams.LeanQuantityRatio = lean_qty_factor; + parameters.QuoteParams.QuoteMuteZone = null; // == Throttle unchecked + + return (contract: contract, parameters: parameters); + } + + public static string deduce_symbol(SecurityImmutable? security) { + if (!string.IsNullOrWhiteSpace(security?.Symbol)) return security?.Symbol; + if (security?.Synthetic.Legs.Count() > 0) return security?.Synthetic.Legs.First().Security.Symbol; + return string.Empty; + } + + public static async Task create_synthetic(SyntheticSecurityService service, SecurityImmutable? synthetic) { + var result = await service.create_synthetic_async(synthetic.Value); + Assert.IsTrue(result.success, "failed to create synthetic"); + return result.value.Key; + } + + public static async Task save_strategy(SyntheticSecurityService service, uint synthetic_id, ExecutionStrategyImmutable strategy) { + var result = await service.update_security_metadata_async(new Metadata { SecurityKey = synthetic_id, Strategy = strategy.CloneToMutable() }); + return result.success; + } + } +} \ No newline at end of file diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index f469031f3..6967bee52 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -1,10 +1,16 @@ -using bts.collections; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.orderman; +using bts.collections; using System; using System.Collections.Generic; using System.Linq; +using System.Reactive.Linq; +using System.Threading.Tasks; namespace bts.tests.utils { - static class TestUtils { + public static class TestUtils { public static List randomize_values(IReadOnlyList input) { var remaining_indices = Enumerable.Range(0, input.Count).ToList(); var rand = new Random(); @@ -38,5 +44,99 @@ namespace bts.tests.utils { } return reshuffled; } + + public static bool test_price_equality(double price_1, double price_2, double tick_size) { + return Math.Abs(price_2 - price_1) < 0.01 * tick_size; + } + + // this is a copy from TickUtils -- ask what's legal for the spark_test project... + public static double ticksize(this ContractSpecificationImmutable spec, double price) => + Math.Abs(price) > spec.PriceBreak ? spec.HighTick : spec.LowTick; + + // this was copied from GlobalExtensions + public struct TimeoutResult { + public TimeoutResult(T result, TimeSpan ts) { + wait_duration = ts; + this.result = result; + } + public readonly TimeSpan wait_duration; + public readonly T result; + } + + // this was copied from GlobalExtensions + public static async Task> timeout(this Task task, TimeSpan timeout) { + System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + var timeout_task = Task.Delay(timeout); + var completed = await Task.WhenAny(task, timeout_task); + return (completed == timeout_task) ? + new TimeoutResult(default(T), timeout) : + new TimeoutResult(task.Result, sw.Elapsed); + } + + public static async Task await_with_timeout(Task task, TimeSpan timeout){ + var to = timeout(task, timeout); + var tr = await to; + return tr.result; + } + + + public static async Task test_for_system_ready(ServiceContext context, TimeSpan? timeout = null) { + if(timeout == null) { + timeout = TimeSpan.FromSeconds(30); + } + + System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + + bool admin_ready = await test_for_admin_service_ready(context, timeout.Value.Subtract(sw.Elapsed)); + Console.WriteLine("Admin Service Ready: " + admin_ready); + bool md_ready = await test_for_md_service_ready(context, timeout.Value.Subtract(sw.Elapsed)); + Console.WriteLine("MD Service Ready: " + md_ready); + + return admin_ready && md_ready; + } + + public static async Task test_for_admin_service_ready(ServiceContext context, TimeSpan timeout) { + System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + + var admin_service = context.locate(); + + Update admin_value = null; + var account_sub = admin_service.subscribei_admin_data().Subscribe(update => admin_value = update); + + while(admin_value == null && sw.Elapsed < timeout) { + Console.WriteLine("Waiting for admin service..."); + await Task.Delay(100); + } + + return admin_value != null; + } + + + public static async Task test_for_md_service_ready(ServiceContext context, TimeSpan timeout) { + var md_request = new co2.MDRequest() { + Host = "system_test", + Channels = { + new co2.SecurityChannel() { + Time = 0, + Flags = 0, + Type = SecurityType.Future, + Exchange = Venue.Sim, + Symbol = "*", + TradeCursor = 0, + RfqCursor = 0 + } + } + }; + + var md_relay = context.locate(); + Result? md_result = await await_with_timeout( + md_relay.requestmd_async(md_request), + timeout); + + return md_result != null; + } } } \ No newline at end of file diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 8a6c94761..308bc8928 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh new file mode 100644 index 000000000..9c9ade42e --- /dev/null +++ b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir=/sparkdata +fi + +rm -r $sparkdata_dir/data/databases/ > /dev/null + +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf + ExchangeSim { + value { + merge_with_md:false + } + } + Logging { + value { + console { default_level: "Error" } + syslog { default_level: "Error" } + file { default_level: "Error" } + } +} +EOF + + +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid + +echo "sleeping for 120 seconds..." +sleep 120 + +dotnet sparkcmd.dll test spreader_simple_sanity + +kill $pid +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_clip_limits.sh b/src/client/spark_test/system_test_scripts/test_clip_limits.sh new file mode 100644 index 000000000..8f3d3215e --- /dev/null +++ b/src/client/spark_test/system_test_scripts/test_clip_limits.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir=/sparkdata +fi + +rm -r $sparkdata_dir/data/databases/ > /dev/null + + +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf + ExchangeSim { + value { + merge_with_md:true + } + } + Logging { + value { + console { default_level: "Error" } + syslog { default_level: "Error" } + file { default_level: "Error" } + } +} +EOF + +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid + +echo "sleeping for 120 seconds..." +sleep 120 + +dotnet sparkcmd.dll test test_clip_limits + +kill $pid +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_join_algo.sh b/src/client/spark_test/system_test_scripts/test_join_algo.sh new file mode 100644 index 000000000..775ee0b05 --- /dev/null +++ b/src/client/spark_test/system_test_scripts/test_join_algo.sh @@ -0,0 +1,151 @@ +#!/usr/bin/env bash + +# Stop script on NZEC +set -e +# Stop script if unbound variable found (use ${var:-} if intentional) +set -u + +# Use in the the functions: eval $invocation +invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"' + +# standard output may be used as a return value in the functions +# we need a way to write text on the screen in the functions so that +# it won't interfere with the return value. +# Exposing stream 3 as a pipe to standard output of the script itself +exec 3>&1 + +# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. +# See if stdout is a terminal +if [ -t 1 ] && command -v tput > /dev/null; then + # see if it supports colors + ncolors=$(tput colors) + if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then + bold="$(tput bold || echo)" + normal="$(tput sgr0 || echo)" + black="$(tput setaf 0 || echo)" + red="$(tput setaf 1 || echo)" + green="$(tput setaf 2 || echo)" + yellow="$(tput setaf 3 || echo)" + blue="$(tput setaf 4 || echo)" + magenta="$(tput setaf 5 || echo)" + cyan="$(tput setaf 6 || echo)" + white="$(tput setaf 7 || echo)" + fi +fi + +say_warning() { + printf "%b\n" "${yellow:-}$test_script_name: Warning: $1${normal:-}" +} + +say_err() { + printf "%b\n" "${red:-}$test_script_name: Error: $1${normal:-}" >&2 +} + +say() { + # using stream 3 (defined in the beginning) to not interfere with stdout of functions + # which may be used as return value + printf "%b\n" "${cyan:-}$test_script_name:${normal:-} $1" >&3 +} + +say_verbose() { + if [ "$verbose" = true ]; then + say "$1" + fi +} + +is_merge_with_md_on() { + eval $invocation + + if [ $(./sparkd configcheck ExchangeSim | grep merge_with_md: | cut -d " " -f 2) == "false" ]; then + return 0 + else + return 1 + fi +} + +set_merge_with_md_off() { + eval $invocation + + if [ -f $config_file_path ]; then + say_verbose "config file exists ... removing" + rm $config_file_path + fi + + echo "$merge_with_md_key" >> $config_file_path && test_config_file_created=true + + return 0 +} + +# args +# return_var - $1 +# class_name - $2 +get_tests_in_class() { + eval $invocation + + local return_var=$1 + local class_name=$2 + local arr=($(dotnet sparkcmd.dll test --type System --list | perl -ne '/^( *)/; $i = length $1; $j && $i >= $j and print, next; $j = 0; /'"$class_name"'/ and $j = $i + 1, print' | tail -n +2)) + eval $return_var='("${arr[@]}")' + + return 0 +} + +# Start sparkd +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid +echo "sleeping for 120 seconds..." +sleep 120 + + +# args +# class_name - $1 +run_bts_test() { + eval $invocation + + class_name=$1 + + local test_names_tuple=() + get_tests_in_class test_names_tuple $class_name + for test_name in ${test_names_tuple[@]}; do + say_verbose "running test with name: $test_name ..."; + dotnet sparkcmd.dll test $test_name + done + + return 0 +} + +test_script_name=$(basename "$0") +verbose=true +config_file_path="/home/bts/sparkdata/conf/test_join_algo_tests.conf" +test_config_file_created=false +merge_with_md_key=$(/bin/cat <<'END_HEREDOC' +ExchangeSim { + value { + merge_with_md: false + } +} +END_HEREDOC +) + +if is_merge_with_md_on; then + set_merge_with_md_off + if is_merge_with_md_on; then + say_err "Could not turn off merge_with_md" + say_err "Please investigate manually" + exit 1 + fi +else + say_verbose "merge with md is already off" +fi + +run_bts_test "JoinAlgoTests" + +if [ "$test_config_file_created" = true ]; then + rm $config_file_path +fi + +# Kill sparkd +kill $pid + +say "Test has finished." diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh new file mode 100644 index 000000000..b31445a5b --- /dev/null +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir=/sparkdata +fi + +rm -r $sparkdata_dir/data/databases/ > /dev/null + + +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf + ExchangeSim { + value { + merge_with_md:true + } + } + Logging { + value { + console { default_level: "Error" } + syslog { default_level: "Error" } + file { default_level: "Error" } + } +} +EOF + + +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid + +echo "sleeping for 120 seconds..." +sleep 120 +dotnet sparkcmd.dll test test_position_limits + +kill $pid +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/lib/config/protos/UI.proto b/src/lib/config/protos/UI.proto index 71b9702c8..ceaea14db 100644 --- a/src/lib/config/protos/UI.proto +++ b/src/lib/config/protos/UI.proto @@ -68,7 +68,12 @@ message LadderKnobs { optional uint32 max_open_ladders = 4 [default = 75]; optional uint32 security_timeout_secs = 5 [default = 60]; optional bool open_algo_popup_on_select = 6 [default = false]; - optional bool use_algo_param_grid = 7 [default = false]; + optional bool use_algo_param_grid = 7 [default = true]; +} + +message OrderBookOptions { + optional bool animate_child_order_rows = 1 [default = false]; + optional double status_color_opacity_when_selected = 2 [default = 0.35]; } message ShellPingOptions { diff --git a/src/lib/md/MDConsumer.cpp b/src/lib/md/MDConsumer.cpp index a303c34ad..3a6610dae 100644 --- a/src/lib/md/MDConsumer.cpp +++ b/src/lib/md/MDConsumer.cpp @@ -269,6 +269,16 @@ public: if (!_cold.is_initialized()) return true; return is_heart_beat_ok(cold_header()); } + + void dump_shm_to(const char* directory) const { + _cold.dump_to(directory); + if (_hot) { + _hot->dump_to(directory); + } + if (_hot_depth) { + _hot_depth->dump_to(directory); + } + } private: @@ -910,6 +920,15 @@ public: return result; } + void dump_shm_to(const char* p) const { + // To be safe we should lock _work_mutex -but- + // we need this function to diagnose problems happening in the on_security callback + // which holds the _work_mutex. Since anyone calling this function is going down + // anyway we as well live dangerously. + for (auto& inst : _instances) { + inst->dump_shm_to(p); + } + } }; @@ -957,6 +976,8 @@ MDConsumerChannel MDConsumer::get_channel(const std::string& symbol, SecurityTyp MDConsumerChannel MDConsumer::get_channel(const UserSymbol& u) const { return _pimpl->get_channel(u.symbol(), u.type(), u.exchange()); } +void MDConsumer::dump_shm_to(const char* p) const { _pimpl->dump_shm_to(p); } + MDConsumerChannel::MDConsumerChannel(const shared_ptr& inst) : _pimpl(inst) {} int64_t MDConsumerChannel::read_trades(google::protobuf::RepeatedPtrField& trades, int64_t cursor) { return _pimpl->read_trades(trades, cursor); } diff --git a/src/lib/md/MDConsumer.h b/src/lib/md/MDConsumer.h index 103e8bb19..d197499a3 100644 --- a/src/lib/md/MDConsumer.h +++ b/src/lib/md/MDConsumer.h @@ -67,6 +67,8 @@ public: } uintptr_t id() const { return reinterpret_cast(_pimpl.get()); } + void dump_shm_to(const char* directory) const; + private: //BTS_NO_COPY(MDConsumer); COPY OK std::shared_ptr _pimpl; diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index 17a36b072..88972112d 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -177,5 +177,11 @@ CAPI void post_on_scan_security_thread(just_action a) { md::scan_securities_thread().post(a); } +CAPI void dump_co2_memory_to_disk(MDConsumer* consumer, const char* path) { + if (consumer) { + consumer->dump_shm_to(path); + } +} + }} //namespace #endif diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index 9830a6cc7..54c3a9066 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -143,7 +143,9 @@ public: LOG(md,Diag, "Added {} trades", ch.trade_log_size()); } for (const auto& trade : ch.trade_log()) { - channel.add_trade(trade); + if (trade.key()) { + channel.add_trade(trade); + } } for (const auto& rfq : ch.rfq_log()) { channel.add_rfq(rfq); diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 1ee5e14bc..01dff07fb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -10,6 +10,18 @@ namespace orderman { using namespace api::orderman; +enum class CoverAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE }; +const char *CoverAlgo::status_name(Status st) { + switch (st) { + case Status::WORKING: + return "WORKING"; + case Status::WAITING_FOR_HEDGES: + return "WAITING_FOR_HEDGES"; + case Status::DONE: + return "Done"; + } + return nullptr; +} struct CoverAlgo::PImpl { IAlgoServices *algo; OrderKey child_key = null_order_key(); @@ -17,6 +29,8 @@ struct CoverAlgo::PImpl { ChildTemplate *child_template = nullptr; ChildTemplate *hedge_template = nullptr; Quantity hedged_fills = Quantity(0); + Status status = Status::WORKING; + std::vector hedges; }; CoverAlgo::CoverAlgo() : me(new PImpl()) {} @@ -77,64 +91,96 @@ void CoverAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, } void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { - bts_assert(k == me->child_key); // We are not subscribed to hedge changes + if (k == me->child_key) { + if (st.total_fills.value() > me->hedged_fills.value()) { + auto hedge_qty = + Quantity(st.total_fills.value() - me->hedged_fills.value()); + auto hedge_price = securities::improve_price( + algo().definition().side(), st.last_price, + me->price_improvement_delta); - if (st.total_fills.value() > me->hedged_fills.value()) { - auto hedge_qty = - Quantity(st.total_fills.value() - me->hedged_fills.value()); - auto hedge_price = - securities::improve_price(algo().definition().side(), st.last_price, - me->price_improvement_delta); + auto hedge = + algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); + me->hedges.push_back(hedge); - algo().launch_child(*me->hedge_template, hedge_price, hedge_qty, - false); // do not subscribe to hedge changes - - me->hedged_fills = Quantity(hedge_qty.value() + me->hedged_fills.value()); - LOG(OrderMan, Diag, - "CoverAlgo {}, launched new hedge in response to child fill. Hedge: " - "{} {}@{}", - algo().order_key().value(), - securities::side_name(algo().definition().side()), hedge_qty.value(), - hedge_price.value()); - } - algo().update_fill_state(st.total_fills, st.last_price); - switch (st.status) { - case ChildStatus::WORKING: - return; - case ChildStatus::COMPLETED: - algo().detach_all_children(); - algo().complete(); - return; - case ChildStatus::CANCELED: - algo().terminate_error("Unexpected child cancel"); - return; + me->hedged_fills = + Quantity(hedge_qty.value() + me->hedged_fills.value()); + LOG(OrderMan, Diag, + "CoverAlgo {}, launched new hedge in response to child fill. " + "Hedge: " + "{} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); + } + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + LOG(OrderMan, Info, + "CoverAlgo {}. Child is completed, waiting for hedges ", + algo().order_key().value()); + me->status = Status::WAITING_FOR_HEDGES; + break; + case ChildStatus::CANCELED: + LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + break; + } + } else { + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); + it != me->hedges.end()) + me->hedges.erase(it); + break; + case ChildStatus::CANCELED: + LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + break; + } } + check_terminate(); } void CoverAlgo::do_update(api::orderman::Update const &update) { - LOG(OrderMan, Diag, "CoverAlgo order {} receiving update: {}", - algo().order_key().value(), utils::pb::to_string(update)); + if (me->status == Status::WORKING) { + LOG(OrderMan, Diag, "CoverAlgo order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_cover()) { - algo().terminate_error("Invalid update"); - return; - } - - Update child_update; - child_update.set_price(update.price()); - child_update.set_quantity(update.quantity()); - - // process custom part of the udpate if any - if (update.has_custom()) { - auto &cover_update = update.custom().cover(); - set_price_improvement_delta(algo(), cover_update); - if (cover_update.has_child()) { - *child_update.mutable_custom() = cover_update.child(); + if (update.has_custom() && !update.custom().has_cover()) { + algo().terminate_error("Invalid update"); + return; } - if (cover_update.has_hedge()) - init_hedge_template(algo(), cover_update.hedge()); + + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); + + // process custom part of the udpate if any + if (update.has_custom()) { + auto &cover_update = update.custom().cover(); + set_price_improvement_delta(algo(), cover_update); + if (cover_update.has_child()) { + *child_update.mutable_custom() = cover_update.child(); + } + if (cover_update.has_hedge()) + init_hedge_template(algo(), cover_update.hedge()); + } + algo().update_child(me->child_key, child_update); + } else { + LOG(OrderMan, Info, + "CoverAlgo {}. Received update after child has completed. Ignoring " + "it.", + algo().order_key().value()); } - algo().update_child(me->child_key, child_update); } void orderman::CoverAlgo::init_hedge_template( @@ -155,5 +201,18 @@ void CoverAlgo::set_price_improvement_delta( securities::tick_size(serv.security()).value() * cover.hedge_ticks()); } +void CoverAlgo::check_terminate() { + LOG(OrderMan, Diag, + "CoverAlgo {} check_terminate. State: {} Hedge count: {}", + algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, + me->hedges.size()); + + if (me->status == Status::WAITING_FOR_HEDGES && me->hedges.empty()) { + LOG(OrderMan, Info, "CoverAlgo {}. Last hedge completed, terminating", + algo().order_key().value()); + algo().complete(); + } +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 3e8d9adbf..3bedb00e7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -21,6 +21,7 @@ public: private: struct PImpl; + enum class Status; std::unique_ptr me; IAlgoServices &algo() const; void @@ -28,6 +29,8 @@ private: api::orderman::CoverOrderDefinition const &); void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); + void check_terminate(); + const char *status_name(Status st); }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp index 9c8d8e3be..e85a07f6e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp @@ -3,6 +3,7 @@ #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" #include "lib/utils/PBUtils.h" namespace bts { @@ -20,6 +21,7 @@ struct JoinAlgo::PImpl { ChildTemplate *child_template = nullptr; Book book_at_inception; Book last_book; + Price joined_price=Price(os::nan()); }; JoinAlgo::JoinAlgo() : me(new PImpl()) {} @@ -80,7 +82,8 @@ void JoinAlgo::do_update(api::orderman::Update const &update) { } Update child_update; - child_update.set_price(update.price()); + Price price_to_pass = get_price_to_pass(Price(update.price())); + child_update.set_price(price_to_pass.value()); child_update.set_quantity(update.quantity()); if (update.has_custom()) { update_join_threshold(); @@ -146,6 +149,7 @@ void JoinAlgo::try_to_join() { // Time to join Update child_update; + me->joined_price = Price(my_side_psz.price()); child_update.set_price(my_side_psz.price()); child_update.set_quantity(algo().quantity().value()); algo().update_child(me->child_key, child_update); @@ -161,6 +165,20 @@ void JoinAlgo::try_to_join() { } } +Price JoinAlgo::get_price_to_pass (Price price) const{ + Price rv; + switch (me->status) { + case Status::WAITING_FOR_MD: + case Status::WAITING_TO_JOIN: + rv = price; + break; + case Status::JOINED: + rv = me->joined_price; + break; + } + return rv; +} + void JoinAlgo::update_join_threshold() { me->min_quantity_to_join = SpreaderUtils::_quantity_threshold( algo().definition().custom_def().join().join_threshold(), algo().quantity()); diff --git a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h index 114a9131b..e77aa382b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.h @@ -31,6 +31,7 @@ private: void update_join_threshold(); bool has_running_child() const; void try_to_join(); + Price get_price_to_pass (Price price) const; }; }} diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp index a7f0a870b..6a86c4671 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp @@ -28,6 +28,7 @@ struct LeanAlgo::PImpl { Book curr_book; Price out_price = Price(os::nan()); Quantity out_qty = Quantity(0); + Price cross_price = Price(os::nan()); }; LeanAlgo::LeanAlgo() : me(new PImpl()) {} @@ -79,7 +80,8 @@ void LeanAlgo::do_update(const api::orderman::Update &update) { return; } Update child_update; - child_update.set_price(update.price()); + Price price_to_pass = _get_price_to_pass(Price(update.price())); + child_update.set_price(price_to_pass.value()); child_update.set_quantity(update.quantity()); if (update.has_custom()) { auto &lean_update = update.custom().lean(); @@ -195,6 +197,13 @@ LeanAlgo::MarketChange LeanAlgo::_market_change() const{ else return MarketChange::SIZE_CHANGE; } +Price LeanAlgo::_get_price_to_pass (Price price) const{ + // if it has crossed once, then the + // child order is always passed that price + if(!os::is_nan(me->cross_price.value())) + return me->cross_price; + return price; +} // actions //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void LeanAlgo::_analyze_and_act() { @@ -298,8 +307,9 @@ void LeanAlgo::_udpate_out_price_qty(Price price, Quantity qty){ } bool LeanAlgo::_modify_price_price_qty(Price price, Quantity qty){ if(me->out_price.value()!=price.value() || - me->out_qty.value()!=qty.value()){ - _udpate_out_price_qty(price,qty); + me->out_qty.value()!=qty.value()){ + _udpate_out_price_qty(price,qty); + me->cross_price = price; Update child_update; child_update.set_price(price.value()), child_update.set_quantity(qty.value()); diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h index 56bda12d3..09aea41ba 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.h @@ -34,7 +34,8 @@ class LeanAlgo : public IAlgoOrder { api::Side _opp_side() const; bool _within_chase_band(Price price) const; Price _chase_limit() const; - MarketChange _market_change() const; + MarketChange _market_change() const; + Price _get_price_to_pass (Price price) const; void _analyze_and_act(); bool _try_cross(Price); void _go_furthest_possible(); diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index a8f4a8acf..af49ce401 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -361,7 +361,7 @@ void OrderServiceServer::on_order_op_result( bts_assert(it!=me->in_flight_order_ops.end()); auto &responder = it->second; api::orderman::Response r; - r.set_order_key(0); + r.set_order_key(op_result.ok.value()); r.set_error_code(op_result.result.error); r.set_msg(op_result.result.error_msg); responder(r); diff --git a/src/lib/utils/SharedList.h b/src/lib/utils/SharedList.h index 345055ebf..9a47e2701 100644 --- a/src/lib/utils/SharedList.h +++ b/src/lib/utils/SharedList.h @@ -15,8 +15,10 @@ #include #include #include +#include #include +#include namespace bts { namespace utils { @@ -238,6 +240,38 @@ public: offset = sizeof(SegmentHeader); } } + + void dump_to(const char* directory) const { + using namespace std; + boost::system::error_code _; + if (!boost::filesystem::exists(directory, _)) { + boost::filesystem::create_directories(directory, _); + } + + if (!boost::filesystem::is_directory(directory)) { + LOG(md,Error, "Error dumping memory to {}", std::string(directory)); + return; + } + + boost::filesystem::path root(directory); + + // OK to hold the lock for a while as we're typically crashing when this is called + tbb::queuing_mutex::scoped_lock lock(_mutex); + + for (size_t x = 0; x < _segments.size(); ++x) { + char segment_name[512]; + SharedList::get_segment_name(segment_name, BTS_ARRAYSIZE(segment_name), _name, x); + + // create/overwrite output file + std::ofstream writer( (root/segment_name).string(), ios::out | ios::app | ios::binary); + if (writer.is_open()) { + // writer just loves signed types + writer.write( + (const char*)_segments[x].address, + (std::streamsize)_segments[x].size); + } + } + } private: BTS_NO_COPY(SharedListReader); @@ -281,7 +315,7 @@ private: const std::string _name; THeader* _header; // null value indicates no memory segment - tbb::queuing_mutex _mutex; + mutable tbb::queuing_mutex _mutex; std::unique_ptr _shm; std::vector _segments; }; diff --git a/src/sdk/README.md b/src/sdk/README.md index ee11093a2..63a91c61b 100644 --- a/src/sdk/README.md +++ b/src/sdk/README.md @@ -67,7 +67,7 @@ $ cd spark_sdk ### Development -Algo Orders typically implement the IAlgoOrder interface to respond to events and use the IAlgoServices interface to create and control child orders as well as manage their own life cycles. See [examples/order_plugin_example.cpp](examples/order_plugin_example.cpp) for a fully fledged example +Algo Orders typically implement the [IAlgoOrder](include/spark/lib/orderman/orders/algo/IAlgoOrder.h) interface to respond to events and use the [IAlgoServices](include/spark/lib/orderman/orders/algo/IAlgoServices.h) interface to create and control child orders as well as manage their own life cycles. See [examples/order_plugin_example.cpp](examples/order_plugin_example.cpp) for a fully fledged example Look at [examples/md_publisher_example.cpp](examples/md_publisher_example.cpp) to look at how to build a custom market data producer diff --git a/src/server/sparkd/support/ShellLatencyServer.cpp b/src/server/sparkd/support/ShellLatencyServer.cpp index ccdb3e4ca..eb5657b87 100644 --- a/src/server/sparkd/support/ShellLatencyServer.cpp +++ b/src/server/sparkd/support/ShellLatencyServer.cpp @@ -36,7 +36,7 @@ void ShellLatencyServer::report( reply(bts::api::VoidMessage()); // look up or create the metric - auto key = request.host_name() + "-" + request.version(); + auto key = request.host_name() + "-" + request.version() + "-" + request.user(); auto iter = _metrics.find(key); std::shared_ptr metric; // report at least 1ms because the metric will not report anything if it's 0 @@ -44,8 +44,8 @@ void ShellLatencyServer::report( if (iter == _metrics.end()) { // create metric auto metric = - std::make_shared("spark_shell_latency", - std::vector