check point before flying to chapel hill

.gitignore

@@ -34,4 +34,3 @@ trace_data/
 /doc/user/public/*
 .ionide/*
 /.ignore
-CMakeDeps.cmake

.vscode/launch.json

@@ -46,7 +46,7 @@
             "sourceFileMap": {
                 "/home/bts/spark/": "${workspaceRoot}"
             }
-        },     
+        },
         {
             "name": "(gdb) Launch",
             "type": "cppdbg",
@@ -345,11 +345,12 @@
             "name": ".NET Core Remote Launch",
             "type": "coreclr",
             "request": "launch",
-            "program": "sparkcmd",
+            "program": "/usr/bin/dotnet",
             "args": [
+                "sparkcmd.dll",
                 "test",
+                "test_join_create_and_takeout_market"
             ],
-            "env": {"LD_LIBRARY_PATH" : "."},
             "stopAtEntry": false,
             "cwd": "/home/bts/spark/build/ninja_debug/server",
             "pipeTransport": {
@@ -360,11 +361,11 @@
                 "debuggerPath": "/home/bts/vsdbg/vsdbg",
                 "pipeCwd": "${workspaceRoot}",
                 "quoteArgs": true
-            },           
+            },
             "sourceFileMap": {
                 "/home/bts/spark/": "${workspaceRoot}"
             },
             "justMyCode": false
-        },               
+        },
     ]
 }

CMakeLists.txt

@@ -48,7 +48,6 @@ else ()
   add_subdirectory(doc/user)
   add_subdirectory(src/sdk)
   add_subdirectory(src/data_files)
-  add_subdirectory(src/client)
 
   add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
@@ -59,18 +58,9 @@ else ()
     COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.13.0.0 ${CMAKE_BINARY_DIR}/server
     COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
     COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
+    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/
     COMMENT "Creating server runtime layout"
-    DEPENDS sparkd data_files_dir spark_client_dir
     DEPENDS sparkd data_files_dir)  
 
   add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
-  
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
-else()
-   add_custom_command(TARGET server_layout POST_BUILD
-      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
-endif()
-      
 endif()

doc/api/.gitignore

@@ -1 +0,0 @@
-public 

doc/api/config.toml

@@ -1,15 +0,0 @@
-# The URL the site will be built for
-base_url = "https://api.bluetradesys.com"
-
-title = "BTS Spark API"
-description = "Documentation for the BTS Spark API"
-
-compile_sass = true
-
-highlight_code = true
-highlight_theme = "kronuz"
-insert_anchor_links = true
-build_search_index = true
-
-[extra]
-author = "Blue Trading Systems"

doc/api/content/_index.md

@@ -1,5 +0,0 @@
-+++
-title = "BTS Spark API"
-+++
-
-This is index

doc/api/content/client/_index.md

@@ -1,7 +0,0 @@
-+++
-title="Client API"
-template="client.html"
-sort_by="weight"
-+++
-
-

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

@@ -1,7 +0,0 @@
-+++
-title="Getting Started"
-template="client.html"
-sort_by="weight"
-weight = 1
-+++ 
-

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

@@ -1,9 +0,0 @@
-+++
-title = "Install Prerequisites"
-template="client.html"
-weight = 1
-+++
-
-## Coming Soon
-
-* Install .net core

doc/api/content/server/_index.md

@@ -1,25 +0,0 @@
-+++
-title="Algo API"
-template="documentation.html"
-redirect_to = "server/getting-started/overview/"
-sort_by="weight"
-+++ 
-
-Getting Started
-- Install (docker, editor)
-- Downloading
-- Write your first algo
-- Testing
-
-Reference
-- Subscriptions
-- Child Orders
-- Detaching
-- Attaching
-- ...
-
-Samples
-- Iceberg
-- Pro-rata
-
-

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

@@ -1,7 +0,0 @@
-+++
-title="Getting Started"
-template="documentation.html"
-sort_by="weight"
-weight = 1
-+++ 
-

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

@@ -1,138 +0,0 @@
-+++
-title = "Development"
-weight = 3
-+++
-
-# Visual Studio Code
-
-In this section we're going to use the Remote - Containers feature of <a href="https://code.visualstudio.com/" target="_blank">Visual Studio Code<i class="fa fa-fw fa-window-restore" aria-hidden="true"></i></a> to simplify the development experience. If you are using a different editor skip to the <a href="#other-editors">other editor</a> section below.
-
-## Remote - Containers
-
-The Visual Studio Code Remote containers extension allows it to run a complete development environment inside the Spark SDK Docker container.  The editor UI runs as a thin client on your desktop and connects to a headless instance running inside the Spark SDK Docker environment.  This configuration allows us to ship a pre-configured set of [Tasks](https://code.visualstudio.com/Docs/editor/tasks) for building and testing your code.
-
-Start Visual Studio Code and click on the puzzle piece icon on the left-hand side to open the extensions panel. Use the search box at the top to find the "Remote - Containers" extension and install it.
-
-<img src="../vscode_remote_containers.png" width="640" />
-
-## Into the Code
-
-Open the examples/algo_template directory using the File->Open Folder menu option. If you opted to add it to your path during install, you could run `code .` from your command prompt.
-
-When the workspace opens, you should see a notification offering to let you re-open the workspace inside the container.
-
-<img src="../vscode_notification.png" width="480" />
-
-The first time you open the workspace inside the container it will take a few seconds to configure the spark_sdk docker container.  While the workspace is open in Visual Studio Code the docker image will also be running in the background.  The container will stop automatically when you close the editor.
-
-Open algo_template.cpp from the file browser on the left or by pressing ctrl-p and typing the name.  Each Algo is a standard C++ class which implements **IAlgoOrder**.  Placing your cursor on IAlgoOrder and pressing F12 will take you to the IAlgoOrder.h header file where you can browse the API.  To learn more about how an Algo is instantiated see the [Algo Initialization](/server/ref/initialization).
-
-## Compiling
-
-To build press "Ctrl+Shift+B".  You should see the build output at the bottom of your screen.  If the build was successful the resulting algo_template.so will be automatically copied to the plugins directory where it will be loaded by the Spark server process on start.
-
-<img src="../compiled.png" width="640" />
-
-## Debugging
-
-To debug your Algo set a breakpoint (F9) and open the Debug panel (Ctrl+Shift+D) and choose "(gdb) Launch".  This will launch the Spark Server inside the container with the debugger attached.  
-
-<img src="../gdb_launch.png" width="380" />
-
-With sparkd running you can launch the Spark Client (spark_client.cmd) and it will connect to the running server.  Log in with the user "bts" and no password and open a ladder.  You can now select your Algo on the order type dropdown and activate it by clicking on a price on the ladder.
-
-<img src="../myalgo.png" width="150" />
-
-While sparkd is running you can also access the Spark Server Admin interface on [http://localhost:9000](http://localhost:9000).  Use the same "bts" login to access the admin interface. Here you can manage user and account permissions and risk limits.
-
-## Starting Spark Server
-
-To start the Spark Server without attaching a debugger press "Ctrl+Shift+P" and select "Tasks: Run Task" and then "Start Sparkd" and "Never scan task output"  This will open a new terminal where you can see any messages logged with the **Sdk** subsystem as well as any warnings or errors.  To stop the Spark server simply kill the terminal (trash can icon) or run the "Stop Sparkd" task.
-
-## Next Steps
-
-If you would like to understand more about how Docker is working behind the scenes continue to the [next section](#other-editors).  Otherwise, continue to [Algo Registration](/server/ref/registration) to learn how Algos are registered with the Spark.
-
-<hr>
-
-# Other Editors
-
-In this section you will be more exposed to the details of how Docker works and how to compile and test your Algo using the command line. 
-
-## Docker
-
-Spark Server is built and runs only on Linux so you need a Linux development environment to effectively develop plug-ins for it. Docker lets you take the spark_sdk.img disk image and run it inside a virtual Linux machine running on your Windows desktop. 
-
-First, some terminology.  A Docker "image" is a disk image containing a complete filesystem. The spark_sdk.img file you imported earlier is an image.  A Docker "container" is what you get when you get when you attach this image to a running Linux system.  You can connect to a running container and use it to run commands like the C++ compiler or the Spark server.  Directories from your local filesystem can be mapped into the Docker container when it starts so you can easily share files.
-
-### Start
-
-The first step is to start the spark_sdk Docker container with the examples directory mapped so we can compile the examples inside the container. In your command prompt cd to the *examples* directory that you unzipped from the spark_sdk.zip file.  Then run the following command to start the container.
-
-Windows Command Prompt:
-{% clipable() %}
-docker run --rm -it -v %CD%:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
-{% end %}
-
-**Powershell** / Linux / Mac:
-{% clipable() %}
-docker run --rm -it -v ${PWD}:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
-{% end %}
-
-### Attach
-
-The container will remain as long as this prompt is open.  You can attach an additional to the running container with the following command:
-{% clipable() %}
-docker exec -it spark_sdk bash
-{% end %}
-
-## Compiling
-
-Let's look at the algo_template sample first.  All of the samples are laid out similarly with a `build.sh` script for compiling.  As long as you are running build.sh inside the spark Docker container, it automatically copies the build output to /sparkbin/plugins/ where it needs to be to get loaded by the Spark server.
-
-```
-bts@spark_sdk:/examples$ cd algo_template/
-bts@spark_sdk:/examples/algo_template$ ./build.sh
-algo_template.so copied to /sparkbin/plugins/
-Restart sparkd to see changes.
-```
-
-## Starting Spark Server
-
-To start the Spark server `cd /sparkbin/` and run `./sparkd run`.  Press Ctrl+C to stop it.
-```
-bts@spark_sdk:/sparkbin$ ./sparkd run
-2019-10-25 16:21:09.383626|262552152803600|Gen|Warn |1  |main|132 |Run.cpp:53 |dev|
------------------------------------- Sparkd launched --------------------------------
-```
-
-You will see any Sdk log messages as well as any log messages at or above Warning level from other parts of the system.  If you need additional diagnostic information more details logs are stored in /sparkdata/data/logging/log.  These logs will be automatically deleted when you stop the Docker container.
-
-With sparkd running you can launch the Spark Client (spark_client.cmd) and it will connect to the running server.  Log in with the user "bts" and no password and open a ladder.  You can now select your Algo on the order type dropdown and activate it by clicking on a price on the ladder.
-
-<img src="../myalgo.png" width="150" />
-
-While sparkd is running you can also access the Spark Server Admin interface on [http://localhost:9000](http://localhost:9000).  Use the same "bts" login to access the admin interface. Here you can manage user and account permissions and risk limits.
-
-## Debugging
-
-You can debug your algo using gdb from the bash command prompt.  
-
-```bts@spark_sdk:/sparkbin$ gdb --args ./sparkd run
-GNU gdb (Ubuntu 8.1-0ubuntu3) 8.1.0.20180409-git
-Copyright (C) 2018 Free Software Foundation, Inc.
-...
-Reading symbols from ./sparkd...done.
-(gdb) break algo_template.cpp:45
-No source file named algo_template.cpp.
-Make breakpoint pending on future shared library load? (y or [n]) y
-Breakpoint 1 (algo_template.cpp:45) pending.
-(gdb) run
-Starting program: /sparkbin/sparkd run
-```
-
-If your editor supports debugging over the ssh protocol you can start sshd from inside the container.
-
-## Next
-
-Continue to [Algo Registration](/server/ref/registration) to learn how Algos are registered with the Spark.

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

@@ -1,79 +0,0 @@
-+++
-title = "Download SDK"
-weight = 2
-+++
-
-## Request Access 🔑
-
-To start using the Server SDK you will need to request access though our sales department.  Please email <a href="mailto:info@bluetradesys.com">info@bluetradesys.com</a> or call <a href="tel:919-913-0850">(919) 913-0850</a> and we will provide download credentials.
-
-## Download
-
-Download the latest SDK image here: [spark_sdk.zip](https://api.bluetradesys.com/download/spark_sdk.zip)
-
-Unzip that folder into a working directory. Inside you should see something like this:
-
-```
-spark_sdk.img
-client/
-spark_client.cmd
-examples/
-```
-
-## Import 
-
-Import the spark_sdk image into docker using the `docker load` command.
-{% clipable() %}
-docker load < spark_sdk.img
-{% end %}
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-<strong>If you see this error it means Docker Desktop is not running:</strong>
-
-
-error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.40/images/json: open //./pipe/docker_engine: The system cannot find the file specified. In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.
-</div>
-
-Confirm that the import worked by running `docker images` which should list the new image.
-```
-c:\bts> docker images
-REPOSITORY                          TAG            IMAGE ID            CREATED             SIZE
-bluetradingsystems/spark_sdk        latest         e2be89436e73        4 hours ago         3.89GB
-```
-
-<!-- 
-## Run 
-
-Start the docker container by running
-```
-docker run -d -v %CD%:/work --name spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 8000:8000 -p 8001:8001 -p 8008:8008 bluetradingsytems/spark_sdk
-```
-<div class="linux">
-<i class="fa fa-linux fa-fw" aria-hidden="true"></i>
-If you are using Linux or Mac replace <strong>%CD%</strong> with <strong>$PWD</strong>.
-</div>
-
-The first time you invoke `docker run` you may be prompted to "share" your filesystem with Docker.  This usually works fine but if you run into trouble, see <a href="">Docker Desktop for Windows tips</a> on avoiding common problems.
-
-## Success 🎉
-Docker is now running the spark SDK image.  If you are on Windows or Mac it is running inside a virtual Linux machine. You can see that is is running by typing `docker ps` to list running docker containers.  If you restart the Docker Desktop application you will need to start the spark_sdk image again using `docker start spark_sdk`.
-
-You should now be able to access an admin interface at http://localhost:8008/ which will let you stop and start the spark server process. 
--->
-
-## Update
-
-To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://api.bluetradesys.com/download/spark_sdk.zip) and use `docker load < spark_sdk.img` to overwrite the old image with the new one.
-
-To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.
-
-<!--
-Then stop, remove and restart spark_sdk.
-```
-c:\bts> docker stop spark_sdk
-c:\bts> docker rm spark_sdk
-c:\bts> docker run -d -v %cd%:/sdk --name spark_sdk bluetradingsytems/spark_sdk
-
-``` -->
-

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

@@ -1,57 +0,0 @@
-+++
-title = "Install Prerequisites"
-weight = 1
-+++
-
-These instructions assume you are using Microsoft Windows but you should be able to follow them on a Linux or Mac with minor modifications.  
-
-{% linux() %}
-When there is a significant difference on non-Windows platforms it will be called out in a box like this one.
-{% end %}
-{% info() %}
-Tips or solutions to common problems will be highlighted in a box like this.
-{% end %}
-
-The minimum hardware requirements for using the SDK are:
-- **12 GB** RAM (preferably 16 GB or more)
-- 4 CPU cores
-- 20 GB free hard disk space
-
-The Spark SDK uses a tool called Docker to distribute all of the tools you need to build and test your trading algorithm ("Algo").  Once you have Docker installed you can download and import the Spark SDK image and be ready to start developing your Algo in a few minutes. 
-
-## Docker
-
-Download and install <a href="https://www.docker.com/products/docker-desktop" target="_blank">Docker Desktop for Windows/Mac. <i class="fa fa-fw fa-window-restore" aria-hidden="true"></i></a>
-
-<div class="linux">
-<i class="fa fa-linux fa-fw" aria-hidden="true"></i>
-If you are using Linux follow the <a href="https://docs.docker.com/install/#supported-platforms">official install instructions for Docker for your distribution.</a>
-</div>
-
-During the install Docker may ask you to enable virtualization support and reboot.
-
-Once Docker Desktop is installed and running it will create an icon in your system tray area that looks like the Docker logo.  
-![](../docker_tray.png)
-
-Right click on the tray icon and choose 'Settings' and choose the 'Advanced' tab.
-
-Ensure that the docker image has 8192 MB of memory and at least 2 cores.  Memory that you assign to the docker image will not be available to Windows/Mac while Docker is running. CPU cores are shared with the host OS.  Since you are going to use this image to compile your Algo it makes sense to allow Docker to use all available cores.
-
-<img src="../docker_config.png" width="640" >
-
-## Sharing
-
-You need to give Docker access to the Windows drive where your source code is kept. 
-
-Open Settings -> Shared Drives and check the drive where you intend to keep your Algo source code.
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-If you run into trouble with drive sharing, see <a href="https://code.visualstudio.com/docs/remote/troubleshooting#_docker-desktop-for-windows-tips">Docker Desktop for Windows tips</a> on avoiding common problems.
-</div>
-
-## Editor
-
-The Server SDK includes a complete configuration for C++ development with the <a href="https://code.visualstudio.com/" target="_blank">Visual Studio Code <i class="fa fa-fw fa-window-restore" aria-hidden="true"></i></a> editor.  If you are a new to C++ development on a Linux system we recommend you give this a try as it's the easiest way to get up and running quickly. Of course, If you have a different editor that you prefer we fully support that as well.
-
-

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

@@ -1,44 +0,0 @@
-+++
-title = "Overview"
-weight = 0
-+++
-
-Using the **Spark Server SDK**, users can create new order types ("Algos"). In this case, users implement the new functionality in C++, producing a shared library that is loaded at run time by our Spark Server.
-
-If you are interested in accessing Spark server remotely, please see the [Spark Client SDK](/client/).
-
-## Speed
-
-The Spark platform offers a sub-10 microsecond socket to socket response times for algorithmic trading.  With the **Spark Server SDK**, you can create your order types in high-performance C++ and load them into the Spark server. 
-
-Since your order is running inside the Spark Server, there is virtually no overhead allowing your algorithm to take full advantage of the speed Spark offers. Hosting a high-performance language like C++ directly in the Spark server process allows it to respond to the market thousands of times faster than an Algo built using a proprietary drag and drop tool.
-
-
-## Easy to Get Started
-
-If you are not actively developing with C++, it can be time-consuming to set up a complete development environment from scratch.  That is why we provide a full development environment out of the box with [Docker](https://docker.io) so you can download and try the Server SDK quickly and easily. 
-
-Docker works across Windows, macOS, and Linux, so you don't need to change your development environment to try the Spark API. Docker also ensures that all of the dependencies you need are packaged together in one image, so you know it will work out of the box, no matter the platform.
-
-## Implementation
-
-Creating a new Algo begins with implementing a standard C++ class derived from IAlgoOrder. Start from the [algo_template](/server/samples/template) example to get going quickly.
-
-The first call your new Algo receives is [do_before_launch](/server/ref/initialization#before-launch), which is an opportunity to validate parameters and allocate any long-lived resources needed during execution.  Next, it receives either [do_launch](/server/ref/initialization#launch-launch-attached) in the case of a new order or [do_launch_attached](/server/ref/initialization#launch-launch-attached) if the order is attaching to an existing order.
-
-The Algo receives a reference to [IAlgoServices](/server/ref/subscriptions/), which is how it calls out to the Spark system.  It will use [IAlgoServices](/server/ref/subscriptions/) to subscribe to market events, launch and control child orders, and communicate its state to the larger Spark system.
-
-## Fully Integrated
-
-When a Spark Server plugin is loaded, it registers its exposed Algos with the Spark Server though the [init_spark_plugin](/server/ref/registration) callback.  This callback allows the Algo to describe the parameters it expects so they can be automatically entered in the [Spark Client](https://www.bluetradingsystems.com/bts-spark/).
-
-<img src="../myalgo.png" width="150" />
-<img src="../paramsui.png" width="460" />
-
-Compose your Algo with out of the box Algos in the [Spark Algo Studio](https://www.bluetradingsystems.com/news/155-bts-algo-studio-provides-algo-library-with-customization-functionality) to create new functionality on the fly.
-
-<img src="../algostudio.png" width="548" /><br />
-<img src="../iced_algo.png" width="460" />
-
-
-

doc/api/content/server/ref/_index.md

@@ -1,7 +0,0 @@
-+++
-title="Reference"
-template="documentation.html"
-sort_by="weight"
-weight = 2
-+++ 
-

doc/api/content/server/ref/faq.md

@@ -1,8 +0,0 @@
-+++
-title = "Questions"
-weight = 40
-+++
-
-## I need to make a call that might take a few seconds. What is the best way to do this?
-
-Create a background thread in [do_before_launch](/server/ref/initialization#before-launch) or [do_launch](/server/ref/initialization#launch-launch-attached) to do the work.  Use [on_timer](/server/ref/subscriptions#timer) to poll until the result is available.

doc/api/content/server/ref/initialization.md

@@ -1,97 +0,0 @@
-+++
-title = "Initialization"
-weight = 10
-+++
-
-Each Algo derives from IAlgoOrder and overrides virtual methods to receive callbacks from the Spark system.
-
-
-## Before Launch
-
-When an order is activated by a user or by another Algo, the first call it receives is do_before_launch.  This call happens outside of the latency-sensitive path, so it's the place to validate parameters and set up data structures that the Algo might need.
-
-This call returns an OrderOpResult, which allows it to fail and return an error message to its creator.  If a user created this order, this message is displayed in the [Activity Log](https://www.bluetradingsystems.com/docs/bts_spark/Help/#activity-log) and across the bottom of the ladder.
-
-Every SDK Algo is a "Dynamic" Algo since it's parameters are defined during [registration](/server/ref/registration/). Use the `get_if<T>` helper to retrieve a named parameter from the `order_params` collection as a `std::option<T>`.  If a parameter has a valid default value you can use `std::option::value_or(...)` to set default values for missing parameters.  If a parameter *must* exist or must be within a certain valid range, return an error to the caller.
-
-```cpp
-OrderOpResult MyAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) {
-   auto& def = serv.definition();
-   auto& params = def.custom_def().dynamic().order_params();
-   auto mqi = get_if<uint32_t>(params, "Min Quantity");
-   if (!mqi || mqi.value() == 0)
-      return OrderOpResult{
-          ORDER_ERROR_INVALID_ORDER_DEFINITON,
-          "Min Quantity parameter must be defined and non zero"};
-}
-```
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-The parameters are defined during <a href="/server/ref/registration/">registration</a> by the <a href="/server/ref/registration/#dynamicorderdescriptor">DynamicOrderDescriptor</a>.
-</div>
-
-### IBeforeLaunchAlgoServices
-
-IBeforeLaunchAlgoServices is passed to `do_before_launch` and allows the Algo to query its environment.
-
-```cpp
-class IBeforeLaunchAlgoServices {
- public:
-   // The OrderDefinition for this algo
-   virtual api::orderman::OrderDefinition const &definition() const = 0;
-
-   // The security this algo is paramterized with (also available from
-   // definition())
-   virtual api::Security const &security() const = 0;
-
-   // The unique order key for this algo
-   virtual OrderKey order_key() const = 0;
-
-   // The parent key for this algo's parent or null_order_key() if the
-   // algo does not have a parent
-   virtual OrderKey parent_order_key() const = 0;
-
-   // The security identified by k or nullptr if no such security exists
-   virtual api::Security const *lookup_security(SecurityKey k) const = 0;
-
-   // Wheter this algo is being attached to an existing order.
-   // If an algo does not support attaching it can return an error 
-   // if is_attaching() == true from do_before_launch.
-   virtual bool is_attaching() const = 0;
-
-   // Build a child template that can later can be used to quickly
-   // launch child orders. The reserve parameter indicates how many
-   // orders should be created ahead of time, before they are
-   // launched. This is usefull to remove the relatively expensive
-   // order creation operation to a background thread.
-   virtual ChildTemplate &
-   make_child_template(api::orderman::OrderDefinition const &child_def,
-                       size_t reserve = 1) = 0;
-
-   // Get the current time
-   virtual TimeStamp get_time() const;
-};
-```
-
-
-## Launch / Launch Attached
-
-Depending on the state of `is_attaching()` the next call will either be `do_launch` or `do_launch_attached`.  The only difference is that in `do_launch_attached` the existing OrderKey and ChildState are provided.
-
-`do_launch` and `do_launch_attached` are in the latency-sensitive path and should not do more work than needed.  These functions get a reference to `IAlgoServices`, which is a superset of the functionality available on `IBeforeLaunchAlgoServices`.  Most Algos should store a pointer or reference to this object for managing child orders (it has a stable address).
-
-Now is the time to use `IAlgoServices` to subscribe to market events that are relevant to your Algo and create any child orders that need to exist at the start of your Algo. You can safely call IAlgoServices from any `IAlgoOrder` callback.
-
-To learn more about subscribing to events see [subscriptions](/server/ref/subscriptions).
-
-### Things to do in the launch callback
-☑ Store a reference to IAlgoServices  
-☑ Subscribe to relevant market events  
-☑ Launch a child order?
-
-
-## Update
-
-If the user or parent Algo changes the order parameters (price, size, or the custom parameters defined during registration), Spark calls the `do_update` callback with the new parameters.  It is up to the Algo to decide how to apply the new parameters to update the running state.  It can do this by canceling, changing, or adding new child orders. 
-

doc/api/content/server/ref/orders.md

@@ -1,88 +0,0 @@
-+++
-title = "Child Orders"
-weight = 30
-+++
-
-Every Algo must, at some point, launch a child order to be useful. Each child order can be another Algo or regular exchange order.  When the child order is updated or filled, those changes are also sent to the parent.
-
-
-# Templates
-
-Since launching a child order is one of the most latency-sensitive things an Algo can do, the Server SDK enables you to create a child template.  An order template prepares an order based on a known OrderDefinition and gets it ready to send on a background thread.  When the Algo determines it is time to send the order, it only needs to provide the price and quantity to complete and send the order.  If an Algo expects to send multiple child orders, it can reserve more than one.  Preparing a child template is typically done in [do_before_launch](http://127.0.0.1:1111/server/ref/initialization/#before-launch) callback.
-
-```cpp
-virtual ChildTemplate& 
-    IBeforeLaunchAlgoServices::make_child_template(
-        api::orderman::OrderDefinition const &child_def,
-        size_t reserve = 1);
-```
-
-# Launch
-
-IAlgoServices provides two overloads for launching child orders.  By default, launching a child order automatically subscribes the Algo to its state changes.
-
-Launch a child order from a template if you have one prepared. This is the fastest option.
-```cpp
-OrderKey IAlgoServices::launch_child(ChildTemplate&, Price, Quantity, bool subscribe = true);
-```
-Launch a child order by constructing an OrderDefinition as needed.
-```cpp
-OrderKey launch_child(OrderDefinition const &, Price, Quantity, bool subscribe = true);
-```
-
-When a child is launched its `OrderKey` is returned to the caller.  This ID can be used to update, cancel, or detach the child order.
-
-## Update
-
-To update an existing child order, call update_child and pass an Update.  The Update type lets you change the price, size or the entire OrderDefinition. You only need to specify the fields that you intend to update so only set the price() field if that is what you are changing.
-
-```cpp
-void IAlgoServices::update_child(OrderKey child, api::orderman::Update const &);
-```
-
-## Cancel
-
-To cancel an existing child order call `cancel_child`.  When the order is canceled you will receive an update though the `on_child_change` callback.
-
-```cpp
-void IAlgoServices::cancel_child(OrderKey child);
-```
-
-## Detach
-
-The lifetime of a child order is tied to its parent.  If a parent is canceled or completed child orders are automatically stopped as well.  If the Algo needs to launch an order that will continue after the Algo ends use `detach_child` to sever the connection.  This order hierarchy can be viewed in the Spark [Order Book](https://www.bluetradingsystems.com/docs/bts_spark/Trading/#order-book).
-
-```cpp
-void IAlgoServices::detach_child(OrderKey child);
-```
-To detach all children at once use `detach_all_children`.
-
-```cpp
-void IAlgoServices::detach_all_children();
-```
-
-# Child Updated
-
-When a child order is updated the parent receives the `on_child_change` callback with an updated ChildState object.
-
-```cpp
-void on_child_change(OrderKey, ChildState const &) override;
-
-struct ChildState {
-   Price price;
-   Quantity quantity;
-   Quantity total_fills;
-   Price avg_price;
-   Quantity last_fills;
-   Price last_price;
-   ChildStatus status;
-   Quantity fills_at_attach_time;
-};
-```
-
-<!--
-To talk about:
-- updating fills (update_fill_state)
-- handling child finished (unexpected cancel)
--->
-

doc/api/content/server/ref/registration.md

@@ -1,92 +0,0 @@
-+++
-title = "Registration"
-weight = 1
-+++
-
-When Spark Server starts, it loads all plugins listed in the /sparkbin/plugins directory and calls an exported function named `init_spark_plugin` which must have the following signature.
-
-```cpp
-extern "C" void init_spark_plugin(bts::SparkServices &serv) { }
-```
-
-The `init_spark_plugin` function registers the Algo with a DynamicOrderDescriptor. Once registered, the Algo appears in the [Spark ladder](https://www.bluetradingsystems.com/docs/bts_spark/Trading/#ladder) and the [Algo Studio](https://www.bluetradingsystems.com/docs/bts_spark/Trading/#algo-studio).
-
-To register an Algo call `register_dynamic_algo_order` on the provided bts::SparkServices instance. This function takes the DynamicOrderDescriptor and a function that is called to construct the IAlgoOrder. A single init_spark_plugin can call register_dynamic_algo_order multiple times to register multiple Algos.
-
-The DynamicOrderDescriptor must have a dynamic_order_type (name), or the registration will fail.
-
-```cpp
-   DynamicOrderDescriptor desc;
-   desc.set_dynamic_order_type("My Algo");
-   auto result = 
-      serv.register_dynamic_algo_order(
-       desc, []() { return std::make_unique<MyAlgo>(); });
-   if (result != bts::AlgoRegistrationResult::SUCCESS) {
-       // Algo failed to register
-   }
-```
-
-
-## DynamicOrderDescriptor
-
-The DynamicOrderDescriptor describes the type of parameters that the Algo accepts.  These inputs can come either from the user manually entering them or from a parent Algo.  Spark Algos are composable, so one Algo can activate another.  See [Child Orders](/server/ref/orders) for more on how to activate custom order types as child orders.
-
-Add parameters to the DynamicOrderDescriptor by calling `add_param_desc()` and setting the name and parameter type.
-
-```cpp
-   *desc.add_param_desc() = param_bool("Enable Feature");
-   *desc.add_param_desc() = param_uint32("Feature Quantity");
-```
-
-The above parameters look like this when rendered in the Spark ladder.
-
-<img src="../paramsui.png" width="460" />
-
-And like this when viewed in the Spark order book.
-
-<img src="../orderbook_truncated.png" width="988" />
-
-Each descriptor can be one of the following types:
-```
-// Primitive
-int32
-uint32
-double
-string
-bool
-// Complex
-Order
-Array
-Struct
-```
-
-**Currently the Spark UI only renders parameters with primitive types.**  The complex types can only be provided by a parent order.
-
-### Order
-
-This parameter type indicates that another order type parameterizes this Algo. When the Algo needs to create a child order, it can use this parameter type to create a custom order type instead of defaulting to a limit order.
-
-For example, an Algo might be designed to wait for a specific market condition before putting in an order.  Instead of placing a limit order when the condition is met, the user can specify that it should an IceBerg order.  The Algo doesn't need special logic to handle different child order types.
-
-### Array
-
-An array parameter is a collection of the same type of parameter.  If your Algo needed to behave differently depending on a table of prices, you could send that list in though an array parameter.
-```cpp
-    *desc.add_param_desc() = 
-        param_array("Price Points", 
-            param_double("unused").param_type());
-```
-
-### Struct
-
-A struct parameter is a set of named parameter types similar to the entire DynamicOrderDescriptor.  The struct parameter type can be combined with the array type to handle tabular data.
-
-```cpp
-    *desc.add_param_desc() = 
-        param_array("Step Table", 
-            param_struct("", {
-                param_uint32("Market Quantity"),
-                param_uint32("Order Quantity")
-            }).param_type());
-```
-

doc/api/content/server/ref/subscriptions.md

@@ -1,69 +0,0 @@
-+++
-title = "Subscriptions"
-weight = 20
-+++
-
-An Algo exists to observe changes in the market and respond to them. When the Algo is [launched](1/server/ref/initialization/#launch-launch-attached) it uses IAlgoServices to subscribe to the events it needs to operate.  Each subscribe call is paired with a matching unsubscribe call, which takes the same argument to unsubscribe.
-
-# Book
-
-Subscribe to book updates for the specified security call use subscribe_book and unsubscribe book.
-```cpp
-// Subscribe to book updates for the specified security
-void IAlgoServices::subscribe_book(SecurityKey);
-void IAlgoServices::unsubscribe_book(SecurityKey);
-
-// You implement
-virtual void on_book(SecurityKey, Book const &) override;
-```
-Get the `SecurityKey` of the current security using:
-```cpp
-services.subscribe_book(SecurityKey(algo_services().security().id()));
-```
-If your Algo needs to subscribe to other securities, their keys must be passed in as parameters.
-
-
-To get the details of a security use
-```cpp
-api::Security const* IBeforeLaunchAlgoServices::lookup_security(SecurityKey k) const = 0;
-```
-
-# Timer
-To handle time-based logic, an Algo can subscribe to a common timer event that is invoked once every 10 milliseconds.  Use the TimeStamp class from `bts_chrono.h` to efficiently handle time calculations.
-```cpp
-// Subscribe to a periodic 10ms timer
-void IAlgoServices::subscribe_timer();
-// You implement
-virtual void on_timer() override;
-```
-
-# Ticker
-The status callback is called when the market for this security opens, closes, or has some other state transition.
-```cpp
-// Subscribe to trade ticker
-void IAlgoServices::subscribe_ticker(SecurityKey);
-// You implement
-void on_ticker(SecurityKey, TradeVector const&) override;
-```
-
-# Trading Status
-
-The status callback is called when the market for this security opens, closes, or has some other state transition.
-```cpp
-// Subscribe to security trading status
-void IAlgoServices::subscribe_status(SecurityKey);
-// You implement
-virtual void on_status(SecurityKey, co2::TradingStatus) override;
-```
-
-# Child Orders
-
-When an Algo launches a child order, it is subscribed to the changes on that child automatically.  If the Algo unsubscribes from those changes, it can re-subscribe using this method.
-
-```cpp
-// Subscribe to child order updates for the specified child order.
-void IAlgoServices::subscribe_child_change(OrderKey);
-// You implement
-virtual void on_child_change(OrderKey, ChildState const &) override;
-```
-

doc/api/content/server/samples/_index.md

@@ -1,7 +0,0 @@
-+++
-title="Samples"
-template="documentation.html"
-sort_by="weight"
-weight = 3
-+++ 
-

doc/api/content/server/samples/join.md

@@ -1,354 +0,0 @@
-+++
-title = "Join"
-weight = 10
-+++
-
-
-Join starts working N ticks away from the market (usually) and then watches for the opposite inside to become same side inside market; if there is then enough size on that market, it will join.
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-This sample is part of the Server SDK examples included in the <a href="/server/getting-started/download/">spark_sdk.zip download</a>. 
-</div>
-
-```cpp
-#include "spark/lib/config/config.h"
-#include "spark/lib/config/protos/system.pb.h"
-#include "spark/lib/domain_model/Security.h"
-#include "spark/lib/orderman/orders/server/IAlgoOrder.h"
-#include "spark/lib/orderman/orders/server/IAlgoServices.h"
-#include "spark/lib/plugin/SparkServices.h"
-
-#include "spark/lib/orderman/order_factory/IOrderFactory.h"
-#include "spark/lib/orderman/orderman_utils/Book.h"
-#include "spark/lib/orderman/orderman_utils/orderman_utils.h"
-#include "spark/lib/utils/PBUtils.h"
-
-using namespace bts::api::orderman;
-using namespace bts::orderman;
-
-namespace bts {
-namespace order_example {
-
-// Join starts working N ticks away from the market (usually) and then
-// watches for the opposite inside to become same side inside market;
-// if there is then enough size on that market, it will join.
-class DynamicJoin : public IAlgoOrder {
- public:
-   DynamicJoin();
-   ~DynamicJoin();
-
-   OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override;
-   void do_launch(IAlgoServices &) override;
-   void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override;
-   void do_update(api::orderman::Update const &) override;
-   void on_book(SecurityKey, Book const &) override;
-   void on_child_change(OrderKey, ChildState const &) override;
-
- private:
-   enum class Status;
-   struct PImpl;
-   std::unique_ptr<PImpl> me;
-
-   IAlgoServices &algo_services() const;
-   void try_to_join();
-};
-
-// The three stages our algo goes through. We start by waiting to
-// observe the book for our security (WAITING_FOR_MD). Once we have a
-// book we use it to derive our target price and we continue to
-// monitor the book to see if we should join the market
-// (WAITING_TO_JOIN). Once the size and price constraints are met we
-// jump to the target price (JOINED). We remain in the JOINED state
-// until our order is filled or canceled.
-enum class DynamicJoin::Status { WAITING_FOR_MD, WAITING_TO_JOIN, JOINED };
-
-// All state information needed for this algo
-struct DynamicJoin::PImpl {
-   IAlgoServices *algo_services;
-   Quantity min_quantity_to_join;
-   Status status = Status::WAITING_FOR_MD;
-   OrderKey child_key = null_order_key();
-   ChildTemplate *child_template = nullptr;
-   Book book_at_inception;
-   Book last_book;
-};
-
-DynamicJoin::DynamicJoin() : me(new PImpl()) {}
-DynamicJoin::~DynamicJoin() {}
-IAlgoServices &DynamicJoin::algo_services() const { return *me->algo_services; }
-
-// This is called outside of the latency sensitive path
-// once. Expensive initialization should be done here, rather than 
-// in do_launch()
-OrderOpResult DynamicJoin::do_before_launch(IBeforeLaunchAlgoServices &serv) {
-   auto &def = serv.definition();
-   bts_assert(def.has_custom_def());
-   bts_assert(def.custom_def().has_dynamic());
-
-   // Validate our parameters, returning an error if we find a
-   // problem.  If an error is returned here the order will be
-   // abandoned.
-   auto &params = def.custom_def().dynamic().order_params();
-   auto mqi = get_if<uint32_t>(params, "Min Quantity");
-   if (!mqi || mqi.value() == 0) {
-      return OrderOpResult{
-          ORDER_ERROR_INVALID_ORDER_DEFINITON,
-          "Min Quantity parameter must be defined and non zero"};
-   }
-
-   me->min_quantity_to_join = Quantity(mqi.value());
-
-   if (!serv.is_attaching()) {
-      // If we are not attaching, create a child template so we can
-      // quickly launch our child when the time comes.
-
-      // We will be sending a limit order with the same side,
-      // security, trader, account, etc, as this algo order, so just
-      // copy our definition to the child definition to start with.
-      auto child_def = def;
-      // Now add a limit order component to mark our child as a limit
-      // order. Limit orders do not require any extra parameters
-      // beyond those already inherited from this algo order
-      // (i.e. beyond what we obtained through serv.definition()) so
-      // we can just use a default constructed LimitOrderDefinition.
-      *child_def.mutable_custom_def()->mutable_limit() = LimitOrderDefinition{};
-      // Now just build the child template and cache it for future use
-      me->child_template = &(serv.make_child_template(child_def));
-   } else {
-      // If we are attaching to an existing order then we do not need
-      // to spawn a new child, so there is no need to setup a child
-      // template
-   }
-
-   // All is good, return a default constructed OrderOpResult which
-   // indicates success.
-   return {};
-}
-
-// Called in the latency sensitive path, once, when the algo is first
-// launched.
-void DynamicJoin::do_launch(IAlgoServices &services) {
-   // Cache our algo services
-   me->algo_services = &services;
-
-   LOG(OrderMan, Diag, "Lauching DynamicJoin k: {} ",
-       algo_services().order_key().value());
-
-   // Launch our child order
-   me->child_key =
-       services.launch_child(*me->child_template, algo_services().price(),
-                             algo_services().quantity());
-
-   // Subscribe to market data
-   services.subscribe_book(SecurityKey(algo_services().security().id()));
-}
-
-// Called in the latency sensitive path, once, when the algo is first
-// launched. In this case the algo is provided with an existing order
-// it is now responsible for managing.
-void DynamicJoin::do_launch_attached(IAlgoServices &services,
-                                     OrderKey attached_order, ChildState st) {
-   // The order was launched and attached to an existing order, with
-   // key 'attached_order' and current state 'st'
-
-   // Cache our algo services
-   me->algo_services = &services;
-
-   LOG(OrderMan, Diag,
-       "Lauching DynamicJoin k: {} Attached to existing order: {}",
-       algo_services().order_key().value(), attached_order.value());
-
-   // Cache the key of the attached order we will be managing
-   me->child_key = attached_order;
-
-   // Subscribe to market data
-   services.subscribe_book(SecurityKey(services.security().id()));
-
-   // Simulate a child change so we can update our own state to
-   // reflect that of the child order we attached to. From this point
-   // forward there is no distinction between an algo instance that
-   // spawned a new child order and one that attached to an existing
-   // order.
-   on_child_change(attached_order, st);
-}
-
-// Called when a human (or a supervising algo) updates a parameter for
-// this algo. The implementation validates the update and depending on
-// the validation outcome either applies the update or terminates the
-// algo.
-void DynamicJoin::do_update(api::orderman::Update const &update) {
-   LOG(OrderMan, Diag, "DynamicJoin k: {} receiving update: {}",
-       algo_services().order_key().value(), utils::pb::to_string(update));
-
-   // Validate update
-   if (update.quantity() == 0) {
-      // An invalid update has been detected so we terminate the
-      // algo, signaling an error. Any child orders launched by
-      // this algo will also be terminated.
-      algo_services().terminate_error("Invalid update");
-      return;
-   }
-
-   // Updates have two parts, a standard part consisting of price and
-   // size and present in all updates, and an optional part that is
-   // specific to the algo in question. Below we check for the
-   // existance of this optional part and validate if present.
-   bool has_new_min_qty = false;
-   if (update.has_custom()) {
-      auto &params = update.custom().dynamic().order_params();
-      auto mqi = params.find("Min Quantity");
-
-      if (mqi == params.end() || mqi->second.as_uint32() == 0) {
-         algo_services().terminate_error(
-             "Minimum quantity to join must be greater than 0");
-         return;
-      }
-      has_new_min_qty = true;
-      me->min_quantity_to_join = Quantity(mqi->second.as_uint32());
-   }
-
-   // Update is good, forward it to our child
-   Update child_update;
-   child_update.set_price(update.price());
-   child_update.set_quantity(update.quantity());
-   algo_services().update_child(me->child_key, child_update);
-
-   // Try to join again if conditions changed
-   if (me->status == Status::WAITING_TO_JOIN && has_new_min_qty)
-      try_to_join();
-}
-
-// Called when the book for the specified security has changed
-void DynamicJoin::on_book(SecurityKey, Book const &b) {
-
-   // Cache the book, so we can reffer to it in the event of a
-   // parameter change that might allow us to join
-   me->last_book = b;
-
-   LOG(OrderMan, Diag, "DynamicJoin order {} on book. BID: {}@{} ASK: {}@{}",
-       algo_services().order_key().value(), b.side(api::SIDE_BUY)[0].size(),
-       b.side(api::SIDE_BUY)[0].price(), b.side(api::SIDE_SELL)[0].size(),
-       b.side(api::SIDE_SELL)[0].price());
-
-   switch (me->status) {
-   case Status::WAITING_FOR_MD: {
-
-      auto other_side =
-          securities::other_side(algo_services().definition().side());
-      auto &other_side_top = me->last_book.side(other_side)[0];
-
-      if (other_side_top.size() > 0) {
-         // First time we get the opposite side market, we will use
-         // this price as the target price for the join
-         me->status = Status::WAITING_TO_JOIN;
-         me->book_at_inception = b;
-         LOG(OrderMan, Diag,
-             "JoinOrder order {} receiving first book: {} Target: {}",
-             algo_services().order_key().value(),
-             me->min_quantity_to_join.value(), other_side_top.price());
-         try_to_join();
-      }
-   } break;
-   case Status::JOINED:
-      // Nothing to do at this point
-      break;
-   case Status::WAITING_TO_JOIN:
-      // Check if we reached the target and join if so
-      try_to_join();
-      break;
-   }
-}
-
-// Given the current book, our target price and our min quantity
-// parameter, join if appropriate
-void DynamicJoin::try_to_join() {
-   bts_assert(me->status == Status::WAITING_TO_JOIN);
-
-   auto my_side = algo_services().definition().side();
-   auto other_side = securities::other_side(my_side);
-   auto &my_side_psz = me->last_book.side(my_side)[0];
-   auto &opposite_at_inception_psz = me->book_at_inception.side(other_side)[0];
-
-   if (my_side_psz.size() &&
-       my_side_psz.size() >= me->min_quantity_to_join.value() &&
-       securities::is_equal_or_better(
-           my_side, Price(my_side_psz.price()),
-           Price(opposite_at_inception_psz.price()))) {
-
-      // Time to update our child to join the market
-      Update child_update;
-      child_update.set_price(my_side_psz.price());
-      child_update.set_quantity(algo_services().quantity().value());
-      algo_services().update_child(me->child_key, child_update);
-      me->status = Status::JOINED;
-
-      LOG(OrderMan, Diag, "DynamicJoin order {} joined: {}@{}",
-          algo_services().order_key().value(),
-          algo_services().quantity().value(), my_side_psz.price());
-
-   } else {
-      LOG(OrderMan, Diag,
-          "JoinOrder order {} still waiting to join. Order: {}@{} Top of "
-          "the book: {}@{} Target: {}@{}",
-          algo_services().order_key().value(),
-          algo_services().quantity().value(), algo_services().price().value(),
-          my_side_psz.size(), my_side_psz.price(),
-          me->min_quantity_to_join.value(), opposite_at_inception_psz.price());
-   }
-}
-
-// Our child reported a change:
-void DynamicJoin::on_child_change(OrderKey, ChildState const &st) {
-   // Our fill quantity and price is always a reflection of our
-   // child's state
-   algo_services().update_fill_state(st.total_fills, st.last_price);
-
-   switch (st.status) {
-   case ChildStatus::WORKING:
-      // Child order is still working, nothing to do
-      return;
-   case ChildStatus::COMPLETED:
-      // Child order completed, we should also complete
-      algo_services().complete();
-      return;
-   case ChildStatus::CANCELED:
-      // Child order unexpectedly canceled, signal an error and
-      // terminate
-      algo_services().terminate_error("Unexpected child cancel");
-      return;
-   }
-}
-
-// This is called by the spark daemon at startup. In this call we
-// describe our algo's parameters and register a factory function to
-// create an instance of the algo.
-extern "C" void init_spark_plugin(bts::SparkServices &serv) {
-   using namespace bts;
-
-   DynamicOrderDescriptor join_desc;
-
-   // Start by naming our order type
-   join_desc.set_dynamic_order_type("dyn join");
-
-   // Now add a single unsigned int parameter, Min Quantity, that will
-   // determine the minimum quantity that must exist in the book in
-   // order for us to join the market.
-   *join_desc.add_param_desc() = param_uint32("Min Quantity");
-
-   // Associate the descriptor with a builder function and register
-   // that with the Spark server.
-   auto result = 
-      serv.register_dynamic_algo_order(
-       join_desc, []() { return std::make_unique<DynamicJoin>(); });
-
-   if (result != bts::AlgoRegistrationResult::SUCCESS) {
-      // The join_desc has errors
-      // Check the error log for more details
-   }
-}
-
-} // namespace order_example
-} // namespace bts
-
-```

doc/api/content/server/samples/template.md

@@ -1,146 +0,0 @@
-+++
-title = "Template"
-weight = 5
-+++
-
-A mostly blank Algo template that can be used as a jump-start for developing a new Algo.
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-This sample is part of the Server SDK examples included in the <a href="/server/getting-started/download/">spark_sdk.zip download</a>. 
-</div>
-
-```cpp
-#include "spark/lib/config/config.h"
-#include "spark/lib/config/protos/system.pb.h"
-#include "spark/lib/domain_model/Security.h"
-#include "spark/lib/orderman/orders/algo/IAlgoOrder.h"
-#include "spark/lib/orderman/orders/algo/IAlgoServices.h"
-#include "spark/lib/plugin/SparkServices.h"
-
-#include "spark/lib/orderman/order_factory/IOrderFactory.h"
-#include "spark/lib/orderman/orderman_utils/Book.h"
-#include "spark/lib/orderman/orderman_utils/orderman_utils.h"
-#include "spark/lib/utils/PBUtils.h"
-
-using namespace bts::api::orderman;
-using namespace bts::orderman;
-
-namespace bts {
-namespace order_example {
-
-// MyAlgo is a blank IAlgoOrder which you can copy when starting a new Algo
-class MyAlgo : public IAlgoOrder {
- public:
-   MyAlgo();
-   ~MyAlgo();
-
-   OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override;
-   void do_launch(IAlgoServices &) override;
-   void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override;
-   void do_update(api::orderman::Update const &) override;
-   void on_book(SecurityKey, Book const &) override;
-   void on_child_change(OrderKey, ChildState const &) override;
-
- private:
-   IAlgoServices* algo_services;
-   ChildTemplate *child_template = nullptr;
-   OrderKey child_key = null_order_key();
-};
-
-
-MyAlgo::MyAlgo() : algo_services(nullptr) {}
-MyAlgo::~MyAlgo() {}
-
-// This is called outside of the latency sensitive path. 
-// Expensive initialization should be done here, rather than in do_launch()
-OrderOpResult MyAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) {
-   LOG(Sdk,Info, "MyAlgo: do_before_launch");
-   // If we are not attaching, create a child template so we can
-   // quickly launch our child when the time comes.
-   if (!serv.is_attaching()) {
-      // We will be sending a limit order with the same side,
-      // security, trader, account, etc, as this algo order, so just
-      // copy our definition to the child definition to start with.
-      auto child_def = serv.definition();
-      // Now add a limit order component to mark our child as a limit
-      // order. Limit orders do not require any extra parameters
-      // beyond those already inherited from this algo order
-      // (i.e. beyond what we obtained through serv.definition()) so
-      // we can just use a default constructed LimitOrderDefinition.
-      *child_def.mutable_custom_def()->mutable_limit() = LimitOrderDefinition{};
-      // Now just build the child template and cache it for future use
-      child_template = &(serv.make_child_template(child_def));
-   }
-   // Default constructed result is successful
-   return {};
-}
-
-// Called in the latency sensitive path, once, when the algo is first launched. 
-// If the Algo is attaching to an existing order do_launch_attached is called instead.
-void MyAlgo::do_launch(IAlgoServices &services) {
-   algo_services = &services;
-   // Subscribe to book updates for this security
-   services.subscribe_book(SecurityKey(services.security().id()));
-   // Launch a child limit order
-   child_key = 
-      services.launch_child(*child_template, services.price(), services.quantity());
-   LOG(Sdk,Info, "MyAlgo: do_launch");
-}
-
-// Called in the latency sensitive path, once, when the algo is first
-// launched. In this case the algo is provided with an existing order
-// it is now responsible for managing.
-void MyAlgo::do_launch_attached(IAlgoServices &services,
-                                OrderKey attached_order, ChildState st) {
-   algo_services = &services;
-   // Subscribe to book updates for this security
-   services.subscribe_book(SecurityKey(services.security().id()));
-   // Keep track of the child key
-   child_key = attached_order;
-   LOG(Sdk,Info, "MyAlgo: do_launch_attached");
-}
-
-// Called when a human (or a supervising algo) updates a parameter for
-// this algo. The implementation validates the update and depending on
-// the validation outcome either applies the update or terminates the algo.
-void MyAlgo::do_update(api::orderman::Update const &update) {
-}
-
-// Called when the book for the specified security has changed
-void MyAlgo::on_book(SecurityKey, Book const &b) {
-}
-
-// Our child reported a change
-void MyAlgo::on_child_change(OrderKey, ChildState const &st) {
-}
-
-// This is called by the spark daemon at startup. In this call we
-// describe our algo's parameters and register a factory function to
-// create an instance of the algo.
-extern "C" void init_spark_plugin(bts::SparkServices &serv) {
-   using namespace bts;
-
-   DynamicOrderDescriptor desc;
-
-   // Start by naming our order type
-   desc.set_dynamic_order_type("My Algo");
-
-   *desc.add_param_desc() = param_bool("Enable Feature");
-   *desc.add_param_desc() = param_uint32("Feature Quantity");
-
-   // Associate the descriptor with a builder function and register
-   // that with the Spark server.
-   auto result = 
-      serv.register_dynamic_algo_order(
-       desc, []() { return std::make_unique<MyAlgo>(); });
-
-   if (result != bts::AlgoRegistrationResult::SUCCESS) {
-      // The desc has errors
-      // Check the error log (/sparkdata/data/logging/log) for more details
-   }
-}
-
-} // namespace order_example
-} // namespace bts
-```

doc/api/deploy_to_web.sh

@@ -1,9 +0,0 @@
-#/bin/bash
-
-# ../../externals/linux/bin/zola/zola build
-zola.exe build
-
-rsync -avzL public/ bts@api.bluetradesys.com:/data/sdk/public/
-
-rm -rf ./public/
-

doc/api/sass/_base.scss

@@ -1,97 +0,0 @@
-html, body {
-  font-size: 16px;
-  height: 100%;
-}
-
-body {
-  font-family: "Source Sans Pro", "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
-  line-height: 1.6;
-  // from http://www.heropatterns.com
-  background-color: #0072a2;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='100' viewBox='0 0 100 100'%3E%3Cg fill-rule='evenodd'%3E%3Cg fill='%234b4b4b' fill-opacity='0.4'%3E%3Cpath opacity='.5' d='M96 95h4v1h-4v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9zm-1 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9z'/%3E%3Cpath d='M6 5V0H5v5H0v1h5v94h1V6h94V5H6z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
-
-  color: $foreground;
-
-  // for sticky footer
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh;
-}
-
-a {
-  color: $link-color;
-  text-decoration: none;
-  cursor: pointer;
-  border-bottom: 1px solid rgba(0, 124, 188, 0.25);
-
-  &:hover {
-    border-bottom: 1px solid $link-color;
-  }
-
-  &:visited {
-    color: $link-color;
-  }
-
-  // totally taken from stripe
-  &.button {
-    outline: none;
-    white-space: nowrap;
-    display: inline-block;
-    height: 40px;
-    line-height: 40px;
-    padding: 0 14px;
-    box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08);
-    background: #fff;
-    border-radius: 4px;
-    font-size: 15px;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: .025em;
-    color: #191919;
-    text-decoration: none;
-    transition: all .15s ease;
-    border-bottom: none;
-
-    &:hover {
-      transform: translateY(-1px);
-      text-decoration: none;
-      box-shadow: 0 7px 14px rgba(50, 50, 93, 0.1), 0 3px 6px rgba(0, 0, 0, 0.08);
-    }
-
-    &:active {
-      background-color: #f6f9fc;
-      transform: translateY(1px);
-    }
-  }
-
-  &.white {
-    color: white;
-    border-bottom-color: rgba(255, 255, 255, 0.25);
-
-    &:hover {
-      border-bottom-color: white;
-    }
-
-    &:visited {
-      color: white;
-    }
-  }
-}
-
-pre {
-  padding: 1rem;
-  overflow: auto;
-}
-
-p code, li code {
-  // color: #e6e1dc;
-  // background-color: #383838;
-  color: #191919;
-  background-color: #f5f5f5;
-  white-space: pre-wrap;
-  padding: 3px;
-  border-radius: 3px;
-  font-size: 0.85rem;
-  font-family: monospace;
-  // box-shadow: 0 1px 3px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1), 0 2px 1px -1px rgba(0,0,0,.12);
-}

doc/api/sass/_docs.scss

@@ -1,96 +0,0 @@
-.documentation {
-  padding: 3rem;
-  display: flex;
-
-  &__sidebar {
-    margin-right: 2rem;
-
-    ul {
-      padding-left: 0;
-      list-style: none;
-    }
-
-    > ul {
-      > li {
-        margin-bottom: 1rem;
-      }
-
-      .documentation__sidebar__title {
-        font-size: 1.25rem;
-        font-weight: bold;
-      }
-
-      ul {
-        margin-top: 0.25rem;
-
-        li {
-          border-left: 1px solid $background;
-          padding-left: 0.75rem;
-          padding-top: 0.25rem;
-          padding-bottom: 0.25rem;
-        }
-
-        li.active a {
-          font-weight: bold;
-          border-bottom: 1px solid $link-color;
-        }
-      }
-    }
-
-  }
-
-  &__content {
-    width: 60%;
-    // Same as the anchor absolute left to not overlap
-    margin-left: 2rem;
-
-    h1, h2, h3, h4, h5, h6 {
-      .zola-anchor {
-        font-size: 1.25rem;
-        visibility: hidden;
-        margin-left: -2rem;
-        text-decoration: none;
-        border-bottom-color: transparent;
-        cursor: pointer;
-      }
-
-      &:hover {
-        .zola-anchor {
-          visibility: visible;
-        }
-      }
-    }
-
-    blockquote {
-      border-left: 10px solid black;
-      padding: 0.25rem 0.5rem;
-      margin-left: 0;
-      font-style: italic;
-    }
-  }
-
-  iframe {
-    width: 100%;
-    min-height: 400px;
-  }
-}
-
-
-@media only screen and (max-width: 1000px) {
-  .documentation {
-    flex-direction: column;
-    padding: 2rem;
-
-    &__content {
-      width: 100%;
-      margin-left: 0;
-    }
-
-    &__sidebar {
-      border-top: 1px solid $background;
-      order: 1;
-      margin-right: 0;
-      margin-top: 1rem;
-    }
-  }
-}

doc/api/sass/_header.scss

@@ -1,33 +0,0 @@
-header {
-  .header__logo {
-    border-bottom: none;
-  }
-
-  nav a {
-    margin-right: 2rem;
-  }
-
-  .header__logo {
-    font-size: 2rem;
-    font-weight: bold;
-
-    &:hover {
-      text-decoration: none;
-    }
-  }
-}
-
-@media only screen and (max-width: 1000px) {
-  header {
-    padding: 1rem 0;
-
-    nav {
-      text-align: center;
-    }
-
-    .header__logo {
-      // to force menu links to be on a line below
-      display: block;
-    }
-  }
-}

doc/api/sass/_index.scss

@@ -1,71 +0,0 @@
-.inverted-colours {
-  background: $foreground;
-  color: $background;
-}
-
-.hero {
-  width: 60%;
-  margin: 0 auto;
-  margin-top: 2rem;
-  margin-bottom: 4rem;
-  text-align: center;
-
-  &__tagline {
-    margin-bottom: 2rem;
-  }
-}
-
-.disabled {
-  opacity: 0.5;
-}
-
-.selling-points {
-  padding: 3rem;
-
-  &__content {
-    display: flex;
-    flex-wrap: wrap;
-  }
-}
-
-.selling-point {
-  // 2 selling points per row on desktop
-  width: 50%;
-  padding: 2rem;
-  padding-top: 1rem;
-}
-
-.selling-header {
-  width: 100%;
-  padding: 1rem;
-  padding-top: 0rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  img {
-    align-self: center;
-    max-width: 70%;
-  }
-}
-
-// and 1 on mobile
-@media only screen and (max-width: 1000px) {
-  .hero {
-    width: 90%;
-    margin-top: 2rem;
-    margin-bottom: 4rem;
-  }
-
-  .selling-points {
-    padding: 2rem;
-  }
-
-  .selling-point {
-    width: 100%;
-    padding: 1rem;
-
-    h2 {
-      text-align: center;
-    }
-  }
-}

doc/api/sass/_layout.scss

@@ -1,43 +0,0 @@
-header {
-  padding: 2rem 3rem;
-}
-
-.container {
-  max-width: 1000px;
-  margin: 0 auto;
-}
-
-@media only screen and (max-width: 1000px)  {
-  .container {
-    max-width: 90%;
-  }
-}
-
-.content {
-  flex-grow: 1;
-
-  &--reversed {
-    background: $foreground;
-    color: $background;
-  }
-}
-
-.linux {
-  padding: 25px 15px;
-  background: #eff0f1;
-  border-radius: 5px;
-  border: 1px solid #0072a2;
-}
-
-.info {
-  padding: 25px 15px;
-  background: #ffffe0;
-  border-radius: 5px;
-  border: 1px solid #383838;
-}
-
-
-footer {
-  text-align: center;
-  padding: 2rem 3rem;
-}

doc/api/sass/_normalize.scss

@@ -1,447 +0,0 @@
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
-
-/* Document
-   ========================================================================== */
-
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in
- *    IE on Windows Phone and in iOS.
- */
-
-html {
-  line-height: 1.15; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/* Sections
-   ========================================================================== */
-
-/**
- * Remove the margin in all browsers (opinionated).
- */
-
-body {
-  margin: 0;
-}
-
-/**
- * Add the correct display in IE 9-.
- */
-
-article,
-aside,
-footer,
-header,
-nav,
-section {
-  display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- * 1. Add the correct display in IE.
- */
-
-figcaption,
-figure,
-main { /* 1 */
-  display: block;
-}
-
-/**
- * Add the correct margin in IE 8.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
-  box-sizing: content-box; /* 1 */
-  height: 0; /* 1 */
-  overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * 1. Remove the gray background on active links in IE 10.
- * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
- */
-
-a {
-  background-color: transparent; /* 1 */
-  -webkit-text-decoration-skip: objects; /* 2 */
-}
-
-/**
- * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
-  border-bottom: none; /* 1 */
-  text-decoration: underline; /* 2 */
-  text-decoration: underline dotted; /* 2 */
-}
-
-/**
- * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
- */
-
-b,
-strong {
-  font-weight: inherit;
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font style in Android 4.3-.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Add the correct background and color in IE 9-.
- */
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-audio,
-video {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in iOS 4-7.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Remove the border on images inside links in IE 10-.
- */
-
-img {
-  border-style: none;
-}
-
-/**
- * Hide the overflow in IE.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers (opinionated).
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  font-family: sans-serif; /* 1 */
-  font-size: 100%; /* 1 */
-  line-height: 1.15; /* 1 */
-  margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
-  overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
-  text-transform: none;
-}
-
-/**
- * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
- *    controls in Android 4.
- * 2. Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-html [type="button"], /* 1 */
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button; /* 2 */
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-
-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
-  padding: 0.35em 0.75em 0.625em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
-
-legend {
-  box-sizing: border-box; /* 1 */
-  color: inherit; /* 2 */
-  display: table; /* 1 */
-  max-width: 100%; /* 1 */
-  padding: 0; /* 3 */
-  white-space: normal; /* 1 */
-}
-
-/**
- * 1. Add the correct display in IE 9-.
- * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
-}
-
-/**
- * Remove the default vertical scrollbar in IE.
- */
-
-textarea {
-  overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10-.
- * 2. Remove the padding in IE 10-.
- */
-
-[type="checkbox"],
-[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
-  font: inherit; /* 2 */
-}
-
-/* Interactive
-   ========================================================================== */
-
-/*
- * Add the correct display in IE 9-.
- * 1. Add the correct display in Edge, IE, and Firefox.
- */
-
-details, /* 1 */
-menu {
-  display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
-  display: list-item;
-}
-
-/* Scripting
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 9-.
- */
-
-canvas {
-  display: inline-block;
-}
-
-/**
- * Add the correct display in IE.
- */
-
-template {
-  display: none;
-}
-
-/* Hidden
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 10-.
- */
-
-[hidden] {
-  display: none;
-}

doc/api/sass/_search.scss

@@ -1,47 +0,0 @@
-.search-container {
-  display: inline-block;
-  position: relative;
-  width: 300px;
-
-  input {
-    width: 100%;
-    padding: 0.5rem;
-  }
-}
-
-.search-results {
-  display: none;
-  position: absolute;
-  background: white;
-  color: black;
-  padding: 1rem;
-  box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5);
-  max-height: 500px;
-  overflow: auto;
-  width: 150%;
-  right: 0;
-
-  &__items {
-    list-style: none;
-  }
-
-  li {
-    margin-top: 1rem;
-    border-bottom: 1px solid #ccc;
-    font-size: 0.9rem;
-
-    &:first-of-type {
-      margin-top: 0;
-    }
-  }
-
-  &__item {
-    margin-bottom: 1rem;
-
-    a {
-      font-size: 1.2rem;
-      display: inline-block;
-      margin-bottom: 0.5rem;
-    }
-  }
-}

doc/api/sass/_themes.scss

@@ -1,79 +0,0 @@
-
-.themes-container {
-  padding: 3rem;
-  width: 80%;
-  margin: 0 auto;
-
-  img {
-    max-width: 100%;
-  }
-}
-
-@media only screen and (max-width: 1000px)  {
-  .themes-container {
-    width: 100%;
-    margin: 0 1rem;
-  }
-}
-
-.themes {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-
-  .theme {
-    width: 45%;
-    text-decoration: none;
-    cursor: pointer;
-    margin-bottom: 2rem;
-    border-bottom: none;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
-    padding: 10px;
-
-    img {
-      width: 100%;
-      height: 90%;
-    }
-
-    span {
-      display: block;
-      text-align: center;
-      font-size: 1.1rem;
-    }
-  }
-}
-
-.theme-info {
-  display: flex;
-  align-items: flex-start;
-
-  .thumb {
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07);
-    width: 400px;
-    margin-right: 2rem;
-  }
-
-  h1, p {
-    margin: 0;
-  }
-
-  padding: 1rem;
-}
-
-
-@media only screen and (max-width: 1000px)  {
-  .themes .theme {
-    width: 100%;
-  }
-}
-
-@media only screen and (max-width: 1000px)  {
-  .theme-info {
-    flex-direction: column;
-    align-items: center;
-
-    img {
-      margin-bottom: 1rem;
-    }
-  }
-}

doc/api/sass/site.scss

@@ -1,19 +0,0 @@
-@charset "utf-8";
-
-@import "normalize";
-
-*, *:before, *:after {
-  box-sizing: border-box;
-}
-
-$background: #191919;
-$foreground: white;
-$link-color: #007CBC;
-
-@import "base";
-@import "layout";
-@import "header";
-@import "index";
-@import "docs";
-@import "themes";
-@import "search";

doc/api/static/images/logo.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 523.438 166.055" version="1.1" viewBox="0 0 523.44 166.06" xmlns="http://www.w3.org/2000/svg"><path d="m297.43 153.29c-18.051-6.698-91.506-40.523-160.87-72.832-69.291-32.28-134.17-62.929-134.17-62.929-2.082-0.983-2.971-3.466-1.987-5.549 0.981-2.079 3.466-2.97 5.548-1.988 0.037 0.02 16.216 7.661 41.09 19.354 24.874 11.695 58.412 27.425 93.046 43.557 69.192 32.242 143.09 66.232 160.25 72.574 20.188 7.443 37.922 12.204 80.113 12.239 30.434 0 73.407-2.559 138.44-8.568 2.288-0.211 4.319 1.474 4.531 3.765 0.208 2.29-1.478 4.324-3.771 4.536-65.152 6.014-108.31 8.602-139.2 8.605h-0.423c-42.393-1e-3 -61.964-5.092-82.59-12.764z" fill="#B3B3B3"/><path d="m45.824 145.9v-138.39h101.28c27.03 0 44.924 12.184 44.924 35.789 0 17.513-8.947 26.27-19.226 29.506 12.564 3.996 21.702 15.039 21.702 31.22 0 25.319-17.516 41.88-44.545 41.88h-104.13zm41.692-60.155v-20.37h59.774c13.707 0 20.179-4.758 20.179-16.751 0-14.658-11.613-16.943-29.507-16.943h-67.96v90.234h70.052c17.325 0 29.889-4.759 29.889-18.276 0-11.423-7.423-17.894-20.939-17.894h-61.488z" fill="#0086BF"/><path d="m149.96 153.4h-104.13v-7.502h7.501-7.501v7.502h-7.504v-153.4h108.78c14.604 0.018 27.473 3.236 37.154 10.583 9.724 7.301 15.384 19.035 15.273 32.71 0.018 10.01-2.623 18.337-7.222 24.554-1.308 1.779-2.755 3.368-4.306 4.774 2.395 1.964 4.557 4.235 6.422 6.792 4.847 6.626 7.594 15.107 7.58 24.606 0.044 14.363-5.105 27.096-14.494 35.896-9.347 8.809-22.486 13.486-37.463 13.486-0.028 1e-3 -0.058 1e-3 -0.088 1e-3zm0-15.007c12.016-0.018 21.114-3.62 27.266-9.402 6.125-5.814 9.736-14.02 9.777-24.973-0.015-6.687-1.835-11.817-4.698-15.757-2.875-3.934-6.891-6.753-11.775-8.315l-22.267-7.085c-0.322 7e-3 -0.645 0.011-0.97 0.012h-52.271v5.367h53.988c7.892 0 15.036 1.876 20.422 6.475 5.429 4.589 8.092 11.651 8.015 18.922 0.016 4.524-1.103 8.88-3.35 12.497-2.236 3.632-5.46 6.38-9.02 8.3-7.172 3.825-15.677 4.938-25.019 4.979h-77.553v-105.24h75.46c6.958 0.014 13.253 0.288 19.035 1.724 5.677 1.383 11.425 4.37 14.807 10.025 2.23 3.702 3.174 8.068 3.171 12.698-5e-3 3.663-0.489 7.129-1.729 10.368-1.045 2.753-2.714 5.301-4.853 7.329l2.154-0.677c3.906-1.243 7.213-3.358 9.68-6.692 2.445-3.351 4.276-8.156 4.297-15.657-0.111-9.936-3.399-16.094-9.377-20.786-6.028-4.645-15.62-7.52-28.046-7.501l-93.773-3e-3v123.39h96.629v-1e-3zm-72.453-23.984h62.551c5.981 0.011 11.112-0.651 14.744-1.85 3.688-1.218 5.575-2.753 6.528-4.306 0.647-1.077 1.099-2.388 1.113-4.618-0.073-4.151-1.124-6.039-2.785-7.541-1.701-1.492-5.034-2.853-10.648-2.853h-61.49v-7.501h7.501-7.501v7.501h-7.504v-35.372h67.277c4.502 0.018 7.602-0.643 9.234-1.431 1.634-0.854 2.056-1.329 2.718-2.838 0.402-1.025 0.728-2.648 0.728-4.979-0.01-2.704-0.518-4.121-1.023-4.967-0.526-0.837-1.154-1.457-2.696-2.209-3.023-1.521-9.667-2.335-18.288-2.268h-60.459v75.232z" fill="#fff"/><path d="M251.22,145.899V31.68h-52.54V7.505h129.256V31.68h-52.539v114.22H251.22z" fill="#0086BF"/><path d="m251.22 153.4v-7.499h7.501-7.501v7.499h-7.504l-2e-3 -114.22h-52.538v-39.175h144.26v39.175h-52.541v114.22h-31.678zm16.673-15.001v-114.22h52.538v-9.171h-114.25v9.171h52.542v114.22h9.171v-1e-3z" fill="#fff"/><path d="m340.11 145.9v-24.176h103.74c12.942 0 20.177-7.233 20.177-18.083 0-11.802-7.234-17.893-20.177-17.893h-63.58c-26.075 0-42.257-16.562-42.257-39.404 0-22.271 15.038-38.831 42.639-38.831h99.365v24.174h-99.365c-11.042 0-17.514 6.473-17.514 16.94 0 10.469 6.661 16.751 17.324 16.751h63.388c27.98 0 43.02 13.134 43.02 39.974 0 23.226-14.089 40.546-43.02 40.546h-103.74z" fill="#383431"/><path d="m443.85 153.4h-103.74v-7.499h7.498-7.498v7.499h-7.505v-39.176h111.25c5.118-0.02 8.116-1.385 9.849-2.984 1.71-1.622 2.774-3.8 2.823-7.597-0.071-4.45-1.162-6.342-2.67-7.727-1.55-1.385-4.646-2.668-10.002-2.668h-63.58c-14.603 0.028-27.235-4.711-36.097-13.218-8.89-8.476-13.698-20.511-13.666-33.685-0.032-12.792 4.428-24.712 13.274-33.177 8.826-8.496 21.605-13.184 36.87-13.155h106.86v39.176h-106.86c-4.11 0.028-6.327 1.125-7.658 2.411-1.313 1.309-2.315 3.29-2.354 7.027 0.043 3.691 1.042 5.592 2.354 6.89 1.338 1.278 3.562 2.338 7.469 2.36h63.388c15.081-7e-3 27.896 3.536 37.065 11.888 9.185 8.367 13.511 20.865 13.455 35.59 0.022 13.078-4.037 25.357-12.824 34.248-8.729 8.882-21.678 13.796-37.497 13.796-0.066 1e-3 -0.135 1e-3 -0.2 1e-3zm-96.246-14.999 96.246-4e-3c13.017-0.037 21.505-3.779 27.018-9.329 5.488-5.576 8.475-13.569 8.494-23.712-0.052-12.118-3.246-19.606-8.572-24.519-5.35-4.923-14.046-7.951-26.939-7.956h-63.388c-6.76 0.022-13.199-2.056-17.858-6.541-4.686-4.459-7.014-10.932-6.972-17.712-0.038-6.729 2.191-13.218 6.88-17.764 4.659-4.564 11.2-6.707 18.14-6.678h91.856v-9.174l-91.856 4e-3c-12.341 0.026-20.88 3.617-26.474 8.971-5.574 5.382-8.632 12.875-8.667 22.358 0.035 9.665 3.317 17.334 9.038 22.85 5.746 5.486 14.244 9.029 25.721 9.049h63.58c7.58 0 14.573 1.767 19.88 6.38 5.34 4.606 7.87 11.665 7.799 19.018 0.048 7.05-2.504 13.916-7.652 18.62-5.117 4.73-12.205 6.982-20.026 6.965l-96.246-6e-3v9.18h-2e-3z" fill="#fff"/><path d="m45.824 145.9v-138.39h101.27c6Line truncated

doc/api/static/search.js

@@ -1,180 +0,0 @@
-function debounce(func, wait) {
-  var timeout;
-
-  return function () {
-    var context = this;
-    var args = arguments;
-    clearTimeout(timeout);
-
-    timeout = setTimeout(function () {
-      timeout = null;
-      func.apply(context, args);
-    }, wait);
-  };
-}
-
-// Taken from mdbook
-// The strategy is as follows:
-// First, assign a value to each word in the document:
-//  Words that correspond to search terms (stemmer aware): 40
-//  Normal words: 2
-//  First word in a sentence: 8
-// Then use a sliding window with a constant number of words and count the
-// sum of the values of the words within the window. Then use the window that got the
-// maximum sum. If there are multiple maximas, then get the last one.
-// Enclose the terms in <b>.
-function makeTeaser(body, terms) {
-  var TERM_WEIGHT = 40;
-  var NORMAL_WORD_WEIGHT = 2;
-  var FIRST_WORD_WEIGHT = 8;
-  var TEASER_MAX_WORDS = 30;
-
-  var stemmedTerms = terms.map(function (w) {
-    return elasticlunr.stemmer(w.toLowerCase());
-  });
-  var termFound = false;
-  var index = 0;
-  var weighted = []; // contains elements of ["word", weight, index_in_document]
-
-  // split in sentences, then words
-  var sentences = body.toLowerCase().split(". ");
-
-  for (var i in sentences) {
-    var words = sentences[i].split(" ");
-    var value = FIRST_WORD_WEIGHT;
-
-    for (var j in words) {
-      var word = words[j];
-
-      if (word.length > 0) {
-        for (var k in stemmedTerms) {
-          if (elasticlunr.stemmer(word).startsWith(stemmedTerms[k])) {
-            value = TERM_WEIGHT;
-            termFound = true;
-          }
-        }
-        weighted.push([word, value, index]);
-        value = NORMAL_WORD_WEIGHT;
-      }
-
-      index += word.length;
-      index += 1;  // ' ' or '.' if last word in sentence
-    }
-
-    index += 1;  // because we split at a two-char boundary '. '
-  }
-
-  if (weighted.length === 0) {
-    return body;
-  }
-
-  var windowWeights = [];
-  var windowSize = Math.min(weighted.length, TEASER_MAX_WORDS);
-  // We add a window with all the weights first
-  var curSum = 0;
-  for (var i = 0; i < windowSize; i++) {
-    curSum += weighted[i][1];
-  }
-  windowWeights.push(curSum);
-
-  for (var i = 0; i < weighted.length - windowSize; i++) {
-    curSum -= weighted[i][1];
-    curSum += weighted[i + windowSize][1];
-    windowWeights.push(curSum);
-  }
-
-  // If we didn't find the term, just pick the first window
-  var maxSumIndex = 0;
-  if (termFound) {
-    var maxFound = 0;
-    // backwards
-    for (var i = windowWeights.length - 1; i >= 0; i--) {
-      if (windowWeights[i] > maxFound) {
-        maxFound = windowWeights[i];
-        maxSumIndex = i;
-      }
-    }
-  }
-
-  var teaser = [];
-  var startIndex = weighted[maxSumIndex][2];
-  for (var i = maxSumIndex; i < maxSumIndex + windowSize; i++) {
-    var word = weighted[i];
-    if (startIndex < word[2]) {
-      // missing text from index to start of `word`
-      teaser.push(body.substring(startIndex, word[2]));
-      startIndex = word[2];
-    }
-
-    // add <em/> around search terms
-    if (word[1] === TERM_WEIGHT) {
-      teaser.push("<b>");
-    }
-    startIndex = word[2] + word[0].length;
-    teaser.push(body.substring(word[2], startIndex));
-
-    if (word[1] === TERM_WEIGHT) {
-      teaser.push("</b>");
-    }
-  }
-  teaser.push("…");
-  return teaser.join("");
-}
-
-function formatSearchResultItem(item, terms) {
-  return '<div class="search-results__item">'
-  + `<a href="${item.ref}">${item.doc.title}</a>`
-  + `<div>${makeTeaser(item.doc.body, terms)}</div>`
-  + '</div>';
-}
-
-function initSearch() {
-  var $searchInput = document.getElementById("search");
-  var $searchResults = document.querySelector(".search-results");
-  var $searchResultsItems = document.querySelector(".search-results__items");
-  var MAX_ITEMS = 10;
-
-  var options = {
-    bool: "AND",
-    fields: {
-      title: {boost: 2},
-      body: {boost: 1},
-    }
-  };
-  var currentTerm = "";
-  var index = elasticlunr.Index.load(window.searchIndex);
-
-  $searchInput.addEventListener("keyup", debounce(function() {
-    var term = $searchInput.value.trim();
-    if (term === currentTerm || !index) {
-      return;
-    }
-    $searchResults.style.display = term === "" ? "none" : "block";
-    $searchResultsItems.innerHTML = "";
-    if (term === "") {
-      return;
-    }
-
-    var results = index.search(term, options);
-    if (results.length === 0) {
-      $searchResults.style.display = "none";
-      return;
-    }
-
-    currentTerm = term;
-    for (var i = 0; i < Math.min(results.length, MAX_ITEMS); i++) {
-      var item = document.createElement("li");
-      item.innerHTML = formatSearchResultItem(results[i], term.split(" "));
-      $searchResultsItems.appendChild(item);
-    }
-  }, 150));
-}
-
-
-if (document.readyState === "complete" ||
-    (document.readyState !== "loading" && !document.documentElement.doScroll)
-) {
-  initSearch();
-} else {
-  document.addEventListener("DOMContentLoaded", initSearch);
-}

doc/api/templates/client.html

@@ -1,31 +0,0 @@
-{% extends "index.html" %}
-
-{% block extra_nav_class %}{% endblock extra_nav_class %}
-{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
-
-{% block content %}
-{% set section = get_section(path="client/_index.md") %}
-<div class="documentation">
-    <aside class="documentation__sidebar">
-        <ul>
-        {% for p in section.subsections %}
-            {% set subsection = get_section(path=p) %}
-            <li>
-                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
-                <ul>
-                    {% for page in subsection.pages %}
-                        <li class="{% if current_path == page.path %}active{% endif %}">
-                            <a href="{{page.permalink}}">{{page.title}}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-        </ul>
-    </aside>
-    <div class="documentation__content">
-        {% block doc_content %}
-        {% endblock doc_content %}
-    </div>
-</div>
-{% endblock content %}

doc/api/templates/documentation.html

@@ -1,36 +0,0 @@
-{% extends "index.html" %}
-
-{% block extra_nav_class %}{% endblock extra_nav_class %}
-{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
-
-{% block content %}
-{%if page.extra.section %}
-{% set section = get_section(path="{{page.extra.section}}/_index.md") %}
-{% else %}
-{% set section = get_section(path="server/_index.md") %}
-{% endif %}
-<div class="documentation">
-    <aside class="documentation__sidebar">
-        <ul>
-        {% for p in section.subsections %}
-            {% set subsection = get_section(path=p) %}
-            <li>
-                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
-                <ul>
-                    {% for page in subsection.pages %}
-                        <li class="{% if current_path == page.path %}active{% endif %}">
-                            <a href="{{page.permalink}}">{{page.title}}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-        </ul>
-    </aside>
-    <div class="documentation__content">
-        {% block doc_content %}
-        {% endblock doc_content %}
-        {% block next_link %} {% endblock next_link %}
-    </div>
-</div>
-{% endblock content %}

doc/api/templates/index.html

@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-gb">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600" rel="stylesheet" />
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="{% block description %}{{ config.description }}{% endblock description %}">
-        <meta name="keywords" content="Futures, Options, Derivatives, Trade, Trading, Professional, options trading, futures trading, Software, API, SDK" />
-        <meta name="rights" content="© Blue Trading Systems" />
-        <meta name="author" content="{{ config.extra.author }}">
-        <title>{% block title %}{{ config.title }}{% endblock title %}</title>
-        <link rel="stylesheet" href="{{ get_url(path="site.css") }}"/>
-        <link rel="icon" href="{{ get_url(path="favicon.ico") }}">
-        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-    </head>
-    <body>
-
-        <header>
-            <nav class="{% block extra_nav_class %}container{% endblock extra_nav_class %}">
-                <a class="header__logo white" href="{{ config.base_url }}">
-                    <img width="100" src="/images/logo.svg">
-                </a>
-                <a class="white" href="{{ get_url(path="@/server/_index.md") }}" class="nav-link">Server SDK</a>
-                <a class="white" href="{{ get_url(path="@/client/_index.md") }}" class="nav-link">Client SDK</a>
-                <a class="white" href="https://www.bluetradingsystems.com/bts-spark" class="nav-link">About Spark</a>
-
-                <div class="search-container">
-                    <input id="search" type="search" placeholder="🔎 Search">
-
-                    <div class="search-results">
-                        <div class="search-results__items"></div>
-                    </div>
-                </div>
-            </nav>
-        </header>
-
-        <div class="content {% block extra_content_class %}{% endblock extra_content_class %}">
-            {% block content %}
-                <div class="hero">
-                    <h1>Spark SDK</h1>
-                    <p class="hero__tagline">
-                        Spark consists of a client UI 
-                        (<a class="white" href="https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen">Spark Client</a>), 
-                        a high-performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols.
-                        Use the Spark SDK to extend Spark Server with your custom Algos, then use the Client SDK to launch and control them.
-                    </p>
-                </div>
-
-                <div class="inverted-colours selling-points">
-                    <div class="selling-points__content container">
-                        <div class="selling-header">
-                            <img src="/images/API.png" width="100%" />
-                        </div>
-                        <div class="selling-point">
-                            <h2>
-                                Server SDK 
-                                <i class="fa fa-tachometer" aria-hidden="true"></i>
-                            </h2>
-                            <p>
-                                Leverage the ultra-low latency Spark C++ API to develop and run your custom Algo.  Have your first sub-10 microsecond trading algorithm running in under an hour.
-                            </p>
-                            <a href="{{ get_url(path="@/server/_index.md") }}" class="button">Get started</a>
-                        </div>
-
-                        <div class="selling-point disabled">
-                            <h2>
-                                Client SDK
-                                <i class="fa fa-gamepad" aria-hidden="true"></i>
-                            </h2>
-                            <p>
-                                The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
-                            </p>
-                            <a href="" class="button" disabled>Get started</a>
-                        </div>
-                        
-                        <!-- <div class="selling-point disabled">
-                            <h2>
-                                Microsoft Excel
-                                <i class="fa fa-table" aria-hidden="true"></i>
-                            </h2>
-                            <p>
-                                More of your business is built on excel than probably should be. Continue this worrying trend with the Spark Excel API.
-                            </p>
-                            <a href="" class="button" disabled>Get started</a>
-                        </div> -->
-                    </div>
-                </div>
-
-            {% endblock content %}
-        </div>
-        <footer>
-            © Blue Trading Systems
-        </footer>
-
-        <script type="text/javascript" src="{{ get_url(path="elasticlunr.min.js") }}"></script>
-        <script type="text/javascript" src="{{ get_url(path="search_index.en.js") }}"></script>
-        <script type="text/javascript" src="{{ get_url(path="search.js") }}"></script>
-    </body>
-</html>

doc/api/templates/page.html

@@ -1,25 +0,0 @@
-{% extends "documentation.html" %}
-
-{% block title %}{{ page.title }} | {{ super() }} {% endblock title %}
-{% block doc_content %}
-    <h1>{{page.title}}</h1>
-    {{page.content | safe}}
-{% endblock doc_content %}
-
-{% block next_link %}
-<p>
-    {% if page.lighter %}
-        <a href="{{ page.lighter.permalink }}">
-            <i class="fa fa-chevron-left fa-fw" aria-hidden="true"></i>
-            Previous
-        </a>
-    {% endif %}
-    &nbsp;
-    {% if page.heavier %}
-        <a href="{{ page.heavier.permalink }}">
-            Next
-            <i class="fa fa-chevron-right fa-fw" aria-hidden="true"></i>
-        </a>
-    {% endif %}
-</p>
-{% endblock next_link %}

doc/api/templates/shortcodes/clipable.html

@@ -1,15 +0,0 @@
-<pre 
-   {% if background %}
-   style="background-color:{{background}};"
-   {% else %}
-   style="background-color:#383838;"
-   {% endif %}
-   >
-<span 
-   {% if color %}
-   style="color:{{color}};"
-   {% else %}
-   style="color:#e6e1dc;"
-   {% endif %}
-><a onclick="navigator.clipboard.writeText('{{body}}')"><i class="fa fa-clipboard fa-underline" style="color: white; text-decoration: none;"></i></a> {{body}}</span>
-</pre>

doc/api/templates/shortcodes/gallery.html

@@ -1,7 +0,0 @@
-{% for asset in page.assets -%}
-  {%- if asset is matching("[.](jpg|png)$") -%}
-    <a href="{{ get_url(path=asset) | safe }}" target="_blank">
-      <img src="{{ resize_image(path=asset, width=240, height=180, op="fill", format="auto") | safe }}" />
-    </a>
-  {%- endif %}
-{%- endfor %}

doc/api/templates/shortcodes/info.html

@@ -1,4 +0,0 @@
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-    {{body}}
-</div>

doc/api/templates/shortcodes/linux.html

@@ -1,4 +0,0 @@
-<div class="linux">
-    <i class="fa fa-linux fa-fw" aria-hidden="true"></i>
-    {{body}}
-</div>

doc/api/templates/shortcodes/resize_image.html

@@ -1 +0,0 @@
-<img src="{{ resize_image(path=path, width=width, height=height, op=op) }}" />

doc/user/CMakeDeps.cmake

@@ -1 +1 @@
-set(sources /home/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
+set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)

doc/user/content/release_notes/_index.md

@@ -4,50 +4,6 @@ weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
-## 2.15.0
-### User Visible Changes  
-  - Added ability to hide Ladder status messages via Ladder Settings -> Left Panel tab -> Show/Hide groupbox -> Status Message
-  - Synthetic cloning now allows for any parameter to be changed, including tick size and leg contracts
-  - Added ability to import synthetics from a CSV file; see our manual for further details on this process
-  - Reduced Iceberg reloading latency
-### Bug Fixes
-  - Fixed a bug where highlighted fills could lose their highlight status
-  - Fixed a bug where the (Mini) OrderBook PIQ could be displaying an old value
-
-## 2.14.3
-### Bug Fixes
-  - Fixed a bug regarding ICE logon messaging
-  
-## 2.14.2
-### Bug Fixes
-  - Fixed a bug regarding ICE messaging
-  
-## 2.14.1
-### Bug Fixes
-  - Fixed a bug regarding ICE logon authentication
-  
-## 2.14.0
-### User Visible Changes  
-  - All ladders can now be recentered by (shift or alt) + double clicking over the Price column in a ladder
-  - Added a Max Order Quantity setting to the Safety Checks tab on the Ladder settings. This setting allows for a user-defined maximum order quantity.
-  - Added a Price Display Format setting to the Market Price and Size Display tab on the Ladder settings. This setting allows for price levels in the ladder to be displayed without a decimal separator.
-  - Synthetic instrument creation with 3 legs no longer defaults to butterfly quantites
-### Bug Fixes
-  - Fixed an issue where market transition were not observed by IAlgoOrder
-  - Fixed a bug in error reporting
-  - Fixed a bug in the PnL window where specifying a certain grouping order would lead to a UI failure
-
-## 2.13.0
-### User Visible Changes  
-  - Added the name of the spreader to the parent algo badge (for spreader child orders), in the fills, orderbook and floating orderbook windows
-  - Added support for sounds for new orders
-  - Added a new quoting throttle parameter for the spreader, that throttles quotes that are moving toward the inside market but are still a configurable number of ticks away
-  - Enabled the ladder to remember the left panel scroll position across front end restarts
-### Bug Fixes
-  - Fixed the local fills window so that it does not show the admin fills
-  - Removed the deleted accounts from the ladder accounts dropdown
-  - Fixed the orderbook price for iceberg of spreaders
-  
 ## 2.12.0
 ### User Visible Changes
   - Added support for ICE market data and order execution

ops_notes.txt

@@ -1,7 +1,3 @@
-2.14.0
-- Load Algos in libspark.so automatically (no symlink needed)
-- Specify commands to run when sparkd starts. These will automatically be killed when sparkd terminates if they are still running.
-
 1.5.7
 - Fixed Aggressor coloring and ladder high/low coloring in SIM
 

src/client/CMakeLists.txt

@@ -1,19 +0,0 @@
-
-cmake_minimum_required(VERSION 3.5)
-project(spark_client)
-include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake)
-
-file(GLOB_RECURSE spark_client_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cs)
-file(GLOB_RECURSE spark_client_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.csproj)
-file(GLOB_RECURSE spark_ui_sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.cs)
-file(GLOB_RECURSE spark_ui_csproj RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} spark/*.csproj)
-list(REMOVE_ITEM spark_ui_sources ${spark_client_sources} )
-list(REMOVE_ITEM spark_ui_csproj ${spark_client_csproj} )
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/../
-   COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh
-   ARGS ${CMAKE_BUILD_TYPE} ${CMAKE_BINARY_DIR}
-   COMMENT "Building sparkcmd in netcore3"
-   DEPENDS libspark ${spark_client_sources} ${spark_client_csproj} ${CMAKE_CURRENT_SOURCE_DIR}/build_spark_dotnetcore.sh)
-
-   add_custom_target(spark_client_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/../)   

src/client/Directory.Build.Props

@@ -5,7 +5,6 @@
     <SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
     <SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
     <Externals>$(SparkRoot)\externals\windows</Externals>
-    <Externals Condition=" '$(OS)' != 'Windows_NT' ">$(SparkRoot)/externals/linux</Externals>
     <DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
     <ErrorReport>None</ErrorReport>
     <Prefer32Bit>False</Prefer32Bit>
@@ -20,25 +19,20 @@
     <OutputPath>$(BaseOutputPath)\bin</OutputPath>
     <BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
-    <BaseIntermediateOutputPath Condition=" '$(OS)' != 'Windows_NT' ">$(BaseOutputPath)\linuxobj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition=" '$(OS)' != 'Windows_NT' ">$(BaseOutputPath)\linuxobj\$(MSBuildProjectName)</IntermediateOutputPath>
     <GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
 </PropertyGroup>
 
-
 <Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
 
 <ItemGroup>
     <AvailableItemName Include="Proto2">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' " >CompileProto2</Targets>
-        <Targets Condition=" '$(OS)' != 'Windows_NT' " >CompileProto2Linux</Targets>
+        <Targets>CompileProto3</Targets>
     </AvailableItemName>
     <AvailableItemName Include="Proto3">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' " >CompileProto3</Targets>
-        <Targets Condition=" '$(OS)' != 'Windows_NT' " >CompileProto3Linux</Targets>
+        <Targets>CompileProto3</Targets>
     </AvailableItemName>
     <AvailableItemName Include="Proto3Excel">
-        <Targets Condition=" '$(OS)' == 'Windows_NT' ">CompileProto3Excel</Targets>
+        <Targets>CompileProto3Excel</Targets>
     </AvailableItemName>    
 </ItemGroup>
 
@@ -49,14 +43,6 @@
     <protogen>$(Externals)\bin\protogen.exe</protogen>
 </PropertyGroup>
 
-<PropertyGroup Label="ProtoBuf" Condition=" '$(OS)' != 'Windows_NT' ">
-    <ProtocPluginBase>$(SparkRoot)/src/lib/api/service_compiler</ProtocPluginBase>
-    <ProtoInclude>$(Externals)/include</ProtoInclude>
-    <protoc>$(Externals)/bin/protoc</protoc>
-    <protoc_rename>$(Externals)/bin/lowercase_files.sh</protoc_rename>
-    <protogen>$(Externals)/bin/protogen</protogen>
-</PropertyGroup>
-
 <ItemDefinitionGroup>
     <Proto2>
     </Proto2>

src/client/Directory.Build.Targets

@@ -3,7 +3,7 @@
 
 
 <Target Name="CompileProto2" 
-    Condition="'@(Proto2)'!='' AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto2)'!=''"
     Inputs="$(MSBuildProjectFile);$(protogen);%(Proto2.FullPath)" 
     Outputs="$(GenDir)\proto2\%(Proto2.filename).cs"
     AfterTargets="PreBuildEvent">
@@ -28,7 +28,7 @@
     passes wipes out the additional compile includes that we add.
 -->
 <Target Name="CompileProto3" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3)'!=''  AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto3)'!=''"
     Inputs="$(protoc);
     %(Proto3.Identity);$(ProtocPluginBase)\plugin.py;
     $(ProtocPluginBase)\templates\c#\client.pb.cs;
@@ -58,7 +58,7 @@
 </Target>
 
 <Target Name="CompileProto3Excel" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3Excel)'!='' AND '$(OS)' == 'Windows_NT' "
+    Condition="'@(Proto3Excel)'!=''"
     Inputs="$(protoc);
     %(Proto3Excel.Identity);$(ProtocPluginBase)\plugin.py;
     $(ProtocPluginBase)\templates\excel\excel.pb.cs;"
@@ -82,74 +82,12 @@
     </ItemGroup>
 </Target>
 
-
-<Target Name="CompileProto2Linux" 
-    Condition="'@(Proto2)'!='' AND '$(OS)' != 'Windows_NT' "
-    Inputs="$(MSBuildProjectFile);$(protogen);%(Proto2.FullPath)" 
-    Outputs="$(GenDir)/proto2/%(Proto2.filename).cs"
-    AfterTargets="PreBuildEvent">
-    <PropertyGroup>
-        <SourceRelativeFile>$([System.String]::Copy('%(proto2.fullpath)').Replace($(SourceRoot), ''))</SourceRelativeFile>
-        <SourceRelativeDir>$([System.IO.Path]::GetDirectoryName($(SourceRelativeFile)))</SourceRelativeDir>
-        <WorkingDirectory>$(GenDir)/proto2</WorkingDirectory>
-    </PropertyGroup>
-    <MakeDir Directories="$(WorkingDirectory)" />
-    <Copy SourceFiles="%(Proto2.FullPath)" DestinationFolder="$(WorkingDirectory)" SkipUnchangedFiles="True" UseHardLinksIfPossible="True" />
-    <Error Text="protogen.exe does not exist. If you forgot to clone with externals try: git submodule update --init --recursive" Condition="!Exists($(protogen))" />
-    <Message Importance="High" Text="Doing Proto2 %(proto2.filename)" />
-    <Exec Command="$(Protogen) %(Proto2.filename)%(proto2.extension) --csharp_out=. -I. -I$(SourceRoot) -I$(Externals)/include"
-          WorkingDirectory="$(WorkingDirectory)" />
-    <ItemGroup>
-        <Compile Include="$(WorkingDirectory)/%(Proto2.filename).cs" />
-    </ItemGroup>
-</Target>
-
-<Target Name="CompileProto3Linux" AfterTargets="GetAssemblyVersion"
-    Condition="'@(Proto3)'!='' AND '$(OS)' != 'Windows_NT' "
-    Inputs="$(protoc);
-    %(Proto3.Identity);$(ProtocPluginBase)/plugin.py;
-    $(ProtocPluginBase)/templates/c#/client.pb.cs;
-    $(ProtocPluginBase)/templates/c#/server.pb.cs;
-    $(ProtocPluginBase)/templates/c#/immutable.pb.cs;"
-    Outputs="%(Proto3.OutCS);%(Proto3.OutCSServer);%(Proto3.OutCSClient);%(Proto3.OutCSImmutable)">
-    <MakeDir Directories="%(Proto3.OutBase)" />
-    <MakeDir Directories="$(IntermediateOutputPath)/gen" />
-   
-    <Message Importance="High" Text="Generating service %(Proto3.FileName)" />
-    <Exec Command="
-       PYTHONPATH=$(Externals)/python $(protoc) \
-       %(Proto3.FullPath) \
-       --error_format=gcc \
-       --proto_path=$(protoinc):$(SourceRoot) \
-       --plugin=&apos;protoc-gen-service=$(ProtocPluginBase)/plugin.py&apos; \
-       --service_out=lang=c#,strip_out_path=1:%(Proto3.OutBase) \
-       --csharp_out=%(CompileOptions)%(Proto3.OutBase)"
-      WorkingDirectory="%(relativedir)" />    
-      
-    <!-- <Exec Command="$(protoc_rename) %(Proto3.OutBase)"  />    -->
-            
-    <ItemGroup>
-       <Compile Include="%(Proto3.OutCS)" />
-       <Compile Include="%(Proto3.OutCSClient)" />
-       <Compile Include="%(Proto3.OutCSServer)" />
-       <Compile Include="%(Proto3.OutCSImmutable)" />
-    </ItemGroup>
-</Target>
-
-<!-- <Target Name="RenameProto3Linux" AfterTargets="CompileProto3Linux"
-   Condition="'@(Proto3)'!='' AND '$(OS)' != 'Windows_NT' ">
-   <Move SourceFiles="$(OutBase)\Apicore.cs" DestinationFiles="$(OutBase)\apicore.cs" />  
-   <Move SourceFiles="$(OutBase)\Apioptions.cs" DestinationFiles="$(OutBase)\apioptions.cs" />  
-   <Move SourceFiles="$(OutBase)\Co2.cs" DestinationFiles="$(OutBase)\co2.cs" />  
-</Target> -->
-
-
 <Target Name="AfterClean" AfterTargets="Clean">
     <Delete Files="%(Proto3.OutCS)" />
     <Delete Files="%(Proto3.OutCSClient)" />
     <Delete Files="%(Proto3.OutCSServer)" />
     <Delete Files="%(Proto3.OutCSImmutable)" />
-    <Delete Files="$(GenDir)/proto2/*" />
+    <Delete Files="$(GenDir)\proto2\*" />
     <Delete Files="%(Proto3Excel.OutCSExcel)" />
 </Target>
 

src/client/build_spark_dotnetcore.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-#$1 = Debug / Release (CMAKE_BUILD_TYPE), $2 = CMAKE_BINARY_DIR
-cd "$(dirname "$0")"
-echo $PWD dotnet build -c $1 ./sparkcmd/
-dotnet build -c $1 -o $2/../$1/bin/netcoreapp3.0/linux-x64 ./sparkcmd/ 
-
-if [ "$1" == "Release" ]
-then
-   dotnet publish -c $1 -o $2/../$1/bin/netcoreapp3.0/linux-x64 ./sparkcmd/ 
-   ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64/publish
-fi
-
-ln -fs $2/src/lib/libspark.so $2/../$1/bin/netcoreapp3.0/linux-x64

src/client/spark/Admin/AdminModel.cs

@@ -25,7 +25,7 @@ namespace mbts.spark {
                usr.UserData.AccountPermissions.AccountPermissions
                   .Where(kv => (kv.Value.TradingPermission != null && kv.Value.TradingPermission.HasPermissions) || kv.Value.AdminPermission.HasPermissions)
                   .Select(kv => ad.Accounts.Where(a => a.Id == kv.Key).TryGetSingle(out var acc) ? acc : (BTSAccountImmutable?)null)
-                  .Where(acc => acc.HasValue && acc.Value.IsPresent)
+                  .Where(acc => acc.HasValue)
                   .Select(acc => acc.Value)
                   .ToDictionary(acc => acc.Id, acc => acc.Name) :
                new Dictionary<uint, string>(0))

src/client/spark/App.xaml.cs

@@ -136,11 +136,8 @@ namespace mbts.ui.shell
          try {            
             if (argv.Contains("-multiple") || _mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) 
             {
-               if(_mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) {
-                  if (!argv.Contains("-nostunnel")) {
-                     init_stunnel(argv);
-                  }
-               }
+               if(_mutex == null || _mutex.WaitOne(TimeSpan.Zero, true))
+                  init_stunnel(argv);
                return base.Run();
             }
             else {

src/client/spark/Daemons/DeleteSyntheticDaemon.cs

@@ -4,112 +4,43 @@ using mbts;
 using mbts.spark;
 using mbts.ui;
 using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Threading;
-using System.Windows;
 
 namespace bts {
    [Export, Export(typeof(IShellDaemon))]
    class DeleteSyntheticDaemon : IShellDaemon, IDisposable {
-      // request_id is noted in the series of log messages that occur during a particular delete op.
-      static int _request_id = 1;
-
       readonly OrdersModel _orders_model;
       readonly ErrorReporter _error_reporter;
-      IReadOnlyDictionary<uint, ExecutionStrategyImmutable> _strategy_map =
-         DictionaryHelper.empty<uint, ExecutionStrategyImmutable>();
-
       IDisposable _dispose;
 
       [ImportingConstructor]
       public DeleteSyntheticDaemon(IBus bus, OrdersModel orders_model, ErrorReporter error_reporter) {
          _orders_model = orders_model;
          _error_reporter = error_reporter;
-         _dispose = Disposable.Create(
-            bus.subscribe(SparkTags.SyntheticDeleteTag).Subscribe(_delete_synthetic),
-            orders_model.spreader.strategy.Subscribe(map => _strategy_map = map));
+         _dispose = bus.subscribe(SparkTags.SyntheticDeleteTag)
+            .OnDispatcher()
+            .Subscribe(_delete_synthetic);
       }
 
       public void Dispose() =>
          Disposable.dispose(ref _dispose);
 
-      async void _delete_synthetic(IImmutableSet<uint> keys) {
-         var log = new LoggerContext(Log.Ui, $"Synthetic Delete Req {unchecked(Interlocked.Increment(ref _request_id))} - ", null);
-         if (keys.is_null_or_empty()) {
-            log.warn("received empty delete request (no securities specified).");
-            return;
-         }
-         log.info($"received request to delete the following {keys.Count} securities: {string.Join(", ", keys)}");
-         var (orders, orders_success) = await _orders_model.security_order_groups.FirstAsyncTask(SparkUtils.DefaultTimeOut);
+      async void _delete_synthetic(uint id) {
+         var (orders, orders_success) = await _orders_model.on_orders.FirstAsyncTask(SparkUtils.DefaultTimeOut);
          if (!orders_success) {
-            var msg = "Unable to delete synthetic securities: " +
-               $"timed out waiting for orders table (must verify that a synthetic security does not have any working orders before it can be deleted).";
-            _error_reporter.report_error(msg);
-            log.warn(msg);
+            _error_reporter.report_error($"Unable to delete synthetic security ({id}): unable to determine whether or not security ({id}) has working orders (deletion is not permitted while there are working orders).");
+            Log.Ui.warn($"Ignoring request to delete synthetic security ({id}) because the orders lookup timed out (must confirm no working orders).");
+         } else if (orders.state.Values.Any(o => o.order.Def.SecurityKey == id && o.order.is_non_terminal())) {
+            Log.Ui.warn($"Ignoring request to delete synthetic security ({id}) because non-terminal-orders were detected.");
          } else {
-            var working_orders = new List<uint>();
-            var missing_strategies = new List<uint>();
-            var items = new List<(uint key, ExecutionStrategyImmutable strategy)>();
-            var temp_strats = _strategy_map;
-            foreach (var k in keys) {
-               if (orders.state.TryGetValue(k, out var sec_group) && sec_group.table.state.Values.Any(tup => tup.order.is_active())) {
-                  working_orders.Add(k);
-               } else if (!temp_strats.TryGetValue(k, out var strat)) {
-                  missing_strategies.Add(k);
-               } else {
-                  items.Add((k, strat.with(deleted: true)));
-               }
+            ExecutionStrategyImmutable? strategy = await _orders_model.spreader.lookup_strategy_async(id);
+            if (strategy.HasValue) {
+               ExecutionStrategyImmutable deleted_strategy = strategy.Value.with(deleted: true);
+               await _orders_model.spreader.save_strategy(id, deleted_strategy);
             }
-            var lines = new List<string>();
-            if (working_orders.Count > 0) {
-               lines.Add($"skipping {working_orders.Count} securities because they have working orders.");
-            }
-            if (missing_strategies.Count > 0) {
-               lines.Add($"skipping {missing_strategies.Count} securities because their execution strategies were not discovered.");
-            }
-            if (lines.Count > 0)
-               log.warn(string.Join("; ", lines));
-            var errors = await _orders_model.spreader.save_strategies(items);
-            int error_count = errors.Count(e => !string.IsNullOrEmpty(e));
-            log.info($"{items.Count - error_count}/{items.Count} attempted deletes were successful (skipped {working_orders.Count + missing_strategies.Count}).");
-            // display results to user
-            const string dialog_title = "Synthetic Deletion";
-            string display_msg;
-            MessageBoxImage icon = MessageBoxImage.None;
-            if (keys.Count > 1) {
-               if (error_count == 0 && working_orders.Count == 0 && missing_strategies.Count == 0) {
-                  display_msg = $"Synthetic securities have been deleted.";
-                  icon = MessageBoxImage.Information;
-               } else {
-                  display_msg = $"{keys.Count - error_count - working_orders.Count - missing_strategies.Count}/{keys.Count} securities were successfully deleted.";
-                  icon = MessageBoxImage.Error;
-               }
-            } else {
-               if (error_count == 0 && working_orders.Count == 0 && missing_strategies.Count == 0) {
-                  display_msg = "Synthetic security has been deleted.";
-                  icon = MessageBoxImage.Information;
-               } else {
-                  string reason;
-                  if (error_count > 0) {
-                     reason = errors[0];
-                  } else if (missing_strategies.Count > 0) {
-                     reason = "did not find execution strategy.";
-                  } else if (working_orders.Count > 0) {
-                     reason = "working orders detected.";
-                  } else {
-                     // unexpected code path
-                     reason = "unknown error.";
-                  }
-                  icon = MessageBoxImage.Error;
-                  display_msg = $"Unable to delete synthetic security: " + reason;
-               }
-            }
-            BTSMessageBox.Show(display_msg, dialog_title, BTSMessageBoxButtons.OK, icon);
          }
       }
    }
-}
+}

src/client/spark/Daemons/ErrorReporter.cs

@@ -1,15 +1,12 @@
 using bts.api;
 using bts.api.core;
 using bts.support;
-using bts.utils;
 using mbts;
 using mbts.spark;
 using mbts.ui;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
@@ -167,45 +164,5 @@ namespace bts.spark {
          void _report_error(string msg) =>
             error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning);
       }
-
-      public static async Task<(TResult result, string error_msg)[]> safe_execute_batch<T, TResult>(
-         this ErrorReporter error_reporter,
-         IEnumerable<Task<T>> execute,
-         Func<T, (TResult result, string error_msg)> result_selector,
-         string desc,
-         string title) {
-         //
-         try {
-            var results = await Task.WhenAll(execute as Task<T>[] ?? ArrayHelper.clone_optimized(execute));
-            var result_values = new (TResult, string)[results.Length];
-            StringBuilder error_bd = null;
-            for (int i = 0; i < results.Length; i++) {
-               var r = results[i];
-               var (result, error) = result_selector(r);
-               if (!string.IsNullOrEmpty(error)) {
-                  if (error_bd == null) {
-                     error_bd = new StringBuilder();
-                  } else {
-                     error_bd.AppendLine();
-                  }
-                  error_bd.Append(error);
-               }
-               result_values[i] = (result, error);
-            }
-            if (error_bd != null) {
-               var error_msg = error_bd.ToString();
-               if (!string.IsNullOrEmpty(error_msg))
-                  _report_error(error_msg);
-            }
-            return result_values;
-         }
-         catch (Exception ex) {
-            _report_error(ex.ToString());
-         }
-         return null;
-         //
-         void _report_error(string msg) =>
-            error_reporter.report_error($"Error {desc}: {msg}", title, MessageBoxImage.Warning);
-      }
    }
-}
+}

src/client/spark/Daemons/MDDaemon.cs

@@ -39,7 +39,7 @@ namespace bts {
          _relay.set_token(_token.Value);
          _dispose.Add(
             _ss.Value.subscribei_metadata()
-            .Select(upd => upd.all.Where(i => i.HasStrategy).ToDictionary(i => i.SecurityKey, i => i.Strategy))
+            .Select(upd => upd.all.ToDictionary(i => i.SecurityKey, i => i.Strategy))
             .Subscribe(t => {
                var deleted_synthetic_keys = new HashSet<uint>(t.Where(kv => kv.Value.Deleted).Select(kv => kv.Key));
                // add back 'undeleted' synthetics
@@ -64,4 +64,4 @@ namespace bts {
          Task.Run(run);
       }
    }
-}
+}

src/client/spark/Images/Icons.cs

@@ -1,5 +1,4 @@
 using bts;
-using mbts.ui.dpi;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -41,6 +40,7 @@ namespace mbts.ui {
          EditDocumentAltGeometryKey = nameof(EditDocumentAltGeometryKey),
          EditDocumentGeometryKey = nameof(EditDocumentGeometryKey),
          GearGeometryKey = nameof(GearGeometryKey),
+         HamburgerMenuGeometryKey = nameof(HamburgerMenuGeometryKey),
          HornGeometryKey = nameof(HornGeometryKey),
          KeyGeometryKey = nameof(KeyGeometryKey),
          LetterAKey = nameof(LetterAKey),
@@ -56,9 +56,7 @@ namespace mbts.ui {
          StarGeometryKey = nameof(StarGeometryKey),
          ToolsGeometryKey = nameof(ToolsGeometryKey),
          TrashGeometryKey = nameof(TrashGeometryKey),
-         UndoCircularGeometryKey = nameof(UndoCircularGeometryKey),
-         WarningExclamationGeometryKey = nameof(WarningExclamationGeometryKey),
-         WarningGeometryKey = nameof(WarningGeometryKey);
+         UndoCircularGeometryKey = nameof(UndoCircularGeometryKey);
 
       public static Geometry PlayGeometry => Geometry.Parse(get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
 
@@ -175,6 +173,7 @@ namespace mbts.ui {
       public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } }
       public static ImageSource FilterError { get { return load_resource_and_freeze("FilterError"); } }
       public static ImageSource Gear => create_icon(GearGeometryKey);
+      public static ImageSource HamburgerMenu => create_icon(HamburgerMenuGeometryKey);
       public static ImageSource Horn => create_icon(HornGeometryKey);
       public static ImageSource Import => load_resource_and_freeze("Import");
       public static ImageSource Key => create_icon(KeyGeometryKey);
@@ -193,8 +192,6 @@ namespace mbts.ui {
       public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } }
       public static ImageSource Tools => create_icon(ToolsGeometryKey);
       public static ImageSource Trash => create_icon(TrashGeometryKey);
-      public static ImageSource Warning => create_icon(WarningGeometryKey, Brushes.IndianRed);
-      public static ImageSource WarningExclamation => create_icon(WarningExclamationGeometryKey, Brushes.IndianRed);
       public static ImageSource UndoCircular => create_icon(UndoCircularGeometryKey);
       public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings");
       public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } }

src/client/spark/Images/Vector/Icons.xaml

@@ -272,6 +272,10 @@
     M16.000015,9.6000061C12.500012,9.6000061 9.5999844,12.5 9.5999844,16 9.5999844,19.5 12.500012,22.399994 16.000015,22.399994 19.500019,22.399994 22.400015,19.5 22.400015,16 22.400015,12.5 19.500019,9.6000061 16.000015,9.6000061z M14.199995,0L17.800005,0C18.199999,0,18.599993,0.29998779,18.599993,0.79998779L18.599993,4.7999878C19.900013,5.1000061,21.000019,5.6000061,22.099997,6.2999878L25.000023,3.3999939C25.099999,3.2999878 25.300011,3.1999817 25.500025,3.1999817 25.700007,3.1999817 25.900019,3.2999878 26.000025,3.3999939L28.600033,6C28.900021,6.2999878,28.900021,6.7999878,28.600033,7.1000061L25.700007,10C26.400019,11.100006,26.900019,12.299988,27.200007,13.5L31.20001,13.5C31.600037,13.5,31.999998,13.799988,31.999998,14.299988L31.999998,17.899994C31.999998,18.299988,31.700012,18.699982,31.20001,18.699982L27.200007,18.699982C26.900019,20,26.400019,21.100006,25.700007,22.199982L28.600033,25.100006C28.700009,25.199982 28.799984,25.399994 28.799984,25.600006 28.799984,25.799988 28.700009,26 28.600033,26.100006L26.000025,28.600006C25.900019,28.699982 25.700007,28.799988 25.500025,28.799988 25.300011,28.799988 25.099999,28.699982 25.000023,28.600006L22.099997,25.699982C21.000019,26.399994,19.800007,26.899994,18.599993,27.199982L18.599993,31.199982C18.599993,31.600006,18.300005,32,17.800005,32L14.199995,32C13.8,32,13.400006,31.699982,13.400006,31.199982L13.400006,27.199982C12.099987,26.899994,11.000011,26.399994,9.9000027,25.699982L7.0000064,28.600006C6.9000003,28.699982 6.6999881,28.799988 6.5000059,28.799988 6.2999937,28.799988 6.099981,28.699982 6.0000054,28.600006L3.3999967,26C3.0999784,25.699982,3.0999784,25.199982,3.3999967,24.899994L6.2999937,22C5.5999805,20.899994,5.0999801,19.699982,4.7999923,18.5L0.79998828,18.5C0.39999409,18.5,-1.933513E-07,18.199982,0,17.699982L0,14.100006C-1.933513E-07,13.699982,0.2999879,13.299988,0.79998828,13.299988L4.7999923,13.299988C5.0999801,12,5.5999805,10.899994,6.2999937,9.7999878L3.3999967,7C3.2999908,6.8999939 3.1999845,6.6999817 3.1999845,6.5 3.1999845,6.2999878 3.2999908,6.1000061 3.3999967,6L6.0000054,3.3999939C6.099981,3.2999878 6.2999937,3.1999817 6.5000059,3.1999817 6.6999881,3.1999817 6.9000003,3.2999878 7.0000064,3.3999939L9.9000027,6.2999878C11.000011,5.6000061,12.199993,5.1000061,13.400006,4.7999878L13.400006,0.79998779C13.400006,0.29998779,13.8,0,14.199995,0z
   </sys:String>
 
+  <sys:String x:Key="{x:Static mbts:Icons.HamburgerMenuGeometryKey}">
+    M2.384186E-06,24L32.000004,24 32.000004,26 2.384186E-06,26z M0,11.999998L32,11.999998 32,13.999998 0,13.999998z M2.384186E-06,0L32.000004,0 32.000004,2 2.384186E-06,2z
+  </sys:String>
+
   <sys:String x:Key="{x:Static mbts:Icons.HornGeometryKey}">
     M4.0499969,7.0870913C2.9519978,7.0870913 2.0249984,8.4780906 2.0249987,10.125091 2.0249984,11.771091 2.9519978,13.162091 4.0499969,13.162091 5.1479961,13.162091 6.0749954,11.771091 6.0749955,10.125091 6.0749954,8.4780906 5.1479961,7.0870913 4.0499969,7.0870913z M29.975016,3.316155C23.883831,8.2016557,11.829888,8.9691842,8.1184387,9.0896781L8.0151367,9.0928462 8.0175586,9.1059306C8.0716033,9.4352315 8.0999939,9.7760909 8.0999942,10.125091 8.0999939,10.473966 8.0716033,10.814716 8.0175586,11.143921L8.0098858,11.185364 8.193316,11.195448C12.163719,11.420399,23.994581,12.458921,29.975016,17.005057z M31.176758,0.00019051835C31.280359,-0.0022594665 31.391857,0.01889403 31.514975,0.065146674 31.908983,0.21413228 31.999985,0.59114302 31.999985,1.0121596L31.999985,19.236969C31.999985,19.653958 31.913988,20.028956 31.525991,20.179955 31.405998,20.226952 31.450981,20.250023 31.32699,20.250023 31.050991,20.250023 30.778992,20.13601 30.583986,19.925928 25.229074,14.140572 9.6001122,13.269665 7.2865356,13.172559L7.2813506,13.172345 7.1739591,13.343056C6.4304952,14.468533 5.3060585,15.187091 4.0499969,15.187091 1.8169985,15.187091 0,12.916091 0,10.125091 0,7.3330911 1.8169985,5.0620912 4.0499969,5.0620912 5.3060585,5.0620912 6.4304952,5.78065 7.1739591,6.9063042L7.2852713,7.0832756 7.3087114,7.0828188C9.6077337,7.036146 25.141474,6.4939421 30.567997,0.34315929 30.75913,0.12521249 30.948835,0.005580858 31.176758,0.00019051835z
   </sys:String>
@@ -363,18 +367,6 @@
 			c-84.15,0-153-68.85-153-153h-51c0,112.2,91.8,204,204,204s204-91.8,204-204S360.825,89.25,248.625,89.25z
   </sys:String>
 
-  <sys:String x:Key="{x:Static mbts:Icons.WarningExclamationGeometryKey}">
-    M15.998999,17.988002C16.551,17.988002 16.999,18.437009 16.999,18.990018 16.999,19.543027 16.551,19.992034 15.998999,19.992034 15.446999,19.992034 14.998999,19.543027 14.998999,18.990018 14.998999,18.437009 15.446999,17.988002 15.998999,17.988002z
-    M15.998999,8.0630169C16.552,8.0630169,16.999,8.5110159,16.999,9.0650149L16.999,16.167001C16.999,16.721 16.552,17.168998 15.998999,17.168998 15.446,17.168998 14.998999,16.721 14.998999,16.167001L14.998999,9.0650149C14.998999,8.5110159,15.446,8.0630169,15.998999,8.0630169z
-  </sys:String>
-
-  <sys:String x:Key="{x:Static mbts:Icons.WarningGeometryKey}">
-    M15.998999,17.988002C16.551,17.988002 16.999,18.437009 16.999,18.990018 16.999,19.543027 16.551,19.992034 15.998999,19.992034 15.446999,19.992034 14.998999,19.543027 14.998999,18.990018 14.998999,18.437009 15.446999,17.988002 15.998999,17.988002z
-    M15.998999,8.0630169C16.552,8.0630169,16.999,8.5110159,16.999,9.0650149L16.999,16.167001C16.999,16.721 16.552,17.168998 15.998999,17.168998 15.446,17.168998 14.998999,16.721 14.998999,16.167001L14.998999,9.0650149C14.998999,8.5110159,15.446,8.0630169,15.998999,8.0630169z
-    M15.999277,2.3337629L2.3830507,22.996989 29.615442,22.996989z
-    M15.999513,0C16.50052,-3.8678991E-07,17.001274,0.21826346,17.288297,0.65479128L31.74151,22.585975C32.057495,23.064982 32.084472,23.677966 31.812494,24.184989 31.541494,24.687009 31.02049,24.999999 30.450475,24.999999L1.5480773,24.999999C0.97903845,24.999999 0.45705819,24.687009 0.18703459,24.184989 -0.085979476,23.677966 -0.057963934,23.064982 0.25704309,22.585975L14.709219,0.65479128C14.997247,0.21826346,15.498506,-3.8678991E-07,15.999513,0z
-  </sys:String>
-
   <!--
  'y' for equilateral triangle of side length x:
   (x/2)^2 + Y^2 = x^2

src/client/spark/Modules/Market/MarketView/MarketViewCell.cs

@@ -0,0 +1,13 @@
+using mbts.spark;
+
+namespace mbts.ui.spark {
+   readonly struct MarketViewCell {
+      public readonly MarketViewVM.Row row;
+      public readonly MarketViewView.Columns column;
+
+      public MarketViewCell(MarketViewVM.Row row, MarketViewView.Columns column) {
+         this.row = row;
+         this.column = column;
+      }
+   }
+}

src/client/spark/Modules/Market/MarketView/MarketViewRow.cs

@@ -5,6 +5,7 @@ using mbts.co2;
 using mbts.spark.utilities;
 using mbts.ui;
 using mbts.ui.controls;
+using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
@@ -18,7 +19,7 @@ using System.Windows.Input;
 
 namespace mbts.spark {
    partial class MarketViewVM {
-      public class Row : SecurityMDRow, IDisposable, IEquatable<Row>, DIYGrid.IRowVM, DIYGrid.IActionableRowVM {
+      public class Row : DisposableViewModelBase, ISecurityMDRow, IEquatable<Row>, DIYGrid.IRowVM, DIYGrid.IActionableRowVM {
          readonly IBus _bus;
          readonly OrdersModel _orders_model;
          readonly AnimationManager _animation = new AnimationManager();
@@ -40,9 +41,11 @@ namespace mbts.spark {
          double _raw_day_position;
          string _bid_merged_size_text, _ask_merged_size_text;
          ulong _bbo_ref, _last_ref;
+         bool _is_visible;
 
-         public Row(IBus bus, SecurityMD smd, OrdersModel orders_model) : base(smd) {
+         public Row(IBus bus, SecurityMD smd, OrdersModel orders_model) {
             _bus = bus;
+            security_md = smd;
             _orders_model = orders_model;
             _security_text = smd.security.ToString();
             _security_key_text = security_key.ToString();
@@ -105,6 +108,16 @@ namespace mbts.spark {
 
          public event Action invalidated;
 
+         public SecurityMD security_md { get; }
+         public SecurityImmutable security => security_md.security;
+         public uint security_key => security_md.security.Id;
+         SecurityMD ISecurityMDRow.md => security_md;
+
+         public bool is_visible {
+            get => _is_visible;
+            set => Set(ref _is_visible, value);
+         }
+
          #region Bound Properties
          public bool inside_bids => _inside_bids.value;
          public bool inside_asks => _inside_asks.value;
@@ -158,29 +171,30 @@ namespace mbts.spark {
          public IReadOnlyList<DIYGrid.IGridCellStore> cell_stores => new DIYGrid.IGridCellStore[0];
          #endregion
 
+         MDConsumerHandle _md => security_md.md;
+
          public void raise_invalidated() => invalidated?.Invoke();
 
          public void refresh() {
             bool dirty = false;
-            if (md.md.get_bbo(ref _bbo_ref, out NativePriceSize b, out NativePriceSize a)) {
+            if (_md.get_bbo(ref _bbo_ref, out NativePriceSize b, out NativePriceSize a)) {
                _bid_price.set(b.price);
                refresh_size(ref b, _bid_direct_size, _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text));
                _ask_price.set(a.price);
                refresh_size(ref a, _ask_direct_size, _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text));
-               _inside_bids.on_next_distinct(_bid_price.Value >= _working_best_bid.value, ref dirty);
-               _inside_asks.on_next_distinct(_ask_price.Value <= _working_best_ask.value, ref dirty);
+               _refresh_inside_working_orers(ref dirty);
             }
-            if (md.md.get_last_trade(ref _last_ref, out NativePriceSize ps, out DateTime ts, out ulong v, out bool from_spread)) {               
+            if (_md.get_last_trade(ref _last_ref, out NativePriceSize ps, out DateTime ts, out ulong v, out bool from_spread)) {               
                _last_price.set(ps.price);
                _last_price_from_spread.set(from_spread);
                _last_size.on_next_distinct(ps.size, ref dirty);
                _volume.on_next_distinct(v, ref dirty);
             }
-            dirty |= _settlement.set_new(md.md.settlement_price);
-            dirty |= _session_low.set_new(md.md.session_low);
-            dirty |= _session_high.set_new(md.md.session_high);
-            dirty |= _day_change.set_new(last_price - settlement);
-            _volume.on_next_distinct(md.md.total_volume, ref dirty);
+            dirty |=
+               _settlement.set_new(_md.settlement_price) |
+               _session_low.set_new(_md.session_low) |
+               _session_high.set_new(_md.session_high) |
+               _day_change.set_new(last_price - settlement);
             if (dirty)
                invalidated?.Invoke();
 
@@ -206,7 +220,7 @@ namespace mbts.spark {
             security_key.GetHashCode();
 
          #region Show Windows
-         void _show_ladder() => _bus.post(SparkTags.ShowLadderTag, md);
+         void _show_ladder() => _bus.post(SparkTags.ShowLadderTag, security_md);
 
          void _show_order_book(MarketViewView.Columns col) {
             switch (col) {
@@ -280,9 +294,7 @@ namespace mbts.spark {
             _working_ask_volume.on_next_distinct(_order_summarizer.working_ask_qty, ref dirty);
             _working_best_bid.on_next_distinct(_order_summarizer.best_working_bid, ref dirty);
             _working_best_ask.on_next_distinct(_order_summarizer.best_working_ask, ref dirty);
-            _inside_bids.on_next_distinct(_order_summarizer.best_working_bid >= bid_price, ref dirty);
-            _inside_asks.on_next_distinct(_order_summarizer.best_working_ask <= ask_price, ref dirty);
-
+            _refresh_inside_working_orers(ref dirty);
             RaisePropertyChanged(
                // Implied might not be ever set, so it probably does not RaisePropertyChanged either
                // This might be part of the filter funk?
@@ -292,6 +304,11 @@ namespace mbts.spark {
                nameof(working_asks_text)
             );
          }
+
+         void _refresh_inside_working_orers(ref bool dirty) {
+            _inside_bids.on_next_distinct(!double.IsNaN(working_best_bid) && OrderDataHelper.PriceComparer.Compare(working_best_bid, bid_price) >= 0, ref dirty);
+            _inside_asks.on_next_distinct(!double.IsNaN(working_best_ask) && OrderDataHelper.PriceComparer.Compare(working_best_ask, ask_price) <= 0, ref dirty);
+         }
          #endregion
 
          class MyOrderSummarizer {
@@ -367,4 +384,4 @@ namespace mbts.spark {
          }
       }
    }
-}
+}

src/client/spark/Modules/Market/MarketView/MarketViewVM.cs

@@ -1,15 +1,29 @@
+using bts;
 using bts.api;
+using bts.api.core;
+using bts.api.orderman;
 using bts.collections;
 using bts.utils;
 using mbts.persist;
 using mbts.spark.filters;
 using mbts.ui;
+using mbts.ui.controls;
+using mbts.ui.converters;
 using mbts.ui.settings;
+using mbts.ui.shell;
 using mbts.ui.utility;
+using mbts.utils;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
 using System.Reactive.Linq;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 using static bts.shell.MarketViewWindowFactory;
@@ -17,21 +31,56 @@ using static mbts.ui.controls.DIYGrid;
 using static mbts.ui.spark.MarketViewView;
 
 namespace mbts.spark {
-   partial class MarketViewVM : SecurityMDGrid<MarketViewVM.Row, SecurityMD> {
+   partial class MarketViewVM : DisposableViewModelBase, IHandleRowSelection {
+   /// <summary>
+   /// Viewmodel class designed for <see cref="ui.spark.MarketViewView"/>
+   /// </summary>
+      static readonly IReadOnlyList<Func<MarketViewVM, IDataGridColumnFilter<Row>>> _filter_getters =
+         ObjectSnapshot.property_delegates_of_type<MarketViewVM, IDataGridColumnFilter<Row>>().ToReadOnlyList();
+
+      static readonly IComparer<SecurityMD> _sec_md_key_comparer = Comparer<uint>.Default.wrap(SecurityMD.key_fn);
+      static readonly IComparer<Row> _row_key_comparer = _sec_md_key_comparer.wrap<SecurityMD, Row>(r => r.security_md);
+
       readonly IBus _bus;
       readonly OrdersModel _orders_model;
-      IWindowSettingsManager<GridSettings> _settings_manager;
+      readonly ObservableCollection<Row> _rows = new ObservableCollection<Row>();
+      readonly IList<SecurityMD> _wrapped_rows;
+      readonly ListCollectionView _rows_view;
+      readonly Dictionary<uint, Row> _cache = new Dictionary<uint, Row>();
+      readonly Property<Row> _current_row;
+      readonly DeferrableActionWrapper _refresh_filter;
+      Func<Row, bool> _filter;
+      IReadOnlyList<(Columns key, ListSortDirection direction)> _sorting_hierarchy;
+      Color _selection_highlight;
 
-      public MarketViewVM(IBus bus, OrdersModel orders_model, IObservable<StartupData> state, IWindowSettingsManager<GridSettings> settings_manager )
-         : this(bus, orders_model, state, state.SelectManyInSeries(s => s.security_criteria.subscribe_md(bus)), settings_manager) { }
-
-      // securities_connectable should NOT be connected already.
-      MarketViewVM(IBus bus, OrdersModel orders_model, IObservable<StartupData> state, IObservable<IEnumerable<SecurityMD>> securities_source, IWindowSettingsManager<GridSettings> settings_manager)
-         : base(RXCollection.Create(securities_source, SecurityDataHelper.EqualityComparer.MDComparer), null) {
+      /// <summary>
+      /// Initializes an instance of the <see cref="ui.spark.MarketViewView"/> class.
+      /// </summary>
+      /// <param name="bus"></param>
+      /// <param name="orders_model"></param>
+      /// <param name="security_mds_source"></param>
+      /// <param name="use_mouse_state_transitions">Indicates whether or not hyperlink cells should use visual states to animate mouse over (seems to be slower than style triggers, should investigate to be certain).</param>
+      public MarketViewVM(
+         IBus bus,
+         OrdersModel orders_model,
+         IObservable<TableUpdate<SecurityMD, uint>> security_mds_source,
+         bool use_mouse_state_transitions = false) {
          _bus = bus;
          _orders_model = orders_model;
          security_filter = new RegexFilterVM<Row>(r => r.security.ToString(), nameof(Row.security));
-         _settings_manager = settings_manager;
+         comparer = DIYGridSortHelper.build_comparer(sorting_hierarchy, get_column_comparer, Columns.SecurityKey);
+         // rows
+         _wrapped_rows = _rows.WrapSelector(r => r.security_md, s => {
+            var r = new Row(_bus, s, _orders_model);
+            r.is_visible = _filter == null || _filter(r);
+            return r;
+         });
+         _current_row = backing<Row>(nameof(current_row));
+         _rows_view = new ListCollectionView(_rows) {
+            Filter = obj => obj is Row r && r.is_visible,
+            IsLiveFiltering = true
+         };
+         _rows_view.LiveFilteringProperties.Add(nameof(Row.is_visible));
          // Columns
          const string merged_size_col_header = "Qty", direct_size_col_header = "Direct", implied_size_col_header = "Implied", working_col_header = "Working";
          const double working_orders_col_width = 105;
@@ -39,24 +88,37 @@ namespace mbts.spark {
          add_col(Columns.Security, "Security", r => r.security.ToString(), nameof(Row.security), DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex);
          add_col(Columns.Volume, "Volume", r => r.volume.ToString(), nameof(Row.volume), DefaultColumnWidths.Volume, volume_filter, DataGridFilterKnownTemplates.ULongMinMax);
          add_col(Columns.LastSpd, "Spd", r => r.last_price_from_spread ? "S" : "", nameof(Row.last_price_from_spread), DefaultColumnWidths.Side, last_price_from_spread_filter, DataGridFilterKnownTemplates.Regex);
-         add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax);         
-         add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.RawDayPosition, "Raw Day Pos", r => SparkUtils.fmt_position(r.raw_day_position), nameof(Row.raw_day_position), DefaultColumnWidths.Size, raw_day_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_working_orders_col(Columns.WorkingBids, working_col_header, nameof(Row.working_bids_text), nameof(Row.working_best_bid), nameof(Row.working_bids_click), working_bid_volume_filter, BTSColors.MarketData.bid, System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_merged_size_col(Columns.BidMergedSize, merged_size_col_header, nameof(Row.bid_merged_size), nameof(Row.bid_merged_size_text), nameof(Row.bid_merged_size_click), bid_merged_size_filter, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), nameof(Row.bid_price_click), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), nameof(Row.ask_price_click), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_merged_size_col(Columns.AskMergedSize, merged_size_col_header, nameof(Row.ask_merged_size), nameof(Row.ask_merged_size_text), nameof(Row.ask_merged_size_click), ask_merged_size_filter, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_hl_working_orders_col(Columns.WorkingAsks, working_col_header, nameof(Row.working_asks_text), nameof(Row.working_best_ask), nameof(Row.working_asks_click), working_ask_volume_filter, BTSColors.MarketData.ask, System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.Settlement, "Settlement", r => r.format_price(r.settlement), nameof(Row.settlement), DefaultColumnWidths.Settlement, settlement_filter, DataGridFilterKnownTemplates.DoubleMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.DayChange, "Change", r => r.format_price(r.day_change), nameof(Row.day_change), DefaultColumnWidths.Price, day_change_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.SessionLow, "Low", r => r.format_price(r.session_low), nameof(Row.session_low), DefaultColumnWidths.Price, session_low_filter, DataGridFilterKnownTemplates.DoubleMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
-         add_col(Columns.SessionHigh, "High", r => r.format_price(r.session_high), nameof(Row.session_high), DefaultColumnWidths.Price, session_high_filter, DataGridFilterKnownTemplates.DoubleMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
+         add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax);
+         add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax);
+         add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax);
+         add_col(Columns.RawDayPosition, "Raw Day Pos", r => SparkUtils.fmt_position(r.raw_day_position), nameof(Row.raw_day_position), DefaultColumnWidths.Size, raw_day_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, true);
+         add_hl_working_orders_col(
+            Columns.WorkingBids,
+            working_col_header,
+            nameof(Row.working_bids_text),
+            nameof(Row.working_best_bid),
+            working_bid_volume_filter,
+            BTSColors.MarketData.bid);
+         add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid);
+         add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid);
+
+         add_hl_merged_size_col(Columns.BidMergedSize, nameof(Row.bid_merged_size), nameof(Row.bid_merged_size_text), bid_merged_size_filter, BTSColors.MarketData.bid);
+         add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid);
+         add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask);
+         add_hl_merged_size_col(Columns.AskMergedSize, nameof(Row.ask_merged_size), nameof(Row.ask_merged_size_text), ask_merged_size_filter, BTSColors.MarketData.ask);
+         add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask);
+         add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask);
+         add_hl_working_orders_col(
+            Columns.WorkingAsks,
+            working_col_header,
+            nameof(Row.working_asks_text),
+            nameof(Row.working_best_ask),
+            working_ask_volume_filter,
+            BTSColors.MarketData.ask);
+         add_col(Columns.Settlement, "Settlement", r => r.format_price(r.settlement), nameof(Row.settlement), DefaultColumnWidths.Settlement, settlement_filter, DataGridFilterKnownTemplates.DoubleMinMax);
+         add_col(Columns.DayChange, "Change", r => r.format_price(r.day_change), nameof(Row.day_change), DefaultColumnWidths.Price, day_change_filter, DataGridFilterKnownTemplates.DoubleMinMax, true);
+         add_col(Columns.SessionLow, "Low", r => r.format_price(r.session_low), nameof(Row.session_low), DefaultColumnWidths.Price, session_low_filter, DataGridFilterKnownTemplates.DoubleMinMax);
+         add_col(Columns.SessionHigh, "High", r => r.format_price(r.session_high), nameof(Row.session_high), DefaultColumnWidths.Price, session_high_filter, DataGridFilterKnownTemplates.DoubleMinMax);
          add_col(Columns.SecurityKey, "Security Key", r => r.security_key.ToString(), nameof(Row.security_key), DefaultColumnWidths.SecurityKey, security_key_filter, DataGridFilterKnownTemplates.Regex);
 
          add_col(Columns.MarketDescription, "Market Description", r => r.security.market_description(), nameof(Row.market_description), DefaultColumnWidths.SecurityKey, market_description_filter, DataGridFilterKnownTemplates.Regex);
@@ -66,8 +128,8 @@ namespace mbts.spark {
          add_col(Columns.StripName, "Strip Name", r => r.security.strip_name(), nameof(Row.strip_name), DefaultColumnWidths.SecurityKey, strip_name_filter, DataGridFilterKnownTemplates.Regex);
          add_col(Columns.MicCode, "Mic Code", r => r.security.mic_code(), nameof(Row.mic_code), DefaultColumnWidths.SecurityKey, mic_code_filter, DataGridFilterKnownTemplates.Regex);
          //
-         void add_col(Columns col_key, string header, Func<Row, string> get_text, string prop, double width, IDataGridColumnFilter filter, string filter_template, bool is_animatable = false, Color? font_color = null, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
-            columns.Add(new RenderTextColumn<Row, Columns>(col_key, get_text, filter, filter_template) {
+         RenderTextColumn<Row> add_col(Columns col_key, string header, Func<Row, string> get_text, string prop, double width, IDataGridColumnFilter filter, string filter_template, bool is_animatable = false, Color? font_color = null, HorizontalAlignment h_alignment = HorizontalAlignment.Right) {
+            var col = new RenderTextColumn<Row, Columns>(col_key, get_text, filter, filter_template) {
                // it's necessary to have this id populated for grid settings
                id = bts.shell.MarketViewWindowFactory.col_id(col_key),
                Header = header,
@@ -76,31 +138,85 @@ namespace mbts.spark {
                padding = is_animatable ? AnimatableCellPadding : DefaultCellPadding,
                font_color_override = font_color,
                horizontal_alignment = h_alignment
-            });
+            };
+            columns.Add(col);
+            return col;
+         }
 
-         void add_hl_price_col(Columns col_key, string header, string prop, string command_prop, IDataGridColumnFilter filter, Color foreground, Color? background, System.Windows.HorizontalAlignment h_alignment) =>
-            add_hl_col(col_key, header, price_binding(prop), prop, command_prop, filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.MViewPrice, foreground, background, h_alignment);
+         void add_hl_price_col(Columns col_key, string header, string prop, IDataGridColumnFilter filter, Color foreground, Color? background) =>
+            add_hl_col(
+               col_key,
+               header,
+               price_binding(prop),
+               prop,
+               filter,
+               DataGridFilterKnownTemplates.DoubleMinMax,
+               DefaultColumnWidths.MViewPrice,
+               foreground,
+               background,
+               tooltip: _order_ticket_tooltip(col_key));
 
-         void add_hl_merged_size_col(Columns col_key, string header, string sort_prop, string text_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) =>
-            add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.ImpliedDirectMergedSize, foreground, null, h_alignment);
+         void add_hl_merged_size_col(Columns col_key, string sort_prop, string text_prop, IDataGridColumnFilter filter, Color foreground) =>
+            add_hl_col(
+               col_key,
+               merged_size_col_header,
+               new Binding(text_prop),
+               sort_prop,
+               filter,
+               DataGridFilterKnownTemplates.UIntMinMax,
+               DefaultColumnWidths.ImpliedDirectMergedSize,
+               foreground,
+               tooltip: _order_ticket_tooltip(col_key));
 
-         void add_hl_working_orders_col(Columns col_key, string header, string text_prop, string sort_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) =>
-            add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.IntMinMax, working_orders_col_width, foreground, null, h_alignment);
+         HyperlinkElementColumn<Columns> add_hl_working_orders_col(Columns col_key, string header, string text_prop, string sort_prop, IDataGridColumnFilter filter, Color foreground) =>
+            add_hl_col(
+               col_key,
+               header,
+               new Binding(text_prop),
+               sort_prop,
+               filter,
+               DataGridFilterKnownTemplates.IntMinMax,
+               working_orders_col_width,
+               foreground,
+               tooltip: $"Show {_orderbook_title(col_key).desc}");
 
-         void add_hl_col(
-            Columns col_key, string header, BindingBase binding, string prop, string command_prop,
-            IDataGridColumnFilter filter, string filter_template, double width, Color foreground, Color? background, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
-         columns.Add(new HyperlinkElementColumn<Row, Columns>(
-            col_key, binding, new Binding(command_prop), filter, filter_template) {
-            // it's necessary to have this id populated for grid settings
-            id = bts.shell.MarketViewWindowFactory.col_id(col_key),
-            Header = header,
-            sort_member_path = prop,
-            font_color_override = foreground,
-            background_color_override = background,
-            Width = DefaultColumnWidths.Price,
-            horizontal_alignment = h_alignment
-         });
+         HyperlinkElementColumn<Columns> add_hl_col(
+            Columns col_key,
+            string header,
+            BindingBase binding,
+            string prop,
+            IDataGridColumnFilter filter,
+            string filter_template,
+            double width,
+            Color? foreground = null,
+            Color? background = null,
+            HorizontalAlignment h_alignment = HorizontalAlignment.Right,
+            string tooltip = null) {
+
+            var col = new HyperlinkElementColumn<Columns>(
+               col_key, filter, filter_template) {
+               // it's necessary to have this id populated for grid settings
+               id = bts.shell.MarketViewWindowFactory.col_id(col_key),
+               Header = header,
+               sort_member_path = prop,
+               font_color_override = foreground,
+               background_color_override = background,
+               TextBinding = binding,
+               Width = DefaultColumnWidths.Price,
+               horizontal_alignment = h_alignment,
+               HyperlinkClickMode = HyperlinkCellClickMode.Anywhere
+            };
+            col.view_generated += on_view_generated;
+            columns.Add(col);
+            return col;
+            //
+            void on_view_generated(HyperlinkCell cell_view) {
+               cell_view.SetValue(ColumnKeyProperty, col_key);
+               cell_view.ToolTip = tooltip;
+               if (use_mouse_state_transitions)
+                  init_hyperlink_hover_animation(cell_view, col);
+            }
+         }
 
          BindingBase price_binding(string prop) {
             var mb = new MultiBinding { Converter = price_converter };
@@ -108,108 +224,94 @@ namespace mbts.spark {
             mb.Bindings.Add(new Binding($"{nameof(Row.security)}.{nameof(SecurityImmutable.ContractSpec)}") { Mode = BindingMode.OneWay });
             return mb;
          }
+         // row vm filter
+         // Althoguh securities are filtered at the row 'model' level (SecurityMD), the column base filters have to be applied at the row vm level,
+         // because they access market data, which is polled periodically and cached in the row vm.
+         _refresh_filter = new DeferrableActionWrapper(() => _filter_changed?.Invoke());
+         var row_filter_source = Observable.Create<Func<Row, bool>>(o => {
+            notify();
+            _filter_changed += notify;
+            return Disposable.Create(() => _filter_changed -= notify);
+            void notify() =>
+               o.OnNext(get_filter_states().build_predicate());
+         });
+         foreach (var f in _all_filters) {
+            f.filter_changed += _refresh_filter.execute;
+         }
          //
-         // make font-color immutable for Side, Size, (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells)
-         var col_settings_flags = new Dictionary<string, GridColumnSettingsFeatureFlags> {
-            { Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor },
-            { Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor},
-            { Columns.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
-            { Columns.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }
-         };
-         grid_settings_manager = new SimpleGridSettingsManager<Row>(columns, col_settings_flags, row_vms);
-         // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.)
-         grid_settings_manager.load_from(settings_manager.current_settings());
-         //
-         _resources.AddRange(
-            state.OnDispatcher().Subscribe(s => {
-               using (rows_view.DeferRefresh()) {
-                  if (s.grid != null) {
-                     // this means we are not using defaults,
-                     // Note: settings_manager in turn notifies grid_settings_manager of this update
-                     _settings_manager.instance_settings = s.grid;
-                  }
-                  if (s.filters is FilterStates filters) {
-                     security_filter.load_state(filters.security);
-                     bid_price_filter.load_state(filters.bid_price);
-                     bid_merged_size_filter.load_state(filters.bid_merged_size);
-                     bid_direct_size_filter.load_state(filters.bid_direct_size);
-                     bid_implied_size_filter.load_state(filters.bid_implied_size);
-                     ask_price_filter.load_state(filters.ask_price);
-                     ask_merged_size_filter.load_state(filters.ask_merged_size);
-                     ask_direct_size_filter.load_state(filters.ask_direct_size);
-                     ask_implied_size_filter.load_state(filters.ask_implied_size);
-                     last_price_filter.load_state(filters.last_price);
-                     last_price_from_spread_filter.load_state(filters.last_price_from_spread);
-                     last_size_filter.load_state(filters.last_size);
-                     day_change_filter.load_state(filters.day_change);
-                     settlement_filter.load_state(filters.settlement);
-                     session_low_filter.load_state(filters.session_low);
-                     session_high_filter.load_state(filters.session_high);
-                     position_filter.load_state(filters.position);
-                     raw_day_position_filter.load_state(filters.raw_day_position);
-                     working_bid_volume_filter.load_state(filters.working_bid_volume);
-                     working_ask_volume_filter.load_state(filters.working_ask_volume);
-                     volume_filter.load_state(filters.volume);
-                     security_key_filter.load_state(filters.security_key);
-                  }
-                  rows_view.set_sort_descriptions(s.sorting_criterion, columns);
-               }
-            }), DataGridFilterHelper.hook_filters(rows_view, security_filter,
-            bid_price_filter, bid_merged_size_filter, bid_direct_size_filter, bid_implied_size_filter,
-            ask_price_filter, ask_merged_size_filter, ask_direct_size_filter, ask_implied_size_filter,
-            last_price_filter, last_price_from_spread_filter, last_size_filter, day_change_filter, settlement_filter,
-            session_low_filter, session_high_filter, position_filter, raw_day_position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter),
-            settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
+         _dispose = Disposable.Create(
+            row_filter_source.Subscribe(f => {
+               // the rows are polled every 100 ms, just set the filter and let the refresh take care of the rest.
+               _filter = f;
+            }),
+            security_mds_source.Subscribe(_on_securities),
+            ObservableAutoWrapper.connect_item_hooks(_rows, r => r, true),
             WorkLoop.Start("MarketView", _refresh)
          );
-      }
-
-      public ObservableCollection<ColumnBase> columns { get; } = new ObservableCollection<ColumnBase>();
-
-      public SimpleGridSettingsManager<Row> grid_settings_manager { get; }
-
-      public GridSettings get_grid_save_state() {
-         if (_settings_manager.instance_settings == null)
-            return null;
-         else
-            return grid_settings_manager.create();
-      }
-
-      public static IComparer<Row> get_column_comparer(Columns column) {
-         switch (column) {
-            case Columns.Security: return wrap(r => r.security);
-            case Columns.SecurityKey: return wrap(r => r.security.Id);
-            case Columns.Volume: return wrap(r => r.volume);
-            case Columns.Last: return wrap(r => r.last_price);
-            case Columns.LastSize: return wrap(r => r.last_size);
-            case Columns.Position: return wrap(r => r.position);
-            case Columns.WorkingBids: return wrap(r => r.working_bid_volume);
-            case Columns.BidImpliedSize: return wrap(r => r.bid_implied_size);
-            case Columns.BidDirectSize: return wrap(r => r.bid_direct_size);
-            case Columns.BidMergedSize: return wrap(r => r.bid_merged_size);
-            case Columns.Bid: return wrap(r => r.bid_price);
-            case Columns.Ask: return wrap(r => r.ask_price);
-            case Columns.AskMergedSize: return wrap(r => r.ask_merged_size);
-            case Columns.AskDirectSize: return wrap(r => r.ask_direct_size);
-            case Columns.AskImpliedSize: return wrap(r => r.ask_implied_size);
-            case Columns.WorkingAsks: return wrap(r => r.working_ask_volume);
-            case Columns.Settlement: return wrap(r => r.settlement);
-            case Columns.DayChange: return wrap(r => r.day_change);
-            case Columns.SessionLow: return wrap(r => r.session_low);
-            case Columns.SessionHigh: return wrap(r => r.session_high);
-            case Columns.MarketDescription: return wrap(r => r.market_description);
-            case Columns.ClearedAlias: return wrap(r => r.security.cleared_alias());
-            case Columns.ProductDescription: return wrap(r => r.security.product_name());
-            case Columns.HubAlias: return wrap(r => r.security.hub_alias());
-            case Columns.StripName: return wrap(r => r.security.strip_name());
-            case Columns.MicCode: return wrap(r => r.security.mic_code());
-            default: return null;
+         void init_hyperlink_hover_animation(HyperlinkCell cell_view, ColumnBase col) {
+            // background timeline
+            var hover_bg_timeline = VisualStateHelper.create_color_animation(
+               cell_view,
+               new PropertyPath("(0).(1)", HyperlinkCell.BackgroundProperty, SolidColorBrush.ColorProperty),
+               new Binding(nameof(ColumnBase.background_color)) {
+                  Source = col,
+                  Converter = new ColorBlendConverter { Overlay = Colors.Black.with(0x1A) }
+               });
+            // background pressed timeline
+            var pressed_bg_timeline = VisualStateHelper.create_color_animation(
+               cell_view,
+               new PropertyPath("(0).(1)", HyperlinkCell.BackgroundProperty, SolidColorBrush.ColorProperty),
+               new Binding(nameof(ColumnBase.background_color)) {
+                  Source = col,
+                  Converter = new ColorBlendConverter { Overlay = Colors.Black.with(0x25) }
+               });
+            // border timeline
+            var bd_brush = new SolidColorBrush();
+            BindingOperations.SetBinding(bd_brush, SolidColorBrush.ColorProperty, new Binding(nameof(ColumnBase.background_color)) { Source = col });
+            cell_view.BorderBrush = bd_brush;
+            cell_view.BorderThickness = new Thickness(1);
+            var hover_bd_timeline = VisualStateHelper.create_color_animation(
+               cell_view, new PropertyPath("(0).(1)", HyperlinkCell.BorderBrushProperty, SolidColorBrush.ColorProperty), Colors.Black.with(0x60));
+            // mouse states
+            VisualStateManager.GetVisualStateGroups(cell_view).Add(
+               VisualStateHelper.create_group("MouseStates",
+                  new VisualState { Name = "Normal" },
+                  VisualStateHelper.create_state("MouseOver", hover_bg_timeline, hover_bd_timeline),
+                  VisualStateHelper.create_state("Pressed", pressed_bg_timeline, hover_bd_timeline)));
+            // state groups manager
+            StateManager.SetGroups(cell_view, new StateGroupsManager {
+               StateDefinitions = new StateDefinitionCollection {
+                     new MouseStateDefinition { MouseSource = cell_view }
+                  }
+            });
          }
-         IComparer<Row> wrap<T>(Func<Row, T> selector) =>
-            Comparer<T>.Default.wrap(selector);
       }
 
-      #region Filters
+      public event PropertyChange<Row> current_row_changed { add => _current_row.Changed += value; remove => _current_row.Changed -= value; }
+      event Action _filter_changed;
+
+      public ICollectionView rows_view => _rows_view;
+      public ObservableCollection<Row> rows => _rows;
+      public ObservableCollection<Row> selected_rows { get; } = new ObservableCollection<Row>();
+      public Color selection_highlight { get => _selection_highlight; set => Set(ref _selection_highlight, value); }
+      public ObservableCollection<ColumnBase> columns { get; } = new ObservableCollection<ColumnBase>();
+      public Row current_row { get => _current_row.Value; set => _current_row.set(value); }
+
+      internal IBus bus => _bus;
+      internal OrdersModel orders_model => _orders_model;
+
+      public IReadOnlyList<(Columns key, ListSortDirection direction)> sorting_hierarchy {
+         get => _sorting_hierarchy ?? (_sorting_hierarchy = Array.Empty<(Columns, ListSortDirection)>());
+         set {
+            _sorting_hierarchy = value;
+            comparer = DIYGridSortHelper.build_comparer(value, get_column_comparer, Columns.SecurityKey);
+            DIYGridSortHelper.reset_sorting(columns, value);
+            _rows_view.CustomSort = comparer.to_non_generic();
+         }
+      }
+
+      public IComparer<Row> comparer { get; private set; }
+
       public IDataGridColumnPersistentFilter<Row, string> security_filter { get; }
       public IDataGridColumnPersistentFilter<Row, DoubleMinMaxState> bid_price_filter { get; } = new DoubleMinMax<Row>(r => r.bid_price, nameof(Row.bid_price));
       public IDataGridColumnPersistentFilter<Row, UIntMinMaxState> bid_merged_size_filter { get; } = new UIntMinMax<Row>(r => r.bid_merged_size, nameof(Row.bid_merged_size));
@@ -239,7 +341,60 @@ namespace mbts.spark {
       public IDataGridColumnPersistentFilter<Row, string> hub_alias_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.HubAlias : "", nameof(Row.hub_alias));
       public IDataGridColumnPersistentFilter<Row, string> strip_name_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.StripName : "", nameof(Row.strip_name));
       public IDataGridColumnPersistentFilter<Row, string> mic_code_filter { get; } = new RegexFilterVM<Row>(r => r.security.HasIce ? r.security.Ice.MicCode : "", nameof(Row.mic_code));
-      
+
+      IEnumerable<IDataGridColumnFilter<Row>> _all_filters =>
+         _filter_getters.Select(g => g(this));
+
+      public static IComparer<Row> get_column_comparer(Columns column) {
+         switch (column) {
+            case Columns.Security: return wrap(r => r.security);
+            case Columns.SecurityKey: return wrap(r => r.security.Id);
+            case Columns.Volume: return wrap(r => r.volume);
+            case Columns.Last: return wrap(r => r.last_price);
+            case Columns.LastSpd: return wrap(r => r.last_price_from_spread);
+            case Columns.LastSize: return wrap(r => r.last_size);
+            case Columns.Position: return wrap(r => r.position);
+            case Columns.WorkingBids: return wrap(r => r.working_bid_volume);
+            case Columns.BidImpliedSize: return wrap(r => r.bid_implied_size);
+            case Columns.BidDirectSize: return wrap(r => r.bid_direct_size);
+            case Columns.BidMergedSize: return wrap(r => r.bid_merged_size);
+            case Columns.Bid: return wrap(r => r.bid_price);
+            case Columns.Ask: return wrap(r => r.ask_price);
+            case Columns.AskMergedSize: return wrap(r => r.ask_merged_size);
+            case Columns.AskDirectSize: return wrap(r => r.ask_direct_size);
+            case Columns.AskImpliedSize: return wrap(r => r.ask_implied_size);
+            case Columns.WorkingAsks: return wrap(r => r.working_ask_volume);
+            case Columns.Settlement: return wrap(r => r.settlement);
+            case Columns.DayChange: return wrap(r => r.day_change);
+            case Columns.SessionLow: return wrap(r => r.session_low);
+            case Columns.SessionHigh: return wrap(r => r.session_high);
+            case Columns.MarketDescription: return wrap(r => r.market_description);
+            case Columns.ClearedAlias: return wrap(r => r.security.cleared_alias());
+            case Columns.ProductDescription: return wrap(r => r.security.product_name());
+            case Columns.HubAlias: return wrap(r => r.security.hub_alias());
+            case Columns.StripName: return wrap(r => r.security.strip_name());
+            case Columns.MicCode: return wrap(r => r.security.mic_code());
+            default: return null;
+         }
+         IComparer<Row> wrap<T>(Func<Row, T> selector) =>
+            Comparer<T>.Default.wrap(selector);
+      }
+
+      public (OrderBookVM vm, string context, string title, Color fg) orderbook_params(SecurityImmutable security, Columns column) {
+         var (title_desc, fg) = _orderbook_title(column);
+         var filters = new bts.shell.orderbook.FilterStates {
+            security_criteria = SecurityCriteria.from_keys(new[] { security.Id })
+         };
+         switch (column) {
+            case Columns.WorkingBids: filters.sides = new[] { Side.Buy }; break;
+            case Columns.WorkingAsks: filters.sides = new[] { Side.Sell }; break;
+         }
+         var vm = _mk_orderbook_vm_common(filters, new[] {
+            OrderBookGridView.ColumnKeys.Security,
+            OrderBookGridView.ColumnKeys.Side
+         });
+         return (vm, $"{security}", title_desc, fg);
+      }
 
       public FilterStates get_filter_states() {
          return new FilterStates {
@@ -273,14 +428,102 @@ namespace mbts.spark {
             mic_code = mic_code_filter.get_state(),
          };
       }
-      #endregion
 
-      protected override Row row_factory(SecurityMD smd) => new Row(_bus, smd, _orders_model);
-      protected override void on_row_removed(Row row) => row.Dispose();
-      protected override IEnumerable<SortingCriteria> get_default_sorting() { yield return new SortingCriteria(nameof(Row.security), true); }
+      public void load_filters(FilterStates filters) {
+         if (filters != null) {
+            using (rows_view.DeferRefresh()) {
+               security_filter.load_state(filters.security);
+               bid_price_filter.load_state(filters.bid_price);
+               bid_merged_size_filter.load_state(filters.bid_merged_size);
+               bid_direct_size_filter.load_state(filters.bid_direct_size);
+               bid_implied_size_filter.load_state(filters.bid_implied_size);
+               ask_price_filter.load_state(filters.ask_price);
+               ask_merged_size_filter.load_state(filters.ask_merged_size);
+               ask_direct_size_filter.load_state(filters.ask_direct_size);
+               ask_implied_size_filter.load_state(filters.ask_implied_size);
+               last_price_filter.load_state(filters.last_price);
+               last_price_from_spread_filter.load_state(filters.last_price_from_spread);
+               last_size_filter.load_state(filters.last_size);
+               day_change_filter.load_state(filters.day_change);
+               settlement_filter.load_state(filters.settlement);
+               session_low_filter.load_state(filters.session_low);
+               session_high_filter.load_state(filters.session_high);
+               position_filter.load_state(filters.position);
+               raw_day_position_filter.load_state(filters.raw_day_position);
+               working_bid_volume_filter.load_state(filters.working_bid_volume);
+               working_ask_volume_filter.load_state(filters.working_ask_volume);
+               volume_filter.load_state(filters.volume);
+               security_key_filter.load_state(filters.security_key);
+            }
+         }
+      }
+
+      static (string desc, Color fg) _orderbook_title(Columns key) {
+         switch (key) {
+            case Columns.WorkingBids: return ("Working Buy Orders", BTSColors.MarketData.bid);
+            case Columns.WorkingAsks: return ("Working Sell Orders", BTSColors.MarketData.ask);
+            default: return ("Working Orders", Colors.Black);
+         }
+      }
+
+      static GridSettings _hide_cols(GridSettings grid, IEnumerable<OrderBookGridView.ColumnKeys> columns) =>
+         grid.with(_hide_cols(grid.columns, columns));
+
+      static IEnumerable<GridColumnSettings> _hide_cols(IEnumerable<GridColumnSettings> cols, IEnumerable<OrderBookGridView.ColumnKeys> columns) {
+         // hide columns who's data is implied by the grouping
+         var col_hash = new HashSet<string>(columns.Select(k => k.ToString()));
+         foreach (var c in cols)
+            yield return col_hash.Contains(c.id) ? c.with(is_visible: false) : c;
+      }
+
+      static string _order_ticket_tooltip(Columns key) {
+         var bid_or_ask = Regex.Match(key.ToString(), "(Bid|Ask)");
+         return bid_or_ask.Success ? $"Order Ticket @ {bid_or_ask.Value}" : "Order Ticket";
+      }
+
+      OrderBookVM _mk_orderbook_vm_common(bts.shell.orderbook.FilterStates filters, IEnumerable<OrderBookGridView.ColumnKeys> hide_cols, IObservable<TableUpdate<OrderSecurityRootPair, uint>> orders_source = null) {
+         var state = new bts.shell.orderbook.OrderBookStartupData(filters, bts.shell.orderbook.OrderBookStartupData.default_mini_grid, use_defaults: false);
+         state.orderbook_grid.general = _hide_cols(state.orderbook_grid.general, hide_cols);
+         var settings_man = new WindowSettingsManager<bts.shell.orderbook.OrderBookGridSettings>.DisconnectedImpl(state.orderbook_grid);
+         var obvm = orders_source == null ?
+            new OrderBookVM(_bus, null, _orders_model, settings_man, true) :
+            new OrderBookVM(_bus, null, _orders_model, orders_source, settings_man, true);
+         foreach (var c in OrderBookVM.OrderBookColumnCollection.editable_columns)
+            obvm.columns.Insert(0, c);
+         obvm.load_from(state);
+         return obvm;
+      }
+
 
       void _refresh() {
-         foreach (var r in _row_vms) r.refresh();
+         foreach (var r in _rows) {
+            r.refresh();
+            r.is_visible = _filter == null || _filter(r);
+         }
+      }
+
+      Row _row_factory(SecurityMD smd) => new Row(_bus, smd, _orders_model);
+
+      void IHandleRowSelection.row_selection_changed(SelectionChangedEventArgs e) {
+         selected_rows.RemoveSorted(e.RemovedItems.OfType<Row>(), _row_key_comparer);
+         selected_rows.InsertSorted(e.AddedItems.OfType<Row>(), _row_key_comparer);
+      }
+
+      void _on_securities(TableUpdate<SecurityMD, uint> table) {
+         var sw = new Stopwatch();
+         sw.Start();
+         foreach (var smd in table.removed) {
+            int i = CollectionHelper.binary_search(_wrapped_rows, smd, _sec_md_key_comparer);
+            Log.assert(i >= 0);
+            _wrapped_rows.RemoveAt(i);
+         }
+         foreach (var smd in table.added) {
+            int i = CollectionHelper.binary_search(_wrapped_rows, smd, _sec_md_key_comparer);
+            Log.assert(i < 0);
+            _wrapped_rows.Insert(~i, smd);
+         }
+         sw.Stop();
+         Log.Ui.info($"MarketView update took {sw.ElapsedMilliseconds:0.00}ms.");
       }
    }
 }

src/client/spark/Modules/Market/MarketView/MarketViewView.xaml

@@ -3,8 +3,13 @@
   x:ClassModifier="internal"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:bv="clr-namespace:bts.view"
+  xmlns:u="clr-namespace:mbts.ui"
   xmlns:c="clr-namespace:mbts.ui.controls"
+  xmlns:cv="clr-namespace:mbts.ui.converters"
   xmlns:usp="clr-namespace:mbts.ui.spark"
+  xmlns:sys="clr-namespace:System;assembly=mscorlib"
+  u:WindowStyle.UnsafeWindow="{Binding Path='(u:WindowStyle.UnsafeWindow)', RelativeSource={RelativeSource AncestorType=bv:SparkWindowView}}"
   FocusManager.IsFocusScope="True"
   Background="{StaticResource CommonBackground}"
 >
@@ -13,8 +18,54 @@
       <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml"/>
       </ResourceDictionary.MergedDictionaries>
+      <Style TargetType="c:HyperlinkCell">
+        <Setter Property="Background" Value="{Binding Path='(c:DIYGrid.Column).background_brush', RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Command" Value="{x:Static usp:MarketViewView.CellClickCommand}"/>
+        <Setter Property="CommandParameter">
+          <Setter.Value>
+            <MultiBinding Converter="{x:Static usp:MarketViewView.CellConverter}">
+              <Binding Path=""/>
+              <Binding Path="(c:DIYGrid.ColumnKey)" RelativeSource="{RelativeSource Self}"/>
+            </MultiBinding>
+          </Setter.Value>
+        </Setter>
+        <Setter Property="CommandTarget" Value="{Binding RelativeSource={RelativeSource AncestorType=usp:MarketViewView}}"/>
+        <Style.Triggers>
+          <Trigger Property="IsMouseOverClickArea" Value="True">
+            <Setter Property="Background">
+              <Setter.Value>
+                <SolidColorBrush>
+                  <SolidColorBrush.Color>
+                    <MultiBinding Converter="{x:Static cv:ColorBlendMultiConverter.Instance}">
+                      <Binding Path="SelectionHighlight" RelativeSource="{RelativeSource AncestorType=c:DIYGrid}"/>
+                      <Binding Path="(c:DIYGrid.Column).background_color" RelativeSource="{RelativeSource AncestorType=c:HyperlinkCell}"/>
+                    </MultiBinding>
+                  </SolidColorBrush.Color>
+                </SolidColorBrush>
+              </Setter.Value>
+            </Setter>
+            <Setter Property="BorderBrush">
+              <Setter.Value>
+                <Binding Path="SelectionHighlight" RelativeSource="{RelativeSource  AncestorType=c:DIYGrid}">
+                  <Binding.Converter>
+                    <cv:ValueConverterPipe>
+                      <cv:ColorWithConverter A="255"/>
+                      <cv:ColorToBrushConverter/>
+                    </cv:ValueConverterPipe>
+                  </Binding.Converter>
+                </Binding>
+              </Setter.Value>
+            </Setter>
+            <Setter Property="BorderThickness" Value="1"/>
+          </Trigger>
+        </Style.Triggers>
+      </Style>
     </ResourceDictionary>
   </UserControl.Resources>
+  <UserControl.CommandBindings>
+    <CommandBinding Command="{x:Static usp:MarketViewView.CellClickCommand}" Executed="{x:Static usp:MarketViewView.CellClickExecuted}"/>
+  </UserControl.CommandBindings>
   <AdornerDecorator>
     <Grid>
       <Grid.RowDefinitions>
@@ -22,13 +73,14 @@
         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <c:DIYGrid
-      x:Name="_grid"
-      Grid.Row="0"
-      Columns="{Binding columns}"
-      CurrentRow="{Binding current_row}"
-      Rows="{Binding rows_view}"
-      SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}"
-    >
+        x:Name="_grid"
+        Grid.Row="0"
+        Columns="{Binding columns}"
+        CurrentRow="{Binding current_row}"
+        Rows="{Binding rows_view}"
+        SelectionHighlight="{Binding selection_highlight, Mode=OneWay}"
+        SyncColumnSortDirectionWithSortDescriptions="False"
+      >
         <c:DIYGrid.InputBindings>
           <MouseBinding MouseAction="LeftDoubleClick" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
           <KeyBinding Key="Return" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>

src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs

@@ -1,14 +1,36 @@
-using mbts.spark;
+using bts.api;
+using mbts.spark;
 using mbts.ui.controls;
+using mbts.ui.converters;
+using mbts.ui.extensions;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
 
 namespace mbts.ui.spark {
    /// <summary>
    /// Interaction logic for MarketSheetsView.xaml
    /// </summary>
    partial class MarketViewView : UserControl {
+      public static readonly RoutedCommand CellClickCommand = new RoutedCommand();
+
+      MarketViewVM _vm;
+      DIYGridPopupManager _popup_man_backing;
+
+      public MarketViewView() {
+         InitializeComponent();
+         this.ConnectDataContext<MarketViewVM>(vm => _vm = vm);
+         AdornerHelper.attach_continuously_on_loaded(
+            () => new GridAnimation.DIYGridAnimationAdorner<Columns>(
+               _grid, _grid.descendants_of_type<DIYGridRowsPresenter>().First()),
+            _grid);
+      }
+
       public enum Columns {
+         None,
          Security,
          Volume,
          Last,
@@ -39,14 +61,100 @@ namespace mbts.ui.spark {
          MicCode
       }
 
-      public MarketViewView() {
-         InitializeComponent();
-         AdornerHelper.attach_continuously_on_loaded(
-            () => new GridAnimation.DIYGridAnimationAdorner<Columns>(
-               _grid, _grid.descendants_of_type<DIYGridRowsPresenter>().First()),
-            _grid);
+      public static ExecutedRoutedEventHandler
+         CellClickExecuted => CommandImpl.cell_click;
+
+      public static IMultiValueConverter CellConverter =>
+         ValueConverter.create<MarketViewVM.Row, Columns, MarketViewCell>((r, c) => new MarketViewCell(r, c));
+
+      IBus _bus => _vm.bus;
+      OrdersModel _model => _vm.orders_model;
+      DIYGridPopupManager _popup_man =>
+         _popup_man_backing ?? (_popup_man_backing = DIYGridPopupManager.create(this));
+
+      public void show_mini_orderbook(SecurityMD security_md) =>
+         _show_mini_orderbook(security_md, Columns.None);
+
+      protected override void OnLostMouseCapture(MouseEventArgs e) {
+         if (e.LeftButton == MouseButtonState.Pressed && Mouse.Captured == null) {
+            if (this.ChildAtPoint(e.GetPosition(this), out DIYGridRowsPresenter presenter))
+               presenter.begin_explicit_drag();
+         }
+      }
+
+      void _on_cell_click(MarketViewVM.Row row, Columns col) {
+         switch (col) {
+            case Columns.WorkingAsks:
+            case Columns.WorkingBids:
+               _show_mini_orderbook(row.security_md, col);
+               break;
+            case Columns.Bid:
+               _show_order_ticket(row.security, row.bid_price);
+               break;
+            case Columns.BidMergedSize: _show_order_ticket(row.security, row.bid_price, row.bid_merged_size); break;
+            case Columns.BidDirectSize: _show_order_ticket(row.security, row.bid_price, row.bid_direct_size); break;
+            case Columns.BidImpliedSize: _show_order_ticket(row.security, row.bid_price, row.bid_implied_size); break;
+            case Columns.Ask:
+               _show_order_ticket(row.security, row.ask_price);
+               break;
+            case Columns.AskMergedSize: _show_order_ticket(row.security, row.ask_price, row.ask_merged_size); break;
+            case Columns.AskDirectSize: _show_order_ticket(row.security, row.ask_price, row.ask_direct_size); break;
+            case Columns.AskImpliedSize: _show_order_ticket(row.security, row.ask_price, row.ask_implied_size); break;
+            case Columns.Last:
+               _show_order_ticket(row.security, row.last_price);
+               break;
+            case Columns.LastSize:
+               _show_order_ticket(row.security, row.last_price, row.last_size);
+               break;
+         }
+      }
+
+      void _show_mini_orderbook(SecurityMD security_md, Columns col) {
+         var (vm, context, title, fg) = _vm.orderbook_params(security_md.security, col);
+         _show_popup(vm, new AuxiliaryDataHeader {
+            context = context,
+            title = title,
+            title_foreground = fg
+         });
+      }
+
+      async void _show_order_ticket(SecurityImmutable security, double price = double.NaN, uint size = 0) {
+         var sec_md = await _bus.subscribe(SparkTags.SecuritiesTag)
+            .Select(sec_map => sec_map.TryGetValue(security.Id, out var smd) ? smd : (SecurityMD?)null)
+            .SkipWhile(smd => !smd.HasValue)
+            .FirstOrDefaultAsync();
+         if (sec_md.HasValue) {
+            var resources = new OrderTicketResources();
+            resources.MergedDictionaries.Add(new AuxiliaryDataResources());
+            var ticket_vm = new NewOrderTicketVM(
+               _model, sec_md.Value, _model.factory.order(security), price, size, Observable.Return(mbts.spark.LadderSettings.Default.calculator_buttons));
+            _show_popup(ticket_vm, new OrderTicketHeader { bbo = ticket_vm.bbo }, resources);
+         }
+      }
+
+      void _show_popup(object content, object header) =>
+         _show_popup(content, header, new AuxiliaryDataResources());
+
+      void _show_popup(object content, object header, ResourceDictionary resources) {
+         var view = new HeaderedContentControl {
+            Content = content,
+            Header = header,
+            HorizontalAlignment = HorizontalAlignment.Left,
+            VerticalAlignment = VerticalAlignment.Top,
+            Resources = resources ?? new AuxiliaryDataResources()
+         };
+         view.Style = view.Resources[AuxiliaryDataResources.PopupChildStyleKey] as Style;
+         _popup_man.show(view);
+      }
+
+      static class CommandImpl {
+         public static void cell_click(object sender, ExecutedRoutedEventArgs e) {
+            if (sender is MarketViewView mview && e.Parameter is MarketViewCell cell)
+               mview._on_cell_click(cell.row, cell.column);
+            e.Handled = true;
+         }
       }
    }
 
-   class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row, MarketViewView.Columns> { }
+   class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row> { }
 }

src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs

@@ -1,18 +1,19 @@
 using bts;
 using bts.api;
+using bts.api.core;
+using bts.collections;
 using bts.shell;
 using bts.shell.fills;
 using bts.spark;
-using bts.utils;
 using mbts.persist;
 using mbts.ui;
 using mbts.ui.settings;
-using mbts.ui.shell;
 using mbts.ui.spark;
 using mbts.ui.utility;
 using mbts.utils;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -21,6 +22,14 @@ using System.Windows;
 namespace mbts.spark {
    class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData>, ISharedWindow, ISlowMeasureContentSize {
       const string _window_type = "MarketView", _window_type_display_name = "Market View";
+         // make font-color immutable for Side, Size, (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells)
+      static readonly IReadOnlyDictionary<string, GridColumnSettingsFeatureFlags> _col_settings_flags = new Dictionary<string, GridColumnSettingsFeatureFlags> {
+         { MarketViewView.Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor },
+         { MarketViewView.Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor},
+         { MarketViewView.Columns.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
+         { MarketViewView.Columns.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }
+      };
+
       readonly OrdersModel _orders_model;
       readonly AllowOnce _init_guard = new AllowOnce("MarketView");
       readonly IWindowSettingsManager<GridSettings> _settings_manager;
@@ -32,6 +41,7 @@ namespace mbts.spark {
       SecurityCriteria
          _selected_security_criteria_backing,
          _sorted_selected_security_criteria_backing;
+      SimpleGridSettingsManager<MarketViewVM.Row> _grid_settings_manager;
 
       public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, IWindowSettingsManager<GridSettings> settings_manager)
          : base("Market View", bus, factory, SparkCommands.ShowMarketView.icon) {
@@ -42,13 +52,16 @@ namespace mbts.spark {
          thread_id = config.Configuration.get<bts.config.MultiThreadedWindows>().market_view ? "MarketView" : null;
       }
 
-      event Action<MarketViewWindowFactory.StartupData> _state_changed;
-
       public override string window_type => _window_type;
       public override UIElement Content => _view;
       public override IEnumerable<SparkCommand> Commands => _commands;
       public override MarketViewWindowFactory.StartupData SaveState =>
-         _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.get_grid_save_state(), _vm.rows_view.get_sorting_criteria(_vm.columns));
+         _state = new MarketViewWindowFactory.StartupData(
+            _state.security_criteria,
+            _vm.get_filter_states(),
+            _settings_manager.instance_settings,
+            _vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == System.ComponentModel.ListSortDirection.Ascending))
+            .ToList());
 
       public override double MinWidth => MarketViewWindowFactory.StartupData.DefaultGridSettings.columns.Where(c => c.is_visible).Sum(gcs => gcs.width)
          + SPARK_MENU_COLLAPSED_WIDTH
@@ -68,43 +81,33 @@ namespace mbts.spark {
             return _selected_security_criteria_backing;
          }
       }
-      SecurityCriteria _sorted_selected_security_criteria {
-         get {
-            if (_sorted_selected_security_criteria_backing == null) {
-               if (_vm != null) {
-                  var sorting_criteria = _vm.rows_view.get_sorting_criteria(_vm.columns);
-                  var comp_builder = new ComparerBuilder<MarketViewVM.Row>();
-                  foreach (var sc in sorting_criteria) {
-                     if (_vm.columns.TryGetFirst(col => string.Equals(col.id, sc.col_name, StringComparison.CurrentCultureIgnoreCase), out var match)) {
-                        if (match is ui.controls.DIYGrid.IKeyedColumn<MarketViewView.Columns> kcol) {
-                           var col_comp = MarketViewVM.get_column_comparer(kcol.key);
-                           if (col_comp != null) {
-                              comp_builder.add(sc.is_ascending ? col_comp : col_comp.reverse());
-                           } else {
-                              Log.Ui.warn($"{_window_type} is unable to find the row comparer for the '{sc.col_name}' column.");
-                           }
-                        } else {
-                           Log.Ui.warn($"{_window_type} is unable find a column with id '{sc.col_name}.'");
-                        }
-                     }
-                  }
-                  var comp = comp_builder.to_comparer();
-                  _sorted_selected_security_criteria_backing = new SecurityCriteria(_vm.selected_rows.Ordered(comp).Select(r => r.security));
-               }
-            }
-            return _sorted_selected_security_criteria_backing;
-         }
-      }
+
+      SecurityCriteria _sorted_selected_security_criteria => _sorted_selected_security_criteria_backing ?? (
+         _sorted_selected_security_criteria_backing = _vm != null ?
+            new SecurityCriteria(_vm.selected_rows.Ordered(_vm.comparer).Select(r => r.security)) :
+            null);
 
       bool _has_selected_rows() => _vm != null && _vm.selected_rows.Count > 0;
 
       public void thread_init() {
          _init_guard.check_access();
          Log.notnull(_state);
-         var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
-         _vm = new MarketViewVM(_bus, _orders_model, state_src, _settings_manager);
+         var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
+         _vm = new MarketViewVM(
+            _bus,
+            _orders_model,
+            _bus.subscribe(update_securities_cmd.tag)
+            .StartWith(_state.security_criteria)
+            .SelectManyInSeries(c => c.subscribe_md_map(_bus))
+            .BufferLatest(TimeSpan.FromSeconds(1))
+            .Table(SecurityMD.key_fn)
+            .Where(t => t.has_changes())
+            .OnDispatcher());
+         _vm.load_filters(_state.filters);
          _view = new MarketViewView { DataContext = _vm };
          _view._grid.Sorting += on_grid_sorting;
+         _grid_settings_manager = new SimpleGridSettingsManager<MarketViewVM.Row>(_vm.columns, _col_settings_flags, _vm.rows);
+         _grid_settings_manager.load_from(_settings_manager.current_settings());
          /// The 'CanExecute' plumbing for the cmds below is designed to avoid potentially costly .ToList() operations on the selected_rows/securities.
          /// Some of the cmds post ITags with data that is, or has, a SecurityCriteria member; the SecurityCriteria constructor creates a new List of the specified securities.
          /// For these commands, the objective is to evaluate 'CanExecute' without instantiating the SecurityCriteria (or more importantly, without creating a new List).
@@ -135,11 +138,22 @@ namespace mbts.spark {
          var show_synth_create_actual_cmd = SparkCommands.ShowSyntheticCreate();
          var show_synth_create_cmd_wrapper = new SparkCommandCommand(show_synth_create_actual_cmd.title, show_synth_create_actual_cmd.icon, show_synth_create_cmd, SparkCommands.KeyGestures.ShowSyntheticCreate);
 
-         var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
+         var show_mini_ob_cmd = ObservantCommand.create<SecurityMD?, SecurityMD>(_view.show_mini_orderbook, s => s.HasValue, s => s.Value, out var show_mini_ob_observer);
          // commands
+         var current_sec_md_src = Observable.Create<SecurityMD?>(o => {
+            notify(null, null);
+            _vm.current_row_changed += notify;
+            return Disposable.Create(() => _vm.current_row_changed -= notify);
+            void notify(MarketViewVM.Row oldval, MarketViewVM.Row newval) {
+               if (newval != null)
+                  o.OnNext(newval.security_md);
+               else o.OnNext(null);
+            }
+         });
          _commands = new List<SparkCommand> {
-            SparkCommands.ShowLadders(SparkCommands.KeyGestures.ShowLadder).complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0),
-            SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(_vm.current_security_md, md => md.HasValue, ConvertUtils.ValueOrDefault),
+            SparkCommands.ShowLadders(SparkCommands.KeyGestures.ShowLadder).complete(_vm.selected_rows.Observe().Select(_ => _vm.selected_rows.WrapSelectorRO(r => r.security_md)), smds => smds.Count > 0),
+            SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(current_sec_md_src, md => md.HasValue, ConvertUtils.ValueOrDefault),
+            new SparkCommandCommand("Working Orders", Icons.Orders, show_mini_ob_cmd),
             show_fills_cmd_wrapper,
             show_tas_cmd_wrapper,
             show_synth_create_cmd_wrapper,
@@ -150,7 +164,7 @@ namespace mbts.spark {
                   _settings_manager,
                   us => us.market_view_grid,
                   UserSettings.FileExtensions.GRID,
-                  s => _vm.grid_settings_manager.create_vm(
+                  s => _grid_settings_manager.create_vm(
                      // we need to get the most up to date GridSettings when launching b/c users may
                      // have changed some settings on the grid directly, like column widths.
                      s.with(_vm.columns.Select(c => c.create()))
@@ -163,16 +177,19 @@ namespace mbts.spark {
             }))
          };
          //
-         _vm.selection_changed += on_selection_changed;
-         _subscriptions = new CompositeDisposable(_bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(c =>
-            _state_changed?.Invoke(_state = new MarketViewWindowFactory.StartupData(c, _vm.get_filter_states(), _vm.grid_settings_manager.create())))) {
+         _vm.selected_rows.CollectionChanged += on_selection_changed;
+         _subscriptions = new CompositeDisposable(
+            current_sec_md_src.Subscribe(show_mini_ob_observer),
+            _settings_manager.subscribe_current().OnDispatcher().Subscribe(new CompositeObserver<GridSettings>(_grid_settings_manager) {
+               s => _vm.selection_highlight = s.selection_highlight
+            })) {
             () => {
-               _vm.selection_changed -= on_selection_changed;
+               _vm.selected_rows.CollectionChanged -= on_selection_changed;
                _view._grid.Sorting -= on_grid_sorting;
             }
          };
 
-         void on_selection_changed((IEnumerable<MarketViewVM.Row> removed, IEnumerable<MarketViewVM.Row> added) change) {
+         void on_selection_changed(object sender, NotifyCollectionChangedEventArgs e) {
             // invalidate selected security criteria
             _selected_security_criteria_backing = null;
             _sorted_selected_security_criteria_backing = null;

src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs

@@ -1,6 +1,7 @@
 using bts.api;
 using bts.proto;
 using bts.settings;
+using bts.utils;
 using mbts.persist;
 using mbts.spark;
 using mbts.spark.filters;
@@ -229,6 +230,46 @@ namespace bts.shell {
          public string last_price_from_spread;
          [ProtoMember(28)]         
          public string mic_code;
+
+         public Func<MarketViewVM.Row, bool> build_predicate() {
+            var pb = new ColumnPredicateBuilder<MarketViewVM.Row>();
+            // security
+            pb.add_regex(security, r => r.security.ToString());
+            pb.add_regex(security_key, r => r.security_key.ToString());
+            // bid
+            pb.add_numeric(bid_price, r => r.bid_price);
+            pb.add_numeric(bid_merged_size, r => r.bid_merged_size);
+            pb.add_numeric(bid_direct_size, r => r.bid_direct_size);
+            pb.add_numeric(bid_implied_size, r => r.bid_implied_size);
+            pb.add_numeric(working_bid_volume, r => r.working_bid_volume);
+            // ask
+            pb.add_numeric(ask_price, r => r.ask_price);
+            pb.add_numeric(ask_implied_size, r => r.ask_implied_size);
+            pb.add_numeric(ask_direct_size, r => r.ask_direct_size);
+            pb.add_numeric(ask_merged_size, r => r.ask_merged_size);
+            pb.add_numeric(working_ask_volume, r => r.working_ask_volume);
+            // last
+            pb.add_numeric(last_price, r => r.last_price);
+            pb.add_regex(last_price_from_spread, r => r.last_price_from_spread.ToString());
+            pb.add_numeric(last_size, r => r.last_size);
+            // position
+            pb.add_numeric(position, r => r.position);
+            pb.add_numeric(raw_day_position, r => r.raw_day_position);
+            // market
+            pb.add_numeric(day_change, r => r.day_change);
+            pb.add_numeric(settlement, r => r.settlement);
+            pb.add_numeric(session_low, r => r.session_low);
+            pb.add_numeric(session_high, r => r.session_high);
+            pb.add_numeric(volume, r => r.volume);
+            // ice
+            pb.add_regex(market_description, r => r.market_description);
+            pb.add_regex(cleared_alias, r => r.cleared_alias);
+            pb.add_regex(product_description, r => r.product_description);
+            pb.add_regex(hub_alias, r => r.hub_alias);
+            pb.add_regex(strip_name, r => r.strip_name);
+            pb.add_regex(mic_code, r => r.mic_code);
+            return pb.to_predicate();
+         }
       }
 
       // migration rules
@@ -271,5 +312,11 @@ namespace bts.shell {
             return false;
          }
       }
+
+      [Export(typeof(IMarketViewGridSettingsMigrationRule))]
+      class EnsureSelectionHighlightTranslucency : IMarketViewGridSettingsMigrationRule {
+         public bool apply(GridSettings settings, out GridSettings new_settings) =>
+            GridSettingsMigrationRules.SelectionHighlightIsTranslucent.apply(settings, out new_settings);
+      }
    }
 }

src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs

@@ -13,5 +13,5 @@ namespace mbts.ui.spark {
          InitializeComponent();
    }
 
-   class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesVM.Row, TimeAndSalesView.Columns> { }
+   class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesVM.Row> { }
 }

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

@@ -1,4 +1,5 @@
 using bts.api;
+using bts.settings;
 using bts.spark;
 using mbts;
 using mbts.co2;
@@ -10,6 +11,7 @@ using mbts.ui.settings;
 using ProtoBuf;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -38,7 +40,7 @@ namespace bts.shell {
 
       public override Task<IShellWindow> load(StartupData state) =>
          Task.FromResult<IShellWindow>(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon,
-            new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales:g))));
+            _settings_hub.create_time_and_sales_settings_manager(state.grid)));
 
       public async void show(SecurityCriteria criteria) {
          var w = await load(new StartupData(criteria));
@@ -122,5 +124,11 @@ namespace bts.shell {
          [ProtoMember(7)]
          public co2.AggressorSide[] aggressor_sides;
       }
+
+      [Export(typeof(ITimeAndSalesGridSettingsMigrationRule))]
+      class EnsureSelectionHighlightTranslucency : ITimeAndSalesGridSettingsMigrationRule {
+         public bool apply(GridSettings settings, out GridSettings new_settings) =>
+            GridSettingsMigrationRules.SelectionHighlightIsTranslucent.apply(settings, out new_settings);
+      }
    }
 }

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

@@ -140,7 +140,7 @@
       <DataTemplate>
         <ComboBox SelectedItem="{Binding value}" ItemsSource="{u:EnumBindingSource {u:Nested sp:ConditionalQuoting.Types.PriceType}}" ItemTemplate="{StaticResource EnumDescriptionTemplate}"/>
       </DataTemplate>
-    </usp:DataGridParameterCellTemplateConverter.ConditionalPriceTypeTemplate>
+    </usp:DataGridParameterCellTemplateConverter.ConditionalPriceTypeTemplate>    
     <usp:DataGridParameterCellTemplateConverter.QuantityMeasureTemplate>
       <DataTemplate>
         <Grid IsEnabled="{Binding enabled}">
@@ -333,61 +333,13 @@
       </DataTrigger>
     </Style.Triggers>
   </Style>
-
-  <Style x:Key="ContractPickerButton" TargetType="Button">
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
-    <Setter Property="HorizontalContentAlignment" Value="Center"/>
-    <Setter Property="VerticalContentAlignment" Value="Center"/>
-    <Setter Property="ToolTip" Value="Change Security"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border
-            x:Name="Bd"
-            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-            Padding="{TemplateBinding Padding}"
-          >
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup Name="MouseStates">
-                <VisualState Name="Normal"/>
-                <VisualState Name="MouseOver">
-                  <Storyboard>
-                    <ColorAnimation Storyboard.TargetName="Bd" Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="#24FFFFFF"/>
-                  </Storyboard>
-                </VisualState>
-                <VisualState Name="Pressed">
-                  <Storyboard>
-                    <ColorAnimation Storyboard.TargetName="Bd" Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="#40FFFFFF"/>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border.Background>
-              <SolidColorBrush/>
-            </Border.Background>
-            <ContentPresenter
-              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-            />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <DataGridTextColumn x:Key="{x:Static usp:ExecutionStrategyEditor.AddColumnPlaceholderKey}" x:Shared="False" IsReadOnly="True">
     <DataGridTextColumn.Header>
       <c:PopupControl
-        ShowExpanderArrow="False"
-        PopupPlacement="Right"
-        Header="Add Leg"
-        Padding="6,0"
+        ShowExpanderArrow="False" PopupPlacement="Right" Header="Add Leg" Padding="6,0"
         Background="{StaticResource Button.Static.BackgroundBrush}"
         IsOpen="{Binding IsNewLegPopupOpen, RelativeSource={RelativeSource AncestorType=usp:ExecutionStrategyEditor}, Mode=TwoWay}"
         IsEnabled="{Binding CanUserAddNewLeg, RelativeSource={RelativeSource AncestorType=usp:ExecutionStrategyEditor}}"
-        VerticalAlignment="Center"
       >
         <msp:ContractPickerView
           CloseOnOK="False" CloseOnCancel="False"
@@ -396,7 +348,7 @@
       </c:PopupControl>
     </DataGridTextColumn.Header>
   </DataGridTextColumn>
-  <DataTemplate x:Key="{x:Static usp:ExecutionStrategyEditor.RemovableColumnHeaderTemplateKey}" DataType="{x:Type usp:LegSpreaderParamsTuple}">
+  <DataTemplate x:Key="{x:Static usp:ExecutionStrategyEditor.RemovableColumnHeaderTemplateKey}">
     <Grid>
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="Auto"/>
@@ -404,40 +356,13 @@
       </Grid.ColumnDefinitions>
       <Button
         Command="{Binding RemoveLegCommand, RelativeSource={RelativeSource AncestorType=usp:ExecutionStrategyEditor}}"
-        CommandParameter="{Binding}"
-        Style="{StaticResource RoundCloseButton}"
-        ToolTip="Remove Leg"
+        CommandParameter="{Binding}" Style="{StaticResource RoundCloseButton}"
       />
-      <c:ContractPickerPopup
-        Grid.Column="1"
-        BorderThickness="0"
-        ButtonStyle="{StaticResource ContractPickerButton}"
-        CloseOnCancel="True"
-        CloseOnOK="True"
-        Header="{Binding security}"
-        IsEditMode="False"
-        IsLazy="True"
-        SecurityMap="{Binding ContractPickerModel.all_securities, RelativeSource={RelativeSource AncestorType=usp:ExecutionStrategyEditor}, Mode=OneWay}"
-        SelectedSecurity="{Binding security}"
-        ShowDialogSkirt="True"
-      >
-        <c:ContractPickerPopup.Background>
-          <SolidColorBrush/>
-        </c:ContractPickerPopup.Background>
-        <c:ContractPickerPopup.HeaderTemplate>
-          <DataTemplate>
-            <TextBlock Foreground="{x:Static u:BTSColors.header_text_brush}" Text="{Binding}"/>
-          </DataTemplate>
-        </c:ContractPickerPopup.HeaderTemplate>
-      </c:ContractPickerPopup>
+      <TextBlock Grid.Column="1" Margin="4,0,0,0" Text="{Binding Converter={StaticResource SecurityTextConverter}}"/>
     </Grid>
   </DataTemplate>
-  <DataTemplate x:Key="ReadOnlyColumnHeaderTemplate" DataType="{x:Type usp:LegSpreaderParamsTuple}">
-    <TextBlock
-      HorizontalAlignment="Center"
-      VerticalAlignment="Center"
-      Text="{Binding security}"
-    />
+  <DataTemplate x:Key="{x:Static usp:ExecutionStrategyEditor.NonRemovableColumnHeaderTemplateKey}">
+    <TextBlock Text="{Binding Converter={StaticResource SecurityTextConverter}}"/>
   </DataTemplate>
   <ControlTemplate x:Key="ExecutionStrategyEditorTemplate" TargetType="usp:ExecutionStrategyEditor">
     <Border
@@ -635,14 +560,6 @@
               </Setter>
             </Style>
           </DataGrid.Resources>
-          <DataGrid.ColumnHeaderStyle>
-            <Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-              <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-              <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-              <Setter Property="Padding" Value="5,0"/>
-              <Setter Property="MinHeight" Value="26"/>
-            </Style>
-          </DataGrid.ColumnHeaderStyle>
           <DataGrid.GroupStyle>
             <GroupStyle ContainerStyle="{StaticResource GroupItemStyle}"/>
           </DataGrid.GroupStyle>

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

@@ -227,8 +227,8 @@ namespace mbts.ui.spark {
       }
 
       DataGridColumn _column_factory(LegSpreaderParamsTuple l) {
-         var col = new DataGridColumnInternal(l, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter);
-         col.HeaderTemplate = TryFindResource(IsNew ? RemovableColumnHeaderTemplateKey : NonRemovableColumnHeaderTemplateKey) as DataTemplate;
+         var col = new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter);
+         col.HeaderTemplate = (DataTemplate)FindResource(IsNew ? RemovableColumnHeaderTemplateKey : NonRemovableColumnHeaderTemplateKey);
          DataGridEx.SetRightBorder(col, new DataGridExVerticalLine(false, true, Colors.DarkGray, 1));
          return col;
       }
@@ -237,12 +237,10 @@ namespace mbts.ui.spark {
 
       private class DataGridColumnInternal : DataGridDynamicColumn {
          readonly IValueConverter _cell_template_converter, _cell_editing_template_converter;
-         readonly LegSpreaderParamsTuple _leg_tup;
 
-         public DataGridColumnInternal(LegSpreaderParamsTuple leg_tup, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) {
-            _leg_tup = leg_tup;
-            Header = leg_tup;
-            SetValue(DataGridEx.CellKeyProperty, leg_tup);
+         public DataGridColumnInternal(Security security, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) {
+            Header = security;
+            SetValue(DataGridEx.CellKeyProperty, security);
             _cell_template_converter = cell_template_converter;
             _cell_editing_template_converter = cell_editing_template_converter;
          }
@@ -250,8 +248,8 @@ namespace mbts.ui.spark {
          // I decided this was an easy and simple enough solution to justify breaking the mvvm paradigm
          // The alternative - within strict bounds of the paradigm - is to change the DataGridParameterCellTemplateConverter into an IMultiValueConverter, bound to data_type AND read_only
          protected override FrameworkElement GenerateEditingElement(DataGridCell cell, object dataItem) {
-            if (dataItem is RowVM row_vm) {
-               if (row_vm.read_only || row_vm.get_cell(_leg_tup) is ICell cell_vm && !cell_vm.enabled)
+            if (dataItem is SyntheticEditorVM.RowVM row_vm) {
+               if (row_vm.read_only || row_vm.get_cell(Header) is SyntheticEditorVM.ICell cell_vm && !cell_vm.enabled)
                   return base.GenerateElement(cell, dataItem);
             }
             return base.GenerateEditingElement(cell, dataItem);
@@ -354,4 +352,4 @@ namespace mbts.ui.spark {
       public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
          throw new NotImplementedException();
    }
-}
+}

src/client/spark/Modules/Spreader/Import/ContractLegTypeView.xaml

@@ -1,25 +0,0 @@
-<UserControl
-  x:Class="bts.shell.spreader.ContractLegTypeView"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:spr="clr-namespace:bts.shell.spreader"
->
-  <ItemsControl ItemsSource="{Binding Controller.flags, RelativeSource={RelativeSource AncestorType=spr:ContractLegTypeView}}">
-    <ItemsControl.ItemsPanel>
-      <ItemsPanelTemplate>
-        <UniformGrid Rows="1"/>
-      </ItemsPanelTemplate>
-    </ItemsControl.ItemsPanel>
-    <ItemsControl.ItemTemplate>
-      <DataTemplate>
-        <CheckBox
-          Margin="2"
-          IsChecked="{Binding is_selected}"
-          Content="{Binding value, Converter={x:Static spr:ContractLegTypeView.LegTypeShortDescConverter}}"
-          ToolTip="{Binding value, Converter={x:Static spr:ContractLegTypeView.LegTypeLongDescConverter}}"
-        />
-      </DataTemplate>
-    </ItemsControl.ItemTemplate>
-  </ItemsControl>
-</UserControl>

src/client/spark/Modules/Spreader/Import/ContractLegTypeView.xaml.cs

@@ -1,104 +0,0 @@
-using bts.collections;
-using mbts;
-using mbts.ui;
-using mbts.ui.converters;
-using mbts.ui.shell;
-using mbts.ui.utility;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace bts.shell.spreader {
-   static class EnumFlagItemsVM {
-      public static EnumFlagItemsVM<T> create<T>(IEnumerable<T> flags) where T : struct =>
-         new EnumFlagItemsVM<T>(flags);
-   }
-
-   class EnumFlagItemsVM<T> : ViewModelBase where T : struct {
-      readonly ObservableCollection<SelectableItemVM<T>> _flags = new ObservableCollection<SelectableItemVM<T>>();
-      bool _is_busy;
-      T _result;
-
-      public EnumFlagItemsVM()
-         : this(EnumHelper.get_values<T>()) { }
-
-      public EnumFlagItemsVM(IEnumerable<T> flags) {
-         this.flags = ObservableAutoWrapper.create_read_only_wrapper(_flags);
-         _flags.AddRange(flags.Select(f => new SelectableItemVM<T>(f)));
-         foreach (var vm in _flags) {
-            vm.is_selected_changed += on_is_selected_changed;
-            void on_is_selected_changed(bool value) {
-               if (!_is_busy) {
-                  _is_busy = true;
-                  result = value ?
-                     EnumHelper.add_flags(result, vm.value) :
-                     EnumHelper.remove_flags(result, vm.value);
-                  _is_busy = false;
-               }
-            }
-         }
-      }
-
-      public event Action result_changed;
-
-      public IReadOnlyObservableCollection<SelectableItemVM<T>> flags { get; }
-
-      public T result {
-         get => _result;
-         set {
-            if (!EqualityComparer<T>.Default.Equals(_result, value)) {
-               _result = value;
-               if (!_is_busy) {
-                  _is_busy = true;
-                  for (int i = 0; i < flags.Count; i++)
-                     flags[i].is_selected = EnumHelper.has_flags(value, flags[i].value);
-                  _is_busy = false;
-               }
-               result_changed?.Invoke();
-               RaisePropertyChanged();
-            }
-         }
-      }
-   }
-   /// <summary>
-   /// Interaction logic for ContractLegTypeView.xaml
-   /// </summary>
-   partial class ContractLegTypeView : UserControl {
-      public static IValueConverter LegTypeShortDescConverter =>
-         ValueConverter.create<ContractLegType, string>(SyntheticSecurityParser.display_name);
-
-      public static IValueConverter LegTypeLongDescConverter =>
-         ValueConverter.create<ContractLegType, string>(lt =>
-            string.Join(" & ", EnumHelper.split_flags(lt).Select(f => EnumHelper.get_display_name(f))));
-
-      public ContractLegTypeView() {
-         InitializeComponent();
-         Controller.result = Value;
-         Controller.result_changed += _on_controller_result_changed;
-      }
-
-      public static readonly DependencyProperty ValueProperty =
-         WPFHelper.create_dp<ContractLegType, ContractLegTypeView>(
-            nameof(Value),
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-            (o, v) => {
-               o.Controller.result_changed -= o._on_controller_result_changed;
-               o.Controller.result = v;
-               o.Controller.result_changed += o._on_controller_result_changed;
-            });
-
-      public ContractLegType Value {
-         get => (ContractLegType)GetValue(ValueProperty);
-         set => SetValue(ValueProperty, value);
-      }
-
-      public EnumFlagItemsVM<ContractLegType> Controller { get; } = EnumFlagItemsVM.create(EnumHelper.get_values_except(ContractLegType.None));
-
-      void _on_controller_result_changed() =>
-         SetCurrentValue(ValueProperty, Controller.result);
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsDialog.xaml

@@ -1,47 +0,0 @@
-<Window
-  x:Class="bts.shell.spreader.SyntheticImportConflictsDialog"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:u="clr-namespace:mbts.ui"
-  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:spr="clr-namespace:bts.shell.spreader"
-  u:WindowStyle.AllowResize="True"
-  u:WindowStyle.SizeToContent="WidthAndHeight"
-  u:WindowStyle.TitleContent="Import Synthetics Conflicts"
-  Style="{StaticResource BTSDialogTitleTemplate}"
->
-  <Window.MaxHeight>
-    <Binding Path="SizeToContent" RelativeSource="{RelativeSource Self}">
-      <Binding.Converter>
-        <cv:WindowMaxHeightConverter SizeToContentThreshold="{u:DPIDouble 700}"/>
-      </Binding.Converter>
-    </Binding>
-  </Window.MaxHeight>
-  <u:WindowStyle.TitleContentTemplate>
-    <DataTemplate>
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-        <Image Height="12" Margin="5,2" Source="{x:Static u:Icons.Import}"/>
-        <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
-      </StackPanel>
-    </DataTemplate>
-  </u:WindowStyle.TitleContentTemplate>
-  <Window.Content>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="*"/>
-        <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <spr:SyntheticImportConflictsView Margin="12,10,12,8"/>
-      <c:DialogSkirt Grid.Row="1">
-        <c:DialogSkirt.RightItems>
-          <x:Array Type="{x:Type Button}">
-            <Button Command="{Binding ok_cmd}">Continue</Button>
-            <Button Command="{Binding cancel_cmd}" IsCancel="True">Cancel</Button>
-          </x:Array>
-        </c:DialogSkirt.RightItems>
-      </c:DialogSkirt>
-    </Grid>
-  </Window.Content>
-</Window>

src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsDialog.xaml.cs

@@ -1,11 +0,0 @@
-using System.Windows;
-
-namespace bts.shell.spreader {
-   /// <summary>
-   /// Interaction logic for SyntheticImportConflictsDialog.xaml
-   /// </summary>
-   partial class SyntheticImportConflictsDialog : Window {
-      public SyntheticImportConflictsDialog() =>
-         InitializeComponent();
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsVM.cs

@@ -1,101 +0,0 @@
-using bts.api;
-using bts.collections;
-using bts.utils;
-using mbts;
-using mbts.spark;
-using mbts.ui;
-using mbts.user.settings;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace bts.shell.spreader {
-   readonly struct SyntheticComponent {
-      public readonly SyntheticContractComponent type;
-      public readonly int leg_index;
-
-      public SyntheticComponent(SyntheticContractComponent type, int leg_index) {
-         this.type = type;
-         this.leg_index = leg_index;
-      }
-   }
-
-   class SyntheticImportConflictsVM : ImportConflictsVM<(SyntheticImportRowVM synth, ContractLegVM leg), SyntheticImportRowVM, SyntheticContractComponent>, IRequestViewClose {
-      IReadOnlyDictionary<uint, SecurityMD> _security_map = DictionaryHelper.empty<uint, SecurityMD>();
-
-      public SyntheticImportConflictsVM(int num_synthetics)
-         : base(num_synthetics, tup => tup.synth) { }
-
-      // misc items sources
-      public IReadOnlyDictionary<uint, SecurityMD> security_map {
-         get => _security_map;
-         set {
-            if (!ReferenceEquals(_security_map, value)) {
-               _security_map = value;
-               _resolve_securities();
-               RaisePropertyChanged();
-            }
-         }
-      }
-
-      void _resolve_securities() {
-         if (_security_map == null)
-            return;
-         var reverse_lookup = SyntheticSecurityParser.reverse_lookup(MappedDictionary.create(_security_map, v => v.security.ToString()));
-         foreach (var r in conflicts) {
-            if (r.component == SyntheticContractComponent.Security && r.has_error) {
-               var id = reverse_lookup(r.text);
-               if (id != 0 && _security_map.TryGetValue(id, out var smd))
-                  r.value = smd.security;
-            }
-         }
-      }
-   }
-
-   class SyntheticImportConflictRowVM : ImportConflictRowVM<(SyntheticImportRowVM synth, ContractLegVM leg), SyntheticContractComponent>, ITemplateSelectorKey {
-      public SyntheticImportConflictRowVM(
-         SyntheticContractComponent component,
-         string text,
-         IReadOnlyCollection<(SyntheticImportRowVM synth, ContractLegVM leg)> affected_parts,
-         object error_value,
-         object value)
-         : base(component, text, affected_parts, error_value, value, affected_parts.DistinctOn(tup => tup.synth).Count()) { }
-
-      public override void on_conflicts_resolved() {
-         if (has_error)
-            return;
-         foreach (var (synth, leg) in affected_parts) {
-            switch (component) {
-               case SyntheticContractComponent.Name:
-                  if (value is string str)
-                     synth.name = str;
-                  break;
-               case SyntheticContractComponent.TickSize:
-                  if (value is double ts && ts.IsNonZero()) {
-                     synth.tick_factors = TickUtils.get_regional_ticks(new ContractSpecificationImmutable(new ContractSpecification {
-                        LowTick = ts,
-                        HighTick = ts
-                     })).low_tick;
-                  } else if (value is TickFactors tf && tf.is_valid())
-                     synth.tick_factors = tf;
-                  break;
-               case SyntheticContractComponent.Security:
-                  if (value is SecurityImmutable sec && sec.is_exchange_security())
-                     leg.security = sec;
-                  break;
-               case SyntheticContractComponent.PriceMultiplier:
-                  if (value is double pm && pm.IsNonZero())
-                     leg.price_multiplier = pm;
-                  break;
-               case SyntheticContractComponent.Quantity:
-                  if (value is double q && q.IsNonZero())
-                     leg.quantity = q;
-                  break;
-               case SyntheticContractComponent.LegType:
-                  if (value is ContractLegType lt)
-                     leg.leg_type = lt;
-                  break;
-            }
-         }
-      }
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsView.xaml

@@ -1,199 +0,0 @@
-<UserControl
-  x:Class="bts.shell.spreader.SyntheticImportConflictsView"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:u="clr-namespace:mbts.ui"
-  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:spr="clr-namespace:bts.shell.spreader"
-  MinWidth="400"
->
-  <UserControl.Resources>
-    <Style x:Key="VerticallyCenteredText" TargetType="TextBlock">
-      <Setter Property="VerticalAlignment" Value="Center"/>
-    </Style>
-    <!--Value Cell Template Selector-->
-    <u:KeyedTemplateSelector x:Key="ValueCellTemplateSelector">
-      <u:KeyedTemplateSelector.Default>
-        <DataTemplate>
-          <TextBlock Text="{Binding value}" VerticalAlignment="Center"/>
-        </DataTemplate>
-      </u:KeyedTemplateSelector.Default>
-      <u:TemplateSelectorKeyValue Key="PriceMultiplier">
-        <DataTemplate>
-          <TextBlock Text="{Binding value, Converter={StaticResource DoubleTextConverter}}" VerticalAlignment="Center"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="Quantity">
-        <DataTemplate>
-          <TextBlock Text="{Binding value, Converter={StaticResource DoubleTextConverter}}" VerticalAlignment="Center"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="Security">
-        <DataTemplate>
-          <TextBlock Text="{Binding value, Converter={x:Static cv:ValueConverters.SecuritySelectorText}}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="LegType">
-        <DataTemplate>
-          <TextBlock Text="{Binding value, Converter={x:Static spr:ContractLegTypeView.LegTypeShortDescConverter}}">
-            <TextBlock.ToolTip>
-              <TextBlock>
-                <Run Text="{Binding value, Converter={x:Static spr:ContractLegTypeView.LegTypeLongDescConverter}}"/>
-                <LineBreak/>
-                <Run Text="Q = Quote"/>
-                <LineBreak/>
-                <Run Text="H = Hedge"/>
-                <LineBreak/>
-                <Run Text="N = None"/>
-              </TextBlock>
-            </TextBlock.ToolTip>
-          </TextBlock>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-    </u:KeyedTemplateSelector>
-    <!--Value Cell Editing Template Selector-->
-    <u:KeyedTemplateSelector x:Key="ValueCellEditingTemplateSelector">
-      <u:TemplateSelectorKeyValue Key="Security">
-        <DataTemplate>
-          <c:ContractPickerPopup
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch"
-            CloseOnCancel="True"
-            CloseOnOK="True"
-            Header="{Binding value, Converter={x:Static cv:ValueConverters.SecuritySelectorText}}"
-            IsEditMode="False"
-            IsLazy="True"
-            SecurityMap="{Binding DataContext.security_map, RelativeSource={RelativeSource AncestorType=DataGrid}, Mode=OneWay}"
-            SelectedSecurity="{Binding value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-            ShowDialogSkirt="True"
-          />
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="Name">
-        <DataTemplate>
-          <TextBox u:Behavior.FocusOnLoaded="True" Text="{Binding value}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="TickSize">
-        <DataTemplate>
-          <c:TickUpDownDouble Value="{Binding value, UpdateSourceTrigger=PropertyChanged}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="PriceMultiplier">
-        <DataTemplate>
-          <c:TickUpDownDouble Value="{Binding value}" DisplayConverter="{StaticResource DoubleTextConverter}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="Quantity">
-        <DataTemplate>
-          <c:TickUpDownDouble Value="{Binding value}" DisplayConverter="{StaticResource DoubleTextConverter}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-      <u:TemplateSelectorKeyValue Key="LegType">
-        <DataTemplate>
-          <spr:ContractLegTypeView Value="{Binding value}"/>
-        </DataTemplate>
-      </u:TemplateSelectorKeyValue>
-    </u:KeyedTemplateSelector>
-  </UserControl.Resources>
-  <!--Content-->
-  <Grid x:Name="content_root">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="*"/>
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="*"/>
-    </Grid.ColumnDefinitions>
-    <Image VerticalAlignment="Center" Margin="0,0,8,0">
-      <Image.Source>
-        <Binding Source="{x:Static MessageBoxImage.Exclamation}">
-          <Binding.Converter>
-            <cv:SystemIconConverter/>
-          </Binding.Converter>
-        </Binding>
-      </Image.Source>
-    </Image>
-    <Canvas x:Name="text_canvas" Grid.Column="1" HorizontalAlignment="Stretch"/>
-    <TextBlock Grid.Column="1" TextWrapping="Wrap" Width="{Binding ActualWidth, ElementName=text_canvas}">
-      <Run Text="{Binding num_successfully_parsed_rows, Mode=OneWay}"/>
-      <Run Text="/"/>
-      <Run Text="{Binding num_rows, Mode=OneWay}"/>
-      <Run Text=" synthetics were successfully converted."/>
-      <Run Text="Resolve conflicts below by selecting a value to assign each affected synthetic,"/>
-      <Run Text="or modify individual synthetics in the main window."/>
-      <LineBreak/>
-      <LineBreak/>
-      <Run Text="Click 'Continue' to proceed to the main window."/>
-    </TextBlock>
-    <DataGrid
-      x:Name="data_grid"
-      u:DataGridBehavior.SingleClickEdit="True"
-      Grid.Row="1"
-      Grid.ColumnSpan="2"
-      AutoGenerateColumns="False"
-      CanUserAddRows="False"
-      CanUserDeleteRows="False"
-      CanUserReorderColumns="False"
-      CanUserSortColumns="True"
-      HeadersVisibility="All"
-      ItemsSource="{Binding conflicts_view}"
-      Margin="0,8,0,0"
-      MinRowHeight="17"
-      RowHeaderWidth="22"
-      SelectionMode="Single"
-    >
-      <DataGrid.RowValidationErrorTemplate>
-         <ControlTemplate>
-           <Grid Background="Green">
-             <Border x:Name="exclamation" HorizontalAlignment="Center">
-               <Image Height="12" VerticalAlignment="Center" Source="{x:Static u:Icons.WarningExclamation}"/>
-             </Border>
-             <ContentControl HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" ToolTip="{Binding (Validation.Errors), RelativeSource={RelativeSource AncestorType=DataGridRow}}">
-               <ContentControl.Template>
-                 <ControlTemplate TargetType="ContentControl">
-                   <Grid Background="Transparent">
-                     <Grid.ToolTip>
-                       <ToolTip Content="{Binding ToolTip, RelativeSource={RelativeSource TemplatedParent}}">
-                         <ToolTip.ContentTemplate>
-                           <DataTemplate>
-                             <ItemsControl ItemsSource="{Binding}" DisplayMemberPath="ErrorContent"/>
-                           </DataTemplate>
-                         </ToolTip.ContentTemplate>
-                       </ToolTip>
-                     </Grid.ToolTip>
-                   </Grid>
-                 </ControlTemplate>
-               </ContentControl.Template>
-             </ContentControl>
-           </Grid>
-         </ControlTemplate>
-      </DataGrid.RowValidationErrorTemplate>
-      <DataGrid.CellStyle>
-        <Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellBaseStyle}">
-          <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        </Style>
-      </DataGrid.CellStyle>
-      <DataGrid.RowStyle>
-        <Style TargetType="DataGridRow">
-          <Setter Property="ValidationErrorTemplate" Value="{Binding RowValidationErrorTemplate, RelativeSource={RelativeSource AncestorType=DataGrid}}"/>
-          <Setter Property="IsSelected" Value="{Binding is_selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-          <Style.Triggers>
-            <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True">
-              <Setter Property="Background" Value="{StaticResource SelectedRowBackground}"/>
-            </DataTrigger>
-          </Style.Triggers>
-        </Style>
-      </DataGrid.RowStyle>
-      <DataGrid.Columns>
-        <DataGridTextColumn Header="Component" Binding="{Binding component, Converter={StaticResource EnumDescriptionConverter}}" ElementStyle="{StaticResource VerticallyCenteredText}" IsReadOnly="True"/>
-        <DataGridTextColumn Header="Text" Binding="{Binding text}" ElementStyle="{StaticResource VerticallyCenteredText}" IsReadOnly="True"/>
-        <DataGridTextColumn Header="Affected Synthetics" Binding="{Binding num_affected_rows}" ElementStyle="{StaticResource VerticallyCenteredText}" IsReadOnly="True"/>
-        <DataGridTemplateColumn Header="Value" CellTemplateSelector="{StaticResource ValueCellTemplateSelector}" CellEditingTemplateSelector="{StaticResource ValueCellEditingTemplateSelector}"/>
-      </DataGrid.Columns>
-    </DataGrid>
-  </Grid>
-</UserControl>

src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsView.xaml.cs

@@ -1,20 +0,0 @@
-using System.Windows.Controls;
-
-namespace bts.shell.spreader {
-   enum SyntheticContractComponent {
-      Name,
-      TickSize,
-      Security,
-      PriceMultiplier,
-      Quantity,
-      LegType
-   }
-
-   /// <summary>
-   /// Interaction logic for SyntheticImportConflictsView.xaml
-   /// </summary>
-   partial class SyntheticImportConflictsView : UserControl {
-      public SyntheticImportConflictsView() =>
-         InitializeComponent();
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml

@@ -1,45 +0,0 @@
-<Window
-  x:Class="bts.shell.spreader.SyntheticImportDialog"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:u="clr-namespace:mbts.ui"
-  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:spr="clr-namespace:bts.shell.spreader"
-  u:WindowStyle.AllowResize="True"
-  u:WindowStyle.SizeToContent="WidthAndHeight"
-  u:WindowStyle.TitleContent="Import Synthetics"
-  Style="{StaticResource BTSDialogTitleTemplate}"
-  Content="{Binding}"
->
-  <Window.MaxHeight>
-    <Binding Path="SizeToContent" RelativeSource="{RelativeSource Self}">
-      <Binding.Converter>
-        <cv:WindowMaxHeightConverter SizeToContentThreshold="{u:DPIDouble 700}"/>
-      </Binding.Converter>
-    </Binding>
-  </Window.MaxHeight>
-  <u:WindowStyle.TitleContentTemplate>
-    <DataTemplate>
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-        <Image Height="12" Margin="5,2" Source="{x:Static u:Icons.Import}"/>
-        <TextBlock Margin="4,0,0,0" Text="{Binding}"/>
-      </StackPanel>
-    </DataTemplate>
-  </u:WindowStyle.TitleContentTemplate>
-  <Window.ContentTemplate>
-    <DataTemplate DataType="{x:Type spr:SyntheticImportVM}">
-      <AdornerDecorator>
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-          </Grid.RowDefinitions>
-          <spr:SyntheticImportView/>
-          <c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding ok_cmd}" CancelCommand="{Binding cancel_cmd}"/>
-        </Grid>
-      </AdornerDecorator>
-    </DataTemplate>
-  </Window.ContentTemplate>
-</Window>

src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml.cs

@@ -1,11 +0,0 @@
-using System.Windows;
-
-namespace bts.shell.spreader {
-   /// <summary>
-   /// Interaction logic for SyntheticImportDialog.xaml
-   /// </summary>
-   partial class SyntheticImportDialog : Window {
-      public SyntheticImportDialog() =>
-         InitializeComponent();
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportRowCollectionView.cs

@@ -1,236 +0,0 @@
-using mbts;
-using mbts.ui;
-using mbts.ui.shell;
-using mbts.ui.utility;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Windows.Data;
-
-namespace bts.shell.spreader {
-   class SyntheticImportRowCollectionView : ListCollectionView {
-      ReadOnlyObservableCollection<object> _base_groups, _groups_wrapper;
-      ObservableAutoWrapper<object, object> _groups;
-
-      public SyntheticImportRowCollectionView(IList list)
-         : base(list) { }
-
-      public override bool CanGroup => true;
-
-      // Must return null if there are no GroupDescriptions (i.e., instead of an empty collection).
-      // If an empty collection is returned, the view assumes grouping is active and there are no items.
-      public override ReadOnlyObservableCollection<object> Groups {
-         get {
-            if ((GroupDescriptions?.Count ?? 0) == 0)
-               return null;
-            if (_groups_wrapper == null) {
-               _base_groups = base.Groups;
-               if (_base_groups == null)
-                  return null;
-               _groups = new ObservableAutoWrapper<object, object>(_base_groups, obj => new SyntheticImportRowCollectionViewGroup((CollectionViewGroup)obj, this));
-               _groups_wrapper = new ReadOnlyObservableCollection<object>(_groups);
-            }
-            return _groups_wrapper;
-         }
-      }
-
-      public void set_all_expanded(bool is_expanded) {
-         foreach (var g in Groups.OfTypeSafe<SyntheticImportRowCollectionViewGroup>())
-            g.set_all_expanded(is_expanded);
-      }
-   }
-
-   class SyntheticImportRowCollectionViewGroup : CollectionViewGroup, INotifyDataErrorInfo, IRaiseNotifyPropertyChanged, IEquatable<SyntheticImportRowCollectionViewGroup> {
-      static readonly string _desc_delim = ", ";
-      readonly SyntheticImportRowCollectionView _root;
-      readonly CollectionViewGroup _from;
-      readonly Dictionary<object, InnerGroupSubscription> _inner_groups = new Dictionary<object, InnerGroupSubscription>();
-      readonly Dictionary<int, IDisposable> _rows = new Dictionary<int, IDisposable>();
-      string
-         _leg_type_desc,
-         _security_desc,
-         _quantity_desc,
-         _price_multiplier_desc;
-
-      IDisposable _dispose;
-      bool _is_expanded;
-
-      public SyntheticImportRowCollectionViewGroup(CollectionViewGroup from, SyntheticImportRowCollectionView root) : base(from.Name) {
-         _root = root;
-         _from = from;
-         ((INotifyCollectionChanged)_from.Items).CollectionChanged += _from_items_CollectionChanged;
-         _from_items_CollectionChanged(_from.Items, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, _from.Items, 0));
-      }
-
-      public event Action ProtectedItemCountChanged;
-      public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
-
-      public override bool IsBottomLevel => _from.IsBottomLevel;
-      public bool is_expanded { get => _is_expanded; set => _set(ref _is_expanded, value); }
-      public int level => parent == null ? 1 : parent.level + 1;
-      public SyntheticImportRowCollectionViewGroup parent { get; private set; }
-      // leg type desc
-      public string leg_type_desc =>
-         _leg_type_desc ?? (_leg_type_desc = string.Join(_desc_delim, ProtectedItems.OfType<ContractLegVM>().Select(l => l.leg_type.display_name())));
-      // price multiplier desc
-      public string price_multiplier_desc =>
-         _price_multiplier_desc ?? (_price_multiplier_desc = string.Join(_desc_delim, ProtectedItems.OfType<ContractLegVM>().Select(l => l.price_multiplier)));
-      // quantity desc
-      public string quantity_desc =>
-         _quantity_desc ?? (_quantity_desc = string.Join(_desc_delim, ProtectedItems.OfType<ContractLegVM>().Select(l => l.quantity)));
-      // security desc
-      public string security_desc =>
-         _security_desc ?? (_security_desc = string.Join(_desc_delim, ProtectedItems.OfType<ContractLegVM>().Select(l => l.security?.ToString() ?? "?").ExceptNull()).if_null_or_empty("(No Legs)"));
-
-      new int ProtectedItemCount {
-         get => base.ProtectedItemCount;
-         set {
-            if (base.ProtectedItemCount != value) {
-               base.ProtectedItemCount = value;
-               ProtectedItemCountChanged?.Invoke();
-            }
-         }
-      }
-
-      public bool HasErrors => Items.OfType<ContractLegVM>().Any(l => l.HasErrors);
-      public IEnumerable GetErrors(string propertyName) =>
-         propertyName == nameof(Items) ?
-         Items.OfType<ContractLegVM>().SelectMany(l => l.AllErrors) :
-         Enumerable.Empty<string>();
-
-      public void set_all_expanded(bool is_expanded) {
-         this.is_expanded = is_expanded;
-         foreach (var g in Items.OfTypeSafe<SyntheticImportRowCollectionViewGroup>())
-            g.set_all_expanded(is_expanded);
-      }
-
-      public bool Equals(SyntheticImportRowCollectionViewGroup other) =>
-         other != null &&
-         level == other.level &&
-         Equals(Name, other.Name);
-
-      void IRaiseNotifyPropertyChanged.raise_notify_property_changed(string prop) =>
-         OnPropertyChanged(new PropertyChangedEventArgs(prop));
-
-      void _add_item(int index, object item) {
-         Log.assert(index >= 0, "Index is less than 0.");
-         if (item is CollectionViewGroup group) {
-            var inner_group = new SyntheticImportRowCollectionViewGroup(group, _root);
-            _inner_groups.Add(group.Name, new InnerGroupSubscription(this, inner_group));
-            ProtectedItems.Insert(index, inner_group);
-         } else {
-            var row = (ContractLegVM)item;
-            if (_rows.TryPopValue(row.id, out var sub))
-               sub.Dispose();
-            _rows[row.id] = _connect_row(row);
-            ProtectedItems.Insert(index, item);
-         }
-      }
-
-      void _remove_item(int index, object item) {
-         if (item is SyntheticImportRowCollectionViewGroup inner_group) {
-            if (!_inner_groups.TryPopValue(inner_group.Name, out var ig_sub))
-               throw new InvalidOperationException($"Inner groups cache does not have an entry for the specified name '{inner_group.Name}' (entire tree structure may be compromised).");
-            ig_sub.Dispose();
-            Disposable.dispose(ref inner_group._dispose);
-         }
-         ProtectedItems.RemoveAt(index);
-      }
-
-      void _from_items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
-         switch (e.Action) {
-            case NotifyCollectionChangedAction.Add:
-               for (int i = 0; i < e.NewItems.Count; i++)
-                  _add_item(e.NewStartingIndex + i, e.NewItems[i]);
-               break;
-            case NotifyCollectionChangedAction.Remove:
-               for (int i = 0; i < e.OldItems.Count; i++)
-                  _remove_item(e.OldStartingIndex, ProtectedItems[e.OldStartingIndex]);
-               break;
-            case NotifyCollectionChangedAction.Replace:
-               for (int i = 0; i < e.OldItems.Count; i++)
-                  _remove_item(e.OldStartingIndex, ProtectedItems[e.OldStartingIndex]);
-               for (int i = 0; i < e.NewItems.Count; i++)
-                  _add_item(e.NewStartingIndex + i, e.NewItems[i]);
-               break;
-            case NotifyCollectionChangedAction.Reset:
-               while (ProtectedItems.Count > 0)
-                  _remove_item(0, ProtectedItems[0]);
-               for (int i = 0; i < _from.Items.Count; i++)
-                  _add_item(i, _from.Items[i]);
-               break;
-         }
-      }
-
-      void _invalidate_props(params string[] props) {
-         for (int i = 0; i < props.Length; i++)
-            OnPropertyChanged(new PropertyChangedEventArgs(props[i]));
-      }
-
-      void _set<T>(ref T backing, T new_value, [CallerMemberName]string prop = "") =>
-         _set(ref backing, new_value, EqualityComparer<T>.Default, prop);
-
-      void _set<T>(ref T backing, T new_value, IEqualityComparer<T> comparer, [CallerMemberName]string prop = "") {
-         if (!comparer.Equals(backing, new_value)) {
-            backing = new_value;
-            OnPropertyChanged(new PropertyChangedEventArgs(prop));
-         }
-      }
-
-      IDisposable _connect_row(ContractLegVM row) {
-         row.result_changed += on_result_changed;
-         row.ErrorsChanged += on_errors_changed;
-         return Disposable.Create(() => {
-            row.result_changed -= on_result_changed;
-            row.ErrorsChanged -= on_errors_changed;
-         });
-         void on_result_changed() {
-            _security_desc = null;
-            _price_multiplier_desc = null;
-            _quantity_desc = null;
-            _leg_type_desc = null;
-            _invalidate_props(nameof(security_desc), nameof(price_multiplier_desc), nameof(quantity_desc), nameof(leg_type_desc));
-         }
-         void on_errors_changed(object sender, DataErrorsChangedEventArgs e) =>
-            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Items)));
-      }
-
-      class InnerGroupSubscription : IDisposable {
-         public readonly SyntheticImportRowCollectionViewGroup _inner_group;
-         readonly SyntheticImportRowCollectionViewGroup _parent;
-         int _last_count;
-
-         public InnerGroupSubscription(SyntheticImportRowCollectionViewGroup parent, SyntheticImportRowCollectionViewGroup inner_group) {
-            _parent = parent;
-            _inner_group = inner_group;
-            _inner_group.parent = parent;
-            // init item count
-            _on_item_count_changed();
-            // listen to item count changes
-            _inner_group.ProtectedItemCountChanged += _on_item_count_changed;
-         }
-
-         public void Dispose() {
-            _inner_group.ProtectedItemCountChanged -= _on_item_count_changed;
-            _inner_group.parent = null;
-            // make sure the state is valid (if a bad state goes by undetected here, nefarious/difficult-to-track bugs could arise)
-            if (_last_count != _inner_group.ProtectedItemCount) {
-               Log.Ui.warn("Cached inner count is not equal to the inner group's ItemCount (entire tree structure may be compromised).");
-            }
-            _parent.ProtectedItemCount -= _last_count;
-         }
-
-         void _on_item_count_changed() {
-            // add the delta
-            _parent.ProtectedItemCount += (_inner_group.ProtectedItemCount - _last_count);
-            // reset the local cache
-            _last_count = _inner_group.ProtectedItemCount;
-         }
-      }
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportVM.cs

@@ -1,253 +0,0 @@
-using bts.api;
-using bts.collections;
-using bts.spark;
-using mbts;
-using mbts.collections;
-using mbts.spark;
-using mbts.ui;
-using mbts.ui.shell;
-using mbts.ui.utility;
-using mbts.user.settings;
-using mbts.utils;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Windows.Data;
-using System.Windows.Input;
-using Disposable = mbts.Disposable;
-
-namespace bts.shell.spreader {
-   class SyntheticImportVM : DisposableViewModelBase, IRequestViewClose {
-      IReadOnlyDictionary<uint, SecurityMD> _security_map = DictionaryHelper.empty<uint, SecurityMD>();
-
-      public SyntheticImportVM() {
-         var rows_view = new SyntheticImportRowCollectionView(flat_legs);
-         rows_view.GroupDescriptions.Add(new PropertyGroupDescription(nameof(ContractLegVM.owner)));
-         this.rows_view = rows_view;
-         ok_cmd = new DelegateCommand(() => import_request?.Invoke());
-         cancel_cmd = new DelegateCommand(() => RequestClose?.Invoke(this, new EventArgs()));
-         _dispose = ObservableAutoWrapper.connect_item_hooks(
-            rows,
-            r => {
-               flat_legs.AddRange(r.legs);
-               return Disposable.Create(() => flat_legs.removeRange(r.legs));
-            });
-      }
-
-      public event Action import_request;
-      public event EventHandler RequestClose;
-
-      public ObservableCollection<SyntheticImportRowVM> rows { get; } = new ObservableCollection<SyntheticImportRowVM>();
-      public ObservableCollection<ContractLegVM> flat_legs { get; } = new ObservableCollection<ContractLegVM>();
-      public IReadOnlyDictionary<uint, SecurityMD> security_map { get => _security_map; set => Set(ref _security_map, value); }
-      public ICollectionView rows_view { get; }
-      // commands
-      public ICommand ok_cmd { get; }
-      public ICommand cancel_cmd { get; }
-   }
-
-   class SyntheticImportRowVM : DisposableViewModelBase, IEquatable<SyntheticImportRowVM> {
-      readonly ReactiveThresholdMonitor<ContractLegVM> _leg_errors_mon = new ReactiveThresholdMonitor<ContractLegVM>(l => l.subscribe_has_errors(true));
-      readonly Func<string, bool> _get_name_exists;
-      SecurityImmutable? _security;
-      ExecutionStrategyImmutable? _strategy;
-      TickFactors _tick_factors;
-      string _name;
-      bool _is_selected;
-
-      public SyntheticImportRowVM(uint user_id, Func<string, bool> get_name_exists) {
-         this.user_id = user_id;
-         _get_name_exists = get_name_exists;
-         _validate();
-         add_leg_cmd = new DelegateCommand<SyntheticImportRowVM>(r => {
-            if (r != null) {
-               r.legs.Add(new ContractLegVM {
-                  price_multiplier = 1,
-                  quantity = 1,
-                  owner = r
-               });
-            }
-         });
-         remove_leg_cmd = new DelegateCommand<ContractLegVM>(l => l?.owner?.legs?.Remove(l));
-         PropertyChanged += on_property_changed;
-         var disp = new DisposableCombo(
-            _leg_errors_mon.OnDispatcher().Subscribe(v => _validate()),
-            ObservableAutoWrapper.connect_item_hooks(legs,
-               l => {
-                  l.result_changed += invalidate;
-                  return new DisposableCombo(_leg_errors_mon.join(l), l) +
-                  new Action(() => l.result_changed -= invalidate);
-               })) +
-            new Action(() => PropertyChanged -= on_property_changed);
-
-         void invalidate() {
-            _security = null;
-            _strategy = null;
-            _validate();
-            result_changed?.Invoke();
-         }
-
-         void on_property_changed(object sender, PropertyChangedEventArgs e) =>
-            invalidate();
-      }
-
-      public event Action result_changed;
-
-      public SecurityImmutable result =>
-         _security ?? (_security = new SecurityImmutable(to_security())).Value;
-
-      public ExecutionStrategyImmutable strategy =>
-         _strategy ?? (_strategy = new ExecutionStrategyImmutable(to_strategy())).Value;
-
-      public (SecurityImmutable security, ExecutionStrategyImmutable strategy) result_tuple =>
-         (result, strategy);
-
-      public ParsedSyntheticContract parsed_synth { get; set; }
-
-      public string name { get => _name; set => Set(ref _name, value); }
-      public uint user_id { get; }
-      public TickFactors tick_factors { get => _tick_factors; set => Set(ref _tick_factors, value); }
-      public ObservableCollection<ContractLegVM> legs { get; } = new ObservableCollection<ContractLegVM>();
-      public bool is_selected { get => _is_selected; set => Set(ref _is_selected, value); }
-      public ICommand add_leg_cmd { get; }
-      public ICommand remove_leg_cmd { get; }
-
-      public Security to_security() {
-         var sc = new SyntheticContract {
-            Name = name,
-            UserId = user_id
-         };
-         sc.Legs.AddRange(legs.Select(l => l.to_contract_leg()));
-         return new Security {
-            Synthetic = sc,
-            Symbol = sc.Legs.FirstOrDefault()?.Security?.Symbol ?? string.Empty,
-            Exchange = Venue.Bts,
-            ContractSpec = tick_factors.to_spec()
-         };
-      }
-
-      public ExecutionStrategy to_strategy() {
-         var strat = new ExecutionStrategy();
-         foreach (var l in legs) {
-            if (l.security.HasValue)
-               strat.LegParamsMap[l.security.Value.Id] = l.to_leg_params();
-         }
-         return strat;
-      }
-
-      void _validate() {
-         using (validation()) {
-            if (string.IsNullOrEmpty(name)) {
-               validation_assert(false, "Name is not specified.", nameof(name));
-            } else if (_get_name_exists(name)) {
-               validation_assert(false, "Name already exists.", nameof(name));
-            }
-            validation_assert(tick_factors != null && tick_factors.is_valid(), "Invalid tick", nameof(tick_factors));
-            validation_assert(legs.Count > 0 && !_leg_errors_mon.is_above_threshold, "Invalid legs.", nameof(legs));
-         }
-      }
-
-      public bool Equals(SyntheticImportRowVM other) =>
-         other != null &&
-         parsed_synth.unpersisted_id == other.parsed_synth.unpersisted_id;
-
-      public override bool Equals(object obj) =>
-         Equals(obj as SyntheticImportRowVM);
-
-      public override int GetHashCode() =>
-         parsed_synth.unpersisted_id;
-   }
-
-   class ContractLegVM : DisposableViewModelBase, IEquatable<ContractLegVM> {
-      ContractLegImmutable? _leg;
-      LegSpreaderParamsImmutable? _leg_params;
-      SecurityImmutable? _security;
-      double _price_multiplier, _quantity;
-      ContractLegType _leg_type;
-      bool _is_selected;
-
-      public ContractLegVM() {
-         PropertyChanged += on_property_changed;
-         _dispose = Disposable.Create(() => PropertyChanged -= on_property_changed);
-         _validate();
-         void on_property_changed(object sender, PropertyChangedEventArgs e) {
-            switch (e.PropertyName) {
-               case nameof(security):
-               case nameof(price_multiplier):
-               case nameof(quantity):
-                  _leg = null;
-                  break;
-               case nameof(leg_type):
-                  _leg_params = null;
-                  break;
-               default: return;
-            }
-            _validate();
-            result_changed?.Invoke();
-         }
-      }
-
-      public event Action result_changed;
-
-      public ParsedContractLeg parsed_leg { get; set; }
-      public SyntheticImportRowVM owner { get; set; }
-      public int owner_id => owner.parsed_synth.unpersisted_id;
-      public int id => parsed_leg.id;
-
-      public ContractLegImmutable leg =>
-         _leg ?? (_leg = new ContractLegImmutable(to_contract_leg())).Value;
-
-      public LegSpreaderParamsImmutable leg_params =>
-         _leg_params ?? (_leg_params = new LegSpreaderParamsImmutable(to_leg_params())).Value;
-
-      public (ContractLegImmutable leg, LegSpreaderParamsImmutable leg_params) result_tuple =>
-         (leg, leg_params);
-
-      public SecurityImmutable? security { get => _security; set => Set(ref _security, value); }
-      public double price_multiplier { get => _price_multiplier; set => Set(ref _price_multiplier, value); }
-      public double quantity { get => _quantity; set => Set(ref _quantity, value); }
-      public ContractLegType leg_type { get => _leg_type; set => Set(ref _leg_type, value); }
-      public bool is_selected { get => _is_selected; set => Set(ref _is_selected, value); }
-
-      public void load(ContractLegImmutable leg) {
-         security = leg.Security;
-         price_multiplier = leg.PriceMultiplier;
-         quantity = leg.Quantity;
-      }
-
-      public ContractLeg to_contract_leg() =>
-         new ContractLeg {
-            Security = security?.CloneToMutable(),
-            PriceMultiplier = price_multiplier,
-            Side = quantity < 0 ? Side.Sell : Side.Buy,
-            Quantity = Math.Abs(quantity)
-         };
-
-      public LegSpreaderParams to_leg_params() {
-         var lps = SyntheticDataHelper.Defaults.LegSpreaderParams;
-         lps.EnableHedging = (leg_type & ContractLegType.Hedge) != 0;
-         lps.IsActiveQuoting = (leg_type & ContractLegType.Quote) != 0;
-         return lps;
-      }
-
-      void _validate() {
-         using (validation()) {
-            validation_assert(security.is_exchange_security(), "Invalid security", nameof(security));
-            validation_assert(price_multiplier.IsNonZero(), "Invalid price multiplier", nameof(price_multiplier));
-            validation_assert(quantity.IsNonZero(), "Invalid quantity", nameof(quantity));
-         }
-      }
-
-      public bool Equals(ContractLegVM other) =>
-         other != null && id == other.id;
-
-      public override bool Equals(object obj) =>
-         Equals(obj as ContractLegVM);
-
-      public override int GetHashCode() =>
-         id;
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml

@@ -1,270 +0,0 @@
-<UserControl
-  x:Class="bts.shell.spreader.SyntheticImportView"
-  x:ClassModifier="internal"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:u="clr-namespace:mbts.ui"
-  xmlns:c="clr-namespace:mbts.ui.controls"
-  xmlns:cv="clr-namespace:mbts.ui.converters"
-  xmlns:spr="clr-namespace:bts.shell.spreader"
-  xmlns:pnl="clr-namespace:bts.shell.pnl"
-  MinWidth="400"
-  Content="{Binding}"
->
-  <UserControl.Resources>
-    <cv:GridLengthConverter x:Key="GridLengthPixelConverter" UnitType="Pixel"/>
-    <Style x:Key="GroupDesc" TargetType="TextBlock">
-      <Setter Property="Margin" Value="{x:Static spr:SyntheticImportView.CellPadding}"/>
-      <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Self}}"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="Foreground" Value="#80000000"/>
-      <Setter Property="FontStyle" Value="Italic"/>
-    </Style>
-    <DataTemplate DataType="{x:Type spr:ContractLegVM}">
-      <c:ContractPickerPopup
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        CloseOnCancel="True"
-        CloseOnOK="True"
-        Header="{Binding security}"
-        IsEditMode="False"
-        IsLazy="True"
-        SecurityMap="{Binding DataContext.security_map, RelativeSource={RelativeSource AncestorType=DataGrid}, Mode=OneWay}"
-        SelectedSecurity="{Binding security, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-        ShowDialogSkirt="True"
-        ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
-      />
-    </DataTemplate>
-    <DataTemplate DataType="{x:Type spr:SyntheticImportVM}">
-      <c:DIYGrid
-        Grid.IsSharedSizeScope="True"
-        Rows="{Binding rows_view}"
-        RowHeight="{x:Static spr:SyntheticImportView.RowHeight}"
-        RowsHorizontalScrollBarVisibility="Collapsed"
-        SelectionHighlight="#30000000"
-        SelectionMode="Single"
-        SupportGroupItems="True"
-      >
-        <c:DIYGrid.Columns>
-          <c:DIYGridColumnCollection>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.Name}" Width="106"/>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.Ticks}" Width="128"/>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.Security}" Header="Securities" Width="120"/>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.Quantity}" Header="Quantities" Width="70"/>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.PriceMultiplier}" Header="Price Multipliers" Width="80"/>
-            <spr:SyntheticImportColumn key="{x:Static spr:SyntheticImportColumns.LegType}" Header="Leg Types" Width="83"/>
-          </c:DIYGridColumnCollection>
-        </c:DIYGrid.Columns>
-        <c:DIYGrid.GroupStyle>
-          <GroupStyle>
-            <GroupStyle.ContainerStyle>
-              <Style TargetType="GroupItem">
-                <Setter Property="HorizontalAlignment" Value="Left"/>
-                <EventSetter Event="MouseDown" Handler="_on_group_item_mouse_down"/>
-                <!--Note: Tag is bound to 'Items' so errors on the 'Items' prop will be included in Validation.Errors.-->
-                <Setter Property="Tag">
-                  <Setter.Value>
-                    <MultiBinding>
-                      <MultiBinding.Converter>
-                        <cv:MultiValueConverterPipe/>
-                      </MultiBinding.Converter>
-                      <Binding Path="Name.legs"/>
-                      <Binding Path="Name.name"/>
-                    </MultiBinding>
-                  </Setter.Value>
-                </Setter>
-                <Setter Property="Template">
-                  <Setter.Value>
-                    <ControlTemplate TargetType="GroupItem">
-                      <Grid
-                        c:DIYGrid.SyncWithColumnGeometry="True"
-                        u:StateManager.VisualState="{Binding IsChecked, ElementName=expander, Converter={x:Static pnl:PNLView.ExpandedVisualStateConverter}}"
-                        Background="{TemplateBinding Background}"
-                      >
-                        <VisualStateManager.VisualStateGroups>
-                          <VisualStateGroup Name="ExpansionStates">
-                            <VisualState Name="Expanded"/>
-                            <VisualState Name="Collapsed">
-                              <Storyboard>
-                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="presenter" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                  <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}"/>
-                                </ObjectAnimationUsingKeyFrames>
-                              </Storyboard>
-                            </VisualState>
-                          </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid.RowDefinitions>
-                          <RowDefinition Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}, Converter={StaticResource GridLengthPixelConverter}}"/>
-                          <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Fill="Gray" UseLayoutRounding="True"/>
-                        <!--Expander Toggle-->
-                        <c:ExpanderToggleButton
-                          x:Name="expander"
-                          Grid.ColumnSpan="99"
-                          Validation.ValidationAdornerSiteFor="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                          ArrowPadding="14,2,0,0"
-                          Background="{u:Brush Transparent}"
-                          BorderThickness="0"
-                          HorizontalAlignment="Stretch"
-                          HorizontalContentAlignment="Left"
-                          Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}}"
-                          IsChecked="{Binding is_expanded}"
-                        >
-                          <u:StateManager.VisualState>
-                            <Binding Path="TemplatedParent.(Validation.Errors).Count" RelativeSource="{RelativeSource Self}">
-                              <Binding.Converter>
-                                <cv:ValueConverterPipe>
-                                  <cv:IntGreaterThanConverter Value="0"/>
-                                  <cv:BooleanToObjectConverter ValueForFalse="NoErrors" ValueForTrue="Errors"/>
-                                </cv:ValueConverterPipe>
-                              </Binding.Converter>
-                            </Binding>
-                          </u:StateManager.VisualState>
-                          <u:StateManager.Groups>
-                            <u:StateGroupsManager AttachToMembers="True">
-                              <u:StateDefinitionCollection>
-                                <u:MouseStateDefinition MouseSource="{Binding Group.Target, RelativeSource={RelativeSource Self}}"/>
-                              </u:StateDefinitionCollection>
-                            </u:StateGroupsManager>
-                          </u:StateManager.Groups>
-                          <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup Name="MouseStates">
-                              <VisualState Name="Normal"/>
-                              <VisualState Name="MouseOver">
-                                <Storyboard>
-                                  <ColorAnimation Storyboard.TargetName="expander" Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="#10000000"/>
-                                </Storyboard>
-                              </VisualState>
-                              <VisualState Name="Pressed">
-                                <Storyboard>
-                                  <ColorAnimation Storyboard.TargetName="expander" Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="#10000000"/>
-                                </Storyboard>
-                              </VisualState>
-                            </VisualStateGroup>
-                          </VisualStateManager.VisualStateGroups>
-                          <Validation.ErrorTemplate>
-                            <ControlTemplate TargetType="Control">
-                              <Grid>
-                                <AdornedElementPlaceholder x:Name="adorned_element_pl"/>
-                                <Border x:Name="exclamation" HorizontalAlignment="Left">
-                                  <Image Height="12" Margin="6,0,0,0" VerticalAlignment="Center" Source="{x:Static u:Icons.WarningExclamation}"/>
-                                </Border>
-                                <ContentControl u:Behavior.MirrorLayoutFor="{Binding ElementName=exclamation}" ToolTip="{Binding AdornedElement.(Validation.ValidationAdornerSiteFor).(Validation.Errors), ElementName=adorned_element_pl}">
-                                  <ContentControl.Template>
-                                    <ControlTemplate TargetType="ContentControl">
-                                      <Grid Background="Transparent">
-                                        <Grid.ToolTip>
-                                          <ToolTip Content="{Binding ToolTip, RelativeSource={RelativeSource TemplatedParent}}">
-                                            <ToolTip.ContentTemplate>
-                                              <DataTemplate>
-                                                <ItemsControl ItemsSource="{Binding}" DisplayMemberPath="ErrorContent"/>
-                                              </DataTemplate>
-                                            </ToolTip.ContentTemplate>
-                                          </ToolTip>
-                                        </Grid.ToolTip>
-                                      </Grid>
-                                    </ControlTemplate>
-                                  </ContentControl.Template>
-                                </ContentControl>
-                              </Grid>
-                            </ControlTemplate>
-                          </Validation.ErrorTemplate>
-                          <Grid c:DIYGrid.SyncWithColumnGeometry="True" Margin="-22,0,0,0">
-                            <c:EditableTextBlock
-                              x:Name="PART_Name_EditableTextBlock"
-                              Grid.Column="0"
-                              Margin="22,0,0,0"
-                              EndEditOnLostKeyboardFocus="True"
-                              Foreground="{u:Brush Black}"
-                              Text="{Binding Name.name}"
-                              ToolTip="Click to Edit Name"
-                              UseLayoutRounding="True"
-                              VerticalAlignment="Center"
-                            >
-                              <c:EditableTextBlock.CommandBindings>
-                                <CommandBinding Command="{x:Static c:EditableTextBlock.BeginEditCommand}" Executed="{x:Static c:EditableTextBlock.BeginEditExecuted}"/>
-                                <CommandBinding Command="{x:Static c:EditableTextBlock.EndEditCommand}" Executed="{x:Static c:EditableTextBlock.EndEditExecuted}"/>
-                                <CommandBinding Command="{x:Static c:EditableTextBlock.CancelEditCommand}" Executed="{x:Static c:EditableTextBlock.CancelEditExecuted}"/>
-                              </c:EditableTextBlock.CommandBindings>
-                              <c:EditableTextBlock.InputBindings>
-                                <MouseBinding MouseAction="LeftClick" Command="{x:Static c:EditableTextBlock.BeginEditCommand}"/>
-                                <KeyBinding Key="Return" Command="{x:Static c:EditableTextBlock.EndEditCommand}"/>
-                                <KeyBinding Key="Esc" Command="{x:Static c:EditableTextBlock.CancelEditCommand}"/>
-                              </c:EditableTextBlock.InputBindings>
-                            </c:EditableTextBlock>
-                            <c:TickFactorsPicker
-                              c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.Ticks}"
-                              Margin="{x:Static spr:SyntheticImportView.CellPadding}"
-                              SelectedTickFactors="{Binding Name.tick_factors}"
-                              UseLayoutRounding="True"
-                            />
-                            <TextBlock c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.Security}" Text="{Binding security_desc}" Style="{StaticResource GroupDesc}"/>
-                            <TextBlock c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.Quantity}" Text="{Binding quantity_desc}" Style="{StaticResource GroupDesc}"/>
-                            <TextBlock c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.PriceMultiplier}" Text="{Binding price_multiplier_desc}" Style="{StaticResource GroupDesc}"/>
-                            <TextBlock c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.LegType}" Text="{Binding leg_type_desc}" Style="{StaticResource GroupDesc}">
-                              <TextBlock.ToolTip>
-                                <TextBlock>
-                                  <Run Text="{Binding leg_type_desc, Mode=OneWay}"/>
-                                  <LineBreak/>
-                                  <Run Text="Q = Quote"/>
-                                  <LineBreak/>
-                                  <Run Text="H = Hedge"/>
-                                  <LineBreak/>
-                                  <Run Text="N = None"/>
-                                </TextBlock>
-                              </TextBlock.ToolTip>
-                            </TextBlock>
-                          </Grid>
-                        </c:ExpanderToggleButton>
-                        <ItemsPresenter x:Name="presenter" Grid.Row="1" Grid.ColumnSpan="99"/>
-                      </Grid>
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </GroupStyle.ContainerStyle>
-          </GroupStyle>
-        </c:DIYGrid.GroupStyle>
-        <c:DIYGrid.RowTemplate>
-          <DataTemplate DataType="{x:Type spr:ContractLegVM}">
-            <Grid c:DIYGrid.SyncWithColumnGeometry="True">
-              <c:ContractPickerPopup
-                c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.Security}" 
-                Background="Transparent"
-                BorderThickness="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                Margin="{x:Static spr:SyntheticImportView.CellPadding}"
-                CloseOnCancel="True"
-                CloseOnOK="True"
-                Header="{Binding security, Converter={x:Static cv:ValueConverters.SecuritySelectorText}}"
-                IsEditMode="False"
-                IsLazy="True"
-                SecurityMap="{Binding DataContext.security_map, RelativeSource={RelativeSource AncestorType=c:DIYGrid}, Mode=OneWay}"
-                SelectedSecurity="{Binding security, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                ShowDialogSkirt="True"
-                ToolTip="{Binding SelectedSecurity, RelativeSource={RelativeSource Self}}"
-              >
-              </c:ContractPickerPopup>
-              <c:TickUpDownDouble
-                c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.Quantity}"
-                Margin="{x:Static spr:SyntheticImportView.CellPadding}"
-                Value="{Binding quantity}"
-              />
-              <c:TickUpDownDouble
-                c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.PriceMultiplier}"
-                Margin="{x:Static spr:SyntheticImportView.CellPadding}"
-                Value="{Binding price_multiplier}"
-              />
-              <spr:ContractLegTypeView
-                c:DIYGrid.ColumnKey="{x:Static spr:SyntheticImportColumns.LegType}"
-                Value="{Binding leg_type}"
-              />
-            </Grid>
-          </DataTemplate>
-        </c:DIYGrid.RowTemplate>
-      </c:DIYGrid>
-    </DataTemplate>
-  </UserControl.Resources>
-</UserControl>

src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml.cs

@@ -1,50 +0,0 @@
-using mbts.ui.controls;
-using mbts.ui.dpi;
-using mbts.ui.utility;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace bts.shell.spreader {
-   enum SyntheticImportColumns {
-      Name = 1,
-      Security,
-      Ticks,
-      PriceMultiplier,
-      Quantity,
-      LegType
-   }
-
-   /// <summary>
-   /// Interaction logic for SyntheticImportView.xaml
-   /// </summary>
-   partial class SyntheticImportView : UserControl {
-      public static double RowHeight =>
-         27.0.RoundLayoutValue();
-
-      public static Thickness CellPadding =>
-         new Thickness(6, 3, 6, 3).RoundToLayout();
-
-      public SyntheticImportView() =>
-         InitializeComponent();
-
-      void _on_group_item_mouse_down(object sender, MouseButtonEventArgs e) {
-         if (!e.Handled && e.ClickCount == 2 && sender is FrameworkElement el && el.DataContext is SyntheticImportRowCollectionViewGroup group) {
-            group.is_expanded = !group.is_expanded;
-            e.Handled = true;
-         }
-      }
-   }
-
-   class SyntheticImportColumn : DIYGrid.ColumnBase<SyntheticImportColumns> {
-      public SyntheticImportColumn() =>
-         is_visible = true;
-
-      protected override void on_key_initialized(SyntheticImportColumns key) {
-         if (Header == null)
-            Header = EnumHelper.get_display_name(key);
-         if (id == null)
-            id = key.ToString();
-      }
-   }
-}

src/client/spark/Modules/Spreader/Import/SyntheticImporter.cs

@@ -1,194 +0,0 @@
-using bts;
-using bts.api;
-using bts.collections;
-using bts.shell.spreader;
-using mbts.ui;
-using mbts.ui.utility;
-using mbts.utils;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace mbts.spark {
-   static class SyntheticImporter {
-      const string _import_title = "Import Synthetics";
-      static readonly TimeSpan _import_op_sec_map_timeout = TimeSpan.FromSeconds(30);
-
-      public static IDisposable import_from_file(string path, IBus bus, OrdersModel orders_model) {
-         bool is_disposed = false;
-         IDisposable dispose_op = null;
-         dispose_op = Disposable.Create(() => is_disposed = true);
-         impl();
-         return Disposable.Create(() => Disposable.dispose(ref dispose_op));
-         async void impl() {
-            IReadOnlyDictionary<uint, SecurityMD> sec_md_map = null;
-            while (true) {
-               await Task.WhenAny(init_sec_md_map(), Task.Delay(_import_op_sec_map_timeout));
-               if (is_disposed)
-                  return;
-               if (sec_md_map != null)
-                  break;
-               if (!retry_on_error($"Synthetic import op timed out waiting for security map after {_import_op_sec_map_timeout.TotalSeconds:0.00} seconds."))
-                  return;
-            }
-            // The following conditions should break the while loop:
-            //    1) the import succeeds
-            //    2) the import fails, and the user does not click 'Yes' in the 'try again...' confirmation dialog
-            while (true) {
-               string error_msg = null;
-               try {
-                  var raw_lines = File.ReadAllLines(path);
-                  var used_names = new HashSet<string>(sec_md_map.Values.Where(smd => smd.security.ContractCase == Security.ContractOneofCase.Synthetic)
-                     .Select(smd => smd.security.Synthetic.Name));
-                  var parsed_synths = SyntheticSecurityParser.parse_rows(raw_lines, MappedDictionary.create(sec_md_map, smd => smd.security), used_names).ToList();
-                  var main_vm = new SyntheticImportVM() {
-                     security_map = sec_md_map
-                  };
-                  // add rows/conflicts
-                  main_vm.rows.AddRange(parsed_synths.Select(ps => {
-                     var sec = ps.result;
-                     var r = new SyntheticImportRowVM(orders_model.admin_model.user.id, used_names.Contains) {
-                        tick_factors = TickUtils.get_regional_ticks(sec.ContractSpec).low_tick,
-                        name = sec.Synthetic.Name,
-                        parsed_synth = ps
-                     };
-                     r.legs.AddRange(ps.legs.Zip(sec.Synthetic.Legs).Select(tup => {
-                        var (pl, l) = tup;
-                        var leg_vm = new ContractLegVM {
-                           price_multiplier = l.PriceMultiplier,
-                           quantity = l.Quantity,
-                           parsed_leg = pl,
-                           owner = r,
-                           leg_type =
-                              (pl.result_tuple.leg_params.EnableHedging ? ContractLegType.Hedge : ContractLegType.None) |
-                              (pl.result_tuple.leg_params.IsActiveQuoting ? ContractLegType.Quote : ContractLegType.None)
-                        };
-                        if (l.Security != null)
-                           leg_vm.security = new SecurityImmutable(l.Security);
-                        return leg_vm;
-                     }));
-                     return r;
-                  }));
-                  var main_win = new SyntheticImportDialog { DataContext = main_vm };
-                  ui.WindowStyle.SetSizeToContent(main_win, SizeToContent.WidthAndHeight);
-                  main_vm.import_request += on_main_import_request;
-                  main_win.move_to_mouse(-200, -75);
-                  dispose_op = WindowUtilities.connect_vm(main_win, main_vm, main_vm);
-                  main_win.Show();
-                  // conflicts
-                  var conflicts = SyntheticSecurityParser.get_conflicts(main_vm.rows);
-                  if (conflicts.Values.Any(c => c.Count > 0)) {
-                     var conflicts_vm = new SyntheticImportConflictsVM(parsed_synths.Count) {
-                        security_map = sec_md_map
-                     };
-                     foreach (var kv in conflicts) {
-                        var assign_del = SyntheticSecurityParser.assign_component(kv.Key);
-                        foreach (var text_groups in kv.Value) {
-                           var eval = get_error_value(kv.Key);
-                           var row = new SyntheticImportConflictRowVM(kv.Key, text_groups.Key, text_groups.Value, eval, eval);
-                           conflicts_vm.conflicts.Add(row);
-                           conflicts_vm.committed += () => {
-                              foreach (var (synth, leg_vm) in text_groups.Value) {
-                                 var leg_tup = leg_vm?.parsed_leg?.result_tuple;
-                                 assign_del(synth.parsed_synth.result, leg_tup?.leg, leg_tup?.leg_params, row.value);
-                              }
-                              row.on_conflicts_resolved();
-                           };
-                        }
-                     }
-
-                     var conflicts_win = new SyntheticImportConflictsDialog {
-                        DataContext = conflicts_vm,
-                        Owner = main_win,
-                        Title = $"{_import_title} Conflicts",
-                        WindowStartupLocation = WindowStartupLocation.CenterOwner
-                     };
-                     dispose_op = new DisposableCombo(WindowUtilities.connect_vm(conflicts_win, conflicts_vm, conflicts_vm)) + dispose_op;
-
-                     conflicts_win.ShowDialog();
-                  }
-
-                  object get_error_value(SyntheticContractComponent component) {
-                     switch (component) {
-                        case SyntheticContractComponent.PriceMultiplier:
-                        case SyntheticContractComponent.Quantity: return double.NaN;
-                        default: return null;
-                     }
-                  }
-
-                  void on_main_import_request() {
-                     if (!is_disposed)
-                        import_synths(parsed_synths, main_vm.rows);
-                     Disposable.dispose(ref dispose_op);
-                  }
-               }
-               catch (Exception ex) {
-                  error_msg = $"Error parsing synthetics from file '{path}': {ex}.";
-               }
-               if (error_msg == null) {
-                  // Exit loop: the import succeeded.
-                  break;
-               }
-               if (!retry_on_error(error_msg)) {
-                  // Exit loop: the import failed, and the user did not click 'Yes' in the 'try again...' confirmation dialog.
-                  break;
-               }
-               // Continue loop: the import failed, and the user wants to try again.
-               error_msg = null;
-            }
-            async void import_synths(IReadOnlyList<ParsedSyntheticContract> parsed_synths, IEnumerable<SyntheticImportRowVM> rows) {
-               (uint? key, string error_msg)[] new_ids = null;
-               string error_msg = null;
-               try {
-                  new_ids = await orders_model.spreader.create_synthetics(
-                     rows.Where(r => !r.HasErrors)
-                     .Select(r => r.result_tuple));
-               }
-               catch (Exception ex) {
-                  Log.Ui.error($"Failed to save all synthetics during import op (one or more may have been successfully saved): {ex}.");
-                  error_msg = $"Import was unsuccessful: {ex}.";
-               }
-               if (new_ids == null)
-                  error_msg = "An unknown error occurred (check the synthetic management window to see if any synthetics were successfully added).";
-               if (error_msg != null) {
-                  BTSMessageBox.Show(error_msg, "Import Synthetics", BTSMessageBoxButtons.OK);
-               } else {
-                  Log.assert(new_ids != null);
-                  var failed = new_ids
-                     .Where(r => !r.error_msg.is_null_or_empty())
-                     .ToList();
-                  int num_succeeded = new_ids.Length - failed.Count;
-                  if (num_succeeded < parsed_synths.Count) {
-                     if (!BTSMessageBox.Confirm(
-                        $"{num_succeeded}/{parsed_synths.Count} synthetics were successfully imported.\n" +
-                        "Would you like to keep the imports that were successful?",
-                        _import_title)) {
-                        bus.post(SparkTags.SyntheticDeleteTag,
-                           ImmutableHashSet.CreateRange(new_ids.Where(r => r.key.HasValue).Select(r => r.key.Value)));
-                     }
-                  } else {
-                     BTSMessageBox.Show(
-                        $"All {num_succeeded} synthetics were successfully imported.",
-                        _import_title,
-                        BTSMessageBoxButtons.OK,
-                        MessageBoxImage.Information);
-                  }
-               }
-            }
-
-            async Task init_sec_md_map() =>
-               sec_md_map = await bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().FirstOrDefaultAsync();
-
-            bool retry_on_error(string error_msg) {
-               Log.Ui.warn(error_msg);
-               return BTSMessageBox.Confirm(error_msg + "\nTry again?", _import_title, MessageBoxImage.Exclamation);
-            }
-         }
-      }
-   }
-}