fix crash where account name > 12 chars, tested with long account name

RTM - SP-119 Ladder settings NullRef

Approved-by: John Colvin <john.colvin@bluetradesys.com>
Approved-by: Pedro Pinto <pedro.pinto+atlassian@bluetradesys.com>

.gitignore

@@ -32,3 +32,4 @@ trace_data/
 /src/lib/orderman/perf_analysis/last_pretty_log.csv
 /src/lib/orderman/perf_analysis/log.csv
 /doc/user/public/*
+.ionide/*

.vscode/launch.json

@@ -104,7 +104,7 @@
             "request": "launch",
             "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE",
             "args": [
-                "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"
+                "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64.xll"
             ],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,

doc/user/content/release_notes/_index.md

@@ -4,6 +4,31 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
+
+## 2.6.1
+### User Visible Changes
+  - Fixed an issue in the ladder where an error could occur when trying to change ladder settings for the first time
+  
+## 2.6.0
+### User Visible Changes
+  - In the ladder made last trade more distinctive when overlayed on the volumn column
+  - In the ladder, corrected display of volume tool tip 
+  - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes
+  - Added an option for the Top Algo to delete itself if within N ticks from top of book
+  - Address a rare issue that could lead to an error report on UI exit
+  - Added margin risk limits
+  - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book
+  - Avoided switching the current account and order type on open ladders when limits are changed 
+### Internal Changes
+  - Ensure that admin logins are always allowed to login, regardless of keycode status.
+  
+## 2.5.0
+### User Visible Changes
+  - Added loss limit risk check
+  - Made algos, synthetics and user names private so that multiple users can share a single system privately.
+  - Allowed the mini order book defaults for column widths to be changed from the mini order book
+  - Allowed the mini order book to shrink to the minimum size that will be needed to display the selected columns
+  - Improved accuracy of the directional arrow when displaying last trades in the volumn column
 ## 2.4.0
 ### User Visible Settings
   - In the ladder, changed the last trade column to accumulate successive trades at the same price
@@ -391,7 +416,8 @@ insert_anchor_links = "right"
   - This is configurable from a ladder's settings as well
 ### Customized settings in all windows
  - All windows now contain a settings page where grid settings (font color, size, etc) are applied
- - These settings can be saved on a per-window basis or as a Default for newly-launched windows␍
+ - These settings can be saved on a per-window basis or as a Default for newly-launched windows
+
 
 ## 1.3.1 Through 1.3.4
 

src/client/spark/Admin/AdminModel.cs

@@ -7,12 +7,12 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using bts.api.core;
+using mbts.ui.shell;
 
 namespace mbts.spark {
    [Export]
    class AdminModel : IDisposable {
-      readonly string _user_name;
-      public string user_name => _user_name;
+      public readonly UserTuple user;
       
       readonly BehaviorSubject<IReadOnlyDictionary<uint, string>>
          _accounts_subject = new BehaviorSubject<IReadOnlyDictionary<uint, string>>(new Dictionary<uint, string>()),
@@ -24,14 +24,14 @@ namespace mbts.spark {
       IDisposable _dispose;      
 
       [ImportingConstructor]
-      AdminModel(AdminService service, [Import("username")]string user_name) {
-         _user_name = user_name;
+      AdminModel(AdminService service, [Import]UserTuple user) {
+         this.user = user;
          _dispose = service.subscribei_admin_data().Select(update => {
-            _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), _user_name));
+            _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user.name));
             IEnumerable<BTSUserImmutable> active_users =
                from admin_data in update.all
                from bts_user in admin_data.Users
-               where bts_user.Name == user_name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions
+               where bts_user.Name == user.name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions
                select bts_user;
 
             IEnumerable<BTSAccountImmutable> active_accounts =
@@ -62,14 +62,6 @@ namespace mbts.spark {
       public IObservable<IReadOnlyList<AccountTuple>> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList());
       public IObservable<AdminModelWrapper> on_admin_data => _wrapper_subject.AsObservable();
 
-      public UserTuple? get_current_user() {
-         foreach (var kv in _user_map) {
-            // just for good measure, there should never be > 1 element in _user_map, and it should always match _user_name
-            if (kv.Value == _user_name)
-               return new UserTuple(kv.Key, kv.Value);
-         }
-         return null;
-      }
       public AccountTuple? get_default_account() {
          foreach (var kv in _account_map) {
             return new AccountTuple(kv.Key, kv.Value);

src/client/spark/Daemons/AboutDaemon.cs

@@ -3,6 +3,7 @@ using mbts;
 using mbts.config;
 using mbts.spark;
 using mbts.ui;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -22,7 +23,7 @@ namespace bts.ui {
       IDisposable _dispose;
 
       [ImportingConstructor]
-      public AboutDaemon(IBus bus, [Import("username")]string username) {
+      public AboutDaemon(IBus bus, [Import(LoginContainer.Exports.UserName)]string username) {
          _user = username;
          _bus = bus;
          _dispose = bus.subscribe(SparkTags.About).OnDispatcher().Subscribe(_ => show_about());

src/client/spark/Daemons/ErrorReporter.cs

@@ -10,6 +10,7 @@ using System.Reactive.Linq;
 using System.Windows.Threading;
 using System.Windows;
 using System.Threading.Tasks;
+using mbts.ui.shell;
 
 namespace bts.spark
 {
@@ -20,7 +21,7 @@ namespace bts.spark
       IDisposable _dispose;
 
       [ImportingConstructor]
-      public ErrorReporter(ErrorReportService svc, IBus bus, [Import("username")] string username) {
+      public ErrorReporter(ErrorReportService svc, IBus bus, [Import(LoginContainer.Exports.UserName)] string username) {
          _svc = svc;
          _username = username;
          _dispose = bus.subscribe(SparkTags.Support).OnDispatcher().Subscribe(msg => show_support_window(msg, "Report a problem"));
@@ -82,7 +83,6 @@ namespace bts.spark
          }
       }
 
-      //public static async Task<Result<T>>
       public static async Task<(T value, bool success)> safe_execute<T>(this ErrorReporter error_reporter, Func<Task<Result<T>>> execute, Func<T, bool> get_success, Func<T, string> get_error_msg, string desc) {
          try {
             var result = await execute();
@@ -101,5 +101,31 @@ namespace bts.spark
          void _report_error(string msg) =>
             error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning);
       }
+
+      public static async Task<TResult> safe_execute<T, TResult>(
+         this ErrorReporter error_reporter,
+         Func<Task<Result<T>>> execute,
+         Func<T, bool> get_success,
+         Func<T, string> get_error_msg,
+         Func<T, bool, TResult> result_selector,
+         string desc) {
+         //
+         try {
+            var result = await execute();
+            if (!result.success) {
+               _report_error(result.error_message);
+            } else if (!get_success(result.value)) {
+               _report_error(get_error_msg(result.value));
+            } else {
+               return result_selector(result.value, true);
+            }
+         } catch (Exception ex) {
+            _report_error(ex.ToString());
+         }
+         return result_selector(default, false);
+         //
+         void _report_error(string msg) =>
+            error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning);
+      }
    }
 }

src/client/spark/Daemons/MDDaemon.cs

@@ -15,6 +15,7 @@ using System.Collections.Concurrent;
 using System.Threading;
 using bts.api.user;
 using bts.md;
+using mbts.ui.shell;
 
 namespace bts {
    [Export(typeof(IInitializable))]
@@ -27,8 +28,8 @@ namespace bts {
       static uint get_naggle() => mbts.config.Configuration.get<md.RelayOptions>().naggle_ms;
 
       [ImportingConstructor]
-      public MDDaemon(Lazy<IBus> bus, Lazy<AuthTokenImmutable> token, Lazy<SyntheticSecurityService> ss) : 
-         base(get_naggle(), MDSourceOptions.DeferInit) {
+      public MDDaemon(Lazy<IBus> bus, Lazy<AuthTokenImmutable> token, Lazy<SyntheticSecurityService> ss, [Import(LoginContainer.Exports.UserID)]uint user_id) : 
+         base(get_naggle(), MDSourceOptions.DeferInit, user_id) {
          _bus = bus;
          _token = token;
          _ss = ss;         

src/client/spark/Daemons/ShellLatencyDaemon.cs

@@ -3,6 +3,7 @@ using bts.metrics;
 using mbts;
 using mbts.config;
 using mbts.ui;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -23,7 +24,7 @@ namespace bts.perf {
       Ping _pinger = new Ping();
 
       [ImportingConstructor]
-      public ShellLatencyDaemon(ShellLatencyService service, [Import("username")] string user) {
+      public ShellLatencyDaemon(ShellLatencyService service, [Import(LoginContainer.Exports.UserName)] string user) {
          _service = service;
          _version = Configuration.get<bts.config.System>().version;
          _username = user;

src/client/spark/Modules/Market/MarketShellModule.cs

@@ -5,6 +5,7 @@ using mbts.co2;
 using mbts.persist;
 using mbts.spark;
 using mbts.ui;
+using mbts.ui.shell;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -18,7 +19,7 @@ namespace bts.shell
    class MarketShellModule : IShellModule
    {
       [ImportingConstructor]
-      public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import("username")]string user_name) {
+      public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import(LoginContainer.Exports.UserName)]string user_name) {
          _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub);
          _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model);
       }

src/client/spark/Modules/Spreader/SpreaderModel.cs

@@ -1,6 +1,7 @@
 using bts.api;
 using bts.api.synthetic;
 using bts.spark;
+using mbts.ui.shell;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -14,12 +15,14 @@ namespace mbts.spark {
       readonly IBus _bus;
       readonly SyntheticSecurityService _service;
       readonly ErrorReporter _error;
+      readonly uint _user_id;
 
       [ImportingConstructor]
-      public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error) {
+      public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) {
          _bus = bus;
          _service = service;
          _error = error;
+         _user_id = user_id;
       }
 
       public IObservable<IReadOnlyDictionary<uint, ExecutionStrategyImmutable>> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag);
@@ -39,29 +42,40 @@ namespace mbts.spark {
             return (result, success);
          });
 
-      public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(SecurityImmutable security) =>
-         await lookup_strategy_async(security.Id);
+      public Task<ExecutionStrategyImmutable?> lookup_strategy_async(SecurityImmutable security) =>
+         lookup_strategy_async(security.Id);
 
-      public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(uint id) {
-         var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } });
-         if (result.success) {
-            var metadata = result.value.Data.FirstOrDefault(i => i.SecurityKey == id);
-            if (metadata != null) {
-               return metadata.Strategy;
-            }
+      public Task<ExecutionStrategyImmutable?> lookup_strategy_async(uint id) =>
+         _error.safe_execute(
+            () => _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } }),
+            mdc => mdc.Data.Count == 1 && mdc.Data[0].SecurityKey == id,
+            mdc => $"did not find strategy for security id '{id}.'",
+            (mdc, success) => success ? mdc.Data[0].Strategy : (ExecutionStrategyImmutable?)null,
+            "lookup strategy");
+
+      public Task<uint?> create_synthetic(SecurityImmutable synthetic) {
+         if (synthetic.ContractCase != Security.ContractOneofCase.Synthetic)
+            return null;
+         if (synthetic.Synthetic.UserId != _user_id) {
+            var msynth = synthetic.CloneToMutable();
+            msynth.Synthetic.UserId = _user_id;
+            synthetic = new SecurityImmutable(msynth);
          }
-         return null;
+         return _error.safe_execute(
+            () => _service.create_synthetic_async(synthetic),
+            r => r.Error == CreateResult.Types.Error.Ok,
+            r => r.Error.ToString(),
+            (r, success) => success ? r.Key : (uint?)null,
+            "creating synthetic");
       }
 
-      public async Task<uint?> create_synthetic(SecurityImmutable? synthetic) {
-         var result = await _service.create_synthetic_async(synthetic.Value);
-         return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result;
-      }
-
-      public async Task<bool> save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) {
-         var result = await _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() });
-         return _error.handle_error(result, "Error saving execution strategy: {0}", r => r.Error, e => e == UpdateResult.Types.Error.Ok);
-      }
+      public Task<bool> save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) =>
+         _error.safe_execute(
+            () => _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() }),
+            r => r.Error == UpdateResult.Types.Error.Ok,
+            r => r.Error.ToString(),
+            (r, success) => success,
+            "saving strategy");
 
       public async Task<bool> verify_name_is_unique(string name) {
          var (result, success) = await strategy_tuple.FirstAsyncTask(SparkUtils.DefaultTimeOut);

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

@@ -134,7 +134,7 @@ namespace mbts.spark {
                _synthetic.ContractSpec.PriceBreak = double.MaxValue;
                _synthetic.ContractSpec.MainFraction = (uint)MathUtils.factor_out(_tick_factors.tick_base, 10);
                _synthetic.ContractSpec.PriceDisplayFormat = (uint)_tick_factors.display_digits();
-               uint? id = await model.create_synthetic(_synthetic);
+               uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
                if (id.HasValue && id != 0) {
                   if (await model.save_strategy(id.Value, get_strategy())) {
                      var (smd, success) = await SparkUtils.get_security_md_async(bus, id.Value);

src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs

@@ -1,5 +1,4 @@
 using bts;
-using bts.api;
 using bts.api.core;
 using bts.api.orderman;
 using bts.persist.algo;
@@ -110,38 +109,24 @@ namespace mbts.spark {
       public void Dispose() =>
          Disposable.dispose(ref _dispose);
 
-      async Task<AlgoData?> _create_definition(CompositeAlgoDefinitionImmutable definition) {
-         if (_try_get_user(out uint user_id)) {
-            return await _create_definition(definition, user_id);
-         } else {
-            _report_no_user_id(ActionMetadata.CreateDefinition);
-         }
-         return null;
-      }
+      async Task<AlgoData?> _create_definition(CompositeAlgoDefinitionImmutable definition) =>
+         await _create_definition(definition, _admin_model.user.id);
 
       async Task<AlgoTemplateData?> _create_template(AlgoTemplateImmutable template) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async(
-               new TemplateCreateRequest { UserId = user_id, NewTemplate = template.CloneToMutable() }),
-               r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate);
-            if (success)
-               return _Utils.template_data(value.Record);
-         } else {
-            _report_no_user_id(ActionMetadata.CreateTemplate);
-         }
+         var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async(
+            new TemplateCreateRequest { UserId = _admin_model.user.id, NewTemplate = template.CloneToMutable() }),
+            r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate);
+         if (success)
+            return _Utils.template_data(value.Record);
          return null;
       }
 
       async Task<AlgoTemplateData?> _update_template(AlgoTemplateRecordImmutable template) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async(
-               new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }),
-               r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate);
-            if (success)
-               return _Utils.template_data(template);
-         } else {
-            _report_no_user_id(ActionMetadata.UpdateTemplate);
-         }
+         var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async(
+            new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }),
+            r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate);
+         if (success)
+            return _Utils.template_data(template);
          return null;
       }
 
@@ -175,17 +160,6 @@ namespace mbts.spark {
       void _report_no_user_id(string desc) =>
          _error_reporter.report_error($"{desc} failed: did not find current user id");
 
-      bool _try_get_user(out uint id) {
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            id = user.Value.id;
-            return true;
-         } else {
-            id = 0;
-            return false;
-         }
-      }
-
       // used for error handling/reporting
       interface IActionMetadata {
          string desc { get; }

src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs

@@ -1,14 +1,11 @@
 using bts;
-using bts.api;
 using bts.api.core;
 using bts.api.orderman.algo;
 using bts.persist.algo;
 using bts.spark;
-using mbts.spark.utilities;
 using mbts.utils;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 
@@ -27,7 +24,12 @@ namespace mbts.spark {
          _admin_model = admin_model;
          _error_reporter = error_reporter;
          this.ui_configuration = ui_configuration;
-         definitions = service.subscribei_algo_definitions().Filter(r => r.Metadata.IsActive).SelectKeyValue(_definition_data, d => d.key).Table().Cache();
+         definitions =
+            service.subscribei_algo_definitions()
+            .Filter(r => r.Metadata.IsActive && r.Metadata.CreatorUserId == _admin_model.user.id)
+            .SelectKeyValue(_definition_data, d => d.key)
+            .Table()
+            .Cache();
       }
 
       public IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
@@ -39,15 +41,11 @@ namespace mbts.spark {
          Observable.Return(TableUpdate<AlgoTemplateData, AlgoKey>.mk_empty(t => t.key));
 
       public async Task<AlgoData?> save_definition(AlgoData definition_data) {
-         if (_try_get_user(out uint user_id)) {
-            var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
-               _with_key(new AlgoDefinitionUpdateRequest { UserId = user_id, Algo = _template(definition_data) }, definition_data.key)),
-               r => r.Success, r => r.ErrorMessage, "saving template");
-            if (success)
-               return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
-         } else {
-            _report_no_user_id("save template");
-         }
+         var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
+            _with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _template(definition_data) }, definition_data.key)),
+            r => r.Success, r => r.ErrorMessage, "saving template");
+         if (success)
+            return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
          return null;
       }
 
@@ -105,16 +103,5 @@ namespace mbts.spark {
 
       void _report_no_user_id(string desc) =>
          _error_reporter.report_error($"{desc} failed: did not find current user id");
-
-      bool _try_get_user(out uint id) {
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            id = user.Value.id;
-            return true;
-         } else {
-            id = 0;
-            return false;
-         }
-      }
    }
 }

src/client/spark/Modules/Trading/Ladder/LadderSettings.cs

@@ -339,6 +339,7 @@ namespace mbts.spark {
                zoom_slider_visible = false,
                zoom_factor = _default_zoom_factor,
                net_change = NetChangeTerms.None,
+               mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general),
             };
             rv.row_height = LadderRender.measure_row_height(rv);
             return rv;

src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs

@@ -96,14 +96,28 @@ namespace bts.shell {
                   lp => new SettingsProfile<LadderSettings>(lp.id, lp.name, LadderSettings.sanitize(lp.value), lp.security_criteria))),
                (us, lps) => us.with(ladder_profiles: lps.Values.Select(lp => new LadderSettingsProfile(lp.id, lp.name, lp.value, lp.security_criteria)).ToArray()));
             state_settings?.sanitize();
+            /// When settings are adjusted outside of the settings dialog, the vm should raise the <see cref="LadderVM.settings_invalidated"/> event.
+            /// In response to that event, 'needs_resync' is set to true. This causes 'last_value' to be refreshed when the next caller requests the latest settings
+            /// (i.e., an IObserver subscribing to the settings_source, or the settings-dialog viewmodel).
+            bool initialized = false, needs_resync = false;
             LadderSettings last_value = fit_to_sec(state_settings);
-            var settings_subject = new BehaviorSubject<LadderSettings>(last_value);
+            LadderVM vm = null;
+            var settings_subject = new Subject<LadderSettings>();
+            var settings_source = Observable.Create<LadderSettings>(o => {
+               ensure_synced();
+               if (last_value != null)
+                  o.OnNext(last_value);
+               return settings_subject.Subscribe(s => {
+                  if (s != null)
+                     o.OnNext(s);
+               });
+            });
             // vm
-            var vm = LadderVM.create(_bus, model, last_value ?? _settings_hub.current.ladder, settings_subject.Where(s => s != null));
+            vm = LadderVM.create(_bus, model, LadderSettings.sanitize(last_value ?? _settings_hub.current.ladder), settings_source);
+            vm.settings_invalidated += on_settings_invalidated;
             vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select;
             vm.order_properties_vm.use_algo_param_grid = _ladder_conf.use_algo_param_grid;
             vm.request_settings_dialog += open_settings_dialog;
-            bool initialized = false;
             var settings_subscription = _settings_hub.subscribe_default_settings().Subscribe(on_user_settings);
             vm.OnDisposed += disposing => {
                Disposable.dispose(ref settings_subscription);
@@ -119,8 +133,25 @@ namespace bts.shell {
             LadderSettings fit_to_sec(LadderSettings s) =>
                _fit_to_sec(s, md.security.ContractCase);
 
+            void on_settings_invalidated() =>
+               needs_resync = true;
+
+            void ensure_synced() {
+               if (!needs_resync)
+                  return;
+               var curr = vm.get_save_state();
+               if (settings_id == 0) {
+                  last_value = curr;
+               } else if (!curr.Equals(last_value)) {
+                  settings_id = 0;
+                  last_value = curr;
+               }
+               needs_resync = false;
+            }
+
             void on_user_settings(UserSettings us) {
                if (initialized) {
+                  ensure_synced();
                   if (settings_id == 0) {
                      // not on a profile, don't respond to default settings changes
                      return;
@@ -290,4 +321,4 @@ namespace bts.shell {
       [ProtoMember(3)]
       public uint settings_id;
    }
-}
+}

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

@@ -355,8 +355,19 @@ namespace mbts.spark {
       }
 
       public LadderSettings get_result() {
-         var clone = SparkUtils.clone_proto(_current);
-         clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create());
+         LadderSettings clone;
+         if (_current == null) {
+            clone = new LadderSettings {
+               mini_ob = new LadderMiniOrderBookSettings(mini_ob.create())
+            };
+         } else {
+            clone = SparkUtils.clone_proto(_current);
+#pragma warning disable CS0612 // Type or member is obsolete
+            clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ? 
+               mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) :
+               mini_ob.create());
+#pragma warning restore CS0612 // Type or member is obsolete
+         }
          clone.badge_style = badge_style;
          clone.alternate_order_size = alternate_order_size;
          clone.favorite_algos = favorite_algos_vm.create();

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

@@ -241,7 +241,7 @@ namespace mbts.spark {
 
       public IBus bus => _bus;
 
-      public event Action on_tick, request_settings_dialog;
+      public event Action on_tick, request_settings_dialog, settings_invalidated;
 
       public MDConsumerHandle md => _model.md;
       // we return only entries who have piqs and whose piqs are not uint.Max
@@ -394,6 +394,12 @@ namespace mbts.spark {
          }
       }
 
+      public void on_mini_orderbook_closed(bts.shell.orderbook.OrderBookStartupData ob_state) {
+         current_settings = SparkUtils.clone_proto(current_settings);
+         current_settings.mini_ob = new LadderMiniOrderBookSettings(ob_state.orderbook_grid.general);
+         settings_invalidated?.Invoke();
+      }
+
       public void send_order((double price, Side? side, MouseButton button) args) {
          if (order_properties_vm == null || args.button == MouseButton.Middle)
             return;

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

@@ -51,7 +51,7 @@ namespace mbts.spark {
                LadderVM.create_readonly(_bus,
                   new LadderModel(security_md.Value, _model, _model.mbo_service,
                   new Func<OrderSecurity, bool>(osec => _selected_order_tree.Contains(osec.order.Key))),
-                  Observable.Return(LadderSettings.Default)) : null);
+                  Observable.Return(LadderSettings.sanitize(LadderSettings.Default))) : null);
          RaisePropertyChanged(nameof(value));
       }
    }

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

@@ -67,7 +67,8 @@ namespace mbts.spark {
       NativePriceSize _last_trade;
       Func<NativePriceSize, string> _fmt_size = MDDisplayHelper.get_formatter_nps(MarketSizeDisplay.get_default());
       int _old_tooltip_row = int.MaxValue;
-      double _old_last_trade_price = 0.0;
+      NativePriceSize? _old_last_trade;
+      string _direction_arrow = string.Empty;
       bool _tooltips_are_hooked_up = false;
       ToolTip tooltip_view = new ToolTip();
       IDisposable _parameterized_order_popup;
@@ -693,12 +694,14 @@ namespace mbts.spark {
                   // At any rate, we need this part hiding the tooltip so that we don't leave random tooltips around
                   // and we have to reset to old row so that when we go back to what could be our preivous row, the tooltip gets drawn again
                   //System.Diagnostics.Debug.WriteLine("   Tooltip - Volume is 0");
+                  _old_tooltip_row = int.MaxValue;
                   _hide_tool_tip();
                   //_old_tooltip_row = Int32.MaxValue;
                }
             }
          } else {
             //System.Diagnostics.Debug.WriteLine("   Tooltip - not over Volume column");
+            _old_tooltip_row = int.MaxValue;
             _hide_tool_tip();
          }
       }
@@ -861,21 +864,43 @@ namespace mbts.spark {
       void _refresh_volume_at_price() {
          if (!_settings.volume_column.general.show)
             return;
+
+         // if the last trade has a new size then we need to explicitly
+         // mark the volume container as dirty because there is a chance
+         // we have arrived here off a size change and not a volume change
+         // or a random change, like applying new settings
+         bool last_trade_size_changed = _old_last_trade.HasValue ? _last_trade.size != _old_last_trade.Value.size : true;
+         if (last_trade_size_changed && _settings.volume_column.show_ltq) {
+            _volume_container.mark_dirty();
+         }
          var vapls = _volume_container.read_new_value();
          if (vapls != null) {
             Log.assert_d(_price_list != null);
-            var ltp = _last_trade.price;
-            var last_index = LadderRender.index_of(_price_list, ltp, _price_comparer);
-            string direction_arrow = string.Empty;
-            if (MathUtils.epsilon_equals(ltp, _old_last_trade_price)) {
-               // do nothing if in here b/c direction_arrow already string.empty
-            } else if (ltp > _old_last_trade_price) {
-               direction_arrow = "▲";
-            } else {
-               direction_arrow = "▼";
-            }
-            LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _last_trade, direction_arrow);
-            _old_last_trade_price = ltp;
+            var last_index = LadderRender.index_of(_price_list, _last_trade.price, _price_comparer);
+            LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _get_last_arrow_string());
+            _old_last_trade = _last_trade;
+         }
+
+         string _get_last_arrow_string() {
+            // if _old_last_trade doesn't have a value, this is the first time the ladder has been launched
+            // and so the direction should be drawn without an arrow since there is no basis for comparison
+            if (!_old_last_trade.HasValue) {
+               _direction_arrow = string.Empty;
+               // if the Lasts are different then we need to reformat the direction arrow in some fashion
+            } else if (_old_last_trade != _last_trade) {
+               var ltp = _last_trade.price;
+               if (MathUtils.epsilon_equals(ltp, _old_last_trade.Value.price)) {
+                  // update on the same price, so size must be different
+                  _direction_arrow = string.Empty;
+               } else if (ltp > _old_last_trade.Value.price) {
+                  _direction_arrow = "▲";
+               } else {
+                  _direction_arrow = "▼";
+               }
+            } 
+            // regardless of if we've arrived here via a new Last (and new direction arrow)
+            // or we're reusing the old one, this format bit is the same
+            return $"{_direction_arrow} {_last_trade.size} ";
          }
       }
 

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

@@ -9,9 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Interactivity;
 using System.Windows.Media;
 
 namespace mbts.spark {
@@ -156,7 +154,10 @@ namespace mbts.spark {
                popup.SetBinding(System.Windows.Controls.Primitives.Popup.IsOpenProperty,
                   nameof(OrderBookVM.is_row_collection_populated)
                );
-               popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose();
+               popup.Closed += (sender, event_args) => {
+                  (_parent.DataContext as LadderVM)?.on_mini_orderbook_closed(obvm.create());
+                  (popup.DataContext as IDisposable)?.Dispose();
+               };
                popup.MouseUp += (sender, event_args) => {
                   if (event_args.ChangedButton == MouseButton.Middle) {
                      popup.IsOpen = false;

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

@@ -196,8 +196,7 @@ namespace mbts.spark {
         ContractSpecificationImmutable spec,
         VolumeColumnSettings settings,
         int last_index,
-        NativePriceSize last_trade, 
-        string direction_arrow
+        string last_size_and_direction
         ) {
          if (!data.Any()) {
             _clear_visual(dv);
@@ -216,16 +215,16 @@ namespace mbts.spark {
          Brush total_brush = null;
          if (settings.total.bars.result.HasValue) {
             total_brush = new SolidColorBrush(settings.total.bars.result.Value);
-         } else if (components.Count == 0) {
+         } else if (components.Count == 0 && !settings.show_ltq) {
             _clear_visual(dv);
             return;
          }
          // inflate the max so that the graph never fills the available space
          double max = data.Max(v => v.Volume) * 1.1;
-         Brush text_brush = settings.general.foreground.rgb_brush();
          _render_cells(dv, row_height, data.Select(d => (d.Price, d)), settings.general, prices, spec, render_cell);
          /// local methods
          void render_cell(DrawingContext dc, int r, VolumeAtPriceLevelImmutable vap) {
+            Brush text_brush = settings.general.foreground.rgb_brush();
             double y = row_height * r;
             var last_trade_here = r == last_index;
 
@@ -259,7 +258,8 @@ namespace mbts.spark {
             }
             if (settings.show_ltq && last_trade_here) {
                numbers_text.Clear();
-               numbers_text.Add($"{direction_arrow} {last_trade.size} ");
+               numbers_text.Add(last_size_and_direction);
+               text_brush = BTSCoreColors.white;
             }
             if (numbers_text.Count > 0) {
                string str = string.Join("/", numbers_text);

src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml

@@ -14,7 +14,6 @@
              xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api"
              mc:Ignorable="d"
              MaxHeight="240"
-             MinWidth="875"
              d:DesignHeight="600" d:DesignWidth="1080"
              FocusManager.IsFocusScope="True"
              Background="{StaticResource CommonBackground}">

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

@@ -1177,7 +1177,6 @@ namespace mbts.spark {
       public class CommitColumn : FrameworkElementColumnBase<Columns> {
          public CommitColumn() : base(Columns.Commit) {
             id = key.ToString();
-            Header = "";
             Width = 20;
          }
 

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

@@ -331,8 +331,8 @@ namespace mbts.spark {
 
          IDisposable connect_order_mod_vm() =>
             Disposable.Create(
-               _selected_params_mon.subscribe_algos().Subscribe(order_mod_vm.algo_vm.load_many),
-               order_mod_vm.subscribe_is_dirty().Subscribe(_ => {
+               _selected_params_mon.subscribe_algos().OnDispatcher().Subscribe(order_mod_vm.algo_vm.load_many),
+               order_mod_vm.subscribe_is_dirty().OnDispatcher().Subscribe(_ => {
                   modify_selected_orders_async_cmd.RaiseCanExecuteChanged();
                   revert_selected_orders_cmd.RaiseCanExecuteChanged();
                }),
@@ -340,10 +340,10 @@ namespace mbts.spark {
 
          IDisposable connect_common_selected_params(OrderParamsVM vm) =>
             Disposable.Create(
-               _selected_params_mon.subscribe_security().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval),
-               _selected_params_mon.subscribe_price().Subscribe(vm.on_common_price),
-               _selected_params_mon.subscribe_size().Subscribe(vm.on_common_size),
-               _selected_params_mon.subscribe_account().Subscribe(newval => vm.selected_account = newval));
+               _selected_params_mon.subscribe_security().OnDispatcher().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval),
+               _selected_params_mon.subscribe_price().OnDispatcher().Subscribe(vm.on_common_price),
+               _selected_params_mon.subscribe_size().OnDispatcher().Subscribe(vm.on_common_size),
+               _selected_params_mon.subscribe_account().OnDispatcher().Subscribe(newval => vm.selected_account = newval));
       }
 
       private void _row_collection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
@@ -994,11 +994,13 @@ namespace mbts.spark {
             var join = config.Configuration.get<bts.config.JoinAttachUIOptions>();
             var lean = config.Configuration.get<bts.config.LeanAttachUIOptions>();
             var top = config.Configuration.get<bts.config.TopAttachUIOptions>();
+            var offset = config.Configuration.get<bts.config.OffsetAttachUIOptions>();
             _algo_type_conf = new Dictionary<CustomOrderDefinition.CustomOneofCase, (bool, bool)> {
                { CustomOrderDefinition.CustomOneofCase.Cover, (cover.show_price, cover.show_quantity) },
                { CustomOrderDefinition.CustomOneofCase.Join, (join.show_price, join.show_quantity) },
                { CustomOrderDefinition.CustomOneofCase.Lean, (lean.show_price, lean.show_quantity) },
-               { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) }
+               { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) },
+               { CustomOrderDefinition.CustomOneofCase.Offset, (offset.show_price, offset.show_quantity) }
             };
          }
 

src/client/spark/Orders/OrderDataHelper.cs

@@ -168,17 +168,14 @@ namespace mbts.spark.utilities {
             // this will be the tag 50 on CME orders
             // current user might be okay, but we might also want to get it
             // from the store that serves the risk admin gui
-            ManualOrderIndicator = ManualOrderIndicator.Yes
+            ManualOrderIndicator = ManualOrderIndicator.Yes,
+            User = _admin_model.user.name,
+            UserId = _admin_model.user.id
          };
          if (account.HasValue) {
             rv.Account = account.Value.name;
             rv.AccountId = account.Value.id;
          }
-         var user = _admin_model.get_current_user();
-         if (user.HasValue) {
-            rv.User = user.Value.name;
-            rv.UserId = user.Value.id;
-         }
          return rv;
       }
 
@@ -605,7 +602,8 @@ namespace mbts.spark.utilities {
             CustomOrderDefinition.CustomOneofCase.Lean,
             CustomOrderDefinition.CustomOneofCase.Join,
             CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top
+            CustomOrderDefinition.CustomOneofCase.Top,
+            CustomOrderDefinition.CustomOneofCase.Offset
          },
          // The following spreader types are not yet ready for production use:
          // CustomOrderDefinition.CustomOneofCase.Dynamic,
@@ -622,7 +620,8 @@ namespace mbts.spark.utilities {
             CustomOrderDefinition.CustomOneofCase.Lean,
             CustomOrderDefinition.CustomOneofCase.Join,
             CustomOrderDefinition.CustomOneofCase.Cover,
-            CustomOrderDefinition.CustomOneofCase.Top
+            CustomOrderDefinition.CustomOneofCase.Top,
+            CustomOrderDefinition.CustomOneofCase.Offset
          },
          outright_order_types = new[] {
             CustomOrderDefinition.CustomOneofCase.Market,
@@ -718,7 +717,7 @@ namespace mbts.spark.utilities {
                !b.HasChild);
 
          public static bool top_equals(TopOrderDefinitionImmutable a, TopOrderDefinitionImmutable b) =>
-            a.WatchLevelTickOffset == b.WatchLevelTickOffset &&
+            a.TicksOff == b.TicksOff &&
             (a.HasTopThreshold ?
                b.HasTopThreshold && quantity_measure_equals(a.TopThreshold, b.TopThreshold) :
                !b.HasTopThreshold) &&
@@ -909,7 +908,7 @@ namespace mbts.spark.utilities {
                      add_component(_get_hash(_get_tick_child(tick)));
                      break;
                   case CustomOrderDefinition.CustomOneofCase.Top:
-                     add_component(def.Top.WatchLevelTickOffset.GetHashCode());
+                     add_component(def.Top.TicksOff.GetHashCode());
                      add_component(def.Top.HasTopThreshold ? def.Top.TopThreshold.GetHashCode() : 0);
                      add_component(_get_top_child(def.Top).GetHashCode());
                      break;

src/client/spark/Orders/OrderPropertiesEditorVM.cs

@@ -105,13 +105,18 @@ namespace mbts.spark {
          var inline_account_src = order_properties.AggregateLatest(
             model.factory.subscribe_accounts(),
             (last, change, cache) => convert_inline_account(change.New.account, cache),
-            (last, props, change) => convert_inline_account(props.account, change.New),
+            (last, props, change) => convert_inline_account(props.account, change.New, false),
             () => new InlineUserProperty<AccountTuple>(),
             new InlineOrderProperties(),
             DictionaryHelper.empty<uint, string>());
+         // Note that with the .Where on the account_tuples, we will ignore any
+         // updates for which all accounts have been removed.
+         // This was a safer change than changing SelectorProperty's IEnumberable.OnNext
+         // so that it would not reset the selected item on server reboots; i.e. this
+         // change only affects this IObservable.
          _accounts = backing(
             nameof(selected_account),
-            model.factory.subscribe_account_tuples(),
+            model.factory.subscribe_account_tuples().Where(items => items.Any()),
             inline_account_src,
             a => new AccountTuple?(a),
             () => accounts.Cast<AccountTuple?>().FirstOrDefault(),
@@ -263,9 +268,18 @@ namespace mbts.spark {
                   break;
             }
          }
-         InlineUserProperty<AccountTuple> convert_inline_account(InlineUserProperty<uint> account_id, IReadOnlyDictionary<uint, string> account_map) =>
+         //
+         //  Regarding the 3rd parameter, force_override_from_inline_property:
+         //    When using an InlineUserProperty, in the context of assigning a default vs selected item,
+         //    there is somewhat of a conflict between the IObserver<InlineUserProperty<TItem>> and the 
+         //    IObserver<IEnumerable<TItem>> OnNext methods.  This 3rd paramter provides yet another override
+         //    to say if the force_override should come from the inline property or if the force_override should
+         //    be disbled, by way of the immediate return in ViewModelBase._try_auto_select when force_override
+         //    is false.  Our intent is then accomplished because we are no longer attempting to set a default/
+         //    selected item when the account_tuples potentially changes
+         InlineUserProperty<AccountTuple> convert_inline_account(InlineUserProperty<uint> account_id, IReadOnlyDictionary<uint, string> account_map, bool force_override_from_inline_property = true) =>
             account_id.has_value && account_map.TryGetValue(account_id.value, out string name) ?
-               new InlineUserProperty<AccountTuple>(new AccountTuple(account_id.value, name), account_id.force_override) :
+               new InlineUserProperty<AccountTuple>(new AccountTuple(account_id.value, name), force_override_from_inline_property ? account_id.force_override : false) :
                new InlineUserProperty<AccountTuple>();
       }
 

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

@@ -5,13 +5,16 @@ using TopDefi = bts.api.orderman.TopOrderDefinitionImmutable;
 namespace mbts.spark {
    static partial class OrderTypeVMFactory {
       class TopOrderVM : OrderTypeVMBase<TopDef, TopDefi> {
+         readonly Property<uint?> _ticks_off;
          readonly Property<QuantityMeasureImmutable?> _top_threshold;
 
          public TopOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions)
             : base(key, display_name, editing_permissions) {
+            _ticks_off = add_nullable_property<uint>(nameof(ticks_off), TopDef.TicksOffFieldNumber);
             _top_threshold = add_property<QuantityMeasure, QuantityMeasureImmutable>(nameof(top_threshold), TopDef.TopThresholdFieldNumber, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 }));
          }
 
+         public uint? ticks_off { get => _ticks_off.Value; set => _ticks_off.set(value); }
          public QuantityMeasureImmutable? top_threshold { get => _top_threshold.Value; set => _top_threshold.set(value); }
       }
    }

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

@@ -820,6 +820,11 @@ namespace mbts.ui.shell {
 
          void _try_auto_select() {
             if (_is_user_selected_item) {
+               // if we have a user-selected item and the _desired_item for which we might want to set as the selected item
+               // isn't force_override, then no change
+               if (!_desired_item.force_override) {
+                  return;
+               }
                if (desired_item_valid() && _desired_item.force_override && _try_match_item(_desired_item.value, out TValue match)) {
                   _set_selected_item(match, SelectionReason.SettingsMandatedSelection);
                   return;

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

@@ -489,6 +489,8 @@
             </VisualStateGroup>
           </VisualStateManager.VisualStateGroups>
           <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="{Binding Source={StaticResource VerticalPush3}}"/>
             <RowDefinition Height="*"/>
@@ -503,9 +505,11 @@
             <c:HelpButton Margin="{StaticResource Margin.LP1}" ToolTip="If the order is at the top of book, the quantity remaining below which the order will be canceled."/>
           </StackPanel>
           <uag:QuantityMeasureControl x:Name="PART_TopThreshold_QuantityMeasureControl" Grid.Column="2" QuantityMeasure="{Binding top_threshold}"/>
+          <TextBlock Grid.Row="2">Ticks Off</TextBlock>
+          <c:TickUpDownUInt Grid.Row="2" Grid.Column="2" Value="{Binding ticks_off}"/>
           <uag:AlgoPickerNodeView
             x:Name="PART_Child_AlgoPickerNodeView"
-            Grid.Row="2"
+            Grid.Row="4"
             Grid.ColumnSpan="3"
             ItemsSource="{Binding children_vm.child.algos_view}"
             SelectedItem="{Binding children_vm.child.selected_algo}"

src/client/spark/view/Shell/Login/LoginModel.cs

@@ -28,16 +28,27 @@ namespace mbts.ui.shell {
          model.Dispose();
       }
 
-      [Export("username")]
+      [Export(Exports.UserName)]
       public string UserName { get; private set; }
 
-      [Export("userid")]
+      [Export(Exports.UserID)]
       public uint UserId { get; private set; }
+
+      [Export]
+      public UserTuple UserTuple => new UserTuple(UserId, UserName);
+
       [Export]
       public AuthTokenImmutable Token { get; private set; }
 
       [Export("workspace")]
       public string Workspace { get; private set; }
+
+      public static class Exports {
+         public const string
+            UserName = "username",
+            UserID = "userid",
+            UserTuple = "usertuple";
+      }
    }
 
    public struct User {
@@ -49,8 +60,7 @@ namespace mbts.ui.shell {
       public readonly UInt32 id;
    }
 
-   public class LoginModel : IDisposable
-   {
+   public class LoginModel : IDisposable {
       // Singleton to help bootstrap the system
       private static LoginModel _instance = new LoginModel();
       public static LoginModel instance { get { return _instance; } }
@@ -70,6 +80,11 @@ namespace mbts.ui.shell {
       public bool HasFatalError { get; set; }
       public User[] Users { get; private set; }
 
+      public bool try_get_user(string name, out User user) =>
+         Users.TryGetFirst(u => u.name == name, out user);
+
+      public bool user_exists(string name) =>
+         Users.Any(u => u.name == name);
 
       // The final username
       public (string, uint, AuthTokenImmutable) get_user() {

src/client/spark/view/Shell/Login/LoginView.xaml

@@ -6,6 +6,7 @@
         xmlns:ui="clr-namespace:mbts.ui"
         xmlns:uicore="clr-namespace:mbts.ui"
         xmlns:converters="clr-namespace:mbts.ui.converters"
+        xmlns:autocomplete="clr-namespace:WPFTextBoxAutoComplete;assembly=WPFTextBoxAutoComplete"
         mc:Ignorable="d" MouseDown="Window_MouseDown"
         Width="500" Height="309" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
         ui:StateManager.VisualState="{Binding VisualState}">
@@ -82,7 +83,13 @@
                <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
-            <ComboBox ItemsSource="{Binding UserNames}" Grid.ColumnSpan="2" Margin="10" SelectedItem="{Binding Name, Mode=TwoWay}" Width="160" />
+            <TextBox
+              Grid.ColumnSpan="2"
+              autocomplete:AutoCompleteBehavior.AutoCompleteItemsSource="{Binding KnownUsers}"
+              Margin="10"
+              Width="160"
+              Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
+            />
             <ComboBox ItemsSource="{Binding Workspaces}" Grid.Row="1" Grid.ColumnSpan="2" Margin="10" SelectedItem="{Binding SelectedWorkspace, Mode=TwoWay}" Width="160" MaxWidth="160" />
 
             <PasswordBox Grid.Row="2" Margin="10" MinWidth="120" Grid.ColumnSpan="2" x:Name="_password" PasswordChanged="_passwordChanged" Style="{DynamicResource PasswordBoxStyle1}" Width="160">

src/client/spark/view/Shell/Login/LoginViewModel.cs

@@ -18,7 +18,7 @@ namespace mbts.ui.shell
          _dispatcher = disp;
          _model = model;
          Workspaces = new ObservableCollection<string>();
-         LoginCommand = new DelegateCommand(OnLogin, _ => UserNames.Count > 0 && SelectedWorkspace != null);
+         LoginCommand = new DelegateCommand(OnLogin, _ => !string.IsNullOrEmpty(_name) && SelectedWorkspace != null);
          CancelCommand = new DelegateCommand(OnCancel);
          EmailCommand = new DelegateCommand(OnSendMail);
          if (_model.HasFatalError) {
@@ -42,9 +42,10 @@ namespace mbts.ui.shell
       void _model_Ready() {
          _dispatcher.BeginInvoke(() => {
             if (!_model.HasFatalError) {
-               this.UserNames.AddRange(_model.Users.Select(u => u.name));
                this.VisualState = "LoginState";
                load_username();
+               if (!string.IsNullOrEmpty(_name))
+                  KnownUsers.Add(_name);
                LoginCommand.RaiseCanExecuteChanged();
             }
             else {
@@ -57,8 +58,8 @@ namespace mbts.ui.shell
       private string _vstate = "Normal";
       public string VisualState { get { return _vstate; } set { _vstate = value; RaisePropertyChanged("VisualState"); } }
 
-      private ObservableCollection<string> _user_names = new ObservableCollection<string>();
-      public ObservableCollection<string> UserNames { get { return _user_names; } }
+      /// <see cref="KnownUsers"/> should only contain the user-name of the last login (if none exists, it should be empty).
+      public ObservableCollection<string> KnownUsers { get; } = new ObservableCollection<string>();
       private string _name;
       public string Name { 
          get { return _name; } 
@@ -82,12 +83,13 @@ namespace mbts.ui.shell
       private async void update_workspaces(string name) {
          Workspaces.Clear();
          Workspaces.Add("New workspace...");
-         var user = _model.Users.First(u => u.name == name);
-         var to_add = await _model.workspaces_for(user);
-         this.SelectedWorkspace = Workspaces.First();
-         if (to_add != null && name == _name && Workspaces.Count == 1) {
-            Workspaces.AddRange(to_add);
-            load_last_workspace(name);
+         SelectedWorkspace = Workspaces.First();
+         if (_model.try_get_user(name, out var user)) {
+            var to_add = await _model.workspaces_for(user);
+            if (to_add != null && name == _name && Workspaces.Count == 1) {
+               Workspaces.AddRange(to_add);
+               load_last_workspace(name);
+            }
          }
          RaisePropertyChanged("SelectedWorkspace");
          LoginCommand.RaiseCanExecuteChanged();
@@ -111,7 +113,7 @@ namespace mbts.ui.shell
             var value = key.GetValue("login");
             if (value != null) {
                var n = value.ToString();
-               if (UserNames.Contains(n)) {
+               if (_model.user_exists(n)) {
                   Name = n;
                }
             }

src/client/spark/view/Shell/ViewModels/LauncherVM.cs

@@ -1,14 +1,14 @@
-using System;
+using bts;
+using bts.api;
+using bts.spark;
+using mbts.ui.native;
+using mbts.ui.utility;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using mbts.ui.native;
-using mbts.ui.utility;
-using bts.api;
-using bts.spark;
-using bts;
 
 namespace mbts.ui.shell {
    [Export(typeof(ILauncher))]
@@ -23,7 +23,7 @@ namespace mbts.ui.shell {
       [ImportingConstructor]
       public LauncherVM(
          ObservableCollection<IShellModule> modules, 
-         [Import("username")]string username, 
+         [Import(LoginContainer.Exports.UserName)]string username, 
          ErrorReporter errors, IBus bus) {
          _user = username;
          _modules = new ObservableAutoWrapper<ShellModuleVM, IShellModule>(modules, m => new ShellModuleVM(m, bus));

src/client/spark/view/Shell/Workspaces/WorkspacesDialogView.xaml

@@ -45,12 +45,7 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="auto" />
                                 </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                </Grid.RowDefinitions>
                                 <TextBox Margin="4" Text="{Binding SaveName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" />
-                                <CheckBox Margin="4,0,4,0" Grid.Row="1" IsChecked="{Binding IsPublicWorkspace}" HorizontalAlignment="Left">Shared</CheckBox>
                                 <Button Grid.Column="1" HorizontalAlignment="Right" Margin="4" Command="{Binding SaveWorkspace}" IsDefault="True" MinWidth="60">Save</Button>
                             </Grid>
                         </Grid>

src/client/spark_api/Co2/MDConsumerHandle.cs

@@ -253,14 +253,13 @@ namespace mbts.co2 {
          }
       }
 
-      [StructLayout(LayoutKind.Sequential, Size = 712)]
+      [StructLayout(LayoutKind.Sequential, Size = 704)]
       internal struct ColdEntry {
          public int exchange_status;
          // Last trade
          public AtomicPriceSize last_trade;
          public ulong total_volume;
          public utils.LLDateTime last_trade_time;
-         private AggressorSide last_side; 
 
          //// Settlement
          public UInt64 misc_timestamp;

src/client/spark_api/Properties/AssemblyAttributes.cs

@@ -3,4 +3,5 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("spark_core")]
 [assembly: InternalsVisibleTo("sparkcmd")]
 [assembly: InternalsVisibleTo("spark_test")]
+[assembly: InternalsVisibleTo("spark_excel")]
 

src/client/spark_api/md/MDSource.cs

@@ -1,36 +1,33 @@
 using bts.api;
-using bts.api.synthetic;
 using mbts;
 using mbts.co2;
 using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using System.Linq;
-using SecurityKey = System.UInt32;
 using System.Collections.Concurrent;
-using System.Threading;
-using bts.api.user;
+using System.Collections.Generic;
 using System.Reactive.Subjects;
+using System.Threading.Tasks;
+using SecurityKey = System.UInt32;
 
-namespace bts.md
-{
+namespace bts.md {
    [Flags]
    enum MDSourceOptions {
       DeferInit = 1,
    }
    class MDSource : IObserver<List<SecurityAndHandle>>, IDisposable
-   {   
+   {
+      const uint _no_user_id = 0;
       protected readonly MDConsumer _consumer = new MDConsumer();
       protected readonly Co2RelayControl _relay;
       protected DateTime _version = DateTime.MinValue;
       protected readonly ConcurrentDictionary<SecurityKey, SecurityMD> _exchange_sec_map = new ConcurrentDictionary<SecurityKey, SecurityMD>();
       protected List<IDisposable> _dispose = new List<IDisposable>();
       protected readonly MDSourceOptions _options;
+      readonly uint _user_id;
 
-      public MDSource(uint naggle_ms, MDSourceOptions options = 0)
+      public MDSource(uint naggle_ms, MDSourceOptions options = 0, uint user_id = _no_user_id)
       {
          _options = options;
+         _user_id = user_id;
          _relay = new Co2RelayControl(_consumer, naggle_ms);
          _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore();
          _dispose.Add(_consumer.on_security.Subscribe(this));
@@ -54,12 +51,15 @@ namespace bts.md
 
       public void OnCompleted() { }
       public void OnError(Exception error) => Log.Md.error(error.ToString());
-      public void OnNext(List<SecurityAndHandle> values)
-      {
-         if (values.Count > 0)
-         {
-            foreach (var v in values)
-            {
+      public void OnNext(List<SecurityAndHandle> values) {
+         if (values.Count > 0) {
+            foreach (var v in values) {
+               if (_user_id != _no_user_id &&
+                  v.security.ContractCase == Security.ContractOneofCase.Synthetic &&
+                  v.security.Synthetic.UserId != _user_id &&
+                  v.security.Synthetic.UserId != _no_user_id) {
+                  continue;
+               }
                var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle);
                _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd);
             }
@@ -93,4 +93,4 @@ namespace bts.md
       }
 
    }
-}
+}

src/client/spark_api/md/MarketDataClient.cs

@@ -223,7 +223,7 @@ namespace bts.md
       {
          if (!timeout.HasValue)
          {
-            timeout = TimeSpan.FromMilliseconds(10000);
+            timeout = TimeSpan.FromHours(24);
          }
          CancellationTokenSource src = new CancellationTokenSource(timeout.Value);
          SecurityImmutable? security = await Task.Run<SecurityImmutable?>(async () =>

src/client/spark_excel/algogen/CellRef.cs

@@ -0,0 +1,297 @@
+using System;
+using System.Diagnostics;
+using System.Text;
+using bts.excel.extensions;
+
+namespace bts.excel
+{
+   /// <summary>
+   /// Defines a reference to some Cell instance, whether it exists or not.
+   /// </summary>
+   /// <remarks>
+   /// Static methods are provided for conversion of column names etc.
+   /// </remarks>
+   public sealed class CellRef : IComparable, IComparable<CellRef>
+   {
+      public CellRef(ExcelDna.Integration.ExcelReference rref) : this(rref.GetSheetName(), 
+         (rref.ColumnFirst + 1, rref.RowFirst + 1) )
+      {         
+      }
+      
+      /// <summary>
+      /// Constructor for the class: CellRef
+      /// </summary>
+      /// <param name="sheetName">Name of the sheet where the cell belongs.</param>
+      /// <param name="coordinate">Coordinate (column, row) for the cell in the sheet.</param>
+      public CellRef(string sheetName, (int col1, int row1) coordinate)
+      {
+         SheetName = sheetName;
+         SimpleSheetName = simple_sheet_name(SheetName);
+         Coordinate = coordinate;
+         LocalAddress = ConvertCoordToAddress(coordinate);
+      }
+      
+      static string simple_sheet_name(string sn)
+      {
+         int open = sn.IndexOf('[');
+         int close = sn.IndexOf(']', open + 1);
+         var ssn = sn.Substring(0, open) + sn.Substring(close + 1);
+         ssn = ssn.Replace("[", "").Replace("]", "_").Replace(".", "_");
+         return ssn;
+      }
+      
+      public string named_range { get; set;}
+      
+      public bool in_vector {get; set;} = false;
+      public (int col, int row) vector_coordinates {get; set;}
+
+      /// <summary>
+      /// Maximum number of rows, to e compatible with Excel.
+      /// </summary>
+      private const int MaxRows = 1048576;
+
+      /// <summary>
+      /// Maximum number of columns, to be compatible with Excel.
+      /// </summary>
+      private const int MaxColumns = 16384;
+
+      // NOTE: Worksheet and workbook specifications and limits
+      // http://office.microsoft.com/en-gb/excel-help/excel-specifications-and-limits-HP010342495.aspx
+      //
+      //      Worksheet size: 1,048,576 rows by 16,384 columns.
+      //          * 1048575 is the highest number representable in 20 bits.
+      //          * 16383 is the highest number representable in 14 bits. That leaves 2 spare bits in a 16-bit word.
+      //      Column width: 255 characters (I'm not sure what the real significance of this is).
+      //      Total number of characters that a cell can contain: 32,767 characters
+      //          * 32766 is the highest number representable in 15 bits. That leaves 1 spare bit in a 16-bit word.
+      //        
+
+      /// <summary>
+      /// Name of the sheet where the cell belongs.
+      /// </summary>
+      /// <remarks>
+      /// All cells belong to some Sheet instance, so this name must never be null or empty.
+      /// </remarks>
+      public string SheetName { get; }
+      public string SimpleSheetName { get; }
+
+      /// <summary>
+      /// Coordinate (column, row) for the cell in the sheet.
+      /// </summary>
+      public (int col1, int row1) Coordinate { get; }
+
+      public CellRef Offset(int columnOffset, int rowOffset)
+      {
+         return new CellRef(SheetName, (Column + columnOffset, Row + rowOffset));
+      }
+
+      public int Column => Coordinate.col1;
+
+      public int Row => Coordinate.row1;
+
+      public string LocalAddress { get; internal set; }
+
+      #region Address conversion
+
+      /// <summary>
+      /// Converts a column identifier, using letters, to a column number.
+      /// </summary>
+      /// <param name="columnName">Column identifier using letters.</param>
+      /// <returns>Column number.</returns>
+      /// <exception cref="ArgumentOutOfRangeException">When column number exceeds maximum.</exception>
+      public static int ConvertToColumnNumber(string columnName)
+      {
+         var number = 0;
+         var pow = 1;
+         for (var i = columnName.Length - 1; i >= 0; i--)
+         {
+            number += (columnName[i] - 'A' + 1) * pow;
+            pow *= 26;
+         }
+
+         if (number > MaxColumns)
+         {
+            throw new ArgumentOutOfRangeException(nameof(columnName),
+                "Column number from columnName exceeds maximum");
+         }
+
+         return number;
+      }
+
+      /// <summary>
+      /// Converts a column number to a column identifier using letters.
+      /// </summary>
+      /// <param name="columnNumber">Column number.</param>
+      /// <returns>Column identifier using letters.</returns>
+      /// <exception cref="ArgumentOutOfRangeException">When column number is invalid.</exception>
+      public static string ConvertToColumnName(int columnNumber)
+      {
+         if (columnNumber < 1 || columnNumber > MaxColumns)
+         {
+            throw new ArgumentOutOfRangeException(nameof(columnNumber),
+                "Invalid column number");
+         }
+
+         var dividend = columnNumber;
+         var columnName = string.Empty;
+         while (dividend > 0)
+         {
+            var modulo = (dividend - 1) % 26;
+            columnName = Convert.ToChar(65 + modulo) + columnName;
+            dividend = (dividend - modulo) / 26;
+         }
+
+         return columnName;
+      }
+
+      /// <summary>
+      /// Converts an address, like "A1", to a cell coordinate.
+      /// </summary>
+      /// <param name="address">Cell address, like "A1".</param>
+      /// <returns>Coordinate of cell on sheet.</returns>
+      /// <exception cref="ArgumentNullException">When address argument is null.</exception>
+      /// <exception cref="ArgumentException">When address is invalid.</exception>
+      public static (int col1, int row1) ConvertAddressToCoord(string address)
+      {
+         if (address == null)
+         {
+            throw new ArgumentNullException(nameof(address));
+         }
+
+         address = address.Replace("$", string.Empty);
+         address = address.ToUpper();
+
+         var letters = new StringBuilder();
+         foreach (var c in address)
+         {
+            if (c < 'A' || c > 'Z')
+            {
+               break;
+            }
+            letters.Append(c);
+         }
+
+         if (letters.Length == 0 || letters.Length > 3)
+         {
+            throw new ArgumentException(
+                "Column name requires 1 to 3 letters",
+                nameof(address));
+         }
+
+         var numbers = address.Substring(letters.Length);
+         if (numbers.Length == 0)
+         {
+            throw new ArgumentException("Row number is required", nameof(address));
+         }
+
+         Debug.Assert(letters.Length + numbers.Length == address.Length);
+
+         var row1 = int.Parse(numbers);
+         var col1 = ConvertToColumnNumber(letters.ToString());
+
+         return (col1, row1);
+      }
+
+      /// <summary>
+      /// Convert cell coordinate to cell address, like "A1".
+      /// </summary>
+      /// <param name="coordinate">Coordinate of cell on sheet.</param>
+      /// <param name="absolute">Provide absolute address, like "$A$1".</param>
+      /// <returns>Cell address, like "A1", or optionally like "$A$1".</returns>
+      /// <exception cref="ArgumentOutOfRangeException"></exception>
+      public static string ConvertCoordToAddress((int col1, int row1) coordinate, bool absolute = false)
+      {
+         if (coordinate.row1 < 1 || coordinate.row1 > MaxRows ||
+             coordinate.col1 < 1 || coordinate.col1 > MaxColumns)
+         {
+            throw new ArgumentOutOfRangeException(nameof(coordinate),
+                "Invalid coordinate");
+         }
+
+         var (col1, row1) = coordinate;
+         return absolute
+             ? $"${ConvertToColumnName(col1)}${row1}"
+             : $"{ConvertToColumnName(col1)}{row1}";
+      }
+
+      #endregion
+
+      #region IComparable
+
+      public int CompareTo(CellRef other)
+      {
+         if (other == null) return -1;
+         return string.Compare(ToString(), other.ToString(),
+             StringComparison.Ordinal);
+      }
+
+      public int CompareTo(object obj)
+      {
+         if (obj.GetType() != GetType()) return -1;
+         return CompareTo((CellRef)obj);
+      }
+
+      #endregion
+
+      #region HashCode & Equals
+
+      /// <returns>Unique key</returns>
+      public override string ToString()
+      {
+         return to_name();
+      }
+      
+      public string to_address()
+      {
+         if (!string.IsNullOrEmpty(SheetName))
+            return $"'{SheetName}'!{LocalAddress}";
+         else
+            return $"{LocalAddress}";
+      }
+
+      public string to_name()
+      {
+         if(!string.IsNullOrEmpty(named_range))
+            return named_range;
+         else
+         {
+            if (!string.IsNullOrEmpty(SheetName))
+            {
+               return $"{SimpleSheetName}_{LocalAddress}".ToLowerInvariant();
+            }
+            else
+               return $"{LocalAddress}".ToLowerInvariant();
+         }
+      }      
+      
+      public string r1_c1_include_sheet()
+      {
+         if (!string.IsNullOrEmpty(SheetName))
+            return $"'{SimpleSheetName}'!R{this.Row}C{this.Column}";
+         else
+            return $"R{this.Row}C{this.Column}";
+      }
+
+      public string r1_c1()
+      {
+         return $"R{this.Row}C{this.Column}";
+      }
+
+      public override int GetHashCode()
+      {
+         return ToString().GetHashCode();
+      }
+
+      public override bool Equals(object obj)
+      {
+         if (obj == null) return false;
+
+         if (obj != null && !(obj is CellRef))
+            throw new ArgumentException("Object must be of type CellRef.");
+
+         return GetHashCode().Equals(obj.GetHashCode());
+      }
+
+      #endregion
+   }
+}

src/client/spark_excel/algogen/ErrorValue.cs

@@ -0,0 +1,104 @@
+using System;
+
+namespace bts.excel
+{
+   public class ErrorValue : IComparable, IComparable<ErrorValue>
+   {
+      private enum ErrorType
+      {
+         Null,
+         Div0,
+         Value,
+         Ref,
+         Name,
+         Num,
+         NA
+      }
+
+      public static ErrorValue Null => new ErrorValue(ErrorType.Null);
+      public static ErrorValue Div0 => new ErrorValue(ErrorType.Div0);
+      public static ErrorValue Value => new ErrorValue(ErrorType.Value);
+      public static ErrorValue Ref => new ErrorValue(ErrorType.Ref);
+      public static ErrorValue Name => new ErrorValue(ErrorType.Name);
+      public static ErrorValue Num => new ErrorValue(ErrorType.Num);
+      public static ErrorValue NA => new ErrorValue(ErrorType.NA);
+
+      private const string HashNull = "#NULL!";
+      private const string HashDiv0 = "#DIV/0!";
+      private const string HashValue = "#VALUE!";
+      private const string HashRef = "#REF!";
+      private const string HashName = "#NAME?";
+      private const string HashNum = "#NUM!";
+      private const string HashNA = "#N/A";
+
+      private readonly ErrorType _errorType;
+
+      public ErrorValue(string token)
+          : this(GetErrorType(token))
+      { }
+
+      private ErrorValue(ErrorType errorType)
+      {
+         _errorType = errorType;
+      }
+
+      private static ErrorType GetErrorType(string token)
+      {
+         switch (token)
+         {
+            case HashNull: return ErrorType.Null;
+            case HashDiv0: return ErrorType.Div0;
+            case HashValue: return ErrorType.Value;
+            case HashRef: return ErrorType.Ref;
+            case HashName: return ErrorType.Name;
+            case HashNum: return ErrorType.Num;
+            case HashNA: return ErrorType.NA;
+            default: throw new Exception("Unrecongised error token");
+         }
+      }
+
+      public static bool IsErrorToken(string token)
+      {
+         switch (token)
+         {
+            case HashNull:
+            case HashDiv0:
+            case HashValue:
+            case HashRef:
+            case HashName:
+            case HashNum:
+            case HashNA:
+               return true;
+            default:
+               return false;
+         }
+      }
+
+      public override string ToString()
+      {
+         switch (_errorType)
+         {
+            case ErrorType.Null: return HashNull;
+            case ErrorType.Div0: return HashDiv0;
+            case ErrorType.Value: return HashValue;
+            case ErrorType.Ref: return HashRef;
+            case ErrorType.Name: return HashName;
+            case ErrorType.Num: return HashNum;
+            case ErrorType.NA: return HashNA;
+            default: throw new Exception("Unexpected condition");
+         }
+      }
+
+      public int CompareTo(ErrorValue other)
+      {
+         if (other == null) return -1;
+         return _errorType.CompareTo(other._errorType);
+      }
+
+      public int CompareTo(object obj)
+      {
+         if (obj.GetType() != GetType()) return -1;
+         return CompareTo(obj as ErrorValue);
+      }
+   }
+}

src/client/spark_excel/algogen/Expression.cs

@@ -0,0 +1,26 @@
+
+using spark_excel.grammar;
+
+namespace bts.excel
+{
+   public interface IExpression
+   {
+      object evaluate();
+   }
+   internal class Expression<T> : IExpression
+   {
+      private readonly ExcelFormulaParser.ExprContext _context;
+      private readonly IExcelFormulaVisitor<T> _visitor;
+
+      public Expression(ExcelFormulaParser.ExprContext context, IExcelFormulaVisitor<T> visitor)
+      {
+         _context = context;
+         _visitor = visitor;
+      }
+
+      public object evaluate()
+      {
+         return _context.Accept(_visitor);
+      }
+   }
+}

src/client/spark_excel/algogen/Generate.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Concurrent;
+using ExcelDna.Integration;
+using spark_excel.grammar;
+
+using Antlr4.Runtime;
+
+namespace bts.excel
+{
+   internal class ExcelFormulaErrorListener : BaseErrorListener
+   {
+      public bool IsValid { get; private set; } = true;
+      public string offendingSymbol { get; private set;}
+      public int line { get; private set; }
+      public int charPositionInLine { get; private set; }
+      public string msg { get; private set; }
+      public RecognitionException exception { get; private set;}
+
+      public override void SyntaxError(IRecognizer recognizer, IToken offendingSymbol, int line, int charPositionInLine, string msg, RecognitionException e)
+      {
+         IsValid = false;
+         this.offendingSymbol = offendingSymbol.Text;
+         this.line = line;
+         this.charPositionInLine = charPositionInLine;
+         this.msg = msg;
+         this.exception = e;
+      }
+   }
+
+   //https://theantlrguy.atlassian.net/wiki/spaces/ST/pages/1409118/Language+Translation+Using+ANTLR+and+StringTemplate
+   //https://stackoverflow.com/questions/31511610/antlr-source-to-target-language-conversion
+   public class Generate
+   {
+      
+      
+      [ExcelFunction(IsMacroType = true)]
+      static public string bts_generate_code([ExcelArgument(AllowReference=true)] object sink, string function_name = null)
+      {
+         ExcelReference rref = (ExcelReference)sink;
+         var formula = XlCall.Excel(XlCall.xlfGetCell, 41, rref);
+
+         var antlrstream = new AntlrInputStream(formula.ToString());
+         var lexer = new ExcelFormulaLexer(antlrstream);
+         var tokens = new CommonTokenStream(lexer);
+         var parser = new ExcelFormulaParser(tokens);
+
+         var error_listener = new ExcelFormulaErrorListener();
+         //parser.RemoveErrorListeners();
+         parser.AddErrorListener(error_listener);
+         var parsetree = parser.main();
+
+         if (!error_listener.IsValid)
+         {
+            write_file(function_name, error_listener.offendingSymbol + error_listener.msg + error_listener.exception?.ToString());
+            throw new Exception(error_listener.offendingSymbol +  error_listener.msg, error_listener.exception);
+         }
+
+         //AbstractParseTreeVisitor
+         GeneratorVisitor visitor = new GeneratorVisitor(rref);
+         object val = visitor.VisitMain(parsetree);
+         
+         if(string.IsNullOrEmpty(function_name))
+            function_name = new CellRef(rref).to_name();
+         string ret = $"auto {function_name}() {Environment.NewLine}{{{Environment.NewLine}";
+         visitor.get_defs().ForEach(x => ret += "   " + x + Environment.NewLine);
+         ret += "   return " + val.ToString() + " ;";
+         ret += $"{Environment.NewLine} }}";
+         
+         write_file(function_name, ret);
+         return ret;
+      }
+      
+      static void write_file(string function_name, string text)
+      {
+         using(System.IO.StreamWriter file = 
+            new System.IO.StreamWriter($"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}\\{function_name}.function"))
+         {
+            file.WriteLine(text);
+         }
+      }
+   }
+}

src/client/spark_excel/algogen/GeneratorVisitor.cs

@@ -0,0 +1,410 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.Linq;
+using spark_excel.grammar;
+using Antlr4.Runtime;
+
+using ExcelDna.Integration;
+using bts.excel.extensions;
+
+namespace bts.excel
+{
+   public interface IDefinitionVisitor
+   {
+      void add_def(string def);
+      List<string> get_defs();
+   }
+   
+   
+   public class GeneratorVisitor : ExcelFormulaBaseVisitor<object>, IDefinitionVisitor
+   {      
+      ExcelReference _ref;
+      functions.lib.FunctionLibrary _library = new functions.lib.FunctionLibrary();
+      ExcelFormulaErrorListener _error_listener = new ExcelFormulaErrorListener();
+      List<string> _defs = new List<string>();
+      Dictionary<string, string> _def_map = new Dictionary<string, string>();
+      
+     
+      public GeneratorVisitor(ExcelReference rref)
+      {
+         _ref = rref;
+      }
+      
+      public void add_def(string def)
+      {
+         _defs.Add(def);
+      }
+
+      public void map_def(string def, string mapped)
+      {
+         _def_map[def] = mapped;
+      }      
+
+      public List<string> get_defs()
+      {
+         var list = _defs.Distinct();
+         List<string> defs = new List<string>();
+         foreach(var d in list)
+            defs.Add( _def_map.TryGetValue(d, out string mapped) ? mapped : d );
+         return defs;
+      }
+
+      #region Context visitors overrides
+      
+      static ConcurrentDictionary<string, string> _algo_params = new ConcurrentDictionary<string, string>();
+      public static void register_algo_parameter(string sheet, string name)
+      {
+         _algo_params[name] = sheet;
+      }      
+
+      public override object VisitName(ExcelFormulaParser.NameContext context)
+      {
+         var name = context.GetText();
+         
+         var lookup = name;
+         if(!lookup.Contains("!"))
+            lookup = "!" + lookup;
+         object value = XlCall.Excel(XlCall.xlfGetName, lookup);
+         if(value != null && !(value is ExcelError))
+         {
+            string[] par = value.ToString().Split(new[] {'=', 'R', 'C'}, StringSplitOptions.RemoveEmptyEntries);
+            int r = int.Parse(par[0]) - 1;
+            int c = int.Parse(par[1]) - 1;
+            var rref = new ExcelReference(r, r, c, c, _ref.GetSheetName());
+            process_cell(rref);      
+         }
+         return name;
+      }
+      
+      private object process_cell(ExcelReference rref)
+      {
+         var formula = XlCall.Excel(XlCall.xlfGetCell, 41, rref);
+         
+         var formstring = formula.ToString();
+         if(string.IsNullOrEmpty(formstring))
+            formstring = "0.0";
+         if (!formstring.StartsWith("="))
+            formstring = "=" + formstring;
+
+         var cellref = new CellRef(rref);
+         string r1c1 = cellref.r1_c1();
+         var cellname = XlCall.Excel(XlCall.xlfGetDef, r1c1, cellref.SheetName);
+         bool named = false;
+         if (!(cellname is ExcelError))
+         {
+            named = true;
+            cellref.named_range = cellname.ToString();
+         }
+
+         var antlrstream = new AntlrInputStream(formstring);
+         var lexer = new ExcelFormulaLexer(antlrstream);
+         var tokens = new CommonTokenStream(lexer);
+         var parser = new ExcelFormulaParser(tokens);
+         parser.AddErrorListener(_error_listener);
+         var parsetree = parser.main();
+         if (!_error_listener.IsValid)
+         {
+            //throw new ExcelFormulaException(_error_listener.ErrorLocation, _error_listener.ErrorMessage);
+            var def = $"{cellref.ToString()} = Error parsing cell {_error_listener.offendingSymbol } {_error_listener.exception?.ToString()} ;";
+            add_def(def);
+         }
+         else
+         {
+            var def = $"auto&& {cellref.ToString()} = {this.VisitMain(parsetree)} ;";
+            add_def(def);
+            if (named && _algo_params.ContainsKey(cellref.named_range))
+            {
+               map_def(def, $"auto&& {cellref.named_range} = spark_algo_parameter(\"{cellref.named_range}\");");
+            }
+         }
+         return cellref;
+      }
+
+      public override object VisitMain(ExcelFormulaParser.MainContext context)
+      {
+         return context.expr().Accept(this);
+      }
+
+      public override object VisitMulDiv(ExcelFormulaParser.MulDivContext context)
+      {
+         var expr = context.expr();
+
+         var arg1 = expr[0].Accept(this);
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         var arg2 = expr[1].Accept(this);
+         if (arg2 is ErrorValue)
+            return arg2;
+
+         string code = $"{arg1} {context.op.Text} {arg2}";
+         return code;
+      }
+
+      public override object VisitAddSub(ExcelFormulaParser.AddSubContext context)
+      {
+         var expr = context.expr();
+
+         var arg1 = expr[0].Accept(this);
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         var arg2 = expr[1].Accept(this);
+         if (arg2 is ErrorValue)
+            return arg2;
+
+         string code = $"{arg1} {context.op.Text} {arg2}";
+         return code;
+      }
+
+      public override object VisitPercentage(ExcelFormulaParser.PercentageContext context)
+      {
+         var expr = context.expr();
+
+         var arg1 = expr.Accept(this);
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         return $"( {arg1} / 100.0 )";
+      }
+
+      public override object VisitRelational(ExcelFormulaParser.RelationalContext context)
+      {
+         var expr = context.expr();
+
+         var arg1 = expr[0].Accept(this);
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         var arg2 = expr[1].Accept(this);
+         if (arg2 is ErrorValue)
+            return arg2;
+
+         return $"{arg1} {context.op.Text} {arg2}";
+      }      
+
+
+      public override object VisitError(ExcelFormulaParser.ErrorContext context)
+      {
+         return new ErrorValue(context.GetText());
+      }
+
+      public override object VisitString(ExcelFormulaParser.StringContext context)
+      {
+         var str = context.GetText();
+         return $"std::string({str})";
+      }
+
+      public override object VisitUnary(ExcelFormulaParser.UnaryContext context)
+      {
+         var expr = context.expr();
+         if(context.sign.Text == "-")
+            return "-" + expr.Accept(this);
+         else
+            return expr.Accept(this);
+      }
+
+      public override object VisitFunction(ExcelFormulaParser.FunctionContext context)
+      {
+         var name = context.name.Text;
+
+         if (!_library.is_defined(name))
+            return ErrorValue.Name;
+
+         var expr = context.expr();
+         var args = new IExpression[expr.Length];
+         for (var i = 0; i < expr.Length; i++)
+            args[i] = new Expression<object>(expr[i], this);
+         return _library.call_function(name, args, this);
+      }
+
+      public override object VisitParenthesis(ExcelFormulaParser.ParenthesisContext context)
+      {
+         return context.expr().Accept(this);
+      }
+
+      public override object VisitNumber(ExcelFormulaParser.NumberContext context)
+      {
+         var num = context.GetText();
+         if(double.TryParse(num, out double res))
+            return res.ToString("0.0############");
+         return num;
+      }
+
+      public override object VisitConcatenate(ExcelFormulaParser.ConcatenateContext context)
+      {
+         var expr = context.expr();
+
+         var arg1 = "std::to_string(" + expr[0].Accept(this) + ")";
+         var arg2 = "std::to_string(" + expr[1].Accept(this) + ")";
+         return $"{arg1}+{arg2}";
+      }
+
+      public override object VisitRange(ExcelFormulaParser.RangeContext context)
+      {
+         var rng = context.rng();
+         return rng.Accept(this);
+      }
+
+      public override object VisitRangeList(ExcelFormulaParser.RangeListContext context)
+      {
+         var result = new List<RangeRef>();
+
+         foreach (var range in context.rng())
+         {
+            var obj = range.Accept(this);
+
+            switch (obj)
+            {
+               case ErrorValue err:
+                  result.Add(null);
+                  break;
+               case RangeRef rangeRef:
+                  result.Add(rangeRef);
+                  break;
+               case null:
+                  result.Add(null);
+                  break;
+               default:
+                  throw new ArgumentOutOfRangeException($"Unexpected type: {obj.GetType()}");
+            }
+         }
+
+         return result;
+      }
+
+      public override object VisitRangeRef(ExcelFormulaParser.RangeRefContext context)
+      {
+         var obj = context.@ref().Accept(this);
+
+         switch (obj)
+         {
+            case ErrorValue _:
+               return obj;
+            case CellRef start:
+               var (column, row) = CellRef.ConvertAddressToCoord(context.end.Text);
+               var rng = new RangeRef(start, column, row);
+               
+               if(rng.IsOneCell())
+               {
+                  var rref = new ExcelReference(row - 1, row - 1, column - 1, column - 1, start.SheetName);
+                  process_cell(rref);
+               }
+               else
+               {
+                  var def = 
+                  $@"std::vector<auto> {rng.to_name()};
+                  auto {rng.to_name()}_load = [=](auto&& val)
+                  {{
+                  }};
+                  ";
+                  var rref = new ExcelReference(rng.Start.Row - 1, rng.End.Row - 1,
+                                                rng.Start.Column- 1, rng.End.Column - 1, start.SheetName);
+                  //process_cell(rref);
+               }
+               return rng;
+            case null:
+               return null;
+            default:
+               throw new ArgumentOutOfRangeException($"Unexpected type: {obj.GetType()}");
+         }
+      }
+
+      public override object VisitCell(ExcelFormulaParser.CellContext context)
+      {
+         return context.@ref().Accept(this);
+      }
+
+      public override object VisitCellList(ExcelFormulaParser.CellListContext context)
+      {
+         var result = new List<CellRef>();
+         foreach (var @ref in context.@ref())
+         {
+            var obj = @ref.Accept(this);
+            switch (obj)
+            {
+               case ErrorValue _:
+                  // TODO: Warn that error has been replaced with null here?
+                  result.Add(null);
+                  break;
+               case CellRef cellRef:
+                  result.Add(cellRef);
+                  break;
+               case null:
+                  result.Add(null);
+                  break;
+               default:
+                  throw new ArgumentOutOfRangeException($"Unexpected type: {obj.GetType()}");
+            }
+         }
+
+         return result;
+      }      
+
+      public override object VisitCellRef(ExcelFormulaParser.CellRefContext context)
+      {
+         var colRow = context.colRow.Text;
+         var (col1, row1) = CellRef.ConvertAddressToCoord(colRow);
+         var sheetname = context.sheet?.Text ?? _ref.GetSheetName();
+
+         var rref = new ExcelReference(row1 - 1, row1 - 1, col1 - 1, col1 - 1, sheetname);
+         return process_cell(rref);
+      }
+
+
+
+
+      // public override object VisitRangeRef(ExcelFormulaParser.RangeRefContext context)
+      // {
+      // var obj = context.@ref().Accept(this);
+      // var end = context.COL_ROW();
+      //return obj;
+
+      // var result = new List<CellRef>();
+      // var rng = context.GetRuleContexts<spark_excel.grammar.ExcelFormulaParser.RngContext>();
+      // foreach(var r in rng)
+      // {
+      //    var obj = r.Accept(this);
+      //    switch (obj)
+      //    {
+      //       case ErrorValue err:
+      //          result.Add(null);
+      //          break;
+      //       case CellRef rangeRef:
+      //          result.Add(rangeRef);
+      //          break;
+      //       case null:
+      //          result.Add(null);
+      //          break;
+      //       default:
+      //          throw new ArgumentOutOfRangeException($"Unexpected type: {obj.GetType()}");
+      //    }            
+      // }
+      // return result;
+
+      // var colRow = context.COL_ROW();
+      // var colrowstring = colRow.ToString();
+      // var (col1, row1) = CellRef.ConvertAddressToCoord(colrowstring);
+      // var sheetname = !colrowstring.Contains("!") ? _simple_sheetname : _simple_sheetname;
+
+      // var rref = new ExcelReference(row1 - 1, row1 - 1, col1 - 1, col1 - 1, sheetname);
+      // return process_cell(rref, sheetname);         
+
+      // switch (obj)
+      // {
+      //    case ErrorValue _:
+      //       return obj;
+      //    case CellRef start:
+      //       var (column, row) = CellRef.ConvertAddressToCoord(context.end.Text);
+      //       return new RangeRef(start, column, row);
+      //    case null:
+      //       return null;
+      //    default:
+      //       throw new ArgumentOutOfRangeException($"Unexpected type: {obj.GetType()}");
+      // }
+      // }
+
+      #endregion
+   }
+}

src/client/spark_excel/algogen/RangeRef.cs

@@ -0,0 +1,149 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace bts.excel
+{
+   public class RangeRef
+   {
+      public RangeRef(CellRef start, CellRef end)
+      {
+         Start = start;
+         End = end;
+      }
+      
+      public string named_range { get; set;}
+
+      public RangeRef(CellRef start, int endColumn, int endRow)
+          : this(start, new CellRef(start.SheetName, (endColumn, endRow)))
+      { }
+
+      public RangeRef Offset(int columnOffset, int rowOffset)
+      {
+         var start = Start.Offset(columnOffset, rowOffset);
+         var end = End.Offset(columnOffset, rowOffset);
+         return new RangeRef(start, end);
+      }
+
+      public CellRef Start { get; }
+
+      public CellRef End { get; }
+
+      public override string ToString()
+      {
+         return to_name();
+      }
+      
+      public string SheetName => Start.SheetName;
+      public string SimpleSheetName => Start.SimpleSheetName;
+
+      public string to_address()
+      {
+         return string.Format("'{0}'!{1}:{2}",
+             SheetName,
+             CellRef.ConvertCoordToAddress((Start.Column, Start.Row)),
+             CellRef.ConvertCoordToAddress((End.Column, End.Row)));
+      }
+
+      public string to_name()
+      {
+         if (!string.IsNullOrEmpty(named_range))
+            return named_range;
+         else
+         {
+            return string.Format("{0}_{1}_{2}",
+                Start.SimpleSheetName,
+                CellRef.ConvertCoordToAddress((Start.Column, Start.Row)),
+                CellRef.ConvertCoordToAddress((End.Column, End.Row)));
+         }
+      }
+
+
+      public bool IsVector()
+      {
+         return IsSingleRow() || IsSingleColumn();
+      }
+
+      public bool IsOneCell()
+      {
+         return IsSingleRow() && IsSingleColumn();
+      }
+
+      internal List<CellRef> Get2DVector()
+      {
+         var result = new List<CellRef>();
+         var sheetName = Start.SheetName;
+         var numRows = NumRows();
+         var lastRow = Start.Row + numRows - 1;
+
+         for (var row = Start.Row; row <= lastRow; row++)
+         {
+            var numCols = NumCols();
+            var lastCol = Start.Column + numCols - 1;            
+            for (var col = Start.Column; col <= lastCol; col++)
+            {
+               result.Add(new CellRef(sheetName, (col, row)));
+            }
+         }      
+         return result;   
+      }
+
+
+      internal List<CellRef> GetVector()
+      {
+         Debug.Assert(IsVector());
+
+         var result = new List<CellRef>();
+
+         if (IsSingleColumn())
+         {
+            var col = Start.Column;
+            var sheetName = Start.SheetName;
+            var numRows = NumRows();
+            var lastRow = Start.Row + numRows - 1;
+            for (var row = Start.Row; row <= lastRow; row++)
+            {
+               result.Add(new CellRef(sheetName, (col, row)));
+            }
+         }
+         else
+         {
+            Debug.Assert(IsSingleRow());
+
+            var row = Start.Row;
+            var sheetName = Start.SheetName;
+            var numCols = NumCols();
+            var lastCol = Start.Column + numCols - 1;
+            for (var col = Start.Column; col <= lastCol; col++)
+            {
+               result.Add(new CellRef(sheetName, (col, row)));
+            }
+         }
+
+         return result;
+      }
+
+      public bool IsSingleColumn()
+      {
+         Debug.Assert(Start.SheetName == End.SheetName);
+         return Start.Column == End.Column;
+      }
+
+      public bool IsSingleRow()
+      {
+         Debug.Assert(Start.SheetName == End.SheetName);
+         return Start.Row == End.Row;
+      }
+
+      public int NumRows()
+      {
+         Debug.Assert(Start.SheetName == End.SheetName);
+         return End.Row - Start.Row + 1;
+      }
+
+      public int NumCols()
+      {
+         Debug.Assert(Start.SheetName == End.SheetName);
+         return End.Column - Start.Column + 1;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/FunctionLibrary.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using bts.excel.functions;
+using ExcelDna.Registration;
+
+namespace bts.excel.functions.lib
+{
+   public interface IFunction
+   {
+      object function(IExpression[] args, IDefinitionVisitor dv);
+   }
+   public class FunctionLibrary
+   {
+      private readonly Dictionary<string, IFunction> _functions =
+          new Dictionary<string, IFunction>(StringComparer.OrdinalIgnoreCase);
+      private readonly Dictionary<string, Delegate> _dnafunctions =
+          new Dictionary<string, Delegate>(StringComparer.OrdinalIgnoreCase);
+
+      public FunctionLibrary()
+      {
+         add_functions(Logical.functions);
+         add_functions(Mathematics.functions);
+         add_functions(Stat.functions);
+
+         var dna = ExcelRegistration.GetExcelFunctions();
+         foreach(var xl in dna)
+         {
+            _dnafunctions[xl.FunctionAttribute.Name] = 
+               xl.FunctionLambda.Compile();
+         }
+      }
+
+      public bool is_defined(string name) => _functions.ContainsKey(name) || _dnafunctions.ContainsKey(name);
+          
+      public void add_function(string name, IFunction function)
+      {
+         _functions.Add(name, function);
+      }
+
+      public void add_functions(Dictionary<string, IFunction> delegates)
+      {
+         foreach (var f in delegates)
+            _functions.Add(f.Key, f.Value);
+      }
+      
+      public object call_function(string name, IExpression[] args, IDefinitionVisitor dv)
+      {
+         if(_functions.TryGetValue(name, out IFunction func))            
+            return func.function(args, dv);
+         else
+            return call_dna_function(name, args, dv);
+      }
+
+      object call_dna_function(string name, IExpression[] args, IDefinitionVisitor dv)
+      {         
+         if(_dnafunctions.TryGetValue(name, out Delegate func))
+         {
+            object[] param = args.Select(x => x.evaluate()).ToArray();
+            // var pp = func.Method.GetParameters();
+            // if(pp.Length -1 != param.Length)
+            //    throw new ArgumentException("invalide args to dna function " + name);
+
+            string code = $"{name} ( ";  int i = 0;
+            foreach(var p in param)
+               code += p.ToString() + (i++ < param.Length-1 ? ", " : "");
+            code += ")";
+            return code;
+         }
+         else
+            return ErrorValue.Name;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/ExcelFunctions.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+
+namespace bts.excel.functions.lib
+{
+   public static class Logical
+   {
+      public static Dictionary<string, IFunction> functions { get; }
+
+      static Logical()
+      {
+         functions = new Dictionary<string, IFunction>(StringComparer.OrdinalIgnoreCase)
+            {
+                {"AND", new And()},
+                {"IF", new If()},
+                {"IFERROR", new IfError()},
+                {"OR", new Or()},
+            };
+      }
+   }
+
+   public static class Mathematics
+   {
+      public static Dictionary<string, IFunction> functions { get; }
+
+      static Mathematics()
+      {
+         functions = new Dictionary<string, IFunction>(StringComparer.OrdinalIgnoreCase)
+            {
+                {"LN", new Ln()},
+                {"LOG", new Log()},
+                {"POWER", new Power()},
+                {"PI", new Pi()},
+                {"SQRT", new Sqrt()},
+                {"SUM", new Sum()},
+                {"SIN", new Sin()},
+            };
+      }
+   }
+
+   public static class Stat
+   {
+      public static Dictionary<string, IFunction> functions { get; }
+
+      static Stat()
+      {
+         functions = new Dictionary<string, IFunction>(StringComparer.OrdinalIgnoreCase)
+            {
+                {"AVERAGE", new Average()},
+                {"MAX", new Max()},
+                {"MIN", new Min()},
+            };
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/And.cs

@@ -0,0 +1,32 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class And : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: AND(logical1, [logical2], ...)
+         // https://support.office.com/en-gb/article/AND-function-5f19b2e8-e1df-4408-897a-ce285a19e9d9
+
+         if (args.Length < 2)
+         {
+            throw new ArgumentException(
+                $"AND function requires at least 2 arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         string code = "(";
+         foreach (var fx in args)
+         {
+            var arg = fx.evaluate();
+
+            if (arg is ErrorValue)
+               return arg;
+            code += arg + " && ";
+         }
+         code += "true)";
+         return code;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Average.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace bts.excel.functions.lib
+{
+   public class Average : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: Average(number1,[number2],...)
+         // https://support.office.com/en-GB/article/AVERAGE-function-047bac88-d466-426c-a32b-8f33eb960cf6
+
+         if (args.Length < 1)
+         {
+            throw new ArgumentException(
+                $"Average function takes at least 1 arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         string name = "avg_" + new Random().Next(0, int.MaxValue);
+         string def = ($"auto {name} = 0.0;{Environment.NewLine}");
+
+         int count = 0;
+         foreach (var arg in args)
+         {
+            var argv = arg.evaluate();
+            if (arg is ErrorValue)
+               return arg;
+            count++;
+            def += $"   {name} += {argv};{Environment.NewLine}";
+         }
+         if(count > 1) 
+            def += $"   {name} /= {count}";
+         dv.add_def(def);
+         return name;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/If.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class If : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: IF(logical_test, value_if_true, [value_if_false])
+         // https://support.office.com/en-gb/article/IF-function-69aed7c9-4e8a-4755-a9bc-aa8bbff73be2
+
+         if (args.Length != 2 && args.Length != 3)
+         {
+            throw new ArgumentException(
+                "IF function takes 2 or 3 arguments",
+                nameof(args));
+         }
+
+         var arg = args[0].evaluate();
+         if (arg is ErrorValue)
+            return arg;
+
+         string code = string.Empty;
+         if (args.Length == 3)
+         {
+            code += $"( {arg} ? ({ args[1].evaluate() }) : ({args[2].evaluate()}) ) ";
+         }
+         else
+         {
+            code += $"( {arg} ? ({ args[1].evaluate() }) : false) ";
+         }
+         return code;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/IfError.cs

@@ -0,0 +1,32 @@
+using System;
+namespace bts.excel.functions.lib
+{
+    public class IfError : IFunction
+    {
+        public object function(IExpression[] args, IDefinitionVisitor dv)
+        {
+            // Syntax: IFERROR(value, value_if_error)
+            // https://support.office.com/en-gb/article/IFERROR-function-c526fd07-caeb-47b8-8bb6-63f3e417f611
+
+            if (args.Length != 2)
+            {
+                throw new ArgumentException(
+                    "IFERROR function takes exactly 2 arguments",
+                    nameof(args));
+            }
+
+            try
+            {
+                var arg = args[0].evaluate();
+                if (arg is ErrorValue)
+                    return arg;
+
+                return arg;
+            }
+            catch (Exception)
+            {
+                return args[1].evaluate();
+            }
+        }        
+    }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Ln.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+    public class Ln : IFunction
+    {
+        public object function(IExpression[] args, IDefinitionVisitor dv)
+        {
+            // Syntax: LN(number)
+            // https://support.office.com/en-gb/article/LN-function-81fe1ed7-dac9-4acd-ba1d-07a142c6118f
+
+            if (args.Length != 1)
+            {
+                throw new ArgumentException(
+                    $"LN function takes only 1 argument, got {args.Length}");
+            }
+
+            var arg = args[0].evaluate();
+            if (arg is ErrorValue)
+               return arg;
+
+            string code = $"log({arg})";
+            return code;
+        }        
+    }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Log.cs

@@ -0,0 +1,40 @@
+using System;
+namespace bts.excel.functions.lib
+{
+   public class Log : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: LOG(number, [base])
+         // https://support.office.com/en-gb/article/LOG-function-4e82f196-1ca9-4747-8fb0-6c4a3abb3280
+
+         switch (args.Length)
+         {
+            case 1:
+               var arg = args[0].evaluate();
+               if (arg is ErrorValue)
+                  return arg;
+
+               string code = $"log10({arg})";
+               return code;
+
+            case 2:
+               var arg1 = args[0].evaluate();
+               if (arg1 is ErrorValue)
+                  return arg1;
+
+               var arg2 = args[1].evaluate();
+               if (arg2 is ErrorValue)
+                  return arg2;
+
+               string code2 = $"log({arg1}, {arg2})";
+               return code2;
+
+            default:
+               throw new ArgumentException(
+                   $"LOG function takes only 1 or 2 arguments, got {args.Length}",
+                   nameof(args));
+         }
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Max.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace bts.excel.functions.lib
+{
+   public class Max : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: MAX(number1, [number2], ...)
+         // https://support.office.com/en-GB/article/MAX-function-e0012414-9ac8-4b34-9a47-73e662c08098
+
+         if (args.Length < 1)
+         {
+            throw new ArgumentException(
+                $"MAX function takes at least 1 arguments, got {args.Length}",
+                nameof(args));
+         }
+         
+         string code = $"std::max(\n";
+         foreach (var arg in args)
+         {
+            var argv = arg.evaluate();
+            if (argv is ErrorValue)
+               return argv;
+            
+            code += $"{argv},";
+         }
+         code += $"{ args[args.Length-1].evaluate()} );\n";
+
+         return code;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Min.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace bts.excel.functions.lib
+{
+   public class Min : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: MIN(number1, [number2], ...)
+         // https://support.office.com/en-GB/article/MIN-function-61635d12-920f-4ce2-a70f-96f202dcc152
+
+         if (args.Length < 1)
+         {
+            throw new ArgumentException(
+                $"MIN function takes at least 1 arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         string code = $"std::min(\n";
+         foreach (var arg in args)
+         {
+            var argv = arg.evaluate();
+            if (argv is ErrorValue)
+               return argv;
+
+            code += $"{argv},";
+         }
+         code += $"{ args[args.Length - 1].evaluate()} );\n";
+
+         return code;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Or.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class Or : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: OR(logical1, [logical2], ...)
+         // https://support.office.com/en-gb/article/OR-function-7d17ad14-8700-4281-b308-00b131e22af0
+
+         string code = "(";
+         foreach (var fx in args)
+         {
+            var arg = fx.evaluate();
+
+            if (arg is ErrorValue)
+               return arg;
+            code += arg + " || ";
+         }
+         code += "false)";
+         return code;
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Pi.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class Pi : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: PI()
+         // https://support.office.com/en-gb/article/PI-function-264199d0-a3ba-46b8-975a-c4a04608989b
+
+         if (args.Length != 0)
+         {
+            throw new ArgumentException(
+                $"PI function takes no arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         return Math.PI.ToString();
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Power.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class Power : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: POWER(number, power)
+         // https://support.office.com/en-gb/article/POWER-function-d3f2908b-56f4-4c3f-895a-07fb519c362a
+
+         if (args.Length != 2)
+         {
+            throw new ArgumentException(
+                $"POWER function takes 2 arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         var arg1 = args[0].evaluate();
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         var arg2 = args[1].evaluate();
+         if (arg2 is ErrorValue)
+            return arg2;
+
+         return $"pow({arg1}, {arg2})";
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Sin.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class Sin : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: SIN(number)
+         // https://support.office.com/en-gb/article/SIN-function-654975c2-05c4-4831-9a24-2c65e4040fdf
+
+         if (args.Length != 1)
+         {
+            throw new ArgumentException(
+                $"Sin function takes only 1 argument, got {args.Length}");
+         }
+
+         var arg1 = args[0].evaluate();
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         return $"sin({arg1})";
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Sqrt.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace bts.excel.functions.lib
+{
+   public class Sqrt : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: SQRT(number)
+         // https://support.office.com/en-gb/article/SQRT-function-654975c2-05c4-4831-9a24-2c65e4040fdf
+
+         if (args.Length != 1)
+         {
+            throw new ArgumentException(
+                $"SQRT function takes only 1 argument, got {args.Length}");
+         }
+
+         var arg1 = args[0].evaluate();
+         if (arg1 is ErrorValue)
+            return arg1;
+
+         return $"sqrt({arg1})";
+      }
+   }
+}

src/client/spark_excel/algogen/functions/lib/funcs/Sum.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace bts.excel.functions.lib
+{
+   public class Sum : IFunction
+   {
+      public object function(IExpression[] args, IDefinitionVisitor dv)
+      {
+         // Syntax: SUM(number1,[number2],...)
+         // https://support.office.com/en-GB/article/SUM-function-043e1c7d-7726-4e80-8f32-07b23e057f89
+
+         if (args.Length < 1)
+         {
+            throw new ArgumentException(
+                $"SUM function takes at least 1 arguments, got {args.Length}",
+                nameof(args));
+         }
+
+         string name = "sum_" + new Random().Next(0, int.MaxValue);
+         string def = ($"auto {name} = 0.0;{Environment.NewLine}");
+
+         foreach (var arg in args)
+         {
+            var argv = arg.evaluate();
+            if (arg is ErrorValue)
+               return arg;
+
+            def += $"   {name} += {argv};{Environment.NewLine}";
+         }
+         dv.add_def(def);
+         return name;
+      }
+   }
+}

src/client/spark_excel/extensions/ExcelDNAExtensions.cs

@@ -0,0 +1,20 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Reflection;
+using ExcelDna.Integration;
+
+namespace bts.excel.extensions
+{
+   public static class ExcelDNAExtensions
+   {
+      public static string GetSheetName(this ExcelReference rref)
+      {
+         string sheetname = (string)XlCall.Excel(XlCall.xlSheetNm, rref);
+         return sheetname;
+      }   
+   }
+}

src/client/spark_excel/extensions/OrderService_Excel.cs

@@ -11,6 +11,7 @@ using bts.excel;
 using bts.excel.extensions;
 using bts.excel.rtd;
 using Newtonsoft.Json;
+using bts.api;
 
 
 namespace bts.api.orderman
@@ -20,6 +21,14 @@ namespace bts.api.orderman
       readonly static Lazy<user.AuthService> _users = new Lazy<user.AuthService>(() => Locator.locate<user.AuthService>(), true);
       readonly static Lazy<admin.AdminService> _admin = new Lazy<admin.AdminService>(() => Locator.locate<admin.AdminService>(), true);
 
+      struct OrderDef
+      {
+         public Create create;
+         public Response response;
+      }
+      static ConcurrentDictionary<long, OrderDef> _orders = new ConcurrentDictionary<long, OrderDef>();
+
+
       [ExcelFunction(Category = "BTS", Description = "Get All Accessible Accounts")]
       async public static void spark_get_accounts(string login_token, ExcelAsyncHandle handle)
       {
@@ -42,48 +51,66 @@ namespace bts.api.orderman
          }
       }
 
+      static Response cancel_order(long order_id)
+      {
+         var resp = _service.Value.cancel_order(new Cancel() { OrderKey = Convert.ToUInt32(order_id) });
+         return resp;
+      }      
+
       [ExcelFunction(Category = "BTS", Description = "Cancel an Order by Order ID", IsMacroType = true)]
       public static object spark_orderservice_cancel_order(long order_id)
       {
-         var resp = _service.Value.cancel_order(new Cancel() { OrderKey = Convert.ToUInt32(order_id) });
+         var resp = cancel_order(order_id);
          return parse_response(resp);
       }
+      
+      static Response update_order(long order_id, double price, long quantity, CustomOrderDefinition cust = null)
+      {
+         var resp = _service.Value.update_order(new Update() 
+         { 
+            OrderKey = Convert.ToUInt32(order_id), 
+            Price = price, 
+            Quantity = Convert.ToUInt32(quantity) , 
+            Custom = cust
+         });
+         return resp;
+      }
 
       [ExcelFunction(Category = "BTS", Description = "Update an Order by Order ID", IsMacroType = true)]
       public static object spark_orderservice_update_order(long order_id, double price, long quantity)
       {
-         var resp = _service.Value.update_order(new Update() { OrderKey = Convert.ToUInt32(order_id), Price = price, Quantity = Convert.ToUInt32(quantity) });
+         var resp = update_order(order_id, price, quantity);
          return parse_response(resp);
       }      
-
+      
       [ExcelFunction(Category = "BTS", Description = "Send an Order to Spark via security_key", IsMacroType = true)]
       public static object spark_orderservice_send_order_key(
-         [ExcelArgument("Required. Only send the order if > last")] long local_order_id,
+         [ExcelArgument("Required. Only send the order if > 1")] long on_off,
+         [ExcelArgument("Required. Local Order ID used to differentiate between create / update")] long local_order_id,
          [ExcelArgument("Required. Security key")] long security_key,
          [ExcelArgument("Required. Side BUY or SELL")] string side,
          [ExcelArgument("Required. User")] string user,
          [ExcelArgument("Required. Account")] string account,
          [ExcelArgument("Required. Price")] double price,
          [ExcelArgument("Required. Quantity")] long quantity,
-         [ExcelArgument("Required. OrderType (Limit, Stop, Stop_Limit, Iceberg) - Default Limit")] string order_type,
+         [ExcelArgument("Required. OrderType (Limit, Stop, Stop_Limit, Iceberg) - Default Limit")] string order_type = null,
          [ExcelArgument("OPTIONAL. Order Params JSON (\"stop_price\" : 51.88)")] string order_params = null,
          
-         [ExcelArgument("OPTIONAL. (DAY,GTC,IOC) - Default DAY")] string time_in_force = null,
-         [ExcelArgument("OPTIONAL. (YES,NO) - Default YES")] string manual_order_indicator = null,
-         [ExcelArgument("OPTIONAL. (1,2,3,4) - Default 1")] string cti_code = null,
-         [ExcelArgument("OPTIONAL. (CUSTOMER,FIRM) - Default FIRM")] string customer_or_firm = null)
+         [ExcelArgument("OPTIONAL. (DAY,GTC,IOC) - Default DAY")] string time_in_force = null)
       {
-         if (local_order_id <= _local_order_id)
-            return "local_order_id must be greater than " + _local_order_id;
+         if(on_off <= 0)
+            return "this order is turned off";
+         if(_orders.ContainsKey(local_order_id))
+            return "use a new local order id per order";
          Create cr = new Create();
          cr.NewOrder = new OrderDefinition()
          {
             SecurityKey = Convert.ToUInt32(security_key),
             Side = EnumParser.ToEnum<api.Side>(side),
             TimeInForce = time_in_force.ToEnum<TimeInForce>(TimeInForce.Day),
-            ManualOrderIndicator = manual_order_indicator.ToEnum<ManualOrderIndicator>(ManualOrderIndicator.Yes),
-            CtiCode = cti_code.ToEnum<CTICode>(CTICode.CtiCode1),
-            CustomerOrFirm = customer_or_firm.ToEnum<CustomerOrFirm>(CustomerOrFirm.Firm),
+            // ManualOrderIndicator = manual_order_indicator.ToEnum<ManualOrderIndicator>(ManualOrderIndicator.Yes),
+            // CtiCode = cti_code.ToEnum<CTICode>(CTICode.CtiCode1),
+            // CustomerOrFirm = customer_or_firm.ToEnum<CustomerOrFirm>(CustomerOrFirm.Firm),
          };
          cr.Price = price;
          cr.Quantity = Convert.ToUInt32(quantity);         
@@ -98,12 +125,14 @@ namespace bts.api.orderman
             return "Could not resolve account: " + account;
          cr.NewOrder.Account = btaccount.Name;
          cr.NewOrder.AccountId = btaccount.Id;
+         if(string.IsNullOrEmpty(order_type))
+            order_type = "Limit";         
          cr.NewOrder.CustomDef = custom_def(order_type, order_params);
          if(cr.NewOrder.CustomDef == null || cr.NewOrder.CustomDef.CustomCase == CustomOrderDefinition.CustomOneofCase.None)
             return "Could not parse order_type and/or order_params info";
 
          var resp = _service.Value.create_order(cr);
-         _local_order_id = local_order_id;
+         _orders[local_order_id] = new OrderDef { create = cr, response = resp };
          return parse_response(resp, true);
       }
 
@@ -129,7 +158,7 @@ namespace bts.api.orderman
       }      
 
       static CustomOrderDefinition custom_def(string order_type, string order_params)
-      {
+      {         
          var member = ReflectionExtensions.get_fields_or_properties(typeof(CustomOrderDefinition))
             .Where(x => x.Name.ToLower() == order_type.ToLower()).FirstOrDefault();
          if (member != null)
@@ -142,13 +171,13 @@ namespace bts.api.orderman
          }
          else
             return null;
-      }
+      }      
 
-      static long _local_order_id = 0;
 
-      [ExcelFunction(Category = "BTS", Description = "Send an Order to Spark via security_key", IsMacroType = true)]
-      public static object spark_orderservice_send_order(
-         [ExcelArgument("Required. Only send the order if > last")] long local_order_id,
+      [ExcelFunction(Category = "BTS", Description = "Send or Modify or Cancel a Spark Order ")]
+      public async static void spark_send_or_update_order(
+         [ExcelArgument("Required. Only send the order if > 1")] long on_off,
+         [ExcelArgument("Required. Local Order ID used to differentiate between create / update")] long local_order_id,
          [ExcelArgument("Required. Exchange (GLBX,SIM)")] string exchange,
          [ExcelArgument("Required. Security Desc (ZNZ9 or ZNZ9-ZNH0)")] string security_desc,
          [ExcelArgument("Required. Side BUY or SELL")] string side,
@@ -156,29 +185,64 @@ namespace bts.api.orderman
          [ExcelArgument("Required. Account")] string account,
          [ExcelArgument("Required. Price")] double price,
          [ExcelArgument("Required. Quantity")] long quantity,
-         [ExcelArgument("Required. OrderType (Limit, Stop, Stop_Limit, Iceberg) - Default Limit")] string order_type,
+         [ExcelArgument("Required. OrderType (Limit, Stop, Stop_Limit, Iceberg) - Default Limit")] string order_type = null,
          [ExcelArgument("OPTIONAL. Order Params JSON (\"stop_price\" : 51.88)")] string order_params = null,
-        
-         [ExcelArgument("OPTIONAL. (DAY,GTC,IOC) - Default DAY")] string time_in_force = null,
-         [ExcelArgument("OPTIONAL. (YES,NO) - Default YES")] string manual_order_indicator = null,
-         [ExcelArgument("OPTIONAL. (1,2,3,4) - Default 1")] string cti_code = null,
-         [ExcelArgument("OPTIONAL. (CUSTOMER,FIRM) - Default FIRM")] string customer_or_firm = null)
-      {
-         if (local_order_id <= _local_order_id)
-            return "local_order_id must be greater than " + _local_order_id;
-         Venue ven;
-         if (!Utilities.parse_venue(exchange, out ven))
-            return "Can't Parse Exchange: " + (exchange ?? string.Empty);
 
-         uint key;
-         if (MDSubscribe.market_data(ven).lookup_security_key_from_desc(security_desc, out key))
+         [ExcelArgument("OPTIONAL. (DAY,GTC,IOC) - Default DAY")] string time_in_force = null, 
+         ExcelAsyncHandle handle = null)
+      {
+         try
          {
-            return spark_orderservice_send_order_key(local_order_id, (long)key, side, user, account, price, quantity, order_type, order_params,
-                                                     time_in_force, manual_order_indicator, cti_code, customer_or_firm);
+            Venue ven;
+            if (!Utilities.parse_venue(exchange, out ven))
+               handle.SetResult("Can't Parse Exchange: " + (exchange ?? string.Empty));
+            if (on_off <= 0)
+               handle.SetResult("this order is turned off");
+               
+            var sec = await MDSubscribe.market_data(ven).find_security_async(x => x.security_desc() == security_desc);
+            if (sec == null)
+            {
+               handle.SetResult("Can't find security desc " + security_desc);
+            }         
+            else
+            {
+               if (_orders.TryGetValue(local_order_id, out OrderDef def) && def.response.OrderKey > 0)
+               {
+                  if(quantity > 0)
+                  {
+                     if (string.IsNullOrEmpty(order_type))
+                        order_type = "Limit";
+                     var cust = custom_def(order_type, order_params);
+                     if (cust == null || cust.CustomCase == CustomOrderDefinition.CustomOneofCase.None)
+                        handle.SetResult("Could not parse order_type and/or order_params info");
+                     if(def.create.Price != price || def.create.Quantity != Convert.ToUInt32(quantity) ||
+                        (cust != null && !cust.Equals(def.create.NewOrder.CustomDef)))
+                     {
+                        var resp = update_order(def.response.OrderKey, price, quantity, cust);               
+                        if(resp.ErrorCode == OrderError.Ok)
+                        {
+                           def.create.Price = price;
+                           def.create.Quantity = Convert.ToUInt32(quantity);
+                        }
+                        handle.SetResult( parse_response(resp, true) );
+                     }
+                     else
+                        handle.SetResult( parse_response(def.response, true) );
+                  }
+                  else
+                  {
+                     var resp = cancel_order(def.response.OrderKey);
+                     handle.SetResult( parse_response(resp, true) );
+                  }
+               }
+               else
+                  handle.SetResult( spark_orderservice_send_order_key(on_off, local_order_id, (long)(sec.Value.Id), side, user, account, price, quantity, 
+                                                         order_type, order_params, time_in_force) );
+            }
          }
-         else
+         catch (Exception ex)
          {
-            return "Can't find security desc " + security_desc;
+            handle.SetException(ex);
          }
       }
    }

src/client/spark_excel/grammar/C.g4

@@ -0,0 +1,723 @@
+/*
+ [The "BSD licence"]
+ Copyright (c) 2013 Sam Harwell
+ All rights reserved.
+ 
+ Redistribution and use
+ in source and binary forms, with or without
+ modification, are permitted provided that the
+ following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form
+ must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the
+ author may not be used to endorse or promote products
+ derived from this software without specific
+ prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** C 2011 grammar built from the C11 Spec */
+grammar C;
+
+primaryExpression:
+	Identifier
+	| Constant
+	| StringLiteral+
+	| '(' expression ')'
+	| genericSelection
+	| '__extension__'? '(' compoundStatement ')' // Blocks (GCC extension)
+	| '__builtin_va_arg' '(' unaryExpression ',' typeName ')'
+	| '__builtin_offsetof' '(' typeName ',' unaryExpression ')';
+
+genericSelection:
+	'_Generic' '(' assignmentExpression ',' genericAssocList ')';
+
+genericAssocList:
+	genericAssociation
+	| genericAssocList ',' genericAssociation;
+
+genericAssociation:
+	typeName ':' assignmentExpression
+	| 'default' ':' assignmentExpression;
+
+postfixExpression:
+	primaryExpression
+	| postfixExpression '[' expression ']'
+	| postfixExpression '(' argumentExpressionList? ')'
+	| postfixExpression '.' Identifier
+	| postfixExpression '->' Identifier
+	| postfixExpression '++'
+	| postfixExpression '--'
+	| '(' typeName ')' '{' initializerList '}'
+	| '(' typeName ')' '{' initializerList ',' '}'
+	| '__extension__' '(' typeName ')' '{' initializerList '}'
+	| '__extension__' '(' typeName ')' '{' initializerList ',' '}';
+
+argumentExpressionList:
+	assignmentExpression
+	| argumentExpressionList ',' assignmentExpression;
+
+unaryExpression:
+	postfixExpression
+	| '++' unaryExpression
+	| '--' unaryExpression
+	| unaryOperator castExpression
+	| 'sizeof' unaryExpression
+	| 'sizeof' '(' typeName ')'
+	| '_Alignof' '(' typeName ')'
+	| '&&' Identifier ; // GCC extension address of label
+
+unaryOperator: '&' | '*' | '+' | '-' | '~' | '!';
+
+castExpression:
+	'(' typeName ')' castExpression
+	| '__extension__' '(' typeName ')' castExpression
+	| unaryExpression
+	| DigitSequence ; // for
+
+multiplicativeExpression:
+	castExpression
+	| multiplicativeExpression '*' castExpression
+	| multiplicativeExpression '/' castExpression
+	| multiplicativeExpression '%' castExpression;
+
+additiveExpression:
+	multiplicativeExpression
+	| additiveExpression '+' multiplicativeExpression
+	| additiveExpression '-' multiplicativeExpression;
+
+shiftExpression:
+	additiveExpression
+	| shiftExpression '<<' additiveExpression
+	| shiftExpression '>>' additiveExpression;
+
+relationalExpression:
+	shiftExpression
+	| relationalExpression '<' shiftExpression
+	| relationalExpression '>' shiftExpression
+	| relationalExpression '<=' shiftExpression
+	| relationalExpression '>=' shiftExpression;
+
+equalityExpression:
+	relationalExpression
+	| equalityExpression '==' relationalExpression
+	| equalityExpression '!=' relationalExpression;
+
+andExpression:
+	equalityExpression
+	| andExpression '&' equalityExpression;
+
+exclusiveOrExpression:
+	andExpression
+	| exclusiveOrExpression '^' andExpression;
+
+inclusiveOrExpression:
+	exclusiveOrExpression
+	| inclusiveOrExpression '|' exclusiveOrExpression;
+
+logicalAndExpression:
+	inclusiveOrExpression
+	| logicalAndExpression '&&' inclusiveOrExpression;
+
+logicalOrExpression:
+	logicalAndExpression
+	| logicalOrExpression '||' logicalAndExpression;
+
+conditionalExpression:
+	logicalOrExpression (
+		'?' expression ':' conditionalExpression
+	)?;
+
+assignmentExpression:
+	conditionalExpression
+	| unaryExpression assignmentOperator assignmentExpression
+	| DigitSequence ; // for
+
+assignmentOperator:
+	'='
+	| '*='
+	| '/='
+	| '%='
+	| '+='
+	| '-='
+	| '<<='
+	| '>>='
+	| '&='
+	| '^='
+	| '|=';
+
+expression:
+	assignmentExpression
+	| expression ',' assignmentExpression;
+
+constantExpression: conditionalExpression;
+
+declaration:
+	declarationSpecifiers initDeclaratorList ';'
+	| declarationSpecifiers ';'
+	| staticAssertDeclaration;
+
+declarationSpecifiers: declarationSpecifier+;
+
+declarationSpecifiers2: declarationSpecifier+;
+
+declarationSpecifier:
+	storageClassSpecifier
+	| typeSpecifier
+	| typeQualifier
+	| functionSpecifier
+	| alignmentSpecifier;
+
+initDeclaratorList:
+	initDeclarator
+	| initDeclaratorList ',' initDeclarator;
+
+initDeclarator: declarator | declarator '=' initializer;
+
+storageClassSpecifier:
+	'typedef'
+	| 'extern'
+	| 'static'
+	| '_Thread_local'
+	| 'auto'
+	| 'register';
+
+typeSpecifier: (
+		'void'
+		| 'char'
+		| 'short'
+		| 'int'
+		| 'long'
+		| 'float'
+		| 'double'
+		| 'signed'
+		| 'unsigned'
+		| '_Bool'
+		| '_Complex'
+		| '__m128'
+		| '__m128d'
+		| '__m128i'
+	)
+	| '__extension__' '(' ('__m128' | '__m128d' | '__m128i') ')'
+	| atomicTypeSpecifier
+	| structOrUnionSpecifier
+	| enumSpecifier
+	| typedefName
+	| '__typeof__' '(' constantExpression ')' // GCC extension
+	| typeSpecifier pointer;
+
+structOrUnionSpecifier:
+	structOrUnion Identifier? '{' structDeclarationList '}'
+	| structOrUnion Identifier;
+
+structOrUnion: 'struct' | 'union';
+
+structDeclarationList:
+	structDeclaration
+	| structDeclarationList structDeclaration;
+
+structDeclaration:
+	specifierQualifierList structDeclaratorList? ';'
+	| staticAssertDeclaration;
+
+specifierQualifierList:
+	typeSpecifier specifierQualifierList?
+	| typeQualifier specifierQualifierList?;
+
+structDeclaratorList:
+	structDeclarator
+	| structDeclaratorList ',' structDeclarator;
+
+structDeclarator:
+	declarator
+	| declarator? ':' constantExpression;
+
+enumSpecifier:
+	'enum' Identifier? '{' enumeratorList '}'
+	| 'enum' Identifier? '{' enumeratorList ',' '}'
+	| 'enum' Identifier;
+
+enumeratorList: enumerator | enumeratorList ',' enumerator;
+
+enumerator:
+	enumerationConstant
+	| enumerationConstant '=' constantExpression;
+
+enumerationConstant: Identifier;
+
+atomicTypeSpecifier: '_Atomic' '(' typeName ')';
+
+typeQualifier: 'const' | 'restrict' | 'volatile' | '_Atomic';
+
+functionSpecifier: (
+		'inline'
+		| '_Noreturn'
+		| '__inline__' // GCC extension
+		| '__stdcall'
+	)
+	| gccAttributeSpecifier
+	| '__declspec' '(' Identifier ')';
+
+alignmentSpecifier:
+	'_Alignas' '(' typeName ')'
+	| '_Alignas' '(' constantExpression ')';
+
+declarator: pointer? directDeclarator gccDeclaratorExtension*;
+
+directDeclarator:
+	Identifier
+	| '(' declarator ')'
+	| directDeclarator '[' typeQualifierList? assignmentExpression? ']'
+	| directDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+	| directDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+	| directDeclarator '[' typeQualifierList? '*' ']'
+	| directDeclarator '(' parameterTypeList ')'
+	| directDeclarator '(' identifierList? ')'
+	| Identifier ':' DigitSequence // bit field
+	| '(' typeSpecifier? pointer directDeclarator ')' ; // function pointer like: (__cdecl *f)
+
+gccDeclaratorExtension:
+	'__asm' '(' StringLiteral+ ')'
+	| gccAttributeSpecifier;
+
+gccAttributeSpecifier:
+	'__attribute__' '(' '(' gccAttributeList ')' ')';
+
+gccAttributeList:
+	gccAttribute (',' gccAttribute)*
+	| ; // empty
+
+gccAttribute:
+	~(
+		','
+		| '('
+		| ')'
+	) // relaxed def for "identifier or reserved word"
+	('(' argumentExpressionList? ')')?
+	| ; // empty
+
+nestedParenthesesBlock: (
+		~('(' | ')')
+		| '(' nestedParenthesesBlock ')'
+	)*;
+
+pointer:
+	'*' typeQualifierList?
+	| '*' typeQualifierList? pointer
+	| '^' typeQualifierList? // Blocks language extension
+	| '^' typeQualifierList? pointer ; // Blocks language extension
+
+typeQualifierList:
+	typeQualifier
+	| typeQualifierList typeQualifier;
+
+parameterTypeList: parameterList | parameterList ',' '...';
+
+parameterList:
+	parameterDeclaration
+	| parameterList ',' parameterDeclaration;
+
+parameterDeclaration:
+	declarationSpecifiers declarator
+	| declarationSpecifiers2 abstractDeclarator?;
+
+identifierList: Identifier | identifierList ',' Identifier;
+
+typeName: specifierQualifierList abstractDeclarator?;
+
+abstractDeclarator:
+	pointer
+	| pointer? directAbstractDeclarator gccDeclaratorExtension*;
+
+directAbstractDeclarator:
+	'(' abstractDeclarator ')' gccDeclaratorExtension*
+	| '[' typeQualifierList? assignmentExpression? ']'
+	| '[' 'static' typeQualifierList? assignmentExpression ']'
+	| '[' typeQualifierList 'static' assignmentExpression ']'
+	| '[' '*' ']'
+	| '(' parameterTypeList? ')' gccDeclaratorExtension*
+	| directAbstractDeclarator '[' typeQualifierList? assignmentExpression? ']'
+	| directAbstractDeclarator '[' 'static' typeQualifierList? assignmentExpression ']'
+	| directAbstractDeclarator '[' typeQualifierList 'static' assignmentExpression ']'
+	| directAbstractDeclarator '[' '*' ']'
+	| directAbstractDeclarator '(' parameterTypeList? ')' gccDeclaratorExtension*;
+
+typedefName: Identifier;
+
+initializer:
+	assignmentExpression
+	| '{' initializerList '}'
+	| '{' initializerList ',' '}';
+
+initializerList:
+	designation? initializer
+	| initializerList ',' designation? initializer;
+
+designation: designatorList '=';
+
+designatorList: designator | designatorList designator;
+
+designator: '[' constantExpression ']' | '.' Identifier;
+
+staticAssertDeclaration:
+	'_Static_assert' '(' constantExpression ',' StringLiteral+ ')' ';';
+
+statement:
+	labeledStatement
+	| compoundStatement
+	| expressionStatement
+	| selectionStatement
+	| iterationStatement
+	| jumpStatement
+	| ('__asm' | '__asm__') ('volatile' | '__volatile__') '(' (
+		logicalOrExpression (',' logicalOrExpression)*
+	)? (':' (logicalOrExpression (',' logicalOrExpression)*)?)* ')' ';';
+
+labeledStatement:
+	Identifier ':' statement
+	| 'case' constantExpression ':' statement
+	| 'default' ':' statement;
+
+compoundStatement: '{' blockItemList? '}';
+
+blockItemList: blockItem | blockItemList blockItem;
+
+blockItem: statement | declaration;
+
+expressionStatement: expression? ';';
+
+selectionStatement:
+	'if' '(' expression ')' statement ('else' statement)?
+	| 'switch' '(' expression ')' statement;
+
+iterationStatement:
+	While '(' expression ')' statement
+	| Do statement While '(' expression ')' ';'
+	| For '(' forCondition ')' statement;
+
+// | 'for' '(' expression? ';' expression? ';' forUpdate? ')' statement | For '(' declaration
+// expression? ';' expression? ')' statement
+
+forCondition:
+	forDeclaration ';' forExpression? ';' forExpression?
+	| expression? ';' forExpression? ';' forExpression?;
+
+forDeclaration:
+	declarationSpecifiers initDeclaratorList
+	| declarationSpecifiers;
+
+forExpression:
+	assignmentExpression
+	| forExpression ',' assignmentExpression;
+
+jumpStatement:
+	'goto' Identifier ';'
+	| 'continue' ';'
+	| 'break' ';'
+	| 'return' expression? ';'
+	| 'goto' unaryExpression ';' ; // GCC extension
+
+compilationUnit: translationUnit? EOF;
+
+translationUnit:
+	externalDeclaration
+	| translationUnit externalDeclaration;
+
+externalDeclaration:
+	functionDefinition
+	| declaration
+	| ';' ; // stray ;
+
+functionDefinition:
+	declarationSpecifiers? declarator declarationList? compoundStatement;
+
+declarationList: declaration | declarationList declaration;
+
+Auto: 'auto';
+Break: 'break';
+Case: 'case';
+Char: 'char';
+Const: 'const';
+Continue: 'continue';
+Default: 'default';
+Do: 'do';
+Double: 'double';
+Else: 'else';
+Enum: 'enum';
+Extern: 'extern';
+Float: 'float';
+For: 'for';
+Goto: 'goto';
+If: 'if';
+Inline: 'inline';
+Int: 'int';
+Long: 'long';
+Register: 'register';
+Restrict: 'restrict';
+Return: 'return';
+Short: 'short';
+Signed: 'signed';
+Sizeof: 'sizeof';
+Static: 'static';
+Struct: 'struct';
+Switch: 'switch';
+Typedef: 'typedef';
+Union: 'union';
+Unsigned: 'unsigned';
+Void: 'void';
+Volatile: 'volatile';
+While: 'while';
+
+Alignas: '_Alignas';
+Alignof: '_Alignof';
+Atomic: '_Atomic';
+Bool: '_Bool';
+Complex: '_Complex';
+Generic: '_Generic';
+Imaginary: '_Imaginary';
+Noreturn: '_Noreturn';
+StaticAssert: '_Static_assert';
+ThreadLocal: '_Thread_local';
+
+LeftParen: '(';
+RightParen: ')';
+LeftBracket: '[';
+RightBracket: ']';
+LeftBrace: '{';
+RightBrace: '}';
+
+Less: '<';
+LessEqual: '<=';
+Greater: '>';
+GreaterEqual: '>=';
+LeftShift: '<<';
+RightShift: '>>';
+
+Plus: '+';
+PlusPlus: '++';
+Minus: '-';
+MinusMinus: '--';
+Star: '*';
+Div: '/';
+Mod: '%';
+
+And: '&';
+Or: '|';
+AndAnd: '&&';
+OrOr: '||';
+Caret: '^';
+Not: '!';
+Tilde: '~';
+
+Question: '?';
+Colon: ':';
+Semi: ';';
+Comma: ',';
+
+Assign: '=';
+// '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+StarAssign: '*=';
+DivAssign: '/=';
+ModAssign: '%=';
+PlusAssign: '+=';
+MinusAssign: '-=';
+LeftShiftAssign: '<<=';
+RightShiftAssign: '>>=';
+AndAssign: '&=';
+XorAssign: '^=';
+OrAssign: '|=';
+
+Equal: '==';
+NotEqual: '!=';
+
+Arrow: '->';
+Dot: '.';
+Ellipsis: '...';
+
+Identifier: IdentifierNondigit ( IdentifierNondigit | Digit)*;
+
+fragment IdentifierNondigit:
+	Nondigit
+	| UniversalCharacterName
+	; //|   // other implementation-defined characters...
+
+fragment Nondigit: [a-zA-Z_];
+
+fragment Digit: [0-9];
+
+fragment UniversalCharacterName:
+	'\\u' HexQuad
+	| '\\U' HexQuad HexQuad;
+
+fragment HexQuad:
+	HexadecimalDigit HexadecimalDigit HexadecimalDigit HexadecimalDigit;
+
+Constant:
+	IntegerConstant
+	| FloatingConstant
+	//|   EnumerationConstant
+	| CharacterConstant;
+
+fragment IntegerConstant:
+	DecimalConstant IntegerSuffix?
+	| OctalConstant IntegerSuffix?
+	| HexadecimalConstant IntegerSuffix?
+	| BinaryConstant;
+
+fragment BinaryConstant: '0' [bB] [0-1]+;
+
+fragment DecimalConstant: NonzeroDigit Digit*;
+
+fragment OctalConstant: '0' OctalDigit*;
+
+fragment HexadecimalConstant:
+	HexadecimalPrefix HexadecimalDigit+;
+
+fragment HexadecimalPrefix: '0' [xX];
+
+fragment NonzeroDigit: [1-9];
+
+fragment OctalDigit: [0-7];
+
+fragment HexadecimalDigit: [0-9a-fA-F];
+
+fragment IntegerSuffix:
+	UnsignedSuffix LongSuffix?
+	| UnsignedSuffix LongLongSuffix
+	| LongSuffix UnsignedSuffix?
+	| LongLongSuffix UnsignedSuffix?;
+
+fragment UnsignedSuffix: [uU];
+
+fragment LongSuffix: [lL];
+
+fragment LongLongSuffix: 'll' | 'LL';
+
+fragment FloatingConstant:
+	DecimalFloatingConstant
+	| HexadecimalFloatingConstant;
+
+fragment DecimalFloatingConstant:
+	FractionalConstant ExponentPart? FloatingSuffix?
+	| DigitSequence ExponentPart FloatingSuffix?;
+
+fragment HexadecimalFloatingConstant:
+	HexadecimalPrefix HexadecimalFractionalConstant BinaryExponentPart FloatingSuffix?
+	| HexadecimalPrefix HexadecimalDigitSequence BinaryExponentPart FloatingSuffix?;
+
+fragment FractionalConstant:
+	DigitSequence? '.' DigitSequence
+	| DigitSequence '.';
+
+fragment ExponentPart:
+	'e' Sign? DigitSequence
+	| 'E' Sign? DigitSequence;
+
+fragment Sign: '+' | '-';
+
+DigitSequence: Digit+;
+
+fragment HexadecimalFractionalConstant:
+	HexadecimalDigitSequence? '.' HexadecimalDigitSequence
+	| HexadecimalDigitSequence '.';
+
+fragment BinaryExponentPart:
+	'p' Sign? DigitSequence
+	| 'P' Sign? DigitSequence;
+
+fragment HexadecimalDigitSequence: HexadecimalDigit+;
+
+fragment FloatingSuffix: 'f' | 'l' | 'F' | 'L';
+
+fragment CharacterConstant:
+	'\'' CCharSequence '\''
+	| 'L\'' CCharSequence '\''
+	| 'u\'' CCharSequence '\''
+	| 'U\'' CCharSequence '\'';
+
+fragment CCharSequence: CChar+;
+
+fragment CChar: ~['\\\r\n] | EscapeSequence;
+
+fragment EscapeSequence:
+	SimpleEscapeSequence
+	| OctalEscapeSequence
+	| HexadecimalEscapeSequence
+	| UniversalCharacterName;
+
+fragment SimpleEscapeSequence: '\\' ['"?abfnrtv\\];
+
+fragment OctalEscapeSequence:
+	'\\' OctalDigit
+	| '\\' OctalDigit OctalDigit
+	| '\\' OctalDigit OctalDigit OctalDigit;
+
+fragment HexadecimalEscapeSequence: '\\x' HexadecimalDigit+;
+
+StringLiteral: EncodingPrefix? '"' SCharSequence? '"';
+
+fragment EncodingPrefix: 'u8' | 'u' | 'U' | 'L';
+
+fragment SCharSequence: SChar+;
+
+fragment SChar:
+	~["\\\r\n]
+	| EscapeSequence
+	| '\\\n' // Added line
+	| '\\\r\n' ; // Added line
+
+ComplexDefine: '#' Whitespace? 'define' ~[#]* -> skip;
+
+IncludeDirective:
+	'#' Whitespace? 'include' Whitespace? (
+		('"' ~[\r\n]* '"')
+		| ('<' ~[\r\n]* '>')
+	) Whitespace? Newline -> skip;
+
+// ignore the following asm blocks:
+/*
+ asm
+ {
+ mfspr x, 286;
+ }
+ */
+AsmBlock: 'asm' ~'{'* '{' ~'}'* '}' -> skip;
+
+// ignore the lines generated by c preprocessor sample line : '#line 1 "/home/dm/files/dk1.h" 1'
+LineAfterPreprocessing: '#line' Whitespace* ~[\r\n]* -> skip;
+
+LineDirective:
+	'#' Whitespace? DecimalConstant Whitespace? StringLiteral ~[\r\n]* -> skip;
+
+PragmaDirective:
+	'#' Whitespace? 'pragma' Whitespace ~[\r\n]* -> skip;
+
+Whitespace: [ \t]+ -> skip;
+
+Newline: ( '\r' '\n'? | '\n') -> skip;
+
+BlockComment: '/*' .*? '*/' -> skip;
+
+LineComment: '//' ~[\r\n]* -> skip;

src/client/spark_excel/grammar/ExcelFormula.g4

@@ -0,0 +1,93 @@
+grammar ExcelFormula;
+
+/* Parser rules */
+main: '=' expr EOF;
+expr:
+	sign = ('+' | '-') expr						# Unary
+	| expr '%'									# Percentage
+	| <assoc=right> expr '^' expr				# Pow
+	| expr op = ('*' | '/') expr				# MulDiv
+	| expr op = ('+' | '-') expr				# AddSub
+	| expr '&' expr								# Concatenate
+	| expr op = ('=' | '<>') expr				# Equality
+	| expr op = ('<' | '>' | '<=' | '>=') expr	# Relational
+	| '(' expr ')'								# Parenthesis
+	| name = NAME '(' (expr (',' expr)*)? ')'	# Function
+	| rng										# Range
+	| rng (',' rng)+							# RangeList
+	| ref										# Cell
+	| ref (',' ref)+							# CellList
+	| BOOLEAN									# Boolean
+	| NUMBER									# Number
+	| NAME										# Name
+	| STRING									# String
+	| ERROR										# Error;
+ref: sheet = SHEET? colRow = COL_ROW # CellRef;
+rng: start = ref ':' end = COL_ROW # RangeRef;
+
+/* Lexer rules */
+COL_ROW: '$'? COL '$'? DIGIT+;
+STRING: '"' ~["]* '"';
+BOOLEAN: T R U E | F A L S E;
+NUMBER: FLOAT | DIGIT+;
+NAME: [a-zA-Z_\\] ([0-9a-zA-Z_.\\])*;
+ERROR:
+	E_NULL
+	| E_DIV0
+	| E_VALUE
+	| E_NAME
+	| E_NUM
+	| E_NA
+	| E_REF;
+E_NULL: '#' N U L L '!';
+E_DIV0: '#' D I V '/0';
+E_VALUE: '#' V A L U E '!';
+E_NAME: '#' N A M E '?';
+E_NUM: '#' N U M '!';
+E_NA: '#' N '/' A;
+E_REF: '#' R E F '!';
+SHEET:
+	SHEET_C+ '!'
+	| SHEET_C+ ':'+ SHEET_C+ '!'
+	| '\'' Q_SHEET_C+ '\'!'
+	| '\'' Q_SHEET_C+ ':' Q_SHEET_C+ '\'!';
+SPACE: (' ' | '\t' | '\r' | '\n' | '\u000C') -> skip;
+INVALID: .;
+
+/* Lexer fragments */
+fragment COL: [a-zA-Z]? [a-zA-Z]? [a-zA-Z]; // Max col is XFD
+fragment DIGIT: [0-9];
+fragment FLOAT: DIGIT+ '.' DIGIT+ EXPONENT? | DIGIT+ EXPONENT;
+fragment EXPONENT: E ('+'? | '-') DIGIT+;
+fragment FILE: '[' DIGIT+ ']' | '[' FILENAME_C+ ']';
+fragment WIN_PATH: [A-Z] ':\\' (FILENAME_C+ '\\')*;
+fragment FILENAME_C: ~["*[\]\\:/?<>|];
+fragment SHEET_C: ~['*[\]\\:/?<>();{}#"=&+^%,!\u2229\u222A \-];
+fragment Q_SHEET_C: ~['*[\]\\:/?];
+
+fragment A: ('a' | 'A');
+fragment B: ('b' | 'B');
+fragment C: ('c' | 'C');
+fragment D: ('d' | 'D');
+fragment E: ('e' | 'E');
+fragment F: ('f' | 'F');
+fragment G: ('g' | 'G');
+fragment H: ('h' | 'H');
+fragment I: ('i' | 'I');
+fragment J: ('j' | 'J');
+fragment K: ('k' | 'K');
+fragment L: ('l' | 'L');
+fragment M: ('m' | 'M');
+fragment N: ('n' | 'N');
+fragment O: ('o' | 'O');
+fragment P: ('p' | 'P');
+fragment Q: ('q' | 'Q');
+fragment R: ('r' | 'R');
+fragment S: ('s' | 'S');
+fragment T: ('t' | 'T');
+fragment U: ('u' | 'U');
+fragment V: ('v' | 'V');
+fragment W: ('w' | 'W');
+fragment X: ('x' | 'X');
+fragment Y: ('y' | 'Y');
+fragment Z: ('z' | 'Z');

src/client/spark_excel/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ExcelDna.AddIn" version="0.34.6" targetFramework="net471" />
-  <package id="ExcelDna.Integration" version="0.34.6" targetFramework="net471" />
-</packages>

src/client/spark_excel/rtd/formatting/JsonFormatter.cs

@@ -13,6 +13,8 @@ namespace bts.excel.rtd
    class JsonFormatter : IExcelFormatter
    {
       private object _data;
+      static Google.Protobuf.JsonFormatter _protoformatter =
+         new Google.Protobuf.JsonFormatter(Google.Protobuf.JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
       public JsonFormatter(object data)
       {
          _data = data;
@@ -81,7 +83,7 @@ namespace bts.excel.rtd
       {
          string json = null;
          if(data is IMessage imsg)
-            json = Google.Protobuf.JsonFormatter.Default.Format(imsg);
+            json = _protoformatter.Format(imsg);
          else
             json = JsonConvert.SerializeObject(data);
 

src/client/spark_excel/spark_excel.csproj

@@ -15,9 +15,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>x64</Platforms>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <NoWarn>0108,3021</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
     <Version>1.0.0</Version>
+    <Antlr4UseCSharpGenerator>true</Antlr4UseCSharpGenerator>
   </PropertyGroup>
   
   <ItemGroup>
@@ -28,10 +30,21 @@
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Linq.Dynamic" Version="1.0.7" />
     
-    <PackageReference Include="ExcelDna.AddIn" Version="0.34.6" />  
-    <PackageReference Include="ExcelDna.Integration" Version="0.34.6" />      
+    <PackageReference Include="ExcelDna.AddIn" Version="1.0.0" />  
+    <PackageReference Include="ExcelDna.Integration" Version="1.0.0" />      
     <PackageReference Include="ExcelDna.IntelliSense" Version="1.1.0" />      
     <PackageReference Include="ExcelDna.Registration" Version="0.34.7" />      
+    <PackageReference Include="ExcelDna.Interop" Version="14.0.1" />      
+    
+    <PackageReference Include="Antlr4" Version="4.6.6">
+       <PrivateAssets>all</PrivateAssets>
+       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Antlr4.Runtime" Version="4.6.6" />
+    <PackageReference Include="Antlr4.CodeGenerator" Version="4.6.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>    
   </ItemGroup>
   
   <ItemGroup>    
@@ -50,17 +63,28 @@
     <None Include="spark_excel-AddIn.dna" />
     <None Include="packages.config" />
     <None Include="Properties\ExcelDna.Build.props" />
+    <None Include="$(IntermediateOutputPath)\*.cs" />
   </ItemGroup>  
   
   <ItemGroup>
     <ProjectReference Include="../spark_api/spark_api.csproj"/>
   </ItemGroup>
   
+  
+  <!-- <ItemGroup>
+      <Antlr4 Include="grammar/ExcelFormula.g4">
+         <Generator>MSBuild:Compile</Generator>
+         <CustomToolNamespace>bts.excel.grammar</CustomToolNamespace>
+         <Listener>True</Listener>
+         <Visitor>True</Visitor>
+      </Antlr4>  
+  </ItemGroup> -->
+  
   <ItemGroup>
     <Proto3Excel Include="**/*.proto" />
     <Proto3Excel Include="../../lib/api/services/*.proto" />
   </ItemGroup>
-  
+    
   <ItemGroup>
     <None Include="spark_excel_example_2018.xlsm"><CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory></None>  
   </ItemGroup>
@@ -74,9 +98,9 @@
    -->
   
   <!-- <Import Project="$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets" Condition="Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets')" /> -->
-  <Import Project="$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets"/>
+  <!-- <Import Project="$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets"/>
   <Target Name="EnsureExcelDnaTargetsImported" BeforeTargets="BeforeBuild" Condition="'$(ExcelDnaTargetsImported)' == ''">
     <Error Condition="!Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="You are trying to build with ExcelDna, but the NuGet targets file that ExcelDna depends on is not available on this computer. This is probably because the ExcelDna package has not been committed to source control, or NuGet Package Restore is not enabled. Please enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('$(NuGetPackageRoot)\ExcelDna.AddIn\0.34.6\tools\ExcelDna.AddIn.targets') And ('$(RunExcelDnaBuild)' != '' And $(RunExcelDnaBuild))" Text="ExcelDna cannot be run because NuGet packages were restored prior to the build running, and the targets file was unavailable when the build started. Please build the project again to include these packages in the build. You may also need to make sure that your build server does not delete packages prior to each build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>  
+  </Target>   -->
 </Project>

src/client/spark_excel/utils/AlgoHelpers.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using ExcelDna.Integration;
+using bts.api;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+
+namespace bts.excel
+{
+   public class AlgoHelpers
+   {
+      static ConcurrentDictionary<string, object> _cache = new ConcurrentDictionary<string, object>();
+
+      [ExcelFunction(IsMacroType = true)]
+      static public object sparkalgo_register_parameter([ExcelArgument(AllowReference = true)] object parameter)
+      {
+         ExcelReference par = (ExcelReference)parameter;
+         string sheetname = (string)XlCall.Excel(XlCall.xlSheetNm, par);
+         var cellref = new CellRef(sheetname, (par.ColumnFirst + 1, par.RowFirst + 1));
+         string r1c1 = cellref.r1_c1();
+         var cellname = XlCall.Excel(XlCall.xlfGetDef, r1c1, sheetname);
+         if (!(cellname is ExcelError))
+         {
+            GeneratorVisitor.register_algo_parameter(sheetname, cellname.ToString());
+            return true;
+         }
+         else
+            return $"{ErrorValue.Name}, please make algo parameters named ranges";
+
+         // ExcelReference caller = (ExcelReference)XlCall.Excel(XlCall.xlfCaller);
+         // var refr = $"R{caller.RowFirst+1}C{caller.ColumnFirst+1}:R{caller.RowLast+1}C{caller.ColumnLast+1}";
+         // var reff = new CellRef(sheetname, (caller.ColumnFirst + 1, caller.RowFirst + 1));
+         // refr = reff.r1_c1();    
+         // bool hidden = false; bool local = true;
+         // var res = XlCall.Excel(XlCall.xlcDefineName, name, "=" + refr, Type.Missing, Type.Missing, hidden, Type.Missing, local);
+      }
+
+      [ExcelFunction(IsMacroType = true)]
+      static public object sparkalgo_take_snapshot(object data, string tag)
+      {
+         object val;
+         if(!_cache.TryGetValue(tag, out val))
+         {
+            _cache[tag] = val = data;
+         }
+         return val;
+      }         
+
+      [ExcelFunction(IsMacroType = true)]
+      static public object sparkalgo_get_snapshot(string tag)
+      {
+         _cache.TryGetValue(tag, out object val);
+         return val;
+      }
+
+      [ExcelFunction(IsMacroType = true)]
+      static public object sparkalgo_snapshot_switch(string tag, int on_off)
+      {
+         object val;
+         if (!_cache.TryGetValue(tag, out val) && on_off > 0)
+         {
+            _cache[tag] = val = on_off;
+         }
+         return val ?? 0;
+      }
+
+      [ExcelFunction(IsMacroType = true)]
+      static public void sparkalgo_reset_all_snapshots(object _)
+      {
+         _cache.Clear();
+      }
+
+      static public void sparkalgo_reset_all_snapshots_no_args()
+      {
+         _cache.Clear();
+      }
+
+      [ExcelFunction(IsMacroType = true)]
+      static public void sparkalgo_reset_snapshot(string tag)
+      {
+         _cache.TryRemove(tag, out object val);
+      }
+      
+      
+
+   }
+}

src/client/spark_sdk/README.md

@@ -73,6 +73,10 @@ Commands:
    order <exchange> <security_type> <symbol> <security_desc> <signed_quantity> [<price>]
 Arguments:
    --pump=<pump_interval_in_ms=100 default>
+   
+Example:
+   To print simulated market data to the screen:
+   spark_sdk.exe md SIM FUTURE ES SIM:ESU9 --user=bts
 ```
 
 * Check out sample code

src/client/spark_test/Utils/TestUtils.cs

@@ -143,6 +143,7 @@ namespace bts.tests.utils {
                products = tmpp.value;
                break;
             }
+            await Task.Delay(10000);
          }
 
          bts.test.Assert.IsTrue(products != null, "No products found");
@@ -173,7 +174,7 @@ namespace bts.tests.utils {
             Result<Response> oret = await OrderUtilities.send_order(order_service, odef, 0,1);
 
             var sub = order_service.subscribei_orders().Subscribe(async update => {
-                  if(service_value == null) {
+                  if(service_value == null && oret.value.OrderKey > 0) {
                      await OrderUtilities.cancel_orders(order_service, null, oret.value.OrderKey);
                      service_value = update;
                   }

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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/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/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manLine 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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/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/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderMLine truncated

src/lib/CMakeDeps_win.cmake

@@ -1 +1 @@
-set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/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/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utLine 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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/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/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/cryptoLine truncated

src/lib/api/apicore.proto

@@ -50,6 +50,7 @@ message VoidMessage {}
 message BytesMessage {
 	bytes buffer = 1;
 }
-message BoolResultMessage {
-	bool success = 1;
+message ResultMessage {
+   bool success = 1;
+   string error_message = 2;
 }

src/lib/api/public/Update.h

@@ -27,7 +27,12 @@ namespace api {
          _removed_items(std::move(removed))
       {}
 
-      Update(const Update& other) = delete;
+      Update(const Update& other) : _all_items(other._all_items),
+                                    _added_items(other._added_items),
+                                    _changed_items(other._changed_items),
+                                    _removed_items(other._removed_items)
+      {}
+      
       Update(Update&& other) :
          _all_items(std::move(other._all_items)),
          _added_items(std::move(other._added_items)),
@@ -104,4 +109,4 @@ namespace api {
    }
 
 
-}}//namespace
+}}//namespace

src/lib/api/services/AdminService.proto

@@ -149,6 +149,7 @@ message BTSAccount{
    ExchangeAccountData exchange_account_data = 110;
    // extra parameters for risk enforcement
    RiskLimitEnforcement risk_limit_enforcement=120;
+   AccountLossLimit account_loss_limit = 130;
 }
 
 message RiskLimitEnforcement{   
@@ -190,6 +191,11 @@ message AccountExchangeConnections{
    repeated string exchange_connection_names = 20;
 }
 
+message AccountLossLimit{
+   bool enforce = 10;
+   uint32 total_loss_limit = 20;
+   // if we need per product we can add it here
+}
 /************************************************************************/
 /***************************Exchange Data********************************/
 /************************************************************************/

src/lib/api/services/MarginService.proto

@@ -0,0 +1,67 @@
+syntax="proto3";
+package bts.api.position;
+option csharp_namespace="bts.api.position";
+import "lib/api/apioptions.proto";
+import "lib/api/apicore.proto";
+import "lib/api/services/PositionService.proto";
+
+message MarginResult {
+   enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; }
+   
+   string account = 10 [(bts.api.key)=true];    
+   ResultStatus status = 12;
+   string portfolio_id = 15; 
+   string settle_indicator = 20;
+   string settle_qualifier = 30;   
+   string as_of_time = 40;
+   string calculation_id = 50;   
+   
+   double opt_value = 100;
+   double nonopt_value = 110;
+   double maint_margin = 120;
+   double initial_margin = 130;
+}
+
+message ExcessLiquidityReport { 
+   string account = 10 [(bts.api.key)=true];    
+   uint32 account_id = 11;
+   double leverage_factor = 20;
+   double cash_balance = 30;
+   MarginResult margin_result = 40;
+   AccountPNL account_pnl = 50;
+   bool should_enforce_margin = 60;
+   double excess_liquidity = 100;   
+}
+
+
+message MarginRequest {
+   string account = 10;
+}
+
+message CashFactorUpdate {
+   string account = 10;
+   double leverage_factor = 20;
+}
+
+message CashBalanceUpdate {
+   string account = 10;
+   double cash_balance = 20;
+}
+
+message EnforceUpdate {
+   string account = 10;
+   bool should_enforce_margin = 20;
+}
+
+service MarginService {
+   option (bts.api.service_description) = "Provides CME Margin Information per account";
+
+   rpc get_margin(MarginRequest) returns (MarginResult);
+   rpc get_excess_liquidity_report(MarginRequest) returns (ExcessLiquidityReport);
+   rpc set_should_enforce_margin(EnforceUpdate) returns (bts.api.ResultMessage);
+   rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage);
+   rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage);
+   
+   rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult);
+   rpc excess_liquidity_report(bts.api.VoidMessage) returns (stream ExcessLiquidityReport);
+}

src/lib/api/services/OrderService.proto

@@ -160,8 +160,8 @@ message JoinOrderDefinition {
   CustomOrderDefinition child = 6;
 }
 message TopOrderDefinition {
-  uint32 watch_level_tick_offset = 1;
   spark.QuantityMeasure top_threshold = 2;
+  uint32 ticks_off = 3;
   CustomOrderDefinition child = 6;
 }
 message TriggerOrderDefinition {

src/lib/api/services/PositionService.proto

@@ -8,6 +8,7 @@ import "lib/domain_model/Security.proto";
 message PositionUnit{
    int32 record_id = 1 [(bts.api.key)=true];
    string account = 10;
+   uint32 account_id = 15;
    uint32 security_id = 20;
    double sod_long_pos = 30;
    double sod_long_avg_price = 40;
@@ -19,6 +20,22 @@ message PositionUnit{
    double day_short_avg_price = 100;   
 }
 
+message PNLUnit{
+   int32 record_id = 1 [(bts.api.key)=true];
+   PositionUnit pos = 10;
+   double cash_value = 20;   
+   double bid_price = 30;
+   double ask_price = 40;
+   double last_price = 50;
+   double settlement_price = 60;
+}
+
+message AccountPNL{
+   uint32 account_id = 1 [(bts.api.key)=true];
+   string account_name = 10;
+   double day_pnl = 20;
+}
+
 message ManualFill {
   int32 record_id = 1 [(bts.api.key)=true];
   uint32 security_key = 2;
@@ -53,5 +70,6 @@ service PositionService {
   // subscription
   rpc manual_fills(bts.api.VoidMessage) returns (stream ManualFill);
   rpc position_data(bts.api.VoidMessage) returns (stream PositionUnit);
-
+  rpc pnl_data(bts.api.VoidMessage) returns (stream PNLUnit);
+  rpc pnl_account_data(bts.api.VoidMessage) returns (stream AccountPNL);
 }

src/lib/config/defaults/span.conf

@@ -0,0 +1,9 @@
+
+SpanMargin {
+   value {
+      enabled: false
+      login: 'api_bts1'
+      password: 'Summer123'
+      url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/'
+   }
+}

src/lib/config/defaults/toggles.conf

@@ -8,4 +8,4 @@ OrdersSoftCleanup {
    value {
       enabled: true
    }
-}
+}

src/lib/config/protos/UI.proto

@@ -141,6 +141,11 @@ message TopAttachUIOptions {
    optional bool show_quantity = 2 [default = false];
 }
 
+message OffsetAttachUIOptions {
+   optional bool show_price = 1 [default = false];
+   optional bool show_quantity = 2 [default = false];
+}
+
 message ManualFillsOptions {
    optional bool modal_transactions = 1 [default = true];
 }

src/lib/config/protos/span.proto

@@ -0,0 +1,10 @@
+syntax='proto2';
+package bts.config;
+
+message SpanMargin
+{
+   optional bool enabled = 10;
+   optional string login = 20; 
+   optional string password = 30; 
+   optional string url = 40;    
+}

src/lib/config/protos/toggles.proto

@@ -53,4 +53,4 @@ message EnsureOnScreenWithWorkAreaRect {
    // and the new ensure_onscreen code has only been tested with a single monitor arrangement.
    // Should verify that the code works with every monitor arrangement before enabling by default.
    optional bool enabled = 1 [default = false];
-}
+}

src/lib/domain_model/Security.proto

@@ -143,6 +143,7 @@ message SpreadContract {
 
 message SyntheticContract {    
     string name = 1;
+    uint32 user_id = 2;
     repeated ContractLeg legs = 20;
 	PriceCalc price_calc = 30;
 	enum PriceCalc {

src/lib/md/MDProducerHandle.cpp

@@ -102,14 +102,13 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) {
 }
 
 void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) {
-   // Add this trade to the last trade if price/side match
+   // Add this trade to the last trade if price match
    auto current = std::get<PriceSize>(cdata().last_trade.load());
-   if (current.int_price() == price.int_price() && agside == cdata().last_side) {
+   if (current.int_price() == price.int_price()) {
       cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time);
    }
    else {
       cdata().last_trade.store(price,time);
-      cdata().last_side = agside;
    }
    cdata().last_trade_time = tradetime;
    cdata().total_volume = volume;

src/lib/md/SecurityCache.cpp

@@ -22,6 +22,7 @@ void SecurityCacheImpl::enqueue_update_db(const SecurityPtr& security) {
 }
 
 void SecurityCacheImpl::flush() {
+   #ifndef _WIN32
    if (!update_queue.empty()) {
       std::vector<SecurityPtr> work;
       SecurityPtr temp;
@@ -33,6 +34,7 @@ void SecurityCacheImpl::flush() {
          }
       }
    }
+   #endif
 }
 
 //////////////////

src/lib/md/Shm/MDStructure.h

@@ -26,7 +26,7 @@ namespace md {
 
 using utils::TimeStamp;
 
-const uint32_t shm_version = 101;
+const uint32_t shm_version = 102;
 
 struct ALIGNED_(CACHE_LINE) HotHeader {
    size_t count;
@@ -214,7 +214,6 @@ struct ColdEntry {
       last_trade(),
       total_volume(0),
       last_trade_time(),
-      last_side(co2::AggressorSide::AGGRESSOR_SIDE_NONE),
       misc(),
       deleted(false)
    {
@@ -230,7 +229,6 @@ struct ColdEntry {
    AtomicPriceSize last_trade;
    size_t total_volume;
    datetime::LLDateTime  last_trade_time;
-   co2::AggressorSide last_side;
 
    MiscData misc;
 

src/lib/md/test/synthetic_book_merge_tests.cpp

@@ -111,7 +111,7 @@ tuple<shared_ptr<SyntheticStrategy>,vector<Co2TestInstrument>> make_securities(c
       l->mutable_security()->mutable_contract_spec()->set_low_tick(tick_size);
       l->mutable_security()->mutable_contract_spec()->set_high_tick(tick_size);
       l->set_quantity(quantity);
-      l->set_price_multiplier(quantity * (side == api::SIDE_BUY ? 1.0 : -1));
+      l->set_price_multiplier(mult);
       l->set_side(side);
       synthetic->legs.push_back(instr.consumer());
       legs.push_back(instr);
@@ -126,7 +126,8 @@ tuple<shared_ptr<SyntheticStrategy>,vector<Co2TestInstrument>> make_securities(c
       double quantity, tick_size;
       api::Side side;
       std::tie(quantity, tick_size, side) = t;
-      legs.push_back({ quantity, quantity, tick_size, side });
+      double mult = quantity * (side == api::SIDE_BUY ? 1.0 : -1);
+      legs.push_back({ quantity, mult, tick_size, side });
    }
    return make_securities(legs);
 }
@@ -457,6 +458,113 @@ TEST_CASE("Synthetic_net_change", "[md][synthetic]") {
    }
 }
 
+TEST_CASE("HCL_SP_104", "[md][synthetic]") {
+   shared_ptr<SyntheticStrategy> synthetic;
+   vector<Co2TestInstrument> test_instr;
+   tie(synthetic, test_instr) = make_securities({ 
+      // (quantity, multiplier, tick_size, side)
+      {1.0, 1.0,  0.01, api::SIDE_BUY},
+      {1.0, 1.0,  0.01, api::SIDE_BUY},
+      {1.0, -1.0, 0.01, api::SIDE_SELL},
+      {1.0, -1.0, 0.01, api::SIDE_SELL }
+   });
+   auto leg1 = test_instr[0]; // CLQ9-CLU9
+   auto leg2 = test_instr[1]; // HCLQ9-CLQ9
+   auto leg3 = test_instr[2]; // HCLQ9-HCLU9
+   auto leg4 = test_instr[3]; // HCLU9-CLU9
+
+   setup_market(leg1.producer(),
+      {
+         { -0.10, 3299 },
+         { -0.11, 2885 },
+         { -0.12, 2558 },
+         { -0.13, 2447 },
+         { -0.14, 1540 },
+         { -0.15, 2334 },
+         { -0.16, 1396 },
+         { -0.17, 1190 },
+         { -0.18, 1221 },
+         { -0.19, 812  }
+      },
+      { 
+         { -0.09, 1318 },
+         { -0.08, 2174 },
+         { -0.07, 3057 },
+         { -0.06, 2331 },
+         { -0.05, 2543 },
+         { -0.04, 2638 },
+         { -0.03, 2232 },
+         { -0.02, 3221 },
+         { -0.01, 2863 },
+         {  0.00, 3327 }
+      });
+   
+   setup_market(leg2.producer(),
+      {
+         { 4.06,  1 },
+         { 4.05,  2 },
+         { 4.04,  3 },
+         { 4.03, 12 },
+         { 4.02,  6 },
+         { 4.01,  1 }
+      },
+      {
+         { 4.07, 1 },
+         { 4.08, 2 },
+         { 4.10, 8 },
+         { 4.11, 10 },
+         { 4.12, 2 },
+         { 4.14, 1 }
+      });
+   
+   setup_market(leg3.producer(),
+      {
+         { 0.20, 2  },
+         { 0.19, 6  },
+         { 0.18, 5  },
+         { 0.17, 18 },
+         { 0.16, 2  },
+         { 0.15, 3  },
+         { 0.14, 2  }
+      },
+      {
+         { 0.22, 2 },
+         { 0.23, 4 },
+         { 0.24, 9 },
+         { 0.25, 17},
+         { 0.26, 5 },
+         { 0.27, 5 },
+         { 0.28, 4 },
+         { 0.29, 2 },
+         { 0.30, 2 }
+      });
+
+   setup_market(leg4.producer(),
+      {
+         { 3.75, 1 },
+         { 3.74, 3 },
+         { 3.73, 4 },
+         { 3.72, 12 },
+         { 3.71, 1 },
+         { 3.70, 3 }
+      },
+      {
+         { 3.78, 1 },
+         { 3.79, 2 },
+         { 3.80, 6 },
+         { 3.81, 1 },
+         { 3.82, 10 },
+         { 3.83, 1 }
+      });
+
+      MDConsumerHandle synthetic_handle(synthetic);
+      // dump_market(synthetic_handle);
+      expect_market(synthetic_handle,
+         { { -0.04,1 },{ -0.06,1 },{ -0.07,1 },{ -0.09,3 },{ -0.11,3 },{ -0.12,1 },{ -0.13,5 },{ -0.14,3 },{ -0.15,2 },{ -0.16,1 } },
+         {  { 0.03,1 },{ 0.05,1 },{ 0.06,1 },{ 0.08,1 },{ 0.09,4 },{ 0.11,3 },{ 0.12,2 },{ 0.13,7 },{ 0.14,1 },{ 0.16,2 } }
+      );
+}
+
 
 //
 // Benchmarks

src/lib/orderman/actors/FillStore.cpp

@@ -126,6 +126,7 @@ void FillStore::on_execution_report(
                if (it != me->known_orders.end()) {
                   auto &order_def = it->second;
                   fill.set_account(order_def.account());
+                  fill.set_internal_account_id(order_def.account_id());
                } else
                   me->fills_with_unresolved_accounts[er.order_key]
                       .fills.push_back(fill);
@@ -153,6 +154,7 @@ void FillStore::on_order_definition_update(
          auto &unresolved_fills = me->fills_with_unresolved_accounts[ev.key];
          for (auto &f : unresolved_fills.fills) {
             f.set_account(ev.def->account());
+            f.set_internal_account_id(ev.def->account_id());
             auto fv = utils::pb::to_string(f);
             me->store->update(fills_ns, f.fill_key(), fv);
             publish(me->fill_stream, f, *unresolved_fills.security);

src/lib/orderman/actors/SODPosition.cpp

@@ -1,6 +1,7 @@
 #include "lib/orderman/actors/SODPosition.h"
 #include "lib/config/config.h"
 #include "lib/config/protos/orders_fills_cleanup.pb.h"
+#include "lib/api/service_helpers/AdminServiceUtils.h"
 #include "lib/config/protos/toggles.pb.h"
 #include "lib/logging/logging.h"
 #include "lib/utils/PBUtils.h"
@@ -131,6 +132,7 @@ void SODPosition::_merge_pos(Fill &pos, const Fill &fill) {
 void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) {
    pos.set_security_key(fill.security_key());
    pos.set_account(fill.account());
+   pos.set_internal_account_id(fill.internal_account_id());
    pos.set_side(side);
    pos.mutable_timestamp()->set_seconds(_sod_time.tv_sec);
    pos.mutable_timestamp()->set_nanos(0);
@@ -140,14 +142,20 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) {
    pos.set_last_shares(0);
 }
 
-bool SODPosition::add_fill_to_sod_pos(const Fill &fill) {
+bool SODPosition::add_fill_to_sod_pos(const Fill &fill) {   
    if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) {
-      uint32_t seckey = fill.security_key();
-      const std::string &acct = fill.account();
-      auto acct_it = _sod_map.find(acct);
+      if (!bts::admin::AdminServiceUtils::has_id(fill.internal_account_id())){
+         LOG(persist, Error, "SODPosition::add_fill_to_sod_pos Could not find "
+                             "account_id for fill:{} account:{}",
+                             fill.fill_key(), fill.account());
+         return false;
+      }
+      uint32_t seckey = fill.security_key(),
+               account_id = fill.internal_account_id();
+      auto acct_it = _sod_map.find(account_id);
       if (acct_it == _sod_map.end())
-         _sod_map[acct] = SecPosMap();
-      acct_it = _sod_map.find(fill.account());
+         _sod_map[account_id] = SecPosMap();
+      acct_it = _sod_map.find(account_id);
       bts_assert(acct_it != _sod_map.end());
       SecPosMap &sec_map = acct_it->second;
       auto sec_it = sec_map.find(seckey);
@@ -165,7 +173,8 @@ bool SODPosition::add_fill_to_sod_pos(const Fill &fill) {
       else
          _merge_pos(pos.second, fill);
       return true;
-   } else
+   }
+   else
       return false;
 }
 

src/lib/orderman/actors/SODPosition.h

@@ -16,8 +16,7 @@ SecPosMap;
 
 class SODPosition{
 private:
-   std::map<std::string,SecPosMap> _sod_map;
-   std::map<uint32_t, const api::Security*> _sec_ptr_map;
+   std::map<uint32_t,SecPosMap> _sod_map;
    const bool _enabled;
    const timeval _sod_time;   
 private:

src/lib/orderman/actors/ServiceBridge.cpp

@@ -1,10 +1,14 @@
 #include "ServiceBridge.h"
 
 #include "lib/api/public/ServiceContext.h"
+#include "lib/api/services/OrderService.pb.h"
+#include "lib/api/services/PositionService.pb.h"
 #include "lib/mercury/broker/BrokerProxy.h"
+#include "lib/orderman/events/AccountPnLUpdateEvent.h"
 #include "lib/orderman/events/ActivateOrderEvent.h"
 #include "lib/orderman/events/CancelOrderEvent.h"
 #include "lib/orderman/events/DetachOrderEvent.h"
+#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h"
 #include "lib/orderman/events/NewAdminDataEvent.h"
 #include "lib/orderman/events/OrderManagerReadyEvent.h"
 #include "lib/orderman/events/OrderOpResultEvent.h"
@@ -13,13 +17,11 @@
 #include "lib/orderman/events/UpdateOrderEvent.h"
 #include "lib/orderman/order_factory/OrderFactory.h"
 #include "lib/orderman/order_router/OrderRouter.h"
+#include "lib/orderman/orderman_utils/orderman_common.h"
+#include "lib/orderman/orders/Order.h"
 #include "lib/orderman/securities/MapSecurityDB.h"
 #include "lib/tracing/PerfLog.h"
 #include "lib/utils/PBUtils.h"
-
-#include "lib/api/services/OrderService.pb.h"
-#include "lib/orderman/orderman_utils/orderman_common.h"
-#include "lib/orderman/orders/Order.h"
 #include <future>
 
 namespace bts {
@@ -50,6 +52,8 @@ struct ServiceBridge::PImpl {
    mercury::Stream<CancelOrderEvent> cancel_order_pub;
    mercury::Stream<DetachOrderEvent> detach_order_pub;
    mercury::Stream<NewAdminDataEvent> new_admin_data_pub;
+   mercury::Stream<AccountPnLUpdateEvent> account_pnl_pub;
+   mercury::Stream<ExcessLiquidityUpdateEvent> excess_liquidity_pub;
    std::unordered_set<OrderKey> known_orders;
    std::vector<std::shared_ptr<const api::admin::AdminData>> admin_data_updates;
    mercury::BrokerProxy &service_call_marshaller;
@@ -81,6 +85,8 @@ void ServiceBridge::init() {
    me->cancel_order_pub = make_stream<CancelOrderEvent>();
    me->detach_order_pub = make_stream<DetachOrderEvent>();
    me->new_admin_data_pub = make_stream<NewAdminDataEvent>();
+   me->account_pnl_pub = make_stream<AccountPnLUpdateEvent>();
+   me->excess_liquidity_pub = make_stream<ExcessLiquidityUpdateEvent>();
    me->ready.set_value();
 }
 
@@ -217,6 +223,36 @@ void ServiceBridge::update_admin_data(
    });
 }
 
+void ServiceBridge::update_account_pnl(
+    api::position::Pnl_account_dataUpdate const &pnl) {
+   me->service_call_marshaller.schedule_action([this, pnl]() {
+      for (auto const &account_pnl : pnl.added()) {
+         publish(me->account_pnl_pub, AccountID(account_pnl->account_id()),
+                 account_pnl->day_pnl());
+      }
+      for (auto const &account_pnl : pnl.changed()) {
+         publish(me->account_pnl_pub,
+                 AccountID(account_pnl.current()->account_id()),
+                 account_pnl.current()->day_pnl());
+      }
+   });
+}
+
+void ServiceBridge::update_excess_liquidity_report(
+    api::position::Excess_liquidity_reportUpdate const &elr) {
+   me->service_call_marshaller.schedule_action([this, elr]() {
+      for (auto const &elr : elr.added()) {
+         publish(me->excess_liquidity_pub, AccountID(elr->account_id()),
+                 elr->excess_liquidity());
+      }
+      for (auto const &elr : elr.changed()) {
+         publish(me->excess_liquidity_pub,
+                 AccountID(elr.current()->account_id()),
+                 elr.current()->excess_liquidity());
+      }
+   });
+}
+
 bool ServiceBridge::is_ready() const {
    return me->have_orders && me->order_manager_ready;
 }

src/lib/orderman/actors/ServiceBridge.h

@@ -1,18 +1,26 @@
 #pragma once
 
+#include "lib/api/services/MarginService.client.pb.h"
+#include "lib/api/services/PositionService.client.pb.h"
 #include "lib/config/protos/jetfix.pb.h"
-#include "lib/mercury/actors/Actor.h"
 #include "lib/md/SecurityOracle.h"
+#include "lib/mercury/actors/Actor.h"
+
 #include <memory>
 
 // fwds
 namespace bts {
-namespace mercury {class BrokerProxy;}
+namespace mercury {
+class BrokerProxy;
+}
 namespace api {
 class ServiceContext;
 namespace admin {
 class AdminData;
 }
+namespace position {
+class AccountPNL;
+}
 namespace orderman {
 class OrderRecord;
 class Fill;
@@ -45,16 +53,14 @@ class ServiceBridge : public mercury::Actor {
 
    using OnReady = std::function<void()>;
    using OnOrders =
-      std::function<void(std::vector<api::orderman::OrderRecord> const &)>;
+       std::function<void(std::vector<api::orderman::OrderRecord> const &)>;
    using OnFills =
-      std::function<void(std::vector<api::orderman::Fill> const &)>;
+       std::function<void(std::vector<api::orderman::Fill> const &)>;
+
+   using OnOrderOpResult = std::function<void(OrderOpResultEvent const &)>;
 
-   using OnOrderOpResult =
-      std::function<void(OrderOpResultEvent const&)>;
-   
    ServiceBridge(OnReady const &, OnOrders const &, OnFills const &,
-                 OnOrderOpResult const&,
-                 DynamicOrderRegistry const &,
+                 OnOrderOpResult const &, DynamicOrderRegistry const &,
                  mercury::BrokerProxy &service_call_marshaller,
                  md::SecurityOracle o);
    void init() override;
@@ -71,6 +77,9 @@ class ServiceBridge : public mercury::Actor {
 
    void
    update_admin_data(std::shared_ptr<api::admin::AdminData const> const &admin);
+   void update_account_pnl(api::position::Pnl_account_dataUpdate const &);
+   void update_excess_liquidity_report(
+       api::position::Excess_liquidity_reportUpdate const &);
 
  private:
    struct PImpl;

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

@@ -4,6 +4,8 @@
 #include "lib/mercury/events/TimerEvent.h"
 #include "lib/orderman/actors/order_manager/OrderServices.h"
 #include "lib/orderman/actors/order_manager/OrderServicesData.h"
+#include "lib/orderman/events/AccountPnLUpdateEvent.h"
+#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h"
 #include "lib/orderman/events/NewAdminDataEvent.h"
 #include "lib/orderman/events/NewSecuritiesEvent.h"
 #include "lib/orderman/events/OrderManagerReadyEvent.h"
@@ -52,6 +54,11 @@ OrderManager::~OrderManager() {}
 void OrderManager::init() {
    subscribe<NewAdminDataEvent>(
        [this](auto const &admin_update) { this->on_admin_data(admin_update); });
+   subscribe<AccountPnLUpdateEvent>(
+       [this](auto const &pnl_update) { this->on_pnl_update(pnl_update); });
+   subscribe<ExcessLiquidityUpdateEvent>([this](auto const &liq_update) {
+      this->on_excess_liquidity_update(liq_update);
+   });
 }
 
 void OrderManager::on_admin_data(const mercury::Update<NewAdminDataEvent> &m) {
@@ -74,6 +81,20 @@ void OrderManager::on_admin_data(const mercury::Update<NewAdminDataEvent> &m) {
    }
 }
 
+void OrderManager::on_pnl_update(
+    const mercury::Update<AccountPnLUpdateEvent> &u) {
+   if (u.events)
+      for (auto ev : *u.events)
+         me->services_data.limiter.set_day_pnl(ev.account_id, ev.day_pnl);
+}
+
+void OrderManager::on_excess_liquidity_update(
+    const mercury::Update<ExcessLiquidityUpdateEvent> &u) {
+   if (u.events)
+      for (auto ev : *u.events)
+         me->services_data.limiter.set_excess_liquidity(ev.account_id, ev.excess_liquidity);
+}
+
 void OrderManager::on_securities(
     const mercury::Update<NewSecuritiesEvent> &update) {
 
@@ -116,9 +137,9 @@ void OrderManager::on_fill_recovery(
          for (auto const &ev : *(update.events)) {
             auto trimmed_account_name =
                 boost::algorithm::trim_copy(ev.fill.account());
-            me->services_data.limiter.add(*ev.security, trimmed_account_name,
-                                          ev.fill.side(),
-                                          Quantity(ev.fill.last_shares()),false);
+            me->services_data.limiter.add(
+                *ev.security, trimmed_account_name, ev.fill.side(),
+                Quantity(ev.fill.last_shares()), false);
          }
 
          me->stored_order_sub = subscribe<StoredOrderEvent>(

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

@@ -34,6 +34,8 @@ class OrderServices;
 class CreateFIXBufferReplyEvent;
 class GatewayStatusChangeEvent;
 class NewAdminDataEvent;
+class AccountPnLUpdateEvent;
+class ExcessLiquidityUpdateEvent;
 struct SessionServicesData;
 class DynamicOrderRegistry;
 } // namespace orderman
@@ -83,6 +85,8 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor {
    void on_gateway_state(const mercury::Update<GatewayStatusChangeEvent> &);
    void on_timer(const mercury::Update<mercury::TimerEvent> &);
    void on_admin_data(const mercury::Update<NewAdminDataEvent> &);
+   void on_pnl_update(const mercury::Update<AccountPnLUpdateEvent> &);
+   void on_excess_liquidity_update(const mercury::Update<ExcessLiquidityUpdateEvent> &);
    void on_poll(trace::PerfLog& log) override;
    // end external events
 

src/lib/orderman/events/AccountPnLUpdateEvent.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "lib/api/services/AdminService.pb.h"
+
+#include "lib/mercury/common/mercury_common.h"
+#include "lib/mercury/events/Event.h"
+#include "lib/mercury/synopsis/MergeByKey.h"
+
+#include <memory>
+
+namespace bts {
+namespace orderman {
+
+class AccountPnLUpdateEvent : public mercury::Event<AccountPnLUpdateEvent> {
+ public:
+   using SynopsisPolicy = mercury::MergeByKey<AccountPnLUpdateEvent>;
+   AccountID key() const { return account_id; }
+
+   AccountPnLUpdateEvent(AccountID id, double pnl)
+       : account_id(id), day_pnl(pnl) {}
+
+   AccountID account_id;
+   double day_pnl;
+};
+
+} // namespace orderman
+} // namespace bts

src/lib/orderman/events/ExcessLiquidityUpdateEvent.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "lib/mercury/common/mercury_common.h"
+#include "lib/mercury/events/Event.h"
+#include "lib/mercury/synopsis/MergeByKey.h"
+
+#include <memory>
+
+namespace bts {
+namespace orderman {
+
+class ExcessLiquidityUpdateEvent : public mercury::Event<ExcessLiquidityUpdateEvent> {
+ public:
+   using SynopsisPolicy = mercury::MergeByKey<ExcessLiquidityUpdateEvent>;
+   AccountID key() const { return account_id; }
+
+   ExcessLiquidityUpdateEvent(AccountID id, double excess_liquidity)
+       : account_id(id), excess_liquidity(excess_liquidity) {}
+
+   AccountID account_id;
+   double excess_liquidity;
+};
+
+} // namespace orderman
+} // namespace bts