fixing merge

.gitignore

@@ -35,4 +35,3 @@ trace_data/
 .ionide/*
 /.ignore
 /build
-.clangd/

.vscode/launch.json

@@ -1,30 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Spark Local",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/ninja_debug/server/sparkd",
-            "args": [
-                "run",
-                // "test",
-                // "-a",
-                // "[ilink3]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceRoot}/build/ninja_debug/server/",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
         {
             "name": "SparkVM Launch",
             "type": "cppdbg",

doc/api/content/client/getting-started/services.md

@@ -124,17 +124,4 @@ service OrderService {
 ```
 ### C++ Example
 ```cpp
-#include "lib/api/public/ServiceContext.h"
-#include "lib/api/services/OrderService.client.pb.h"
-using namespace bts::api;
-ServiceContext ctx;
-auto orders = ctx.locate<orderman::OrderService>();
-auto unsub = orders.subscribe_fills().subscribe([](const auto& update) {
-  std::cout 
-    << "Added " << update.added().size() << " items, "
-    << "Removed " << update.removed().size() << " items, "
-    << "Updated " << update.updated().size() << " items, "
-    << "Total items " << update.all().size() << std::endl;
-});
-std::this_thread::sleep_for(std::chrono::minutes(5));
 ```

doc/api/content/client/services/marketdata.md

@@ -1,51 +1,3 @@
 +++
 title = "Market Data"
-+++
-
-
-Use the MarketDataService to subscribe enumerate all available securities.
-
-```cs
-using System;
-using System.Threading;
-using bts.api;
-using bts.api.core;
-
-namespace sample {
-   class Program {
-      static void Main(string[] args) {
-         using var context = new ServiceContext();
-         var md = context.locate<MarketDataService>();
-         using var sub = md.subscribe_securities().Subscribe(update => {
-            foreach (var security in update.added) {
-               Console.WriteLine($"Added security {security.Id}: {security.Symbol}");
-            }
-         });
-
-         Thread.Sleep(TimeSpan.FromMinutes(5));
-      }
-   }
-}
-```
-
-```cpp
-#include "lib/api/public/ServiceContext.h"
-#include "spark/lib/domain_model/Security.h"
-#include "lib/api/services/MarketDataService.client.pb.h"
-#include <thread>
-
-using namespace bts::api;
-
-int main(int argc, char** argv) {
-   ServiceContext ctx;
-   auto md_service = ctx.locate<bts::api::MarketDataService>();
-   auto sub = md_service.subscribe_securities().subscribe([](const auto& update) {
-      for (const auto& s : update.added()) {
-         std::cout << "Added security: " << s->id() << ": " << s->symbol() << std::endl;
-      }
-   });
-
-   std::this_thread::sleep_for(std::chrono::minutes(5));
-   return 0;
-}
-```
++++

doc/api/content/server/getting-started/download.md

@@ -68,21 +68,12 @@ To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://
 
 To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.
 
-### Re-build the Dev Container
-
-If you are using Visual Studio Code you also need to rebuild the dev-container so it picks up the new image.
-
-#### Inside VSCode
-To re-build from inside Visual Studio Code.  Click the 'Remote Explorer' icon on the left hand side. 
-You should see your spark_sdk project listed under the Containers section.  Right click on it and select **rebuild-container**.
-
-#### Command Line
-To re-build from the command line run `docker ps -a` and find the row with the spark_sdk image. 
+<!--
+Then stop, remove and restart spark_sdk.
 ```
-CONTAINER ID        IMAGE                          COMMAND                  CREATED              STATUS                      PORTS                                NAMES
-54d96cfa3888        spark_sdk                      "/bin/sh -c 'echo Co…"   About a minute ago   Up About a minute           127.0.0.1:9000-9001->9000-9001/tcp   quizzical_lichterman
-```
-Then run `docker rm 54d96cfa3888` (use your container id instead of 54d96cfa3888)  or `docker rm quizzical_lichterman` (use your container name).
-
+c:\bts> docker stop spark_sdk
+c:\bts> docker rm spark_sdk
+c:\bts> docker run -d -v %cd%:/sdk --name spark_sdk bluetradingsytems/spark_sdk
 
+``` -->
 

doc/user/content/release_notes/_index.md

@@ -1,29 +1,9 @@
-+++
++++
 title = "Release notes"
 weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
-## 2.16.2
-### User Visible Change
-  - Synthetic creation dialog has a "fractional" checkbox next to the tick settings.  Users may uncheck this box to enter integer tick sizes, so the synthetic security's prices will be displayed without decimals, or fractional units.
-## 2.16.1
-### Bug Fixes
-  - OrderBook's algo state parameters (in the panel on the right side) are sorted alphabetically
-## 2.16.0
-### Bug Fixes
-  - Solved an issue that could result in incorrect ladder levels
-  - Solved an issue that could lead to incorrect routing of orders in the event of certain MSGW changes
-### API Changes
-  - Add C# client side API samples for order entry, position monitoring and market data observation
-
-## 2.15.10
-### Bug Fixes
-  - Solved an issue that could cause the user interface to fail when playing some alert sounds
-### API Changes
-  - Added settlement and position information to the API
-  - Added the ability for user algos to report custom state to the user interface
-  - Added the ability for algos to discover all active securities
 ## 2.15.3
 ### Bug Fixes
   - Fixed a bug where some CME currency spreads exhibited incorrect tick values
@@ -728,4 +708,3 @@ insert_anchor_links = "right"
 - Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively
 - Corrected cash per point values, used in pnl calculations, for a number of products
 - PnL report will now remember any customizations you make to filtering and/or sorting criteria
-

global.json

@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "2.1.508",
-    "rollForward": "latestMajor"
-  }
-}

src/client/Directory.Build.Props

@@ -22,10 +22,6 @@
     <GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
 </PropertyGroup>
 
-<PropertyGroup Condition="'$(VCTargetsPath)'==''">
-    <VCTargetsPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets</VCTargetsPath>
-</PropertyGroup>
-
 <Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
 
 <ItemGroup>

src/client/spark/App.xaml.cs

@@ -115,7 +115,7 @@ namespace mbts.ui.shell
       {
          try
          {
-            string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
+            var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
             if (File.Exists(path + "config\\stunnel.conf"))
             {
                uint job_error = BTSUINativeMethods.setup_process_job_object();   
@@ -124,15 +124,6 @@ namespace mbts.ui.shell
                   kill_stunnel();
                start_stunnel(path, job_error);
             }
-            path = AppDomain.CurrentDomain.BaseDirectory + "\\..\\stunnel\\";
-            if (File.Exists(path + "config\\stunnel.conf"))
-            {
-               uint job_error = BTSUINativeMethods.setup_process_job_object();
-               //if we can't put this process and stunnel into a job, try to stop stunnel then restart
-               if (job_error != 0)
-                  kill_stunnel();
-               start_stunnel(path, job_error);
-            }
          }
          catch(Exception ex)
          {

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs

@@ -1,6 +1,7 @@
 using bts.api;
 using bts.co2;
 using bts.utils;
+using bts.utils.csv;
 using mbts;
 using mbts.spark;
 using mbts.ui.controls;
@@ -44,6 +45,18 @@ namespace bts.shell.time_and_sales {
       public void raise_invalidated() =>
          invalidated?.Invoke();
 
+      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(
+               typeof(TimeAndSalesRowVM),
+               new string[] {
+                  nameof(security),
+                  nameof(time),
+                  nameof(price),
+                  nameof(size),
+                  nameof(aggressor_side),
+                  nameof(security_key),
+               });
+
       public bool Equals(TimeAndSalesRowVM other) =>
          other != null &&
          row_key == other.row_key;

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs

@@ -2,6 +2,7 @@
 using bts.shell.fills;
 using bts.spark;
 using bts.view;
+using bts.utils.csv;
 using mbts;
 using mbts.co2;
 using mbts.persist;
@@ -114,6 +115,8 @@ namespace bts.shell.time_and_sales {
             show_in_context_menu = _can_pause_updates
          };
          _commands = new SparkCommand[] {
+            // csv export
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(TimeAndSalesRowVM.csv_ordered_properties), "TaS")),
             // ladder
             SparkCommands.ShowLadderAutoLookup(SparkCommands.KeyGestures.ShowLadder)
                .complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),

src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml

@@ -549,48 +549,24 @@
               </u:BindingUpdateGroupCollection>
             </u:Behavior.BindingUpdateGroups>
           </TextBox>
-          <StackPanel
+          <TextBlock
             x:Name="PART_TickFactors_Label"
             Grid.Column="2"
+            VerticalAlignment="Center"
+            Margin="{StaticResource Margin.LHeaderPanelItem}"
+            Text="Ticks"
             IsEnabled="True"
-            Orientation="Horizontal"
             Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
-           >
-            <TextBlock
-              VerticalAlignment="Center"
-              Margin="{StaticResource Margin.LHeaderPanelItem}"
-              Text="Ticks ("
-            />
-            <CheckBox
-              Margin="1,0,0,0"
-              IsChecked="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}}"
-              VerticalAlignment="Center"
-              VerticalContentAlignment="Center"
-              Padding="0"
-            >
-              fractional
-            </CheckBox>
-            <TextBlock VerticalAlignment="Center" Margin="1,0,0,0">)</TextBlock>
-          </StackPanel>
-          <Grid
+          />
+          <c:TickFactorsPicker
             x:Name="PART_TickFactors_Picker"
             Grid.Column="3"
-            IsEnabled="True"
             Margin="{StaticResource Margin.LHeaderPanelItem}"
+            HorizontalAlignment="Stretch"
+            IsEnabled="True"
+            SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
             Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
-          >
-            <c:TickFactorsPicker
-              HorizontalAlignment="Stretch"
-              SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-              Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static cv:BooleanToVisibilityConverter.HiddenInstance}}"
-            />
-            <c:TickUpDownInt
-              HorizontalAlignment="Stretch"
-              Minimum="1"
-              Value="{Binding IntegerTickSize, RelativeSource={RelativeSource TemplatedParent}}"
-              Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource FalseVisibilityConverter}}"
-            />
-          </Grid>
+          />
           <TextBlock
             x:Name="PART_Pricing_Label"
             Grid.Column="4"

src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs

@@ -52,26 +52,6 @@ namespace mbts.ui.spark {
       public TickFactors TickFactors { get => GetValue(TickFactorsProperty) as TickFactors; set => SetValue(TickFactorsProperty, value); }
       #endregion
 
-      #region UseFractionalTicks
-      public static readonly DependencyProperty UseFractionalTicksProperty = WPFHelper.create_dp<bool, ExecutionStrategyEditor>(
-         nameof(UseFractionalTicks), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, true);
-
-      public bool UseFractionalTicks {
-         get => (bool)GetValue(UseFractionalTicksProperty);
-         set => SetValue(UseFractionalTicksProperty, value);
-      }
-      #endregion
-
-      #region IntegerTickSize
-      public static readonly DependencyProperty IntegerTickSizeProperty = WPFHelper.create_dp<int, ExecutionStrategyEditor>(
-         nameof(IntegerTickSize), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, 1);
-
-      public int IntegerTickSize {
-         get => (int)GetValue(IntegerTickSizeProperty);
-         set => SetValue(IntegerTickSizeProperty, value);
-      }
-      #endregion
-
       #region IsNew
       public static readonly DependencyProperty IsNewProperty =
          DependencyProperty.Register(

src/client/spark/Modules/Spreader/SyntheticEditorView.xaml

@@ -36,8 +36,6 @@
       ContractPickerModel="{Binding contract_picker_model}"
       HedgePricing="{Binding hedge_pricing}"
       HedgePricingItemsSource="{Binding hedge_pricing_options}"
-      UseFractionalTicks="{Binding use_fractional_ticks}"
-      IntegerTickSize="{Binding integer_tick_size}"
     />
     <c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding commit}" CloseOnOK="False"/>
   </Grid>

src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs

@@ -2,6 +2,7 @@
 using bts.collections;
 using bts.shell;
 using bts.spark;
+using bts.utils;
 using mbts.ui;
 using mbts.ui.shell;
 using mbts.ui.spark;
@@ -29,16 +30,8 @@ namespace mbts.spark {
       readonly Property<bool> _has_working_orders, _can_add_leg;
 
       Security _synthetic;
-      bool
-         _set_name_automatically,
-         _set_ticks_automatically,
-         _set_quantities_automatically,
-         _set_price_mults_automatically,
-         _is_setting_quantities,
-         _is_setting_price_mults,
-         _use_fractional_ticks = true;
+      bool _set_name_automatically, _set_ticks_automatically, _set_quantities_automatically, _set_price_mults_automatically, _is_setting_quantities, _is_setting_price_mults;
       TickFactors _tick_factors;
-      int _integer_tick_size = 1;
       ExecutionStrategyImmutable _strategy;
       HedgePricing _hedge_pricing;
 
@@ -51,10 +44,6 @@ namespace mbts.spark {
          : this(synthetic, strategy, false) {
          ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
          _tick_factors = TickUtils.get_regional_ticks(synthetic.ContractSpec).low_tick;
-         if (TickUtils.is_integer_tick(synthetic.ContractSpec)) {
-            _use_fractional_ticks = false;
-            _integer_tick_size = DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0;
-         }
          title = $"Edit '{synthetic.Synthetic.Name}'";
          icon = Icons.ModifySynthetic;
          _has_working_orders = backing(nameof(has_working_orders), security_has_working_orders.OnDispatcher());
@@ -142,14 +131,14 @@ namespace mbts.spark {
                flash_error_msg("Name already taken", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore();
                valid = false;
             }
-            if (use_fractional_ticks ? (_tick_factors == null || !_tick_factors.is_valid()) : integer_tick_size == 0) {
-               flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, use_fractional_ticks ? nameof(tick_factors) : nameof(integer_tick_size)).ignore();
+            if (_tick_factors == null || !_tick_factors.is_valid()) {
+               flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, nameof(tick_factors)).ignore();
                valid = false;
             }
             if (valid) {
                _synthetic.Synthetic.Legs.SetItems(leg_tuples.Select(l => l.leg));
                _synthetic.Symbol = _deduce_symbol(_synthetic);
-               _synthetic.ContractSpec = use_fractional_ticks ? _tick_factors.to_spec() : TickUtils.create_integer_tick_spec(integer_tick_size);
+               _synthetic.ContractSpec = _tick_factors.to_spec();
                uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
                if (id.HasValue && id != 0) {
                   if (await model.save_strategy(id.Value, get_strategy())) {
@@ -306,20 +295,6 @@ namespace mbts.spark {
       public bool has_working_orders => _has_working_orders.Value;
       public bool is_new { get; }
       public bool is_new_leg_popup_open { get; set; }
-      public bool use_fractional_ticks {
-         get => _use_fractional_ticks;
-         set {
-            if (Set(ref _use_fractional_ticks, value))
-               _set_ticks_automatically = false;
-         }
-      }
-      public int integer_tick_size {
-         get => _integer_tick_size;
-         set {
-            if (Set(ref _integer_tick_size, value))
-               _set_ticks_automatically = false;
-         }
-      }
       public bool can_add_leg => _can_add_leg.Value;
       public SyntheticContract.Types.PriceCalc price_calc { get => _synthetic.Synthetic.PriceCalc; set => _synthetic.Synthetic.PriceCalc = value; }
       public ObservableCollection<LegSpreaderParamsTuple> leg_tuples { get; } = new ObservableCollection<LegSpreaderParamsTuple>();
@@ -348,16 +323,6 @@ namespace mbts.spark {
          _strategy = strategy;
          hedge_pricing = strategy.HedgePricing;
          leg_tuples.SetItems(_get_legs(_synthetic, strategy));
-         if (synthetic.HasContractSpec) {
-            /// assign the fields <see cref="_use_fractional_ticks"/> and <see cref="_integer_tick_size"/>,
-            /// rather than the properties <see cref="use_fractional_ticks"/> and <see cref="integer_tick_size"/>
-            /// because the setters of the former flip <see cref="_set_ticks_automatically"/> to false if the value changes.
-            /// This behavior causes the ticks to be automatically deduced as legs are added/removed,
-            /// until the user explicitly enters a different value (as the properties are bound to tick input controls in the view).
-            Set(ref _use_fractional_ticks, !TickUtils.is_integer_tick(synthetic.ContractSpec), nameof(use_fractional_ticks));
-            if (!use_fractional_ticks)
-               Set(ref _integer_tick_size, DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0, nameof(integer_tick_size));
-         }
          RaisePropertyChanged(nameof(name), nameof(tick_factors));
       }
 

src/client/spark/Modules/Trading/Fills/FillsVM.cs

@@ -5,6 +5,7 @@ using bts.collections;
 using bts.shell.fills;
 using bts.spark;
 using bts.utils;
+using bts.utils.csv;
 using mbts.collections;
 using mbts.persist;
 using mbts.spark.filters;
@@ -330,6 +331,27 @@ namespace mbts.spark {
          public override bool Equals(object obj) => Equals(obj as Row);
          public override int GetHashCode() => _fill.FillKey.GetHashCode() ^ _order.Key.GetHashCode();
 
+         public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(typeof(Row),
+               new string[] {
+                  nameof(security),
+                  nameof(order_type),
+                  nameof(root_algo_display_name),
+                  nameof(side),
+                  nameof(fill_time),
+                  nameof(user),
+                  nameof(account),
+                  nameof(exchange),
+                  nameof(time_in_force),
+                  nameof(size),
+                  nameof(price),
+                  nameof(fill_kind),
+                  nameof(fill_status),
+                  nameof(fill_key),
+                  nameof(order_key),
+                  nameof(security_key)
+               });
+
          public event Action invalidated;
          void IRowVM.raise_invalidated() => invalidated?.Invoke();
       }

src/client/spark/Modules/Trading/Fills/FillsWindow.cs

@@ -4,6 +4,7 @@ using bts.shell;
 using bts.shell.fills;
 using bts.spark;
 using bts.view;
+using bts.utils.csv;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
@@ -61,6 +62,7 @@ namespace mbts.spark {
          _view = new FillsView { DataContext = _vm };
 
          _commands = new List<SparkCommand> {
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(FillsVM.Row.csv_ordered_properties), "Fills")),
             // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes
             SparkCommands.window_settings_command(new DialogCommand(() => {
                var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(

src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs

@@ -143,7 +143,7 @@ namespace mbts.spark {
             string candidate = string.Empty;
             if (a.HasValue) {
                var algo_name = a.Value.name;
-               var words = algo_name.Split(delim, StringSplitOptions.RemoveEmptyEntries);
+               var words = algo_name.Split(delim);
                if (words.Length == 1) {
                   var single_word = words[0];
                   if (single_word.Length > 1) {
@@ -152,7 +152,7 @@ namespace mbts.spark {
                      candidate = single_word;
                   }
                } else {
-                  candidate = string.Join(string.Empty, words.Take(2).Select(w => w.Substring(0, 1)));
+                  candidate = words.Take(2).Select(w => w.Substring(0, 1)).list_string(string.Empty);
                }
             }
             return candidate.ToUpper();

src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs

@@ -534,44 +534,14 @@ namespace mbts.spark {
          _size_from_row(row, _price_list, _asks, _vm.security.ContractSpec);
 
       uint _volume_from_row(int row) {
-         const int max_tries = 3;
-         var errors = new List<string>(0);
-         int num_tries = 0;
-         for (; num_tries < max_tries; num_tries++) {
-            try {
-               var rv = impl();
-               if (num_tries > 0) {
-                  log_errors(true);
-               }
-               return rv;
-            } catch (Exception ex) {
-               errors.Add(ex.ToString());
-            }
-         }
-         log_errors(false);
-         return 0;
-
-         void log_errors(bool succeeded) {
-            // Only log distinct errors to avoid useless noise.
-            // It's likely that the exception will always be the same (IndexOutOfRange),
-            // however, this bug is not fully understood, so assume nothing.
-            var error_msg = string.Join("; ", errors.Distinct());
-            if (succeeded) {
-               Log.Ui.error($"Ladder '{security}' got volume for row at index '{row}' after {num_tries + 1} attempts (price_list array length is {_price_list.Length}).  The following exceptions were observed: {error_msg}");
-            } else {
-               Log.Ui.error($"Ladder '{security}' failed to get volume for row at index '{row}' after {max_tries} attempts (price_list array length is {_price_list.Length}): {error_msg}");
-            }
-         }
-
-         uint impl() {
-            if (_price_list.SafeTryGetAt(row, out var price)) {
-               var vapls = _volume_container.read_new_value();
-               if (vapls != null) {
-                  return vapls.SelectFirstOrDefault(v => MathUtils.epsilon_equals(v.Price, price), v => v.Volume);
-               }
-            }
-            return 0u;
+         if (_price_list != null) {
+            var price = _price_list[row];
+            var vapls = _volume_container.read_new_value();
+            if (vapls != null) {
+               return vapls.SelectFirstOrDefault(v => MathUtils.epsilon_equals(v.Price, price), v => v.Volume);
+            } 
          }
+         return 0u;
       }
 
 

src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs

@@ -2,7 +2,6 @@ using bts.api;
 using bts.api.core;
 using bts.api.position;
 using bts.collections;
-using bts.utils;
 using mbts;
 using mbts.spark;
 using mbts.ui;

src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs

@@ -4,6 +4,7 @@ using bts.api.orderman;
 using bts.collections;
 using bts.spark;
 using bts.utils;
+using bts.utils.csv;
 using mbts.ui;
 using mbts.ui.controls;
 using System;
@@ -11,6 +12,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Windows.Input;
 using System.Windows.Media;
 using Columns = mbts.spark.OrderBookGridView.ColumnKeys;
@@ -36,6 +38,7 @@ namespace mbts.spark {
       public OrderBookRowVM(OrderBookVM owner, OrderSecurityRootPair order_tuple, bool is_expanded, Action<bool> on_selection_changed) {
          _owner = owner;
          this.order_tuple = order_tuple;
+         is_visible = !is_child;
          _is_expanded = is_expanded;
          prospective_quantity = this.quantity;
          prospective_price = this.price;
@@ -59,6 +62,35 @@ namespace mbts.spark {
       public event Action<(OrderSecurityRootPair oldval, OrderSecurityRootPair newval)> updated;
       public event PropertyChangedEventHandler PropertyChanged;
 
+      public static System.Collections.Specialized.OrderedDictionary csv_ordered_properties =>
+            CsvHelper.create_ordering_maintainer(
+               typeof(OrderBookRowVM), 
+               new string[] {
+                  nameof(security_text),
+                  nameof(symbol),
+                  nameof(time_created),
+                  nameof(last_change),
+                  nameof(user),
+                  nameof(account),
+                  nameof(exchange),
+                  nameof(time_in_force),
+                  nameof(order_type),
+                  nameof(root_algo_display_name),
+                  nameof(order_sub_type),
+                  nameof(side),
+                  nameof(quantity),
+                  nameof(filled_quantity),
+                  nameof(price),
+                  nameof(avg_price),
+                  nameof(last_price),
+                  nameof(piq),
+                  nameof(status),
+                  // last message (could contains commas, so skipping)
+                  nameof(security_key),
+                  nameof(order_key),
+                  nameof(parent_order_key),
+               });
+
       // Core
       public OrderSecurityRootPair order_tuple { get; private set; }
       public OrderRecordImmutable order => order_tuple.order.order;
@@ -112,6 +144,7 @@ namespace mbts.spark {
       // Tree
       public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); }
       public bool is_child => order.has_parent();
+      public bool is_visible { get; set; }
       public bool is_expanded {
          get => _is_expanded;
          set {

src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs

@@ -51,7 +51,6 @@ namespace mbts.spark {
       readonly OrderParamsAggregator _selected_params_mon;
       readonly CommonValueMonitor<SecurityImmutable?> _selected_security_mon = new CommonValueMonitor<SecurityImmutable?>();
       readonly RightPanelModel _right_panel = new RightPanelModel();
-      readonly CustomStateSynchronizer _custom_state_sync;
       OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid;
       double
          _raw_right_panel_width = OrderBookStartupData.Default.right_panel_width,
@@ -125,8 +124,6 @@ namespace mbts.spark {
          _row_collection.CollectionChanged += _row_collection_CollectionChanged;
          _current_row = backing<OrderBookRowVM>(nameof(current_row));
          _columns.filter_changed += _on_filter_changed;
-         _custom_state_sync = new CustomStateSynchronizer(this);
-         // commands
          collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all);
          expand_all_rows_command = new DelegateCommand(_row_collection.expand_all);
          var modify_selected_orders_async_cmd = new AsyncCommand(_modify_selected_orders_async, () => _selected_params_mon.all_active && order_mod_vm.is_dirty);
@@ -191,7 +188,6 @@ namespace mbts.spark {
                security_plurality = p;
                RaisePropertyChanged(nameof(security_plurality));
             }),
-            _current_row.Subscribe(_ => _custom_state_sync.sync()),
             orders_source.OnDispatcher().Subscribe(t => {
                if (_selected_rows.Count == 0) {
                   _cached_orders = t.state;
@@ -211,8 +207,6 @@ namespace mbts.spark {
                      }
                   }
                }
-               _custom_state_sync.sync(true);
-               orders_changed?.Invoke();
             }),
             model.on_orders_can_attach.OnDispatcher().Subscribe(table => {
                _cached_attachable = new MappedDictionary<uint, KeyValuePair<uint, bool>, bool>(table.state, kv => kv.Value);
@@ -381,7 +375,7 @@ namespace mbts.spark {
       }
 
       public event Action<OrderRecordImmutable?> selected_order_changed;
-      public event Action begin_attaching, end_attaching, orders_changed;
+      public event Action begin_attaching, end_attaching;
       public event Action<(IEnumerable, bool)> request_selection;
 
       public ObservableAppendCollection<DIYGrid.ColumnBase> columns { get; }
@@ -401,7 +395,6 @@ namespace mbts.spark {
          }
       }
       public OrderRecordImmutable? current_order => current_row?.order;
-      public ObservableCollection<NamedValueVM> current_algo_custom_state { get; } = new ObservableCollection<NamedValueVM>();
       public AlgoDefinitionVM algo_vm => order_mod_vm.algo_vm;
       public OrderParamsVM order_mod_vm { get; }
       public FillsVMContainer fills_vm { get; } = new FillsVMContainer();
@@ -481,28 +474,6 @@ namespace mbts.spark {
       public IObservable<bool> subscribe_show_fills() => _show_fills.observe_current(true);
       public IObservable<bool> subscribe_show_ladder() => _show_ladder.observe_current(true);
       public IObservable<bool> subscribe_show_order_params() => _show_order_params.observe_current(true);
-      public IObservable<OrderSecurityAlgo?> subscribe_single_selected_order() =>
-         Observable.Create<OrderSecurityAlgo?>(o => {
-            OrderSecurityAlgo? last_fired = null;
-            orders_changed += notify;
-            _current_row.Changed += on_current_row_changed;
-            notify();
-            return Disposable.Create(dispose);
-            // local methods
-            void notify() {
-               var next = current_row == null ? (OrderSecurityAlgo?)null : current_row.order_tuple.order;
-               if (next != last_fired)
-                  o.OnNext(last_fired = next);
-            }
-
-            void on_current_row_changed(OrderBookRowVM oldval, OrderBookRowVM newval) =>
-               notify();
-
-            void dispose() {
-               orders_changed -= notify;
-               _current_row.Changed -= on_current_row_changed;
-            }
-         });
 
       public void row_selection_changed(SelectionChangedEventArgs e) {
          try {
@@ -532,7 +503,6 @@ namespace mbts.spark {
             _can_attach_selected_orders.refresh();
             _can_detach_selected_orders.refresh();
             selected_order_changed?.Invoke(current_order);
-            _custom_state_sync.sync();
          } catch (Exception ex) {
             // [John]I observed a strange null-reference exception in this callback when the launcher was shutting down (see https://bluetradesys.atlassian.net/browse/SPARK-2089)
             Log.Ui.error($"[{nameof(OrderBookVM)}] Error handling selection change: {ex}");
@@ -753,45 +723,6 @@ namespace mbts.spark {
          }
       }
 
-      class CustomStateSynchronizer {
-         readonly OrderBookVM _vm;
-         OrderBookRowVM _synced_row;
-
-         public CustomStateSynchronizer(OrderBookVM vm) =>
-            _vm = vm;
-
-         public void sync(bool force_refresh = false) {
-            var row = _vm.current_row != null &&
-               _vm.selected_rows.Select(r => r.order_tuple.root.order.Key).Distinct().TryGetSingle(out uint droot) &&
-               _vm.current_row.order_tuple.root.order.Key == droot ?
-                  _vm.current_row : null;
-            if (force_refresh || row != _synced_row) {
-               _synced_row = row;
-               _refresh();
-            }
-         }
-
-         void _refresh() {
-            _vm.current_algo_custom_state.Clear();
-            if (_synced_row == null)
-               return;
-            var dcs = _synced_row.order.dynamic_custom_state();
-            // while dcs is not expected to be null, best to play it safe and double check.
-            if (dcs.is_null_or_empty()) {
-               var descendent_rows = _vm._row_collection.get_descendent_rows(_synced_row.order_key);
-               if (_vm._row_collection.filter != null)
-                  descendent_rows = descendent_rows.Where(child => _vm._row_collection.filter(child.order_tuple));
-               foreach (var dr in descendent_rows) {
-                  dcs = dr.order.dynamic_custom_state();
-                  if (!dcs.is_null_or_empty())
-                     break;
-               }
-            }
-            foreach (var p in dcs.empty_if_null().OrderBy(kv => kv.Key))
-               _vm.current_algo_custom_state.Add(new NamedValueVM(p.Key, DynamicOrderHelper.fmt_param(p.Value)));
-         }
-      }
-
       public class OrderParamsVM : DisposableViewModelBase {
          readonly SelectorProperty<AccountTuple, AccountTuple?> _accounts;
          readonly OrderBookVM _owner;

src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs

@@ -1,17 +1,15 @@
-using bts;
-using bts.api;
+using bts.api;
 using bts.api.orderman;
 using bts.shell;
 using bts.shell.fills;
 using bts.shell.orderbook;
 using bts.spark;
+using bts.utils.csv;
 using bts.view;
 using mbts.persist;
-using mbts.spark.utilities;
 using mbts.ui;
 using mbts.ui.extensions;
 using mbts.ui.spark;
-using mbts.ui.utilities;
 using mbts.ui.utility;
 using mbts.utils;
 using System;
@@ -27,10 +25,7 @@ namespace mbts.spark {
       const string _window_type = "OrderBook", _default_title = "Order Book";
       readonly INotificationService _notification_service;
       readonly IWindowSettingsManager<OrderBookGridSettings> _settings_manager;
-      readonly bool _can_edit_specific_algo_params;
       IDisposable _attachment_exit_sub;
-      // initialized in thread_init
-      List<IDisposable> _thread_init_resources;
       OrderBookStartupData _state;
       OrdersModel _model;
       OrderBookVM _vm;
@@ -40,14 +35,13 @@ namespace mbts.spark {
       SparkCommand[] _commands;
 
       public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service,
-         OrderBookStartupData state, ImageSource icon, IWindowSettingsManager<OrderBookGridSettings> settings_manager, bool can_edit_specific_algo_params)
+         OrderBookStartupData state, ImageSource icon, IWindowSettingsManager<OrderBookGridSettings> settings_manager)
          : base(_default_title, bus, factory, SparkCommands.ShowOrders.icon) {
          _model = model;
          _factory = factory;
          _notification_service = notification_service;
          _state = state;
          _settings_manager = settings_manager;
-         _can_edit_specific_algo_params = can_edit_specific_algo_params;
          thread_id = config.Configuration.get<bts.config.MultiThreadedWindows>().order_book ? "OrderBook" : null;
       }
 
@@ -71,14 +65,12 @@ namespace mbts.spark {
       public string thread_id { get; }
 
       public override void Dispose() {
-         Disposable.dispose(_thread_init_resources);
+         _commands.OfType<IDisposable>().DisposeAll();
          Disposable.dispose(ref _attachment_exit_sub);
          Disposable.dispose(ref _vm);
       }
 
       public void thread_init() {
-         Log.assert(_thread_init_resources == null, $"{nameof(_thread_init_resources)} must be initialized in thread_init.");
-         _thread_init_resources = new List<IDisposable>();
          _menu_display_vm = new SparkMenuDisplayVM();
          if (_state != null)
             _menu_display_vm.load_from(_state.menu_display);
@@ -156,15 +148,6 @@ namespace mbts.spark {
             can_execute: () => _vm.selected_orders.Any(x => passes_recreate_search_criteria(x))
          );
          recreate_selected_orders_command.group = CommandGroups.Modify;
-         ICommand edit_algo_params_cmd;
-         if (_can_edit_specific_algo_params) {
-            _thread_init_resources.Add(CommandHelper.bind_param_source(
-               new DialogCommand<OrderSecurityAlgo?, Window>(mk_algo_params_dialog, has_algo_params),
-               _vm.subscribe_single_selected_order(),
-               out edit_algo_params_cmd, true));
-         } else {
-            edit_algo_params_cmd = DelegateCommand.empty;
-         }
 
          var attach_selected_orders_command = new SparkCommandCommand(
             "Attach To Selected",
@@ -212,22 +195,15 @@ namespace mbts.spark {
          show_grid_settings_command.group = CommandGroups.Auxiliary;
 
          _commands = new SparkCommand[] {
-            // modify commands
+            new SparkCommandCommand("Export to csv", Icons.Export, FileDialogCommand.export_csv(() => _vm.rows.ToCsv(OrderBookRowVM.csv_ordered_properties), "OrderBook")),
             toggle_show_right_panel_command,
             attach_selected_orders_command,
             detach_selected_orders_command,
             recreate_selected_orders_command,
-            new SparkCommandCommand("Algo Params...", Icons.Algo, edit_algo_params_cmd) {
-               group = CommandGroups.Modify,
-               show_in_toolbar = false,
-               show_in_context_menu = _can_edit_specific_algo_params
-            },
-            // cancel commands
             cancel_selected_orders_command,
             cancel_buy_orders_command,
             cancel_sell_orders_command,
             cancel_all_orders_command,
-
             toggle_collapse_all_command,
             toggle_expand_all_command,
             show_grid_settings_command,
@@ -236,12 +212,9 @@ namespace mbts.spark {
             hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.RevertOrders, null, _vm.revert_selected_orders_cmd, OrderBookView.KeyboardShortcuts.RevertOrders)),
             _menu_display_vm.spark_cmd
          };
-         _thread_init_resources.AddRange(_commands.OfType<IDisposable>());
-         _thread_init_resources.Add(_vm.as_demuxer()
-            .subscribe<bool>(nameof(OrderBookVM.show_right_panel))
-            .Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title()));
+         _vm.as_demuxer().subscribe<bool>(nameof(OrderBookVM.show_right_panel))
+            .Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title());
          _vm.selected_order_changed += vm_selected_order_changed;
-         _thread_init_resources.Add(Disposable.Create(() => _vm.selected_order_changed -= vm_selected_order_changed));
          // local methods
          string get_toggle_show_right_panel_cmd_title() =>
             _vm.show_right_panel ? OrderBookView.CommandDescriptions.HideRightPanel : OrderBookView.CommandDescriptions.ShowRightPanel;
@@ -263,36 +236,6 @@ namespace mbts.spark {
             attach_selected_orders_command.raiseCanExecuteChanged();
             detach_selected_orders_command.raiseCanExecuteChanged();
          }
-
-         bool has_algo_params(OrderSecurityAlgo? order) =>
-            order.HasValue && !OrderDataHelper.get_metadata(order.Value.algo.value.CustomCase).NoProps;
-
-         Window mk_algo_params_dialog(OrderSecurityAlgo? order) {
-            if (!has_algo_params(order))
-               return null;
-            var algo_def = AlgoDefinitionVM.create(_model, order.Value.algo, editing_permissions: AlgoEditingPermissions.AllowEditValues);
-            var algo_params_vm = new OrderBookAlgoParamsVM(algo_def, order.Value.order.is_non_terminal());
-            var dialog = new OrderBookAlgoParamsDialog {
-               Content = algo_params_vm
-            };
-            ui.WindowStyle.SetTitleContent(dialog, algo_def);
-            dialog.Closed += (s, e) => {
-               Disposable.dispose(ref algo_params_vm);
-               dialog = null;
-            };
-            algo_params_vm.RequestCommit += commit;
-            algo_params_vm.RequestClose += (s, e) => close_dialog();
-            return dialog;
-
-            void close_dialog() {
-               dialog?.Close();
-               dialog = null;
-            }
-            void commit(CustomOrderDefinitionImmutable value) {
-               _model.update_order(order.Value.order, new_algo: value).ignore();
-               close_dialog();
-            }
-         }
       }
 
       protected override void OnParentViewCreated(SparkWindowView parent_view) {

src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs

@@ -1,7 +1,6 @@
 using bts.api;
 using bts.shell.orderbook;
 using bts.spark;
-using mbts.config;
 using mbts.persist;
 using mbts.spark;
 using mbts.ui;
@@ -16,11 +15,8 @@ namespace bts.shell {
       readonly INotificationServiceDataCache _notification_service_data_cache;
       readonly OrdersModel _model;
       readonly UserSettingsHub _settings_hub;
-      readonly OrderBookConfig _config;
 
       public OrderBookWindowFactory(IShellModule owner, IBus bus, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, OrdersModel model, UserSettingsHub settings_hub) : base(owner, "SparkOrderBookWindow") {
-         var raw_config = Configuration.get<bts.config.OrderBookOptions>();
-         _config = new OrderBookConfig(raw_config.can_edit_specific_algo_params);
          _bus = bus;
          _notification_service = notification_service;
          _notification_service_data_cache = notification_service_data_cache;
@@ -33,8 +29,7 @@ namespace bts.shell {
          var settings_manager = new WindowSettingsManager<OrderBookGridSettings>(_settings_hub, state.grid_settings_wrapper(),
             us => us.order_book_grid ?? OrderBookStartupData.DefaultGrid,
             (us, s) => us.with(order_book_grid: s));
-         var w = new OrderBookWindow(_model, this, _bus, _notification_service, state,
-            SparkCommands.ShowOrders.icon, settings_manager.as_non_shared(), _config.can_edit_specific_algo_params);
+         var w = new OrderBookWindow(_model, this, _bus, _notification_service, state, SparkCommands.ShowOrders.icon, settings_manager.as_non_shared());
          return Task.FromResult<IShellWindow>(w);
       }
 
@@ -42,12 +37,5 @@ namespace bts.shell {
          var w = await load(startup_data);
          _bus.post(SparkTags.ShowWindow, w);
       }
-
-      readonly struct OrderBookConfig {
-         public readonly bool can_edit_specific_algo_params;
-
-         public OrderBookConfig(bool can_edit_specific_algo_params) =>
-            this.can_edit_specific_algo_params = can_edit_specific_algo_params;
-      }
    }
 }

src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml

@@ -1,40 +0,0 @@
-<Window
-  x:Class="bts.shell.orderbook.OrderBookAlgoParamsDialog"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:sp="clr-namespace:mbts.spark"
-  xmlns:ob="clr-namespace:bts.shell.orderbook"
-  xmlns:usp="clr-namespace:mbts.ui.spark"
-  xmlns:u="clr-namespace:mbts.ui"
-  xmlns:c="clr-namespace:mbts.ui.controls"
-  u:WindowStyle.SizeToContent="WidthAndHeight"
-  Margin="0"
-  Padding="0"
-  Style="{StaticResource BTSWindowTitleTemplate}"
->
-  <u:WindowStyle.TitleContentTemplate>
-    <DataTemplate DataType="{x:Type sp:AlgoDefinitionVM}">
-      <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
-        <usp:OrderTypeItem Margin="4,0" DisplayName="{Binding name, StringFormat='{}{0} Params'}" BadgeFill="{Binding badge_fill}"/>
-      </StackPanel>
-    </DataTemplate>
-  </u:WindowStyle.TitleContentTemplate>
-  <Window.ContentTemplate>
-    <DataTemplate DataType="{x:Type ob:OrderBookAlgoParamsVM}">
-      <Grid>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="*"/>
-          <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        <usp:AlgoEditorGridView
-          Width="390"
-          Margin="5"
-          AlgoParamRows="{Binding param_rows}"
-          CanUserChangeAlgoRoot="False"
-        />
-        <c:DialogSkirt Grid.Row="1" RightItems="{Binding dialog_skirt}"/>
-      </Grid>
-    </DataTemplate>
-  </Window.ContentTemplate>
-</Window>

src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml.cs

@@ -1,49 +0,0 @@
-using bts.api.orderman;
-using bts.collections;
-using mbts.spark;
-using mbts.ui;
-using mbts.ui.controls;
-using mbts.ui.shell;
-using System;
-using System.Collections.Generic;
-using System.Windows;
-
-namespace bts.shell.orderbook {
-   /// <summary>
-   /// Interaction logic for OrderBookAlgoParamsDialog.xaml
-   /// </summary>
-   partial class OrderBookAlgoParamsDialog : Window {
-      public OrderBookAlgoParamsDialog() =>
-         InitializeComponent();
-   }
-
-   class OrderBookAlgoParamsVM : DisposableViewModelBase, IRequestViewClose {
-      readonly ObservableAggregateCollection<AlgoParamRowVM> _param_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
-      readonly DialogSkirtItem _commit, _cancel;
-
-      public OrderBookAlgoParamsVM(AlgoDefinitionVM algo_definition, bool can_user_edit) {
-         this.algo_definition = algo_definition;
-         _dispose = AlgoParamRowsHelper.connect(algo_definition, _param_rows, false);
-         _commit = new DialogSkirtItem("OK", new DelegateCommand(commit, () => can_user_edit)) { is_default = true };
-         _cancel = new DialogSkirtItem("Cancel", new DelegateCommand(close)) { is_cancel = true };
-         // local methods
-         void commit() {
-            RequestCommit?.Invoke(new CustomOrderDefinitionImmutable(algo_definition.algo_root.created_assigned()));
-            close();
-         }
-         void close() => RequestClose?.Invoke(this, EventArgs.Empty);
-      }
-
-      public event EventHandler RequestClose;
-      public event Action<CustomOrderDefinitionImmutable> RequestCommit;
-
-      public AlgoDefinitionVM algo_definition { get; }
-      public IReadOnlyObservableCollection<AlgoParamRowVM> param_rows => _param_rows;
-      public IEnumerable<DialogSkirtItem> dialog_skirt {
-         get {
-            yield return _commit;
-            yield return _cancel;
-         }
-      }
-   }
-}

src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml

@@ -484,7 +484,6 @@
           <Border Padding="12,12,12,6">
             <Grid>
               <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
               </Grid.RowDefinitions>
@@ -496,45 +495,7 @@
                 AlgoParamRows="{Binding param_rows}"
                 IsReadOnly="{Binding DataContext.can_user_modify_selected_orders, ElementName=Root, Converter={StaticResource NotConverter}}"
               />
-              <c:ExpanderToggleButton
-                x:Name="algo_state_toggle"
-                Grid.Row="1"
-                BorderThickness="0"
-                Content="Algo State"
-                HorizontalContentAlignment="Left"
-                Margin="0,4,0,0"
-                VerticalAlignment="Top"
-                Visibility="{Binding current_algo_custom_state.Count, Converter={StaticResource IntNotZeroVisibilityConverter}}"
-              />
-              <c:DIYGrid Grid.Row="1" Rows="{Binding current_algo_custom_state}" Margin="0,28,0,4">
-                <c:DIYGrid.Visibility>
-                  <MultiBinding>
-                    <MultiBinding.Converter>
-                      <cv:MultiValueConverterPipe>
-                        <cv:BooleanAndConverter/>
-                        <cv:BooleanToVisibilityConverter/>
-                      </cv:MultiValueConverterPipe>
-                    </MultiBinding.Converter>
-                    <Binding Path="current_algo_custom_state.Count" Mode="OneWay" Converter="{StaticResource IntNotZeroConverter}"/>
-                    <Binding Path="IsChecked" ElementName="algo_state_toggle"/>
-                  </MultiBinding>
-                </c:DIYGrid.Visibility>
-                <c:DIYGrid.Columns>
-                  <c:DIYGridColumnCollection>
-                    <c:DIYGridColumn id="Name" Header="Param" Width="176"/>
-                    <c:DIYGridColumn id="Value" Header="Value" Width="176"/>
-                  </c:DIYGridColumnCollection>
-                </c:DIYGrid.Columns>
-                <c:DIYGrid.RowTemplate>
-                  <DataTemplate>
-                    <Grid c:DIYGrid.SyncWithColumnGeometry="True">
-                      <c:TextCell c:DIYGrid.ColumnKey="Name" Text="{Binding name}"/>
-                      <c:TextCell c:DIYGrid.ColumnKey="Value" Text="{Binding value}"/>
-                    </Grid>
-                  </DataTemplate>
-                </c:DIYGrid.RowTemplate>
-              </c:DIYGrid>
-              <StackPanel Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,8,0,0" Orientation="Horizontal">
+              <StackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,8,0,0" Orientation="Horizontal">
                 <Button x:Name="modify_orders_button" Command="{Binding modify_selected_orders_cmd}">
                   <Button.Margin>
                     <Thickness Right="{StaticResource DialogSkirtButtonPadding.Right}"/>

src/client/spark/Notifications/INotifier.cs

@@ -2,7 +2,6 @@
 using bts.api;
 using bts.shell;
 using bts.spark;
-using bts.utils;
 using mbts.config;
 using mbts.persist;
 using mbts.spark;
@@ -115,7 +114,6 @@ namespace mbts.ui {
             void dispose_core() {
                Disposable.dispose(ref _settings_sub);
                Disposable.dispose(ref _toast_controller);
-               Disposable.dispose(ref _sound_player);
                if (_dispatcher != null && !_dispatcher.HasShutdownStarted) {
                   _dispatcher.BeginInvokeShutdown(DispatcherPriority.Background);
                }
@@ -160,25 +158,15 @@ namespace mbts.ui {
             }
          }
 
-         class SoundNotificationPlayer : IDisposable {
-            IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _players;
+         class SoundNotificationPlayer {
+            readonly IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _players;
+
+            public static SoundNotificationPlayer create() => new SoundNotificationPlayer(_all_players());
 
             SoundNotificationPlayer(IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> players) =>
                _players = players;
 
-            public static SoundNotificationPlayer create() =>
-               new SoundNotificationPlayer(_all_players());
-
-            public void Dispose() {
-               if (_players != null) {
-                  _players.Values.DisposeAll();
-                  _players = null;
-               }
-            }
-
             public void play_sounds(IEnumerable<SoundNotification> sounds) {
-               if (_players == null)
-                  return;
                foreach (var s in sounds) {
                   switch (s.sound_type_case) {
                      case SoundNotification.SoundTypeOneofCase.System: _players.GetValueOrDefault(s.system_sound.Value)?.play(); break;
@@ -189,8 +177,7 @@ namespace mbts.ui {
             }
 
             static IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _all_players() =>
-               EnumHelper.get_values<SoundNotification.SystemSound>()
-               .ToReadOnlyDictionaryWhere<SoundNotification.SystemSound, NAudioPlayer>(NAudioPlayer.try_create);
+               EnumHelper.get_values<SoundNotification.SystemSound>().ToReadOnlyDictionary(s => s, NAudioPlayer.create);
          }
 
          // This class adopts to role of view-controller in the mvc paradigm, rather than view-model in mvvm.

src/client/spark/Notifications/NAudioPlayer.cs

@@ -1,5 +1,4 @@
-using bts;
-using bts.shell;
+using bts.shell;
 using mbts.ui.utility;
 using NAudio.Wave;
 using System;
@@ -7,71 +6,29 @@ using System.IO;
 using System.Threading.Tasks;
 
 namespace mbts.ui {
-   class NAudioPlayer : IDisposable {
+   class NAudioPlayer {
       // number of milliseconds to delay playing sound,
       // during which time all subsequent requests to play the same sound will be ignored.
       const int _delay_ms = 75;
       readonly int _start_position;
-      IDisposable _stream_in;
       WaveOutEvent _wave_out = new WaveOutEvent();
       WaveFileReader _wave_reader;
       bool _is_playing, _is_play_requested;
 
-      /// <paramref name="stream_in"/> should not be disposed by the caller,
-      /// as NAudioPlayer handles that in its own Dispose method;
-      /// this constructor is private is to prevent such misuse.
-      NAudioPlayer(Stream stream_in, int start_position = 0) {
-         _stream_in = stream_in;
-         _wave_reader = new WaveFileReader(stream_in);
+      public NAudioPlayer(Stream uwave_stream, int start_position = 0) {
+         var ms = new MemoryStream();
+         uwave_stream.CopyTo(ms);
+         ms.Position = 0;
+         _wave_reader = new WaveFileReader(ms);
          _wave_reader.Position = _start_position = (start_position < _wave_reader.Length ? start_position : 0);
          _wave_out.Init(_wave_reader);
          _wave_out.PlaybackStopped += _on_playback_stopped;
       }
 
-      /// <see cref="_playback_stopped"/> is a proxy/buffer for the _wave_out.PlaybackStopped event.
-      /// It serves a couple purposes:
-      ///   1) The main callback (<see cref="_on_playback_stopped(object, StoppedEventArgs)"/>)
-      ///      is guarenteed to be executed first (though it would be anyways, since that
-      ///      callback is hooked up in the constructor, the proxy event makes it obvious).
-      ///   2) <see cref="_playback_stopped"/> is only raised after playback is truly complete,
-      ///      meaning there are no pending requests to repeat the sound.
-      event Action _playback_stopped;
-
-      public static bool try_create(SoundNotification.SystemSound system_sound, out NAudioPlayer result) {
-         if (_try_get_stream(system_sound, out var stream)) {
-            var sb = EnumHelper.get_attribute<SoundNotification.SystemSound, SilenceBufferAttribute>(system_sound);
-            result = sb != null ? new NAudioPlayer(stream, sb.start_position) : new NAudioPlayer(stream);
-            return true;
-         }
-         result = null;
-         return false;
-      }
-
-      public static void play(SoundNotification.SystemSound system_sound) {
-         if (try_create(system_sound, out var player)) {
-            try {
-               var temp = player;
-               temp._playback_stopped += temp.Dispose;
-               player.play();
-               player = null;
-            } catch (Exception ex) {
-               Log.Ui.warn($"Encountered exception playing the system sound '{system_sound}': {ex}.");
-            } finally {
-               player?.Dispose();
-            }
-         } else {
-            Log.Ui.warn($"Unable to play the system sound '{system_sound}': unexpected sound type (did not find an audio stream that corresponds to this enum value).");
-         }
-      }
-
-      public void Dispose() {
-         if (_wave_out != null) {
-            _wave_out.PlaybackStopped -= _on_playback_stopped;
-            _wave_out.Dispose();
-            _wave_out = null;
-         }
-         Disposable.dispose(ref _wave_reader);
-         Disposable.dispose(ref _stream_in);
+      public static NAudioPlayer create(SoundNotification.SystemSound system_sound) {
+         var stream = _get_stream(system_sound);
+         var sb = EnumHelper.get_attribute<SoundNotification.SystemSound, SilenceBufferAttribute>(system_sound);
+         return sb != null ? new NAudioPlayer(stream, sb.start_position) : new NAudioPlayer(stream);
       }
 
       public void play() {
@@ -89,8 +46,6 @@ namespace mbts.ui {
          if (_is_play_requested) {
             _is_play_requested = false;
             _play_core();
-         } else {
-            _playback_stopped?.Invoke();
          }
       }
 
@@ -101,26 +56,18 @@ namespace mbts.ui {
          _is_playing = false;
       }
 
-      static bool _try_get_stream(SoundNotification.SystemSound system_sound, out Stream stream) {
-         UnmanagedMemoryStream um_stream;
+      static Stream _get_stream(SoundNotification.SystemSound system_sound) {
          switch (system_sound) {
-            case SoundNotification.SystemSound.GameCorrect: um_stream = bts.Properties.Resources.game_sound_correct; break;
-            case SoundNotification.SystemSound.GameIncorrect: um_stream = bts.Properties.Resources.game_sound_wrong; break;
-            case SoundNotification.SystemSound.GameOverArcade: um_stream = bts.Properties.Resources.game_over_arcade; break;
-            case SoundNotification.SystemSound.Whistle: um_stream = bts.Properties.Resources.whistle; break;
-            case SoundNotification.SystemSound.BellCounter: um_stream = bts.Properties.Resources.bell_counter; break;
-            case SoundNotification.SystemSound.Powerup: um_stream = bts.Properties.Resources.powerup; break;
-            case SoundNotification.SystemSound.CashRegister: um_stream = bts.Properties.Resources.cash_register_purchase; break;
-            case SoundNotification.SystemSound.Reload: um_stream = bts.Properties.Resources.reload_1911; break;
-            default:
-               stream = null;
-               return false;
+            case SoundNotification.SystemSound.GameCorrect: return bts.Properties.Resources.game_sound_correct;
+            case SoundNotification.SystemSound.GameIncorrect: return bts.Properties.Resources.game_sound_wrong;
+            case SoundNotification.SystemSound.GameOverArcade: return bts.Properties.Resources.game_over_arcade;
+            case SoundNotification.SystemSound.Whistle: return bts.Properties.Resources.whistle;
+            case SoundNotification.SystemSound.BellCounter: return bts.Properties.Resources.bell_counter;
+            case SoundNotification.SystemSound.Powerup: return bts.Properties.Resources.powerup;
+            case SoundNotification.SystemSound.CashRegister: return bts.Properties.Resources.cash_register_purchase;
+            case SoundNotification.SystemSound.Reload: return bts.Properties.Resources.reload_1911;
+            default: throw new NotImplementedException($"Unknown {nameof(SoundNotification.SystemSound)}: {system_sound}.");
          }
-         stream = new MemoryStream();
-         um_stream.CopyTo(stream);
-         um_stream.Dispose();
-         stream.Position = 0;
-         return true;
       }
    }
-}
+}

src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs

@@ -23,32 +23,6 @@ namespace mbts.spark {
 
       public IEnumerable<string> dynamic_types => _dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType);
 
-      public static string fmt_param(DynamicOrderParam dyn_param) {
-         if (dyn_param == null)
-            return null;
-         switch (dyn_param.ValueCase) {
-            case DynamicOrderParam.ValueOneofCase.AsArray:
-               return string.Join(", ", dyn_param.AsArray.Element.Select(fmt_param));
-            case DynamicOrderParam.ValueOneofCase.AsBool:
-               return dyn_param.AsBool.ToString();
-            case DynamicOrderParam.ValueOneofCase.AsDouble:
-               return dyn_param.AsDouble.ToString();
-            case DynamicOrderParam.ValueOneofCase.AsEnumerated:
-               return dyn_param.AsEnumerated.EnumValue;
-            case DynamicOrderParam.ValueOneofCase.AsInt32:
-               return dyn_param.AsInt32.ToString();
-            case DynamicOrderParam.ValueOneofCase.AsQuantity:
-               return dyn_param.AsQuantity.ToString();
-            case DynamicOrderParam.ValueOneofCase.AsString:
-               return dyn_param.AsString;
-            default:
-               // implement additional cases as needed
-               // (as of 4/17/20, this method is only used to format
-               // dynamic orders' CustomState params in the orderbook)
-               return $"({dyn_param.ValueCase})";
-         }
-      }
-
       public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs, Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory) {
          foreach (var d in _dynamic_types.DynamicOrderDesc) {
             var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);

src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs

@@ -33,7 +33,7 @@ namespace mbts.spark
          {
             return;
          } 
-         var ev = fd.EnumType.Values.FirstOrDefault(x => x.Name == value)?.Number;
+         var ev = fd.EnumType.Values.First(x => x.Name == value)?.Number;
          if(ev.HasValue)
             fd.Accessor.SetValue(message, ev.Value);
       }

src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs

@@ -2,6 +2,7 @@
 using bts.api;
 using bts.api.orderman;
 using bts.collections;
+using bts.spark;
 using Google.Protobuf;
 using Google.Protobuf.Reflection;
 using mbts.collections;
@@ -14,19 +15,21 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Reflection;
 using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
 
 namespace mbts.spark {
-   static partial class OrderTypeVMFactory {
-      internal class GenericOrderFactory {
-         static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) {
+   static partial class OrderTypeVMFactory 
+   {
+      internal class GenericOrderFactory
+      {
+         static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
+         {
             var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(),
-               BindingFlags.Instance | BindingFlags.Public);
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
             var rt = prop.PropertyType;
 
             var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(),
-               BindingFlags.Instance | BindingFlags.Public);
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
             var rti = propi.PropertyType;
 
             var vmt = typeof(GenericOrderVM<,>);
@@ -35,33 +38,38 @@ namespace mbts.spark {
             object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions);
             return (IAlgoVM)vm;
          }
-         static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) {
+         static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type)
+         {
             var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(),
-               BindingFlags.Instance | BindingFlags.Public);
+               System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
             var rt = prop.PropertyType;
             var rtt = Activator.CreateInstance(rt);
-
+            
             var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition));
-            foreach (var cid in ci)
+            foreach(var cid in ci)
                cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() });
             prop.SetValue(custom, rtt);
          }
-      }
-
+      }      
+      
       class GenericOrderVM<TMutable, TImmutable> : OrderTypeVMBase<TMutable, TImmutable>
-         where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage {
+         where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage
+      {         
          readonly ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string> _parameters =
             new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
          readonly AlgoType _algo_type;
 
          public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
-            : base(key, display_name, editing_permissions) {
+            : base(key, display_name, editing_permissions) 
+         {
             _algo_type = algo_type;
             _parameters = new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
             _resources.AddRange(
-               ObservableAutoWrapper.connect_item_hooks(_parameters, p => {
+               ObservableAutoWrapper.connect_item_hooks(_parameters, p =>
+               {
                   p.PropertyChanged += on_param_prop_changed;
-                  return Disposable.Create(() => {
+                  return Disposable.Create(() => 
+                  {
                      p.PropertyChanged -= on_param_prop_changed;
                      remove_property(p.descriptor.Name);
                      p.Dispose();
@@ -72,74 +80,84 @@ namespace mbts.spark {
          }
 
          public string algo_type => _algo_type.ToString();
-         public override string abbreviation =>
+         public override string abbreviation => 
             model == null ? display_name : model.factory.abbreviate_algo(new OneOf<CustomOrderDefinition.CustomOneofCase, string>(_algo_type));
          public override AlgoDisplayGroup group => AlgoDisplayGroup.API;
          public ObservableCollection<GenericOrderParamVM<TMutable>> parameters => _parameters;
 
-         protected override void on_model_internal() =>
+         protected override void on_model_internal() 
+         {
             _sync_generic_params();
+         }
 
-         void _sync_generic_params() {
-            if (model != null) {
-               MessageDescriptor desc = new TMutable().Descriptor;
+         void _sync_generic_params()
+         {
+            if (model != null)
+            {               
+               Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor;               
                _parameters.SyncWithDictionary(
                   desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm);
             }
          }
-
-         static bool _is_value_param_desc(FieldDescriptor desc) =>
-            (desc.FieldType != FieldType.Message ||
+         static bool _is_value_param_desc(FieldDescriptor desc)
+         {
+            return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message || 
                _is_quantity_measure_desc(desc));
-
-         static bool _is_quantity_measure_desc(FieldDescriptor desc) =>
-            desc.FieldType == FieldType.Message &&
-               desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName;
-
-         protected override IEnumerable<ChildAlgoData> get_selector_data() =>
-            OrderDataHelper.get_child_algo_data(_algo_type);
-
-         GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor) {
-            ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));
-            if (descriptor.FieldType == FieldType.Message &&
-                descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) {
-               var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
-               return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
-            } else if (descriptor.FieldType == FieldType.Enum) {
-               return EnumParamFactory.create(this, descriptor);
-            } else if (descriptor.FieldType == FieldType.Bool) {
-               return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
-            } else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float) {
-               return mk<double, double>(descriptor, v => v, v => v, double.NaN);
-            } else if (descriptor.FieldType == FieldType.Int32) {
-               return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
-            } else if (descriptor.FieldType == FieldType.UInt32) {
-               return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
-            } else if (descriptor.FieldType == FieldType.String) {
-               return mk<string, string>(descriptor, v => v, v => v);
-            } else return null;
          }
 
-         GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(
-            FieldDescriptor fdesc,
-            Func<TModel, TView> convert,
-            Func<TView, TModel> convert_back,
-            TView default_value = default) {
-            //
+         static bool _is_quantity_measure_desc(FieldDescriptor desc)
+         {
+            return desc.FieldType == Google.Protobuf.Reflection.FieldType.Message &&
+               desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName;
+         }
+
+         protected override IEnumerable<ChildAlgoData> get_selector_data() 
+         {
+            var v = OrderDataHelper.get_child_algo_data(_algo_type);
+            return v;
+         }
+
+         GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor) 
+         {
+            ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));
+
+            if (descriptor.FieldType == FieldType.Message && 
+                descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName)
+            {
+               var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
+               return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
+            }
+            else if(descriptor.FieldType == FieldType.Enum)
+            {
+               var pvm = new GenericOrderEnumeratedVM<TMutable>(descriptor);
+               attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value);
+               return pvm;
+            }
+            else if (descriptor.FieldType == FieldType.Bool)
+               return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float)
+               return mk<double, double>(descriptor, v => v, v => v, double.NaN);
+            else if (descriptor.FieldType == FieldType.Int32)
+               return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.UInt32)
+               return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
+            else if (descriptor.FieldType == FieldType.String)
+               return mk<string, string>(descriptor, v => v, v => v);
+            else
+               return null;
+         }
+         GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(FieldDescriptor fdesc, Func<TModel, TView> convert, Func<TView, TModel> convert_back, TView default_value = default)
+         {
             var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back);
-            return attached(pvm, get_from_param, assign_to_param, default_value);
+            return attached<TView, GenericOrderParamVM<TMutable, TView, TModel>>(pvm, get_from_param, assign_to_param, default_value);
+
             TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert<TModel>(fdesc.Accessor.GetValue(param)));
             void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
          }
 
-         TParam attached<T, TParam>(
-            TParam pvm,
-            Func<IMessage, FieldDescriptor, T>
-            selector, Action<IMessage, FieldDescriptor, T> assign_to_param,
-            T default_value = default)
-            where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T> {
-            //
-            add_property(
+         TParam attached<T, TParam>(TParam pvm, Func<IMessage, FieldDescriptor, T> selector, Action<IMessage, FieldDescriptor, T> assign_to_param, T default_value = default) where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T>
+         {
+            add_property<T>(
                pvm.descriptor.Name,
                mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value,
                (mdef, v) => assign_to_param(mdef, pvm.descriptor, v),
@@ -148,37 +166,7 @@ namespace mbts.spark {
                pvm.subscribe_value(),
                default_value);
             return pvm;
-         }
-
-         static class EnumParamFactory {
-            [ThreadStatic]
-            static Dictionary<Type, IFactory> _factories_backing;
-            static Dictionary<Type, IFactory> _factories =>
-               _factories_backing ?? (_factories_backing = new Dictionary<Type, IFactory>());
-
-            public static GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor) {
-               if (descriptor.FieldType != FieldType.Enum)
-                  throw ExceptionBuilder.Argument.unexpected_case(descriptor.FieldType, $"{nameof(descriptor)}.{nameof(FieldDescriptor.FieldType)}");
-               if (!_factories.TryGetValue(descriptor.EnumType.ClrType, out var f)) {
-                  // Impl<T> is a nested type, so parent class's generic type args must be included.
-                  _factories[descriptor.EnumType.ClrType] = f = (IFactory)Activator.CreateInstance(typeof(Impl<>)
-                     .MakeGenericType(typeof(TMutable), typeof(TImmutable), descriptor.EnumType.ClrType));
-               }
-               return f.create(owner, descriptor);
-            }
-
-            interface IFactory {
-               GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor);
-            }
-
-            class Impl<T> : IFactory where T : struct {
-               static readonly Func<T, T?> _convert = v => v;
-               static readonly Func<T?, T> _convert_back = v => v ?? default;
-
-               public GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor) =>
-                  owner.mk(descriptor, _convert, _convert_back, default);
-            }
-         }
+         }         
       }
    }
-}
+}

src/client/spark/Orders/OrderUtils.cs

@@ -63,11 +63,6 @@ namespace mbts.spark {
       public static string last_msg(this OrderRecordImmutable order) =>
          order.HasState ? order.State.LastMsg : string.Empty;
 
-      public static IReadOnlyDictionary<string, DynamicOrderParam> dynamic_custom_state(this OrderRecordImmutable order) =>
-         order.HasState && order.State.HasDynamic ?
-            (order.State.Dynamic.CustomState ?? DictionaryHelper.empty<string, DynamicOrderParam>()) :
-            DictionaryHelper.empty<string, DynamicOrderParam>();
-
       public static DateTime created(this OrderRecordImmutable order) =>
          order.HasState && order.State.HasCreated ? order.State.Created.ToDateTime().ToLocalTime() : DateTime.MinValue;
 

src/client/spark/Orders/OrdersModel.cs

@@ -215,11 +215,8 @@ namespace mbts.spark {
             FillTuple.key_fn);
          on_fill_tuples_with_root = fill_order_tuples_with_root_join.Cache();
          // manual fills
-         on_manual_fills_securities = admin_model
-            .permission_filter(
-               _position_service.subscribei_manual_fills()
-               .Naggle(interval, scheduler),
-               f => f.AccountId)
+         on_manual_fills_securities = _position_service.subscribei_manual_fills()
+            .Naggle(interval, scheduler)
             .Filter(f => f.FillType == ManualFill.Types.FillType.Local)
             .join(sstore, mf => mf.SecurityKey)
             .Table().Cache();

src/client/spark/Spark.csproj

@@ -12,7 +12,6 @@
     <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
-    <LanguageTargets Condition="'$(VisualStudioVersion)'=='16.0'">$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
     <StartupObject>mbts.ui.shell.App</StartupObject>

src/client/spark/core/GlobalExtensions/DoubleHelper.cs

@@ -63,20 +63,5 @@ namespace mbts {
 
       public static double? nan_nullable(double value) =>
          double.IsNaN(value) ? (double?)null : value;
-
-      public static int? to_optional_int32(double value) {
-         if (double.IsNaN(value) || double.IsInfinity(value))
-            return null;
-         if (value > 0) {
-            value = Math.Floor(value);
-            if (value <= int.MaxValue)
-               return (int)value;
-         } else if (value < 0) {
-            value = Math.Ceiling(value);
-            if (value >= int.MinValue)
-               return (int)value;
-         }
-         return null;
-      }
    }
 }

src/client/spark/core/Utility/Delegates.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Globalization;
 
-namespace bts.utils {
-   public delegate bool TryGetValue<T>(out T value);
-   public delegate bool TryGetValue<TKey, TValue>(TKey key, out TValue value);
+namespace mbts.utils {
+   delegate bool TryGetValue<T>(out T value);
+   delegate bool TryGetValue<TKey, TValue>(TKey key, out TValue value);
 
-   public static class LogicalDelegates {
+   static class LogicalDelegates {
       public static readonly Func<bool, bool, bool>
          And = (a, b) => a && b,
          Or = (a, b) => a || b,
@@ -13,7 +13,7 @@ namespace bts.utils {
          None = (a, b) => !a && !b;
    }
 
-   public static class FormattingDelegates {
+   static class FormattingDelegates {
       public static class Price {
          public static readonly Func<double, string> Value =
             p => double.IsNaN(p) ? "" : p.ToString("#,0.00");
@@ -26,4 +26,4 @@ namespace bts.utils {
             p => p.ToString("#,0.00", CultureInfo.CurrentCulture);
       }
    }
-}
+}

src/client/spark/view/Controls/DIYGrid/Columns/DIYGridColumn.cs

@@ -1,9 +0,0 @@
-namespace mbts.ui.controls {
-   class DIYGridColumn : DIYGrid.ColumnBase<string> {
-      public DIYGridColumn()
-         : base() {
-         is_visible = true;
-         Width = 60;
-      }
-   }
-}

src/client/spark/view/Controls/DIYGrid/Settings/Animation/SoundAnimationView.xaml.cs

@@ -38,7 +38,11 @@ namespace mbts.ui.controls {
       }
 
       public static ICommand PreviewSoundCommand =>
-         new DelegateCommand<SoundNotification.SystemSound>(NAudioPlayer.play);
+         new DelegateCommand<SoundNotification.SystemSound>(s =>  {
+            try {
+               NAudioPlayer.create(s).play();
+            } catch (NAudio.MmException) { }
+         });
 
       #region SoundTypes
       public static readonly DependencyProperty SoundTypesProperty =

src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml

@@ -1005,8 +1005,6 @@
             ContractPickerModel="{Binding contract_picker_model}"
             HedgePricing="{Binding hedge_pricing}"
             HedgePricingItemsSource="{Binding hedge_pricing_options}"
-            UseFractionalTicks="{Binding use_fractional_ticks}"
-            IntegerTickSize="{Binding integer_tick_size}"
           />
           <c:DialogSkirt Grid.Row="1" Margin="-4" VerticalAlignment="Top" RightItems="{Binding skirt_items}"/>
         </Grid>

src/client/spark/view/Converters/BooleanToVisibilityConverter.cs

@@ -12,9 +12,6 @@ namespace mbts.ui.converters
       public Visibility VisibilityForFalse { get { return _visfalse; } set { _visfalse = value; } }
 
       public static BooleanToVisibilityConverter Instance => new BooleanToVisibilityConverter();
-      public static BooleanToVisibilityConverter HiddenInstance => new BooleanToVisibilityConverter {
-         VisibilityForFalse = Visibility.Hidden
-      };
 
       public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
          bool flag = false;

src/client/spark/view/Extensions/Command/FileDialogCommand.cs

@@ -64,6 +64,25 @@ namespace mbts.ui {
             }
          }, can_execute == null ? null : new Func<object, bool>(_ => can_execute()));
 
+      public static IDialogCommand export_csv(
+         Func<string> get_file_content,
+         string source_window_name) =>
+         new AnonymousFileDialogCommand<object>(_ =>
+            _create_save_file_dialog(
+               Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+               $"BTS_Spark_{source_window_name}_{DateTime.Now.ToString("yyyyMMdd_HHmm")}.csv",
+               new[] { ("CSV (comma delimited)", new string[] { "csv" }) }
+            ),
+            (_, file) => {
+               try {
+                  File.WriteAllText(file, get_file_content.Invoke());
+               } catch (Exception ex) {
+                  BTSMessageBox.Show($"Error exporting data to csv: {ex}.", "CSV Export Error", BTSMessageBoxButtons.OK, System.Windows.MessageBoxImage.Error, true, false, true);
+               }
+            },
+            // we are always able to perform an export, even when no rows (it will just be a header)
+            (_) => true);
+
       static TDialog _create_file_dialog<TDialog>(string initial_dir = null, IReadOnlyList<(string name, string[] extensions)> filter_items = null) where TDialog : FileDialog, new() {
          var rv = new TDialog();
          if (!string.IsNullOrEmpty(initial_dir))

src/client/spark/view/Spark/Core/TickUtils.cs

@@ -49,28 +49,6 @@ namespace mbts.spark {
       public static double parse(this ContractSpecificationImmutable? spec, string text, double display_multiplier, string nan_text) =>
          spec.spec_or_default().parse(text, display_multiplier, nan_text);
 
-      public static bool is_integer_tick(ContractSpecificationImmutable spec) =>
-         spec.MainFraction == 0 &&
-         spec.PriceDisplayFormat == 0 &&
-         spec.LowTick > 0 &&
-         MathUtils.is_int(spec.LowTick) &&
-         spec.HighTick > 0 &&
-         MathUtils.is_int(spec.HighTick);
-
-      public static ContractSpecification create_integer_tick_spec(int low_tick) =>
-         create_integer_tick_spec(low_tick, low_tick);
-
-      public static ContractSpecification create_integer_tick_spec(int low_tick, int high_tick) {
-         var rv = SecurityDataHelper.Defaults.ContractSpecification;
-         rv.MainFraction = 0;
-         rv.SubFraction = 0;
-         rv.PriceDisplayFormat = 0;
-         rv.PriceBreak = 0;
-         rv.LowTick = low_tick;
-         rv.HighTick = high_tick;
-         return rv;
-      }
-
       public static double low_tick(NativePriceSize[] bids, NativePriceSize[] asks) {
          double low = bids[bids.Length - 1].price;
          if (double.IsNaN(low))
@@ -348,7 +326,7 @@ namespace mbts.spark {
          }
 
          static bool _check_tick_size(double tick_size) =>
-            tick_size > 0 && (tick_size <= 0.5 || MathUtils.is_int(tick_size));
+            (tick_size > 0 && tick_size <= 0.5) || tick_size == 1;
 
          struct SpecKey : IEquatable<SpecKey> {
             public readonly uint denominator, display_digits;

src/client/spark/view/Utility/CommandHelper.cs

@@ -1,7 +1,5 @@
 using mbts.ui.converters;
-using System;
 using System.Globalization;
-using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
@@ -14,31 +12,6 @@ namespace mbts.ui.utilities {
       public static string fmt(string title, KeyGesture key_gesture) =>
          key_gesture == null ? title : $"{title} ({key_gesture.GetDisplayStringForCulture(CultureInfo.CurrentCulture)})";
 
-      public static IDisposable bind_param_source<T>(ICommand command, IObservable<T> param_source, out ICommand bound_cmd, bool dispose_command_on_dispose = false) {
-         bool initialized = false;
-         bool can_execute = false;
-         T param = default;
-         var bcmd = new DelegateCommand(() => command.Execute(param), () => can_execute);
-         bound_cmd = bcmd;
-         var sub = param_source.Subscribe(p => {
-            param = p;
-            if (!initialized) {
-               initialized = true;
-               can_execute = command.CanExecute(p);
-               bcmd.RaiseCanExecuteChanged();
-            } else if (can_execute != command.CanExecute(p)) {
-               can_execute = !can_execute;
-               bcmd.RaiseCanExecuteChanged();
-            }
-         });
-         return dispose_command_on_dispose ?
-            Disposable.Create(() => {
-               Disposable.dispose(ref sub);
-               (command as IDisposable)?.Dispose();
-               command = null;
-            }) : sub;
-      }
-
       #region Paraphrased from https://referencesource.microsoft.com/#PresentationFramework/src/Framework/MS/Internal/Commands/CommandHelpers.cs
 
       public static bool CanExecuteCommandSource(ICommandSource commandSource) {

src/client/spark/view/Utility/EnabledValueVM.cs

@@ -30,21 +30,6 @@ namespace mbts.ui {
       public string name { get; }
    }
 
-   class NamedValueVM : ViewModelBase {
-      string _name;
-      object _value;
-
-      public NamedValueVM() { }
-
-      public NamedValueVM(string name, object value) {
-         _name = name;
-         _value = value;
-      }
-
-      public string name { get => _name; set => Set(ref _name, value); }
-      public object value { get => _value; set => Set(ref _value, value); }
-   }
-
    static class EnabledValueVMExtensions {
       public static T? get_nullable<T>(this EnabledValueVM<T> vm) where T : struct =>
          vm.enabled ? vm.value : (T?)null;

src/client/spark_api/security/SecurityHelper.cs

@@ -83,24 +83,22 @@ namespace bts.api {
          }
 
          public static int Compare(SecurityImmutable x, SecurityImmutable y) {
-            if (x.ContractCase == ContractOneofCase.Future) {
-               return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1;
-            } else if (y.ContractCase == ContractOneofCase.Future) {
-               return 1;
-            }
+            if (x.ContractCase == ContractOneofCase.Future) return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1;
+            else if (y.ContractCase == ContractOneofCase.Future) return 1;
             var xlegs = get_flat_future_legs(x).ToList();
             var ylegs = get_flat_future_legs(y).ToList();
             int max = Math.Min(xlegs.Count, ylegs.Count);
             for (int i = 0; i < max; i++) {
                int rv = Compare(xlegs[i].symbol, xlegs[i].future, ylegs[i].symbol, ylegs[i].future);
-               if (rv != 0)
-                  return rv;
-               rv = xlegs[i].quantity.CompareTo(ylegs[i].quantity);
-               if (rv != 0)
-                  return rv;
-               rv = xlegs[i].exchange.CompareTo(ylegs[i].exchange);
-               if (rv != 0)
-                  return rv;
+               if (rv != 0) return rv;
+            }
+            for (int i = 0; i < max; i++) {
+               int rv = xlegs[i].quantity.CompareTo(ylegs[i].quantity);
+               if (rv != 0) return rv;
+            }
+            for (int i = 0; i < max; i++) {
+               int rv = xlegs[i].exchange.CompareTo(ylegs[i].exchange);
+               if (rv != 0) return rv;
             }
             return xlegs.Count.CompareTo(ylegs.Count);
          }

src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs

@@ -390,15 +390,6 @@ namespace System.Collections.Generic {
       public static ReadOnlyDictionary<TKey, TElement> ToReadOnlyDictionary<T, TKey, TElement>(this IEnumerable<T> enumerable, Func<T, TKey> key_selector, Func<T, TElement> element_selector, IEqualityComparer<TKey> comparer) =>
          new ReadOnlyDictionary<TKey, TElement>(enumerable.ToDictionary(key_selector, element_selector, comparer));
 
-      public static ReadOnlyDictionary<TKey, TElement> ToReadOnlyDictionaryWhere<TKey, TElement>(this IEnumerable<TKey> keys, TryGetValue<TKey, TElement> value_selector) {
-         var mdict = new Dictionary<TKey, TElement>();
-         foreach (var k in keys) {
-            if (value_selector(k, out var val))
-               mdict[k] = val;
-         }
-         return new ReadOnlyDictionary<TKey, TElement>(mdict);
-      }
-
       public static ILookup<TKey, TElement> ToFlatLookup<T, TKey, TElement>(this IEnumerable<T> source, Func<T, TKey> key_selector, Func<T, IEnumerable<TElement>> selector) =>
          source.SelectMany(v => {
             var k = key_selector(v);

src/client/spark_core/Collections/Extensions/ListExtensions.cs

@@ -103,15 +103,6 @@ namespace bts.collections {
          return array;
       }
 
-      public static bool SafeTryGetAt<T>(this IList<T> list, int index, out T value) {
-         if (list != null && index >= 0 && index < list.Count) {
-            value = list[index];
-            return true;
-         }
-         value = default;
-         return false;
-      }
-
       public static bool TryGetAt<T>(this IList<T> list, int index, out T value) {
          if (index >= 0 && index < list.Count) {
             value = list[index];

src/client/spark_core/utils/CsvHelper.cs

@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reflection;
+
+namespace bts.utils.csv {
+   public static class CsvHelper {
+
+      public static string ToCsv<T>(this IEnumerable<T> items, OrderedDictionary properties = null) where T : class {
+         var output = "";
+         var delimiter = ",";
+         if (properties == null) {
+            properties = new OrderedDictionary();
+            foreach (var pi in typeof(T).GetProperties()) {
+               properties.Add(pi.Name, pi);
+            }
+         }
+
+         using (var sw = new StringWriter()) {
+            var dict_values = properties.Values.OfType<PropertyInfo>();
+            var header = dict_values.Select(n => n.Name).Aggregate((first, second) => first + delimiter + second);
+            sw.WriteLine(header);
+            foreach (var i in items) {
+               var row = dict_values.Select(x => x.GetValue(i, null))
+                  .Select(x => x == null ? "null" : x.ToString())
+                  .Aggregate((first, second) => first + delimiter + second);
+               sw.WriteLine(row);
+            }
+            output = sw.ToString();
+         }
+         return output;
+      }
+
+      public static OrderedDictionary create_ordering_maintainer(Type t, string[] property_names_in_order) {
+         OrderedDictionary od = new OrderedDictionary();
+         var props = t.GetProperties();
+         foreach (var n in property_names_in_order) {
+            var query = props.Where(pi => pi.Name == n);
+            if (query.Any()) {
+               var property_info = query.First();
+               if (!od.Contains(property_info)) {
+                  od.Add(n, property_info);
+               }
+            }
+         }
+         return od;
+      }
+
+   }
+}

src/client/spark_core/utils/FilePathHelper.cs

@@ -1,21 +0,0 @@
-using System;
-using System.IO;
-
-namespace bts.utils {
-   public static class FilePathHelper {
-      public static string GetUniquePathWithDate(string path_root, string ext) =>
-         GetUniquePath($"{path_root}_{DateTime.Now:MM - dd - yyyy_hh - mm}", ext);
-
-      public static string GetUniquePath(string path_root, string ext) {
-         var path = $"{path_root}.{ext}";
-         const int max_copies = 2 ^ 14;
-         int i = 1;
-         while (File.Exists(path)) {
-            path = $"{path_root}({i++}).{ext}";
-            if (i == max_copies)
-               throw new InvalidOperationException("Unable to make path unique by concating a number.");
-         }
-         return path;
-      }
-   }
-}

src/client/spark_core/utils/ObservableExtensions.cs

@@ -209,7 +209,7 @@ namespace System.Reactive.Linq {
       /// <returns>An IDisposable object used to unsubscribe from the source sequence, and dispose the latest value subscription.</returns>
       public static IDisposable SubscribeEach<T>(this IObservable<T> source, Func<T, IDisposable> subscribe_value) {
          IDisposable value_sub = null;
-         IDisposable source_sub = source.Subscribe(on_source);
+         IDisposable source_sub = source.Select(v => v).Subscribe(on_source);
          return Disposable.Create(dispose);
          // local methods
          void on_source(T value) {

src/client/spark_core/utils/UpdateExtensions.cs

@@ -1,253 +1,208 @@
-using bts.api.core;
-using bts.collections;
-using bts.utils.proto;
-using Google.Protobuf;
-using mbts;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reactive.Linq;
-
-namespace bts.utils {
-   public static class UpdateExtensions {
-      public static TableUpdate<T, TKey> with_added<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> added) where TKey : IEquatable<TKey> =>
-         TableUpdate<T, TKey>.update(table, added, Enumerable.Empty<Change<T>>(), Enumerable.Empty<T>(), table.key_extractor);
-
-      public static TableUpdate<T, TKey> with_removed<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> removed) where TKey : IEquatable<TKey> =>
-         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), Enumerable.Empty<Change<T>>(), removed, table.key_extractor);
-
-      public static TableUpdate<T, TKey> with_changed<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> changed) where TKey : IEquatable<TKey> =>
-         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), changed.Select(v => new Change<T>(table.state[table.key_extractor(v)], v)), Enumerable.Empty<T>(), table.key_extractor);
-
-      public static TableUpdate<T, TKey> with_changes<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<Change<T>> changes) where TKey : IEquatable<TKey> =>
-         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), changes, Enumerable.Empty<T>(), table.key_extractor);
-
-      public static IObservable<TableUpdate<TResult, TKey>> RootDependent<T, TResult, TKey>(
-         this IObservable<TableUpdate<T, TKey>> source,
-         Func<T, TKey> key,
-         Func<T, TKey> parent_key,
-         Func<T, T, TResult> with_root,
-         Func<T, TResult> without_root,
-         Func<TResult, TKey> result_key)
-         where TKey : IEquatable<TKey> =>
-         RootDependent(source, key, parent_key, with_root, without_root, result_key, default);
-
-      // TODO: unit tests
-      public static IObservable<TableUpdate<TResult, TKey>> RootDependent<T, TKey, TResult>(
-         this IObservable<TableUpdate<T, TKey>> source,
-         Func<T, TKey> key,
-         Func<T, TKey> parent_key,
-         Func<T, T, TResult> get_result,
-         Func<T, TResult> get_result_no_parent,
-         Func<TResult, TKey> result_key,
-         TKey no_parent_key)
-         where TKey : IEquatable<TKey> =>
-         Observable.Create<TableUpdate<TResult, TKey>>(observer => {
-            var state = DictionaryHelper.empty<TKey, T>();
-            var output = TableUpdate<TResult, TKey>.mk_empty(result_key);
-            var parent_to_children = new SetMap<TKey, T>();
-            return source.Subscribe(update);
-            //
-            void update(TableUpdate<T, TKey> input) {
-               state = input.state;
-               var builder = output.to_builder();
-               // execute all parent_to_children changes first, so descendent-propagation will be efficient (otherwise propagation might be needlessly performed on values that are yet to be removed, or performed with the wrong root, if the real root is yet to be added).
-               foreach (var v in input.removed.Concat(input.changes.Select(ch => ch.Old))) {
-                  var k = input.key_extractor(v);
-                  parent_to_children.remove(parent_key(v), v);
-               }
-               foreach (var v in input.added.Concat(input.changed)) {
-                  var pk = parent_key(v);
-                  if (!pk.Equals(no_parent_key))
-                     parent_to_children.add(pk, v);
-               }
-               foreach (var v in input.removed) {
-                  var k = input.key_extractor(v);
-                  builder.remove(k);
-                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
-                     foreach (var child in children) {
-                        var ck = key(child);
-                        builder.add_or_update(ck, get_result_no_parent(child));
-                        foreach (var d in descendents(ck))
-                           builder.add_or_update(key(d), get_result(d, child));
-                     }
-                  }
-               }
-               foreach (var v in input.changed) {
-                  var k = input.key_extractor(v);
-                  var root = get_root(v);
-                  TResult result;
-                  if (key(root).Equals(k)) {
-                     result = get_result_no_parent(v);
-                     foreach (var d in descendents(k))
-                        builder.add_or_update(key(d), get_result(d, v));
-                  } else {
-                     result = get_result(v, root);
-                  }
-                  builder.add_or_update(k, result);
-               }
-               foreach (var v in input.added) {
-                  var k = input.key_extractor(v);
-                  var pk = parent_key(v);
-                  TResult result;
-                  if (pk.Equals(no_parent_key)) {
-                     result = get_result_no_parent(v);
-                     foreach (var d in descendents(k))
-                        builder.add_or_update(key(d), get_result(d, v));
-                  } else {
-                     parent_to_children.add(pk, v);
-                     var root = get_root(v);
-                     if (key(root).Equals(k)) {
-                        result = get_result_no_parent(v);
-                        foreach (var d in descendents(k))
-                           builder.add_or_update(key(d), get_result(d, v));
-                     } else {
-                        result = get_result(v, root);
-                     }
-                  }
-                  builder.add_or_update(k, result);
-               }
-               observer.OnNext(output = builder.to_table());
-            }
-            T get_root(T value) {
-               var pk = parent_key(value);
-               while (!pk.Equals(no_parent_key) && state.TryGetValue(pk, out var parent)) {
-                  value = parent;
-                  pk = parent_key(value);
-               }
-               return value;
-            }
-            IEnumerable<T> descendents(TKey k) {
-               if (parent_to_children.try_lookup(k, out ISet<T> children)) {
-                  foreach (var child in children) {
-                     yield return child;
-                     foreach (var d in descendents(key(child)))
-                        yield return d;
-                  }
-               }
-            }
-         });
-
-      public static IObservable<TableUpdate<T, TKey>> MergeTable<T, TKey>(this IObservable<TableUpdate<T, TKey>> source, IObservable<TableUpdate<T, TKey>> other) where TKey : IEquatable<TKey> =>
-         source.AggregateLatest(other, _Merge<T, TKey>.source_change_del, _Merge<T, TKey>.other_change_del, () => TableUpdate<T, TKey>.empty, TableUpdate<T, TKey>.empty, TableUpdate<T, TKey>.empty);
-
-      public static IObservable<TableUpdate<KeyValuePair<TKey, TResult>, TKey>> ParentDependent<T, TKey, TResult>(
-         this IObservable<TableUpdate<T, TKey>> source,
-         Func<T, TKey> key,
-         Func<T, TKey> parent_key,
-         Func<T, T, TResult> get_result,
-         Func<T, TResult> get_result_no_parent)
-         where TResult : IEquatable<TResult>
-         where TKey : IEquatable<TKey> =>
-         ParentDependent(source, key, parent_key, get_result, get_result_no_parent, EqualityComparer<TResult>.Default, default);
-
-      public static IObservable<TableUpdate<KeyValuePair<TKey, TResult>, TKey>> ParentDependent<T, TKey, TResult>(
-         this IObservable<TableUpdate<T, TKey>> source,
-         Func<T, TKey> key,
-         Func<T, TKey> parent_key,
-         Func<T, T, TResult> get_result,
-         Func<T, TResult> get_result_no_parent,
-         IEqualityComparer<TResult> result_comparer,
-         TKey no_parent_key)
-         where TKey : IEquatable<TKey> =>
-         Observable.Create<TableUpdate<KeyValuePair<TKey, TResult>, TKey>>(observer => {
-            var value_comparer = EqualityComparer.Create<KeyValuePair<TKey, TResult>, TResult>(kv => kv.Value, result_comparer);
-            var state = DictionaryHelper.empty<TKey, T>();
-            var output = TableUpdate<KeyValuePair<TKey, TResult>, TKey>.mk_empty(kv => kv.Key);
-            var parent_to_children = new SetMap<TKey, T>();
-            return source.Subscribe(update);
-            //
-            void update(TableUpdate<T, TKey> input) {
-               state = input.state;
-               var builder = output.to_builder();
-               foreach (var v in input.removed) {
-                  var k = input.key_extractor(v);
-                  builder.remove(k);
-                  parent_to_children.remove(parent_key(v), v);
-                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
-                     foreach (var child in children)
-                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result_no_parent(child)));
-                  }
-               }
-               foreach (var v in input.changed) {
-                  var k = key(v);
-                  builder.add_or_update(new KeyValuePair<TKey, TResult>(k, lookup_result(v)));
-                  parent_to_children.set(parent_key(v), v);
-                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
-                     foreach (var child in children)
-                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result(child, v)));
-                  }
-               }
-               foreach (var v in input.added) {
-                  var k = key(v);
-                  builder.add_or_update(new KeyValuePair<TKey, TResult>(k, lookup_result(v)));
-                  parent_to_children.add(parent_key(v), v);
-                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
-                     foreach (var child in children)
-                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result(child, v)));
-                  }
-               }
-               var result = builder.to_table_checked(value_comparer);
-               if (result.has_changes())
-                  observer.OnNext(output = result);
-            }
-            TResult lookup_result(T child) {
-               var pk = parent_key(child);
-               return !pk.Equals(no_parent_key) && state.TryGetValue(pk, out T parent) ?  get_result(child, parent) : get_result_no_parent(child);
-            }
-         });
-
-      static class _Merge<T, TKey> where TKey : IEquatable<TKey> {
-         public static readonly Func<TableUpdate<T, TKey>, Change<TableUpdate<T, TKey>>, TableUpdate<T, TKey>, TableUpdate<T, TKey>> source_change_del = _source_changed_impl;
-         public static readonly Func<TableUpdate<T, TKey>, TableUpdate<T, TKey>, Change<TableUpdate<T, TKey>>, TableUpdate<T, TKey>> other_change_del = _other_changed_impl;
-
-         static TableUpdate<T, TKey> _source_changed_impl(TableUpdate<T, TKey> target, Change<TableUpdate<T, TKey>> source_change, TableUpdate<T, TKey> other_table) =>
-            TableUpdate<T, TKey>.update(target, source_change.New.added, source_change.New.changes, source_change.New.removed, source_change.New.key_extractor);
-
-         static TableUpdate<T, TKey> _other_changed_impl(TableUpdate<T, TKey> target, TableUpdate<T, TKey> source_table, Change<TableUpdate<T, TKey>> other_change) =>
-            TableUpdate<T, TKey>.update(target, other_change.New.added, other_change.New.changes, other_change.New.removed, other_change.New.key_extractor);
-      }
-   }
-}
-namespace bts.utils.diagnostics {
-   public static class DiagnosticUpdateExtensions {
-      // Hard to imagine why this util would be needed outside of diagnosig bugs.
-      // The #if DEBUG directive is an extra precaution to avoid accidentally writing
-      // files like this on a client's machine.
-#if DEBUG
-      static readonly string _proto_capture_ext = "proto_capture";
-
-      public static IObservable<TableUpdate<T, TKey>> ProtoBufCapture<T, TKey, TProto>(this IObservable<TableUpdate<T, TKey>> source, Func<T, TProto> to_message)
-         where TKey : IEquatable<TKey>
-         where TProto : class, IMessage<TProto> =>
-         ProtoBufCapture(source,
-            FilePathHelper.GetUniquePathWithDate(Path.Combine(Directory.GetCurrentDirectory(), typeof(TProto).Name), _proto_capture_ext),
-            to_message);
-
-      public static IObservable<TableUpdate<T, TKey>> ProtoBufCapture<T, TKey, TProto>(this IObservable<TableUpdate<T, TKey>> source, string path, Func<T, TProto> to_message)
-         where TKey : IEquatable<TKey>
-         where TProto : class, IMessage<TProto> =>
-         Observable.Create<TableUpdate<T, TKey>>(o => {
-            // write the state on dispose, and/or on error
-            IReadOnlyDictionary<TKey, T> state = DictionaryHelper.empty<TKey, T>();
-            var sub = source.Subscribe(table => {
-               state = table.state;
-               o.OnNext(table);
-            }, ex => {
-               save(true);
-               o.OnError(ex);
-            },
-            o.OnCompleted);
-            return Disposable.Create(() => {
-               save(false);
-               Disposable.dispose(ref sub);
-            });
-            void save(bool has_error) {
-               if (state.Count > 0)
-                  FileStreamHelper.WriteProtos(has_error ? $"{path}(error)" : path, state.Values.Select(to_message).ExceptNull());
-            }
-         });
-#endif
-   }
-}
+using bts.api.core;
+using bts.collections;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+
+namespace bts.utils {
+   public static class UpdateExtensions {
+      public static TableUpdate<T, TKey> with_added<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> added) where TKey : IEquatable<TKey> =>
+         TableUpdate<T, TKey>.update(table, added, Enumerable.Empty<Change<T>>(), Enumerable.Empty<T>(), table.key_extractor);
+
+      public static TableUpdate<T, TKey> with_removed<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> removed) where TKey : IEquatable<TKey> =>
+         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), Enumerable.Empty<Change<T>>(), removed, table.key_extractor);
+
+      public static TableUpdate<T, TKey> with_changed<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> changed) where TKey : IEquatable<TKey> =>
+         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), changed.Select(v => new Change<T>(table.state[table.key_extractor(v)], v)), Enumerable.Empty<T>(), table.key_extractor);
+
+      public static TableUpdate<T, TKey> with_changes<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<Change<T>> changes) where TKey : IEquatable<TKey> =>
+         TableUpdate<T, TKey>.update(table, Enumerable.Empty<T>(), changes, Enumerable.Empty<T>(), table.key_extractor);
+
+      public static IObservable<TableUpdate<TResult, TKey>> RootDependent<T, TResult, TKey>(
+         this IObservable<TableUpdate<T, TKey>> source,
+         Func<T, TKey> key,
+         Func<T, TKey> parent_key,
+         Func<T, T, TResult> with_root,
+         Func<T, TResult> without_root,
+         Func<TResult, TKey> result_key)
+         where TKey : IEquatable<TKey> =>
+         RootDependent(source, key, parent_key, with_root, without_root, result_key, default);
+
+      // TODO: unit tests
+      public static IObservable<TableUpdate<TResult, TKey>> RootDependent<T, TKey, TResult>(
+         this IObservable<TableUpdate<T, TKey>> source,
+         Func<T, TKey> key,
+         Func<T, TKey> parent_key,
+         Func<T, T, TResult> get_result,
+         Func<T, TResult> get_result_no_parent,
+         Func<TResult, TKey> result_key,
+         TKey no_parent_key)
+         where TKey : IEquatable<TKey> =>
+         Observable.Create<TableUpdate<TResult, TKey>>(observer => {
+            var state = DictionaryHelper.empty<TKey, T>();
+            var output = TableUpdate<TResult, TKey>.mk_empty(result_key);
+            var parent_to_children = new SetMap<TKey, T>();
+            return source.Subscribe(update);
+            //
+            void update(TableUpdate<T, TKey> input) {
+               state = input.state;
+               var builder = output.to_builder();
+               // execute all parent_to_children changes first, so descendent-propagation will be efficient (otherwise propagation might be needlessly performed on values that are yet to be removed, or performed with the wrong root, if the real root is yet to be added).
+               foreach (var v in input.removed.Concat(input.changes.Select(ch => ch.Old))) {
+                  var k = input.key_extractor(v);
+                  parent_to_children.remove(parent_key(v), v);
+               }
+               foreach (var v in input.added.Concat(input.changed)) {
+                  var pk = parent_key(v);
+                  if (!pk.Equals(no_parent_key))
+                     parent_to_children.add(pk, v);
+               }
+               foreach (var v in input.removed) {
+                  var k = input.key_extractor(v);
+                  builder.remove(k);
+                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
+                     foreach (var child in children) {
+                        var ck = key(child);
+                        builder.add_or_update(ck, get_result_no_parent(child));
+                        foreach (var d in descendents(ck))
+                           builder.add_or_update(key(d), get_result(d, child));
+                     }
+                  }
+               }
+               foreach (var v in input.changed) {
+                  var k = input.key_extractor(v);
+                  var root = get_root(v);
+                  TResult result;
+                  if (key(root).Equals(k)) {
+                     result = get_result_no_parent(v);
+                     foreach (var d in descendents(k))
+                        builder.add_or_update(key(d), get_result(d, v));
+                  } else {
+                     result = get_result(v, root);
+                  }
+                  builder.add_or_update(k, result);
+               }
+               foreach (var v in input.added) {
+                  var k = input.key_extractor(v);
+                  var pk = parent_key(v);
+                  TResult result;
+                  if (pk.Equals(no_parent_key)) {
+                     result = get_result_no_parent(v);
+                     foreach (var d in descendents(k))
+                        builder.add_or_update(key(d), get_result(d, v));
+                  } else {
+                     parent_to_children.add(pk, v);
+                     var root = get_root(v);
+                     if (key(root).Equals(k)) {
+                        result = get_result_no_parent(v);
+                        foreach (var d in descendents(k))
+                           builder.add_or_update(key(d), get_result(d, v));
+                     } else {
+                        result = get_result(v, root);
+                     }
+                  }
+                  builder.add_or_update(k, result);
+               }
+               observer.OnNext(output = builder.to_table());
+            }
+            T get_root(T value) {
+               var pk = parent_key(value);
+               while (!pk.Equals(no_parent_key) && state.TryGetValue(pk, out var parent)) {
+                  value = parent;
+                  pk = parent_key(value);
+               }
+               return value;
+            }
+            IEnumerable<T> descendents(TKey k) {
+               if (parent_to_children.try_lookup(k, out ISet<T> children)) {
+                  foreach (var child in children) {
+                     yield return child;
+                     foreach (var d in descendents(key(child)))
+                        yield return d;
+                  }
+               }
+            }
+         });
+
+      public static IObservable<TableUpdate<T, TKey>> MergeTable<T, TKey>(this IObservable<TableUpdate<T, TKey>> source, IObservable<TableUpdate<T, TKey>> other) where TKey : IEquatable<TKey> =>
+         source.AggregateLatest(other, _Merge<T, TKey>.source_change_del, _Merge<T, TKey>.other_change_del, () => TableUpdate<T, TKey>.empty, TableUpdate<T, TKey>.empty, TableUpdate<T, TKey>.empty);
+
+      public static IObservable<TableUpdate<KeyValuePair<TKey, TResult>, TKey>> ParentDependent<T, TKey, TResult>(
+         this IObservable<TableUpdate<T, TKey>> source,
+         Func<T, TKey> key,
+         Func<T, TKey> parent_key,
+         Func<T, T, TResult> get_result,
+         Func<T, TResult> get_result_no_parent)
+         where TResult : IEquatable<TResult>
+         where TKey : IEquatable<TKey> =>
+         ParentDependent(source, key, parent_key, get_result, get_result_no_parent, EqualityComparer<TResult>.Default, default);
+
+      public static IObservable<TableUpdate<KeyValuePair<TKey, TResult>, TKey>> ParentDependent<T, TKey, TResult>(
+         this IObservable<TableUpdate<T, TKey>> source,
+         Func<T, TKey> key,
+         Func<T, TKey> parent_key,
+         Func<T, T, TResult> get_result,
+         Func<T, TResult> get_result_no_parent,
+         IEqualityComparer<TResult> result_comparer,
+         TKey no_parent_key)
+         where TKey : IEquatable<TKey> =>
+         Observable.Create<TableUpdate<KeyValuePair<TKey, TResult>, TKey>>(observer => {
+            var value_comparer = EqualityComparer.Create<KeyValuePair<TKey, TResult>, TResult>(kv => kv.Value, result_comparer);
+            var state = DictionaryHelper.empty<TKey, T>();
+            var output = TableUpdate<KeyValuePair<TKey, TResult>, TKey>.mk_empty(kv => kv.Key);
+            var parent_to_children = new SetMap<TKey, T>();
+            return source.Subscribe(update);
+            //
+            void update(TableUpdate<T, TKey> input) {
+               state = input.state;
+               var builder = output.to_builder();
+               foreach (var v in input.removed) {
+                  var k = input.key_extractor(v);
+                  builder.remove(k);
+                  parent_to_children.remove(parent_key(v), v);
+                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
+                     foreach (var child in children)
+                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result_no_parent(child)));
+                  }
+               }
+               foreach (var v in input.changed) {
+                  var k = key(v);
+                  builder.add_or_update(new KeyValuePair<TKey, TResult>(k, lookup_result(v)));
+                  parent_to_children.set(parent_key(v), v);
+                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
+                     foreach (var child in children)
+                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result(child, v)));
+                  }
+               }
+               foreach (var v in input.added) {
+                  var k = key(v);
+                  builder.add_or_update(new KeyValuePair<TKey, TResult>(k, lookup_result(v)));
+                  parent_to_children.add(parent_key(v), v);
+                  if (parent_to_children.try_lookup(k, out ISet<T> children)) {
+                     foreach (var child in children)
+                        builder.add_or_update(new KeyValuePair<TKey, TResult>(key(child), get_result(child, v)));
+                  }
+               }
+               var result = builder.to_table_checked(value_comparer);
+               if (result.has_changes())
+                  observer.OnNext(output = result);
+            }
+            TResult lookup_result(T child) {
+               var pk = parent_key(child);
+               return !pk.Equals(no_parent_key) && state.TryGetValue(pk, out T parent) ?  get_result(child, parent) : get_result_no_parent(child);
+            }
+         });
+
+      static class _Merge<T, TKey> where TKey : IEquatable<TKey> {
+         public static readonly Func<TableUpdate<T, TKey>, Change<TableUpdate<T, TKey>>, TableUpdate<T, TKey>, TableUpdate<T, TKey>> source_change_del = _source_changed_impl;
+         public static readonly Func<TableUpdate<T, TKey>, TableUpdate<T, TKey>, Change<TableUpdate<T, TKey>>, TableUpdate<T, TKey>> other_change_del = _other_changed_impl;
+
+         static TableUpdate<T, TKey> _source_changed_impl(TableUpdate<T, TKey> target, Change<TableUpdate<T, TKey>> source_change, TableUpdate<T, TKey> other_table) =>
+            TableUpdate<T, TKey>.update(target, source_change.New.added, source_change.New.changes, source_change.New.removed, source_change.New.key_extractor);
+
+         static TableUpdate<T, TKey> _other_changed_impl(TableUpdate<T, TKey> target, TableUpdate<T, TKey> source_table, Change<TableUpdate<T, TKey>> other_change) =>
+            TableUpdate<T, TKey>.update(target, other_change.New.added, other_change.New.changes, other_change.New.removed, other_change.New.key_extractor);
+      }
+   }
+}

src/client/spark_test/Resources/ResourceHelper.cs

@@ -1,13 +0,0 @@
-using System.IO;
-using System.Reflection;
-
-namespace bts.resources {
-   class ResourceHelper {
-      const string _default_namespace = "spark_test.Resources";
-
-      public static Stream LoadResource(string name) {
-         var ass = Assembly.GetExecutingAssembly();
-         return ass.GetManifestResourceStream(name) ?? ass.GetManifestResourceStream($"{_default_namespace}.{name}");
-      }
-   }
-}

src/client/spark_test/Security/SecurityTests.cs

@@ -1,11 +1,13 @@
-using bts.api;
-using bts.resources;
-using bts.test;
-using bts.utils.proto;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using bts.api;
+using bts.test;
 
-namespace bts.mcore {
+namespace bts.mcore
+{
    [TestGroup]
    class SecurityTests {
       [Test]
@@ -26,23 +28,5 @@ namespace bts.mcore {
          Assert.That(dict[b] == 1);
          Assert.That(dict[c] == 2);
       }
-
-      [Test]
-      public void test_security_compare() {
-         const string securities_resource = "KrandallOrderBookCrash.security_proto";
-         // verify that the sample size doesn't shrink for some reason.
-         // if it grows a bit that's fine; the generic comparison test
-         // asserts against collections that are too large.
-         const int min_sample_size = 91;
-
-         var securities = StreamHelper.ReadProtos<Security>(
-            ResourceHelper.LoadResource(securities_resource))
-            .Select(s => new SecurityImmutable(s))
-            .ToList();
-         Assert.IsTrue(securities.Count >= min_sample_size);
-
-         ComparisonTests.transitive_comparison(securities, SecurityHelper.Comparer.InstanceImmutable);
-         ComparisonTests.identity_comparison(securities, SecurityHelper.Comparer.InstanceImmutable);
-      }
    }
 }

src/client/spark_test/Utils/ComparisonTests.cs

@@ -1,34 +0,0 @@
-using bts.test;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace bts.mcore {
-   static class ComparisonTests {
-      public static void transitive_comparison<T>(IEnumerable<T> items, IComparer<T> comparer) {
-         // Verify that the sample size isn't too big.
-         // This test compares each item to every other item
-         // (technically twice; lhs/rhs is flipped the second time),
-         // so performance is O(n^2).
-         const int max_sample_size = 4092;
-         var sorted_items = items.ToList();
-         Assert.That(sorted_items.Count <= max_sample_size);
-         sorted_items.Sort(comparer);
-         for (int i = 0; i < sorted_items.Count - 1; i++) {
-            for (int j = i + 1; j < sorted_items.Count; j++) {
-               assert_comp(i, j);
-            }
-         }
-         void assert_comp(int lhs, int rhs) {
-            int pos_comp = lhs.CompareTo(rhs);
-            // hit both sides for good measure
-            Assert.That(comparer.Compare(sorted_items[lhs], sorted_items[rhs]) == pos_comp);
-            Assert.That(comparer.Compare(sorted_items[rhs], sorted_items[lhs]) == -pos_comp);
-         }
-      }
-
-      public static void identity_comparison<T>(IEnumerable<T> items, IComparer<T> comparer) {
-         foreach (var v in items)
-            Assert.That(comparer.Compare(v, v) == 0);
-      }
-   }
-}

src/client/spark_test/Utils/MarketDataUtilities.cs

@@ -61,7 +61,7 @@ public static async Task<IEnumerable<SecurityImmutable>> get_multiple_securities
          return Enumerable.Empty<SecurityImmutable>();
       }
 
-      public static async Task<(bool, List<FutureContract>)> get_expirations(MarketDataRelay relay, string symbol, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) {
+      public static async Task<IEnumerable<FutureContract>> get_expirations(MarketDataRelay relay, string symbol, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) {
          var request = new MDRequest() {
             Host = _MD_HOST,
             Channels = {
@@ -89,7 +89,7 @@ public static async Task<IEnumerable<SecurityImmutable>> get_multiple_securities
             }
          }
 
-         return (result.success, futures);
+         return (IEnumerable<FutureContract>) futures;
       }
 
    }

src/client/spark_test/Utils/SpreaderUtilities.cs

@@ -22,9 +22,8 @@ namespace bts.tests
    public class SpreaderUtilities {
 
       public static async Task<(SecurityImmutable s1, SecurityImmutable s2)> get_securities_for_common_setup_one(MarketDataRelay relay, string symbol) {
-         var (success, exps) = await MarketDataUtilities.get_expirations(relay, symbol, SecurityType.Future);
+         var exps  = (await MarketDataUtilities.get_expirations(relay, symbol, SecurityType.Future)).ToList();
 
-         Assert.IsTrue(success, "Could not reach market data service");
          Assert.IsNotNull(exps);
          Assert.IsTrue(exps.Count() > 2, "Need at least two expirations");
 

src/client/spark_test/spark_test.csproj

@@ -14,7 +14,5 @@
   <ItemGroup>
     <Content Include="../spark_test/system_test_scripts/*.sh" CopyToOutputDirectory="PreserveNewest"></Content>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\KrandallOrderBookCrash.security_proto" />
-  </ItemGroup>
+
 </Project>

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/MarketDataService.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/subprocess.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/Product.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/service/MarketDataServiceServer.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;md/vendor/OnixsUtils.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;metricsLine truncated
+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/MarketDataService.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/subprocess.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/Product.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/service/MarketDataServiceServer.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;md/vendor/OnixsUtils.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;metricsLine truncated

src/lib/api/service_helpers/AdminServiceUtils.cpp

@@ -685,7 +685,6 @@ bts::api::admin::BTSAccount* AdminServiceUtils::create_account(bts::api::admin::
    new_account_ptr->set_name(account_name);
    new_account_ptr->set_description(description);
    new_account_ptr->set_is_active(is_active);
-   new_account_ptr->mutable_risk_limit_enforcement()->set_ignore_spread_position_limits(true);
    return new_account_ptr;
 }
 void AdminServiceUtils::update_account(bts::api::admin::AdminData& admin_data,

src/lib/api/services/OrderService.proto

@@ -104,7 +104,6 @@ message CustomOrderDefinition
     SplitterOrderDefinition   splitter = 29;
     ScratchOrderDefinition scratch = 31;
     ProRataOrderDefinition prorata = 32;
-    DeleteAndCoverDefinition delete_and_cover = 34;
     
     DynamicOrderDefinition dynamic = 1000;
   }
@@ -145,13 +144,6 @@ message TickOrderDefinition {
   bool detach_on_toward = 5;
   CustomOrderDefinition child = 6;
 }
-enum LeanOnToward
-{
-   NO_CHANGE = 0; //continue to lean on initial inside market
-   CANCEL = 1; //cancel algo and order
-   DETACH = 2; //cancel algo but leave order working
-   REPRICE = 3; //lean on new inside market
-}
 message LeanOrderDefinition {
   spark.QuantityMeasure cross_threshold = 1;
   uint32 max_chase_ticks = 2;
@@ -187,21 +179,6 @@ message CoverOrderDefinition {
   CustomOrderDefinition child = 3;
   bool cancel_on_external_hedge_cancel = 4;
   bool cancel_hedges_on_cancel = 5;
-  bool detach_hedges = 6;
-}
-message DeleteAndCoverDefinition{
-  // cover
-  uint32 hedge_ticks = 1;
-  bool cancel_on_external_hedge_cancel = 2;
-  bool cancel_hedges_on_cancel = 3;
-  bool detach_hedges = 4;
-  // main child = top
-  spark.QuantityMeasure top_threshold = 10;
-  uint32 ticks_off = 11;
-  // hedge child = Lean
-  spark.QuantityMeasure cross_threshold = 20;
-  uint32 max_chase_ticks = 21;
-  LeanOnToward trade_toward_behavior = 22;
 }
 message OffsetOrderDefinition {
   uint32 tick_offset_on_deploy = 1;
@@ -406,9 +383,7 @@ message OCOOrderState {}
 message PricerOrderState {}
 message ScratchOrderState {}
 message ProRataOrderState {}
-message DynamicOrderState {
-  map<string,DynamicOrderParam> custom_state = 1;
-}
+message DynamicOrderState {}
 message QueueHolderState {}
 message SplitterOrderState {}
 
@@ -669,7 +644,7 @@ message RegisteredDynamicOrderTypes {
 
 message DynamicOrderParam {
   oneof value {
-    int32 as_int32 = 1;
+    uint32 as_int32 = 1;
     uint32 as_uint32 = 2;
     double as_double = 3;
     string as_string = 4;

src/lib/config/defaults/keycode.conf

@@ -1,10 +1,13 @@
+
+
 #nusers: 1
 #allow concurrent : true
-#expires: 2021-Jan-01 00:00:00   637450560000000000
-#generation_time: 2020-Apr-03 18:39:31.010863   5248901378137496534
+#expires: 2020-Mar-31 00:00:00   637212096000000000
+#generation_time: 2020-Jan-06 18:56:23.406931   5248825356261457214
 EncryptedKeyCode {
    value {
-      keycode: "BJBQWsbdTXWa/iLmOf3ekE8vP/NYkf0Q/nUsp/rJ78Ze3W9pNXICCMabmmsr1xOM7aqRIclPgZd955uSSfvFkdNWFTxwPQ5IfnDGopj3QdhUVxhzgVLaXHN+vC0H/MWrDQ5K4WY5J/6VXgUn1LSN/2HNb5iR2sKXeh3Alamg87YtCWEi+scelffE7HK5ERT/3A3Y/e0pqUFhP6xouIjHRhC2FRBb6OoJQVvFwVDADSuKZNo9B6GhC3H0YdHqjFhGDoky5ecgzeKIX8uWJEQNnQXQJ0iTgQ95+YR5IMU+XWdlVfSrc0fuTmj3YWcBQ8Kl2ItEcobyZzJYega3tu6Ftw=="
+      keycode: "Ixb/z6hwFQmojpm4GwNEpQmsqpYT9OTHbcKtROIqj38GwGqyVn54JMDB04V048quO+NAI78DKJXsUWgjDH0y5HQlwN6Lq48s/bdwKqR1OTBPr6xoTImtCb+l5b+8fUGlg7t3X8gfMdxohHgcUi9k9n7ZrnNvqcjdYKoP0CaTZT8zHuBQx3f4Lqrz32gq9rJ5skRjH6ZqNblNdlsF+kOAqXCkvI5p0QfyKgtCodr33qsW2cbqY5gUD9KwsnmFVa8/zuFBucsoM7dHB47yRaIeOFFu7xGayAdAHA8SwLyoxE5y+adIX1SYnAiqAu1raZpeXgRE1LNQk3c7uhUjt0coag=="
    }
 }
 
+

src/lib/config/protos/MarketData.proto

@@ -52,11 +52,6 @@ message PublisherOptions
    optional uint32 heartbeat_boot_seconds = 12 [default = 60]; // 1 minute grace period from shm creation
 
    optional bool skip_options = 13 [default = true];
-
-   optional uint32 hot_initial = 20 [default = 1024];
-   optional uint32 hot_growth = 21 [default = 1024];
-   optional uint32 cold_initial = 22 [default = 8192];
-   optional uint32 cold_growth = 23 [default = 2048];
 }
 
 message ICEPublisherOptions
@@ -198,11 +193,6 @@ message RecordOptions {
    optional bool record_sim = 5 [default=false];
 }
 
-// If starting on Sunday pre-load the selected symbols from disk
-message SecurityPreload {
-   repeated string symbol = 1;
-}
-
 //
 // Replay options
 // 

src/lib/config/protos/UI.proto

@@ -76,7 +76,6 @@ message LadderKnobs {
 message OrderBookOptions {
    optional bool animate_child_order_rows = 1 [default = false];
    optional double status_color_opacity_when_selected = 2 [default = 0.35];
-   optional bool can_edit_specific_algo_params = 3 [default = false];
 }
 
 message OrderTicketOptions {

src/lib/config/protos/toggles.proto

@@ -67,7 +67,4 @@ message DynamicAlgos{
    optional bool enable_dorman = 1 [default = false];
    optional bool enable_pyramid = 2 [default = false];
    optional bool enable_tas = 3 [default = false];
-   optional bool enable_tascounter = 4 [default = false];
-   optional bool enable_limit_cover = 5 [default = false];
-   optional bool enable_onsignal = 6 [default = false];
 }

src/lib/domain_model/Security.h

@@ -41,16 +41,16 @@ inline api::Side other_side(api::Side side) {
    }
 }
 
-inline double market_epsilon() { return 1e-10; }
+inline double market_epislon() { return 1e-10; }
 
 // better == p1 more aggressive than p1 ie for a buy order p1 is higher
 // than p2, and for a sell order p1 is lower than p2
 inline bool is_better(api::Side side, Price p1, Price p2) {
    switch (side) {
    case api::SIDE_BUY:
-      return p1.value() - p2.value() > market_epsilon();
+      return p1.value() - p2.value() > market_epislon();
    case api::SIDE_SELL:
-      return p2.value() - p1.value() > market_epsilon();
+      return p2.value() - p1.value() > market_epislon();
    default:
       return false;
    }
@@ -76,7 +76,7 @@ inline Price worsen_price(api::Side side, Price p, Price offset) {
 }
 
 inline bool is_same(Price p1, Price p2) {
-   return std::abs(p1.value() - p2.value()) < market_epsilon();
+   return std::abs(p1.value() - p2.value()) < market_epislon();
 }
 
 inline bool is_equal_or_better(api::Side side, Price p1, Price p2) {
@@ -211,9 +211,6 @@ inline bool gr_than(double p1, double p2, double tick_size) {
    return gr_than_eq(p1, p2, tick_size) &&
           !test_price_equality(p1, p2, tick_size);
 }
-inline bool test_price_equality(double price_1, double price_2) {
-   return std::fabs(price_2 - price_1) < market_epsilon();
-}
 
-} // namespace securities
-} // namespace bts
+
+}}

src/lib/md/MDConsumer.cpp

@@ -792,7 +792,7 @@ public:
             // We can safely send a security key to every _instance because by definition
             // a security cannot appear in 2 instances
             if (unresolved_securities.size() > 250) {
-               LOG(md,Info,"Failed to resolve legs for {}"
+               LOG(md,Warn,"Failed to resolve legs for {}"
                    " spreads. This can happen when a spread is subscribed without "
                    "it's underliers and may lead to higher than expected CPU use.",
                    unresolved_securities.size() );
@@ -901,10 +901,6 @@ public:
       return _cache.get_security(key);
    }
 
-   std::vector<api::Security const *> get_securities() const {
-      return _cache.get_securities();
-   }
-
    MDConsumerChannel get_channel(const std::string& symbol, SecurityType type, Venue exchange) const {
       for (auto& inst : _instances) {
          if ((inst->symbol() == symbol && inst->type() == type && inst->exchange() == exchange) ||
@@ -980,7 +976,6 @@ size_t MDConsumer::walk_security_list(SecurityCallback cb, const string& symbol,
 size_t MDConsumer::scan_securities(bool resolve_legs) { return _pimpl->scan_securities(resolve_legs); }
 void MDConsumer::on_security(SecurityCallback cb, bool resolve_legs) { _pimpl->on_security(cb, resolve_legs); }
 const api::Security* MDConsumer::get_security(SecurityKey key) const { return _pimpl->get_security(key).get(); }
-std::vector<api::Security const*> MDConsumer::get_securities() const {return _pimpl->get_securities();}
 
 MDConsumerChannel MDConsumer::get_channel(const std::string& symbol, SecurityType type, Venue exchange) const {
    return _pimpl->get_channel(symbol, type, exchange);

src/lib/md/MDConsumer.h

@@ -59,9 +59,6 @@ public:
    // You still need to call scan_securities() periodically to discover new securities
    const api::Security* get_security(SecurityKey key) const;
 
-   // Retrieve all cached securities
-   std::vector<api::Security const*> get_securities() const;
-
    MDConsumerChannel get_channel(const std::string& symbol, SecurityType type, Venue exchange) const;
    MDConsumerChannel get_channel(const UserSymbol&) const;
 

src/lib/md/MDProducer.cpp

@@ -20,14 +20,8 @@ public:
       _symbol(symbol),
       _type(type),
       _exchange(exchange),
-      _hot(hot_segment_name(symbol, type, exchange, platform), 
-         config::get<PublisherOptions>().hot_initial(), 
-         config::get<PublisherOptions>().hot_growth(),
-         flags & MDProducerFlags::Shared),
-      _cold(cold_segment_name(symbol, type, exchange, platform), 
-         config::get<PublisherOptions>().cold_initial(), 
-         config::get<PublisherOptions>().cold_growth(), 
-         flags & MDProducerFlags::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)
       {

src/lib/md/SecurityCache.cpp

@@ -69,17 +69,6 @@ SecurityPtr SecurityCache::get_security(SecurityKey key) {
    }
 }
 
-std::vector<api::Security const*> SecurityCache::get_securities()
-{
-   std::vector<api::Security const*> result;
-   result.reserve(100000);
-
-   std::unique_lock<std::mutex> lock(_me->cache_mutex);
-   for (auto const&p : _me->cache)
-      result.push_back(p.second.get());
-   return result;
-}
-
 SecurityPtr SecurityCache::add_db_security(const SecurityPtr& security) {
    bts_assert(security);
    std::lock_guard<std::mutex> lock(_me->cache_mutex);
@@ -101,4 +90,4 @@ bool SecurityCache::add_live_security(const SecurityPtr& security) {
 
 void SecurityCache::flush_to_disk() { _me->flush(); }
 
-}}//ns
+}}//ns

src/lib/md/SecurityCache.h

@@ -22,9 +22,6 @@ public:
    //Load security from cache with fallback to database
    SecurityPtr get_security(SecurityKey key); 
 
-   // Load all securities from cache, no fallback to database
-   std::vector<api::Security const*> get_securities();
-   
    // Get the security if it's in the cache otherwise return nullptr. Does not query security database.
    SecurityPtr try_get_security(SecurityKey key) const;
 
@@ -36,4 +33,4 @@ public:
 
 };
 
-}}//ns
+}}//ns

src/lib/md/SecurityOracle.cpp

@@ -10,8 +10,4 @@ const api::Security* SecurityOracle::get_security(SecurityKey key) const {
    return _client.current_consumer().get_security(key);
 }
 
-std::vector<api::Security const*> SecurityOracle::get_securities() const {
-   return _client.current_consumer().get_securities();
-}
-
-}}//namespace
+}}//namespace

src/lib/md/SecurityOracle.h

@@ -1,8 +1,6 @@
 #pragma once
-
 #include "lib/domain_model/SecurityKey.h"
 #include <memory>
-#include <vector>
 
 namespace bts {
 namespace api {class Security;}
@@ -14,7 +12,6 @@ public:
    SecurityOracle(const MDClient&);
    ~SecurityOracle();
    const api::Security* get_security(SecurityKey key) const;
-   std::vector<api::Security const*> get_securities() const;
 };
 
-}}//namespace
+}}//namespace

src/lib/md/vendor/OnixsUtils.cpp

@@ -18,16 +18,16 @@ const char * onixs_license[] = {
 "    <name>Blue Trading Systems OF 9420-2</name>",
 "  </customer>",
 "  <period>",
-"    <since>2020-05-01</since>",
-"    <till>2021-05-12</till>",
+"    <since>2019-05-02</since>",
+"    <till>2020-05-13</till>",
 "  </period>",
 "  <products>",
 "    <product id=\"4\" name=\"CME Market Data Handler for C++\" />",
 "    <product id=\"7\" name=\"ICE iMpact Multicast Price Feed Handler for C++\" />",
 "    <product id=\"67\" name=\"Eurex Market and Reference Data Interfaces (EMDI, RDI) Handler for C++\" />",
 "  </products>",
-"  <checksum>1C9210495AA3C9C884B7A37A4C7AD8F9</checksum>",
-"</license>"
+"  <checksum>5E50A1DACD94D7C1BECD316EEAE5AB02</checksum>",
+"</license>",
 };
 
 OnixsTemplLicense onixs_create_temporary_license() {

src/lib/orderman/actors/OrderStore.cpp

@@ -154,13 +154,10 @@ void OrderStore::store_and_publish_if_complete(
 
 bool OrderStore::_order_cutoff(const api::orderman::OrderRecord &rec) {
    // TODO: move this to orderutils
-   bool working =
-     (rec.state().status() ==
-      api::orderman::OrderStatus::ORDER_STATUS_WORKING) ||
-     (rec.state().status() ==
-      api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED) ||
-     (rec.state().status() ==
-      api::orderman::OrderStatus::ORDER_STATUS_PENDING_WORKING);
+   bool working = (rec.state().status() ==
+                   api::orderman::OrderStatus::ORDER_STATUS_WORKING) ||
+                  (rec.state().status() ==
+                   api::orderman::OrderStatus::ORDER_STATUS_PENDING_WORKING);
    return me->soft_cleanup_enabled && !working &&
           rec.state().created().seconds() < me->cutoff_time.tv_sec;
 }

src/lib/orderman/actors/SODPosition.cpp

@@ -7,7 +7,6 @@
 #include "lib/utils/PBUtils.h"
 #include "lib/utils/bts_assert.h"
 #include <google/protobuf/timestamp.pb.h>
-#include <google/protobuf/util/time_util.h>
 #include <sstream>
 #include <sys/time.h>
 
@@ -54,7 +53,7 @@ timeval SODPosition::sod_time() {
    // if the server started before the sod for today
    if (rv.tv_sec >= now_epoch)
       rv = subtract_days (rv,1);
-   return rv;
+   return rv;   
 }
 
 timeval SODPosition::get_order_cutoff_time(
@@ -99,48 +98,6 @@ timeval SODPosition::now(){
    return tv;
 }
 
-google::protobuf::Timestamp SODPosition::today_local_time_to_utc_timestamp (
-                                                   uint16_t hours,
-                                                   uint16_t mins,
-                                                   uint16_t secs,
-                                                   bool add_day_if_less,
-                                                   bool subtract_day_if_more){
-   time_t now_epoch;
-   time(&now_epoch); // seconds since epoch (utc) (independent of machine timezone)
-   auto now_ts = google::protobuf::util::TimeUtil::TimeTToTimestamp(now_epoch);
-   struct tm *ptm_local = localtime(&now_epoch);  // in local timezone
-   ptm_local->tm_hour = hours;
-   ptm_local->tm_min = mins;
-   ptm_local->tm_sec = secs;
-   ptm_local->tm_isdst = -1;
-   time_t ovrd_epoch = mktime(ptm_local);  // converts local time to UTC epoch time
-   if(ovrd_epoch < now_epoch){
-      if (add_day_if_less)
-         ovrd_epoch += 24*60*60;
-   }
-   else{
-      if(subtract_day_if_more)
-         ovrd_epoch -= 24*60*60;
-   }
-   auto ovrd_ts = google::protobuf::util::TimeUtil::TimeTToTimestamp(ovrd_epoch);
-   return ovrd_ts;
-}
-
-google::protobuf::Timestamp SODPosition::add_seconds (
-                                       const google::protobuf::Timestamp& ts,
-                                       int secs_diff){
-   auto secs = google::protobuf::util::TimeUtil::TimestampToSeconds(ts);
-   secs += secs_diff;
-   return google::protobuf::util::TimeUtil::SecondsToTimestamp(secs);
-}
-
-google::protobuf::Timestamp SODPosition::add_nanoseconds (
-                                       const google::protobuf::Timestamp& ts,
-                                       long diff){
-   return google::protobuf::util::TimeUtil::NanosecondsToTimestamp(
-      google::protobuf::util::TimeUtil::TimestampToNanoseconds(ts) + diff);
-}
-
 google::protobuf::Timestamp SODPosition::to_timestamp (timeval tv){
    google::protobuf::Timestamp rv;
    rv.set_seconds(tv.tv_sec);

src/lib/orderman/actors/SODPosition.h

@@ -31,18 +31,6 @@ public:
                      const std::map<std::string,std::string>& ordermap);
    static timeval now();
    static google::protobuf::Timestamp to_timestamp (timeval);
-   static google::protobuf::Timestamp today_local_time_to_utc_timestamp (
-            uint16_t hours,
-            uint16_t mins,
-            uint16_t secs,
-            bool add_day_if_less,
-            bool subtract_day_if_more);
-   static google::protobuf::Timestamp add_seconds (
-                                 const google::protobuf::Timestamp& ts,
-                                 int secs);
-   static google::protobuf::Timestamp add_nanoseconds (
-                                 const google::protobuf::Timestamp& ts,
-                                 long diff);
    bool is_sod (const google::protobuf::Timestamp& fill_time) const;
 };
 

src/lib/orderman/actors/order_manager/OrderManager.cpp

@@ -157,7 +157,6 @@ void OrderManager::on_filled_position(
       }
 
       for (auto const &ev : *(update.events)) {
-         me->services_data.position.update(ev);
          me->services_data.limiter.set_filled_position(
              *ev.security, ev.account_id, ev.long_quantity, ev.short_quantity);
       }
@@ -551,8 +550,6 @@ void OrderManager::init_order_services() {
        std::make_unique<ContentSubscription<TimerEvent, NoKey>>(*this, log);
    me->services_data.order_creation_subs =
        std::make_unique<ContentSubscription<CreateOrderReplyEvent>>(*this, log);
-   me->services_data.position_subs =
-      std::make_unique<ContentSubscription<FilledPositionEvent,NoKey>>(*this, log);
 }
 
 void OrderManager::after_event() {

src/lib/orderman/actors/order_manager/OrderServices.cpp

@@ -32,7 +32,6 @@ void OrderServices::init(OrderServicesData &data) {
    _status_updates.init(*data.status_subs);
    _settlement_updates.init(*data.settlement_subs);
    _time_change.init(*data.time_subs);
-   _position_update.init(*data.position_subs);
    if (_sessions.empty())
       for (auto &sd : data.sessions)
          _sessions.emplace_back(*sd);

src/lib/orderman/actors/order_manager/OrderServices.h

@@ -8,7 +8,6 @@
 #include "lib/orderman/actors/order_manager/SessionServices.h"
 #include "lib/orderman/events/TickerUpdateEvent.h"
 #include "lib/orderman/events/StatusUpdateEvent.h"
-#include "lib/orderman/events/FilledPositionEvent.h"
 #include "lib/orderman/governor/Governor.h"
 #include "lib/orderman/orderman_utils/EventStream.h"
 #include "lib/orderman/orders/Order.h"
@@ -63,10 +62,6 @@ class OrderServices {
       _data->log.log(corid(), entry_kind, uint64_1, txt_1, uint32_1);
    }
 
-   std::vector<PositionUpdate> const& current_positions() {
-      return _data->position.current_positions();
-   }
-
    trace::ScopedPerfLogEntry log_scope(const char *entry_kind,
                                        uint64_t uint64_1 = 0,
                                        const char *txt_1 = "",
@@ -128,15 +123,6 @@ class OrderServices {
    void unsubscribe_from_time() { _time_change.unsub(_time_change_sub); }
    // Time
 
-
-   // Position Updates
-   template <class CB> void subscribe_to_position_updates(CB &&cb) {
-      _position_update_sub = _position_update.sub(
-          [this, cb](auto const &ev) { this->on_external_event(ev, cb); });
-   }
-   void unsubscribe_from_position_updates() { _position_update.unsub(_position_update_sub); }
-   // Position Updates
-   
    // Execution Reports
    using ExeReportSubID = EventStream<NewExecutionReportEvent>::SubID;
    template <class CB>
@@ -312,10 +298,8 @@ class OrderServices {
    EventStream<StatusUpdateEvent> _status_updates;
    EventStream<SettlementUpdateEvent> _settlement_updates;
    EventStream<mercury::TimerEvent, mercury::NoKey> _time_change;
-   EventStream<orderman::FilledPositionEvent, mercury::NoKey> _position_update;
    boost::container::small_vector<SessionServices, 20> _sessions;
    EventStream<mercury::TimerEvent, mercury::NoKey>::SubID _time_change_sub;
-   EventStream<orderman::FilledPositionEvent, mercury::NoKey>::SubID _position_update_sub;
    EventStream<CreateOrderReplyEvent> _create_order_reply;
 }; // namespace orderman
 } // namespace orderman

src/lib/orderman/actors/order_manager/OrderServicesData.h

@@ -35,7 +35,6 @@
 #include "lib/orderman/order_router/OrderRouter.h"
 #include "lib/utils/datetime.h"
 #include "lib/utils/Puid.h"
-#include "lib/orderman/actors/order_manager/PositionIndex.h"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
@@ -88,7 +87,6 @@ class OrderServicesData {
    OrderManager &owner;
    trace::PerfLog &log;
    securities::MapSecurityDB sec_db;
-   PositionIndex position;
    OrderRouter order_router;
    Limiter limiter;
    OrderFactory order_factory;
@@ -103,8 +101,6 @@ class OrderServicesData {
        time_subs;
    std::unique_ptr<mercury::ContentSubscription<CreateOrderReplyEvent>>
        order_creation_subs;
-   std::unique_ptr<mercury::ContentSubscription<FilledPositionEvent,mercury::NoKey>>
-       position_subs;
 
    mercury::Stream<CreateOrderRequestEvent> create_order_req_pub;
    mercury::Stream<CreateFIXBufferRequestEvent> create_fix_req_pub;

src/lib/orderman/actors/order_manager/PositionIndex.cpp

@@ -1,31 +0,0 @@
-#include "PositionIndex.h"
-
-#include "lib/orderman/events/FilledPositionEvent.h"
-#include "lib/orderman/orders/algo/PositionUpdate.h"
-
-namespace bts {
-namespace orderman {
-
-struct PositionIndex::PImpl {
-   PImpl() : position_idx(), current_positions() {}
-   std::map<std::pair<SecurityKey,AccountID>,size_t> position_idx;
-   std::vector<PositionUpdate> current_positions;
-};
-
-void PositionIndex::update(FilledPositionEvent const&ev) {
-   auto &idx = me->position_idx[{SecurityKey(ev.security->id()),ev.account_id}];
-   if (idx == 0) {
-      me->current_positions.push_back({});
-      idx = me->current_positions.size();
-   }
-   me->current_positions[idx-1] = {ev.security,ev.account_id,ev.long_quantity, ev.short_quantity};
-}
-
-std::vector<PositionUpdate> const& PositionIndex::current_positions() const {
-   return me->current_positions;
-}
-
-PositionIndex::PositionIndex() : me (new PImpl()) {}
-PositionIndex::~PositionIndex() {}
-
-}}

src/lib/orderman/actors/order_manager/PositionIndex.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-namespace bts {
-namespace orderman {
-
-class FilledPositionEvent;
-struct PositionUpdate;
-
-class PositionIndex {
-public:
-   PositionIndex();
-   ~PositionIndex(); 
-   void update(FilledPositionEvent const&);
-   std::vector<PositionUpdate> const &current_positions() const;
-private:
-   struct PImpl;
-   std::unique_ptr<PImpl> me;
-};
-
-}}

src/lib/orderman/events/OrderStateUpdateEvent.h

@@ -11,16 +11,16 @@ namespace bts {
 namespace orderman {
 
 class OrderStateUpdateEvent : public mercury::Event<OrderStateUpdateEvent> {
-public:
+ public:
    using SynopsisPolicy = mercury::CacheAll<OrderStateUpdateEvent>;
 
    OrderStateUpdateEvent()
       : key(null_order_key()), parent_key(null_order_key()) {}
 
    OrderStateUpdateEvent(
-      OrderKey k, OrderKey pk,
-      std::shared_ptr<const api::orderman::OrderDefinition> const &def,
-      api::orderman::OrderState const &state) {
+       OrderKey k, OrderKey pk,
+       std::shared_ptr<const api::orderman::OrderDefinition> const &def,
+       api::orderman::OrderState const &state) {
       init(k, pk, def, state);
    }
 
@@ -41,21 +41,18 @@ public:
       display_status = state.display_status();
 
       custom = state.custom_case();
-      if (custom == api::orderman::OrderState::kDynamic) {
-         dynamic_order_state = state.dynamic();
-      } else {
-         auto native_state = get_native_state(state);
-         if (native_state) {
-            exchange_order_id = native_state->exchange_order_id();
-            last_msg_seq_num = native_state->last_msg_seq_num();
-            sub_error_code = native_state->sub_error_code();
-            native_status = native_state->native_status();
-            routing_record = native_state->routing_record();
-            native_type = native_state->native_type();
-            orderman::str_to(native_state->last_transact_time(),
-                             &last_transact_time);
-            stop_px = native_state->stop_px();
-         }
+
+      auto native_state = get_native_state(state);
+      if (native_state) {
+         exchange_order_id = native_state->exchange_order_id();
+         last_msg_seq_num = native_state->last_msg_seq_num();
+         sub_error_code = native_state->sub_error_code();
+         native_status = native_state->native_status();
+         routing_record = native_state->routing_record();
+         native_type = native_state->native_type();
+         orderman::str_to(native_state->last_transact_time(),
+                          &last_transact_time);
+         stop_px = native_state->stop_px();
       }
    }
 
@@ -73,6 +70,7 @@ public:
    uint32_t filled_at_attach_time_quantity;
    std::string last_msg;
    api::orderman::OrderState::DisplayStatus display_status;
+   
    api::orderman::OrderState::CustomCase custom;
 
    // native order state
@@ -84,10 +82,7 @@ public:
    api::orderman::NativeOrderType native_type;
    mercury::TimeStampStr last_transact_time;
    double stop_px;
-
-   // dynamic order state
-   std::optional<api::orderman::DynamicOrderState> dynamic_order_state;
-
+   
    api::orderman::OrderState quick_rebuild_state() const {
       api::orderman::OrderState result;
       result.set_status(status);
@@ -116,11 +111,11 @@ public:
          break;
       case api::orderman::OrderState::kStopLimit:
          rebuild_native_state(
-            result.mutable_stop_limit()->mutable_native_state());
+             result.mutable_stop_limit()->mutable_native_state());
          break;
       case api::orderman::OrderState::kGlbxIceberg:
          rebuild_native_state(
-            result.mutable_glbx_iceberg()->mutable_native_state());
+             result.mutable_glbx_iceberg()->mutable_native_state());
          break;
       case api::orderman::OrderState::kIceberg:
          result.mutable_iceberg();
@@ -168,7 +163,7 @@ public:
          result.mutable_prorata();
          break;
       case api::orderman::OrderState::kDynamic:
-         *result.mutable_dynamic() = dynamic_order_state.value();
+         result.mutable_dynamic();
          break;
       case api::orderman::OrderState::kSplitter:
          result.mutable_splitter();
@@ -180,7 +175,7 @@ public:
       return result;
    }
 
-private:
+ private:
    void rebuild_native_state(api::orderman::NativeOrderState *st) const {
       st->set_stop_px(stop_px);
       st->set_exchange_order_id(exchange_order_id);

src/lib/orderman/order_factory/OrderFactory.cpp

@@ -24,7 +24,6 @@
 #include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.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/DeleteAndCoverAlgo.h"
 #include "lib/orderman/orders/book_algos/OCOOrder.h"
 #include "lib/orderman/orders/book_algos/PricerOrder.h"
 #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h"
@@ -243,10 +242,6 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk,
       order_ptr.reset(
          new orderman::AlgoWrapperOrder(std::make_unique<splitter::SplitterAlgo>()));
       break;
-   case CustomOrderDefinition::kDeleteAndCover:
-      order_ptr.reset(
-         new orderman::AlgoWrapperOrder(std::make_unique<DeleteAndCoverAlgo>()));
-      break;
    case CustomOrderDefinition::CUSTOM_NOT_SET:
       bts_assert_msg(false, "Cannot create order with unknown type");
       break;

src/lib/orderman/orderman_utils/BookUtils.cpp

@@ -1,26 +0,0 @@
-#include "BookUtils.h"
-
-namespace bts {
-namespace orderman {
-using Size = bts::md::Size;
-using Side = bts::api::Side;
-
-Size BookUtils::volume_at_or_better(const Book& book, Side side, Price price) {
-   return volume_at_or_better(book, side, price.value());
-}
-Size BookUtils::volume_at_or_better(const Book& book, Side side, double price) {
-   Size volume = 0;
-   SidePriceComp spc(side);
-   for (const auto& plevel : book.side(side)) {
-      if (spc(price, plevel.price()))
-         break;
-      volume += plevel.size();
-   }
-   return volume;
-}
-
-SidePriceComp BookUtils::price_comp(Side side) {
-   return SidePriceComp(side);
-}
-} // namespace orderman
-} // namespace bts

src/lib/orderman/orderman_utils/BookUtils.h

@@ -1,18 +0,0 @@
-#pragma once
-#include "lib/api/services/OrderService.pb.h"
-#include "lib/config/protos/MarketData.pb.h"
-#include "lib/domain_model/Security.h"
-#include "lib/domain_model/common.h"
-#include "lib/orderman/orderman_utils/Book.h"
-#include "lib/orderman/orderman_utils/PriceComp.h"
-
-namespace bts {
-namespace orderman {
-
-struct BookUtils {
-   static md::Size volume_at_or_better(const Book& book, api::Side side, Price price);
-   static md::Size volume_at_or_better(const Book& book, api::Side side, double price);
-   static SidePriceComp price_comp(api::Side side);
-};
-} // namespace orderman
-} // namespace bts

src/lib/orderman/orderman_utils/Formatter.h

@@ -1,283 +0,0 @@
-#pragma once
-#include "lib/api/services/OrderService.pb.h"
-#include "lib/config/protos/MarketData.pb.h"
-#include "lib/domain_model/common.h"
-#include "lib/md/PriceSize.h"
-#include "lib/orderman/orderman_utils/Book.h"
-#include "lib/orderman/orders/algo/IAlgoOrder.h"
-#include "lib/utils/PBUtils.h"
-#include <functional>
-#include <iostream>
-#include <map>
-#include <sstream>
-#include <fmt/format.h>
-
-namespace bts {
-namespace orderman {
-struct Formatter {
-   using Side = bts::api::Side;
-   // this is a placeholder for other book formats down the road.
-   enum class BookFormat { BBO = 1 };
-   enum class Tense {
-      Present,
-      Preterite
-   };
-
-   template<typename T>
-   inline static void concat(std::ostream& ostr, const T& v) {
-      ostr << v;
-   }
-
-   template<typename T, typename... Args>
-   inline static void concat(std::ostream& ostr, const T& first, Args... args) {
-      ostr << first;
-      (concat(ostr, args), ...);
-   }
-
-   template<typename T>
-   inline static std::string fmt(const T& curr) {
-      std::stringstream str;
-      str << curr;
-      return str.str();
-   }
-
-   template<typename T, typename... Args>
-   inline static std::string fmt(const T& curr, Args... next) {
-      std::stringstream str;
-      concat(str, curr, next...);
-      return str.str();
-   }
-
-   template <class TKey, class TValue>
-   static std::string fmt_values(const std::map<TKey, TValue>& map) {
-      if (map.empty())
-         return "None";
-      std::stringstream str;
-      auto it = map.begin();
-      str << it->second;
-      while (++it != map.end()) {
-         str << ", " << it->second;
-      }
-      return str.str();
-   }
-
-   template <class T>
-   static std::string fmt_values(const std::vector<T>& values) {
-      if (values.empty())
-         return "None";
-      std::stringstream str;
-      auto it = values.begin();
-      str << *it;
-      while (++it != values.end()) {
-         str << ", " << *it;
-      }
-      return str.str();
-   }
-
-   static std::string fmt_fill(Side side, uint32_t qty, double price) {
-      std::stringstream ostr;
-      ostr << to_string(side, Tense::Preterite) << " " << qty << " @ " << price;
-      return ostr.str();
-   }
-
-   static std::string fmt_order(Side side, uint32_t qty, double price) {
-      std::stringstream ostr;
-      ostr << to_string(side) << " " << qty << " @ " << price;
-      return ostr.str();
-   }
-
-   static std::string fmt_order(OrderKey key, uint32_t qty, double price, const api::orderman::OrderDefinition& def) {
-      std::stringstream ostr;
-      ostr << key << " " << to_string(def.side()) << " " << qty << " @ "
-           << price << std::endl << "[Def]" << utils::pb::to_string(def);
-      return ostr.str();
-   }
-
-   static std::string fmt_order(OrderKey key, Side side, uint32_t qty, double price, ChildState state) {
-      std::stringstream ostr;
-      ostr << key << " " << to_string(side) << " " << qty << " @ " << price
-           << " " << to_string(state);
-      return ostr.str();
-   }
-
-private:
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream&, const std::string&) { }
-
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream&, std::function<std::string()>) { }
-
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream& str, const std::string& separator, const T& curr) {
-      str << separator << curr;
-   }
-
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream& str, std::function<std::string()> get_separator, const T& curr) {
-      str << get_separator() << curr;
-   }
-
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream& str, const std::string& separator, const T& curr, Args... next) {
-      str << separator << curr;
-      (join_next(str, separator, next), ...);
-   }
-
-   template<typename T, typename... Args>
-   inline static void join_next(std::stringstream& str, std::function<std::string()> get_separator, const T& curr, Args... next) {
-      str << get_separator() << curr;
-      (join_next(str, get_separator, next), ...);
-   }
-
-public:
-   template<typename T, typename... Next>
-   inline static std::string join(const std::string&, const T& curr) {
-      std::stringstream str;
-      str << curr;
-      return str.str();
-   }
-
-   template<typename T, typename... Next>
-   inline static std::string join(const std::string& separator, const T& curr, Next... next) {
-      std::stringstream str;
-      str << curr;
-      join_next(str, separator, next...);
-      return str.str();
-   }
-
-   template<typename T, typename... Next>
-   inline static std::string join(std::function<std::string()> get_separator, const T& curr, Next... next) {
-      std::stringstream str;
-      str << curr;
-      join_next(str, get_separator, next...);
-      return str.str();
-   }
-
-   template <class T>
-   static std::string to_string(const T& value) {
-      std::stringstream str;
-      str << value;
-      return str.str();
-   }
-
-   static std::string to_string(bool value) {
-      return value ? "true" : "false";
-   }
-
-   static std::string to_string(Side side, Tense tense = Tense::Present) {
-      switch (side) {
-      case bts::api::SIDE_BUY:
-         switch (tense) {
-         case Tense::Preterite:
-            return "Bought";
-         case Tense::Present:
-         default:
-            return "Buy";
-         }
-      case bts::api::SIDE_SELL:
-         switch (tense) {
-         case Tense::Preterite:
-            return "Sold";
-         case Tense::Present:
-         default:
-            return "Sell";
-         }
-      default:
-         return fmt("Side_", static_cast<int>(side));
-      }
-   }
-
-   static std::string to_string(ChildStatus value) {
-      switch (value) {
-      case ChildStatus::WORKING: return "Working";
-      case ChildStatus::COMPLETED: return "Completed";
-      case ChildStatus::CANCELED: return "Canceled";
-      default: return fmt("ChildStatus_", static_cast<int>(value));
-      }
-   }
-
-   static std::string to_string(ChildState value) {
-      std::stringstream ostr;
-      ostr << "[" << to_string(value.status) << "] "
-           << value.quantity.value() << " @ " << value.price.value()
-           << "(total filled " << value.total_fills.value() << " @[avg] "
-           << value.avg_price.value() << ", last filled "
-           << value.last_fills.value() << " @ "
-           << value.last_price.value() << ")";
-      return ostr.str();
-   }
-
-   static std::string to_string(const Book &book) {
-      return to_string(book, BookFormat::BBO);
-   }
-
-   static std::string to_string(const Book &book, BookFormat format) {
-      // add other impls as needed
-      std::stringstream ostr;
-      switch (format) {
-      case BookFormat::BBO:
-         if (book.bid().size() > 0 && !book.bid().at(0).is_nan()) {
-            auto best_bid = book.bid().at(0);
-            ostr << best_bid.size() << "@" << best_bid.price();
-         } else {
-            ostr << "N/A";
-         }
-         ostr << " <> ";
-         if (book.ask().size() > 0 && !book.ask().at(0).is_nan()) {
-            auto best_ask = book.ask().at(0);
-            ostr << best_ask.size() << "@" << best_ask.price();
-         } else {
-            ostr << "N/A";
-         }
-         break;
-      default:
-         break;
-      }
-      return ostr.str();
-   }
-
-   static std::string to_string(api::orderman::OrderError error) {
-      return api::orderman::OrderError_Name(error);
-   }
-
-   static std::string to_string(api::orderman::CustomOrderDefinition::CustomCase algo_type) {
-      switch (algo_type) {
-      case api::orderman::CustomOrderDefinition::CustomCase::kLimit: return "Limit";
-      case api::orderman::CustomOrderDefinition::CustomCase::kOffset: return "Offset";
-      case api::orderman::CustomOrderDefinition::CustomCase::kCover: return "Cover";
-      case api::orderman::CustomOrderDefinition::CustomCase::kIceberg: return "Iceberg";
-      default: return fmt("AlgoType_", static_cast<int>(algo_type));
-      }
-   }
-};
-
-// << operators
-inline std::ostream &operator<<(std::ostream &ostr, const api::Side &side) {
-   ostr << Formatter::to_string(side);
-   return ostr;
-}
-
-inline std::ostream &operator<<(std::ostream &ostr, const ChildStatus &child_status) {
-   ostr << Formatter::to_string(child_status);
-   return ostr;
-}
-
-inline std::ostream &operator<<(std::ostream &ostr, const ChildState &child_state) {
-   ostr << "[" << child_state.status << "] " << child_state.quantity.value()
-        << " @ " << child_state.price.value() << "(filled "
-        << child_state.total_fills.value() << " @avg "
-        << child_state.avg_price.value() << ")";
-   return ostr;
-}
-
-inline std::ostream& operator<<(std::ostream& ostr, const bts::Price& price) {
-   ostr << price.value();
-   return ostr;
-}
-
-inline std::ostream& operator<<(std::ostream& ostr, const bts::Quantity& quantity) {
-   ostr << quantity.value();
-   return ostr;
-}
-} // namespace orderman
-} // namespace bts

src/lib/orderman/orderman_utils/PriceComp.h

@@ -1,32 +0,0 @@
-#pragma once
-#include "lib/domain_model/Security.h"
-
-namespace bts {
-namespace orderman {
-struct PriceComp {
-   bool operator()(const Price& lhs, const Price& rhs) { return lhs.value() > rhs.value(); }
-   bool operator()(const double& lhs, const double& rhs) { return lhs > rhs; }
-};
-
-struct ReversePriceComp {
-   bool operator()(const Price& lhs, const Price& rhs) { return lhs.value() < rhs.value(); }
-   bool operator()(const double& lhs, const double& rhs) { return lhs < rhs; }
-};
-
-struct SidePriceComp {
-   SidePriceComp(api::Side side) : _side(side) {}
-
-   api::Side side() const { return _side; }
-
-   bool operator()(const Price& lhs, const Price& rhs) {
-      return _side == api::SIDE_SELL ? lhs.value() < rhs.value() : lhs.value() > rhs.value();
-   }
-
-   bool operator()(const double& lhs, const double& rhs) {
-      return _side == api::SIDE_SELL ? lhs < rhs : lhs > rhs;
-   }
-private:
-   api::Side _side;
-};
-} // namespace orderman
-} // namespace bts

src/lib/orderman/orderman_utils/orderman_utils.h

@@ -1,4 +1,3 @@
-#pragma once
 #include "lib/api/services/OrderService.pb.h"
 #include <optional>
 #include <variant>

src/lib/orderman/orders/GLBXNativeOrder.cpp

@@ -190,18 +190,21 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec,
          return;
       }
 
-      auto rq = serv.order_router.get_routing_record(
-         UserID(def.user_id()), AccountID(def.account_id()), *me->sec);
-      if (!rq.has_route) {
-         auto msg = fmt::format("Could not route order: {}", rq.error_msg);
-         LOG(OrderMan, Error, "Unable to route order {} recovered from disk. Message: {}",
-             rec.key(), msg);
+      // bail if the session we used for the order is no longer valid
+      auto const &session = native_state.routing_record().session();
+      if (!serv.order_router.is_valid_session(session)) {
+         LOG(OrderMan, Error,
+             "Unknown JetFIX session {} referenced by recovered "
+             "order {}. This is a serious "
+             "problem which has to be corrected manually. ",
+             session, rec.key());
          transition_to_error(NativeOrderState::SUB_ERROR_UNKNOWN_FIX_SESSION,
-                             "Could not route order");
+                             fmt::format("Unknown FIX session: {}", session));
          return;
       }
+
       // if we made it this far we are good.
-      me->routing_record = rq.routing_record; 
+      me->routing_record = native_state.routing_record();
       if (me->state.status() != ORDER_STATUS_PENDING_WORKING)
          me->exchange_order_id = native_state.exchange_order_id();
       init_fix();

src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp

@@ -56,12 +56,11 @@ struct AlgoWrapperOrder::PImpl {
    OrderState const &state() const { return _state; }
 
    Map<SecurityKey, OrderServices::BookSubID> book_subs;
-   Map<SecurityKey, OrderServices::SettlementSubID> settlement_subs;
    Map<SecurityKey, OrderServices::TickerSubID> ticker_subs;
    Map<SecurityKey, OrderServices::StatusSubID> status_subs;
    Map<OrderKey, ChildRecord> children;
    bool has_timer_sub = false;
-   bool has_position_sub = false;
+
    bool is_state_dirty = false;
 
    Map<Edge, Action> transition_actions;
@@ -119,13 +118,6 @@ struct AlgoWrapperOrder::PImpl {
                                            : OrderState::HIDDEN);
    }
 
-   void update_custom_state(api::orderman::DynamicOrderState const&cstate) {
-      is_state_dirty = true;
-      bts_assert(definition.has_custom_def());
-      bts_assert(definition.custom_def().has_dynamic());
-      *_state.mutable_dynamic() = cstate;
-   }
-   
    void set_key(OrderKey k) { _my_key = k; }
 
  private:
@@ -390,10 +382,6 @@ api::Security const *AlgoWrapperOrder::lookup_security(SecurityKey k) const {
    return me->security_db->resolve(k);
 }
 
-std::vector<api::Security const *> AlgoWrapperOrder::known_securities() const {
-   return me->security_db->get_securities();
-}
-
 Price AlgoWrapperOrder::price() const { return Price(me->state().price()); }
 
 Quantity AlgoWrapperOrder::quantity() const {
@@ -408,10 +396,6 @@ bool AlgoWrapperOrder::is_shutting_down() const {
    return me->status == Status::SHUTTING_DOWN;
 }
 
-std::vector<PositionUpdate> const&AlgoWrapperOrder::current_positions() const {
-   return me->services->current_positions();
-}
-
 void AlgoWrapperOrder::subscribe_book(SecurityKey k) {
    if (!is_working())
       return;
@@ -432,26 +416,6 @@ void AlgoWrapperOrder::unsubscribe_book(SecurityKey k) {
       me->services->unsubscribe_from_book(it->second);
 }
 
-void AlgoWrapperOrder::subscribe_settlement(SecurityKey k) {
-   if (!is_working())
-      return;
-   bts_assert(me->settlement_subs.find(k) == me->settlement_subs.end());
-
-   me->settlement_subs[k] =
-       me->services->subscribe_to_settlements(k, [this, k](auto const &ev) {
-          ReportStateGuard _(*this);
-          me->algo->on_settlement(k, Price(ev.settlement_price.price()));
-       });
-}
-
-void AlgoWrapperOrder::unsubscribe_settlement(SecurityKey k) {
-   if (!is_working())
-      return;
-   bts_assert(me->settlement_subs.find(k) != me->settlement_subs.end());
-   if (auto it = me->settlement_subs.find(k); it != me->settlement_subs.end())
-      me->services->unsubscribe_from_settlements(it->second);
-}
-
 void AlgoWrapperOrder::subscribe_ticker(SecurityKey k) {
    if (!is_working())
       return;
@@ -533,25 +497,6 @@ void AlgoWrapperOrder::unsubscribe_timer() {
    me->has_timer_sub = false;
 }
 
-void AlgoWrapperOrder::subscribe_position() {
-   if (!is_working())
-      return;
-   bts_assert(!me->has_position_sub);
-   me->has_position_sub = true;
-   me->services->subscribe_to_position_updates([this](auto const &ev) {
-      ReportStateGuard _(*this);
-      me->algo->on_position({ev.security,ev.account_id,ev.long_quantity, ev.short_quantity});
-   });
-}
-
-void AlgoWrapperOrder::unsubscribe_position() {
-   if (!is_working())
-      return;
-   bts_assert(me->has_position_sub);
-   me->services->unsubscribe_from_position_updates();
-   me->has_position_sub = false;
-}
-
 bool AlgoWrapperOrder::is_attaching() const {
    return me->attach_target != null_order_key();
 }
@@ -665,12 +610,6 @@ void AlgoWrapperOrder::set_ladder_visibility(bool is_visible) {
    me->set_ladder_visibility(is_visible);
 }
 
-void AlgoWrapperOrder::update_custom_state(api::orderman::DynamicOrderState const&cstate) {
-   if (!is_working())
-      return;
-   me->update_custom_state(cstate);
-}
-
 void AlgoWrapperOrder::cancel(std::string const &msg) {
    if (!is_working())
       return;
@@ -902,8 +841,6 @@ void AlgoWrapperOrder::check_invariants() {
       bts_assert(is_attaching());
       bts_assert(me->external_status() == ORDER_STATUS_WORKING);
       bts_assert(me->book_subs.empty());
-      bts_assert(me->settlement_subs.empty());
-      bts_assert(me->ticker_subs.empty());
       bts_assert(me->children.empty());
       bts_assert(!me->has_timer_sub);
       bts_assert(!me->pending_terminate.has_value());
@@ -923,8 +860,6 @@ void AlgoWrapperOrder::check_invariants() {
       bts_assert(me->security);
       bts_assert(me->external_status() == ORDER_STATUS_WORKING);
       bts_assert(me->book_subs.empty());
-      bts_assert(me->settlement_subs.empty());
-      bts_assert(me->ticker_subs.empty());
       bts_assert(!me->has_timer_sub);
       bts_assert(!me->pending_update.has_value());
       bts_assert(me->pending_terminate.has_value());
@@ -938,8 +873,6 @@ void AlgoWrapperOrder::check_invariants() {
                  me->external_status() == ORDER_STATUS_ERROR ||
                  me->external_status() == ORDER_STATUS_REJECTED_BY_SPARK);
       bts_assert(me->book_subs.empty());
-      bts_assert(me->settlement_subs.empty());
-      bts_assert(me->ticker_subs.empty());
       bts_assert(!me->has_timer_sub);
       bts_assert(!me->pending_update.has_value());
       bts_assert(!me->pending_terminate.has_value());
@@ -986,18 +919,10 @@ void AlgoWrapperOrder::shutdown(api::orderman::OrderStatus st,
 }
 
 void AlgoWrapperOrder::cleanup() {
-   for (auto const &s : me->book_subs) 
+   for (auto const &s : me->book_subs) {
       me->services->unsubscribe_from_book(s.second);
-   me->book_subs.clear();
-
-   for (auto const &s : me->settlement_subs) 
-      me->services->unsubscribe_from_settlements(s.second);
-   me->settlement_subs.clear();
-
-   for (auto const &s : me->ticker_subs) 
-      me->services->unsubscribe_from_ticker(s.second);
-   me->ticker_subs.clear();
-
+      me->book_subs.clear();
+   }
    for (auto &c : me->children)
       c.second.order.cancel();
    if (me->has_timer_sub)

src/lib/orderman/orders/algo/AlgoWrapperOrder.h

@@ -33,8 +33,6 @@ class AlgoWrapperOrder : public Order,
    OrderKey order_key() const override;
    OrderKey parent_order_key() const override;
    api::Security const *lookup_security(SecurityKey k) const override;
-   std::vector<api::Security const *> known_securities() const override;
-
    bool is_attaching() const override;
    ChildTemplate &make_child_template(api::orderman::OrderDefinition const &,
                                       size_t) override;
@@ -43,12 +41,8 @@ class AlgoWrapperOrder : public Order,
    Quantity quantity() const override;
    Quantity total_fills() const override;
    bool is_shutting_down() const override;
-   std::vector<PositionUpdate> const&current_positions() const override;
-
    void subscribe_book(SecurityKey) override;
    void unsubscribe_book(SecurityKey) override;
-   void subscribe_settlement(SecurityKey) override;
-   void unsubscribe_settlement(SecurityKey) override;
    void subscribe_child_change(OrderKey) override;
    void unsubscribe_child_change(OrderKey) override;
    void subscribe_timer() override;
@@ -57,8 +51,6 @@ class AlgoWrapperOrder : public Order,
    void unsubscribe_ticker(SecurityKey) override;
    void subscribe_status(SecurityKey) override;
    void unsubscribe_status(SecurityKey) override;
-   void subscribe_position() override;
-   void unsubscribe_position() override;
 
    OrderKey launch_child(ChildTemplate &, Price, Quantity,
                          bool subscribe = true) override;
@@ -72,7 +64,6 @@ class AlgoWrapperOrder : public Order,
    void terminate_error(std::string const &msg) override;
    void complete() override;
    void update_fill_state(Quantity total_fills, Price last_price) override;
-   void update_custom_state(api::orderman::DynamicOrderState const&) override;
    void set_ladder_visibility (bool is_visibile) override;
    
    // Private

src/lib/orderman/orders/algo/IAlgoOrder.cpp

@@ -3,7 +3,6 @@
 
 namespace bts {
 namespace orderman {
-#include "lib/orderman/orders/algo/IAlgoOrder.h"
 IAlgoOrder::~IAlgoOrder() {}
 
 OrderOpResult IAlgoOrder::do_before_launch(IBeforeLaunchAlgoServices &) {

src/lib/orderman/orders/algo/IAlgoOrder.h

@@ -2,8 +2,6 @@
 
 #include "lib/orderman/orders/Order.h"
 #include "lib/orderman/events/TickerUpdateEvent.h"
-#include "lib/orderman/orders/algo/PositionUpdate.h"
-
 #include <memory>
 
 namespace bts {
@@ -46,12 +44,6 @@ class IAlgoOrder {
    // The trading status for the specified security has changed
    virtual void on_status(SecurityKey, co2::TradingStatus) {};
 
-   // The settlement price for the specified security has changed
-   virtual void on_settlement(SecurityKey, Price) {};
-   
-   // The current position for the security, account combination
-   virtual void on_position(PositionUpdate const&) {};
-
    // A periodic timer has fired
    virtual void on_timer() {}
 

src/lib/orderman/orders/algo/IAlgoServices.h

@@ -1,15 +1,10 @@
 #pragma once
 
 #include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h"
-#include "lib/orderman/orders/algo/PositionUpdate.h"
 
 namespace bts {
 namespace orderman {
 
-
-// Services to an algo *after* it has been launched. See
-// IBeforeLaunchAlgoServices for services available before launch,
-// that is outside of the latency sensitive path.
 class IAlgoServices : public IBeforeLaunchAlgoServices {
  public:
    // --------------------------------------------------------------
@@ -31,13 +26,6 @@ class IAlgoServices : public IBeforeLaunchAlgoServices {
    // cancel child orders will be ignored.
    virtual bool is_shutting_down() const = 0;
 
-   // Returns the current position per security and account. The
-   // returned reference is only valid immediately after the
-   // call. Callers should make a copy if they wish to use it beyond
-   // that. Callers can keep track of changes to the position by
-   // subscribing to the position update events below.
-   virtual std::vector<PositionUpdate> const&current_positions() const = 0;
-
    // --------------------------------------------------------------
    // Event Subscriptions
    // --------------------------------------------------------------
@@ -46,10 +34,6 @@ class IAlgoServices : public IBeforeLaunchAlgoServices {
    virtual void subscribe_book(SecurityKey) = 0;
    virtual void unsubscribe_book(SecurityKey) = 0;
 
-   // Subscribe to settlement prices for the specified security
-   virtual void subscribe_settlement(SecurityKey) = 0;
-   virtual void unsubscribe_settlement(SecurityKey) = 0;
-
    // Subscribe to child order updates for the specified child
    // order. This is rarely needed since launch_child() by default
    // automatically subscribes to new orders.
@@ -68,10 +52,6 @@ class IAlgoServices : public IBeforeLaunchAlgoServices {
    virtual void subscribe_status(SecurityKey) = 0;
    virtual void unsubscribe_status(SecurityKey) = 0;
 
-   // Subscribe to position updates
-   virtual void subscribe_position() = 0;
-   virtual void unsubscribe_position() = 0;
-
    // --------------------------------------------------------------
    // Child management
    // --------------------------------------------------------------
@@ -122,9 +102,6 @@ class IAlgoServices : public IBeforeLaunchAlgoServices {
    // Set wheter this algo instance should be displayed in the Spark UI ladder
    virtual void set_ladder_visibility(bool is_visible) = 0;
 
-   // Report custom algo state for display in the Spark UI
-   virtual void update_custom_state(api::orderman::DynamicOrderState const&) = 0;
-   
    // Update this algos's filled quantity and last price
    virtual void update_fill_state(Quantity total_fills, Price last_price) = 0;
 };