diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 323f05d0f..4b447d088 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,13 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.8.2 +### Bug Fixes + - Added proper display factors for SOM spreads + - Fixed a bug that could cause a UI failure when trying to change settings in a synthetic ladder +## 2.8.1 +### Bug fixes + - Fixed an error in the UI grids filtering widget ## 2.8.0 ### User Visible Changes - Added ProRata and Scratch algos @@ -14,6 +21,9 @@ insert_anchor_links = "right" - Fixed a bug that cause cause a failure on startup if the user loaded a workspace with a Ladder that had a dynamic order type selected by default + - Increased width of login panel to better show login error messages + - Added optional 'Maker/Taker' pricing to Spreader algo + - Algo buttons in ladder can now be made to deactivate after launching an algo or remain 'sticky' ### Internal changes - Made it easier to generate simple UI's for new order types ### API Changes @@ -362,7 +372,8 @@ insert_anchor_links = "right" - The zoom slider can be enabled from Ladder Form -> Settings button -> Left Pane tab -> check Zoom Slider checkbox - The zoom functionality can also be performed via hotkey and mouse wheel combinations - Zoom In = CTRL + Mouse wheel up - - Zoom Out = CTRL + Mouse wheel down + - Zoom Out = CTRL + Mouse wheel down + - Reset zoom = CTRL + Mouse wheel click or double click on the zoom slider ### Exchange simulator - Improved the exchange simulator to track real market data more closely diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs index 5f4d64a32..c49712bae 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs @@ -10,7 +10,7 @@ using System.Reactive.Disposables; namespace mbts.spark { static class AlgoParamRowsHelper { public static IDisposable connect(AlgoDefinitionVM algo, ObservableAggregateCollection rows, bool include_algo_type_rows) => - algo == null ? null : new CompositeDisposable(algo.observe_algo_root().SubscribeEach(a => { + algo == null ? null : new CompositeDisposable(algo.observe_algo_root().OnDispatcher().SubscribeEach(a => { rows.clear_collections(); if (a == null) return Disposable.empty; @@ -77,7 +77,7 @@ namespace mbts.spark { include_algo_type_rows ? (ObservableCollection)new ObservableAppendCollection(child_rows, selector_wrapper) : child_rows, - s.subscribe_selected_algo().SubscribeEach(a => { + s.subscribe_selected_algo().OnDispatcher().SubscribeEach(a => { s.value = a; child_rows.clear_collections(); return _wrap_rows(a, selector_wrapper, child_rows, include_algo_type_rows); diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index 6f2a442c4..a26f626ae 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -194,20 +194,27 @@ namespace mbts.spark { readonly bts.persist.algo.AlgoPersistedKey[] _favorite_algos; [ProtoMember(2)] public readonly int column_count; + [ProtoMember(3)] + readonly bts.persist.algo.AlgoPersistedKey[] _stickied_algos; - public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count) - : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)), column_count) { } + public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos) + : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)), + column_count, + ArrayHelper.safe_convert(stickied_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted))) { } - LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count) { + LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count, bts.persist.algo.AlgoPersistedKey[] stickied_algos) { _favorite_algos = favorite_algos; this.column_count = column_count; + _stickied_algos = stickied_algos; } public IReadOnlyList favorite_algos => ArrayHelper.safe_convert(_favorite_algos, k => k.to_algo_key()); + public IReadOnlyList stickied_algos => ArrayHelper.safe_convert(_stickied_algos, k => k.to_algo_key()); public bool Equals(LadderFavoriteAlgosSettings other) => column_count == other.column_count && - favorite_algos.SequenceEqual(other.favorite_algos); + favorite_algos.SequenceEqual(other.favorite_algos) && + stickied_algos.SequenceEqual(other.stickied_algos); public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj); @@ -215,7 +222,8 @@ namespace mbts.spark { public override int GetHashCode() => EqualityComparer.aggregate_hash( column_count, - EqualityComparer.aggregate_hash_limited(favorite_algos)); + EqualityComparer.aggregate_hash_limited(favorite_algos), + EqualityComparer.aggregate_hash_limited(stickied_algos)); public static bool operator ==(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => a.Equals(b); public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b); @@ -273,7 +281,7 @@ namespace mbts.spark { order_entry_panel_initial_width = _default_order_entry_panel_width; zoom_factor = _default_zoom_factor; use_defaults = true; - favorite_algos = new LadderFavoriteAlgosSettings(null, 2); + favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null); show_warn_on_cross = _default_show_warn_on_cross; } diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index 3ab614a21..0b5030b0b 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -11,6 +11,7 @@ using ProtoBuf; using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.IO; using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; @@ -22,6 +23,7 @@ using LadderSettings = mbts.spark.LadderSettings; namespace bts.shell { class LadderWindowFactory : ShellWindowFactory { const string _window_type = "ladder"; + const int _version_where_stickied_algos_introduced = 2; readonly LadderConfig _ladder_conf; readonly IBus _bus; readonly IWindowManager _wm; @@ -38,7 +40,7 @@ namespace bts.shell { OrdersModel orders_model, MBOService mbo) - : base(owner, "SparkLadder") { + : base(owner, "SparkLadder", 2) { _bus = bus; _wm = wm; _settings_hub = settings_hub; @@ -60,6 +62,16 @@ namespace bts.shell { return null; } + protected override Task try_upgrade_state(Stream load_stream, int version) { + var state = ProtoBuf.Serializer.DeserializeWithLengthPrefix(load_stream, ProtoBuf.PrefixStyle.Fixed32); + if (version < _version_where_stickied_algos_introduced) { + // We want to assign any existing favorite algos to stickied algos upon setting upgrade + var favorite_algos_array = state.settings.favorite_algos.favorite_algos.ToArray(); + state.settings.favorite_algos = new LadderFavoriteAlgosSettings(favorite_algos_array, state.settings.favorite_algos.column_count, favorite_algos_array); + } + return load(state); + } + LadderSaveState _get_state(LadderVM vm, uint id) { LadderSettings s = vm.get_save_state(); if (id != 0) { diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index d7847884f..97db476d3 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -2,6 +2,7 @@ using bts.api; using bts.api.orderman; using bts.collections; +using bts.persist.algo; using bts.shell.orderbook; using bts.utils; using mbts.collections; @@ -723,12 +724,15 @@ namespace mbts.spark { readonly IObservableCollection _algo_definitions; readonly ObservableCollection _raw_items = new ObservableCollection(); int _column_count = 2; + HashSet _sticky_algo_keys; + IDisposable _sticky_algos_hook; public FavoriteAlgosVM(IObservableCollection algo_definitions) { _algo_definitions = algo_definitions; items = new ObservableAggregateCollection(_raw_items, new ObservableCollection { FavoriteAlgoItem.AddButtonPlaceholderItem }); add_item_cmd = new DelegateCommand(() => _raw_items.Add(_item_factory())); remove_item_cmd = new DelegateCommand(fai => _raw_items.Remove(fai)); + _dispose = Disposable.Create(() => Disposable.dispose(ref _sticky_algos_hook)); } public ObservableCollection items { get; } @@ -745,6 +749,17 @@ namespace mbts.spark { fai.selector.try_select(k); return fai; })); + _sticky_algo_keys = new HashSet(value.stickied_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted))); + Disposable.replace(ref _sticky_algos_hook, + ObservableAutoWrapper.connect_item_hooks(_raw_items, x => + x.selector.subscribe_value().Subscribe(algo => { + if (algo != null && + algo.key.is_persisted && + (x.is_sticky = _sticky_algo_keys.Remove(new AlgoPersistedKey(algo.key.persisted))) && + _sticky_algo_keys.Count == 0) + // + Disposable.dispose(ref _sticky_algos_hook); + }))); } public LadderFavoriteAlgosSettings create() => @@ -753,7 +768,13 @@ namespace mbts.spark { .Where(k => k.HasValue && k.Value.is_persisted) .Select(k => k.Value) .ToArray(), - column_count); + column_count, + _raw_items + .Where(fai => fai.is_sticky) + .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) + .Where(k => k.HasValue && k.Value.is_persisted) + .Select(k => k.Value) + .ToArray()); FavoriteAlgoItem _item_factory() => new FavoriteAlgoItem(_algo_definitions, new ListCollectionView(_algo_definitions) { @@ -766,6 +787,7 @@ namespace mbts.spark { public static readonly FavoriteAlgoItem AddButtonPlaceholderItem = new _AddButtonPlaceholderItem(); internal readonly KeyedItemSelector selector; + bool _is_sticky; protected FavoriteAlgoItem() { } @@ -776,6 +798,7 @@ namespace mbts.spark { public ICollectionView algo_definitions_view { get; } public AlgoDefinitionVM algo_definition { get => selector.value; set => selector.value = value; } + public bool is_sticky { get => _is_sticky; set => Set(ref _is_sticky, value); } class _AddButtonPlaceholderItem : FavoriteAlgoItem, ITemplateSelectorKey { public string key => LadderSettingsView.FavoriteAlgoAddButtonTemplateKey; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 506835d9c..c985e6381 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -1,9 +1,11 @@ using bts.api; using bts.api.orderman; +using bts.collections; using bts.shell; using bts.spark; using bts.utils; using mbts.co2; +using mbts.spark.utilities; using mbts.ui; using mbts.ui.shell; using mbts.utils; @@ -32,6 +34,7 @@ namespace mbts.spark { _show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys, _show_cancel_sells, _show_cancel_all, _show_zoom; readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground; + readonly HashSet _sticky_algos = new HashSet(); double _position, _day_position; bool _show_account_position, _show_day_position; ulong _misc_time = 0; @@ -133,7 +136,7 @@ namespace mbts.spark { //_window_height = backing(nameof(window_height), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 600); //_window_width = backing(nameof(window_width), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 420); position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(_show_day_position ? day_position : position))); - send_order_command = new DelegateCommand<(double price, Side? side, MouseButton button)>(send_order); + send_order_command = new AsyncCommand<(double price, Side? side, MouseButton button)>(send_order_async); cancel_command = new AsyncCommand(_model.cancel_orders, true); show_book_command = new DelegateCommand(_show_book); show_ticket_command = new DelegateCommand(_show_ticket); @@ -223,7 +226,10 @@ namespace mbts.spark { .SelectManyInSeries(a => _model.order_gateway.on_security_positions(security.Id) .Select(table => table.state.Values.FirstOrDefault(pos => pos.Item2.Account == a, tup => tup.Item2, (bts.api.position.PositionUnitImmutable?)null))); return Disposable.Create( - settings.OnDispatcher().Subscribe(s => order_properties_vm.on_favorite_algos(s.favorite_algos)), + settings.OnDispatcher().Subscribe(s => { + _sticky_algos.SetItems(s.favorite_algos.stickied_algos); + order_properties_vm.on_favorite_algos(s.favorite_algos); + }), order_properties_vm, position_src.OnDispatcher().Subscribe(pos => { double total, day; @@ -400,20 +406,19 @@ namespace mbts.spark { settings_invalidated?.Invoke(); } - public void send_order((double price, Side? side, MouseButton button) args) { - if (order_properties_vm == null || args.button == MouseButton.Middle) - return; - var size_from_alternate = args.button == MouseButton.Right; - if (DoubleHelper.IsNaNOrInfinity(args.price) || !args.side.HasValue || HasErrors || order_properties_vm.HasErrors || (size_from_alternate && current_settings.alternate_order_size == 0)) { - return; - } - if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) { - size_calculator.flash_error(); - } - else { - uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); - send_order_async(args.side.Value, size, args.price).ignore(); + public Task send_order_async((double price, Side? side, MouseButton button) args) { + if (order_properties_vm != null && args.button != MouseButton.Middle) { + var size_from_alternate = args.button == MouseButton.Right; + if (!DoubleHelper.IsNaNOrInfinity(args.price) && args.side.HasValue && !HasErrors && !order_properties_vm.HasErrors && (!size_from_alternate || current_settings.alternate_order_size > 0)) { + if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) { + size_calculator.flash_error(); + } else { + uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); + return send_order_async(args.side.Value, size, args.price); + } + } } + return Task.CompletedTask; } public async Task send_order_async(Side side, uint size, double price) { @@ -433,6 +438,13 @@ namespace mbts.spark { await _model.order_gateway.send_order(order, price, size); if (auto_clear) size_calculator.value = 0; + var fav_algo = order_properties_vm.selected_favorite_algo_definition; + if (fav_algo != null && !_sticky_algos.Contains(fav_algo.key) && !order_properties_vm.try_pop_selected_algo_definition()) { + var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase))); + if (order_properties_vm.try_get_algo_definition(key, out var r)) { + order_properties_vm.selected_algo_definition = r; + } + } } void _update_header() { diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 67ed2b074..92ab62e4d 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -805,6 +805,7 @@ + diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 31ff1fc1b..e5a90d0e1 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -60,6 +60,7 @@ namespace mbts.spark { readonly ListCollectionView _algo_definitions_view, _favorite_algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); + readonly AlgoDefinitionVM the_anchor_algo_def_vm; IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); IDisposable _algo_param_rows_hook; @@ -68,6 +69,7 @@ namespace mbts.spark { public OrderPropertiesEditorVM(OrdersModel model, IObservable security_md_source, IObservable order_properties) { _model = model; + the_anchor_algo_def_vm = AlgoDefinitionVM.create(_model, OrderDataHelper.Defaults.AlgoData(CustomOrderDefinition.CustomOneofCase.Limit)); var security_source = security_md_source.Select(smd => smd.security); _security = backing(nameof(security), security_source, SecurityDataHelper.Defaults.SecurityImmutable); security_source = _security.observe_current(true); @@ -237,11 +239,15 @@ namespace mbts.spark { void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) { Disposable.dispose(ref _algo_param_rows_hook); + if (old_value != null) + // Taha feels that we should always revert to a Limit order either when the user explicity unchecks a sticky button + // or when a non-sticky button is pressed. Rather than completely remove the stack at this time (b/c it may be come + // back in the future), let's just always push a specfic def_vm.key onto it [Limit] ;) + //_selected_algo_stack.Push(old_value.key); + _selected_algo_stack.Push(the_anchor_algo_def_vm.key); if (new_value != null) { if (use_algo_param_grid) _algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows); - if (reason != SelectionReason.Explicit) - _selected_algo_stack.Push(new_value.key); } if (open_algo_popup_on_select) { if (reason == SelectionReason.UserSelectedNewValue && new_value?.algo_root is IAlgoVM ar && ar.can_expand) @@ -277,6 +283,18 @@ namespace mbts.spark { get => _selected_algo_definition.selected_item; set => _selected_algo_definition.selected_item = value; } + + public bool try_get_algo_definition(AlgoKey a, out AlgoDefinitionVM result) => + _algo_definitions.TryGetValue(a, out result); + + public bool try_pop_selected_algo_definition() { + if (_selected_algo_stack.TryPop(out AlgoKey k) && _algo_definitions.TryGetValue(k, out AlgoDefinitionVM vm)) { + _selected_algo_definition.select_explicit(vm); + return true; + } + return false; + } + public AlgoDefinitionVM selected_favorite_algo_definition { get => selected_algo_definition?.is_favorite ?? false ? selected_algo_definition : null; set { @@ -353,6 +371,7 @@ namespace mbts.spark { d.favorite_index = _get_favorite_algo_index(d.key); } favorite_algos_column_count = value.column_count; + RaisePropertyChanged(nameof(selected_favorite_algo_definition)); } static IDisposable _connect_algo_param_rows(AlgoDefinitionVM def, ObservableAggregateCollection rows) => @@ -371,4 +390,4 @@ namespace mbts.spark { algo_definitions_view.Refresh(); } } -} +} \ No newline at end of file diff --git a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs index c5ceff2c4..f29218124 100644 --- a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs +++ b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs @@ -34,13 +34,14 @@ namespace bts.shell { Disposable.dispose(ref _dispose); } public abstract Task load(T state); + protected virtual Task try_upgrade_state(Stream load_stream, int version) => null; public Task load_window(Stream load_stream, int version) { if (version == this.version) { var t = ProtoBuf.Serializer.DeserializeWithLengthPrefix(load_stream, ProtoBuf.PrefixStyle.Fixed32); return load(t); } - return null; + return try_upgrade_state(load_stream, version); } public void save(T data, Stream output) { var header = new ShellSerializationHeader() { 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 861292a4f..e33c4e7e7 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -110,10 +110,11 @@ namespace mbts.spark.filters { class DynamicItemsFilter : FilterVMBase, IDisposable { readonly IEqualityComparer _equality_comparer; + readonly IComparer _comparer; readonly Func, TState> _get_state; readonly Func>> _load_state; readonly HashSet _items_set, _selected_items_set; - readonly ObservableCollection _unsorted_items; + readonly ObservableCollection _items = new ObservableCollection(); bool _override_desired_selection; IDisposable _desired_items_sub, _items_sub; @@ -129,7 +130,7 @@ namespace mbts.spark.filters { // _items_sub = items.OnDispatcher().Subscribe(new_items => { _items_set.SetItems(new_items.Concat(_selected_items_set)); - _unsorted_items.sync_with(_items_set); + _sync_items(); }); } @@ -148,7 +149,7 @@ namespace mbts.spark.filters { _items_set.Remove(v); foreach (var v in update.added) _items_set.Add(v); - _unsorted_items.sync_with(_items_set); + _sync_items(); }); } @@ -164,11 +165,11 @@ namespace mbts.spark.filters { _get_state = get_state; _load_state = load_state; _equality_comparer = equality_comparer; + _comparer = comparer; _selected_items_set = new HashSet(_equality_comparer); _items_set = new HashSet(_equality_comparer); - _unsorted_items = new ObservableCollection(); - items = comparer != null ? ObservableAutoWrapper.create_sorted_wrapper(_unsorted_items, comparer) : ObservableAutoWrapper.create_read_only_wrapper(_unsorted_items); selected_items.CollectionChanged += _on_selected_items_CollectionChanged; + _sync_items(); } public IReadOnlyObservableCollection items { get; } @@ -238,9 +239,11 @@ namespace mbts.spark.filters { var copy = new HashSet(_selected_items_set, _equality_comparer); _selected_items_set.SetItems(dsi); using (selected_items.SuspendHandler(_on_selected_items_CollectionChanged)) { - foreach (var item in _selected_items_set) { - if (_items_set.Add(item)) - _unsorted_items.Add(item); + var to_add = _selected_items_set.Where(_items_set.Add); + if (_comparer != null) { + _items.InsertSorted(to_add, _comparer); + } else { + _items.AddRange(to_add); } selected_items.sync_with(_selected_items_set); } @@ -248,6 +251,14 @@ namespace mbts.spark.filters { _raise_filter_changed(); } } + + void _sync_items() { + if (_comparer != null) { + _items.sync_with(_items_set.Ordered(_comparer)); + } else { + _items.sync_with(_items_set); + } + } } class TableUpdateItemsFilter : FilterVMBase, IObserver> where TKey : struct, IEquatable { diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index d07248c08..656513fc3 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -687,7 +687,10 @@ - Tick Offset + + Tick Offset + + - Max Show Quantity + + Max Show Quantity + + @@ -944,7 +950,10 @@ - Show Quantity + + Show Quantity + + - Expose Quantity + + Expose Quantity + + - Max Order Quantity + + + Max Order Quantity + + command.Execute(parameter)); + return Task.Run(() => command.Execute(parameter)); } public static void TryExecuteIfCan(this ICommand command, object parameter) { diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index 741efc3fb..9461e25ad 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -10,8 +10,8 @@ xmlns:autocomplete="clr-namespace:WPFTextBoxAutoComplete;assembly=WPFTextBoxAutoComplete" xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Name="_login_view" - Width="460" - Height="254" + Width="520" + Height="230" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" @@ -27,7 +27,7 @@ - 40 + 10 10 22 @@ -206,7 +206,7 @@ x:Name="_error_control" Grid.Column="1" VerticalAlignment="Center" - HorizontalAlignment="Center" + HorizontalAlignment="Left" Visibility="Hidden" Opacity="0" > @@ -251,10 +251,10 @@ - - diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs index 398d994a4..a85da8c0c 100644 --- a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs +++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs @@ -136,8 +136,8 @@ namespace mbts.spark { var skip_local = profiles.WrapSkip(1); var skip_local_wrapper = skip_local.WrapSelector( p => new SettingsProfile(p.id, p.name, p.value.create(), p.security_criteria), - ns => new ProfileVM(ns.id, vm_factory(ns.value), ns.name, ns.security_criteria)); - profiles.Add(_local_profile = new ProfileVM(0, vm_factory(init), "Custom", template_key: ShellSettingsDialog.LocalProfileItemTemplateKey)); + ns => new ProfileVM(ns.id, vm_factory(ns.value), ns.name, ns.security_criteria, target_value: ns.value)); + profiles.Add(_local_profile = new ProfileVM(0, vm_factory(init), "Custom", template_key: ShellSettingsDialog.LocalProfileItemTemplateKey, target_value: init)); _selected_profile = backing(nameof(selected_profile), _local_profile); // dialog skirt items _apply_item = new DialogSkirtItem("Apply", new DelegateCommand(apply)); @@ -325,26 +325,37 @@ namespace mbts.spark { // SecurityCriteria _security_criteria; SettingsProfile _committed, _last_result; + T _target_value; string _name, _template_key; bool _is_selected; IDisposable _dispose; - public ProfileVM(uint id, TVM value, string name, SecurityCriteria security_criteria = null, string template_key = null) { + public ProfileVM(uint id, TVM value, string name, SecurityCriteria security_criteria = null, string template_key = null, T target_value = null) { this.id = id; this.value = value; _name = name; _security_criteria = security_criteria; _template_key = template_key; + _target_value = target_value; _committed = _last_result = create(); _is_dirty = backing(nameof(is_dirty), () => !_last_result.Equals(_committed)); _refresh_is_dirty = new DeferrableActionWrapper(_is_dirty.refresh); var sub = value.Subscribe(v => { _last_result = _last_result.with(value: v); _refresh_is_dirty.execute(); + _on_value_changed(); }); _dispose = value is IDisposable d ? Disposable.Create(sub, d) : sub; } + void _on_value_changed() { + if (_target_value != null && is_dirty && _last_result.value.Equals(_target_value)) { + _target_value = null; + _committed = _last_result; + _refresh_is_dirty.execute(); + } + } + public uint id { get; } public TVM value { get; } public string name { @@ -380,21 +391,26 @@ namespace mbts.spark { /// assign directly to , to capture props that aren't visible in the dialog (i.e., props that are manipulated in the main window) _last_result = data; } + _on_value_changed(); } public void load_value_from(T value) { using (_refresh_is_dirty.defer_execution()) this.value.load_from(value); + _on_value_changed(); } public void commit(SettingsProfile data) { using (_refresh_is_dirty.defer_execution()) _load_from(_committed = data); + _on_value_changed(); } public void commit_current() { _committed = _last_result; + _target_value = _committed.value; _refresh_is_dirty.execute(); + _on_value_changed(); } public void revert() { @@ -402,6 +418,7 @@ namespace mbts.spark { _load_from(_committed); _last_result = _committed; } + _on_value_changed(); } public IObservable subscribe_is_dirty() => _is_dirty.observe_current(true); @@ -414,6 +431,7 @@ namespace mbts.spark { public override string ToString() => _name; void _load_from(SettingsProfile data) { + _target_value = data.value; name = data.name; security_criteria = data.security_criteria; value.load_from(data.value); diff --git a/src/client/spark/view/Spark/Core/TickUtils.cs b/src/client/spark/view/Spark/Core/TickUtils.cs index 8144dd74a..4cf1dcd37 100644 --- a/src/client/spark/view/Spark/Core/TickUtils.cs +++ b/src/client/spark/view/Spark/Core/TickUtils.cs @@ -197,6 +197,7 @@ namespace mbts.spark { static class TickStore { public static readonly RegionalTickFactors default_rtf = new RegionalTickFactors(new TickFactors(1000, 1), new TickFactors(1000, 1), double.MaxValue); static readonly ConcurrentDictionary _exchange_ticks = new ConcurrentDictionary(); + static readonly bool _som_ticks_fix_enabled = config.Configuration.get().enabled; public static RegionalTickFactors get(ContractSpecification spec) => _exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf); @@ -249,8 +250,23 @@ namespace mbts.spark { var tf = _try_create_tf(tick_size, tick_base); if (tf != null && display_digits_override > 0) { int display_digit_diff = (int)display_digits_override - tf.display_digits(); - if (display_digit_diff != 0) + if (_som_ticks_fix_enabled) { + // we can always add display_digits (i.e. dislpay_digit_diff > 0), of course the ticks can be expressed precisely with extra 0s. + // but if we are going to remove display_digits (i.e display_digit_diff < 0), we must make sure the tick_unit is large enough to be expressed precisely with that many fewer digits + // - "-display_digit_diff <= Math.Ceiling(Math.Log10(tf.tick_unit))" will tell us if the digits can be removed without compromising precision + // - unfortunately, we cannot rely on the exchange's ContractSpec for this, there is 1 known case where the data they give us is incorrect + // SOM spreads ContractSpec (from the exchange): + // LowTick: 0.0025 (aka 1/400, or 2/800) + // MainFraction: 8 + // SubFraction: 0 + // PriceDisplayFormat: 1 + // - as you can see, this cannot possibly be formatted with 1 display digit, it ticks in increments of 1/400 + // - in practice, to maintain the '8' base, we format this in increments of 2/800 (e.g. 1-000, 1-002, 1-004, and so on up to 1-778, 2-000) + if (display_digit_diff > 0 || (display_digit_diff < 0 && -display_digit_diff <= Math.Ceiling(Math.Log10(tf.tick_unit)))) + tf = _inflate_to_base(tf, tf.tick_base * Math.Pow(10, display_digit_diff)); + } else if (display_digit_diff != 0) { tf = _inflate_to_base(tf, tf.tick_base * Math.Pow(10, display_digit_diff)); + } } return tf; } diff --git a/src/client/spark_core/utils/ConsoleEx.cs b/src/client/spark_core/utils/ConsoleEx.cs index 4d9f09da7..4abf7891a 100644 --- a/src/client/spark_core/utils/ConsoleEx.cs +++ b/src/client/spark_core/utils/ConsoleEx.cs @@ -25,19 +25,30 @@ namespace bts.test { public static T prompt(string prompt, params T[] options) { return ConsoleEx.prompt(prompt, (IEnumerable)options); } + private static (bool,int) read_small_number() { + var key = Console.ReadKey(); + return (Int32.TryParse(key.KeyChar.ToString(), out int value), value); + } + private static (bool,int) read_big_number() { + var line = Console.ReadLine(); + return (Int32.TryParse(line, out int value), value); + } + private static int read_number(int max) { + do { + (var success,var value) = max > 9 ? read_big_number() : read_small_number(); + if (success && value >= 0 && value <= max) { + return value; + } + }while(true); + } + public static T prompt(string prompt, IEnumerable options) { WriteLine(prompt, ConsoleColor.Yellow); for (int x = 0; x < options.Count(); ++x) { Write($"{x}. ", ConsoleColor.Yellow); WriteLine(options.ElementAt(x).ToString()); } - int response = 0; - bool success = false; - while(!success) { - var key = Console.ReadKey(); - success = Int32.TryParse(key.KeyChar.ToString(), out response); - if (response > options.Count()) success = false; - } + int response = read_number(options.Count()); var value = options.ElementAt(response); Console.WriteLine(" >> " + value.ToString()); Console.WriteLine(); diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index 69b63f8f0..22be985fd 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -20,7 +20,6 @@ namespace mbts.api.Test { ApiTestService[] test_services() { return new[] { _mtest, _ntest }; } public ApiTests() { - config.Configuration.initialize(); _context = ServiceContextTestHelpers.create_private_context(); _native_server = ApiTestsNativeMethods.apitest_start_apitest_service(_context.native_context); _managed_server = new ApiTestServiceServer(_context); @@ -34,7 +33,7 @@ namespace mbts.api.Test { Disposable.dispose(ref _context); } - [Test, Ignore("Times out")] + [Test] public void test_empty_reply_is_not_null() { foreach (var svc in test_services()) { Assert.IsNotNull( @@ -43,7 +42,6 @@ namespace mbts.api.Test { } [Test] - [Ignore("Fixme")] public void hello_server_test() { _mtest.run_hello_service(null); _mtest.run_shout_service(null); diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index a2282dd56..067b4013b 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index 0b2bde2a0..f28197c3b 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index 8b57c72dd..46a224b4e 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -59,18 +59,16 @@ CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* met } CAPI void api_server_update_table(TableHandle htable, StreamUpdate* raw_changes, int change_count) { - if (change_count > 0) { - bts_assert(htable); - qbus::TablePublisher* ptable = reinterpret_cast(htable); - std::vector changes(change_count); - for (int x = 0; x < change_count; ++x) { - StreamUpdate& ch = raw_changes[x]; - std::string buffer(ch.buffer, ch.buffer_len); - qbus::RecordPtr record = std::make_shared(std::move(buffer)); - changes[x] = qbus::Change((qbus::Change::Type)ch.type, qbus::RecordKey(ch.key), record); - } - ptable->publish(std::move(changes)); + bts_assert(htable); + qbus::TablePublisher* ptable = reinterpret_cast(htable); + std::vector changes(change_count); + for (int x = 0; x < change_count; ++x) { + StreamUpdate& ch = raw_changes[x]; + std::string buffer(ch.buffer, ch.buffer_len); + qbus::RecordPtr record = std::make_shared(std::move(buffer)); + changes[x] = qbus::Change((qbus::Change::Type)ch.type, qbus::RecordKey(ch.key), record); } + ptable->publish(std::move(changes)); } CAPI void api_server_destroy_table(qbus::TablePublisher* ptable) { diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 0c86f2a7f..022542544 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -12,6 +12,10 @@ namespace bts{ namespace admin{ + +using namespace bts::api::admin; +using namespace bts::api::orderman; + //////////////////////////////////////////// // connection accessors //////////////////// //////////////////////////////////////////// @@ -55,31 +59,32 @@ bool AdminServiceUtils::has_exchange(const ExchangeConnection& conn, } return rv; } -const bts::api::admin::ExchangeConnection* AdminServiceUtils::find_default_account_connection(const bts::api::admin::AdminData& data, - const bts::api::admin::BTSAccount& account, - bts::api::Venue exchange){ +const ExchangeConnection* AdminServiceUtils::find_default_account_connection( + const AdminData& data, + const BTSAccount& account, + bts::api::Venue exchange){ //todo:get from parent accounts if not overridden if(account.has_connections()) for (const std::string& conn_name : account.connections().exchange_connection_names()){ - const bts::api::admin::ExchangeConnection* conn = find_connection(data, conn_name); + const ExchangeConnection* conn = find_connection(data, conn_name); if (conn!=nullptr && has_exchange(*conn, exchange)) return conn; } return nullptr; } -const bts::api::admin::ExchangeConnection* -AdminServiceUtils::resolve_cme_connection(const bts::api::admin::AdminData& data, - const bts::api::admin::BTSAccount& account, +const ExchangeConnection* AdminServiceUtils::resolve_cme_connection( + const AdminData& data, + const BTSAccount& account, const bts::api::Security& sec){ if(account.has_connections()) for (const std::string& conn_name : account.connections().exchange_connection_names()){ - const bts::api::admin::ExchangeConnection* conn = find_connection(data, conn_name); + const ExchangeConnection* conn = find_connection(data, conn_name); if (conn!=nullptr && conn->has_cme_connection()) if (conn->cme_connection().has_cgw_connection() || (sec.has_glbx() && conn->cme_connection().has_msgw_connection() && conn->cme_connection().msgw_connection().market_segment_id() == sec.glbx().market_segment_id())) - return conn; + return conn; } return nullptr; } @@ -167,45 +172,96 @@ void AdminServiceUtils::fill_connections_from_config(bts::api::admin::AdminData& //////////////////////////////////////////// // account accessors /////////////////////// //////////////////////////////////////////// -bts::api::admin::BTSAccount* AdminServiceUtils::find_account (bts::api::admin::AdminData& data, - const std::string& name, - bool include_deleted){ +BTSAccount* AdminServiceUtils::find_account (AdminData& data, + const std::string& name, + bool include_deleted){ auto account_ptrs = accounts_mutable(data, include_deleted); for (auto account_ptr : account_ptrs) if(name==account_ptr->name()) return account_ptr; return nullptr; } -const bts::api::admin::BTSAccount* AdminServiceUtils::find_account (const bts::api::admin::AdminData& data, - const std::string& name, - bool include_deleted){ +std::map +AdminServiceUtils::get_clearing_account_map(const AdminData& data){ + std::map rv; + auto all_accounts = accounts(data,true); + for (BTSAccount const* a : all_accounts){ + // only for CME, ICE, GLBX + AdminServiceOperationResult res; + // cme + { + auto cme_clr_acc = find_account_exchange_account(data, *a, + api::Venue::VENUE_GLBX, + res); + if(res.is_success()) + rv[cme_clr_acc] = a->id(); + } + // ice + { + auto ice_clr_acc = find_account_exchange_account(data, *a, + api::Venue::VENUE_ICE, + res); + if(res.is_success()) + rv[ice_clr_acc] = a->id(); + } + // sim + { + auto sim_clr_acc = find_account_exchange_account(data, *a, + api::Venue::VENUE_SIM, + res); + if(res.is_success()) + rv[sim_clr_acc] = a->id(); + } + } + return rv; +} +const BTSAccount* AdminServiceUtils::find_account (const AdminData& data, + const std::string& name, + bool include_deleted){ auto account_ptrs = accounts(data, include_deleted); for (auto account_ptr : account_ptrs) if(name==account_ptr->name()) return account_ptr; return nullptr; } -bts::api::admin::BTSAccount* AdminServiceUtils::find_account (bts::api::admin::AdminData& data, - uint32_t id, - bool include_deleted){ + +BTSAccount const* AdminServiceUtils::find_account ( + const AdminData& data, + const std::string& clearing_account, + bts::api::Venue exchange){ + auto all_accounts = accounts(data,true); + for (BTSAccount const* a : all_accounts){ + AdminServiceOperationResult res; + // returns the first account that matches + std::string s = find_account_exchange_account (data, *a, exchange, res); + if (res.is_success() && s == clearing_account) + return a; + } + return nullptr; +} + +BTSAccount* AdminServiceUtils::find_account (AdminData& data, + uint32_t id, + bool include_deleted){ auto account_ptrs = accounts_mutable(data, include_deleted); for (auto account_ptr : account_ptrs) if(id==account_ptr->id()) return account_ptr; return nullptr; } -const bts::api::admin::BTSAccount* AdminServiceUtils::find_account (const bts::api::admin::AdminData& data, - uint32_t id, - bool include_deleted){ +const BTSAccount* AdminServiceUtils::find_account (const AdminData& data, + uint32_t id, + bool include_deleted){ auto account_ptrs = accounts(data, include_deleted); for (auto account_ptr : account_ptrs) if(id==account_ptr->id()) return account_ptr; return nullptr; } -std::vector AdminServiceUtils::accounts (const bts::api::admin::AdminData& data, - bool include_deleted){ - std::vector rv; +std::vector AdminServiceUtils::accounts ( + const AdminData& data, + bool include_deleted){ + std::vector rv; for (const auto& account : data.accounts()) if (account.is_present() || include_deleted) rv.push_back(&account); @@ -228,18 +284,36 @@ uint32_t AdminServiceUtils::find_max_acct_id (const bts::api::admin::AdminData& rv = acct.id(); return rv; } -const bts::api::admin::CMEAccountData* AdminServiceUtils::get_account_cme_data(const bts::api::admin::BTSAccount& account, - const bts::api::admin::AdminData& data){ - if (account.has_exchange_account_data() && account.exchange_account_data().has_cme_account_data()) +const CMEAccountData* AdminServiceUtils::get_account_cme_data( + const BTSAccount& account, + const AdminData& data){ + if (account.has_exchange_account_data() && + account.exchange_account_data().has_cme_account_data()) return &(account.exchange_account_data().cme_account_data()); else if (has_id(account.parent_account_id())){ - const bts::api::admin::BTSAccount* parent_account = find_account(data, account.parent_account_id()); + const BTSAccount* parent_account = + find_account(data, account.parent_account_id()); if (parent_account != nullptr) return get_account_cme_data (*parent_account, data); } return nullptr; } +const ICEAccountData* AdminServiceUtils::get_account_ice_data( + const BTSAccount& account, + const AdminData& data){ + if (account.has_exchange_account_data() && + account.exchange_account_data().has_ice_account_data()) + return &(account.exchange_account_data().ice_account_data()); + else if (has_id(account.parent_account_id())){ + const BTSAccount* parent_account = + find_account(data, account.parent_account_id()); + if (parent_account != nullptr) + return get_account_ice_data (*parent_account, data); + } + return nullptr; +} + const bts::api::admin::SIMAccountData* AdminServiceUtils::get_account_sim_data(const bts::api::admin::BTSAccount& account, const bts::api::admin::AdminData& data){ if (account.has_exchange_account_data() && account.exchange_account_data().has_sim_account_data()) @@ -252,7 +326,7 @@ const bts::api::admin::SIMAccountData* AdminServiceUtils::get_account_sim_data(c return nullptr; } -bool AdminServiceUtils::account_has_connection(const bts::api::admin::BTSAccount& account, +bool AdminServiceUtils::account_has_connection(const BTSAccount& account, const std::string& connection_name){ if(account.has_connections()){ for(int i=0; iclearing_account(); break; } + case api::Venue::VENUE_ICE:{ + auto ice_account_data = get_account_ice_data(account, data); + if (ice_account_data != nullptr) + rv = ice_account_data->clearing_account_override(); + break; + } case api::Venue::VENUE_SIM: { auto sim_account_data = get_account_sim_data(account, data); if (sim_account_data != nullptr) @@ -284,11 +365,11 @@ std::string AdminServiceUtils::find_account_exchange_account (const bts::api::ad case api::Venue::VENUE_UNSET: case api::Venue::VENUE_BTS: case api::Venue::VENUE_CBOE: - case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: + case api::Venue::VENUE_CBOECFE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: - out_result.set_is_success(false); out_result.set_error_text("Exchange not supported"); + out_result.set_is_success(false); + out_result.set_error_text("Exchange not supported"); break; } return rv; diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index da478248a..ebd941cf6 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -60,13 +60,12 @@ public: static BTSAccount* find_account (AdminData& data, const std::string& acct_name, bool include_deleted=false); - + static std::map get_clearing_account_map(const AdminData&); + + // finds the account from a clearing account (and its venue) static BTSAccount const* find_account (const AdminData& data, const std::string& clearing_account, - bts::api::Venue ) { - return find_account(data,clearing_account); - } - + bts::api::Venue); // same as above for const pointer static const BTSAccount* find_account (const AdminData& data, const std::string& acct_name, @@ -92,6 +91,8 @@ public: // if needed) static const CMEAccountData* get_account_cme_data(const BTSAccount& account, const AdminData& data); + static const ICEAccountData* get_account_ice_data(const BTSAccount& account, + const AdminData& data); static const SIMAccountData* get_account_sim_data(const BTSAccount& account, const AdminData& data); // returns true if an account has a connection diff --git a/src/lib/api/services/BasePositionService.proto b/src/lib/api/services/BasePositionService.proto index 48a81a6dc..e6dc77d2f 100644 --- a/src/lib/api/services/BasePositionService.proto +++ b/src/lib/api/services/BasePositionService.proto @@ -11,12 +11,12 @@ message GMI_ParseResult { } } -message CSVBlock { +message GMI_CSVBlock { string text = 1; } service BasePositionService { option (bts.api.service_description) = - "Obtains an initial position from an external source and invokes the Position Service with it"; - rpc parse_gmi_csv (CSVBlock) returns (GMI_ParseResult); + "Obtains an initial position from an external source and invokes the Position Service with it. Also provides on demand parsing of the GMI format"; + rpc parse_gmi_csv (GMI_CSVBlock) returns (GMI_ParseResult); } \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index abe7a343b..d2d9d67b5 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -48,6 +48,15 @@ message CashBalanceUpdate { double cash_balance = 20; } +message CashBalanceItem { + int32 account_id = 1; + double cash_balance = 2; +} + +message CashBalanceBatch { + repeated CashBalanceItem cash_balance = 1; +} + message EnforceUpdate { string account = 10; bool should_enforce_margin = 20; @@ -61,7 +70,8 @@ service MarginService { rpc set_should_enforce_margin(EnforceUpdate) returns (bts.api.ResultMessage); rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage); rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage); - + rpc set_cash_balance_batch(CashBalanceBatch) returns (bts.api.ResultMessage); + rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); rpc excess_liquidity_report(bts.api.VoidMessage) returns (stream ExcessLiquidityReport); } \ No newline at end of file diff --git a/src/lib/api/services/MoneyFileService.proto b/src/lib/api/services/MoneyFileService.proto new file mode 100644 index 000000000..5418fc1f8 --- /dev/null +++ b/src/lib/api/services/MoneyFileService.proto @@ -0,0 +1,22 @@ +syntax="proto3"; +package bts.api.position; +option csharp_namespace="bts.api.position"; +import "lib/api/apioptions.proto"; +import "lib/api/services/MarginService.proto"; + +message Money_ParseResult { + oneof result { + string failure = 1; + CashBalanceBatch success = 2; + } +} + +message Money_CSVBlock { + string text = 1; +} + +service MoneyFileService { + option (bts.api.service_description) = + "Obtains cash balances from an external source and invokes the margin service with them. Also provides on demand parsing of the money file"; + rpc parse_money_csv (Money_CSVBlock) returns (Money_ParseResult); +} \ No newline at end of file diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index 538be9ce6..24e3630c6 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -31,6 +31,10 @@ message PositionUnit{ double day_short_avg_price = 100; PositionEntry sod = 110; PositionEntry day = 120; + // this is the position without the spread legs + // being incorporated into the outright position + // (for spreads, day == raw_day) + PositionEntry raw_day = 125; PositionEntry local = 130; PositionEntry admin_sod = 140; PositionEntry admin_day = 150; diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index f22836227..a8dd25828 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -94,3 +94,14 @@ MDBootDelayWindow { } } } + +DisplayFactorOverride { + value { + override { + symbol: "SOM" + exchange: "GLBX" + type: "SPREAD" + price_multiplier: 1 + } + } +} diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index abe1a2924..ac365cefb 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -90,8 +90,6 @@ CppConfig cpp_entry { key: "8D" value: 1000 } cpp_entry { key: "8W" value: 1000 } cpp_entry { key: "8XN" value: 2500 } - cpp_entry { key: "8ZN" value: 2500 } - cpp_entry { key: "9FN" value: 2500 } cpp_entry { key: "9Q" value: 1000 } cpp_entry { key: "A0D" value: 100 } cpp_entry { key: "A0F" value: 100 } @@ -163,6 +161,7 @@ CppConfig cpp_entry { key: "AAW" value: 42000 } cpp_entry { key: "AB3" value: 80 } cpp_entry { key: "AB7" value: 1000 } + cpp_entry { key: "ABF" value: 100 } cpp_entry { key: "ABH" value: 42000 } cpp_entry { key: "ABI" value: 1000 } cpp_entry { key: "ABS" value: 1000 } @@ -170,6 +169,7 @@ CppConfig cpp_entry { key: "ABX" value: 1000 } cpp_entry { key: "ABY" value: 1000 } cpp_entry { key: "AC0" value: 42000 } + cpp_entry { key: "ACB" value: 1000 } cpp_entry { key: "ACD" value: 200000 } cpp_entry { key: "ACM" value: 1000 } cpp_entry { key: "ACT" value: 1000 } @@ -183,7 +183,7 @@ CppConfig cpp_entry { key: "AE5" value: 1000 } cpp_entry { key: "AE8" value: 5 } cpp_entry { key: "AE9" value: 80 } - cpp_entry { key: "AEJ" value: 960 } + cpp_entry { key: "AEB" value: 1000 } cpp_entry { key: "AEP" value: 25 } cpp_entry { key: "AET" value: 1000 } cpp_entry { key: "AEZ" value: 42000 } @@ -222,7 +222,6 @@ CppConfig cpp_entry { key: "AJB" value: 1000 } cpp_entry { key: "AJJ" value: 5 } cpp_entry { key: "AJL" value: 42000 } - cpp_entry { key: "AJP" value: 960 } cpp_entry { key: "AJR" value: 1000 } cpp_entry { key: "AJS" value: 42000 } cpp_entry { key: "AJU" value: 42000 } @@ -346,7 +345,6 @@ CppConfig cpp_entry { key: "BCF" value: 50 } cpp_entry { key: "BCH" value: 50 } cpp_entry { key: "BDB" value: 1000 } - cpp_entry { key: "BDI" value: 100 } cpp_entry { key: "BDS" value: 1000 } cpp_entry { key: "BFR" value: 100 } cpp_entry { key: "BG" value: 1000 } @@ -357,13 +355,12 @@ CppConfig cpp_entry { key: "BOO" value: 6350 } cpp_entry { key: "BOS" value: 250 } cpp_entry { key: "BR7" value: 1000 } - cpp_entry { key: "BSW" value: 136 } + cpp_entry { key: "BSF" value: 25 } cpp_entry { key: "BTC" value: 5 } cpp_entry { key: "BTT" value: 50 } cpp_entry { key: "BUB" value: 1000 } cpp_entry { key: "BUC" value: 42000 } cpp_entry { key: "BUS" value: 20 } - cpp_entry { key: "BUW" value: 20 } cpp_entry { key: "BWF" value: 50 } cpp_entry { key: "BWH" value: 50 } cpp_entry { key: "BZ" value: 1000 } @@ -394,6 +391,7 @@ CppConfig cpp_entry { key: "CFB" value: 1000 } cpp_entry { key: "CFC" value: 1000 } cpp_entry { key: "CGB" value: 42000 } + cpp_entry { key: "CHB" value: 1000 } cpp_entry { key: "CHI" value: 250 } cpp_entry { key: "CHL" value: 100000 } cpp_entry { key: "CHP" value: 50000000 } @@ -406,9 +404,11 @@ CppConfig cpp_entry { key: "CL" value: 1000 } cpp_entry { key: "CL1" value: 1000 } cpp_entry { key: "CL2" value: 1000 } + cpp_entry { key: "CLD" value: 1000 } cpp_entry { key: "CLL" value: 1000 } cpp_entry { key: "CLS" value: 1000 } cpp_entry { key: "CLT" value: 1000 } + cpp_entry { key: "CMB" value: 1000 } cpp_entry { key: "CMF" value: 1000 } cpp_entry { key: "CNH" value: 100000 } cpp_entry { key: "COL" value: 80 } @@ -431,7 +431,6 @@ CppConfig cpp_entry { key: "CUS" value: 250 } cpp_entry { key: "CY" value: 1000 } cpp_entry { key: "CZK" value: 4000000 } - cpp_entry { key: "CZN" value: 2500 } cpp_entry { key: "D0" value: 20 } cpp_entry { key: "D0X" value: 20 } cpp_entry { key: "D0Z" value: 20 } @@ -461,9 +460,9 @@ CppConfig cpp_entry { key: "DDO" value: 1000 } cpp_entry { key: "DEB" value: 744 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 252 } + cpp_entry { key: "DEP" value: 264 } cpp_entry { key: "DFL" value: 100 } - cpp_entry { key: "DFT" value: 100 } + cpp_entry { key: "DFN" value: 100 } cpp_entry { key: "DG2" value: 100 } cpp_entry { key: "DG3" value: 100 } cpp_entry { key: "DGH" value: 1000 } @@ -472,7 +471,6 @@ CppConfig cpp_entry { key: "DGT" value: 100 } cpp_entry { key: "DHA" value: 80 } cpp_entry { key: "DHI" value: 1000 } - cpp_entry { key: "DIH" value: 2500 } cpp_entry { key: "DJR" value: 100 } cpp_entry { key: "DKR" value: 1000 } cpp_entry { key: "DMB" value: 100 } @@ -503,7 +501,6 @@ CppConfig cpp_entry { key: "EAC" value: 80 } cpp_entry { key: "EAD" value: 125000 } cpp_entry { key: "EAE" value: 5 } - cpp_entry { key: "EAF" value: 1000 } cpp_entry { key: "EAW" value: 80 } cpp_entry { key: "EBE" value: 1000 } cpp_entry { key: "ECD" value: 125000 } @@ -542,7 +539,6 @@ CppConfig cpp_entry { key: "EST" value: 50 } cpp_entry { key: "ETT" value: 100 } cpp_entry { key: "EUB" value: 80 } - cpp_entry { key: "EUL" value: 1000 } cpp_entry { key: "EURADC" value: 1 } cpp_entry { key: "EURBPC" value: 1 } cpp_entry { key: "EURBPN" value: 1 } @@ -668,17 +664,24 @@ CppConfig cpp_entry { key: "H4X" value: 20 } cpp_entry { key: "H4Z" value: 20 } cpp_entry { key: "H5" value: 20 } + cpp_entry { key: "H5B" value: 1000 } cpp_entry { key: "H5F" value: 1000 } cpp_entry { key: "H5G" value: 1000 } cpp_entry { key: "H5L" value: 80 } cpp_entry { key: "H5X" value: 20 } cpp_entry { key: "H5Z" value: 20 } cpp_entry { key: "HB" value: 2500 } + cpp_entry { key: "HBC" value: 1000 } + cpp_entry { key: "HBR" value: 1000 } cpp_entry { key: "HCL" value: 1000 } + cpp_entry { key: "HDB" value: 1000 } cpp_entry { key: "HE" value: 400 } cpp_entry { key: "HET" value: 400 } cpp_entry { key: "HG" value: 25000 } cpp_entry { key: "HG0" value: 25000 } + cpp_entry { key: "HGB" value: 1000 } + cpp_entry { key: "HGF" value: 25000 } + cpp_entry { key: "HGK" value: 25000 } cpp_entry { key: "HGS" value: 25000 } cpp_entry { key: "HGT" value: 25000 } cpp_entry { key: "HH" value: 10000 } @@ -703,11 +706,16 @@ CppConfig cpp_entry { key: "HQX" value: 20 } cpp_entry { key: "HQZ" value: 20 } cpp_entry { key: "HRC" value: 20 } + cpp_entry { key: "HRP" value: 20 } cpp_entry { key: "HS" value: 20 } cpp_entry { key: "HSX" value: 20 } cpp_entry { key: "HSZ" value: 20 } cpp_entry { key: "HTA" value: 1000 } cpp_entry { key: "HTB" value: 1000 } + cpp_entry { key: "HTC" value: 1000 } + cpp_entry { key: "HTE" value: 1000 } + cpp_entry { key: "HTI" value: 1000 } + cpp_entry { key: "HTM" value: 1000 } cpp_entry { key: "HTT" value: 1000 } cpp_entry { key: "HUF" value: 30000000 } cpp_entry { key: "HWA" value: 80 } @@ -719,7 +727,6 @@ CppConfig cpp_entry { key: "ICI" value: 1000 } cpp_entry { key: "IDL" value: 5 } cpp_entry { key: "IH" value: 50 } - cpp_entry { key: "ILB" value: 1750 } cpp_entry { key: "ILS" value: 1000000 } cpp_entry { key: "IN" value: 2500 } cpp_entry { key: "IP" value: 50 } @@ -727,11 +734,12 @@ CppConfig cpp_entry { key: "IPT" value: 10 } cpp_entry { key: "IS" value: 50 } cpp_entry { key: "ITB" value: 744 } - cpp_entry { key: "ITP" value: 252 } + cpp_entry { key: "ITP" value: 264 } cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } cpp_entry { key: "JA" value: 1000 } + cpp_entry { key: "JCC" value: 1000 } cpp_entry { key: "JDL" value: 80 } cpp_entry { key: "JE" value: 42000 } cpp_entry { key: "JET" value: 42000 } @@ -740,7 +748,7 @@ CppConfig cpp_entry { key: "JKB" value: 10000 } cpp_entry { key: "JKF" value: 10000 } cpp_entry { key: "JKM" value: 10000 } - cpp_entry { key: "JML" value: 200 } + cpp_entry { key: "JML" value: 480 } cpp_entry { key: "JNC" value: 1000 } cpp_entry { key: "JNG" value: 10000 } cpp_entry { key: "JNL" value: 80 } @@ -809,6 +817,9 @@ CppConfig cpp_entry { key: "LSW" value: 1000 } cpp_entry { key: "LT" value: 42000 } cpp_entry { key: "LWB" value: 1000 } + cpp_entry { key: "M1B" value: 10 } + cpp_entry { key: "M2K" value: 5 } + cpp_entry { key: "M35" value: 10 } cpp_entry { key: "M5F" value: 10 } cpp_entry { key: "M6A" value: 10000 } cpp_entry { key: "M6B" value: 6250 } @@ -839,10 +850,11 @@ CppConfig cpp_entry { key: "MEB" value: 100 } cpp_entry { key: "MEE" value: 100 } cpp_entry { key: "MEF" value: 10 } - cpp_entry { key: "MEL" value: 840 } cpp_entry { key: "MEO" value: 100 } + cpp_entry { key: "MES" value: 5 } cpp_entry { key: "MEW" value: 100 } cpp_entry { key: "MFB" value: 1000 } + cpp_entry { key: "MFC" value: 100 } cpp_entry { key: "MFD" value: 100 } cpp_entry { key: "MFF" value: 1000 } cpp_entry { key: "MFP" value: 100 } @@ -879,6 +891,7 @@ CppConfig cpp_entry { key: "MNE" value: 100 } cpp_entry { key: "MNG" value: 2500 } cpp_entry { key: "MNH" value: 10000 } + cpp_entry { key: "MNQ" value: 2 } cpp_entry { key: "MNS" value: 635 } cpp_entry { key: "MNT" value: 80 } cpp_entry { key: "MO" value: 1000 } @@ -910,6 +923,7 @@ CppConfig cpp_entry { key: "MXB" value: 35000 } cpp_entry { key: "MXL" value: 5 } cpp_entry { key: "MXR" value: 35000 } + cpp_entry { key: "MYM" value: 0.5 } cpp_entry { key: "N1B" value: 1000 } cpp_entry { key: "N1R" value: 10 } cpp_entry { key: "N1T" value: 10 } @@ -927,7 +941,6 @@ CppConfig cpp_entry { key: "NCF" value: 100 } cpp_entry { key: "NCO" value: 5 } cpp_entry { key: "NCP" value: 100 } - cpp_entry { key: "NEN" value: 2500 } cpp_entry { key: "NEO" value: 5 } cpp_entry { key: "NEP" value: 80 } cpp_entry { key: "NFC" value: 1000 } @@ -941,10 +954,14 @@ CppConfig cpp_entry { key: "NHN" value: 2500 } cpp_entry { key: "NHO" value: 5 } cpp_entry { key: "NHP" value: 80 } + cpp_entry { key: "NIM" value: 500 } + cpp_entry { key: "NIT" value: 500 } cpp_entry { key: "NIY" value: 500 } cpp_entry { key: "NJ" value: 2500 } cpp_entry { key: "NKD" value: 5 } + cpp_entry { key: "NKM" value: 5 } cpp_entry { key: "NKN" value: 2500 } + cpp_entry { key: "NKT" value: 5 } cpp_entry { key: "NL" value: 2500 } cpp_entry { key: "NLS" value: 42000 } cpp_entry { key: "NMO" value: 5 } @@ -984,7 +1001,7 @@ CppConfig cpp_entry { key: "NYR" value: 42000 } cpp_entry { key: "NYT" value: 1000 } cpp_entry { key: "NZDUSC" value: 1 } - cpp_entry { key: "NZN" value: 2500 } + cpp_entry { key: "NZDUSD" value: 1 } cpp_entry { key: "OAD" value: 1 } cpp_entry { key: "ODO" value: 1000 } cpp_entry { key: "OFF" value: 5 } @@ -1000,6 +1017,7 @@ CppConfig cpp_entry { key: "OVL" value: 5 } cpp_entry { key: "PA" value: 100 } cpp_entry { key: "PAL" value: 80 } + cpp_entry { key: "PAM" value: 10 } cpp_entry { key: "PAT" value: 100 } cpp_entry { key: "PBO" value: 5 } cpp_entry { key: "PBP" value: 80 } @@ -1020,7 +1038,6 @@ CppConfig cpp_entry { key: "PHF" value: 5 } cpp_entry { key: "PHO" value: 5 } cpp_entry { key: "PHP" value: 80 } - cpp_entry { key: "PIO" value: 500 } cpp_entry { key: "PJY" value: 125000 } cpp_entry { key: "PKP" value: 80 } cpp_entry { key: "PL" value: 50 } @@ -1082,6 +1099,8 @@ CppConfig cpp_entry { key: "R2T" value: 10 } cpp_entry { key: "R2V" value: 50 } cpp_entry { key: "R53" value: 1000 } + cpp_entry { key: "R5B" value: 1000 } + cpp_entry { key: "R5E" value: 1000 } cpp_entry { key: "R5F" value: 1000 } cpp_entry { key: "R5M" value: 100 } cpp_entry { key: "R5O" value: 10 } @@ -1091,6 +1110,7 @@ CppConfig cpp_entry { key: "RBF" value: 100 } cpp_entry { key: "RBG" value: 42000 } cpp_entry { key: "RBL" value: 42000 } + cpp_entry { key: "RBM" value: 100 } cpp_entry { key: "RBS" value: 42000 } cpp_entry { key: "RBT" value: 42000 } cpp_entry { key: "REX" value: 100 } @@ -1119,13 +1139,15 @@ CppConfig cpp_entry { key: "RYA" value: 42000 } cpp_entry { key: "S1U" value: 1000 } cpp_entry { key: "S53" value: 1000 } + cpp_entry { key: "S5B" value: 1000 } cpp_entry { key: "S5F" value: 1000 } cpp_entry { key: "S5M" value: 100 } cpp_entry { key: "S5O" value: 10 } + cpp_entry { key: "SBM" value: 100 } cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1600 } + cpp_entry { key: "SDD" value: 1760 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1157,12 +1179,14 @@ CppConfig cpp_entry { key: "SMT" value: 100 } cpp_entry { key: "SMU" value: 1000 } cpp_entry { key: "SMW" value: 100 } + cpp_entry { key: "SOM" value: 500 } cpp_entry { key: "SON" value: 2500 } cpp_entry { key: "SP" value: 250 } cpp_entry { key: "SR1" value: 4167 } cpp_entry { key: "SR3" value: 2500 } cpp_entry { key: "SR5" value: 1000 } - cpp_entry { key: "SRT" value: 1600 } + cpp_entry { key: "SRB" value: 1000 } + cpp_entry { key: "SRT" value: 1760 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1173,25 +1197,31 @@ CppConfig cpp_entry { key: "STY" value: 1000 } cpp_entry { key: "SU" value: 250 } cpp_entry { key: "SUT" value: 250 } - cpp_entry { key: "T02" value: 800 } cpp_entry { key: "T03" value: 800 } cpp_entry { key: "T04" value: 800 } + cpp_entry { key: "T06" value: 800 } + cpp_entry { key: "T07" value: 800 } + cpp_entry { key: "T08" value: 800 } + cpp_entry { key: "T09" value: 800 } + cpp_entry { key: "T12" value: 800 } cpp_entry { key: "T13" value: 800 } cpp_entry { key: "T14" value: 800 } - cpp_entry { key: "T17" value: 800 } - cpp_entry { key: "T18" value: 800 } + cpp_entry { key: "T15" value: 800 } + cpp_entry { key: "T16" value: 800 } cpp_entry { key: "T19" value: 800 } cpp_entry { key: "T1U" value: 1000 } cpp_entry { key: "T20" value: 800 } cpp_entry { key: "T21" value: 800 } - cpp_entry { key: "T24" value: 800 } + cpp_entry { key: "T22" value: 800 } + cpp_entry { key: "T23" value: 800 } cpp_entry { key: "T26" value: 800 } cpp_entry { key: "T27" value: 800 } cpp_entry { key: "T28" value: 800 } + cpp_entry { key: "T29" value: 800 } cpp_entry { key: "T2B" value: 1000 } cpp_entry { key: "T2D" value: 1000 } cpp_entry { key: "T2M" value: 100 } - cpp_entry { key: "T31" value: 800 } + cpp_entry { key: "T30" value: 800 } cpp_entry { key: "T3B" value: 1000 } cpp_entry { key: "T3L" value: 80 } cpp_entry { key: "T4B" value: 1000 } @@ -1207,6 +1237,7 @@ CppConfig cpp_entry { key: "TC" value: 2500 } cpp_entry { key: "TC6" value: 1000 } cpp_entry { key: "TC9" value: 1000 } + cpp_entry { key: "TCS" value: 1000 } cpp_entry { key: "TD3" value: 1000 } cpp_entry { key: "TD8" value: 1000 } cpp_entry { key: "TEX" value: 1000 } @@ -1216,6 +1247,7 @@ CppConfig cpp_entry { key: "THB" value: 1000 } cpp_entry { key: "THD" value: 10000 } cpp_entry { key: "TIC" value: 500 } + cpp_entry { key: "TIL" value: 1000 } cpp_entry { key: "TIO" value: 500 } cpp_entry { key: "TK" value: 1000 } cpp_entry { key: "TKB" value: 1000 } @@ -1252,7 +1284,6 @@ CppConfig cpp_entry { key: "TUT" value: 1000 } cpp_entry { key: "TUX" value: 1000 } cpp_entry { key: "TW" value: 1000 } - cpp_entry { key: "TXN" value: 2500 } cpp_entry { key: "TYT" value: 1000 } cpp_entry { key: "TYX" value: 1000 } cpp_entry { key: "TZ6" value: 2500 } @@ -1262,10 +1293,12 @@ CppConfig cpp_entry { key: "UB" value: 1000 } cpp_entry { key: "UCM" value: 100 } cpp_entry { key: "UDL" value: 80 } + cpp_entry { key: "UFB" value: 100 } + cpp_entry { key: "UFE" value: 100 } cpp_entry { key: "UFG" value: 100 } cpp_entry { key: "UFN" value: 100 } cpp_entry { key: "UFU" value: 100 } - cpp_entry { key: "UFZ" value: 100 } + cpp_entry { key: "UFV" value: 100 } cpp_entry { key: "UGG" value: 42000 } cpp_entry { key: "UKG" value: 310 } cpp_entry { key: "ULB" value: 42000 } @@ -1276,10 +1309,12 @@ CppConfig cpp_entry { key: "UNB" value: 1000 } cpp_entry { key: "UNS" value: 1000 } cpp_entry { key: "UR" value: 1000 } + cpp_entry { key: "USC" value: 1000 } cpp_entry { key: "USDBRL" value: 1 } cpp_entry { key: "USDCAC" value: 1 } cpp_entry { key: "USDCAD" value: 1 } cpp_entry { key: "USDCAN" value: 1 } + cpp_entry { key: "USDCHF" value: 10 } cpp_entry { key: "USDCKC" value: 1 } cpp_entry { key: "USDCLP" value: 1 } cpp_entry { key: "USDCNY" value: 1 } @@ -1309,6 +1344,7 @@ CppConfig cpp_entry { key: "USDTLC" value: 1 } cpp_entry { key: "USDTWD" value: 1 } cpp_entry { key: "USDZRC" value: 1 } + cpp_entry { key: "USE" value: 1000 } cpp_entry { key: "UV" value: 1000 } cpp_entry { key: "UX" value: 250 } cpp_entry { key: "V3L" value: 5 } @@ -1338,6 +1374,7 @@ CppConfig cpp_entry { key: "WTA" value: 1000 } cpp_entry { key: "WTD" value: 1000 } cpp_entry { key: "WTI" value: 1000 } + cpp_entry { key: "WTL" value: 1000 } cpp_entry { key: "WTS" value: 1000 } cpp_entry { key: "WTT" value: 1000 } cpp_entry { key: "X0" value: 1000 } @@ -1390,6 +1427,7 @@ CppConfig cpp_entry { key: "YWE" value: 80 } cpp_entry { key: "YWF" value: 5 } cpp_entry { key: "YWK" value: 5 } + cpp_entry { key: "Z00000" value: 1000 } cpp_entry { key: "Z1B" value: 100 } cpp_entry { key: "Z3N" value: 2000 } cpp_entry { key: "Z4" value: 1000 } @@ -1507,8 +1545,6 @@ CmeSymbolMics cme_mic { key: "8D" value: NYMEX } cme_mic { key: "8W" value: NYMEX } cme_mic { key: "8XN" value: NYMEX } - cme_mic { key: "8ZN" value: NYMEX } - cme_mic { key: "9FN" value: NYMEX } cme_mic { key: "9Q" value: NYMEX } cme_mic { key: "A0D" value: NYMEX } cme_mic { key: "A0F" value: NYMEX } @@ -1580,6 +1616,7 @@ CmeSymbolMics cme_mic { key: "AAW" value: NYMEX } cme_mic { key: "AB3" value: NYMEX } cme_mic { key: "AB7" value: NYMEX } + cme_mic { key: "ABF" value: NYMEX } cme_mic { key: "ABH" value: NYMEX } cme_mic { key: "ABI" value: NYMEX } cme_mic { key: "ABS" value: NYMEX } @@ -1587,6 +1624,7 @@ CmeSymbolMics cme_mic { key: "ABX" value: NYMEX } cme_mic { key: "ABY" value: NYMEX } cme_mic { key: "AC0" value: NYMEX } + cme_mic { key: "ACB" value: NYMEX } cme_mic { key: "ACD" value: CME } cme_mic { key: "ACM" value: NYMEX } cme_mic { key: "ACT" value: NYMEX } @@ -1600,7 +1638,7 @@ CmeSymbolMics cme_mic { key: "AE5" value: NYMEX } cme_mic { key: "AE8" value: NYMEX } cme_mic { key: "AE9" value: NYMEX } - cme_mic { key: "AEJ" value: NYMEX } + cme_mic { key: "AEB" value: NYMEX } cme_mic { key: "AEP" value: COMEX } cme_mic { key: "AET" value: NYMEX } cme_mic { key: "AEZ" value: NYMEX } @@ -1639,7 +1677,6 @@ CmeSymbolMics cme_mic { key: "AJB" value: NYMEX } cme_mic { key: "AJJ" value: NYMEX } cme_mic { key: "AJL" value: NYMEX } - cme_mic { key: "AJP" value: NYMEX } cme_mic { key: "AJR" value: NYMEX } cme_mic { key: "AJS" value: NYMEX } cme_mic { key: "AJU" value: NYMEX } @@ -1763,7 +1800,6 @@ CmeSymbolMics cme_mic { key: "BCF" value: CBT } cme_mic { key: "BCH" value: CBT } cme_mic { key: "BDB" value: NYMEX } - cme_mic { key: "BDI" value: CME } cme_mic { key: "BDS" value: DME } cme_mic { key: "BFR" value: NYMEX } cme_mic { key: "BG" value: NYMEX } @@ -1774,13 +1810,12 @@ CmeSymbolMics cme_mic { key: "BOO" value: NYMEX } cme_mic { key: "BOS" value: CME } cme_mic { key: "BR7" value: NYMEX } - cme_mic { key: "BSW" value: CBT } + cme_mic { key: "BSF" value: CBT } cme_mic { key: "BTC" value: CME } cme_mic { key: "BTT" value: CME } cme_mic { key: "BUB" value: CBT } cme_mic { key: "BUC" value: NYMEX } cme_mic { key: "BUS" value: NYMEX } - cme_mic { key: "BUW" value: NYMSW } cme_mic { key: "BWF" value: CBT } cme_mic { key: "BWH" value: CBT } cme_mic { key: "BZ" value: NYMEX } @@ -1811,6 +1846,7 @@ CmeSymbolMics cme_mic { key: "CFB" value: NYMEX } cme_mic { key: "CFC" value: NYMEX } cme_mic { key: "CGB" value: NYMEX } + cme_mic { key: "CHB" value: NYMEX } cme_mic { key: "CHI" value: CME } cme_mic { key: "CHL" value: CME } cme_mic { key: "CHP" value: CME } @@ -1823,9 +1859,11 @@ CmeSymbolMics cme_mic { key: "CL" value: NYMEX } cme_mic { key: "CL1" value: NYMEX } cme_mic { key: "CL2" value: NYMEX } + cme_mic { key: "CLD" value: NYMEX } cme_mic { key: "CLL" value: NYMEX } cme_mic { key: "CLS" value: NYMEX } cme_mic { key: "CLT" value: NYMEX } + cme_mic { key: "CMB" value: NYMEX } cme_mic { key: "CMF" value: NYMEX } cme_mic { key: "CNH" value: CME } cme_mic { key: "COL" value: NYMEX } @@ -1848,7 +1886,6 @@ CmeSymbolMics cme_mic { key: "CUS" value: CME } cme_mic { key: "CY" value: NYMEX } cme_mic { key: "CZK" value: CME } - cme_mic { key: "CZN" value: NYMEX } cme_mic { key: "D0" value: CME } cme_mic { key: "D0X" value: CME } cme_mic { key: "D0Z" value: CME } @@ -1880,7 +1917,7 @@ CmeSymbolMics cme_mic { key: "DEN" value: CME } cme_mic { key: "DEP" value: NYMEX } cme_mic { key: "DFL" value: CBT } - cme_mic { key: "DFT" value: CBT } + cme_mic { key: "DFN" value: CBT } cme_mic { key: "DG2" value: CBT } cme_mic { key: "DG3" value: CBT } cme_mic { key: "DGH" value: DME } @@ -1889,7 +1926,6 @@ CmeSymbolMics cme_mic { key: "DGT" value: CBT } cme_mic { key: "DHA" value: NYMEX } cme_mic { key: "DHI" value: DME } - cme_mic { key: "DIH" value: NYMEX } cme_mic { key: "DJR" value: CBT } cme_mic { key: "DKR" value: DME } cme_mic { key: "DMB" value: DME } @@ -1920,7 +1956,6 @@ CmeSymbolMics cme_mic { key: "EAC" value: NYMEX } cme_mic { key: "EAD" value: CME } cme_mic { key: "EAE" value: NYMEX } - cme_mic { key: "EAF" value: NYMEX } cme_mic { key: "EAW" value: NYMEX } cme_mic { key: "EBE" value: NYMEX } cme_mic { key: "ECD" value: CME } @@ -1959,7 +1994,6 @@ CmeSymbolMics cme_mic { key: "EST" value: CME } cme_mic { key: "ETT" value: CME } cme_mic { key: "EUB" value: NYMEX } - cme_mic { key: "EUL" value: NYMEX } cme_mic { key: "EURADC" value: CME } cme_mic { key: "EURBPC" value: CME } cme_mic { key: "EURBPN" value: CME } @@ -2085,17 +2119,24 @@ CmeSymbolMics cme_mic { key: "H4X" value: CME } cme_mic { key: "H4Z" value: CME } cme_mic { key: "H5" value: CME } + cme_mic { key: "H5B" value: NYMEX } cme_mic { key: "H5F" value: NYMEX } cme_mic { key: "H5G" value: NYMEX } cme_mic { key: "H5L" value: NYMEX } cme_mic { key: "H5X" value: CME } cme_mic { key: "H5Z" value: CME } cme_mic { key: "HB" value: NYMEX } + cme_mic { key: "HBC" value: NYMEX } + cme_mic { key: "HBR" value: NYMEX } cme_mic { key: "HCL" value: NYMEX } + cme_mic { key: "HDB" value: NYMEX } cme_mic { key: "HE" value: CME } cme_mic { key: "HET" value: CME } cme_mic { key: "HG" value: COMEX } cme_mic { key: "HG0" value: COMEX } + cme_mic { key: "HGB" value: NYMEX } + cme_mic { key: "HGF" value: COMEX } + cme_mic { key: "HGK" value: COMEX } cme_mic { key: "HGS" value: COMEX } cme_mic { key: "HGT" value: COMEX } cme_mic { key: "HH" value: NYMEX } @@ -2120,11 +2161,16 @@ CmeSymbolMics cme_mic { key: "HQX" value: CME } cme_mic { key: "HQZ" value: CME } cme_mic { key: "HRC" value: NYMEX } + cme_mic { key: "HRP" value: COMEX } cme_mic { key: "HS" value: CME } cme_mic { key: "HSX" value: CME } cme_mic { key: "HSZ" value: CME } cme_mic { key: "HTA" value: NYMEX } cme_mic { key: "HTB" value: NYMEX } + cme_mic { key: "HTC" value: NYMEX } + cme_mic { key: "HTE" value: NYMEX } + cme_mic { key: "HTI" value: NYMEX } + cme_mic { key: "HTM" value: NYMEX } cme_mic { key: "HTT" value: NYMEX } cme_mic { key: "HUF" value: CME } cme_mic { key: "HWA" value: NYMEX } @@ -2136,7 +2182,6 @@ CmeSymbolMics cme_mic { key: "ICI" value: NYMEX } cme_mic { key: "IDL" value: NYMEX } cme_mic { key: "IH" value: MGE } - cme_mic { key: "ILB" value: NYMEX } cme_mic { key: "ILS" value: CME } cme_mic { key: "IN" value: NYMEX } cme_mic { key: "IP" value: MGE } @@ -2149,6 +2194,7 @@ CmeSymbolMics cme_mic { key: "J4L" value: NYMEX } cme_mic { key: "J7" value: CME } cme_mic { key: "JA" value: NYMEX } + cme_mic { key: "JCC" value: NYMEX } cme_mic { key: "JDL" value: NYMEX } cme_mic { key: "JE" value: NYMEX } cme_mic { key: "JET" value: NYMEX } @@ -2226,6 +2272,9 @@ CmeSymbolMics cme_mic { key: "LSW" value: NYMEX } cme_mic { key: "LT" value: NYMEX } cme_mic { key: "LWB" value: NYMEX } + cme_mic { key: "M1B" value: NYMEX } + cme_mic { key: "M2K" value: CME } + cme_mic { key: "M35" value: NYMEX } cme_mic { key: "M5F" value: NYMEX } cme_mic { key: "M6A" value: CME } cme_mic { key: "M6B" value: CME } @@ -2256,10 +2305,11 @@ CmeSymbolMics cme_mic { key: "MEB" value: NYMEX } cme_mic { key: "MEE" value: NYMEX } cme_mic { key: "MEF" value: NYMEX } - cme_mic { key: "MEL" value: NYMEX } cme_mic { key: "MEO" value: NYMEX } + cme_mic { key: "MES" value: CME } cme_mic { key: "MEW" value: NYMEX } cme_mic { key: "MFB" value: NYMEX } + cme_mic { key: "MFC" value: CBT } cme_mic { key: "MFD" value: NYMEX } cme_mic { key: "MFF" value: NYMEX } cme_mic { key: "MFP" value: NYMEX } @@ -2296,6 +2346,7 @@ CmeSymbolMics cme_mic { key: "MNE" value: NYMEX } cme_mic { key: "MNG" value: NYMEX } cme_mic { key: "MNH" value: CME } + cme_mic { key: "MNQ" value: CME } cme_mic { key: "MNS" value: NYMEX } cme_mic { key: "MNT" value: NYMEX } cme_mic { key: "MO" value: NYMEX } @@ -2327,6 +2378,7 @@ CmeSymbolMics cme_mic { key: "MXB" value: NYMEX } cme_mic { key: "MXL" value: NYMEX } cme_mic { key: "MXR" value: NYMEX } + cme_mic { key: "MYM" value: CBT } cme_mic { key: "N1B" value: NYMEX } cme_mic { key: "N1R" value: CME } cme_mic { key: "N1T" value: CME } @@ -2344,7 +2396,6 @@ CmeSymbolMics cme_mic { key: "NCF" value: NYMEX } cme_mic { key: "NCO" value: NYMEX } cme_mic { key: "NCP" value: NYMEX } - cme_mic { key: "NEN" value: NYMEX } cme_mic { key: "NEO" value: NYMEX } cme_mic { key: "NEP" value: NYMEX } cme_mic { key: "NFC" value: NYMEX } @@ -2358,10 +2409,14 @@ CmeSymbolMics cme_mic { key: "NHN" value: NYMEX } cme_mic { key: "NHO" value: NYMEX } cme_mic { key: "NHP" value: NYMEX } + cme_mic { key: "NIM" value: CME } + cme_mic { key: "NIT" value: CME } cme_mic { key: "NIY" value: CME } cme_mic { key: "NJ" value: NYMEX } cme_mic { key: "NKD" value: CME } + cme_mic { key: "NKM" value: CME } cme_mic { key: "NKN" value: NYMEX } + cme_mic { key: "NKT" value: CME } cme_mic { key: "NL" value: NYMEX } cme_mic { key: "NLS" value: NYMEX } cme_mic { key: "NMO" value: NYMEX } @@ -2401,7 +2456,7 @@ CmeSymbolMics cme_mic { key: "NYR" value: NYMEX } cme_mic { key: "NYT" value: NYMEX } cme_mic { key: "NZDUSC" value: CME } - cme_mic { key: "NZN" value: NYMEX } + cme_mic { key: "NZDUSD" value: FXS } cme_mic { key: "OAD" value: NYMEX } cme_mic { key: "ODO" value: DME } cme_mic { key: "OFF" value: NYMEX } @@ -2417,6 +2472,7 @@ CmeSymbolMics cme_mic { key: "OVL" value: NYMEX } cme_mic { key: "PA" value: NYMEX } cme_mic { key: "PAL" value: NYMEX } + cme_mic { key: "PAM" value: NYMEX } cme_mic { key: "PAT" value: NYMEX } cme_mic { key: "PBO" value: NYMEX } cme_mic { key: "PBP" value: NYMEX } @@ -2437,7 +2493,6 @@ CmeSymbolMics cme_mic { key: "PHF" value: NYMEX } cme_mic { key: "PHO" value: NYMEX } cme_mic { key: "PHP" value: NYMEX } - cme_mic { key: "PIO" value: NYMEX } cme_mic { key: "PJY" value: CME } cme_mic { key: "PKP" value: NYMEX } cme_mic { key: "PL" value: NYMEX } @@ -2499,6 +2554,8 @@ CmeSymbolMics cme_mic { key: "R2T" value: CME } cme_mic { key: "R2V" value: CME } cme_mic { key: "R53" value: NYMEX } + cme_mic { key: "R5B" value: NYMEX } + cme_mic { key: "R5E" value: NYMEX } cme_mic { key: "R5F" value: NYMEX } cme_mic { key: "R5M" value: NYMEX } cme_mic { key: "R5O" value: NYMEX } @@ -2508,6 +2565,7 @@ CmeSymbolMics cme_mic { key: "RBF" value: NYMEX } cme_mic { key: "RBG" value: NYMEX } cme_mic { key: "RBL" value: NYMEX } + cme_mic { key: "RBM" value: NYMEX } cme_mic { key: "RBS" value: NYMEX } cme_mic { key: "RBT" value: NYMEX } cme_mic { key: "REX" value: CBT } @@ -2536,9 +2594,11 @@ CmeSymbolMics cme_mic { key: "RYA" value: NYMEX } cme_mic { key: "S1U" value: CBT } cme_mic { key: "S53" value: NYMEX } + cme_mic { key: "S5B" value: NYMEX } cme_mic { key: "S5F" value: NYMEX } cme_mic { key: "S5M" value: NYMEX } cme_mic { key: "S5O" value: NYMEX } + cme_mic { key: "SBM" value: NYMEX } cme_mic { key: "SBT" value: CBT } cme_mic { key: "SD" value: NYMEX } cme_mic { key: "SDA" value: CME } @@ -2574,11 +2634,13 @@ CmeSymbolMics cme_mic { key: "SMT" value: CME } cme_mic { key: "SMU" value: NYMEX } cme_mic { key: "SMW" value: NYMEX } + cme_mic { key: "SOM" value: CBT } cme_mic { key: "SON" value: CME } cme_mic { key: "SP" value: CME } cme_mic { key: "SR1" value: CME } cme_mic { key: "SR3" value: CME } cme_mic { key: "SR5" value: NYMEX } + cme_mic { key: "SRB" value: NYMEX } cme_mic { key: "SRT" value: NYMEX } cme_mic { key: "SSI" value: NYMEX } cme_mic { key: "SSP" value: COMEX } @@ -2590,25 +2652,31 @@ CmeSymbolMics cme_mic { key: "STY" value: NYMEX } cme_mic { key: "SU" value: CME } cme_mic { key: "SUT" value: CME } - cme_mic { key: "T02" value: NYMEX } cme_mic { key: "T03" value: NYMEX } cme_mic { key: "T04" value: NYMEX } + cme_mic { key: "T06" value: NYMEX } + cme_mic { key: "T07" value: NYMEX } + cme_mic { key: "T08" value: NYMEX } + cme_mic { key: "T09" value: NYMEX } + cme_mic { key: "T12" value: NYMEX } cme_mic { key: "T13" value: NYMEX } cme_mic { key: "T14" value: NYMEX } - cme_mic { key: "T17" value: NYMEX } - cme_mic { key: "T18" value: NYMEX } + cme_mic { key: "T15" value: NYMEX } + cme_mic { key: "T16" value: NYMEX } cme_mic { key: "T19" value: NYMEX } cme_mic { key: "T1U" value: CBT } cme_mic { key: "T20" value: NYMEX } cme_mic { key: "T21" value: NYMEX } - cme_mic { key: "T24" value: NYMEX } + cme_mic { key: "T22" value: NYMEX } + cme_mic { key: "T23" value: NYMEX } cme_mic { key: "T26" value: NYMEX } cme_mic { key: "T27" value: NYMEX } cme_mic { key: "T28" value: NYMEX } + cme_mic { key: "T29" value: NYMEX } cme_mic { key: "T2B" value: NYMEX } cme_mic { key: "T2D" value: NYMEX } cme_mic { key: "T2M" value: NYMEX } - cme_mic { key: "T31" value: NYMEX } + cme_mic { key: "T30" value: NYMEX } cme_mic { key: "T3B" value: NYMEX } cme_mic { key: "T3L" value: NYMEX } cme_mic { key: "T4B" value: NYMEX } @@ -2624,6 +2692,7 @@ CmeSymbolMics cme_mic { key: "TC" value: NYMEX } cme_mic { key: "TC6" value: NYMEX } cme_mic { key: "TC9" value: NYMEX } + cme_mic { key: "TCS" value: NYMEX } cme_mic { key: "TD3" value: NYMEX } cme_mic { key: "TD8" value: NYMEX } cme_mic { key: "TEX" value: CBT } @@ -2633,6 +2702,7 @@ CmeSymbolMics cme_mic { key: "THB" value: NYMEX } cme_mic { key: "THD" value: NYMEX } cme_mic { key: "TIC" value: NYMEX } + cme_mic { key: "TIL" value: NYMEX } cme_mic { key: "TIO" value: NYMEX } cme_mic { key: "TK" value: NYMEX } cme_mic { key: "TKB" value: NYMEX } @@ -2669,7 +2739,6 @@ CmeSymbolMics cme_mic { key: "TUT" value: CBT } cme_mic { key: "TUX" value: CBT } cme_mic { key: "TW" value: NYMEX } - cme_mic { key: "TXN" value: NYMEX } cme_mic { key: "TYT" value: CBT } cme_mic { key: "TYX" value: CBT } cme_mic { key: "TZ6" value: NYMEX } @@ -2679,10 +2748,12 @@ CmeSymbolMics cme_mic { key: "UB" value: CBT } cme_mic { key: "UCM" value: NYMEX } cme_mic { key: "UDL" value: NYMEX } + cme_mic { key: "UFB" value: CBT } + cme_mic { key: "UFE" value: CBT } cme_mic { key: "UFG" value: CBT } cme_mic { key: "UFN" value: CBT } cme_mic { key: "UFU" value: CBT } - cme_mic { key: "UFZ" value: CBT } + cme_mic { key: "UFV" value: CBT } cme_mic { key: "UGG" value: NYMEX } cme_mic { key: "UKG" value: NYMEX } cme_mic { key: "ULB" value: NYMEX } @@ -2693,10 +2764,12 @@ CmeSymbolMics cme_mic { key: "UNB" value: NYMEX } cme_mic { key: "UNS" value: NYMEX } cme_mic { key: "UR" value: NYMEX } + cme_mic { key: "USC" value: NYMEX } cme_mic { key: "USDBRL" value: CME } cme_mic { key: "USDCAC" value: CME } cme_mic { key: "USDCAD" value: FXS } cme_mic { key: "USDCAN" value: CME } + cme_mic { key: "USDCHF" value: FXS } cme_mic { key: "USDCKC" value: CME } cme_mic { key: "USDCLP" value: CME } cme_mic { key: "USDCNY" value: CME } @@ -2726,6 +2799,7 @@ CmeSymbolMics cme_mic { key: "USDTLC" value: CME } cme_mic { key: "USDTWD" value: CME } cme_mic { key: "USDZRC" value: CME } + cme_mic { key: "USE" value: NYMEX } cme_mic { key: "UV" value: NYMEX } cme_mic { key: "UX" value: NYMEX } cme_mic { key: "V3L" value: NYMEX } @@ -2755,6 +2829,7 @@ CmeSymbolMics cme_mic { key: "WTA" value: NYMEX } cme_mic { key: "WTD" value: NYMEX } cme_mic { key: "WTI" value: NYMEX } + cme_mic { key: "WTL" value: NYMEX } cme_mic { key: "WTS" value: NYMEX } cme_mic { key: "WTT" value: NYMEX } cme_mic { key: "X0" value: NYMEX } @@ -2807,6 +2882,7 @@ CmeSymbolMics cme_mic { key: "YWE" value: NYMEX } cme_mic { key: "YWF" value: NYMEX } cme_mic { key: "YWK" value: NYMEX } + cme_mic { key: "Z00000" value: CME } cme_mic { key: "Z1B" value: NYMEX } cme_mic { key: "Z3N" value: CBT } cme_mic { key: "Z4" value: NYMEX } diff --git a/src/lib/config/defaults/position_cfg.conf b/src/lib/config/defaults/position_cfg.conf index 1ecf1c940..eb362017c 100644 --- a/src/lib/config/defaults/position_cfg.conf +++ b/src/lib/config/defaults/position_cfg.conf @@ -1,9 +1,9 @@ GMI_SymbolMap { value { - sym { gmi: "1" spark: "ZW" venue: VENUE_GLBX } - sym { gmi: "2" spark: "ZC" venue: VENUE_GLBX } - sym { gmi: "3" spark: "ZO" venue: VENUE_GLBX } - sym { gmi: "5" spark: "ZS" venue: VENUE_GLBX } - sym { gmi: "KW" spark: "KE" venue: VENUE_GLBX } + sym { gmi: "01" spark: "ZW" venue: VENUE_GLBX price_multiplier: 100.0} + sym { gmi: "02" spark: "ZC" venue: VENUE_GLBX price_multiplier: 100.0} + sym { gmi: "03" spark: "ZO" venue: VENUE_GLBX price_multiplier: 100.0} + sym { gmi: "05" spark: "ZS" venue: VENUE_GLBX price_multiplier: 100.0} + sym { gmi: "KW" spark: "KE" venue: VENUE_GLBX price_multiplier: 100.0} } } \ No newline at end of file diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf index 96ea56a5a..7f86bfab3 100644 --- a/src/lib/config/defaults/span.conf +++ b/src/lib/config/defaults/span.conf @@ -1,7 +1,7 @@ SpanMargin { value { - enabled: false + enabled: true login: 'api_bts1' password: 'Summer123' url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index 0055809d5..3992aaf7f 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -216,3 +216,13 @@ message CMETradingSchedule { message SecurityExpirationCutoff { optional uint32 max_days_after_expiration =1 [default = 7]; } + +message DisplayFactorOverride { + message Override { + required string symbol = 1; + required string exchange = 2; + optional string type = 3; + optional double price_multiplier = 10; + } + repeated Override override = 1; +} \ No newline at end of file diff --git a/src/lib/config/protos/position_cfg.proto b/src/lib/config/protos/position_cfg.proto index 5ce37b2a6..b2a4b5342 100644 --- a/src/lib/config/protos/position_cfg.proto +++ b/src/lib/config/protos/position_cfg.proto @@ -8,12 +8,15 @@ message GMI_Import optional uint32 sftp_port = 11 [default = 22222]; required string sftp_user = 12 [default = "sftp"]; required string sftp_password = 2 [default = "sftp"]; - required int32 pause_between_downloads_seconds = 4 [default = 60]; + required int32 pause_between_downloads_seconds = 4 [default = 30]; required int32 download_timeout_seconds = 5 [default = 35]; - - optional bool enforce_download_window = 8 [default = true]; optional string download_window_begin = 6 [default = "22:00"]; optional string download_window_end = 7 [default = "23:00"]; + + // These are just in case one we need to turn one of these off while + // the other remains on + optional bool disable_money_download = 8 [default = false]; + optional bool disable_position_download = 9 [default = false]; } message GMI_SymbolMap { @@ -21,7 +24,14 @@ message GMI_SymbolMap { required string gmi = 1; required string spark = 2; required bts.api.Venue venue = 3; + required double price_multiplier = 4; } repeated SymbolMap sym = 4; } +message GMI_Parser { + optional bool map_glbx_to_sim = 1 [default = false]; + optional bool ignore_unknown_securities = 5 [ default = false]; + optional bool ignore_unsupported_security_types = 6 [ default = true]; +} + diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index af0232f0b..f1733290f 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -48,6 +48,10 @@ message RejectStopAndStopLimitOrders { optional bool enabled = 1 [default = true]; } +message SOMTicksFix { + optional bool enabled = 1 [default = true]; +} + message EnsureOnScreenWithWorkAreaRect { // Defaulting to false bc this is near the end of the cycle (04/27/2019), // and the new ensure_onscreen code has only been tested with a single monitor arrangement. diff --git a/src/lib/md/MDProducer.cpp b/src/lib/md/MDProducer.cpp index c8ba2cb3a..9e283af9c 100644 --- a/src/lib/md/MDProducer.cpp +++ b/src/lib/md/MDProducer.cpp @@ -16,12 +16,12 @@ namespace md { // Owns shared memory for a single symbol+type class MDProducerImpl { public: - MDProducerImpl(const string& symbol, SecurityType type, Venue exchange, Platform platform, bool shared) : + MDProducerImpl(const string& symbol, SecurityType type, Venue exchange, Platform platform, MDProducerFlags flags) : _symbol(symbol), _type(type), _exchange(exchange), - _hot(hot_segment_name(symbol, type, exchange, platform), 1024, 1024, shared), - _cold(cold_segment_name(symbol, type, exchange, platform), 8192, 2048, shared), + _hot(hot_segment_name(symbol, type, exchange, platform), 1024, 1024, flags & MDProducerFlags::Shared), + _cold(cold_segment_name(symbol, type, exchange, platform), 8192, 2048, flags & MDProducerFlags::Shared), _trades(_cold.header().trade_buffer, BTS_ARRAYSIZE(_cold.header().trade_buffer), true), _rfqs(_cold.header().rfq_buffer, BTS_ARRAYSIZE(_cold.header().rfq_buffer), true) { @@ -33,7 +33,7 @@ public: // static_assert(sizeof(HotEntry) <= 32,"HotEntry should be less than 32 bytes"); } - MDProducerHandle add_security(const FixedSecurity& security) { + MDProducerHandle add_security(const FixedSecurity& security, SecurityMapper& smapper) { void* h_entry = nullptr; if (has_depth()) { h_entry = new (_hot.add(sizeof(HotDepthEntry))) HotDepthEntry(); @@ -45,6 +45,7 @@ public: // Calculating the size for the variable sized entries is tricky ColdEntry* c_entry = new (_cold.add(ColdEntry::fixed_size() + security.size)) ColdEntry(security.size); memcpy(&c_entry->security, &security, security.size); + smapper.apply(c_entry->security); MDProducerHandle handle(_cold.header(), _hot.header(), *c_entry, h_entry, MDProducerChannel(*this)); @@ -102,27 +103,30 @@ private: // MDProducer // -MDProducer::MDProducer(Platform platform, bool shared) : +MDProducer::MDProducer(Platform platform, MDProducerFlags flags) : _mutex(new std::mutex()), _producers(), _id_recorder(), _platform(platform), - _shared(shared) + _flags(flags), + _smapper(flags & MDProducerFlags::SecurityMapper) { } #ifndef WIN32 -MDProducer::MDProducer(Platform platform, SecurityIDRecorder recorder, bool shared) : +MDProducer::MDProducer(Platform platform, SecurityIDRecorder recorder, MDProducerFlags flags) : _mutex(new std::mutex()), _producers(), _id_recorder(std::make_unique(recorder)), _platform(platform), - _shared(shared) + _flags(flags), + _smapper(flags & MDProducerFlags::SecurityMapper) { } #endif MDProducer::MDProducer(MDProducer&& other) : _mutex(std::move(other._mutex)), _producers(std::move(other._producers)), _platform(other._platform), - _shared(other._shared) + _flags(other._flags), + _smapper(_flags & MDProducerFlags::SecurityMapper) {} MDProducer::~MDProducer() {} @@ -141,10 +145,10 @@ MDProducerImpl& MDProducer::get_producer(const char* symbol, SecurityType type, unique_ptr newp; if (type == api::SECURITYTYPE_SYNTHETIC) { // synthetics are special. We don't want to allocate a separate section for each one so we put them all in one - newp.reset(new MDProducerImpl(SYNTHETIC_SYMBOL, api::SECURITYTYPE_SYNTHETIC, Venue::VENUE_BTS, _platform, _shared)); + newp.reset(new MDProducerImpl(SYNTHETIC_SYMBOL, api::SECURITYTYPE_SYNTHETIC, Venue::VENUE_BTS, _platform, _flags)); } else { - newp.reset(new MDProducerImpl(symbol, type, exchange, _platform, _shared)); + newp.reset(new MDProducerImpl(symbol, type, exchange, _platform, _flags)); } _producers.push_back(move(newp)); return *_producers.back(); @@ -155,7 +159,7 @@ MDProducerHandle MDProducer::add_security(const FixedSecurity& security) { bts_assert(security.size >= sizeof(FixedSecurity)); std::lock_guard lock(*_mutex); auto& impl = get_producer(security.symbol(), security.type, security.exchange); - auto result = impl.add_security(security); + auto result = impl.add_security(security, _smapper); if (security.key != invalid_security_key) { result.set_key(security.key); } else if(_id_recorder) { _id_recorder->ensure_key(result); diff --git a/src/lib/md/MDProducer.h b/src/lib/md/MDProducer.h index aaad1ee1a..4b08f0589 100644 --- a/src/lib/md/MDProducer.h +++ b/src/lib/md/MDProducer.h @@ -7,6 +7,7 @@ #include "MDProducerHandle.h" #include "MDProducerChannel.h" #include "Shm/FixedSecurity.h" +#include "SecurityMapper.h" #include #include #include @@ -17,11 +18,23 @@ namespace md { class MDProducerImpl; class SecurityIDRecorder; +enum class MDProducerFlags { + None = 0x0, + Shared = 0x1, + SecurityMapper = 0x2, +}; + +constexpr MDProducerFlags operator+(MDProducerFlags a, MDProducerFlags b) { return (MDProducerFlags)((uint32_t)a | (uint32_t)b); } +constexpr MDProducerFlags operator-(MDProducerFlags a, MDProducerFlags b) { return (MDProducerFlags)((uint32_t)a | (uint32_t)b); } +constexpr bool operator&(const MDProducerFlags a, const MDProducerFlags b) { return ((uint32_t)a & (uint32_t)b) == (uint32_t)b; } + +constexpr MDProducerFlags DefaultMDProducerFlags = MDProducerFlags::Shared + MDProducerFlags::SecurityMapper; + class BTS_EXPORT MDProducer { public: - MDProducer(Platform platform, bool shared=true); - MDProducer(Platform platform, SecurityIDRecorder recorder, bool shared=true); + MDProducer(Platform platform, MDProducerFlags flags=DefaultMDProducerFlags); + MDProducer(Platform platform, SecurityIDRecorder recorder, MDProducerFlags flags=DefaultMDProducerFlags); MDProducer(MDProducer&& other); ~MDProducer(); @@ -45,7 +58,8 @@ private: std::vector> _producers; std::unique_ptr _id_recorder; Platform _platform; - bool _shared; + MDProducerFlags _flags; + SecurityMapper _smapper; }; diff --git a/src/lib/md/SecurityMapper.cpp b/src/lib/md/SecurityMapper.cpp new file mode 100644 index 000000000..5d1f046f7 --- /dev/null +++ b/src/lib/md/SecurityMapper.cpp @@ -0,0 +1,92 @@ + +#include "SecurityMapper.h" +#include "UserSymbol.h" +#include "PriceSize.h" +#include "lib/config/config.h" +#include "lib/config/protos/MarketData.pb.h" +#include "lib/config/protos/cme_reference_data.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/utils/parse_enum.h" +#ifndef _WIN32 +#include "google/btree/btree_map.h" + +namespace bts { +namespace md { +struct DisplayFactorMapper : public ISecurityMapper +{ + btree::btree_map _mapped; + DisplayFactorMapper() : _mapped() { + for (const auto& ov : config::get().override()) { + if (ov.has_price_multiplier()) { + auto venue = parse_enum(ov.exchange(), "VENUE", api::Venue_Parse); + bts_assert_msg(venue, fmt::format("Invalid venue `{}`", ov.exchange())); + auto type = parse_enum(ov.type(), "SECURITYTYPE", api::SecurityType_Parse); + + if (type) { + _mapped.insert( + std::make_pair( + UserSymbol { uppercase_copy(ov.symbol()), *venue, *type }, + -to_exponent(ov.price_multiplier()))); + } + else { + for (auto t : { + SecurityType::SECURITYTYPE_FUTURE, + SecurityType::SECURITYTYPE_SPREAD, + SecurityType::SECURITYTYPE_OPTION }) { + _mapped.insert( + std::make_pair( + UserSymbol { uppercase_copy(ov.symbol()), *venue, t }, + -to_exponent(ov.price_multiplier()))); + } + } + } + } + } + void apply(FixedSecurity& f) const override { + UserSymbol key { f.symbol(), f.exchange, f.type }; + auto iter = _mapped.find(key); + if (iter != _mapped.end()) { + f.display_factor = iter->second; + } + } +}; + +struct CppOverride : public ISecurityMapper +{ + btree::btree_map _map; + CppOverride() : _map() { + for (const auto& p : config::get().cpp_entry()) { + _map.insert(p); + } + } + + void apply(FixedSecurity& f) const override { + auto iter = _map.find(f.symbol()); + if (iter != _map.end()) { + f.cash_per_point = iter->second; + } + } +}; + + +SecurityMapper::SecurityMapper(bool enabled): _impl() { + if (enabled) { + _impl.push_back(std::make_unique()); + _impl.push_back(std::make_unique()); + // Register more mappers HERE + } +} + +#else +namespace bts { +namespace md { +SecurityMapper::SecurityMapper(bool): _impl() {} +#endif + +SecurityMapper::~SecurityMapper() { } +void SecurityMapper::apply(FixedSecurity& security) { + for (const auto& m : _impl) { + m->apply(security); + } +} +}} //namespace diff --git a/src/lib/md/SecurityMapper.h b/src/lib/md/SecurityMapper.h new file mode 100644 index 000000000..2ca2129fa --- /dev/null +++ b/src/lib/md/SecurityMapper.h @@ -0,0 +1,24 @@ +#pragma once +#include "Shm/FixedSecurity.h" +#include +#include + +namespace bts { +namespace md { + +struct ISecurityMapper { + virtual ~ISecurityMapper() {} + virtual void apply(FixedSecurity&) const = 0; +}; + +class SecurityMapper { + std::vector> _impl; + public: + SecurityMapper(bool enabled); + ~SecurityMapper(); + // apply various mappings to the security + void apply(FixedSecurity&); +}; + + +}} //namespace diff --git a/src/lib/md/Shm/FixedSecurity.cpp b/src/lib/md/Shm/FixedSecurity.cpp index a159e291a..fd5f7bfec 100644 --- a/src/lib/md/Shm/FixedSecurity.cpp +++ b/src/lib/md/Shm/FixedSecurity.cpp @@ -140,7 +140,7 @@ std::string security_descriptor(const api::Security& security) { return result.str(); } -void get_contract_spec(const FixedSecurity& source, api::ContractSpecification& spec) { +void get_contract_spec(const FixedSecurity& source, /*out*/ api::ContractSpecification& spec) { spec.set_price_break(source.price_break); spec.set_low_tick(source.low_tick); spec.set_high_tick(source.high_tick); diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index 54c3a9066..341ff53fd 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -100,7 +100,9 @@ public: MDProducer& ensure_producer(Platform platform) { auto find_result = _producers.find(platform); if (find_result == _producers.end()) { - auto result = _producers.insert(make_pair(platform, MDProducer(platform, _shared))); + // relay never wants to enable SecurityMapper. Securities should always match the relay source. + auto flags = _shared ? MDProducerFlags::Shared : MDProducerFlags::None; + auto result = _producers.insert(make_pair(platform, MDProducer(platform, flags))); if (result.second) { return result.first->second; } diff --git a/src/lib/md/test/Co2ManagedTestHelper.cpp b/src/lib/md/test/Co2ManagedTestHelper.cpp index 30caf3bde..f38ca3325 100644 --- a/src/lib/md/test/Co2ManagedTestHelper.cpp +++ b/src/lib/md/test/Co2ManagedTestHelper.cpp @@ -120,7 +120,7 @@ extern "C" BTS_EXPORT TestProducer* co2_produce_test_md() { " }" "}"); auto* tp = new TestProducer(); - tp->md = std::make_shared(PLATFORM_SIM, false); + tp->md = std::make_shared(PLATFORM_SIM, MDProducerFlags::None); tp->handles = create_test_securities(*(tp->md)); auto& producers = tp->handles; assign_ids(producers.begin(), producers.end()); diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index 196c7e2f2..4a54a7b27 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -14,15 +14,19 @@ namespace bts { namespace orderman { SODPosition::SODPosition() - : _enabled(config::get().enabled()), - _sod_time(_get_fills_sod_time()) { - LOG(persist, Info, "SODPosition enabled:{} sec:{}", _enabled, - _sod_time.tv_sec); +: +SODPosition(sod_time()) { +} + +SODPosition::SODPosition(timeval sod_time) +: +_sod_time(sod_time){ + LOG(persist, Info, "SODPosition::cons sod_time:{}", sod_time.tv_sec); } // returns the timeval for today's hh,mm,ss // (timeval is the microseconds from epoch) -timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { +timeval SODPosition::to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { bts_assert(hh < 24); bts_assert(mm < 60); bts_assert(ss < 60); @@ -40,36 +44,36 @@ timeval SODPosition::_to_timeval(uint16_t hh, uint16_t mm, uint16_t ss) { return rv; } -timeval SODPosition::_subtract_days(const timeval &tv, uint32_t n_days) { +timeval SODPosition::subtract_days(const timeval &tv, uint32_t n_days) { uint32_t secs_in_day = 86400 * n_days; timeval rv = tv; rv.tv_sec = (rv.tv_sec > secs_in_day) ? rv.tv_sec - secs_in_day : 0; return rv; } -timeval SODPosition::_get_fills_sod_time() { +timeval SODPosition::sod_time() { const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); + timeval sod = to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); + sod = subtract_days(sod); return sod; } timeval SODPosition::get_orders_start_time() { const auto &sod_time = config::get(); - timeval sod = _to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); + timeval sod = to_timeval(sod_time.sod_hh(), sod_time.sod_mm(), 0); const auto &orders_cleanup = config::get(); timeval now; gettimeofday(&now, NULL); // if the server started before the sod for today // we go back to yesterday if (sod.tv_sec >= now.tv_sec) - sod = _subtract_days(sod); - sod = _subtract_days(sod, orders_cleanup.extra_days()); + sod = subtract_days(sod); + sod = subtract_days(sod, orders_cleanup.extra_days()); return sod; } @@ -106,104 +110,24 @@ timeval SODPosition::get_order_cutoff_time( rv.tv_sec = max_ts.seconds(); rv.tv_usec = static_cast(max_ts.nanos()) / 1000; const auto &orders_cleanup = config::get(); - return _subtract_days(rv, orders_cleanup.extra_days()); + return subtract_days(rv, orders_cleanup.extra_days()); } -std::string SODPosition::_sod_fill_id(const Fill &fill, api::Side side) { - // sod:acct:long/short:sec - std::ostringstream oss; - oss << "sod:" << fill.account() - << (side == api::Side::SIDE_BUY ? ":L:" : ":S:") << fill.security_key(); - return oss.str(); +timeval SODPosition::now(){ + timeval tv; + gettimeofday(&tv, NULL); + return tv; } -void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { - bts_assert(pos.security_key() == fill.security_key()); - bts_assert(pos.account() == fill.account()); - bts_assert(pos.side() == fill.side()); - double total_qty = pos.last_shares() + fill.last_shares(); - double avg_price = (pos.avg_price() * pos.last_shares() + - fill.last_price() * fill.last_shares()) / - total_qty; - pos.set_avg_price(avg_price); - pos.set_last_price(avg_price); - pos.set_last_shares(total_qty); -} - -void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { - pos.set_security_key(fill.security_key()); - pos.set_account(fill.account()); - pos.set_internal_account_id(fill.internal_account_id()); - pos.set_side(side); - pos.mutable_timestamp()->set_seconds(_sod_time.tv_sec); - pos.mutable_timestamp()->set_nanos(0); - pos.set_fill_kind(Fill::FILL_KIND_SOD); - pos.set_order_key(0); - pos.set_fill_key(_sod_fill_id(fill, side)); - pos.set_last_shares(0); -} - -bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { - if (!bts::admin::AdminServiceUtils::has_id(fill.internal_account_id())){ - LOG(persist, Error, "SODPosition::add_fill_to_sod_pos Could not find " - "account_id for fill:{} account:{}", - fill.fill_key(), fill.account()); - return false; - } - uint32_t seckey = fill.security_key(), - account_id = fill.internal_account_id(); - auto acct_it = _sod_map.find(account_id); - if (acct_it == _sod_map.end()) - _sod_map[account_id] = SecPosMap(); - acct_it = _sod_map.find(account_id); - bts_assert(acct_it != _sod_map.end()); - SecPosMap &sec_map = acct_it->second; - auto sec_it = sec_map.find(seckey); - if (sec_it == sec_map.end()) { - Fill long_pos, short_pos; - _zero_pos(long_pos, fill, api::Side::SIDE_BUY); - _zero_pos(short_pos, fill, api::Side::SIDE_SELL); - sec_map[seckey] = std::pair(long_pos, short_pos); - } - sec_it = sec_map.find(seckey); - bts_assert(sec_it != sec_map.end()); - std::pair &pos = sec_it->second; - if (fill.side() == api::Side::SIDE_BUY) - _merge_pos(pos.first, fill); - else - _merge_pos(pos.second, fill); - return true; - } - else - return false; -} - -void SODPosition::add_sod_pos_as_fill_events( - std::vector &fe, - md::SecurityOracle& oracle) { - if (_enabled) - for (auto &acct_p : _sod_map) { - for (auto &sec_p : acct_p.second) { - Fill &long_pos = sec_p.second.first; - Fill &short_pos = sec_p.second.second; - bts_assert(long_pos.security_key() == short_pos.security_key()); - auto sec = oracle.get_security(SecurityKey(long_pos.security_key())); - if (!sec) - LOG(persist, Error, - "Could not recover fill for key:{} from storage. " - "This should be investigated", - long_pos.security_key()); - else { - fe.emplace_back(long_pos, *sec); - fe.emplace_back(short_pos, *sec); - } - } - } +google::protobuf::Timestamp SODPosition::to_timestamp (timeval tv){ + google::protobuf::Timestamp rv; + rv.set_seconds(tv.tv_sec); + rv.set_nanos(tv.tv_usec*1000); + return rv; } bool SODPosition::is_sod(const google::protobuf::Timestamp& fill_time) const{ - return _enabled && fill_time.seconds() < _sod_time.tv_sec; + return fill_time.seconds() < _sod_time.tv_sec; } } // namespace orderman diff --git a/src/lib/orderman/actors/SODPosition.h b/src/lib/orderman/actors/SODPosition.h index d8eef996b..523ab11aa 100644 --- a/src/lib/orderman/actors/SODPosition.h +++ b/src/lib/orderman/actors/SODPosition.h @@ -18,25 +18,20 @@ SecPosMap; class SODPosition{ private: - std::map _sod_map; - const bool _enabled; const timeval _sod_time; private: - // converts today:hh:mm:ss to timeval - static timeval _to_timeval(uint16_t hh, uint16_t mm, uint16_t ss); - static timeval _subtract_days(const timeval& tv, uint32_t n_days=1); - static timeval _get_fills_sod_time(); - static std::string _sod_fill_id(const Fill& fill,api::Side side); - void _merge_pos(Fill& pos, const Fill& fill); - void _zero_pos(Fill& pos, const Fill& fill, api::Side side); + // converts today:hh:mm:ss to timeval public: SODPosition(); + SODPosition(timeval); + static timeval sod_time(); + static timeval to_timeval(uint16_t hh, uint16_t mm, uint16_t ss); + static timeval subtract_days(const timeval& tv, uint32_t n_days=1); // all inactive orders before this time are not published static timeval get_orders_start_time(); static timeval get_order_cutoff_time(const std::map& ordermap); - bool add_fill_to_sod_pos(const Fill& fill); - void add_sod_pos_as_fill_events(std::vector& fill_events, - md::SecurityOracle&); + static timeval now(); + static google::protobuf::Timestamp to_timestamp (timeval); bool is_sod (const google::protobuf::Timestamp& fill_time) const; }; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 527810d21..ad501ab98 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -23,6 +23,7 @@ #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" +#include "lib/api/service_helpers/PositionUtilities.h" #include namespace bts { @@ -261,12 +262,15 @@ make_pos_event(api::position::PositionUnit const &pu, securities::MapSecurityDB const &o) { auto sec = o.resolve(SecurityKey(pu.security_id())); if (sec) { + uint32_t total_long_pos, total_short_pos; + bts::position::PositionUtilities::total_position(pu, + total_long_pos, + total_short_pos); FilledPositionEvent ev{ *sec, AccountID(pu.account_id()), - Quantity(pu.sod().long_pos() + pu.day().long_pos() + - pu.admin_sod().long_pos()), - Quantity(pu.sod().short_pos() + pu.day().short_pos() + - pu.admin_sod().short_pos())}; + Quantity(total_long_pos), + Quantity(total_short_pos) + }; return {ev}; } else return {}; @@ -299,8 +303,7 @@ void ServiceBridge::update_position( } me->service_call_marshaller.schedule_action([this, evs]() { - for (auto const &e : evs) - publish(me->filled_position_pub, e); + publish_batch(me->filled_position_pub, evs); }); } diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 84d619544..a3e76866c 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3065,7 +3065,7 @@ TEST_CASE ("spreader_perf_2legs", "[spreader]") } TEST_CASE ("spreader_perf_4legs", "[spreader]") { - bool recomp = gen_rand(0,10) > 5; + bool recomp = false;//gen_rand(0,10) > 5; bts::orderman::OrderKey order_key(0); Price spreader_price = Price (40); Quantity spreader_quantity = Quantity (250); diff --git a/src/lib/utils/optional.h b/src/lib/utils/optional.h new file mode 100644 index 000000000..b5466b79d --- /dev/null +++ b/src/lib/utils/optional.h @@ -0,0 +1,56 @@ +#pragma once +// An incomplete version of std::optional which should work well enough on Windows until it catch up +#ifdef _WIN32 +#include +namespace std { + class bad_optional_access : exception { }; + + template + class optional { + bool _has_value; + union { + T _value; + int _unused; + }; + public: + optional(const T& value) : _has_value(true), _value(value) { } + optional(T&& value) : _has_value(true), _value(value) { } + optional() : _has_value(false) + ~optional() { reset(); } + bool has_value() const { return _has_value; } + operator bool() { return b.has_value(); } + T& operator *() { + if (has_value()) { + return _value; + } + else throw std::bad_optional_access(); + } + const T& operator*() const { return **this; } + T& operator->() { return **this; } + const T& operator->() const { return **this; } + bool operator==(const std::optional& other) const { + if (!_has_value && !other.has_value()) return true; + return _has_value == other._has_value && _value == other.value(); + } + bool operator!=(const std::optional& other) const { return !(*this == other); } + T& value() { return **this; } + const T& value() const { return **this; } + T value_or(T default_value) { + if (has_value()) return _value; + else return default_value; + } + void reset() { + if (has_value()) { + _value.~T(); + _has_value = false; + } + } + // This class is incomplete. Add methods as necessary + }; + + template + constexpr optional nullopt = {}; +} +#else +#include +#endif \ No newline at end of file diff --git a/src/lib/utils/parse_enum.h b/src/lib/utils/parse_enum.h new file mode 100644 index 000000000..3b8447bae --- /dev/null +++ b/src/lib/utils/parse_enum.h @@ -0,0 +1,27 @@ +#pragma once + +#include +#include "lib/utils/optional.h" +namespace bts { + + inline std::string uppercase_copy(const std::string& cs) { + std::string s = cs; + std::transform(s.begin(), s.end(), s.begin(), ::toupper); + return s; + } + + template + std::optional parse_enum(const std::string& value, const std::string& prefix, T2 parse) { + auto temp = value; + T result; + if (temp.find(prefix) == std::string::npos) { + temp = prefix + "_" + temp; + } + if(parse(temp, &result)) { + return {result}; + } + else { + return std::nullopt; + } + } +} \ No newline at end of file diff --git a/src/sdk/README.md b/src/sdk/README.md index 809037be5..13aacec16 100644 --- a/src/sdk/README.md +++ b/src/sdk/README.md @@ -150,11 +150,6 @@ In gdb: ``` (gdb) break order_plugin_example.cpp:366 ``` - -#### In Depth Algo Descriptions - - * [Spark Algo Descriptions](doc/algos.md) - * Send us an email for help: api_support@bluetradesys.com #### Spark windows client * Download spark windows executable here: diff --git a/src/sdk/doc/algos.md b/src/sdk/doc/algos.md deleted file mode 100644 index 7ec2f9517..000000000 --- a/src/sdk/doc/algos.md +++ /dev/null @@ -1,46 +0,0 @@ -+++ -title = "BTS Basic Algos" -weight = 3 -sort_by = "weight" -insert_anchor_links = "right" -+++ - - -## Lean - -The goal of the lean order is to watch the opposite-inside market size and cross when that size goes below the threshold (this also implies a cross if that size goes to zero and the market trades away from you) If the market trades toward you, you can opt into several different behaviors - -##### Parameters - * Cross Thresh - size thresh in absolute or ratio terms - * Max Chase Ticks - max levels to pay up, in ticks - - -## Join -The goal of the join order is to watch the opposite-inside market and join when the market flips (that is, when the best offer becomes the best bid) and has at least threshold size. - -##### Parameters - * Join Thresh - size thresh in absolute or ratio terms - - -## Top - -The goal of the top order is to not trade by yourself, but the intent at the time of order entry is to get filled.If the order is on the market (say current bid price) AND the quantity on that bid price is below top thresh then cancel the order else remain working. - -##### Parameters - * Top Thresh - size thresh in absolute or ratio terms - - -## Cover -A Cover order’s purpose is to fire a hedge order (of any type) in response to fills from it’s child order on the opposite side of the market N ticks away - -##### Parameters - * Profit Ticks - ticks above or below fill price to place profit / cover order - - -## OCO -An OCO order creates a relationship between a child order and a 'stop' or 'other' order such that when one of these is cancelled, both cancel, or when one is filled, the other order's size is debited in the amount of the fill. - -Composing this order with Cover simulates scalping functionality - -##### Parameters - * Stop Ticks - ticks below or above main order to place stop / other order \ No newline at end of file diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 53112d13e..945b69c2e 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -25,7 +25,6 @@ ln -sf $1/server $1/sdk/lib mkdir $1/sdk/examples cp $2/examples/* $1/sdk/examples -cp $2/doc/* $1/sdk/doc cp $2/sdk_shell.sh $1/sdk/sdk_shell.sh cp $2/update_github.sh $1/sdk/update_github.sh cp $2/README.md $1/sdk/README.md diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 7e2db1fc7..555be9e10 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/BasePositionServiceServer.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/gmi_parser.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionMap.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/import/BasePositionServiceServer.cpp;position/import/DownloadCommonStateMachine.cpp;position/import/DownloadWindow.cpp;position/import/MoneyFileServiceServer.cpp;position/import/parsing/gmi_parser.cpp;position/import/parsing/money_parser.cpp;position/import/parsing/parser_common.cpp;position/tests/PositionTests.cpp;position/tests/position_tests_internal.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 3400bb9cd..1bbcbfa49 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -29,17 +29,17 @@ #include "server/sparkd/http/WebServer.h" #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" -#include "server/sparkd/position/BasePositionServiceServer.h" -#include "server/sparkd/position/PositionServiceServer.h" #include "server/sparkd/position/MarginServiceServer.h" +#include "server/sparkd/position/PositionServiceServer.h" +#include "server/sparkd/position/import/BasePositionServiceServer.h" +#include "server/sparkd/position/import/MoneyFileServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/AuthServiceServer.h" - -#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" #include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" #include @@ -88,7 +88,7 @@ int Run::execute(std::vector const &) { SparkServices plugin_services(dyn_order_registry); plugin::init_plugins(plugin_services); // finished initializing order plugins - + orderman::OrderServiceServer order_service_server( sc, mdclient, dyn_order_registry, stats, perf_log); support::ErrorReportServer error_report_service(sc); @@ -97,6 +97,7 @@ int Run::execute(std::vector const &) { bts::api::orderman::algo::AlgoDefinitionServiceServer algo_definition_server( sc); position::BasePositionServiceServer base_pos_server(sc); + position::MoneyFileServiceServer money_file_server(sc); position::PositionServiceServer position_service(sc, mdclient); position::MarginServiceServer margin_service(sc, mdclient); metrics::ShellLatencyServer shell_latency_service( diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 42f4da101..35ded097d 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -16,6 +16,7 @@ #include "lib/md/SecurityDB.h" #include "server/sparkd/exchange_sim/ExchangeSim.h" #include "lib/utils/thread_manager.h" +#include "lib/utils/parse_enum.h" #include @@ -169,16 +170,14 @@ string& uppercase(string& s) { return s; } template -bool parse_enum(const string& value, const string& prefix, T2 parse, T default_value, T* presult) { - string temp = value; - if (temp.find(prefix) == string::npos) { - temp = prefix + "_" + temp; - } - if(parse(temp, presult)) { +bool parse_enum(const string& value, const string& prefix, T2 parse, T default_value, T* result) { + auto opt = ::bts::parse_enum(value, prefix, parse); + if (opt) { + *result = opt.value(); return true; } else { - *presult = default_value; + *result = default_value; return false; } } @@ -208,13 +207,14 @@ struct MDArgs { MDArgs parse_md_args(const vector& args) { using namespace api; using namespace co2; - auto venue = VENUE_UNSET; // Default to glbx. If you change this change below (used) also + auto venue = VENUE_UNSET; auto platform = PLATFORM_UNSET; auto type = SECURITYTYPE_UNSET; bool hot = false; long number = 0; std::string symbol; for (auto str : args) { + // Iterate through each argument and see if it parses to one of these enums uppercase(str); bool used = (venue == VENUE_UNSET && parse_enum(str, "VENUE", Venue_Parse, venue, &venue)) || diff --git a/src/server/sparkd/position/BasePositionServiceServer.cpp b/src/server/sparkd/position/BasePositionServiceServer.cpp deleted file mode 100644 index 7d2ce2c0f..000000000 --- a/src/server/sparkd/position/BasePositionServiceServer.cpp +++ /dev/null @@ -1,331 +0,0 @@ -#include "BasePositionServiceServer.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AdminService.client.pb.h" -#include "lib/api/services/PositionService.client.pb.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/orders_fills_cleanup.pb.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/domain_model/sod.h" -#include "lib/logging/logging.h" -#include "lib/persistence/IStore.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/datetime.h" -#include "lib/utils/sftp.h" -#include "server/sparkd/position/gmi_parser.h" - -#include -#include -#include -#include - -#include -#include - -namespace bts { -namespace position { - -enum class BasePositionServiceServer::State { - W_ADMIN, - SYNCHED, - DOWNLOADING, - W_DOWNLOAD_WINDOW -}; - -struct BasePositionServiceServer::PImpl { - PImpl(bts::api::ServiceContext &ctx) - : ctx(ctx), state(State::W_ADMIN), last_download_attempt_ts(), - admin_service(ctx.locate()), - pos_service(ctx.locate()), - admin_data() {} - - bts::api::ServiceContext &ctx; - State state = State::W_ADMIN; - TimeStamp last_download_attempt_ts; - api::admin::AdminService admin_service; - api::position::PositionService pos_service; - std::shared_ptr admin_data; - size_t download_attempts = 0; -}; - -BasePositionServiceServer::BasePositionServiceServer( - bts::api::ServiceContext &ctx) - : BasePositionServiceBase(ctx), me(new PImpl(ctx)) { - - if (config::get().sftp_host().size()) { - on_timer(); - me->admin_service.subscribe_admin_data() | - rxcpp::operators::subscribe( - [this](auto const &update) { - bts_assert(update.all().size() == 1); - on_admin_data(update.all()[0]); - }); - } else - LOG(OrderMan, Warn, - "GMI import is disabled, since no host is specified in the " - "GMI_Import.sftp_host config key"); -} - -BasePositionServiceServer::~BasePositionServiceServer() {} - -void BasePositionServiceServer::parse_gmi_csv( - const api::position::CSVBlock &b, - const api::Response &reply) { - - api::position::GMI_ParseResult result; - if (me->state == State::W_ADMIN) { - *result.mutable_failure() = "Server is not ready"; - reply(result); - return; - } - - std::istringstream in {b.text()}; - auto parse_result = parse_gmi(*me->admin_data,in); - - if (!std::holds_alternative( - parse_result)) { - *result.mutable_failure() = std::get(parse_result); - reply(result); - return; - } - - auto base_position = - std::get(parse_result); - *result.mutable_success() = base_position; - reply(result); - return; -} - -void BasePositionServiceServer::on_timer() { - me->ctx.post([this]() { on_timer(); }, 1000); - switch (me->state) { - case State::W_ADMIN: - break; - case State::SYNCHED: - break; - case State::DOWNLOADING: - break; - case State::W_DOWNLOAD_WINDOW: - maybe_start_synch(); - break; - } -} - -void BasePositionServiceServer::transition(State new_state) { - LOG(OrderMan, Info, "Transitioning BasePositionServiceServer from {} to {}", - state_name(me->state), state_name(new_state)); - me->state = new_state; -} - -std::string BasePositionServiceServer::state_name(State st) const { - switch (st) { - case State::W_ADMIN: - return "W_ADMIN"; - case State::SYNCHED: - return "SYNCHED"; - case State::DOWNLOADING: - return "DOWNLOADING"; - case State::W_DOWNLOAD_WINDOW: - return "W_DOWNLOAD_WINDOW"; - } - bts_assert(false); - return ""; -} - -void BasePositionServiceServer::on_admin_data( - std::shared_ptr const &a) { - LOG(OrderMan, Info, "Received new admin data"); - - me->admin_data = a; - - switch (me->state) { - case State::W_ADMIN: - maybe_start_synch(); - return; - case State::SYNCHED: - LOG(OrderMan, Info, - "Will recompute base position based on new admin data"); - maybe_start_synch(); - return; - case State::DOWNLOADING: - case State::W_DOWNLOAD_WINDOW: - return; - } - bts_assert(false); -} - -void BasePositionServiceServer::maybe_start_synch() { - - // We cannot start synching right away if we recently tried to - // download - if ((sec_diff(Timer::now(), me->last_download_attempt_ts) <= - config::get().pause_between_downloads_seconds())) { - LOG(OrderMan, Diag, - "Skipping download because the last attempt was too recent"); - if (me->state != State::W_DOWNLOAD_WINDOW) - transition(State::W_DOWNLOAD_WINDOW); - return; - } - - // We cannot start synching if we already tried and we are outside - // the download window - if (me->download_attempts > 0 && !in_download_window()) { - LOG(OrderMan, Diag, - "Skipping download because we are outside the download window"); - if (me->state != State::W_DOWNLOAD_WINDOW) - transition(State::W_DOWNLOAD_WINDOW); - return; - } - - LOG(OrderMan, Diag, "Attempting download"); - transition(State::DOWNLOADING); - me->download_attempts++; - using namespace bts::utils; - const auto &conf = config::get(); - - begin_sftp_download( - conf.sftp_host(), conf.sftp_port(), conf.sftp_user(), - conf.sftp_password(), conf.download_timeout_seconds() * 1000, - [this](const auto &v) { return pick_most_recent_pos_file(v); }, - [this](auto const &result) { - if (std::holds_alternative(result)) { - auto error_msg = - fmt::format("Failed to download GMI file. Error={}", - std::get(result).error_msg); - me->ctx.post([this, error_msg]() { - me->last_download_attempt_ts = Timer::now(); - on_error(error_msg); - }); - } else { - auto sftp_file_path = - std::get(result).sftp_file_path; - auto local_file_path = - std::get(result).local_file_path; - me->ctx.post([this, sftp_file_path, local_file_path]() { - me->last_download_attempt_ts = Timer::now(); - on_download_success(sftp_file_path, local_file_path); - }); - } - }); -} - -void BasePositionServiceServer::on_download_success( - std::string const &sftp_file_path, std::string const &local_file_path) { - - LOG(OrderMan, Warn, - "Successfully downloaded GMI file {} to local file " - "{}. Will parse next.", - sftp_file_path, local_file_path); - - bts_assert(me->state == State::DOWNLOADING); - - auto as_of = get_as_of_date(sftp_file_path); - if (!as_of.has_value()) { - auto error_msg = - fmt::format("Could not extract date from sftp file name {}", - sftp_file_path); - on_error(error_msg); - return; - } - - auto parse_result = parse_gmi_file(local_file_path); - if (!std::holds_alternative( - parse_result)) { - auto error_msg = - fmt::format("Failed to parse GMI file at {}. Error msg: {}", - local_file_path, std::get(parse_result)); - on_error(error_msg); - return; - } - - auto base_position = - std::get(parse_result); - - LOG(OrderMan, Warn, - "Successfully parsed GMI file at {}. Extracted {} records for " - "the " - "base position", - local_file_path, base_position.positions_size()); - - transition(State::SYNCHED); - *base_position.mutable_current_as_of() = - utils::pb::to_timestamp(as_of.value()); - - me->pos_service.set_base_position(base_position, - [this](auto const &rr) { - if (!rr.success()) - on_error(rr.error_message()); - else if (!rr.value()->ok()) - on_error(rr.value()->msg()); - }, - 5000); -} - -void BasePositionServiceServer::on_error(std::string const &error_msg) { - LOG(OrderMan, Error, - "Failed to obtain a valid base position. The following " - "information is " - "available: {}", - error_msg); - maybe_start_synch(); -} - -std::optional -BasePositionServiceServer::get_as_of_date(std::string const &sftp_file_name) { - std::regex rx(".*(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d).*"); - std::smatch matches; - if (!std::regex_match(sftp_file_name, matches, rx)) - return {}; - auto y = std::stoi(matches[1]); - auto m = std::stoi(matches[2]); - auto d = std::stoi(matches[3]); - - const auto &sod = config::get(); - try { - return datetime::make_ptime(y, m, d, sod.sod_hh(), sod.has_sod_mm(), 0, - 0); - } catch (std::out_of_range const &) { - return {}; - } -} - -std::optional BasePositionServiceServer::pick_most_recent_pos_file( - std::vector const &candidates) { - - std::vector pos_files; - std::copy_if(candidates.begin(), candidates.end(), - std::back_inserter(pos_files), [](auto const &file_name) { - return boost::algorithm::ends_with(file_name, - ".adatpos.csv"); - }); - if (pos_files.empty()) - return {}; - std::sort(pos_files.begin(), pos_files.end()); - return pos_files.back(); -} - -std::variant -BasePositionServiceServer::parse_gmi_file(std::string const &f) { - return position::parse_gmi(*me->admin_data, f); -} - -bool BasePositionServiceServer::in_download_window() const { - auto const &conf = config::get(); - if (!conf.enforce_download_window()) - return false; - auto start = - boost::posix_time::duration_from_string(conf.download_window_begin()); - auto stop = - boost::posix_time::duration_from_string(conf.download_window_end()); - auto now = datetime::local_now().time_of_day(); - - if (start < stop) - return now > start && now < stop; - else - return !(now >= stop && now <= start); -} - -} // namespace position -} // namespace bts diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 723c95e7b..e499062b1 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -230,6 +230,49 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor }); } } + +void MarginServiceServer::set_cash_balance_batch(const ::bts::api::position::CashBalanceBatch& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + if(!config::get().enabled()) + { + api::ResultMessage resp; resp.set_success(true); + reply(resp); + return; + } + std::scoped_lock l(_lock); + + std::shared_ptr resp(new api::ResultMessage); + resp->set_success(true); + for(const auto& r : request.cash_balance()) + { + auto acct = AdminServiceUtils::find_account(_admin_data, r.account_id(), false); + if(!acct) + { + resp->set_success(false); + resp->set_error_message("Account ID" + std::to_string(r.account_id()) + " not found"); + } + else + { + acct->mutable_margin_limit()->set_cash_balance(r.cash_balance()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, update, resp](const api::Result& admin_result) + { + resp->set_success(admin_result.success()); + resp->set_error_message(admin_result.error_message()); + incremental_update_report(update.complete_data().name(), update.complete_data().id()); + }); + } + if(!resp->success()) + break; + } + + reply(*resp); +} + void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index aa0c5cd01..6b5cf978e 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -40,6 +40,8 @@ public: void set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; + void set_cash_balance_batch(const ::bts::api::position::CashBalanceBatch& , + const api::Response<::bts::api::ResultMessage>& ) override; void set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; diff --git a/src/server/sparkd/position/PositionMap.cpp b/src/server/sparkd/position/PositionMap.cpp index 414a69e9e..060cebcb0 100644 --- a/src/server/sparkd/position/PositionMap.cpp +++ b/src/server/sparkd/position/PositionMap.cpp @@ -20,16 +20,20 @@ using namespace bts::api::orderman; using namespace bts::api::position; PositionMap::PositionMap() +: +PositionMap (SODPosition::sod_time()){ +} + +PositionMap::PositionMap(timeval sod_time) : _pos_id(0), -_sod_helper(), +_sod_helper(sod_time), _account_id_map(), _fill_map(), _manual_fill_map(), _pos_map(), _base_pos_ts(), -_base_pos_map() -{ +_base_pos_map(){ } const PositionUnit& PositionMap::on_fill (const Fill& f, @@ -59,6 +63,13 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, f.last_shares(), f.fill_key(), is_add); + if (f.fill_kind() == Fill::FILL_KIND_STANDARD) + PositionUtilities::apply_fill(*(pu.mutable_raw_day()), + f.side(), + f.last_price(), + f.last_shares(), + f.fill_key(), + is_add); break; } PositionUtilities::backwards_compat(pu); @@ -83,6 +94,19 @@ const PositionUnit& PositionMap::on_fill (const Fill& f, "", is_add); break; + case ManualFill::ADMIN_DAY: + PositionUtilities::apply_fill(*(pu.mutable_admin_day()), + mf.side(), + mf.price(), + mf.quantity(), + "", + is_add); + PositionUtilities::apply_fill(*(pu.mutable_raw_day()), + mf.side(), + mf.price(), + mf.quantity(), + "", + is_add); default: break; } @@ -101,6 +125,10 @@ void PositionMap::set_base_position(const BasePositionBatch& request){ bp.quantity(), "", true); + LOG(Gen, Info, "PositionMap::set_base_position acct_id:{} sec:key:{} " + "price:{} qty:{} side:{}", + bp.account_id(), bp.security_id(), + bp.avg_price(), bp.quantity(),bp.side()); } _reset_sod(); } @@ -178,6 +206,12 @@ void PositionMap::_reset_sod(){ // rentering all the manual fills for (auto& mfill_p : _manual_fill_map) on_manual_fill(mfill_p.second,true); + // 5. + // for backwards compat, copy it to the doubles + for (auto &acct_p : _pos_map) + for (auto &sec_p : acct_p.second) + PositionUtilities::backwards_compat(sec_p.second); + } // for backwards compatibility sake void PositionMap::_fill_account (PositionUnit& u){ @@ -190,6 +224,7 @@ void PositionMap::_fill_account (PositionUnit& u){ void PositionMap::_zero_out_pos_unit (bts::api::position::PositionUnit& pu){ _zero_out_pos_entry(*pu.mutable_day()); + _zero_out_pos_entry(*pu.mutable_raw_day()); _zero_out_pos_entry(*pu.mutable_sod()); _zero_out_pos_entry(*pu.mutable_local()); _zero_out_pos_entry(*pu.mutable_admin_day()); @@ -207,4 +242,22 @@ void PositionMap::_zero_out_pos_entry (bts::api::position::PositionEntry& p){ p.set_short_avg_price(0); } +// test only ////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +PositionUnit const* PositionMap::test_only_pos (uint32_t account_id, + uint32_t sec_key) const{ + auto acct_it = _pos_map.find(account_id); + if (acct_it != _pos_map.end()){ + auto sec_it = acct_it->second.find(sec_key); + if(sec_it != acct_it->second.end()){ + return &(sec_it->second); + } + } + return nullptr; +} + +const std::map& PositionMap::test_only_fills() const{ + return _fill_map; +} + }} \ No newline at end of file diff --git a/src/server/sparkd/position/PositionMap.h b/src/server/sparkd/position/PositionMap.h index 88721300d..a9c70b0df 100644 --- a/src/server/sparkd/position/PositionMap.h +++ b/src/server/sparkd/position/PositionMap.h @@ -48,6 +48,7 @@ private: void _zero_out_pos_entry (bts::api::position::PositionEntry&); public: PositionMap(); + PositionMap(timeval sod_time); const bts::api::position::PositionUnit& on_fill ( const bts::api::orderman::Fill& f, bool is_add); @@ -58,6 +59,10 @@ public: void set_admin_data (const bts::api::admin::AdminData&); void get_pos (std::map&) const; bts::api::position::ManualFill const* get_manual_fill (int rec_id) const; +public: + bts::api::position::PositionUnit const* test_only_pos (uint32_t account_id, + uint32_t sec_key) const; + const std::map& test_only_fills() const; }; }} diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 2bd44795a..403c9b52b 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -5,7 +5,7 @@ #include "PositionServicePNLHelper.h" #include "lib/config/protos/cme_reference_data.pb.h" #include "lib/config/config.h" -//#include "PositionUtilities.h" +#include "lib/utils/PBUtils.h" #include "lib/utils/LockBox.h" #include @@ -68,9 +68,13 @@ public: else return PNLType::UNRESOLVED; } - std::string get_symbol (SecurityKey key) const{ - auto handle = _get_handle(key); - return handle.get_usersymbol().symbol(); + double get_cpp (SecurityKey key) const{ + auto h = _get_handle(key); + if (h.is_initialized()){ + const auto& sec = h.get_normalized_security(); + return sec.contract_spec().cash_per_point(); + } + return os::nan(); } void get_md(SecurityKey key, double& bid, double& ask, double& last, double& settle){ @@ -121,21 +125,11 @@ private: struct PositionServicePNLHelper::PImpl { HandleIndex handle_index; - std::map symbol_cpp_map; - std::map sec_cpp_map; + std::map missing_data_log_count; PImpl(bts::md::MDClient& md_client) : handle_index(md_client), - symbol_cpp_map(), - sec_cpp_map() - { - const auto& cpp_map = config::get().cpp_entry(); - LOG(md,Info,"PositionServicePNLHelper::cons loaded {} cpps",cpp_map.size()); - for (const auto& p : cpp_map){ - symbol_cpp_map[std::string(p.first)]=p.second; - LOG(md,Info,"PositionServicePNLHelper loading cpp's Sym:{} cpp:{}", - p.first,p.second); - } + missing_data_log_count(){ } }; @@ -149,7 +143,7 @@ void PositionServicePNLHelper::compute_pnl( for (const auto& p : in_pos) { const PositionUnit& pu = *(p.second); uint32_t sec_key = pu.security_id(); - double cpp = _get_cpp(sec_key); + double cpp = me->handle_index.get_cpp(SecurityKey(sec_key)); double bid, ask, last, settle; me->handle_index.get_md(SecurityKey(sec_key),bid,ask,last,settle); PNLUnit pnlu; @@ -161,6 +155,7 @@ void PositionServicePNLHelper::compute_pnl( pnlu.set_last_price(last); pnlu.set_settlement_price(settle); out_pnl.push_back(pnlu); + _log_missing_data(pnlu); } _aggregate_account_pnl(out_pnl,account_map,out_account_pnl); } @@ -234,25 +229,24 @@ double PositionServicePNLHelper::_compute_day_pnl ( } return pnl; } -double PositionServicePNLHelper::_get_cpp(uint32_t sec_key){ - auto it = me->sec_cpp_map.find(sec_key); - if(it == me->sec_cpp_map.end()){ - // try to find it and put the value there - std::string symbol = me->handle_index.get_symbol(SecurityKey(sec_key)); - auto cppit = me->symbol_cpp_map.find(symbol); - if(cppit == me->symbol_cpp_map.end()){ - LOG(md,Warn,"Could not find cpp for key:{} symbol:{}", - sec_key,symbol); - return bts::os::nan(); - } - else{ - double cpp = cppit->second; - me->sec_cpp_map[sec_key]=cpp; - return cpp; - } +void PositionServicePNLHelper::_log_missing_data(const PNLUnit& u){ + auto sec_key = SecurityKey(u.pos().security_id()); + bool missing_cpp = os::is_nan(u.cash_value()), + missing_md = os::is_nan(u.bid_price()) && + os::is_nan(u.ask_price()) && + os::is_nan(u.last_price()) && + os::is_nan(u.settlement_price()); + if(missing_cpp || missing_md){ + const auto it = me->missing_data_log_count.find(sec_key); + uint16_t count = it == me->missing_data_log_count.end() ? 0 : + it->second; + if (count <= 50) + LOG(md, Warn, "Missing pnl data sec:{} cpp:{} md:{}", + sec_key, missing_cpp, missing_md); + me->missing_data_log_count[sec_key] = count+1; } else - return it->second; + me->missing_data_log_count[sec_key] = 0; } PositionServicePNLHelper::PositionServicePNLHelper(md::MDClient& md_client) : diff --git a/src/server/sparkd/position/PositionServicePNLHelper.h b/src/server/sparkd/position/PositionServicePNLHelper.h index c7f44ac4f..1d9cc29e2 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.h +++ b/src/server/sparkd/position/PositionServicePNLHelper.h @@ -23,6 +23,7 @@ private: const std::vector& in_pnl, const std::map& account_map, std::vector& out_account_pnl); + void _log_missing_data(const bts::api::position::PNLUnit&); public: PositionServicePNLHelper(md::MDClient& client); ~PositionServicePNLHelper(); diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 1b3e199d1..b42642180 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -166,17 +166,9 @@ void _diff (const std::map& new_state, void PositionServiceServer::_clear_and_publish_pos(){ std::map new_state; me->state.get_pos (new_state); - std::map prev_state; - for (const auto& p : me->pos_publisher.state_data()) - prev_state[p.first] = &(p.second); - std::vector added, changed, deleted; - _diff(new_state, prev_state, added, changed, deleted); - for (const auto& i : deleted) - me->pos_publisher.erase(i->record_id()); - for (const auto& i : changed) - me->pos_publisher.add_or_update(*i); - for (const auto& i : added) - me->pos_publisher.add_or_update(*i); + // entries are never deleted from new_state + for (const auto& p : new_state) + me->pos_publisher.add_or_update(*p.second); me->pos_publisher.flush(); } /////////////////////////////////////////////////////////////////////////////// @@ -271,6 +263,8 @@ void PositionServiceServer::remove_manual_fill( void PositionServiceServer::set_base_position( const BasePositionBatch& req, const api::Response&) { + LOG(persist, Info, "PositionServiceServer::set_base_position bp count:{}", + req.positions_size()); me->state.set_base_position(req); _clear_and_publish_pos(); } diff --git a/src/server/sparkd/position/gmi_docs/test_positions_20190708.csv b/src/server/sparkd/position/gmi_docs/test_positions_20190708.csv deleted file mode 100644 index b3eaec4b3..000000000 --- a/src/server/sparkd/position/gmi_docs/test_positions_20190708.csv +++ /dev/null @@ -1,7 +0,0 @@ -CRECID,CFIRM,COFFIC,CACCT,CATYPE,CCUSIP,CCUSP2,CCTYM,CSBCUS,CSTYPE,CSUBTY,CSTYP2,CSTRIK,CEXPDT,CSUBAC,CDEAL,CTDATE,CTPRIC,CBS,CLOC,CBROKR,CSPRED,CTRACE,CICODE,CREFNO,CSWAC1,CSWAP1,CSWAS1,CSWAC2,CSWAP2,CSWAS2,CZONE,CACNTY,CCLASS,CSUBCL,CRR,CRISKG,CMEMBR,CSNAME,CSRCAC,CREFOF,CREFRR,COFFFN,COFFOF,COFFAC,COFFAT,CMPGMN,CQTEDT,CQTY,CPRTQ,CBUSTQ,CMAKEQ,CLEAVQ,CSEGQ,CTFRQ,CDLVYQ,CDLVYA,CSDSC#,CSDSC1,CSDSC2,CSDSC3,CTDSC#,CTDSC1,CTDSC2,CTDSC3,CMKVAL,CYSTMV,CMULTF,CSDATE,CEXRAT,CRXDAT,CIAD,CYIELD,CDCTCO,CDELTA,CLTDAT,CCTLNO,CPCNTY,CEXCH,CFC,CTYPE,CSYMBL,CPTYPE,CSUBEX,CTRDEX,CMATDT,CPRTPR,CBASIS,CCLOSE,CPRCDT,CPRTCP,CUNDCP,CPRTUC,CPRVCP,CTRPRC,CEXPR,CPRICE,CSPEDT,CTPEDT,CCURSY,CCURCD,CCALC,CCMNT1,CCMNT2,CCMNT3,CLEGND,COMNCD,CRTHT,CSCHDL,COC,CCOD,CUCUSP,CCVTBL,CEXBKR,COPBKR,COPFRM,CGIVIO,CGIVF#,CIEXNG,CIEFRM,CCARD,CORDER,CCHIT,CFEECL,CFEEEX,CCTI,CORDTY,CORDOR,CTIME,CTBKT,CSESSN,CSTINS,CTTYPE,CBARG1,CBARG2,CBARG3,CBARG4,CBARG5,CMTABL,CMINIT,CMVARN,CMUNTL,CMGNCV,CREL1F,CREL1O,CREL1A,CREL1T,CREL2F,CREL2O,CREL2A,CREL2T,CREL3F,CREL3O,CREL3A,CREL3T,CCOMM,CFEE1,CFEE2,CFEE3,CFEE4,CFEE5,CFEE6,CFEE7,CFEE8,CFEE9,CGICHG,CBKCHG,COTHER,CGROSS,CNET,CMBKOF,CMFLOR,CMORDR,CMWIRE,CMOTHR,CATCOM,CATFE1,CATFE2,CATFE3,CATFE4,CATFE5,CATFE6,CATFE7,CATFE8,CATFE9,CATGIV,CATBKG,CATOTH,CATBKO,CATFLR,CATORD,CATWIR,CATALO,CFDCOM,CFDFE1,CFDFE2,CFDFE3,CFDFE4,CFDFE5,CFDFE6,CFDFE7,CFDFE8,CFDFE9,CFDGIV,CFDBKG,CFDOTH,CFDBKO,CFDFLR,CFDORD,CFDWIR,CFDALO,CFUFE1,CFUFE2,CFUFE3,CFUFE4,CFUFE5,CFUFE6,CFUFE7,CFUFE8,CFUFE9,CFUGIV,CFUBKG,CFUOTH,CFUBKO,CFUFLR,CFUORD,CFUWIR,CFUALO,COVNQ,CDAYQ,CSCRQ,CSPDQ,COVNC,CDAYC,CSCRC,CSPDC,CLEVEL,CBATCH,CRECNO,CCLRID,CINPMO,CINPYR,CFBACC,CORIG,CCABCD,CSCHOV,CPGMID,CSCRID,CUSER,CWSID,CWSTIM,CDEST,CDELET,CXTRCT,CBQTY,CSQTY,CFDAM1,CAMT1,CFDAM2,CAMT2,CROUT1,CROUT2,CROUT3,CCURAC,CCURAT,CCCNTY -P,A,,ACC A,F1,.A020000019I, ,201909, ,F, , ,0,0, , ,20190612,4.395,1, , , ,9F12 BD2H0,100, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1,1,0,0,0,0,0,0,0,1,SEP 19 CORN , , ,0, , , ,0,0,5000,20190612,1,0,0,0,0,0,20190913, ,US,1,2, , , , ,1A,0, 4.39 1/2,0,4.395,20190708, 4.39 1/2,0, ,4.3875,0, ,4395, ,4,USD,US, , J, , , , ,H,FA, , , F1,0,9J5L ,99HMC, , , , , ,1579, , ,C,C,4, , ,85117, , , ,2, , , , , , ,0,0,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BAK,908,160478456,9,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,1,B, ,0,1,0, ,0, ,0,A,A,A,USD,USD,US -P,A,XXX,12345,F1,.A020000019L, ,201912, ,F, , ,0,0, , ,20190528,4.235,2, , , ,9E28 ODK0,100, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1, 1-,0,0,0,0,0,0,0,1,DEC 19 CORN , , ,0, , , ,-1012.5,0,5000,20190528,1,0,0,0,0,0,20191213, ,US,1,2, , , , ,1A,0, 4.23 1/2,0,4.4375,20190708, 4.43 3/4,0, ,4.4225,0, ,4235, ,4,USD,US, , J, , , , ,H,FA, , , F1,0,9J5L ,99HMC, , , , , ,1197, , ,C,C,4, , ,190123, , , ,2, , , , , , ,0,0,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BA1,909,158996393,&,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,13400,B, ,0,0,1, ,0, ,0,A,A,A,USD,USD,US -P,A,XXX,12345,F1,.A020041019X, ,201912, ,F,P, ,4.1,20191122, , ,20190701,0.19375,2, , , ,9G01 CNGN0,200, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1, 1-,0,0,0,0,0,0,0,1,PUT DEC 19 CORN 410, , ,0, , , ,-618.75,0,5000,20190701,1,0,0,0,0,0.274,20191122, ,US,1,2,O, , , ,1A,0, .19 3/8,0,0.12375,20190708, .12 3/8,4.4375, ,0.135,0,410,193,2,8,USD,US, , J, , , , ,H,FA,O, , F1,0,9J5L ,99HMC, , , , , ,124P, , ,C,C,4, , ,115650, , , ,2, , , , , , ,0,350,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BAU,910,162054240,&,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,115600,B, ,0,0,1, ,0, ,0,A,A,A,USD,USD,US -P,A,XXX,12345,F1,.A020044019L, ,201912, ,F,C, ,4.4,20191122, , ,20190701,0.2125,2, , , ,9G01 CNH70,200, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1, 1-,0,0,0,0,0,0,0,1,CALL DEC 19 CORN 440, , ,0, , , ,-1581.25,0,5000,20190701,1,0,0,0,0,0.552,20191122, ,US,1,2,O, , , ,1A,0, .21 1/4,0,0.31625,20190708, .31 5/8,4.4375, ,0.315,0,440,212,2,8,USD,US, , J, , , , ,H,FA,O, , F1,0,9J5L ,99HMC, , , , , ,124Q, , ,C,C,4, , ,115701, , , ,2, , , , , , ,0,-518.75,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BAU,911,162054300,&,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,115616,B, ,0,0,1, ,0, ,0,A,A,A,USD,USD,US -P,A,,ACC A,F1,.A020044019L, ,201912, ,F,, ,4.4,20191122, , ,20190701,0.2125,2, , , ,9G01 CNH70,200, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1, 1-,0,0,0,0,0,0,0,1,CALL DEC 19 CORN 440, , ,0, , , ,-1581.25,0,5000,20190701,1,0,0,0,0,0.552,20190913, ,US,1,2,O, , , ,1A,0, .21 1/4,0,0.31625,20190708, .31 5/8,4.4375, ,0.315,0,440,212,2,8,USD,US, , J, , , , ,H,FA,O, , F1,0,9J5L ,99HMC, , , , , ,124Q, , ,C,C,4, , ,115701, , , ,2, , , , , , ,0,-518.75,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BAU,911,162054300,&,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,115616,B, ,0,0,1, ,0, ,0,A,A,A,USD,USD,US -P,A,XXX,12345,F1,.A050095019H, ,201908, ,F,C, ,9.5,20190726, , ,20190624,0.11125,1, , , ,9F24 CGF10,200, , , , , , , , ,US,C, ,12345, , ,TEST ACCOUNT , , , , , , , , ,0,1,1,0,0,0,0,0,0,0,1,CALL AUG 19 SOYBEANS 950, , ,0, , , ,56.25,0,5000,20190624,1,0,0,0,0,0.056,20190726, ,US,1,5,O, , , ,1A,0, .11 1/8,0,0.01125,20190708, .01 1/8,8.79, ,0.0125,0,950,111,2,8,USD,US, , J, , , , ,H,FA,O, , F1,0,9J5L ,99HMC, , , , , ,12JL, , ,C,C,4, , ,130747, , , ,2, , , , , , ,0,-500,0,0, , , ,M, , , , , , , , ,-2,0,-1.95,-0.02,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,F1,M,C,E,N,X,Z, , , , , ,B,T,Y,F,D,W,K,C,C,C,M,M,M,M,M,M, ,C,M,M,M,M,M,M,1,0,0,0,-2,0,0,0,ATO,BAX,912,161483229,8,19, , , , ,1,31,TESTACCT ,ATESDGMIMC,130708,B, ,0,1,0, ,0, ,0,A,A,A,USD,USD,US diff --git a/src/server/sparkd/position/gmi_parser.cpp b/src/server/sparkd/position/gmi_parser.cpp deleted file mode 100644 index 8721e965d..000000000 --- a/src/server/sparkd/position/gmi_parser.cpp +++ /dev/null @@ -1,315 +0,0 @@ -#include "gmi_parser.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" -#include "lib/config/config.h" -#include "lib/config/protos/position_cfg.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/UserSymbol.h" -#include "lib/utils/PBUtils.h" - -#include -#include -#include - -namespace bts { -namespace position { - -md::UserSymbol map_gmi_future_symbol(std::string const &cfc, api::Venue venue) { - for (auto const &m : config::get().sym()) - if (m.gmi() == cfc && m.venue() == venue) - return {m.spark(), venue, api::SECURITYTYPE_FUTURE}; - return {}; -} - -api::Venue map_gmi_venue(std::string const &gmi_venue) { - if (gmi_venue == "1" || gmi_venue == "2" || gmi_venue == "01" || - gmi_venue == "02") - return api::Venue::VENUE_GLBX; - else if (gmi_venue == "5") - return api::Venue::VENUE_ICE; - else - return api::Venue::VENUE_UNSET; -} - -bool is_gmi_security_a_future(std::string const &cstype, - std::string const &csubty) { - return cstype == "F" && csubty.empty(); -} - -api::Side map_gmi_side(std::string const &cbs) { - if (cbs == "1") - return api::Side::SIDE_BUY; - else if (cbs == "2") - return api::Side::SIDE_BUY; - else - return api::Side::SIDE_UNDEFINED; -} - -std::optional map_gmi_quantity(std::string const &cqty) { - try { - return std::stoi(cqty); - } catch (std::exception const &) { - return {}; - } -} - -std::optional map_gmi_price(std::string const &cprice) { - try { - return std::stod(cprice); - } catch (std::exception const &) { - return {}; - } -} - -std::optional -map_gmi_expiration(std::string const &exp_date) { - if (exp_date.size() != 8) - return {}; - - auto year = map_gmi_quantity(exp_date.substr(0, 4)); - if (!year.has_value()) - return {}; - auto month = map_gmi_quantity(exp_date.substr(4, 2)); - if (!month.has_value()) - return {}; - auto day = map_gmi_quantity(exp_date.substr(6, 2)); - if (!day.has_value()) - return {}; - - api::FutureContract result; - result.set_expiration_year(year.value()); - result.set_expiration_month(month.value()); - result.set_expiration_day(day.value()); - return result; -} - -api::Security const * -find_security(md::UserSymbol const &s, std::string const &cltdat, - std::map> &cached) { - - auto exp_date = map_gmi_expiration(cltdat); - if (!exp_date.has_value()) - return nullptr; - - auto it = cached.find(s); - if (it == cached.end()) { - auto &secs = cached[s]; - - std::set to_load; - to_load.insert(s); - bts::md::db::load_securities( - to_load, [&secs](auto const &s) { secs.push_back(s); }); - } - auto &secs = cached[s]; - - for (auto const &s : secs) { - bts_assert(s.has_future()); - auto &f = s.future(); - if (f.expiration_year() == exp_date.value().expiration_year() && - f.expiration_month() == exp_date.value().expiration_month() && - f.expiration_day() == exp_date.value().expiration_day()) - return &s; - } - return nullptr; -} - -void sanitize_values(std::vector *values) { - for (auto &s : *values) { - boost::algorithm::replace_all(s, "\"", ""); - boost::algorithm::trim(s); - } -} - -std::variant -parse_gmi(api::admin::AdminData const &admin_data, - std::string const &file_path) { - std::ifstream in {file_path}; - return parse_gmi(admin_data,in); -} - -std::variant -parse_gmi(api::admin::AdminData const &admin_data, std::istream &in) { - if (in.bad()) - return fmt::format("Unable to open GMI file"); - - std::string line; - std::getline(in, line); - - if (in.bad()) - return fmt::format("Could not read first line of GMI file "); - - std::vector column_names; - boost::algorithm::split(column_names, line, - boost::algorithm::is_any_of(",")); - std::map column_idx; - for (size_t i = 0; i < column_names.size(); i++) - column_idx[column_names[i]] = i; - - auto required_columns = { - "PFC", // Symbol - "PEXCH", // Exchange - "PSTYPE", // Symbol type (options are marked as futures) - "PSUBTY", // Symbol sub-type (for options C,P for futures blank) - "PLTDAT", // Expiration date - "PBS", // Buy/Sell - "PQTY", // Quantity, - "POFFIC", // Office number (3 first chars of clearing account) - "PACCT", // Account name (remaining 5 digits of clearing account) - "PTPRIC", // Price paid - }; - - for (auto c : required_columns) - if (column_idx.count(c) == 0) - return fmt::format("Could not find column {} in GMI file", c); - - api::position::BasePositionBatch result; - auto line_number = 1; - std::map> cached_securities; - - while (std::getline(in, line)) { - line_number++; - std::vector values; - boost::algorithm::split(values, line, boost::algorithm::is_any_of(",")); - sanitize_values(&values); - if (values.size() != column_names.size()) { - auto msg = - fmt::format("Aborted parsing on line {}. Expected {} columns, but " - "found {}", - line_number, column_names.size(), values.size()); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - auto gmi_exchange_code = values[column_idx["PEXCH"]]; - auto venue = map_gmi_venue(gmi_exchange_code); - if (venue == api::Venue::VENUE_UNSET) { - LOG(OrderMan, Info, - "Skipping line {} file because we could not resolve " - "the GMI " - "exchange code on colum PEXCH {}", - line_number, gmi_exchange_code); - continue; - } - - auto clearing_account = - values[column_idx["POFFIC"]] + values[column_idx["PACCT"]]; - - auto bts_account = admin::AdminServiceUtils::find_account( - admin_data, clearing_account, venue); - - if (bts_account == nullptr) { - LOG(OrderMan, Info, - "Skipping line {} because we could not map the " - "GMI clearing account {} to a BTS account", - line_number, clearing_account); - continue; - } - - api::position::BasePosition this_line_position; - - // ACCOUNT ID - this_line_position.set_account_id(bts_account->id()); - // ACCOUNT ID - - if (!is_gmi_security_a_future(values[column_idx["PSTYPE"]], - values[column_idx["PSUBTY"]])) { - auto msg = fmt::format("Aborted parsing on line {}. " - "PSTYPE and PSUBTY do not reffer to a " - "future", - line_number); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - auto gmi_cfc = values[column_idx["PFC"]]; - auto spark_symbol = map_gmi_future_symbol(gmi_cfc, venue); - if (spark_symbol == md::UserSymbol()) { - auto msg = fmt::format("Aborted parsing on line {} because " - "the PFC code {} could " - "not be resolved" - "to a spark future symbol at venue {}", - line_number, gmi_cfc, api::Venue_Name(venue)); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - auto gmi_exp = values[column_idx["PLTDAT"]]; - auto security = find_security(spark_symbol, gmi_exp, cached_securities); - - if (security == nullptr) { - auto msg = fmt::format( - "Aborted parsing on line {} because no security with " - "symbol {} and expiration {} was found the spark security " - "database", - line_number, spark_symbol.to_string(), gmi_exp); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - // SECURITY KEY - this_line_position.set_security_id(security->id()); - // SECURITY KEY - - auto gmi_side = values[column_idx["PBS"]]; - auto side = map_gmi_side(gmi_side); - if (side == api::Side::SIDE_UNDEFINED) { - auto msg = fmt::format("Aborted parsing on line {} because we " - "could not interpret " - "PBS value {} to either a buy or a sell", - line_number, gmi_side); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - // SIDE - this_line_position.set_side(side); - // SIDE - - auto gmi_qty = values[column_idx["PQTY"]]; - auto qty = map_gmi_quantity(gmi_qty); - if (!qty.has_value()) { - auto msg = fmt::format("Aborted parsing on line {} because " - "PQTY {} is not a number", - line_number, gmi_qty); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - // Quantity - this_line_position.set_quantity(qty.value()); - // Quantity - - if (qty.value() == 0) - this_line_position.set_avg_price(0); - else { - - auto gmi_price = values[column_idx["PPRICE"]]; - auto price = map_gmi_price(gmi_price); - if (!price.has_value()) { - auto msg = fmt::format("Aborted parsing on line {} because " - "PPRICE {} is not a number", - line_number, gmi_price); - LOG(OrderMan, Error, "{}", msg); - return msg; - } - - // AVG Price - this_line_position.set_avg_price(price.value() / qty.value()); - // AVG Price - } - - LOG(OrderMan, Info, "Successfully parsed line {}. Parsed value: {}", - line_number, utils::pb::to_string(this_line_position)); - *result.add_positions() = this_line_position; - } - - if (result.positions_size() == 0) - LOG(OrderMan, Error, - "There were no positions in the GMI file. This is suspicious " - "but not necessarily wrong."); - - return result; -} - -} // namespace position -} // namespace bts diff --git a/src/server/sparkd/position/import/BasePositionServiceServer.cpp b/src/server/sparkd/position/import/BasePositionServiceServer.cpp new file mode 100644 index 000000000..58ecf78d0 --- /dev/null +++ b/src/server/sparkd/position/import/BasePositionServiceServer.cpp @@ -0,0 +1,219 @@ +#include "BasePositionServiceServer.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/PositionService.client.pb.h" +#include "lib/config/config.h" +#include "lib/config/protos/position_cfg.pb.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/logging/logging.h" +#include "lib/utils/PBUtils.h" +#include "lib/utils/bts_assert.h" +#include "lib/utils/datetime.h" +#include "server/sparkd/position/import/parsing/gmi_parser.h" +#include "server/sparkd/position/import/DownloadCommonStateMachine.h" + +#include +#include +#include +#include + +namespace bts { +namespace position { + +struct BasePositionServiceServer::PImpl { + PImpl(BasePositionServiceServer &owner, + bts::api::ServiceContext &ctx) + : ctx(ctx), + admin_service(ctx.locate()), + pos_service(ctx.locate()), + download_sm("Position downloader", + + // File picker + [&owner] (auto const &candidates) { + return owner.pick_most_recent_pos_file(candidates); + }, + + // Download complete handler + [&owner] (auto const&sftp_file, auto const&local_file) { + return owner.on_download_complete(sftp_file,local_file); + }, + + // Thread Marshaller + [&ctx] (auto const&action) { + ctx.post(action); + }), + admin_data() + {} + + bts::api::ServiceContext &ctx; + api::admin::AdminService admin_service; + api::position::PositionService pos_service; + DownloadCommonStateMachine download_sm; + std::shared_ptr admin_data; +}; + +BasePositionServiceServer::BasePositionServiceServer( + bts::api::ServiceContext &ctx) + : BasePositionServiceBase(ctx), me(new PImpl(*this,ctx)) { + auto const &c = config::get(); + + if (c.sftp_host().size() && !c.disable_position_download()) { + LOG(OrderMan, Info, "BasePositionServiceServer is active."); + + on_timer(); + me->admin_service.subscribe_admin_data() | + rxcpp::operators::subscribe( + [this](auto const &update) { + bts_assert(update.all().size() == 1); + me->admin_data = update.all()[0]; + me->download_sm.on_admin(me->admin_data); + }); + } else + LOG(OrderMan, Warn, + "GMI import is disabled, since no host is specified in the " + "GMI_Import.sftp_host config key"); +} + +BasePositionServiceServer::~BasePositionServiceServer() {} + +void BasePositionServiceServer::parse_gmi_csv( + const api::position::GMI_CSVBlock &b, + const api::Response &reply) { + + api::position::GMI_ParseResult result; + if (!me->admin_data) { + *result.mutable_failure() = "Server is not ready"; + reply(result); + return; + } + + std::istringstream in{b.text()}; + auto parse_result = parse_gmi(*me->admin_data, in); + + if (!std::holds_alternative( + parse_result)) { + *result.mutable_failure() = std::get(parse_result); + reply(result); + return; + } + + auto base_position = + std::get(parse_result); + *result.mutable_success() = reduce_parsed_gmi(base_position); + reply(result); + return; +} + +void BasePositionServiceServer::on_timer() { + me->ctx.post([this]() { on_timer(); }, 10000); + me->download_sm.on_timer(); +} + +std::optional BasePositionServiceServer::on_download_complete( + std::string const &sftp_file_path, std::string const &local_file_path) { + + LOG(OrderMan, Warn, + "Successfully downloaded GMI file {} to local file " + "{}. Will parse next.", + sftp_file_path, local_file_path); + + auto as_of = get_as_of_date(sftp_file_path); + if (!as_of.has_value()) { + auto error_msg = fmt::format( + "Could not extract date from sftp file name {}", sftp_file_path); + return error_msg; + } + + auto parse_result = parse_gmi_file(local_file_path); + if (!std::holds_alternative( + parse_result)) { + auto error_msg = + fmt::format("Failed to parse GMI file at {}. Error msg: {}", + local_file_path, std::get(parse_result)); + return error_msg; + } + + auto base_position = + std::get(parse_result); + + LOG(OrderMan, Warn, + "Successfully parsed GMI file at {}. Extracted {} records for " + "the " + "base position", + local_file_path, base_position.positions_size()); + + *base_position.mutable_current_as_of() = + utils::pb::to_timestamp(as_of.value()); + + auto reduced_base_pos = reduce_parsed_gmi(base_position); + + LOG(OrderMan, Warn, "Reduced parsed GMI file at {} from {} to {} records", + local_file_path, base_position.positions_size(), + reduced_base_pos.positions_size()); + + for (auto const &bp : reduced_base_pos.positions()) + LOG(OrderMan, Info, "Base position for Account: {} Sec: {} {} {} @ {} ", + bp.account_id(), bp.security_id(), api::Side_Name(bp.side()), + bp.quantity(), bp.avg_price()); + + me->pos_service.set_base_position( + reduced_base_pos, + [this](auto const &rr) { + if (!rr.success()) + on_position_set_failure(rr.error_message()); + else if (!rr.value()->ok()) + on_position_set_failure(rr.value()->msg()); + }, + 5000); + return {}; +} + +void BasePositionServiceServer::on_position_set_failure( + std::string const &error) { + LOG(OrderMan, Error, + "Failed to set base position through the position service. The " + "following information is available: {}", + error); + me->download_sm.on_post_handle_failure(error); +} + +std::optional +BasePositionServiceServer::get_as_of_date(std::string const &sftp_file_name) { + std::regex rx(".*btspos_(\\d\\d\\d\\d)(\\d\\d)(\\d\\d)\\.csv.*"); + std::smatch matches; + if (!std::regex_match(sftp_file_name, matches, rx)) + return {}; + auto y = std::stoi(matches[1]); + auto m = std::stoi(matches[2]); + auto d = std::stoi(matches[3]); + + const auto &sod = config::get(); + try { + return datetime::make_ptime(y, m, d, sod.sod_hh(), sod.has_sod_mm(), 0, + 0); + } catch (std::out_of_range const &) { + return {}; + } +} + +std::optional BasePositionServiceServer::pick_most_recent_pos_file( + std::vector const &candidates) { + + std::vector pos_files; + std::copy_if(candidates.begin(), candidates.end(), + std::back_inserter(pos_files), [](auto const &file_name) { + return boost::algorithm::starts_with(file_name, "btspos_"); + }); + if (pos_files.empty()) + return {}; + std::sort(pos_files.begin(), pos_files.end()); + return pos_files.back(); +} + +std::variant +BasePositionServiceServer::parse_gmi_file(std::string const &f) { + return position::parse_gmi(*me->admin_data, f); +} + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/BasePositionServiceServer.h b/src/server/sparkd/position/import/BasePositionServiceServer.h similarity index 70% rename from src/server/sparkd/position/BasePositionServiceServer.h rename to src/server/sparkd/position/import/BasePositionServiceServer.h index d43723cb0..dbcfcf8e0 100644 --- a/src/server/sparkd/position/BasePositionServiceServer.h +++ b/src/server/sparkd/position/import/BasePositionServiceServer.h @@ -19,6 +19,8 @@ class AdminData; namespace bts { namespace position { +class DownloadWindow; + class BasePositionServiceServer : public bts::api::position::BasePositionServiceBase { public: @@ -26,27 +28,25 @@ class BasePositionServiceServer ~BasePositionServiceServer(); void parse_gmi_csv( - const api::position::CSVBlock &, + const api::position::GMI_CSVBlock &, const api::Response &) override; private: void on_timer(); - void on_admin_data(std::shared_ptr const &); - void maybe_start_synch(); - enum class State; - void transition(State new_state); + void on_admin(std::shared_ptr const &); + std::optional on_download_complete(std::string const &sftp_file_path, + std::string const &local_file_path); + void on_position_set_failure(std::string const &); + std::optional pick_most_recent_pos_file(std::vector const &); + std::optional get_as_of_date(std::string const &sftp_file_name); - void on_download_success(std::string const &sftp_file_path, - std::string const &local_file_path); - void on_error(std::string const &msg); + std::variant parse_gmi_file(std::string const &file_path); - bool in_download_window() const; - std::string state_name(State) const; struct PImpl; std::unique_ptr me; }; diff --git a/src/server/sparkd/position/import/DownloadCommonStateMachine.cpp b/src/server/sparkd/position/import/DownloadCommonStateMachine.cpp new file mode 100644 index 000000000..e51f0fce9 --- /dev/null +++ b/src/server/sparkd/position/import/DownloadCommonStateMachine.cpp @@ -0,0 +1,246 @@ +#include "DownloadCommonStateMachine.h" + +#include "lib/config/config.h" +#include "lib/config/protos/position_cfg.pb.h" +#include "lib/utils/bts_assert.h" +#include "lib/utils/datetime.h" +#include "lib/utils/sftp.h" +#include "server/sparkd/position/import/DownloadWindow.h" + +namespace bts { +namespace position { + +using namespace boost::posix_time; + +enum class DownloadCommonStateMachine::State { + W_ADMIN, // Waiting for the initial admin object + DOWNLOADING, // In the process of downloading the newest file + W_WINDOW, // Waiting for the download window to open + PAUSED, // Waiting for a few seconds before starting a download +}; + +struct DownloadCommonStateMachine::PImpl { + PImpl(std::string const &state_machine_descriptor, FilePicker const &p, + FileHandler const &h, ThreadMarshaller const &m) + : descriptor(state_machine_descriptor), file_picker(p), file_handler(h), + post(m), state(State::W_ADMIN), last_download_attempt_ts(), + admin_data(), + download_window( + now(), + duration_from_string( + config::get().download_window_begin()), + duration_from_string( + config::get().download_window_end())) {} + + std::string descriptor; + FilePicker file_picker; + FileHandler file_handler; + ThreadMarshaller post; + State state = State::W_ADMIN; + datetime::PTime last_download_attempt_ts; + std::shared_ptr admin_data; + DownloadWindow download_window; +}; + +DownloadCommonStateMachine::DownloadCommonStateMachine( + std::string const &desc, FilePicker const &p, FileHandler const &h, + ThreadMarshaller const &m) + : me(new PImpl(desc, p, h, m)) { + + LOG(OrderMan, Info, "{} current download window is {}", me->descriptor, + me->download_window); +} + +DownloadCommonStateMachine::~DownloadCommonStateMachine() {} + +datetime::PTime DownloadCommonStateMachine::now() { + return datetime::local_now(); +} + +void DownloadCommonStateMachine::on_admin( + std::shared_ptr const &a) { + LOG(OrderMan, Info, "Received new admin data in {}", me->descriptor); + + me->admin_data = a; + + switch (me->state) { + case State::W_ADMIN: + case State::W_WINDOW: + LOG(OrderMan, Info, + "{} received admistrative data in state {}. " + "Beginning " + "download", + me->descriptor, state_name(me->state)); + pause(); + return; + case State::DOWNLOADING: + case State::PAUSED: + LOG(OrderMan, Info, + "{} received new administrative data while in " + "state {}. " + "The new data will be used when decoding the next position file", + me->descriptor, state_name(me->state)); + return; + } +} + +void DownloadCommonStateMachine::on_timer() { + switch (me->state) { + case State::W_ADMIN: + case State::DOWNLOADING: + break; + case State::PAUSED: + if (pause_over()) { + LOG(OrderMan, Info, "{} pause period over. Beginning download", + me->descriptor); + start_download(); + } else + LOG(OrderMan, Diag, "{} is paused", me->descriptor); + break; + case State::W_WINDOW: + if (me->download_window.is_inside(now())) { + LOG(OrderMan, Info, + "{} download window {} began. Beginning " + "download", + me->descriptor, me->download_window); + start_download(); + } else + LOG(OrderMan, Diag, + "{} is waiting for the download window {} to begin", + me->descriptor, me->download_window); + break; + } +} + +void DownloadCommonStateMachine::start_download() { + LOG(OrderMan, Info, "{} attempting download", me->descriptor); + transition(State::DOWNLOADING); + + using namespace bts::utils; + const auto &conf = config::get(); + + begin_sftp_download( + conf.sftp_host(), conf.sftp_port(), conf.sftp_user(), + conf.sftp_password(), conf.download_timeout_seconds() * 1000, + [this](const auto &v) { return me->file_picker(v); }, + [this](auto const &result) { + if (std::holds_alternative(result)) { + auto error_msg = fmt::format( + "{} failed to download file. Error={}", me->descriptor, + std::get(result).error_msg); + me->post([this, error_msg]() { on_download_failure(error_msg); }); + } else { + auto sftp_file_path = + std::get(result).sftp_file_path; + auto local_file_path = + std::get(result).local_file_path; + me->post([this, sftp_file_path, local_file_path]() { + on_download_complete(sftp_file_path, local_file_path); + }); + } + }); +} + +void DownloadCommonStateMachine::on_download_failure( + std::string const &error_msg) { + LOG(OrderMan, Error, + "{} failed to obtain or parse the target file. The following " + "information is " + "available: {}. ", + me->descriptor, error_msg); + + if (me->download_window.is_inside(now())) + pause(); + else { + if (now() > me->download_window.stop()) + advance_download_window(); + wait_download_window(); + } +} + +void DownloadCommonStateMachine::on_download_complete( + std::string const &sftp_file_path, std::string const &local_file_path) { + + LOG(OrderMan, Warn, + "{} successfully downloaded target file {} to local file " + "{}. Will parse next.", + me->descriptor, sftp_file_path, local_file_path); + + bts_assert(me->state == State::DOWNLOADING); + auto error = me->file_handler(sftp_file_path, local_file_path); + if (error.has_value()) + on_download_failure(error.value()); + else { + if (now() >= me->download_window.start()) + advance_download_window(); + wait_download_window(); + } +} + +void DownloadCommonStateMachine::on_post_handle_failure( + std::string const &error) { + LOG(OrderMan, Error, + "A post file handlong service downsream from {} failed. The " + "following information is available: {}", + me->descriptor, error); + + switch (me->state) { + case State::W_ADMIN: + bts_assert(false); + return; + case State::W_WINDOW: + LOG(OrderMan, Info, "{} will force retry of download", me->descriptor); + pause(); + return; + case State::DOWNLOADING: + case State::PAUSED: + return; + } +} + +void DownloadCommonStateMachine::advance_download_window() { + auto previous = me->download_window; + me->download_window = me->download_window.next(); + LOG(OrderMan, Info, "{} advancing download window from {} to {}", + me->descriptor, previous, me->download_window); +} + +void DownloadCommonStateMachine::wait_download_window() { + transition(State::W_WINDOW); +} + +void DownloadCommonStateMachine::transition(State new_state) { + LOG(OrderMan, Info, "Transitioning {} from {} to {}", me->descriptor, + state_name(me->state), state_name(new_state)); + me->state = new_state; +} + +std::string DownloadCommonStateMachine::state_name(State st) const { + switch (st) { + case State::W_ADMIN: + return "W_ADMIN"; + case State::DOWNLOADING: + return "DOWNLOADING"; + case State::PAUSED: + return "PAUSED"; + case State::W_WINDOW: + return "W_WINDOW"; + } + bts_assert(false); + return ""; +} + +void DownloadCommonStateMachine::pause() { + me->last_download_attempt_ts = now(); + transition(State::PAUSED); +} + +bool DownloadCommonStateMachine::pause_over() const { + auto secs_to_pause = + config::get().pause_between_downloads_seconds(); + return (now() - me->last_download_attempt_ts).total_seconds() >= + (int64_t)secs_to_pause; +} + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/DownloadCommonStateMachine.h b/src/server/sparkd/position/import/DownloadCommonStateMachine.h new file mode 100644 index 000000000..d6df9cc81 --- /dev/null +++ b/src/server/sparkd/position/import/DownloadCommonStateMachine.h @@ -0,0 +1,56 @@ +#pragma once + +#include +#include +#include +#include +#include +#include "lib/utils/datetime.h" + +namespace bts { +namespace api { +namespace admin { +class AdminData; +} +} // namespace api +namespace position { + +using FilePicker = + std::function(std::vector const &)>; +using FileHandler = std::function( + std::string const &sftp_file_path, std::string const &local_file_path)>; +using ThreadMarshaller = std::function)>; + +class DownloadCommonStateMachine { + public: + DownloadCommonStateMachine( + std::string const&state_machine_descriptor, + FilePicker const &, FileHandler const &, + ThreadMarshaller const&); + + ~DownloadCommonStateMachine(); + void on_admin(std::shared_ptr const &); + void on_timer(); + void on_post_handle_failure(std::string const &msg); + + private: + enum class State; + struct PImpl; + static datetime::PTime now() ; + std::unique_ptr me; + + void start_download(); + + void on_download_failure(std::string const &); + void on_download_complete(std::string const &, std::string const &); + void pause(); + bool pause_over() const ; + void wait_download_window(); + void advance_download_window(); + + void transition(State new_state); + std::string state_name(State) const; +}; + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/DownloadWindow.cpp b/src/server/sparkd/position/import/DownloadWindow.cpp new file mode 100644 index 000000000..64d963fed --- /dev/null +++ b/src/server/sparkd/position/import/DownloadWindow.cpp @@ -0,0 +1,80 @@ +#include "server/sparkd/position/import/DownloadWindow.h" +#include "lib/config/config.h" +#include "lib/config/protos/position_cfg.pb.h" +#include "lib/utils/bts_assert.h" + +#include + +namespace bts { +namespace position { + +using namespace boost::posix_time; + +DownloadWindow::DownloadWindow(const DownloadWindow &src) + : _start(src.start()), _stop(src.stop()) {} + +DownloadWindow ::DownloadWindow(datetime::PTime now, time_duration start_time, + time_duration stop_time) { + bts_assert(start_time != stop_time); + + auto now_time = now.time_of_day(); + auto today = now.date(); + auto tomorrow = today + boost::gregorian::date_duration(1); + auto yesterday = today - boost::gregorian::date_duration(1); + + if (start_time < stop_time) { + // The window opens and closes in the same day + + // are we past the end of the window? + if (now_time > stop_time) { + // Today's window has closed and will only open up again tomorrow + _start = datetime::PTime(tomorrow, start_time); + _stop = datetime::PTime(tomorrow, stop_time); + } else { + // Today's window is either open now or will open later + // today + _start = datetime::PTime(today, start_time); + _stop = datetime::PTime(today, stop_time); + } + } else { + // The window opens one day and closes the next + + if (now_time < stop_time) { + // Yesterdays window is still open, it close today + _start = datetime::PTime(yesterday, start_time); + _stop = datetime::PTime(now.date(), stop_time); + } else { + // Today's window is either open now or will open later + // today (and close tomorrow) + _start = datetime::PTime(today, start_time); + _stop = datetime::PTime(tomorrow, stop_time); + } + } + bts_assert(_start < _stop); +} + +DownloadWindow::DownloadWindow(datetime::PTime const &start, + datetime::PTime const &stop) + : _start(start), _stop(stop) { + bts_assert(_start < _stop); +} + +DownloadWindow DownloadWindow::next() const { + return DownloadWindow(_start + boost::gregorian::date_duration(1), + _stop + boost::gregorian::date_duration(1)); +} + +bool DownloadWindow::is_inside(datetime::PTime const &time) const { + return time >= _start and time <= _stop; +} + +datetime::PTime DownloadWindow::start() const { return _start; } +datetime::PTime DownloadWindow::stop() const { return _stop; } + +std::ostream &operator<<(std::ostream &out, DownloadWindow const &w) { + out << "[ " << w.start() << " ... " << w.stop() << " ]"; + return out; +} + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/DownloadWindow.h b/src/server/sparkd/position/import/DownloadWindow.h new file mode 100644 index 000000000..2faa5648d --- /dev/null +++ b/src/server/sparkd/position/import/DownloadWindow.h @@ -0,0 +1,27 @@ +#pragma once + +#include "lib/utils/datetime.h" +#include + +namespace bts { +namespace position { + +class DownloadWindow { +public: + DownloadWindow (const DownloadWindow&); + DownloadWindow(datetime::PTime now, + boost::posix_time::time_duration window_begin, + boost::posix_time::time_duration window_end); + DownloadWindow(datetime::PTime const &, datetime::PTime const &); + DownloadWindow next() const ; + bool is_inside(datetime::PTime const &time) const ; + datetime::PTime start() const; + datetime::PTime stop() const; +private: + datetime::PTime _start; + datetime::PTime _stop; +}; + +std::ostream& operator<<(std::ostream &,DownloadWindow const&); + +}} diff --git a/src/server/sparkd/position/import/MoneyFileServiceServer.cpp b/src/server/sparkd/position/import/MoneyFileServiceServer.cpp new file mode 100644 index 000000000..3b1d96465 --- /dev/null +++ b/src/server/sparkd/position/import/MoneyFileServiceServer.cpp @@ -0,0 +1,192 @@ +#include "MoneyFileServiceServer.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/MarginService.client.pb.h" +#include "lib/config/config.h" +#include "lib/config/protos/position_cfg.pb.h" +#include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/logging/logging.h" +#include "lib/utils/PBUtils.h" +#include "lib/utils/bts_assert.h" +#include "lib/utils/datetime.h" +#include "server/sparkd/position/import/parsing/money_parser.h" +#include "server/sparkd/position/import/DownloadCommonStateMachine.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" + +#include +#include +#include +#include + +namespace bts { +namespace position { + +struct MoneyFileServiceServer::PImpl { + PImpl(MoneyFileServiceServer &owner, + bts::api::ServiceContext &ctx) + : ctx(ctx), + admin_service(ctx.locate()), + margin_service(ctx.locate()), + download_sm("Money file downloader", + + // File picker + [&owner] (auto const &candidates) { + return owner.pick_most_recent_money_file(candidates); + }, + + // Download complete handler + [&owner] (auto const&sftp_file, auto const&local_file) { + return owner.on_download_complete(sftp_file,local_file); + }, + + // Thread Marshaller + [&ctx] (auto const&action) { + ctx.post(action); + }), + admin_data() + {} + + bts::api::ServiceContext &ctx; + api::admin::AdminService admin_service; + api::position::MarginService margin_service; + DownloadCommonStateMachine download_sm; + std::shared_ptr admin_data; + std::map all_clearing_accounts; +}; + +MoneyFileServiceServer::MoneyFileServiceServer( + bts::api::ServiceContext &ctx) + : MoneyFileServiceBase(ctx), me(new PImpl(*this,ctx)) { + auto const &c = config::get(); + + if (c.sftp_host().size() && !c.disable_money_download()) { + LOG(OrderMan, Info, "MoneyFileServiceServer is active."); + + on_timer(); + me->admin_service.subscribe_admin_data() | + rxcpp::operators::subscribe( + [this](auto const &update) { + bts_assert(update.all().size() == 1); + + auto first_update = !me->admin_data; + me->admin_data = update.all()[0]; + auto old_clearing_accounts = std::move(me->all_clearing_accounts); + me->all_clearing_accounts = + admin::AdminServiceUtils::get_clearing_account_map(*me->admin_data); + + if (first_update || + // this is necessary to break the cycle money + // file change -> margin -> admin -> money file + // change + old_clearing_accounts != me->all_clearing_accounts) + me->download_sm.on_admin(me->admin_data); + }); + } else + LOG(OrderMan, Warn, + "Money file import is disabled, since no host is specified in the " + "GMI_Import.sftp_host config key"); +} + +MoneyFileServiceServer::~MoneyFileServiceServer() {} + +void MoneyFileServiceServer::parse_money_csv( + const api::position::Money_CSVBlock &b, + const api::Response &reply) { + + api::position::Money_ParseResult result; + if (!me->admin_data) { + *result.mutable_failure() = "Server is not ready"; + reply(result); + return; + } + + std::istringstream in{b.text()}; + auto parse_result = parse_money(*me->admin_data, in); + + if (!std::holds_alternative( + parse_result)) { + *result.mutable_failure() = std::get(parse_result); + reply(result); + return; + } + + auto cash_balance = + std::get(parse_result); + *result.mutable_success() = cash_balance; + reply(result); + return; +} + +void MoneyFileServiceServer::on_timer() { + me->ctx.post([this]() { on_timer(); }, 7000); + me->download_sm.on_timer(); +} + +std::optional MoneyFileServiceServer::on_download_complete( + std::string const &sftp_file_path, std::string const &local_file_path) { + + LOG(OrderMan, Warn, + "Successfully downloaded money file {} to local file " + "{}. Will parse next.", + sftp_file_path, local_file_path); + + auto parse_result = parse_money_file(local_file_path); + if (!std::holds_alternative( + parse_result)) { + auto error_msg = + fmt::format("Failed to parse money file at {}. Error msg: {}", + local_file_path, std::get(parse_result)); + return error_msg; + } + + auto cash_balance = + std::get(parse_result); + + LOG(OrderMan, Warn, + "Successfully parsed money file at {}. Extracted {} records", + local_file_path, cash_balance.cash_balance_size()); + + for (auto const &cb : cash_balance.cash_balance()) + LOG(OrderMan, Info, "Cash balance for account {} is {}", + cb.account_id(), cb.cash_balance()); + + me->margin_service.set_cash_balance_batch( + cash_balance, + [this](auto const &rr) { + if (!rr.success()) + on_money_set_failure(rr.error_message()); + }, + 5000); + return {}; +} + +void MoneyFileServiceServer::on_money_set_failure( + std::string const &error) { + LOG(OrderMan, Error, + "Failed to set cash balance through the margin service. The " + "following information is available: {}", + error); + me->download_sm.on_post_handle_failure(error); +} + +std::optional MoneyFileServiceServer::pick_most_recent_money_file( + std::vector const &candidates) { + + std::vector pos_files; + std::copy_if(candidates.begin(), candidates.end(), + std::back_inserter(pos_files), [](auto const &file_name) { + return boost::algorithm::starts_with(file_name, "btsmny_"); + }); + if (pos_files.empty()) + return {}; + std::sort(pos_files.begin(), pos_files.end()); + return pos_files.back(); +} + +std::variant +MoneyFileServiceServer::parse_money_file(std::string const &f) { + return position::parse_money(*me->admin_data, f); +} + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/MoneyFileServiceServer.h b/src/server/sparkd/position/import/MoneyFileServiceServer.h new file mode 100644 index 000000000..c21b6870c --- /dev/null +++ b/src/server/sparkd/position/import/MoneyFileServiceServer.h @@ -0,0 +1,51 @@ +#pragma once + +#include "lib/api/services/MoneyFileService.server.pb.h" +#include "lib/utils/datetime.h" +#include +#include + +namespace bts { +namespace api { +namespace position { +class MoneyFileBatch; +} +namespace admin { +class AdminData; +} +} // namespace api +} // namespace bts + +namespace bts { +namespace position { + +class DownloadWindow; + +class MoneyFileServiceServer + : public bts::api::position::MoneyFileServiceBase { + public: + MoneyFileServiceServer(bts::api::ServiceContext &ctx); + ~MoneyFileServiceServer(); + + void parse_money_csv( + const api::position::Money_CSVBlock &, + const api::Response &) override; + + private: + void on_timer(); + void on_admin(std::shared_ptr const &); + std::optional on_download_complete(std::string const &sftp_file_path, + std::string const &local_file_path); + void on_money_set_failure(std::string const &); + + std::optional + pick_most_recent_money_file(std::vector const &); + + std::variant + parse_money_file(std::string const &file_path); + + struct PImpl; + std::unique_ptr me; +}; +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg b/src/server/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg new file mode 100644 index 000000000..67c4ccc51 --- /dev/null +++ b/src/server/sparkd/position/import/docs/data/04/a77600-afc9-4929-ae2c-c68f32e137e7/sftp_credentials_encrypted.txt.gpg @@ -0,0 +1,2 @@ +Œ  JÐ>ͬŒpÿÒ¢¼à¾ßadߣ÷Cm•AVs4ÄÝCr\OÜ +輦%*(,W(DŠ–ùrúŠËZÎq^?~=jÉ=üÁ±&f M@T¶ÔXq—W¾ÑÆM«ÎÈ"OÂéà DOWNLOADING [label=admin] + DOWNLOADING -> W_WINDOW [label="download_success ||\n[out_w]download_failure"] + DOWNLOADING -> PAUSED [label="[in_w]download_failure"] + PAUSED -> DOWNLOADING [label="[timeout]time"] + W_WINDOW -> PAUSED [label="set_pos_failure ||\n admin ||\n[in_w]time"] + } +#+END_SRC + +#+RESULTS: +[[file:download_state_machine.pdf]] diff --git a/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf b/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf new file mode 100644 index 000000000..ea50b1431 Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Money.pdf differ diff --git a/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf b/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf new file mode 100644 index 000000000..d004bd287 Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/2019-07-08.File_Layout_Positions.pdf differ diff --git a/src/server/sparkd/position/gmi_docs/GMI Mapping spreadsheet.xlsx b/src/server/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx similarity index 100% rename from src/server/sparkd/position/gmi_docs/GMI Mapping spreadsheet.xlsx rename to src/server/sparkd/position/import/docs/reference/GMI Mapping spreadsheet.xlsx diff --git a/src/server/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf b/src/server/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf new file mode 100644 index 000000000..f39bdb98f Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/Gmail - Money and Position files.pdf differ diff --git a/src/server/sparkd/position/import/docs/reference/adatmny.docx b/src/server/sparkd/position/import/docs/reference/adatmny.docx new file mode 100644 index 000000000..a3fce38dd Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/adatmny.docx differ diff --git a/src/server/sparkd/position/import/docs/reference/adatpos.docx b/src/server/sparkd/position/import/docs/reference/adatpos.docx new file mode 100644 index 000000000..69bd33ee6 Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/adatpos.docx differ diff --git a/src/server/sparkd/position/import/docs/reference/btsmny_20190813.csv b/src/server/sparkd/position/import/docs/reference/btsmny_20190813.csv new file mode 100755 index 000000000..5cf9a086c Binary files /dev/null and b/src/server/sparkd/position/import/docs/reference/btsmny_20190813.csv differ diff --git a/src/server/sparkd/position/import/docs/reference/btspos_20190814.csv b/src/server/sparkd/position/import/docs/reference/btspos_20190814.csv new file mode 100755 index 000000000..c441e5bb9 --- /dev/null +++ b/src/server/sparkd/position/import/docs/reference/btspos_20190814.csv @@ -0,0 +1,36 @@ +CRECID,CFIRM,COFFIC,CACCT,CATYPE,CCUSIP,CCUSP2,CCTYM,CSBCUS,CSTYPE,CSUBTY,CSTYP2,CSTRIK,CEXPDT,CSUBAC,CDEAL,CTDATE,CTPRIC,CBS,CLOC,CBROKR,CSPRED,CTRACE,CICODE,CREFNO,CSWAC1,CSWAP1,CSWAS1,CSWAC2,CSWAP2,CSWAS2,CZONE,CACNTY,CCLASS,CSUBCL,CRR,CRISKG,CMEMBR,CSNAME,CSRCAC,CREFOF,CREFRR,COFFFN,COFFOF,COFFAC,COFFAT,CMPGMN,CQTEDT,CQTY,CPRTQ,CBUSTQ,CMAKEQ,CLEAVQ,CSEGQ,CTFRQ,CDLVYQ,CDLVYA,CSDSC#,CSDSC1,CSDSC2,CSDSC3,CTDSC#,CTDSC1,CTDSC2,CTDSC3,CMKVAL,CYSTMV,CMULTF,CSDATE,CEXRAT,CRXDAT,CIAD,CYIELD,CDCTCO,CDELTA,CLTDAT,CCTLNO,CPCNTY,CEXCH,CFC,CTYPE,CSYMBL,CPTYPE,CSUBEX,CTRDEX,CMATDT,CPRTPR,CBASIS,CCLOSE,CPRCDT,CPRTCP,CUNDCP,CPRTUC,CPRVCP,CTRPRC,CEXPR,CPRICE,CSPEDT,CTPEDT,CCURSY,CCURCD,CCALC,CCMNT1,CCMNT2,CCMNT3,CLEGND,COMNCD,CRTHT,CSCHDL,COC,CCOD,CUCUSP,CCVTBL,CEXBKR,COPBKR,COPFRM,CGIVIO,CGIVF#,CIEXNG,CIEFRM,CCARD,CORDER,CCHIT,CFEECL,CFEEEX,CCTI,CORDTY,CORDOR,CTIME,CTBKT,CSESSN,CSTINS,CTTYPE,CBARG1,CBARG2,CBARG3,CBARG4,CBARG5,CMTABL,CMINIT,CMVARN,CMUNTL,CMGNCV,CREL1F,CREL1O,CREL1A,CREL1T,CREL2F,CREL2O,CREL2A,CREL2T,CREL3F,CREL3O,CREL3A,CREL3T,CCOMM,CFEE1,CFEE2,CFEE3,CFEE4,CFEE5,CFEE6,CFEE7,CFEE8,CFEE9,CGICHG,CBKCHG,COTHER,CGROSS,CNET,CMBKOF,CMFLOR,CMORDR,CMWIRE,CMOTHR,CATCOM,CATFE1,CATFE2,CATFE3,CATFE4,CATFE5,CATFE6,CATFE7,CATFE8,CATFE9,CATGIV,CATBKG,CATOTH,CATBKO,CATFLR,CATORD,CATWIR,CATALO,CFDCOM,CFDFE1,CFDFE2,CFDFE3,CFDFE4,CFDFE5,CFDFE6,CFDFE7,CFDFE8,CFDFE9,CFDGIV,CFDBKG,CFDOTH,CFDBKO,CFDFLR,CFDORD,CFDWIR,CFDALO,CFUFE1,CFUFE2,CFUFE3,CFUFE4,CFUFE5,CFUFE6,CFUFE7,CFUFE8,CFUFE9,CFUGIV,CFUBKG,CFUOTH,CFUBKO,CFUFLR,CFUORD,CFUWIR,CFUALO,COVNQ,CDAYQ,CSCRQ,CSPDQ,COVNC,CDAYC,CSCRC,CSPDC,CLEVEL,CBATCH,CRECNO,CCLRID,CINPMO,CINPYR,CFBACC,CORIG,CCABCD,CSCHOV,CPGMID,CSCRID,CUSER,CWSID,CWSTIM,CDEST,CDELET,CXTRCT,CBQTY,CSQTY,CFDAM1,CAMT1,CFDAM2,CAMT2,CROUT1,CROUT2,CROUT3,CCURAC,CCURAT,CCCNTY +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.02000000 ,"1"," "," ","S","9H13 DU6W0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-125.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.02 ",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004020"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","130L"," "," ","D","D","1"," "," ","130624"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAV",558632 ,"0165522483","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",130637 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.02250000 ,"1"," "," ","S","9H13 DGVI0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-150.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.02 1/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004022"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","176R"," "," ","D","D","1"," "," ","112900"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAQ",558633 ,"0165506378","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",112911 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.02500000 ,"1"," "," ","S","9H13 DGVR0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",3.0000 ," 3 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-262.50 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.02 1/2",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004025"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","176R"," "," ","D","D","1"," "," ","112907"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.15 ,.00 ,-1.05 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,3.0000 ,.00 ,.00 ,.00 ,-.15 ,"ATO","BAQ",558634 ,"0165506426","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",112921 ,"B"," ",0 ,3.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.04500000 ,"1"," "," ","S","9H13 C1730","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-375.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.04 1/2",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004045"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","12RX"," "," ","D","D","1"," "," ","102311"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAN",558635 ,"0165490446","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",102327 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.05000000 ,"1"," "," ","S","9H13 C8IC0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",10.0000 ," 10 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-2125.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.05 ",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004050"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","170F"," "," ","D","D","1"," "," ","104804"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.50 ,.00 ,-3.50 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,10.0000 ,.00 ,.00 ,.00 ,-.50 ,"ATO","BAQ",558636 ,"0165497557","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",104817 ,"B"," ",0 ,10.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.05250000 ,"1"," "," ","S","9H13 CWT60","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-450.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.05 1/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004052"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","16TB"," "," ","D","D","1"," "," ","100946"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAN",558637 ,"0165484943","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",101000 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.05500000 ,"1"," "," ","S","9H13 CYSQ0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-475.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.05 1/2",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004055"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","12RV"," "," ","D","D","1"," "," ","101311"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAN",558638 ,"0165486540","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",101326 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,4.06750000 ,"1"," "," ","S","9H13 CVV00","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",4.0000 ," 4 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-1200.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.06 3/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.00500000 ,.00000000 ," "," 0004067"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","16TJ"," "," ","D","D","1"," "," ","100710"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.20 ,.00 ,-1.40 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,4.0000 ,.00 ,.00 ,.00 ,-.20 ,"ATO","BAN",558639 ,"0165483857","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",100721 ,"B"," ",0 ,4.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,3.97750000 ,"1"," "," ","S","9H14 BPLJ0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",300.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 3.97 3/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",3.97750000 ,.00000000 ," "," 0003977"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1986"," "," ","D","D","1"," "," ","084311"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,2.0000 ,.0000 ,.0000 ,.00 ,-.10 ,.00 ,.00 ,"ATO","BAL",558640 ,"0165600515","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",84326 ,"B"," ",0 ,2.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,3.98750000 ,"1"," "," ","S","9H14 BNKF0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",3.0000 ," 3 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",300.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 3.98 3/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",3.98750000 ,.00000000 ," "," 0003987"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1968"," "," ","D","D","1"," "," ","083703"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.15 ,.00 ,-1.05 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,3.0000 ,.0000 ,.0000 ,.00 ,-.15 ,.00 ,.00 ,"ATO","BAK",558641 ,"0165598119","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83718 ,"B"," ",0 ,3.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".AKW0000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.03250000 ,"1"," "," ","S","9H14 C6PO0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",3.0000 ," 3 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 KCBT RED WHEAT "," "," ",0 ," "," "," ",-375.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","KW"," "," "," "," ","1A",0 ," 4.03 1/4",.00000000 ,4.00750000 ,20190814 ," 4.00 3/4",.00000000 ," ",4.03250000 ,.00000000 ," "," 0004032"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1AH0"," "," ","D","D","1"," "," ","123926"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.15 ,.00 ,-1.05 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,3.0000 ,.0000 ,.0000 ,.00 ,-.15 ,.00 ,.00 ,"ATO","BAU",558642 ,"0165659478","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",123940 ,"B"," ",0 ,3.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.77000000 ,"2"," "," ","S","9H14 BLRQ0","100"," "," 0.0 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",32.0000 ," 32-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",-2000.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.77 ",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.77000000 ,.00000000 ," "," 0004770"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","13GG"," "," ","D","D","1"," "," ","083241"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-1.60 ,.00 ,-11.20 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,32.0000 ,.0000 ,.00 ,.00 ,-1.60 ,.00 ,"ATO","BAK",558643 ,"0165596192","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83306 ,"B"," ",0 ,.0000 ,32.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.78250000 ,"2"," "," ","S","9H14 CUH20","100"," "," -0.0625"," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",25.0000 ," 25-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.78 1/4",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.78250000 ,.00000000 ," "," 0004782"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A06"," "," ","D","D","1"," "," ","112640"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-1.25 ,.00 ,-8.75 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,2.0000 ,23.0000 ,.00 ,.00 ,-.10 ,-1.15 ,"ATO","BAR",558644 ,"0165645052","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",112652 ,"B"," ",0 ,.0000 ,25.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.79000000 ,"2"," "," ","S","9H14 CZK60","100"," "," -0.0575"," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",37.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.79 ",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.79000000 ,.00000000 ," "," 0004790"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A8Q"," "," ","D","D","1"," "," ","115617"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,1.0000 ,.0000 ,.00 ,.00 ,-.05 ,.00 ,"ATO","BAU",558645 ,"0165651408","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",115628 ,"B"," ",0 ,.0000 ,1.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.79250000 ,"2"," "," ","S","9H14 C71H0","100"," "," -0.06 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",117.0000 ," 117-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",5850.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.79 1/4",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.79250000 ,.00000000 ," "," 0004792"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1AJY"," "," ","D","D","1"," "," ","124928"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-5.85 ,.00 ,-40.95 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,117.0000 ,.00 ,.00 ,.00 ,-5.85 ,"ATO","BAW",558646 ,"0165661097","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",124941 ,"B"," ",0 ,.0000 ,117.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.79500000 ,"2"," "," ","S","9H14 C0E70","100"," "," -0.0575"," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",7.0000 ," 7-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",437.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.79 1/2",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.79500000 ,.00000000 ," "," 0004795"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A8Q"," "," ","D","D","1"," "," ","120016"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.35 ,.00 ,-2.45 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,7.0000 ,.00 ,.00 ,.00 ,-.35 ,"ATO","BAU",558647 ,"0165652292","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",120031 ,"B"," ",0 ,.0000 ,7.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.80250000 ,"2"," "," ","S","9H14 CII60","100"," "," 0.0 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",50.0000 ," 50-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",5000.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.80 1/4",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.80250000 ,.00000000 ," "," 0004802"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","19RF"," "," ","D","D","1"," "," ","102110"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-2.50 ,.00 ,-17.50 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,50.0000 ,.00 ,.00 ,.00 ,-2.50 ,"ATO","BAO",558648 ,"0165631592","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",102124 ,"B"," ",0 ,.0000 ,50.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.80500000 ,"2"," "," ","S","9H14 C5NQ0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",2.0000 ," 2-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",225.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.80 1/2",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.80500000 ,.00000000 ," "," 0004805"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1AGZ"," "," ","D","D","1"," "," ","123215"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.10 ,.00 ,-.70 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,2.0000 ,.00 ,.00 ,.00 ,-.10 ,"ATO","BAU",558649 ,"0165658281","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",123228 ,"B"," ",0 ,.0000 ,2.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000019L"," ","201912"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.81000000 ,"2"," "," ","S","9H14 C6PP0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"DEC 19 WHEAT "," "," ",0 ," "," "," ",137.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191213 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.81 ",.00000000 ,4.78250000 ,20190814 ," 4.78 1/4",.00000000 ," ",4.81000000 ,.00000000 ," "," 0004810"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1AH0"," "," ","D","D","1"," "," ","123926"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,1.0000 ,.00 ,.00 ,.00 ,-.05 ,"ATO","BAU",558650 ,"0165659479","&","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",123940 ,"B"," ",0 ,.0000 ,1.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.84500000 ,"1"," "," ","S","9H14 CUH30","100"," "," -0.0625"," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",25.0000 ," 25 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-625.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.84 1/2",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.84500000 ,.00000000 ," "," 0004845"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A06"," "," ","D","D","1"," "," ","112640"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-1.25 ,.00 ,-8.75 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,25.0000 ,.00 ,.00 ,.00 ,-1.25 ,"ATO","BAR",558651 ,"0165645053","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",112652 ,"B"," ",0 ,25.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.84750000 ,"1"," "," ","S","9H14 CZK70","100"," "," -0.0575"," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-37.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.84 3/4",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.84750000 ,.00000000 ," "," 0004847"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A8Q"," "," ","D","D","1"," "," ","115617"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,1.0000 ,.00 ,.00 ,.00 ,-.05 ,"ATO","BAU",558652 ,"0165651409","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",115628 ,"B"," ",0 ,1.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.85000000 ,"1"," "," ","S","9H14 C0F80","100"," "," 0.0 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",17.0000 ," 17 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-850.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.85 ",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.85000000 ,.00000000 ," "," 0004850"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1A8Q"," "," ","D","D","1"," "," ","120032"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.85 ,.00 ,-5.95 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,17.0000 ,.00 ,.00 ,.00 ,-.85 ,"ATO","BAU",558653 ,"0165652330","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",120047 ,"B"," ",0 ,17.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.85250000 ,"1"," "," ","S","9H14 C71I0","100"," "," -0.06 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",57.0000 ," 57 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-3562.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.85 1/4",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.85250000 ,.00000000 ," "," 0004852"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","1AJY"," "," ","D","D","1"," "," ","124928"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-2.85 ,.00 ,-19.95 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,57.0000 ,.00 ,.00 ,.00 ,-2.85 ,"ATO","BAW",558654 ,"0165661098","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",124941 ,"B"," ",0 ,57.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.85750000 ,"1"," "," ","S","9H14 CMCO0","100"," "," -0.065 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",50.0000 ," 50 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-4375.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.85 3/4",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.85750000 ,.00000000 ," "," 0004857"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","19UY"," "," ","D","D","1"," "," ","103928"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-2.50 ,.00 ,-17.50 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,50.0000 ,.00 ,.00 ,.00 ,-2.50 ,"ATO","BAQ",558655 ,"0165635896","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",103945 ,"B"," ",0 ,50.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A010000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,4.86750000 ,"1"," "," ","S","9H14 CII50","100"," "," 0.0 "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",50.0000 ," 50 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 WHEAT "," "," ",0 ," "," "," ",-6875.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","01"," "," "," "," ","1A",0 ," 4.86 3/4",.00000000 ,4.84000000 ,20190814 ," 4.84 ",.00000000 ," ",4.86750000 ,.00000000 ," "," 0004867"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","19RF"," "," ","D","D","1"," "," ","102110"," "," "," ","D"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-2.50 ,.00 ,-17.50 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,.0000 ,.0000 ,50.0000 ,.00 ,.00 ,.00 ,-2.50 ,"ATO","BAO",558656 ,"0165631591","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",102124 ,"B"," ",0 ,50.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000019K"," ","201911"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,8.88000000 ,"2"," "," ","S","9H13 DWKV0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",3.0000 ," 3-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"NOV 19 SOYBEANS "," "," ",0 ," "," "," ",1500.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191114 ," ","US","01","05"," "," "," "," ","1A",0 ," 8.88 ",.00000000 ,8.78000000 ,20190814 ," 8.78 ",.00000000 ," ",8.89000000 ,.00000000 ," "," 0008880"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","131423"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.15 ,.00 ,-1.05 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,3.0000 ,.0000 ,.0000 ,.00 ,-.15 ,.00 ,.00 ,"ATO","BAV",558657 ,"0165524028","-","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",131441 ,"B"," ",0 ,.0000 ,3.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000019K"," ","201911"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,8.89000000 ,"2"," "," ","S","9H13 DVII0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",4.0000 ," 4-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"NOV 19 SOYBEANS "," "," ",0 ," "," "," ",2200.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191114 ," ","US","01","05"," "," "," "," ","1A",0 ," 8.89 ",.00000000 ,8.78000000 ,20190814 ," 8.78 ",.00000000 ," ",8.89000000 ,.00000000 ," "," 0008890"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","130917"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.20 ,.00 ,-1.40 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,3.0000 ,1.0000 ,.0000 ,.00 ,-.15 ,-.05 ,.00 ,"ATO","BAV",558658 ,"0165522847","-","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",130929 ,"B"," ",0 ,.0000 ,4.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000019K"," ","201911"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,8.82250000 ,"2"," "," ","S","9H14 BJ4P0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"NOV 19 SOYBEANS "," "," ",0 ," "," "," ",212.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20191114 ," ","US","01","05"," "," "," "," ","1A",0 ," 8.82 1/4",.00000000 ,8.78000000 ,20190814 ," 8.78 ",.00000000 ," ",8.82250000 ,.00000000 ," "," 0008822"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","083016"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,1.0000 ,.0000 ,.0000 ,.00 ,-.05 ,.00 ,.00 ,"ATO","BAK",558659 ,"0165594516","-","19"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83040 ,"B"," ",0 ,.0000 ,1.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020A"," ","202001"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,9.01250000 ,"1"," "," ","S","9H13 DWKT0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",6.0000 ," 6 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"JAN 20 SOYBEANS "," "," ",0 ," "," "," ",-2925.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200114 ," ","US","01","05"," "," "," "," ","1A",0 ," 9.01 1/4",.00000000 ,8.91500000 ,20190814 ," 8.91 1/2",.00000000 ," ",9.02000000 ,.00000000 ," "," 0009012"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","131423"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.30 ,.00 ,-2.10 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,6.0000 ,.0000 ,.0000 ,.00 ,-.30 ,.00 ,.00 ,"ATO","BAV",558660 ,"0165524026","1","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",131441 ,"B"," ",0 ,6.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020A"," ","202001"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,9.02000000 ,"1"," "," ","S","9H13 DVIG0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",8.0000 ," 8 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"JAN 20 SOYBEANS "," "," ",0 ," "," "," ",-4200.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200114 ," ","US","01","05"," "," "," "," ","1A",0 ," 9.02 ",.00000000 ,8.91500000 ,20190814 ," 8.91 1/2",.00000000 ," ",9.02000000 ,.00000000 ," "," 0009020"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","130917"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.40 ,.00 ,-2.80 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,8.0000 ,.0000 ,.0000 ,.00 ,-.40 ,.00 ,.00 ,"ATO","BAV",558661 ,"0165522845","1","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",130929 ,"B"," ",0 ,8.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020A"," ","202001"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,8.95250000 ,"1"," "," ","S","9H14 BJ4Q0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"JAN 20 SOYBEANS "," "," ",0 ," "," "," ",-187.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200114 ," ","US","01","05"," "," "," "," ","1A",0 ," 8.95 1/4",.00000000 ,8.91500000 ,20190814 ," 8.91 1/2",.00000000 ," ",8.95250000 ,.00000000 ," "," 0008952"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","083016"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,1.0000 ,.0000 ,.0000 ,.00 ,-.05 ,.00 ,.00 ,"ATO","BAK",558662 ,"0165594517","1","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83040 ,"B"," ",0 ,1.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020A"," ","202001"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,8.95500000 ,"1"," "," ","S","9H14 BJ4N0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1 ",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"JAN 20 SOYBEANS "," "," ",0 ," "," "," ",-200.00 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200114 ," ","US","01","05"," "," "," "," ","1A",0 ," 8.95 1/2",.00000000 ,8.91500000 ,20190814 ," 8.91 1/2",.00000000 ," ",8.95500000 ,.00000000 ," "," 0008955"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","083016"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,1.0000 ,.0000 ,.0000 ,.00 ,-.05 ,.00 ,.00 ,"ATO","BAK",558663 ,"0165594515","1","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83040 ,"B"," ",0 ,1.0000 ,.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,9.13500000 ,"2"," "," ","S","9H13 DWKU0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",3.0000 ," 3-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 SOYBEANS "," "," ",0 ," "," "," ",1462.50 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","05"," "," "," "," ","1A",0 ," 9.13 1/2",.00000000 ,9.03750000 ,20190814 ," 9.03 3/4",.00000000 ," ",9.14000000 ,.00000000 ," "," 0009135"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","131423"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.15 ,.00 ,-1.05 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,3.0000 ,.0000 ,.0000 ,.00 ,-.15 ,.00 ,.00 ,"ATO","BAV",558664 ,"0165524027","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",131441 ,"B"," ",0 ,.0000 ,3.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190813 ,9.14000000 ,"2"," "," ","S","9H13 DVIH0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",4.0000 ," 4-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 SOYBEANS "," "," ",0 ," "," "," ",2050.00 ,.00 ,5000.0000000 ,20190813 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","05"," "," "," "," ","1A",0 ," 9.14 ",.00000000 ,9.03750000 ,20190814 ," 9.03 3/4",.00000000 ," ",9.14000000 ,.00000000 ," "," 0009140"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","130917"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.20 ,.00 ,-1.40 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,4.0000 ,.0000 ,.0000 ,.00 ,-.20 ,.00 ,.00 ,"ATO","BAV",558665 ,"0165522846","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",130929 ,"B"," ",0 ,.0000 ,4.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" +"P","Z","XYZ","12345","F1",".A050000020C"," ","202003"," ","F"," "," ",.00000000 ,0 ," "," ",20190814 ,9.07500000 ,"2"," "," ","S","9H14 BJ4S0","100"," "," "," "," "," "," "," "," ","US","C"," ","ABCDE"," ","M"," "," "," "," "," "," "," "," "," ","0",1.0000 ," 1-",.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.0000 ,.00 ,1 ,"MAR 20 SOYBEANS "," "," ",0 ," "," "," ",187.50 ,.00 ,5000.0000000 ,20190814 ,1.00000000 ,0 ,.000 ,.00000000 ,.00000000 ,.0000 ,20200313 ," ","US","01","05"," "," "," "," ","1A",0 ," 9.07 1/2",.00000000 ,9.03750000 ,20190814 ," 9.03 3/4",.00000000 ," ",9.07500000 ,.00000000 ," "," 0009075"," ","4","USD","US"," "," J"," "," "," "," ","H","FD"," "," "," F1",.00000000 ,"2H0L ","PKELL"," "," "," "," "," ","17PD"," "," ","D","D","1"," "," ","083016"," "," "," ","6"," "," "," "," "," "," ",.00 ,.00 ,0 ,.00 ,"Z","XYZ","12345","M"," "," "," "," "," "," "," "," ",-.05 ,.00 ,-.35 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,.00 ,"F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","F1","M","C","E","N","X","Z"," "," "," "," "," ","B","T","Y","F","D","W","K","C","C","C","M","M","M","M","M","M"," ","C","C","M","M","M","M","M",.0000 ,1.0000 ,.0000 ,.0000 ,.00 ,-.05 ,.00 ,.00 ,"ATO","BAK",558666 ,"0165594518","3","20"," "," "," "," ","01","31","PKELLEY ","ATESDGMIMC",83040 ,"B"," ",0 ,.0000 ,1.0000 ," ",.00 ," ",.00 ,"A","A","A","USD","USD","US" diff --git a/src/server/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg b/src/server/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg new file mode 100644 index 000000000..67c4ccc51 --- /dev/null +++ b/src/server/sparkd/position/import/docs/reference/sftp_credentials_encrypted.txt.gpg @@ -0,0 +1,2 @@ +Œ  JÐ>ͬŒpÿÒ¢¼à¾ßadߣ÷Cm•AVs4ÄÝCr\OÜ +輦%*(,W(DŠ–ùrúŠËZÎq^?~=jÉ=üÁ±&f M@T¶ÔXq—W¾ÑÆM«ÎÈ"OÂéà +#include +#include + +namespace bts { +namespace position { + +std::pair map_gmi_future_symbol( + std::string const &cfc, api::Venue venue) { + auto map_glbx_to_sim = config::get().map_glbx_to_sim(); + + for (auto const &m : config::get().sym()) + if (m.gmi() == cfc && m.venue() == venue) + return std::pair( + {m.spark(), venue, api::SECURITYTYPE_FUTURE}, + m.price_multiplier()); + else if (map_glbx_to_sim && m.gmi() == cfc && + venue == api::Venue::VENUE_SIM && + m.venue() == api::Venue::VENUE_GLBX) + return std::pair( + {m.spark(), venue, api::SECURITYTYPE_FUTURE}, + m.price_multiplier()); + return std::pair({},os::nan()); +} + +api::Venue map_gmi_venue(std::string const &gmi_venue) { + if (gmi_venue == "1" || gmi_venue == "2" || gmi_venue == "01" || + gmi_venue == "02") { + if (config::get().map_glbx_to_sim()) + return api::Venue::VENUE_SIM; + else + return api::Venue::VENUE_GLBX; + } else if (gmi_venue == "5") + return api::Venue::VENUE_ICE; + else + return api::Venue::VENUE_UNSET; +} + +bool is_gmi_security_a_future(std::string const &cstype, + std::string const &csubty) { + return cstype == "F" && csubty.empty(); +} + +api::Side map_gmi_side(std::string const &cbs) { + if (cbs == "1") + return api::Side::SIDE_BUY; + else if (cbs == "2") + return api::Side::SIDE_SELL; + else + return api::Side::SIDE_UNDEFINED; +} + +std::optional map_gmi_quantity(std::string const &cqty) { + try { + return std::stoi(cqty); + } catch (std::exception const &) { + return {}; + } +} + +std::optional +map_gmi_expiration(std::string const &exp_date) { + if (exp_date.size() != 8) + return {}; + + auto year = map_gmi_quantity(exp_date.substr(0, 4)); + if (!year.has_value()) + return {}; + auto month = map_gmi_quantity(exp_date.substr(4, 2)); + if (!month.has_value()) + return {}; + auto day = map_gmi_quantity(exp_date.substr(6, 2)); + if (!day.has_value()) + return {}; + + api::FutureContract result; + result.set_expiration_year(year.value()); + result.set_expiration_month(month.value()); + result.set_expiration_day(day.value()); + return result; +} + +api::Security const * +find_security(md::UserSymbol const &s, std::string const &cltdat, + std::map> &cached) { + + auto exp_date = map_gmi_expiration(cltdat); + if (!exp_date.has_value()) + return nullptr; + + auto it = cached.find(s); + if (it == cached.end()) { + auto &secs = cached[s]; + + std::set to_load; + to_load.insert(s); + bts::md::db::load_securities( + to_load, [&secs](auto const &s) { secs.push_back(s); }); + } + auto &secs = cached[s]; + + for (auto const &s : secs) { + bts_assert(s.has_future()); + auto &f = s.future(); + if (f.expiration_year() == exp_date.value().expiration_year() && + f.expiration_month() == exp_date.value().expiration_month() && + f.expiration_day() == exp_date.value().expiration_day()) + return &s; + } + return nullptr; +} + +std::variant +parse_gmi(api::admin::AdminData const &admin_data, + std::string const &file_path) { + std::ifstream in{file_path}; + return parse_gmi(admin_data, in); +} + +std::variant +parse_gmi(api::admin::AdminData const &admin_data, std::istream &in) { + if (in.bad()) + return fmt::format("Unable to open GMI file"); + + std::string line; + std::getline(in, line); + + if (in.bad()) + return fmt::format("Could not read first line of GMI file "); + + std::vector column_names = parse_csv(line); + std::map column_idx; + for (size_t i = 0; i < column_names.size(); i++) + column_idx[column_names[i]] = i; + + auto FC = std::string("CFC"); // Symbol + auto EXCH = std::string("CEXCH"); // Exchange + auto STYPE = std::string("CSTYPE"); // Symbol type (options are marked as F) + auto SUBTY = std::string("CSUBTY"); // Symbol sub-type (for futures blank) + auto LTDAT = std::string("CLTDAT"); // Expiration date + auto BS = std::string("CBS"); // Buy/Sell + auto QTY = std::string("CQTY"); // Quantity, + auto OFFIC = std::string("COFFIC"); // First 3 chars of clearing account + auto ACCT = std::string("CACCT"); // Last 5 chars of clearing account + auto TPRIC = std::string("CTPRIC"); // Trade price + + auto required_columns = { + FC, EXCH, STYPE, SUBTY, LTDAT, BS, QTY, OFFIC, ACCT, TPRIC, + }; + + for (auto c : required_columns) + if (column_idx.count(c) == 0) + return fmt::format("Could not find column {} in GMI file", c); + + api::position::BasePositionBatch result; + auto line_number = 1; + std::map> cached_securities; + + while (std::getline(in, line)) { + line_number++; + std::vector values = parse_csv(line); + if (values.size() != column_names.size()) { + auto msg = + fmt::format("Aborted parsing on line {}. Expected {} columns, but " + "found {}", + line_number, column_names.size(), values.size()); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + auto gmi_exchange_code = values[column_idx[EXCH]]; + auto venue = map_gmi_venue(gmi_exchange_code); + if (venue == api::Venue::VENUE_UNSET) { + LOG(OrderMan, Info, + "Skipping line {} file because we could not resolve " + "the GMI " + "exchange code on colum {} {}", + line_number, EXCH, gmi_exchange_code); + continue; + } + + auto clearing_account = + values[column_idx[OFFIC]] + values[column_idx[ACCT]]; + + auto bts_account = admin::AdminServiceUtils::find_account( + admin_data, clearing_account, venue); + + if (bts_account == nullptr) { + LOG(OrderMan, Info, + "Skipping line {} because we could not map the " + "GMI clearing account {} to a BTS account", + line_number, clearing_account); + continue; + } + + api::position::BasePosition this_line_position; + + // ACCOUNT ID + this_line_position.set_account_id(bts_account->id()); + // ACCOUNT ID + + auto ignore_unknown_sec = + config::get().ignore_unknown_securities(); + + bool ignore_unsupported_security_types = + config::get().ignore_unsupported_security_types(); + + if (!is_gmi_security_a_future(values[column_idx[STYPE]], + values[column_idx[SUBTY]])) { + if (ignore_unknown_sec || ignore_unsupported_security_types) { + LOG(OrderMan, Info, + "Skipping line {} because it does not refer to a future", + line_number); + continue; + } else { + auto msg = fmt::format("Aborted parsing on line {}. " + "{} and {} do not refer to a " + "future", + line_number, STYPE, SUBTY); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + } + + auto gmi_cfc = values[column_idx[FC]]; + auto symbol_map = map_gmi_future_symbol(gmi_cfc, venue); + auto spark_symbol = symbol_map.first; + double price_multiplier = symbol_map.second; + if (spark_symbol == md::UserSymbol()) { + if (ignore_unknown_sec) { + LOG(OrderMan, Info, + "Skipping line {} because the {} column with value {} could " + "not be " + "resolved " + "to a spark future symbol at venue {}", + line_number, FC, gmi_cfc, api::Venue_Name(venue)); + continue; + } else { + auto msg = + fmt::format("Aborted parsing on line {} because " + "the {} column with value {} could " + "not be resolved " + "to a spark future symbol at venue {}", + line_number, FC, gmi_cfc, api::Venue_Name(venue)); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + } + + auto gmi_exp = values[column_idx[LTDAT]]; + auto security = find_security(spark_symbol, gmi_exp, cached_securities); + + if (security == nullptr) { + if (ignore_unknown_sec) { + LOG(OrderMan, Info, + "Skipping line {} because no security with " + "symbol {} and expiration {} was found in the spark security " + "database", + line_number, spark_symbol.symbol(), gmi_exp); + continue; + } else { + auto msg = fmt::format( + "Aborted parsing on line {} because no security with " + "symbol {} and expiration {} was found in the spark security " + "database", + line_number, spark_symbol.symbol(), gmi_exp); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + } + + // SECURITY KEY + this_line_position.set_security_id(security->id()); + // SECURITY KEY + + auto gmi_side = values[column_idx[BS]]; + auto side = map_gmi_side(gmi_side); + if (side == api::Side::SIDE_UNDEFINED) { + auto msg = + fmt::format("Aborted parsing on line {} because we " + "could not interpret " + "column {} with value {} to either a buy or a sell", + line_number, BS, gmi_side); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + // SIDE + this_line_position.set_side(side); + // SIDE + + auto gmi_qty = values[column_idx[QTY]]; + auto qty = map_gmi_quantity(gmi_qty); + if (!qty.has_value()) { + auto msg = fmt::format("Aborted parsing on line {} because " + "{} {} is not a number", + line_number, QTY, gmi_qty); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + // Quantity + this_line_position.set_quantity(qty.value()); + // Quantity + + auto gmi_price = values[column_idx[TPRIC]]; + auto price = parse_price(gmi_price); + if (!price.has_value()) { + auto msg = fmt::format("Aborted parsing on line {} because " + "{} {} is not a number", + line_number, TPRIC, gmi_price); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + // Price + auto avg_price = price.value() * price_multiplier; + this_line_position.set_avg_price(avg_price); + // Price + + LOG(OrderMan, Info, + "Successfully parsed line {}. Account: {} (id: {}) Sec: {} (id: {}) " + "{} {} @ {} ", + line_number, bts_account->name(), bts_account->id(), + securities::descriptor(*security), security->id(), + api::Side_Name(side), qty.value(), this_line_position.avg_price()); + + *result.add_positions() = this_line_position; + } + + if (result.positions_size() == 0) + LOG(OrderMan, Error, + "There were no positions in the GMI file. This is suspicious " + "but not necessarily wrong."); + + return result; +} + +api::position::BasePositionBatch +reduce_parsed_gmi(api::position::BasePositionBatch const &in) { + using namespace api::position; + + BasePositionBatch out; + *out.mutable_current_as_of() = in.current_as_of(); + + using Key = std::tuple; + std::map> index; + + for (auto const &bp : in.positions()) { + auto k = std::make_tuple(bp.security_id(), bp.side(), bp.account_id()); + index[k].push_back(bp); + } + + auto reducer = [](std::vector const &in) -> BasePosition { + bts_assert(in.size()); + + uint32_t total_qty = 0; + double total_price = 0; + + for (auto const &bp : in) { + total_qty += bp.quantity(); + total_price += (bp.quantity() * bp.avg_price()); + } + BasePosition result = in[0]; + result.set_quantity(total_qty); + if (total_qty != 0) + result.set_avg_price(total_price / total_qty); + else + result.set_avg_price(0); + return result; + }; + + for (auto const &p : index) { + auto reduced_pos = out.add_positions(); + *reduced_pos = reducer(p.second); + } + return out; +} + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/gmi_parser.h b/src/server/sparkd/position/import/parsing/gmi_parser.h similarity index 80% rename from src/server/sparkd/position/gmi_parser.h rename to src/server/sparkd/position/import/parsing/gmi_parser.h index 58ef62c18..ce578433b 100644 --- a/src/server/sparkd/position/gmi_parser.h +++ b/src/server/sparkd/position/import/parsing/gmi_parser.h @@ -5,11 +5,6 @@ #include #include -namespace bts { -namespace md { -class SecurityOracle; -} -} // namespace bts namespace bts { namespace api { namespace admin { @@ -28,5 +23,9 @@ parse_gmi(api::admin::AdminData const &admin_data, std::variant parse_gmi(api::admin::AdminData const &admin_data, std::istream &); +// Accumulate records by account, security, side +api::position::BasePositionBatch +reduce_parsed_gmi(api::position::BasePositionBatch const &); + } // namespace position } // namespace bts diff --git a/src/server/sparkd/position/import/parsing/money_parser.cpp b/src/server/sparkd/position/import/parsing/money_parser.cpp new file mode 100644 index 000000000..861f86077 --- /dev/null +++ b/src/server/sparkd/position/import/parsing/money_parser.cpp @@ -0,0 +1,119 @@ +#include "server/sparkd/position/import/parsing/money_parser.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/logging/logging.h" +#include "server/sparkd/position/import/parsing/parser_common.h" +#include +#include + +namespace bts { +namespace position { + +std::variant +parse_money(api::admin::AdminData const &admin_data, + std::string const &file_path) { + std::ifstream in{file_path}; + return parse_money(admin_data, in); +} + +std::variant +parse_money(api::admin::AdminData const &admin_data, std::istream &in) { + if (in.bad()) + return fmt::format("Unable to open money file"); + + std::string line; + std::getline(in, line); + + if (in.bad()) + return fmt::format("Could not read first line of money file "); + + std::vector column_names = parse_csv(line); + std::map column_idx; + for (size_t i = 0; i < column_names.size(); i++) + column_idx[column_names[i]] = i; + + auto RECID = std::string("CRECID"); // G, M or R, (we want M) + auto OFFIC = std::string("COFFIC"); // First 3 chars of clearing account + auto ACCT = std::string("CACCT"); // Last 5 digits of clearing account + auto BAL = std::string("CBAL"); // Blance + + auto required_columns = { + RECID, + OFFIC, + ACCT, + BAL, + }; + + for (auto c : required_columns) + if (column_idx.count(c) == 0) + return fmt::format("Could not find column {} in money file", c); + + api::position::CashBalanceBatch result; + auto line_number = 1; + + while (std::getline(in, line)) { + line_number++; + std::vector values = parse_csv(line); + if (values.size() != column_names.size()) { + auto msg = + fmt::format("Aborted parsing of money file on line {}. Expected " + "{} columns, but " + "found {}", + line_number, column_names.size(), values.size()); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + auto mrecid = values[column_idx[RECID]]; + if (mrecid != "M") { + LOG(OrderMan, Info, "Skipping line {} because {} is {}, not M", + line_number, RECID, mrecid); + continue; + } + + auto clearing_account = + values[column_idx[OFFIC]] + values[column_idx[ACCT]]; + + auto bts_account = admin::AdminServiceUtils::find_account( + admin_data, clearing_account, api::Venue::VENUE_GLBX); + + if (bts_account == nullptr) { + LOG(OrderMan, Info, + "Skipping line {} because we could not map the " + "GMI clearing account {} to a BTS account", + line_number, clearing_account); + continue; + } + + api::position::CashBalanceItem this_line_balance; + + // ACCOUNT ID + this_line_balance.set_account_id(bts_account->id()); + // ACCOUNT ID + + // Balance + auto balance_s = values[column_idx[BAL]]; + auto balance = parse_price(balance_s); + if (!balance.has_value()) { + auto msg = fmt::format("Aborted parsing on line {} because " + "{} {} is not a number", + BAL, line_number, balance_s); + LOG(OrderMan, Error, "{}", msg); + return msg; + } + + // Balance + this_line_balance.set_cash_balance(balance.value()); + // Balance + + LOG(OrderMan, Info, + "Successfully parsed line {}. Account: {} (id: {}) Cash Balance: {}", + line_number, bts_account->name(), bts_account->id(), + this_line_balance.cash_balance()); + + *result.add_cash_balance() = this_line_balance; + } + + return result; +} +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/parsing/money_parser.h b/src/server/sparkd/position/import/parsing/money_parser.h new file mode 100644 index 000000000..8d49adc08 --- /dev/null +++ b/src/server/sparkd/position/import/parsing/money_parser.h @@ -0,0 +1,27 @@ +#pragma once + +#include "lib/api/services/MarginService.server.pb.h" +#include +#include +#include + +namespace bts { +namespace api { +namespace admin { +class AdminData; +} +} // namespace api +} // namespace bts + +namespace bts { +namespace position { + +std::variant +parse_money(api::admin::AdminData const &, + std::string const &file_path); + +std::variant +parse_money(api::admin::AdminData const &, std::istream &); + +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/import/parsing/parser_common.cpp b/src/server/sparkd/position/import/parsing/parser_common.cpp new file mode 100644 index 000000000..d2e423dff --- /dev/null +++ b/src/server/sparkd/position/import/parsing/parser_common.cpp @@ -0,0 +1,35 @@ +#include "server/sparkd/position/import/parsing/parser_common.h" + +#include + +namespace bts { +namespace position { + +std::vector sanitize_csv_values(std::vector const &values) { + std::vector out; + out = values; + + for (auto &s : out) { + boost::algorithm::replace_all(s, "\"", ""); + boost::algorithm::trim(s); + } + return out; +} + +std::vector parse_csv(std::string const&line) { + std::vector out; + boost::algorithm::split(out, line, + boost::algorithm::is_any_of(",")); + return sanitize_csv_values(out); +} + +std::optional parse_price(std::string const &cprice) { + try { + return std::stod(cprice); + } catch (std::exception const &) { + return {}; + } +} + + +}} diff --git a/src/server/sparkd/position/import/parsing/parser_common.h b/src/server/sparkd/position/import/parsing/parser_common.h new file mode 100644 index 000000000..bbc73ecd5 --- /dev/null +++ b/src/server/sparkd/position/import/parsing/parser_common.h @@ -0,0 +1,13 @@ +#pragma once + +#include +#include +#include + +namespace bts { +namespace position { +std::vector parse_csv(std::string const&); +std::optional parse_price(std::string const &); +}} + + diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index 51d1f5086..2ad6f9b4e 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -1,69 +1,129 @@ #include "catch/catch.hpp" -#include "../Position.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - -#include "lib/config/config.h" -#include "lib/api/public/ServiceContext.h" -#include "lib/api/services/AuthService.client.pb.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/utils/helper_macros.h" - +#include "lib/utils/datetime.h" +#include +#include #include #include #include -namespace bts -{ -namespace position -{ +#include "server/sparkd/position/import/DownloadWindow.h" -class PositionTests -{ -public: - // static bool query_margin_webapi(MarginServiceCore& svc, const std::vector& pos, MarginResult& res) - // { - // return svc.query_margin_webapi(pos, res); - // } - // static void set_verbose_debugging(MarginServiceCore& svc, bool verb) - // { - // return svc.set_verbose_debugging(verb); - // } - -}; +namespace bts { +namespace test { -// TEST_CASE ("Margin API", "[margin]") -// { -// securities::SecurityDB _db; -// MarginServiceCore _margin(_db); +TEST_CASE("download_window", "[position]") { + SECTION("single_day_before") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); -// SECTION("test1") -// { -// bts::securities::ISecurityDB::SecurityMap secs = _db.retrieve_all(); -// Position p; -// for(const auto& i : secs) -// { -// if(i.second->has_future() && i.second->symbol() == "ES") -// p.security = i.second; -// } -// auto acct = orderman::to("TAG1"); -// p.account = acct; -// p.avg_price = Price(2500.0); -// p.position = Quantity(1); -// p.side = api::SIDE_BUY; -// std::vector pos; -// pos.push_back(p); -// p.position = Quantity(3); -// p.side = api::SIDE_SELL; -// pos.push_back(p); - -// MarginResult res; -// PositionTests::query_margin_webapi(_margin, pos, res); -// REQUIRE(res.valid); -// } + // start window at 22:00, end at 23:00 + auto w_start = boost::posix_time::duration_from_string("22:00"); + auto w_stop = boost::posix_time::duration_from_string("23:00"); -// } + auto w = position::DownloadWindow { now, w_start, w_stop}; -}} - + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 14, 22, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 14, 23, 0, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,21,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,14,22,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,23,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2018,8,14,22,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2020,8,14,22,30,0,0))); + } + SECTION("single_day_inside") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); + + // start window at 8:00, end at 10:00 + auto w_start = boost::posix_time::duration_from_string("08:00"); + auto w_stop = boost::posix_time::duration_from_string("10:00"); + + auto w = position::DownloadWindow { now, w_start, w_stop}; + + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 14, 8, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 14, 10, 0, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,7,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,14,8,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,23,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2018,8,14,22,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2020,8,14,22,30,0,0))); + } + + SECTION("single_day_after") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); + + // start window at 8:00, end at 8:30 + auto w_start = boost::posix_time::duration_from_string("08:00"); + auto w_stop = boost::posix_time::duration_from_string("08:30"); + + auto w = position::DownloadWindow { now, w_start, w_stop}; + + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 15, 8, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 15, 8, 30, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,7,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,15,8,20,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,15,23,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2018,8,14,22,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2020,8,14,22,30,0,0))); + } + + + SECTION("multi_day_before") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); + + // start window at 23:00, end at 01:00 + auto w_start = boost::posix_time::duration_from_string("23:00"); + auto w_stop = boost::posix_time::duration_from_string("01:00"); + + auto w = position::DownloadWindow { now, w_start, w_stop}; + + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 14, 23, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 15, 1, 0, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,21,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,14,23,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,13,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2018,8,14,22,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2020,8,14,22,30,0,0))); + } + + SECTION("multi_day_inside") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); + + // start window at 23:00, end at 10:00 + auto w_start = boost::posix_time::duration_from_string("23:00"); + auto w_stop = boost::posix_time::duration_from_string("10:00"); + + auto w = position::DownloadWindow { now, w_start, w_stop}; + + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 13, 23, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 14, 10, 0, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,21,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,14,9,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,13,30,0,0))); + } + + SECTION("multi_day_after") { + // now = 9:00am + auto now = datetime::make_ptime(2019, 8, 14, 9, 0, 0, 0); + + // start window at 23:00, end at 10:00 + auto w_start = boost::posix_time::duration_from_string("23:00"); + auto w_stop = boost::posix_time::duration_from_string("8:00"); + + auto w = position::DownloadWindow { now, w_start, w_stop}; + + REQUIRE(w.start() == datetime::make_ptime(2019, 8, 13, 23, 0, 0, 0)); + REQUIRE(w.stop() == datetime::make_ptime(2019, 8, 14, 8, 0, 0, 0)); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,21,0,0,0))); + REQUIRE(w.is_inside(datetime::make_ptime(2019,8,14,7,30,0,0))); + REQUIRE(!w.is_inside(datetime::make_ptime(2019,8,14,13,30,0,0))); + } +} + +} // namespace test +} // namespace bts diff --git a/src/server/sparkd/position/tests/position_tests_internal.cpp b/src/server/sparkd/position/tests/position_tests_internal.cpp new file mode 100644 index 000000000..8f83ab5bc --- /dev/null +++ b/src/server/sparkd/position/tests/position_tests_internal.cpp @@ -0,0 +1,308 @@ +#include "catch/catch.hpp" + +#include "lib/utils/datetime.h" +#include "server/sparkd/position/PositionMap.h" +#include "lib/orderman/actors/SODPosition.h" +#include +#include + +namespace bts { +namespace test { + +using namespace bts::api::orderman; +using namespace bts::api::position; +using namespace bts::orderman; + +int fill_id = 0; +Fill create_fill (uint32_t account_id, + uint32_t sec_key, + double price, + uint32_t qty, + api::Side side, + Fill::FillKind fkind){ + Fill f; + f.set_security_key(sec_key); + f.set_internal_account_id(account_id); + f.set_last_price(price); + f.set_last_shares(qty); + f.set_side(side); + f.set_fill_kind(fkind); + f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(SODPosition::now())); + f.set_fill_key(std::to_string(++fill_id)); + return f; +} + +BasePosition create_base_pos(uint32_t account_id, + uint32_t sec_key, + double price, + uint32_t qty, + api::Side side){ + BasePosition bp; + bp.set_security_id(sec_key); + bp.set_account_id(account_id); + bp.set_avg_price(price); + bp.set_quantity(qty); + bp.set_side(side); + return bp; +} + +void compare (double d1, double d2){ + REQUIRE(std::abs(d1-d2) < 0.000001); +} + +void compare_pos (const PositionEntry& p1, + const PositionEntry& p2){ + compare(p1.long_pos(), p2.long_pos()); + compare(p1.long_avg_price(), p2.long_avg_price()); + compare(p1.short_pos(), p2.short_pos()); + compare(p1.short_avg_price(), p2.short_avg_price()); +} + +void compare_pos (const PositionEntry& p1, + double long_pos, + double long_price, + double short_pos, + double short_price){ + compare(p1.long_pos(), long_pos); + compare(p1.long_avg_price(), long_price); + compare(p1.short_pos(), short_pos); + compare(p1.short_avg_price(), short_price); +} + +double gen_rand (double min, double max){ + double f = (double)rand() / RAND_MAX; + return min + f * (max - min); +} + +void add_pos (PositionEntry& pe, double p, double q, bool is_long){ + if (is_long){ + uint32_t tot_q = pe.long_pos() + q; + pe.set_long_avg_price((pe.long_pos()*pe.long_avg_price() + p*q)/tot_q); + pe.set_long_pos(tot_q); + } + else{ + uint32_t tot_q = pe.short_pos() + q; + pe.set_short_avg_price((pe.short_pos()*pe.short_avg_price() + p*q)/tot_q); + pe.set_short_pos(tot_q); + } +} + +TEST_CASE("basic", "[position_internal]") { + SECTION("day_standard") { + // just sends some day position to PositionMap + // and verifies their correctness + PositionMap pmap; + Fill f = create_fill(1, 1, 10.0, 10, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + pmap.on_fill(f,true); + PositionUnit const* p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),10,10,0,0); + compare_pos(p->raw_day(),10,10,0,0); + compare_pos(p->sod(),0,0,0,0); + // remove it + pmap.on_fill(f,false); + p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),0,0,0,0); + compare_pos(p->raw_day(),0,0,0,0); + compare_pos(p->sod(),0,0,0,0); + } + SECTION("day_leg") { + // just sends some day position to PositionMap + // and verifies their correctness + PositionMap pmap; + Fill f = create_fill(1, 1, 10.0, 10, api::Side::SIDE_BUY, Fill::FILL_KIND_LEG); + pmap.on_fill(f,true); + PositionUnit const* p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),10,10,0,0); + compare_pos(p->raw_day(),0,0,0,0); + compare_pos(p->sod(),0,0,0,0); + // remove it + pmap.on_fill(f,false); + p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),0,0,0,0); + compare_pos(p->raw_day(),0,0,0,0); + compare_pos(p->sod(),0,0,0,0); + } + SECTION("sod") { + // just sends some day position to PositionMap + // and verifies their correctness + PositionMap pmap; + Fill f = create_fill(1, 1, 10.0, 10, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + f.mutable_timestamp()->set_seconds(100); + pmap.on_fill(f,true); + PositionUnit const* p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),0,0,0,0); + compare_pos(p->raw_day(),0,0,0,0); + compare_pos(p->sod(),10,10,0,0); + // remove it + pmap.on_fill(f,false); + p = pmap.test_only_pos(1,1); + REQUIRE (p!=nullptr); + compare_pos(p->day(),0,0,0,0); + compare_pos(p->raw_day(),0,0,0,0); + compare_pos(p->sod(),0,0,0,0); + } +} + +TEST_CASE("basic_badge", "[position_internal]") { + SECTION("day_standard") { + PositionMap pmap; + std::map> pos_map; + uint32_t n_accounts = 5, + n_secs = 20, + n_day_fills = 100, + n_sod_fills = 200; + for (uint32_t a=1; a<= n_accounts; a++) + for(uint32_t s=1;s<=n_secs;s++){ + for(uint32_t i=0; i< n_day_fills; i++){ + // day standard + PositionUnit& pu = pos_map[a][s]; + double p = gen_rand(-100,100); + uint32_t q = gen_rand(1,100); + Fill f = create_fill(a, s, p, q, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + add_pos(*pu.mutable_day(),p,q,true); + pmap.on_fill(f,true); + p = gen_rand(-100,100); + q = gen_rand(1,100); + f = create_fill(a, s, p, q, api::Side::SIDE_SELL, Fill::FILL_KIND_STANDARD); + add_pos(*pu.mutable_day(),p,q,false); + pmap.on_fill(f,true); + } + // sod + for(uint32_t i=0; i< n_sod_fills; i++){ + // day standard + PositionUnit& pu = pos_map[a][s]; + double p = gen_rand(-100,100); + uint32_t q = gen_rand(1,100); + Fill f = create_fill(a, s, p, q, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + f.mutable_timestamp()->set_seconds(100); + add_pos(*pu.mutable_sod(),p,q,true); + pmap.on_fill(f,true); + p = gen_rand(-100,100); + q = gen_rand(1,100); + f = create_fill(a, s, p, q, api::Side::SIDE_SELL, Fill::FILL_KIND_STANDARD); + f.mutable_timestamp()->set_seconds(100); + add_pos(*pu.mutable_sod(),p,q,false); + pmap.on_fill(f,true); + } + } + + for (auto a : pos_map){ + for (auto s : a.second){ + uint32_t acc_id = a.first, + sec_key = s.first; + PositionUnit& pu_exp = s.second; + PositionUnit const* pu_calc = pmap.test_only_pos(acc_id, sec_key); + REQUIRE(pu_calc != nullptr); + compare_pos (pu_exp.day(),pu_calc->day()); + compare_pos (pu_exp.day(),pu_calc->raw_day()); + compare_pos (pu_exp.sod(),pu_calc->sod()); + } + } + const auto& fm = pmap.test_only_fills(); + REQUIRE(fm.size() == 2*n_accounts*n_secs*(n_day_fills + n_sod_fills)); + } +} + +TEST_CASE("sod", "[position_internal]") { + // makes sure fills on either side of the SOD + // go the right place + timeval sod = SODPosition::now(); + PositionMap pmap(sod); + timeval pre_sod = sod, post_sod = sod; + pre_sod.tv_sec = pre_sod.tv_sec - 60*60; + post_sod.tv_sec = post_sod.tv_sec + 60*60; + // presod fill + Fill presod_f = create_fill(1, 1, 10, 50, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + presod_f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(pre_sod)); + pmap.on_fill(presod_f,true); + // postsod fill + Fill postsod_f = create_fill(1, 1, 20, 100, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + postsod_f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(post_sod)); + pmap.on_fill(postsod_f,true); + PositionUnit const* pu = pmap.test_only_pos(1,1); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),50,10,0,0); + compare_pos(pu->day(),100,20,0,0); +} + +TEST_CASE("base_position", "[position_internal]"){ + SECTION("base_only"){ + // just with base, no sod, no day + PositionMap pmap; + + BasePositionBatch bp_batch; + bp_batch.add_positions()->CopyFrom(create_base_pos(1,1,10,50,api::Side::SIDE_BUY)); + bp_batch.add_positions()->CopyFrom(create_base_pos(1,1,20,100,api::Side::SIDE_SELL)); + bp_batch.add_positions()->CopyFrom(create_base_pos(1,2,11,51,api::Side::SIDE_BUY)); + bp_batch.add_positions()->CopyFrom(create_base_pos(1,2,21,101,api::Side::SIDE_SELL)); + bp_batch.add_positions()->CopyFrom(create_base_pos(2,1,0.05,5000,api::Side::SIDE_BUY)); + bp_batch.mutable_current_as_of()->CopyFrom(SODPosition::to_timestamp(SODPosition::now())); + pmap.set_base_position(bp_batch); + + PositionUnit const* pu = pmap.test_only_pos(1,1); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),50,10,100,20); + compare_pos(pu->day(),0,0,0,0); + + pu = pmap.test_only_pos(1,2); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),51,11,101,21); + compare_pos(pu->day(),0,0,0,0); + + pu = pmap.test_only_pos(2,1); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),5000,0.05,0,0); + compare_pos(pu->day(),0,0,0,0); + } + SECTION("base+sod+day"){ + // fills on either side of SOD, then a base position + // comes in and overrides the SOD + timeval sod = SODPosition::now(); + PositionMap pmap (sod); + timeval pre_sod = sod, post_sod = sod; + pre_sod.tv_sec = pre_sod.tv_sec - 60*60; + post_sod.tv_sec = post_sod.tv_sec + 60*60; + // presod fill + Fill presod_f = create_fill(1, 1, 10, 50, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + presod_f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(pre_sod)); + pmap.on_fill(presod_f,true); + presod_f = create_fill(1, 2, 30, 50, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + presod_f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(pre_sod)); + pmap.on_fill(presod_f,true); + // postsod fill + Fill postsod_f = create_fill(1, 1, 20, 100, api::Side::SIDE_BUY, Fill::FILL_KIND_STANDARD); + postsod_f.mutable_timestamp()->CopyFrom(SODPosition::to_timestamp(post_sod)); + pmap.on_fill(postsod_f,true); + + PositionUnit const* pu = pmap.test_only_pos(1,1); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),50,10,0,0); + compare_pos(pu->day(),100,20,0,0); + pu = pmap.test_only_pos(1,2); + compare_pos(pu->sod(),50,30,0,0); + compare_pos(pu->day(),0,0,0,0); + // now enter a base position, it should override the SOD + BasePositionBatch bp_batch; + bp_batch.add_positions()->CopyFrom(create_base_pos(1,1,11,51,api::Side::SIDE_SELL)); + bp_batch.mutable_current_as_of()->CopyFrom(SODPosition::to_timestamp(sod)); + pmap.set_base_position(bp_batch); + + pu = pmap.test_only_pos(1,1); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),0,0,51,11); // sod is overriden by bp + compare_pos(pu->day(),100,20,0,0); // day remains the same + // sec 2 gets wiped out + pu = pmap.test_only_pos(1,2); + REQUIRE(pu!=nullptr); + compare_pos(pu->sod(),0,0,0,0); // sod is overriden by bp + compare_pos(pu->day(),0,0,0,0); + } +} + +} // namespace test +} // namespace bts diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 4e4aa474a..ab0676fe1 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 5514d327c..4be0e2e2e 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -1337,7 +1337,7 @@ let root (model:Model) dispatch = // tabHeader CreditLimits model.tab dispatch (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model.tab dispatch) else span [][] ) (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model.tab dispatch) else span [][] ) - (if (Array.length data.accounts > 0) then (tabHeader PositionManagementTab model.tab dispatch) else span [][] ) + //(if (Array.length data.accounts > 0) then (tabHeader PositionManagementTab model.tab dispatch) else span [][] ) (if (Array.length data.accounts > 0) then (tabHeader MarginTab model.tab dispatch) else span [][] ) ] ] diff --git a/testing/allocate.sh b/testing/allocate.sh old mode 100644 new mode 100755 diff --git a/testing/cycle_info.txt b/testing/cycle_info.txt index 0a5437100..0799cbe56 100644 --- a/testing/cycle_info.txt +++ b/testing/cycle_info.txt @@ -1,14 +1,14 @@ -qa_sprint_id=18 +qa_sprint_id=20 testers=( #'pedro.pinto' # 'eric.harding' - 'jake.norbut' - 'michael.harding' +# 'jake.norbut' +# 'michael.harding' 'karl.ellefsen' 'pete.fisher' - 'taha.afzal' - 'john.colvin' +# 'taha.afzal' +# 'john.colvin' 'kevin.darby' 'brian.muhr' ) diff --git a/testing/manual/algo_operations/update.txt b/testing/manual/algo_operations/update.txt index b9b56cb32..08fad7f24 100644 --- a/testing/manual/algo_operations/update.txt +++ b/testing/manual/algo_operations/update.txt @@ -20,10 +20,9 @@ On Toward=No Change 5. Select all the lean orders and change the Trade Toward Behavior to Cancel (don't commit yet). As the parameter is changed its name should turn Green along with a *. Revert back and it should go to No Change. Select a few of the leans and make sure Trade Toward Behavior is No Change. Now Change it -to Cancel and commit. Make sure it is set to Cancel for all the lean orders. +to Cancel and commit. Make sure it is set to Cancel for all the lean orders. This should cancel all the lean orders. -6. Move the ask book to 20.040. This should cancel all the leans (verifies the change -in 5 made through). Move the market back to 20.050 +6. Move the market back to 20.050 7. Enter 2 leans, 4 and 6 lots (configured like 3) at 20.025 and 20.020 respectively. In the orderbook select both and make sure the Price and Size show as - (since they are different). Change the Trade Toward diff --git a/testing/post_to_jira.sh b/testing/post_to_jira.sh old mode 100644 new mode 100755 diff --git a/tools/cpp_helper/ics_spreads.csv b/tools/cpp_helper/ics_spreads.csv index 890bd736e..0f58741d9 100644 --- a/tools/cpp_helper/ics_spreads.csv +++ b/tools/cpp_helper/ics_spreads.csv @@ -28,3 +28,4 @@ Sym,Mult,Exch "BOB",1000,CBT "BUB",1000,CBT "FNU",1000,CBT +"SOM",500,CBT \ No newline at end of file diff --git a/tools/linux_control/build_in_docker.sh b/tools/linux_control/build_in_docker.sh index 5ec8c9850..4ddc96cda 100755 --- a/tools/linux_control/build_in_docker.sh +++ b/tools/linux_control/build_in_docker.sh @@ -2,6 +2,6 @@ if [ -f /.dockerenv ]; then ninja else - cid=`docker ps | grep -P "bluetradingsystems/linux_docker|emacs_ide" | awk '{print $1}'` + cid=`docker ps | grep -P "emacs_ide|bluetradingsystems/linux_docker" | awk '{print $1}'` docker exec $cid /bin/bash -c "cd build/clang_debug/ && ninja" fi