diff --git a/CMakeLists.txt b/CMakeLists.txt
index be98723f2..ab7b9d481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,6 @@ 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)
diff --git a/doc/api/.gitignore b/doc/api/.gitignore
new file mode 100644
index 000000000..ab5e793bc
--- /dev/null
+++ b/doc/api/.gitignore
@@ -0,0 +1 @@
+public
diff --git a/doc/api/config.toml b/doc/api/config.toml
new file mode 100644
index 000000000..7c49216a4
--- /dev/null
+++ b/doc/api/config.toml
@@ -0,0 +1,15 @@
+# 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"
diff --git a/doc/api/content/_index.md b/doc/api/content/_index.md
new file mode 100644
index 000000000..2af9c9fad
--- /dev/null
+++ b/doc/api/content/_index.md
@@ -0,0 +1,5 @@
++++
+title = "BTS Spark API"
++++
+
+This is index
\ No newline at end of file
diff --git a/doc/api/content/client/_index.md b/doc/api/content/client/_index.md
new file mode 100644
index 000000000..d00ac6373
--- /dev/null
+++ b/doc/api/content/client/_index.md
@@ -0,0 +1,7 @@
++++
+title="Client API"
+template="client.html"
+sort_by="weight"
++++
+
+
diff --git a/doc/api/content/client/getting-started/_index.md b/doc/api/content/client/getting-started/_index.md
new file mode 100644
index 000000000..afbb6f79f
--- /dev/null
+++ b/doc/api/content/client/getting-started/_index.md
@@ -0,0 +1,7 @@
++++
+title="Getting Started"
+template="client.html"
+sort_by="weight"
+weight = 1
++++
+
diff --git a/doc/api/content/client/getting-started/install.md b/doc/api/content/client/getting-started/install.md
new file mode 100644
index 000000000..2cd9902aa
--- /dev/null
+++ b/doc/api/content/client/getting-started/install.md
@@ -0,0 +1,9 @@
++++
+title = "Install Prerequisites"
+template="client.html"
+weight = 1
++++
+
+## Coming Soon
+
+* Install .net core
diff --git a/doc/api/content/server/_index.md b/doc/api/content/server/_index.md
new file mode 100644
index 000000000..2ea19d687
--- /dev/null
+++ b/doc/api/content/server/_index.md
@@ -0,0 +1,25 @@
++++
+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
+
+
diff --git a/doc/api/content/server/getting-started/_index.md b/doc/api/content/server/getting-started/_index.md
new file mode 100644
index 000000000..d0e0e72e1
--- /dev/null
+++ b/doc/api/content/server/getting-started/_index.md
@@ -0,0 +1,7 @@
++++
+title="Getting Started"
+template="documentation.html"
+sort_by="weight"
+weight = 1
++++
+
diff --git a/doc/api/content/server/getting-started/algostudio.png b/doc/api/content/server/getting-started/algostudio.png
new file mode 100644
index 000000000..df322e108
Binary files /dev/null and b/doc/api/content/server/getting-started/algostudio.png differ
diff --git a/doc/api/content/server/getting-started/compiled.png b/doc/api/content/server/getting-started/compiled.png
new file mode 100644
index 000000000..d81c5b1af
Binary files /dev/null and b/doc/api/content/server/getting-started/compiled.png differ
diff --git a/doc/api/content/server/getting-started/development.md b/doc/api/content/server/getting-started/development.md
new file mode 100644
index 000000000..386ba96dc
--- /dev/null
+++ b/doc/api/content/server/getting-started/development.md
@@ -0,0 +1,138 @@
++++
+title = "Development"
+weight = 3
++++
+
+# Visual Studio Code
+
+In this section we're going to use the Remote - Containers feature of Visual Studio Code to simplify the development experience. If you are using a different editor skip to the other editor 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.
+
+
+
+## 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.
+
+
+
+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.
+
+
+
+## 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.
+
+
+
+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.
+
+
+
+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.
+
+
+
+# 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.
+
+
+
+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.
diff --git a/doc/api/content/server/getting-started/docker_config.png b/doc/api/content/server/getting-started/docker_config.png
new file mode 100644
index 000000000..d8fb57ac1
Binary files /dev/null and b/doc/api/content/server/getting-started/docker_config.png differ
diff --git a/doc/api/content/server/getting-started/docker_tray.png b/doc/api/content/server/getting-started/docker_tray.png
new file mode 100644
index 000000000..f180c7a94
Binary files /dev/null and b/doc/api/content/server/getting-started/docker_tray.png differ
diff --git a/doc/api/content/server/getting-started/download.md b/doc/api/content/server/getting-started/download.md
new file mode 100644
index 000000000..be3c054a2
--- /dev/null
+++ b/doc/api/content/server/getting-started/download.md
@@ -0,0 +1,79 @@
++++
+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 info@bluetradesys.com or call (919) 913-0850 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 %}
+
+
+
+If you see this error it means Docker Desktop is not running:
+
+
+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.
+
+
+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
+```
+
+
+
+## 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.
+
+
+
diff --git a/doc/api/content/server/getting-started/gdb_launch.png b/doc/api/content/server/getting-started/gdb_launch.png
new file mode 100644
index 000000000..878d96820
Binary files /dev/null and b/doc/api/content/server/getting-started/gdb_launch.png differ
diff --git a/doc/api/content/server/getting-started/iced_algo.png b/doc/api/content/server/getting-started/iced_algo.png
new file mode 100644
index 000000000..bf1ca5b50
Binary files /dev/null and b/doc/api/content/server/getting-started/iced_algo.png differ
diff --git a/doc/api/content/server/getting-started/install.md b/doc/api/content/server/getting-started/install.md
new file mode 100644
index 000000000..01075e6af
--- /dev/null
+++ b/doc/api/content/server/getting-started/install.md
@@ -0,0 +1,57 @@
++++
+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 Docker Desktop for Windows/Mac.
+
+
+
+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.
+
+
+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.
+
+
+
+## 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.
+
+
+
+## Editor
+
+The Server SDK includes a complete configuration for C++ development with the Visual Studio Code 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.
+
+
diff --git a/doc/api/content/server/getting-started/myalgo.png b/doc/api/content/server/getting-started/myalgo.png
new file mode 100644
index 000000000..331f204df
Binary files /dev/null and b/doc/api/content/server/getting-started/myalgo.png differ
diff --git a/doc/api/content/server/getting-started/orderbook_truncated.png b/doc/api/content/server/getting-started/orderbook_truncated.png
new file mode 100644
index 000000000..0b99b937e
Binary files /dev/null and b/doc/api/content/server/getting-started/orderbook_truncated.png differ
diff --git a/doc/api/content/server/getting-started/overview.md b/doc/api/content/server/getting-started/overview.md
new file mode 100644
index 000000000..1d7fd9a4a
--- /dev/null
+++ b/doc/api/content/server/getting-started/overview.md
@@ -0,0 +1,44 @@
++++
+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/).
+
+
+
+
+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.
+
+
+
+
+
+
diff --git a/doc/api/content/server/getting-started/paramsui.png b/doc/api/content/server/getting-started/paramsui.png
new file mode 100644
index 000000000..d81b39c35
Binary files /dev/null and b/doc/api/content/server/getting-started/paramsui.png differ
diff --git a/doc/api/content/server/getting-started/vscode_notification.png b/doc/api/content/server/getting-started/vscode_notification.png
new file mode 100644
index 000000000..38674d111
Binary files /dev/null and b/doc/api/content/server/getting-started/vscode_notification.png differ
diff --git a/doc/api/content/server/getting-started/vscode_remote_containers.png b/doc/api/content/server/getting-started/vscode_remote_containers.png
new file mode 100644
index 000000000..185f16223
Binary files /dev/null and b/doc/api/content/server/getting-started/vscode_remote_containers.png differ
diff --git a/doc/api/content/server/ref/_index.md b/doc/api/content/server/ref/_index.md
new file mode 100644
index 000000000..ac7238434
--- /dev/null
+++ b/doc/api/content/server/ref/_index.md
@@ -0,0 +1,7 @@
++++
+title="Reference"
+template="documentation.html"
+sort_by="weight"
+weight = 2
++++
+
diff --git a/doc/api/content/server/ref/faq.md b/doc/api/content/server/ref/faq.md
new file mode 100644
index 000000000..7c738c0a0
--- /dev/null
+++ b/doc/api/content/server/ref/faq.md
@@ -0,0 +1,8 @@
++++
+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.
diff --git a/doc/api/content/server/ref/initialization.md b/doc/api/content/server/ref/initialization.md
new file mode 100644
index 000000000..6bc243567
--- /dev/null
+++ b/doc/api/content/server/ref/initialization.md
@@ -0,0 +1,97 @@
++++
+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` helper to retrieve a named parameter from the `order_params` collection as a `std::option`. 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(params, "Min Quantity");
+ if (!mqi || mqi.value() == 0)
+ return OrderOpResult{
+ ORDER_ERROR_INVALID_ORDER_DEFINITON,
+ "Min Quantity parameter must be defined and non zero"};
+}
+```
+
+
+
+### 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.
+
diff --git a/doc/api/content/server/ref/orders.md b/doc/api/content/server/ref/orders.md
new file mode 100644
index 000000000..5a5a342a5
--- /dev/null
+++ b/doc/api/content/server/ref/orders.md
@@ -0,0 +1,88 @@
++++
+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;
+};
+```
+
+
+
diff --git a/doc/api/content/server/ref/paramsui.png b/doc/api/content/server/ref/paramsui.png
new file mode 100644
index 000000000..d81b39c35
Binary files /dev/null and b/doc/api/content/server/ref/paramsui.png differ
diff --git a/doc/api/content/server/ref/registration.md b/doc/api/content/server/ref/registration.md
new file mode 100644
index 000000000..c909a42ac
--- /dev/null
+++ b/doc/api/content/server/ref/registration.md
@@ -0,0 +1,92 @@
++++
+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(); });
+ 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.
+
+
+
+And like this when viewed in the Spark order book.
+
+
+
+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());
+```
+
diff --git a/doc/api/content/server/ref/subscriptions.md b/doc/api/content/server/ref/subscriptions.md
new file mode 100644
index 000000000..42432634f
--- /dev/null
+++ b/doc/api/content/server/ref/subscriptions.md
@@ -0,0 +1,69 @@
++++
+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;
+```
+
diff --git a/doc/api/content/server/samples/_index.md b/doc/api/content/server/samples/_index.md
new file mode 100644
index 000000000..b02ad8516
--- /dev/null
+++ b/doc/api/content/server/samples/_index.md
@@ -0,0 +1,7 @@
++++
+title="Samples"
+template="documentation.html"
+sort_by="weight"
+weight = 3
++++
+
diff --git a/doc/api/content/server/samples/join.md b/doc/api/content/server/samples/join.md
new file mode 100644
index 000000000..0a1b7dbd3
--- /dev/null
+++ b/doc/api/content/server/samples/join.md
@@ -0,0 +1,354 @@
++++
+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.
+
+
+
+This sample is part of the Server SDK examples included in the spark_sdk.zip download.
+
+
+```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 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 ¶ms = def.custom_def().dynamic().order_params();
+ auto mqi = get_if(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 ¶ms = 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(); });
+
+ if (result != bts::AlgoRegistrationResult::SUCCESS) {
+ // The join_desc has errors
+ // Check the error log for more details
+ }
+}
+
+} // namespace order_example
+} // namespace bts
+
+```
diff --git a/doc/api/content/server/samples/template.md b/doc/api/content/server/samples/template.md
new file mode 100644
index 000000000..48c8150c0
--- /dev/null
+++ b/doc/api/content/server/samples/template.md
@@ -0,0 +1,146 @@
++++
+title = "Template"
+weight = 5
++++
+
+A mostly blank Algo template that can be used as a jump-start for developing a new Algo.
+
+
+
+This sample is part of the Server SDK examples included in the spark_sdk.zip download.
+
+
+```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(); });
+
+ 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
+```
\ No newline at end of file
diff --git a/doc/api/deploy_to_web.sh b/doc/api/deploy_to_web.sh
new file mode 100644
index 000000000..fdf8a6645
--- /dev/null
+++ b/doc/api/deploy_to_web.sh
@@ -0,0 +1,9 @@
+#/bin/bash
+
+# ../../externals/linux/bin/zola/zola build
+zola.exe build
+
+rsync -avzL public/ bts@api.bluetradesys.com:/data/sdk/public/
+
+rm -rf ./public/
+
diff --git a/doc/api/sass/_base.scss b/doc/api/sass/_base.scss
new file mode 100644
index 000000000..7f3a36563
--- /dev/null
+++ b/doc/api/sass/_base.scss
@@ -0,0 +1,97 @@
+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);
+}
diff --git a/doc/api/sass/_docs.scss b/doc/api/sass/_docs.scss
new file mode 100644
index 000000000..02478b5a6
--- /dev/null
+++ b/doc/api/sass/_docs.scss
@@ -0,0 +1,96 @@
+.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;
+ }
+ }
+}
diff --git a/doc/api/sass/_header.scss b/doc/api/sass/_header.scss
new file mode 100644
index 000000000..699e025aa
--- /dev/null
+++ b/doc/api/sass/_header.scss
@@ -0,0 +1,33 @@
+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;
+ }
+ }
+}
diff --git a/doc/api/sass/_index.scss b/doc/api/sass/_index.scss
new file mode 100644
index 000000000..74b564007
--- /dev/null
+++ b/doc/api/sass/_index.scss
@@ -0,0 +1,71 @@
+.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;
+ }
+ }
+}
diff --git a/doc/api/sass/_layout.scss b/doc/api/sass/_layout.scss
new file mode 100644
index 000000000..fbd1bc483
--- /dev/null
+++ b/doc/api/sass/_layout.scss
@@ -0,0 +1,43 @@
+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;
+}
diff --git a/doc/api/sass/_normalize.scss b/doc/api/sass/_normalize.scss
new file mode 100644
index 000000000..fa4e73dd4
--- /dev/null
+++ b/doc/api/sass/_normalize.scss
@@ -0,0 +1,447 @@
+/*! 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;
+}
diff --git a/doc/api/sass/_search.scss b/doc/api/sass/_search.scss
new file mode 100644
index 000000000..f1ffb70e8
--- /dev/null
+++ b/doc/api/sass/_search.scss
@@ -0,0 +1,47 @@
+.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;
+ }
+ }
+}
diff --git a/doc/api/sass/_themes.scss b/doc/api/sass/_themes.scss
new file mode 100644
index 000000000..dc495e678
--- /dev/null
+++ b/doc/api/sass/_themes.scss
@@ -0,0 +1,79 @@
+
+.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;
+ }
+ }
+}
diff --git a/doc/api/sass/site.scss b/doc/api/sass/site.scss
new file mode 100644
index 000000000..a9e5129ce
--- /dev/null
+++ b/doc/api/sass/site.scss
@@ -0,0 +1,19 @@
+@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";
diff --git a/doc/api/static/favicon.ico b/doc/api/static/favicon.ico
new file mode 100644
index 000000000..72ee404ee
Binary files /dev/null and b/doc/api/static/favicon.ico differ
diff --git a/doc/api/static/images/API.png b/doc/api/static/images/API.png
new file mode 100644
index 000000000..e53f95aaf
Binary files /dev/null and b/doc/api/static/images/API.png differ
diff --git a/doc/api/static/images/logo.svg b/doc/api/static/images/logo.svg
new file mode 100644
index 000000000..d9d0f4b0c
--- /dev/null
+++ b/doc/api/static/images/logo.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/doc/api/static/search.js b/doc/api/static/search.js
new file mode 100644
index 000000000..c24a59625
--- /dev/null
+++ b/doc/api/static/search.js
@@ -0,0 +1,180 @@
+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 .
+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 around search terms
+ if (word[1] === TERM_WEIGHT) {
+ teaser.push("");
+ }
+ startIndex = word[2] + word[0].length;
+ teaser.push(body.substring(word[2], startIndex));
+
+ if (word[1] === TERM_WEIGHT) {
+ teaser.push("");
+ }
+ }
+ teaser.push("…");
+ return teaser.join("");
+}
+
+function formatSearchResultItem(item, terms) {
+ return '
+ Spark consists of a client UI
+ (Spark Client),
+ 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.
+
+
+
+
+
+
+
+
+
+
+ Server SDK
+
+
+
+ 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.
+
diff --git a/doc/api/templates/shortcodes/gallery.html b/doc/api/templates/shortcodes/gallery.html
new file mode 100644
index 000000000..91a75f48a
--- /dev/null
+++ b/doc/api/templates/shortcodes/gallery.html
@@ -0,0 +1,7 @@
+{% for asset in page.assets -%}
+ {%- if asset is matching("[.](jpg|png)$") -%}
+
+
+
+ {%- endif %}
+{%- endfor %}
diff --git a/doc/api/templates/shortcodes/info.html b/doc/api/templates/shortcodes/info.html
new file mode 100644
index 000000000..920e99473
--- /dev/null
+++ b/doc/api/templates/shortcodes/info.html
@@ -0,0 +1,4 @@
+
+
+ {{body}}
+
\ No newline at end of file
diff --git a/doc/api/templates/shortcodes/linux.html b/doc/api/templates/shortcodes/linux.html
new file mode 100644
index 000000000..ee42c83ca
--- /dev/null
+++ b/doc/api/templates/shortcodes/linux.html
@@ -0,0 +1,4 @@
+
+
+ {{body}}
+
\ No newline at end of file
diff --git a/doc/api/templates/shortcodes/resize_image.html b/doc/api/templates/shortcodes/resize_image.html
new file mode 100644
index 000000000..f33bc3b5f
--- /dev/null
+++ b/doc/api/templates/shortcodes/resize_image.html
@@ -0,0 +1 @@
+
diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md
index 2ed5fb588..3b1adae92 100644
--- a/doc/user/content/release_notes/_index.md
+++ b/doc/user/content/release_notes/_index.md
@@ -4,6 +4,34 @@ weight = 3
sort_by = "weight"
insert_anchor_links = "right"
+++
+## 2.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
+### Internal Changes
+ - Lots of permission / admin changes to facilitate ICE
+
## 2.11.0
### User Visible Changes
- Fixed fills form time filter to also apply to SOD fills
@@ -22,12 +50,12 @@ insert_anchor_links = "right"
- Fills now include information about the algo that originated the fill
- A new, more powerful PnL form is now available
### API Changes
- - Added security state information (pre open, halted, normal, closed, etc)
+ - Added security state information (pre open, halted, normal, closed, etc)
### Bug Fixes
- Brought back the "select all" check box in the mini order book
- Fixed an issue in the market data subsystem that on rare occasions could result in a startup crash
### Internal Changes
- - Fixed an issue that was stopping us from interpreting SOD times as local rather than GMT
+ - Fixed an issue that was stopping us from interpreting SOD times as local rather than GMT
## 2.9.3
### Internal Changes
- Fixed system test scripts
@@ -43,7 +71,7 @@ insert_anchor_links = "right"
- Avoided shipping production configuration defaults that lead to trying to download a position file for the development sftp server.
### Api
- C# API sample now uses synchronous calls.
-
+
## 2.9.0
### User Visible Changes
- Improved Workspace management User Interface
@@ -51,11 +79,11 @@ insert_anchor_links = "right"
- The Spark UI Window group now has a title in the Windows task bar
- Added sound alerts for trade events, see Launcher -> Settings -> Alerts
- Allowed composite algos that are attached to existing orders to identify fills that were already present prior to attachment
- - Added import facilities for GMI position files
+ - Added import facilities for GMI position files
- Added the ability for risk managers to enter manual fills
- Added "raw" P&L columns, that is columns that *do not* include spread legs in their accounting
### Bug Fixes
- - Fixed the settings action menu (Load/Save/Reset to Factory)
+ - Fixed the settings action menu (Load/Save/Reset to Factory)
- Fixed the method used to determine if a security is expired to take into account the start of day time
### API Changes
- Fixed an issue in the Client SDK that could lead to occasional failures to connect to the spark server as well as excessive memory usage.
@@ -92,10 +120,10 @@ insert_anchor_links = "right"
- Made it easier to generate simple UI's for new order types
### API Changes
- Dynamic orders can now use QuantityMeasure parameter types
-
+
## 2.7.2
### User Visible Changes
- - Changed the login dialog to avoid leaking workspace names from other users.
+ - Changed the login dialog to avoid leaking workspace names from other users.
- Added new Splitter algo. From the manual: The splitter is useful
for pro-rata markets where you want to vary your exposure
independent of the order quantity that you want to fill. The
@@ -103,13 +131,13 @@ insert_anchor_links = "right"
the order quantity but it will put exposed_qty total size on the
market. Splitter favors order size over queue position.
### Internal Changes
- - Made spark more resilient to lack of connectivity to the CME web site for downloading of templates.
-
+ - Made spark more resilient to lack of connectivity to the CME web site for downloading of templates.
+
## 2.7.1
### User Visible Changes
- Fixed some issues with the Cover algo, where in some circumstances
it would erroneously cancel launched hedges on completion.
-
+
## 2.7.0
### User Visible Changes
- Allowed algos to process "in-flight" fills while shutting down
@@ -128,25 +156,25 @@ insert_anchor_links = "right"
### User Visible Changes
- Fixed an issue in the ladder where in some cases the mini order book could not be brought up from a badge
- Fixed a rare race condition that could lead to erroneous limit enforcement
- - Fixed an issue with the margin limits where an error could occur if an account name with more than 12 chars was used
+ - Fixed an issue with the margin limits where an error could occur if an account name with more than 12 chars was used
## 2.6.1
### User Visible Changes
- Fixed an issue in the ladder where an error could occur when trying to change ladder settings for the first time
-
+
## 2.6.0
### User Visible Changes
- In the ladder made last trade more distinctive when overlayed on the volumn column
- - In the ladder, corrected display of volume tool tip
+ - In the ladder, corrected display of volume tool tip
- In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes
- Added an option for the Top Algo to delete itself if within N ticks from top of book
- Address a rare issue that could lead to an error report on UI exit
- Added margin risk limits
- Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book
- - Avoided switching the current account and order type on open ladders when limits are changed
+ - Avoided switching the current account and order type on open ladders when limits are changed
### Internal Changes
- Ensure that admin logins are always allowed to login, regardless of keycode status.
-
+
## 2.5.0
### User Visible Changes
- Added loss limit risk check
@@ -176,13 +204,13 @@ insert_anchor_links = "right"
- Made Cover order more independent from its hedging chidren:
- Cover continues to operate even if an hedging child is canceled
- When a cover is canceled it will detach from any running hedging children, instead of canceling them
- - Changed Lean, Join and Cover algos to hide themselves in the ladder once they have completed their work
+ - Changed Lean, Join and Cover algos to hide themselves in the ladder once they have completed their work
- Changed manual fills to appear in day PnL rather than in the SOD records
- Add buy/sell coloring to fill rows in fills window
- Streamlined the mini order book:
- Display of the mini order book popup is quicker
- Only exchange orders are displayed
- - Update buttons are only displayed for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order
+ - Update buttons are only displayed for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order
- We can now select multiple rows to attach, detach, update or cancel multiple orders in a batch
- A checkbox column has been added to make clearer which rows are selected
### API Changes
@@ -192,7 +220,7 @@ insert_anchor_links = "right"
- Added system requirements to Spark documentation
- Implemented keycodes
- Temporarily rejected stop and stop limit orders, pending bug fixes
-
+
## 2.2.0
### User Visible Changes
- Made our orders easier to spot in MBO display
@@ -203,30 +231,30 @@ insert_anchor_links = "right"
- Improved handling of orders with undiscovered securities
- Added feedback to the ladder when the user attempts to middle click on bid/ask columns using an order that does not have parameters
- Fixed display of algo studio algo types in order book
- - Hid net change setting in synthetic ladders
+ - Hid net change setting in synthetic ladders
- Fixed a number of problems with filtering on the Fills form
- On the Lean algo, OnToward and Away are now calculated with respect to the opposite inside market at time of the order launch
- Iceberg Spreaders with queue holders are not erroneously cancelled after the first fill
- Added security symbol column to fills window
- Re-organized ladder settings dialog to make it clearer and easier to use
-
+
## 2.1.4
### User Visible Changes
- Fixed handling of cancel button in security picker
-
+
## 2.1.3
### User Visible Changes
- - Fixed a simulator bug in the handling of 0 sized orders
+ - Fixed a simulator bug in the handling of 0 sized orders
## 2.2.1
### User Visible Changes
- Fixed order book form exception when display a spreader order for whichs the legs were not present yet
-
+
## 2.1.1
### User Visible Changes
- Added PIQ to GLBX Iceberg orders
- Corrected handling of stop limit orders
-
+
## 2.1.0
### User Visible Changes
- Added support for the GLBX Iceberg order type
@@ -237,7 +265,7 @@ insert_anchor_links = "right"
- Added PIQ to the mini order book
- Fixed a rare bug that could lead to server failure when requesting market data
- Fixed a bug that could cause incorrect price displays for certain types of synthetic securities
-
+
## 2.0.5
### User Visible Changes
- Fixed a bug in the handling of rejected QHO orders
@@ -247,19 +275,19 @@ insert_anchor_links = "right"
## 2.0.4
### User Visible Changes
- Fixed performance regression in order manager
-
+
### Internal changes
- Improved market data diagnostics for bad configurations
- Changed market data default buffer size
-
+
## 2.0.3
### Internal changes
- Improved backwards compatibility in UI settings
-
+
## 2.0.2
### User Visible Changes
- - Middle click the ladder price column to show the orders for that price level
+ - Middle click the ladder price column to show the orders for that price level
- Middle click the bid or ask column in the ladder no longer sends an order
### Internal changes
@@ -287,8 +315,8 @@ insert_anchor_links = "right"
- Improved settings manager tool output
- Added diagnostics in the event MD memory corruption is detected
- Added systems tests for join,lean, iceberg and spreader orders
- - Made exchange order recovery more resilient in the presence of database loss
-
+ - Made exchange order recovery more resilient in the presence of database loss
+
## 1.6.2
### User Visible Changes
### Exchange simulator
@@ -327,21 +355,21 @@ insert_anchor_links = "right"
- These columns can be restored by toggling their visibility within the PnL's Settings form
- A new Traded Today column has been added to the PnL
- Filtering on this column will allow a user to restrict the report to only show today's position
-### Internal changes
- - Improved organization of the shell notification architecture
+### Internal changes
+ - Improved organization of the shell notification architecture
- Added logging to help troubleshoot shell exit hang
## 1.5.6
### User Visible Changes
- - Fixed a bug that could cause limits to be erroneously enforced
+ - Fixed a bug that could cause limits to be erroneously enforced
- Improved algo documentation
- Changed how the spreader uses net change
- Simplified trigger algo user interface
-### Internal changes
+### Internal changes
- Defaulted to not recording sim market data
- - Improved documentation build
+ - Improved documentation build
- Added additional performance tracing
-
+
## 1.5.5
- Fixed Market View 'stale working orders' bug
@@ -349,11 +377,11 @@ insert_anchor_links = "right"
- Avoided logging when warming up cache
## 1.5.3
- - Fixed sounds startup issue
+ - Fixed sounds startup issue
## 1.5.2
- Added better logging to AlgoDefinitionService
-
+
## 1.5.1
- Fixed missing securities in the Fills and P&L windows.
@@ -374,7 +402,7 @@ insert_anchor_links = "right"
#### Bug Fixes
- Fixed the "Since Open" time filter to use the exchange open time rather than 8:30 AM
- Fixed a bug in the order book where sometimes parent orders would not update their last message column.
-
+
#### Algos
- Added OCO Algo
- An OCO order creates a relationship between a child order and a 'stop' or 'other' order such that when one of these is cancelled, both cancel, or when one is filled, the other order's size is debited in the amount of the fill. Composing this order with Cover simulates scalping functionality
@@ -382,7 +410,7 @@ insert_anchor_links = "right"
- Improved SDK documentation and usability
- Dynamic orders are now properly identified in the order book
#### Documentation
- - Information on the Spark API has been added to the Spark manual
+ - Information on the Spark API has been added to the Spark manual
- The documentation has been updated and reorganized to make information easier to find
### Internal Changes
- Improved robustness of limit system test
diff --git a/docker/linux b/docker/linux
index c40e6eba4..68f43cef8 160000
--- a/docker/linux
+++ b/docker/linux
@@ -1 +1 @@
-Subproject commit c40e6eba4ba72480a68cf784b6ffbcacc3fbf4af
+Subproject commit 68f43cef8d3edbda05a9517421092ada3c392aff
diff --git a/ops_notes.txt b/ops_notes.txt
index 2f9b5a6d5..394ac2733 100644
--- a/ops_notes.txt
+++ b/ops_notes.txt
@@ -1,3 +1,7 @@
+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
diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs
index 2ff340e18..77a6829d6 100644
--- a/src/client/spark/Admin/AdminModel.cs
+++ b/src/client/spark/Admin/AdminModel.cs
@@ -23,9 +23,9 @@ namespace mbts.spark {
on_accounts = service.subscribei_admin_data()
.Select(up => up.all.TryGetFirst(out var ad) && ad.Users.Where(u => u.Name == user.name).TryGetSingle(out var usr) && usr.HasUserData && usr.UserData.HasAccountPermissions ?
usr.UserData.AccountPermissions.AccountPermissions
- .Where(kv => kv.Value.TradingPermission.HasPermissions && kv.Value.AdminPermission.HasPermissions)
+ .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)
+ .Where(acc => acc.HasValue && acc.Value.IsPresent)
.Select(acc => acc.Value)
.ToDictionary(acc => acc.Id, acc => acc.Name) :
new Dictionary(0))
diff --git a/src/client/spark/App.xaml.cs b/src/client/spark/App.xaml.cs
index 0883bc861..c65ec1d26 100644
--- a/src/client/spark/App.xaml.cs
+++ b/src/client/spark/App.xaml.cs
@@ -136,8 +136,11 @@ namespace mbts.ui.shell
try {
if (argv.Contains("-multiple") || _mutex == null || _mutex.WaitOne(TimeSpan.Zero, true))
{
- if(_mutex == null || _mutex.WaitOne(TimeSpan.Zero, true))
- init_stunnel(argv);
+ if(_mutex == null || _mutex.WaitOne(TimeSpan.Zero, true)) {
+ if (!argv.Contains("-nostunnel")) {
+ init_stunnel(argv);
+ }
+ }
return base.Run();
}
else {
diff --git a/src/client/spark/Daemons/OrderTicketDaemon.cs b/src/client/spark/Daemons/OrderTicketDaemon.cs
index cf18c0835..b825740e9 100644
--- a/src/client/spark/Daemons/OrderTicketDaemon.cs
+++ b/src/client/spark/Daemons/OrderTicketDaemon.cs
@@ -43,6 +43,11 @@ namespace bts.shell {
void _show_order_window(Window window) {
foreach (var kv in AlgoStudioModelUtils.get_dynamic_resources(_model.algo_model.ui_configuration))
window.Resources[kv.Key] = kv.Value;
+ // the dynamic algo 'SecurityKey' template has a ContractPickerPopup that expects the security map to be available as a DynamicResource.
+ var sub = _bus.subscribe(SparkTags.SecuritiesTag)
+ .OnDispatcher()
+ .Subscribe(sec_map => window.Resources[ResourceKeys.Securities] = sec_map);
+ window.Closed += (s, e) => Disposable.dispose(ref sub);
window.Show(-200, -160, true);
}
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
index 947a02440..6f3688e77 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
@@ -26,6 +26,7 @@ namespace mbts.spark {
readonly ObservableFilterCollection _working_orders, _working_bids, _working_asks;
readonly string _security_text, _security_key_text;
readonly Property _bid_price, _ask_price, _last_price, _day_change, _settlement, _session_high, _session_low;
+ readonly Property _last_price_from_spread;
readonly CellProperty _position;
readonly CellProperty _last_size;
readonly CellProperty _volume;
@@ -54,6 +55,7 @@ namespace mbts.spark {
_day_change = backing(nameof(day_change), double.NaN);
_session_low = backing(nameof(session_low), double.NaN);
_session_high = backing(nameof(session_high), double.NaN);
+ _last_price_from_spread = backing(nameof(last_price_from_spread), false);
_settlement = backing(nameof(settlement), double.NaN);
_volume = new CellProperty(this, nameof(volume), 0);
_inside_bids = new CellProperty(this, nameof(inside_bids));
@@ -109,6 +111,7 @@ namespace mbts.spark {
public int position => _position.value;
public double raw_day_position => _raw_day_position;
public double last_price => _last_price.Value;
+ public bool last_price_from_spread => _last_price_from_spread.Value;
public uint last_size => _last_size.value;
public double bid_price => _bid_price.Value;
public uint bid_direct_size => _bid_direct_size.Value;
@@ -167,15 +170,17 @@ namespace mbts.spark {
_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);
}
- if (md.md.get_last_trade(ref _last_ref, out NativePriceSize ps, out DateTime ts, out ulong v)) {
+ if (md.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);
}
- _settlement.set(md.md.settlement_price);
- _session_low.set(md.md.session_low);
- _session_high.set(md.md.session_high);
- _day_change.set(last_price - settlement);
+ 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);
if (dirty)
invalidated?.Invoke();
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
index b57e17d33..d2c8ca2b5 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
@@ -38,7 +38,8 @@ namespace mbts.spark {
IMultiValueConverter price_converter = new ui.spark.converters.TickDisplayConverter();
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.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax);
+ 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);
@@ -138,6 +139,7 @@ namespace mbts.spark {
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);
@@ -155,7 +157,7 @@ namespace mbts.spark {
}), 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_size_filter, day_change_filter, settlement_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),
WorkLoop.Start("MarketView", _refresh)
@@ -218,6 +220,7 @@ namespace mbts.spark {
public IDataGridColumnPersistentFilter ask_direct_size_filter { get; } = new UIntMinMax(r => r.ask_direct_size, nameof(Row.ask_direct_size));
public IDataGridColumnPersistentFilter ask_implied_size_filter { get; } = new UIntMinMax(r => r.ask_implied_size, nameof(Row.ask_implied_size));
public IDataGridColumnPersistentFilter last_price_filter { get; } = new DoubleMinMax(r => r.last_price, nameof(Row.last_price));
+ public IDataGridColumnPersistentFilter last_price_from_spread_filter { get; } = new RegexFilterVM(r => r.last_price_from_spread.ToString(), nameof(Row.last_price_from_spread));
public IDataGridColumnPersistentFilter last_size_filter { get; } = new UIntMinMax(r => r.last_size, nameof(Row.last_size));
public IDataGridColumnPersistentFilter day_change_filter { get; } = new DoubleMinMax(r => r.day_change, nameof(Row.day_change));
public IDataGridColumnPersistentFilter settlement_filter { get; } = new DoubleMinMax(r => r.settlement, nameof(Row.settlement));
@@ -250,6 +253,7 @@ namespace mbts.spark {
ask_direct_size = ask_direct_size_filter.get_state(),
ask_implied_size = ask_implied_size_filter.get_state(),
last_price = last_price_filter.get_state(),
+ last_price_from_spread = last_price_from_spread_filter.get_state(),
last_size = last_size_filter.get_state(),
day_change = day_change_filter.get_state(),
settlement = settlement_filter.get_state(),
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
index 86f9d5593..e42bf0e89 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
@@ -12,6 +12,7 @@ namespace mbts.ui.spark {
Security,
Volume,
Last,
+ LastSpd,
LastSize,
Position,
RawDayPosition,
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
index 9c49672a9..d3ae03818 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
@@ -100,6 +100,7 @@ namespace bts.shell {
public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security);
public static GridColumnSettings volume => new GridColumnSettings(col_id(Columns.Volume), DefaultColumnHeaders.Volume, width: DefaultColumnWidths.Volume);
public static GridColumnSettings last => new GridColumnSettings(col_id(Columns.Last), DefaultColumnHeaders.Last, width: DefaultColumnWidths.Price);
+ public static GridColumnSettings last_from_spread => new GridColumnSettings(col_id(Columns.LastSpd), DefaultColumnHeaders.S, width: DefaultColumnWidths.Price, is_visible: false);
public static GridColumnSettings last_size => new GridColumnSettings(col_id(Columns.LastSize), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings position => new GridColumnSettings(col_id(Columns.Position), DefaultColumnHeaders.Pos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings raw_day_position => new GridColumnSettings(col_id(Columns.RawDayPosition), DefaultColumnHeaders.RawDayPos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right, is_visible: false);
@@ -138,6 +139,7 @@ namespace bts.shell {
yield return security;
yield return volume;
yield return last;
+ yield return last_from_spread;
yield return last_size;
yield return position;
yield return raw_day_position;
@@ -224,6 +226,8 @@ namespace bts.shell {
[ProtoMember(25)]
public string strip_name;
[ProtoMember(26)]
+ public string last_price_from_spread;
+ [ProtoMember(28)]
public string mic_code;
}
diff --git a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs
index 2b35df0f2..3d68bd7a8 100644
--- a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs
+++ b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs
@@ -81,9 +81,9 @@ namespace bts.shell {
#region QuoteParams
public static QuoteParams QuoteParams => new QuoteParams {
LeanQuantityRatio = 1,
- QuoteInsideMarketDistance = QuoteInsideMarketDistance,
+ //QuoteInsideMarketDistance = QuoteInsideMarketDistance,
QuoteMaxOrderMove = QuoteMaxOrderMove,
- QuoteMuteZone = QuoteMuteZone,
+ //QuoteMuteZone = QuoteMuteZone,
QuoteRepriceThrottle = QuoteRepriceThrottle,
QuoteInsideMarketDistanceWithTravel = QuoteInsideMarketDistanceWithTravel,
};
@@ -113,6 +113,7 @@ namespace bts.shell {
};
public static QuoteInsideMarketDistanceWithTravel QuoteInsideMarketDistanceWithTravel => new QuoteInsideMarketDistanceWithTravel { Priority = RulePriority };
public static QuoteInsideMarketDistance QuoteInsideMarketDistance => new QuoteInsideMarketDistance { Priority = RulePriority };
+ public static QuoteInsideMarketDistanceThrottle QuoteInsideMarketDistanceThrottle => new QuoteInsideMarketDistanceThrottle();
#endregion
#region PreHedge
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs
new file mode 100644
index 000000000..15ebf0481
--- /dev/null
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs
@@ -0,0 +1,33 @@
+using bts.shell;
+using mbts.ui.spark;
+
+namespace mbts.spark {
+ partial class SyntheticEditorVM {
+ class QuoteInsideMarketDistanceEnabledModel : RowModelBase {
+ readonly QuoteInsideMarketDistanceTowardModel _toward;
+
+ public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceTowardModel toward) =>
+ _toward = toward;
+
+ public override string display_name { get; } = string.Empty;
+ public override string help_text { get; } = string.Empty;
+ public override string man_page { get; } = string.Empty;
+ public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance };
+
+ public override bool get_value(LegSpreaderParamsTuple leg_tup) =>
+ leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle != null;
+
+ public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) {
+ if (value) {
+ if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle == null) {
+ leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceThrottle;
+ _toward.apply_value(leg_tup);
+ }
+ } else {
+ leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = null;
+ }
+ _toward.set_enabled(leg_tup, value);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs
new file mode 100644
index 000000000..f38365209
--- /dev/null
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs
@@ -0,0 +1,39 @@
+using bts.spark;
+using mbts.ui.spark;
+using System.Collections.Generic;
+
+namespace mbts.spark {
+ partial class SyntheticEditorVM {
+ class QuoteInsideMarketDistanceTowardModel : RowModelBase {
+ IDictionary _value_store = new Dictionary();
+
+ public override string display_name { get; } = "Toward Distance";
+ public override string help_text { get; } = string.Empty;
+ public override string man_page { get; } = string.Empty;
+ public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance };
+
+ public void apply_value(LegSpreaderParamsTuple leg_tup) =>
+ _get_inside_market_distance(leg_tup).OnTowardDistance = _value_from_store(leg_tup);
+
+ public override uint get_value(LegSpreaderParamsTuple leg_tup) =>
+ _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance ?
+ inside_market_distance.OnTowardDistance :
+ _value_from_store(leg_tup);
+
+ public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) {
+ _value_store[leg_tup.SecurityKey] = value;
+ if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance)
+ inside_market_distance.OnTowardDistance = value;
+ }
+
+ protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) =>
+ _get_inside_market_distance(leg_tup) != null;
+
+ QuoteInsideMarketDistanceThrottle _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) =>
+ leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle;
+
+ uint _value_from_store(LegSpreaderParamsTuple leg_tup) =>
+ _value_store.GetValueOrDefault(leg_tup.SecurityKey);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
index acb145abb..3d516614f 100644
--- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
+++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs
@@ -115,6 +115,11 @@ namespace mbts.spark {
"dictates if this logic applies to the quoting market or to the synthetic spread " +
"market");
+ public static ParameterSection InsideMarketDistance =>
+ new ParameterSection("Inside Market Distance", true,
+ "Reduces re-quoting by throttling quotes that are moving toward the inside market " +
+ "but are more than 'Toward Distance' away from the inside market");
+
public static ParameterSection InsideMarketThrottleThresholds =>
new ParameterSection("Inside Market Throttle Thresholds", true,
"Reduces re-quoting for quotes that are moving toward the inside market. " +
diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
index 143ead545..b9c676d9e 100644
--- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
+++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs
@@ -190,6 +190,8 @@ namespace mbts.spark {
var quote_inside_market_throttle_ticks = new QuoteInsideMarketThrottleTicksModel();
var quote_inside_market_throttle_min_move = new QuoteInsideMarketThrottleMinMoveModel();
+ var quote_inside_market_distance_toward = new QuoteInsideMarketDistanceTowardModel();
+
var pre_hedge_payless_threshold = new PreHedgePaylessThresholdModel();
var pre_hedge_payless_ticks = new PreHedgePaylessTicksModel();
@@ -227,6 +229,8 @@ namespace mbts.spark {
//quote_inside_market_throttle_ticks,
//quote_inside_market_throttle_min_move,
//new MaxTicksInsideMarketModel(),
+ new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_toward),
+ quote_inside_market_distance_toward,
new PreHedgePaylessEnabledModel(pre_hedge_payless_threshold, pre_hedge_payless_ticks),
pre_hedge_payless_threshold,
pre_hedge_payless_ticks,
@@ -353,19 +357,13 @@ namespace mbts.spark {
if (leg_tuples.Count == 2) {
_is_setting_price_mults = true;
_price_mult_model.override_value(leg_tuples[1], -1);
- } else if (leg_tuples.Count == 3) {
- _is_setting_price_mults = true;
- _price_mult_model.override_value(leg_tuples[1], -2);
- }
+ }
}
void _deduce_quantities() {
if (leg_tuples.Count == 2) {
_is_setting_quantities = true;
_quantity_model.override_value(leg_tuples[1], -1);
- } else if (leg_tuples.Count == 3) {
- _is_setting_quantities = true;
- _quantity_model.override_value(leg_tuples[1], -2);
}
}
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs
index 9f0ec8c59..bcc023fdd 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs
@@ -63,7 +63,10 @@ namespace mbts.spark {
_vm = new AlgoStudioVM(_model);
_vm.load_from(_state);
_view = new AlgoStudioView { DataContext = _vm };
- _resources = new CompositeDisposable();
+ _resources = new CompositeDisposable(
+ _bus.subscribe(SparkTags.SecuritiesTag)
+ .OnDispatcher()
+ .Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map));
// add definition
_commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, _vm.add_definition_cmd));
_commands.Add(new SparkCommandCommand("Clone Algo", Icons.CopyBoxes, _vm.clone_selected_definition_cmd));
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs
index e7ebaa288..8d1297899 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs
@@ -13,6 +13,9 @@ namespace mbts.spark {
string _template_key;
ICommand _set_value_cmd;
+ public AlgoParamRowVM(IAlgoVM algo, IAlgoParamVM param, AlgoParamRowVM parent)
+ : this(algo, param, parent, (param as ITemplateSelectorKey)?.key) { }
+
public AlgoParamRowVM(IAlgoVM algo, IAlgoParamVM param, AlgoParamRowVM parent, string template_key = null) {
this.param = param;
this.algo = algo;
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml
index ce29fd798..cabe66d50 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml
+++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml
@@ -247,6 +247,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -320,6 +345,21 @@
+
+
+
+
+
diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
index 8509914e1..e370685ea 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
@@ -125,6 +125,7 @@ namespace mbts.spark {
add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), new DoubleMinMax(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size);
add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), new DoubleMinMax(r => r.fill.LastPrice), DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price);
add_col(Columns.FillKind, DefaultColumnHeaders.FillKind, r => r.fill_kind.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillKind), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind);
+ add_col(Columns.FillStatus, DefaultColumnHeaders.FillStatus, r => r.fill_status.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillStatus), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind);
add_col(Columns.FillKey, DefaultColumnHeaders.FillKey, r => r.fill_key.ToString(), new RegexFilterVM(r => r.fill.FillKey), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.FillKey);
add_col(Columns.OrderKey, DefaultColumnHeaders.OrderKey, r => r.order_key.ToString(), new RegexFilterVM(r => r.fill.OrderKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.OrderKey);
add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), new RegexFilterVM(r => r.fill.SecurityKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey);
@@ -228,6 +229,7 @@ namespace mbts.spark {
case Columns.Exchange: return wrap_default(ft => ft.security.exchange_or_default());
case Columns.FillKey: return wrap(ft => ft.fill.FillKey);
case Columns.FillKind: return wrap_default(ft => ft.fill.FillKind);
+ case Columns.FillStatus: return wrap_default(ft => ft.fill.FillStatus);
case Columns.FillTime: return wrap(ft => ft.fill.Timestamp.to_local_time());
case Columns.OrderKey: return wrap(ft => ft.fill.OrderKey);
case Columns.OrderType: return wrap_default(ft => ft.order?.order_type() ?? OrderType.None);
@@ -283,7 +285,6 @@ namespace mbts.spark {
public DateTime fill_time => _fill.Timestamp.to_local_time();
public TimeInForce time_in_force => _order.time_in_force();
public OrderType order_type => _order.order_type();
- //public OrderType root_algo_type => _or
public string display_name => OrderUtils.display_name(_order, fill_tuple.algo);
public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase));
public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(fill_tuple.algo_meta, order_metadata));
@@ -294,6 +295,7 @@ namespace mbts.spark {
public double price => _fill.LastPrice;
public double size => _fill.LastShares;
public FillKind fill_kind => _fill.FillKind;
+ public FillStatus fill_status => _fill.FillStatus;
public string fill_key => _fill.FillKey;
public string order_key => _order.Key.ToString();
@@ -301,7 +303,7 @@ namespace mbts.spark {
public OrderType root_algo_order_type => _root_algo.HasValue ? _root_algo.Value.value.CustomCase : OrderType.None;
public OrderMetadata root_algo_order_metadata => _model.factory.get_metadata(root_algo_order_type);
public Color root_algo_badge_color => _root_algo_badge_color ?? (_root_algo_badge_color = OrderUtils.badge_color(_root_algo_meta, root_algo_order_metadata)).Value;
- public string root_algo_display_name => _root_algo?.name ?? root_algo_order_type.display_name();
+ public string root_algo_display_name => fill_tuple.root_order_security?.display_name() ?? OrderType.None.display_name();
public bool Equals(Row other) => other != null && other._fill.Equals(_fill) && other._order.Equals(_order);
public override bool Equals(object obj) => Equals(obj as Row);
diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
index 197e97ea5..9e34bc3e9 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
@@ -21,6 +21,7 @@ namespace mbts.ui.spark {
Price,
Size,
FillKind,
+ FillStatus,
FillKey,
OrderKey,
SecurityKey
diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
index e89aa70a0..1f3c73ce7 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
@@ -37,7 +37,8 @@ namespace bts.shell {
{ nameof(FillsVM.Row.side), Columns.Side },
{ nameof(FillsVM.Row.size), Columns.Size },
{ nameof(FillsVM.Row.time_in_force), Columns.TimeInForce },
- { nameof(FillsVM.Row.user), Columns.User }
+ { nameof(FillsVM.Row.user), Columns.User },
+ { nameof(FillsVM.Row.fill_status ), Columns.FillStatus },
};
public FillsWindowFactory(TradingShellModule module, IBus bus, UserSettingsHub settings_hub, OrdersModel orders_model)
diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
index b09603871..45077ef1d 100644
--- a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
+++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
@@ -74,6 +74,10 @@ namespace bts.shell.fills {
[ProtoMember(15)]
[DIYGridColumnID(nameof(Columns.Symbol))]
public string[] symbol { get; set; }
+
+ [ProtoMember(17)]
+ [DIYGridColumnID(nameof(Columns.FillStatus))]
+ public Fill.Types.FillStatus[] fill_status { get; set; }
}
static class FillsFilterStatesExtensions {
@@ -96,6 +100,7 @@ namespace bts.shell.fills {
pb.add_discrete_values(fs.side, ft => ft.fill.Side);
pb.add_discrete_values(fs.fill_kind, ft => ft.fill.FillKind);
pb.add_discrete_values(fs.symbol, ft => ft.security?.Symbol ?? string.Empty);
+ pb.add_discrete_values(fs.fill_status, ft => ft.fill.FillStatus);
// numeric
pb.add_numeric(fs.size, ft => ft.fill.LastShares);
pb.add_numeric(fs.price, ft => ft.fill.LastPrice);
diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
index e1222b5af..30a1059d7 100644
--- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
+++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
@@ -23,6 +23,10 @@ namespace mbts.spark {
// TODO: somehow allow windows that are using the default settings to still have individual column widths.
[ProtoContract]
class LadderColumnSettings : IEquatable {
+ // this class is 100% mutable (there are literally 0 readonly members),
+ // so GetHashCode must return the same hash for every instance.
+ static readonly int _type_hash = typeof(LadderColumnSettings).GetHashCode();
+
public static LadderColumnSettings Default => new LadderColumnSettings {
show = true,
width = 50,
@@ -74,14 +78,7 @@ namespace mbts.spark {
other.show == show;
public override bool Equals(object obj) => Equals(obj as LadderColumnSettings);
-
- public override int GetHashCode() =>
- width.GetHashCode() +
- background.GetHashCode() +
- foreground.GetHashCode() +
- font_family.GetHashCode() +
- font_size.GetHashCode() +
- font_weight.GetHashCode();
+ public override int GetHashCode() => _type_hash;
public static bool operator ==(LadderColumnSettings x, LadderColumnSettings y) => x.safe_equals(y);
public static bool operator !=(LadderColumnSettings x, LadderColumnSettings y) => !(x == y);
@@ -89,6 +86,9 @@ namespace mbts.spark {
[ProtoContract]
class HistogramBarAnimation : IEquatable {
+ // this class is 100% mutable (there are literally 0 readonly members),
+ // so GetHashCode must return the same hash for every instance.
+ static readonly int _type_hash = typeof(HistogramBarAnimation).GetHashCode();
[ProtoMember(1)]
public ColorShowProto bars { get; set; }
[ProtoMember(2)]
@@ -102,14 +102,14 @@ namespace mbts.spark {
show_numbers == other.show_numbers;
public override bool Equals(object obj) => Equals(obj as HistogramBarAnimation);
- public override int GetHashCode() =>
- EqualityComparer.aggregate_hash(
- bars.GetHashCode(),
- show_numbers.GetHashCode());
+ public override int GetHashCode() => _type_hash;
}
[ProtoContract]
class VolumeColumnSettings : IEquatable {
+ // this class is 100% mutable (there are literally 0 readonly members),
+ // so GetHashCode must return the same hash for every instance.
+ static readonly int _type_hash = typeof(VolumeColumnSettings).GetHashCode();
public static VolumeColumnSettings Default {
get {
var gen = LadderColumnSettings.Default;
@@ -149,19 +149,14 @@ namespace mbts.spark {
show_ltq.Equals(other.show_ltq);
public override bool Equals(object obj) => Equals(obj as VolumeColumnSettings);
-
- public override int GetHashCode() =>
- EqualityComparer.aggregate_hash(
- general.GetHashCode(),
- buy.GetHashCode(),
- sell.GetHashCode(),
- passive.GetHashCode(),
- total.GetHashCode(),
- show_ltq.GetHashCode());
+ public override int GetHashCode() => _type_hash;
}
[ProtoContract]
class LadderMarketBreakLine : IEquatable {
+ // this class is 100% mutable (there are literally 0 readonly members),
+ // so GetHashCode must return the same hash for every instance.
+ static readonly int _type_hash = typeof(LadderMarketBreakLine).GetHashCode();
[ProtoMember(1)]
public bool show { get; set; }
[ProtoMember(2)]
@@ -184,8 +179,7 @@ namespace mbts.spark {
Equals(obj as LadderMarketBreakLine);
public override int GetHashCode() =>
- show.GetHashCode() +
- (int)color;
+ _type_hash;
}
[ProtoContract]
@@ -255,6 +249,12 @@ namespace mbts.spark {
const double _default_order_entry_panel_width = 110.0;
const double _default_zoom_factor = 1.0;
const bool _default_show_warn_on_cross = true;
+ const bool _default_enforce_max_clip = false;
+ public static readonly IEqualityComparer profile_equality_comparer =
+ EqualityComparer.Create(profile_equals);
+ // this class is 100% mutable (there are literally 0 readonly members),
+ // so GetHashCode must return the same hash for every instance.
+ static readonly int _type_hash = typeof(LadderSettings).GetHashCode();
// Default proto constructor
// Added this so that when clients upgrade to a version with new settings,
@@ -283,6 +283,7 @@ namespace mbts.spark {
use_defaults = true;
favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null);
show_warn_on_cross = _default_show_warn_on_cross;
+ enforce_max_clip = _default_enforce_max_clip;
}
public static LadderSettings Default {
@@ -348,6 +349,8 @@ namespace mbts.spark {
zoom_factor = _default_zoom_factor,
net_change = NetChangeTerms.None,
mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general),
+ max_clip = 0,
+ price_display_format = PriceDisplayFormat.Default,
};
rv.row_height = LadderRender.measure_row_height(rv);
return rv;
@@ -366,6 +369,13 @@ namespace mbts.spark {
Ticks
}
+ public enum PriceDisplayFormat {
+ [Description("Default")]
+ Default,
+ [Description("Integer")]
+ Integer
+ }
+
[ProtoMember(1)]
public double row_height { get; set; }
[ProtoMember(2)]
@@ -497,6 +507,18 @@ namespace mbts.spark {
[ProtoMember(55)]
public LadderMiniOrderBookSettings mini_ob { get; set; }
+ [ProtoMember(57)]
+ public double left_panel_scroll_position { get; set; }
+
+ [ProtoMember(58), DefaultValue(_default_enforce_max_clip)]
+ public bool enforce_max_clip { get; set; }
+
+ [ProtoMember(59)]
+ public uint max_clip { get; set; }
+
+ [ProtoMember(60)]
+ public PriceDisplayFormat price_display_format { get; set; }
+
public void sanitize() =>
sanitize(this);
@@ -533,112 +555,84 @@ namespace mbts.spark {
return s;
}
+ ///
+ /// Determines whether or not the specified LadderSettings are 'profile equivalent.'
+ /// This means that 2 ladders, each with a different one of the specified settings, could share the same profile.
+ ///
+ ///
+ /// Note: the impetus for this version of equality is to avoid disconnecting a ladder from its profile due to 'trivial' settings changes.
+ /// Consider the '' property:
+ /// If a ladder is using a settings profile with Limit as the default algo, and the user decides to send a 'Market' order,
+ /// the ladder would suddenly be disconnected from the profile, because it's settings state would no longer be equal to the profile's settings,
+ /// since they changed the selected algo type to 'Market.'
+ /// To avoid such travesties, a separate equals logic is needed: this is called 'profile-equivalent' and is implemented in .
+ /// Devs: be sure to account for properties that are excluded in the 'profile-equals' logic in the [regular]'equals' logic.
+ public static bool profile_equals(LadderSettings a, LadderSettings b) =>
+ a == null ? b == null :
+ b != null &&
+ a.row_height == b.row_height &&
+ a.grid_line_color == b.grid_line_color &&
+ a.orders_column.safe_equals(b.orders_column) &&
+ a.bid_column.safe_equals(b.bid_column) &&
+ a.ask_column.safe_equals(b.ask_column) &&
+ a.price_column.safe_equals(b.price_column) &&
+ a.last_column.safe_equals(b.last_column) &&
+ a.piq_column.safe_equals(b.piq_column) &&
+ a.calculator_buttons.safe_equals(b.calculator_buttons, Enumerable.SequenceEqual) &&
+ a.scroll_bar_visible == b.scroll_bar_visible &&
+ a.default_account == b.default_account &&
+ a.default_time_in_force == b.default_time_in_force &&
+ a.size == b.size &&
+ a.animate_recenter == b.animate_recenter &&
+ a.badge_style == b.badge_style &&
+ a.auto_clear == b.auto_clear &&
+ a.bid_break_line.safe_equals(b.bid_break_line) &&
+ a.ask_break_line.safe_equals(b.ask_break_line) &&
+ a.mid_break_line.safe_equals(b.mid_break_line) &&
+ a.alternate_order_size == b.alternate_order_size &&
+ a.session_low_line.safe_equals(b.session_low_line) &&
+ a.session_high_line.safe_equals(b.session_high_line) &&
+ a.session_range_fill.safe_equals(b.session_range_fill) &&
+ a.volume_column.safe_equals(b.volume_column) &&
+ a.size_display.safe_equals(b.size_display) &&
+ a.day_visible == b.day_visible &&
+ a.high_visible == b.high_visible &&
+ a.low_visible == b.low_visible &&
+ a.open_visible == b.open_visible &&
+ a.settle_visible == b.settle_visible &&
+ a.volume_visible == b.volume_visible &&
+ a.account_visible == b.account_visible &&
+ a.tif_visible == b.tif_visible &&
+ a.order_type_visible == b.order_type_visible &&
+ a.account_position_visible == b.account_position_visible &&
+ a.day_position_visible == b.day_position_visible &&
+ a.raw_day_position_visible == b.raw_day_position_visible &&
+ a.size_presets_visible == b.size_presets_visible &&
+ a.cancel_buys_visible == b.cancel_buys_visible &&
+ a.cancel_sells_visible == b.cancel_sells_visible &&
+ a.cancel_all_visible == b.cancel_all_visible &&
+ a.auto_clear_visible == b.auto_clear_visible &&
+ a.clear_visible == b.clear_visible &&
+ a.order_entry_panel_initial_width == b.order_entry_panel_initial_width &&
+ a.zoom_slider_visible == b.zoom_slider_visible &&
+ a.zoom_factor == b.zoom_factor &&
+ a.use_defaults == b.use_defaults &&
+ a.favorite_algos == b.favorite_algos &&
+ a.net_change == b.net_change &&
+ a.show_warn_on_cross == b.show_warn_on_cross &&
+ a.mini_ob == b.mini_ob &&
+ a.enforce_max_clip == b.enforce_max_clip &&
+ a.max_clip == b.max_clip &&
+ a.price_display_format == b.price_display_format;
+
public bool Equals(LadderSettings other) =>
- other != null &&
- row_height == other.row_height &&
- grid_line_color == other.grid_line_color &&
- orders_column.safe_equals(other.orders_column) &&
- bid_column.safe_equals(other.bid_column) &&
- ask_column.safe_equals(other.ask_column) &&
- price_column.safe_equals(other.price_column) &&
- last_column.safe_equals(other.last_column) &&
- piq_column.safe_equals(other.piq_column) &&
- calculator_buttons.safe_equals(other.calculator_buttons, (a, b) => a.SequenceEqual(b)) &&
- scroll_bar_visible == other.scroll_bar_visible &&
- default_account == other.default_account &&
+ profile_equals(this, other) &&
default_algo == other.default_algo &&
- default_time_in_force == other.default_time_in_force &&
- size == other.size &&
- animate_recenter == other.animate_recenter &&
- badge_style == other.badge_style &&
- auto_clear == other.auto_clear &&
- bid_break_line.safe_equals(other.bid_break_line) &&
- ask_break_line.safe_equals(other.ask_break_line) &&
- mid_break_line.safe_equals(other.mid_break_line) &&
- alternate_order_size == other.alternate_order_size &&
- session_low_line.safe_equals(other.session_low_line) &&
- session_high_line.safe_equals(other.session_high_line) &&
- session_range_fill.safe_equals(other.session_range_fill) &&
- volume_column.safe_equals(other.volume_column) &&
- size_display.safe_equals(other.size_display) &&
- day_visible == other.day_visible &&
- high_visible == other.high_visible &&
- low_visible == other.low_visible &&
- open_visible == other.open_visible &&
- settle_visible == other.settle_visible &&
- volume_visible == other.volume_visible &&
- account_visible == other.account_visible &&
- tif_visible == other.tif_visible &&
- order_type_visible == other.order_type_visible &&
- account_position_visible == other.account_position_visible &&
- day_position_visible == other.day_position_visible &&
- raw_day_position_visible == other.raw_day_position_visible &&
- size_presets_visible == other.size_presets_visible &&
- cancel_buys_visible == other.cancel_buys_visible &&
- cancel_sells_visible == other.cancel_sells_visible &&
- cancel_all_visible == other.cancel_all_visible &&
- auto_clear_visible == other.auto_clear_visible &&
- clear_visible == other.clear_visible &&
- order_entry_panel_initial_width == other.order_entry_panel_initial_width &&
- zoom_slider_visible == other.zoom_slider_visible &&
- zoom_factor == other.zoom_factor &&
- use_defaults == other.use_defaults &&
- favorite_algos == other.favorite_algos &&
- net_change == other.net_change &&
- show_warn_on_cross == other.show_warn_on_cross &&
- mini_ob == other.mini_ob;
+ left_panel_scroll_position == other.left_panel_scroll_position;
public override bool Equals(object obj) => Equals(obj as LadderSettings);
- // TODO: remove mutable props from hash logic (or conversely, make them immutable).
- public override int GetHashCode() =>
- EqualityComparer.aggregate_hash(
- row_height.GetHashCode(),
- grid_line_color.GetHashCode(),
- EqualityComparer.safe_get_hash_code(orders_column),
- EqualityComparer.safe_get_hash_code(bid_column),
- EqualityComparer.safe_get_hash_code(ask_column),
- EqualityComparer.safe_get_hash_code(price_column),
- EqualityComparer.safe_get_hash_code(last_column),
- EqualityComparer.safe_get_hash_code(piq_column),
- EqualityComparer.safe_get_hash_code(calculator_buttons),
- scroll_bar_visible.GetHashCode(),
- default_time_in_force.GetHashCode(),
- size.GetHashCode(),
- animate_recenter.GetHashCode(),
- badge_style.GetHashCode(),
- EqualityComparer.safe_get_hash_code(bid_break_line),
- EqualityComparer.safe_get_hash_code(ask_break_line),
- EqualityComparer.safe_get_hash_code(mid_break_line),
- alternate_order_size.GetHashCode(),
- EqualityComparer.safe_get_hash_code(session_low_line),
- EqualityComparer.safe_get_hash_code(session_high_line),
- EqualityComparer.safe_get_hash_code(session_range_fill),
- EqualityComparer.safe_get_hash_code(volume_column),
- EqualityComparer.safe_get_hash_code(size_display),
- day_visible.GetHashCode(),
- high_visible.GetHashCode(),
- low_visible.GetHashCode(),
- open_visible.GetHashCode(),
- settle_visible.GetHashCode(),
- volume_visible.GetHashCode(),
- account_visible.GetHashCode(),
- tif_visible.GetHashCode(),
- order_type_visible.GetHashCode(),
- account_position_visible.GetHashCode(),
- size_presets_visible.GetHashCode(),
- cancel_buys_visible.GetHashCode(),
- cancel_sells_visible.GetHashCode(),
- cancel_all_visible.GetHashCode(),
- auto_clear_visible.GetHashCode(),
- clear_visible.GetHashCode(),
- order_entry_panel_initial_width.GetHashCode(),
- zoom_slider_visible.GetHashCode(),
- zoom_factor.GetHashCode(),
- use_defaults.GetHashCode(),
- favorite_algos.GetHashCode(),
- net_change.GetHashCode(),
- show_warn_on_cross.GetHashCode());
+ public override int GetHashCode() => _type_hash;
public struct WindowSpecifics {
public readonly double order_entry_panel_width, zoom_factor;
diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
index 0d1b3ac40..2f3b64e92 100644
--- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
+++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
@@ -81,11 +81,9 @@ namespace bts.shell {
if (!_settings_hub.current.ladder_profiles.TryGetFirst(lp => lp.id == id, out var result)) {
// profile was deleted
id = 0;
- } else {
- if (!s.Equals(result.value)) {
- // ladder's settings diverged from the profile (this happens when the user changes settings outside of the settings dialog, such as column widths, left panel width, etc.)
- id = 0;
- }
+ } else if (!LadderSettings.profile_equals(s, result.value)) {
+ // ladder's settings diverged from the profile (this happens when the user changes settings outside of the settings dialog, such as column widths, left panel width, etc.)
+ id = 0;
}
}
return new LadderSaveState { security_key = vm.security.Id, settings = s, settings_id = id };
@@ -149,7 +147,7 @@ namespace bts.shell {
var curr = vm.get_save_state();
if (settings_id == 0) {
last_value = curr;
- } else if (!curr.Equals(last_value)) {
+ } else if (!LadderSettings.profile_equals(curr, last_value)) {
settings_id = 0;
last_value = curr;
}
@@ -163,7 +161,7 @@ namespace bts.shell {
// not on a profile, don't respond to default settings changes
return;
} else if (us.ladder_profiles.TryGetFirst(p => p.id == settings_id, out var profile)) {
- if (!last_value.Equals(vm.get_save_state())) {
+ if (!LadderSettings.profile_equals(last_value, vm.get_save_state())) {
settings_id = 0;
} else {
settings_subject.OnNext(last_value = profile.value);
@@ -211,6 +209,7 @@ namespace bts.shell {
_ => _,
vm.get_save_state(),
UserSettings.FileExtensions.LADDER,
+ LadderSettings.profile_equals,
settings_id);
dialog_vm.applied += apply;
// dialog
diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
index 68fffdeb8..22d2a75b5 100644
--- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
+++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
@@ -29,7 +29,7 @@ using TextUtils = mbts.ui.utility.text.TextUtils;
namespace mbts.spark {
class LadderSettingsVM : DisposableViewModelBase, IWindowSettingsVM, IValueFactory, IObservable, ITemplateSelectorKey {
readonly Property _badge_style;
- readonly Property _alternate_order_size;
+ readonly Property _alternate_order_size, _max_clip;
readonly DelegateProperty _row_height;
readonly UserProperty _default_account;
readonly UserProperty _default_algo;
@@ -41,8 +41,9 @@ namespace mbts.spark {
AlgoID? _desired_algo;
TimeInForce _default_time_in_force;
LadderSettings.NetChangeTerms _price_format;
+ LadderSettings.PriceDisplayFormat _price_display_format;
double _order_entry_panel_width, _zoom_factor;
- bool _auto_clear, _show_warn_on_cross;
+ bool _auto_clear, _show_warn_on_cross, _enforce_max_clip;
LadderSettings _current;
LadderColumnSettingsVM
_orders = new OrdersColumnSettingsVM(),
@@ -91,6 +92,7 @@ namespace mbts.spark {
_alternate_order_size = backing(nameof(alternate_order_size));
_default_account = user_backing(nameof(default_account));
_default_algo = user_backing(nameof(default_algo));
+ _max_clip = backing(nameof(max_clip));
// be sure to initialize backings before this measure_row_height call
_row_height = backing(nameof(row_height), () => LadderRender.measure_row_height(get_result()));
_orders.font_size_changed += on_font_size_changed;
@@ -166,7 +168,9 @@ namespace mbts.spark {
public SimpleGridSettingsVM mini_ob { get; } = new SimpleGridSettingsVM(OrderBookGridSettingsManager.hard_column_flags);
// price format
public LadderSettings.NetChangeTerms price_format { get => _price_format; set => Set(ref _price_format, value); }
+ public LadderSettings.PriceDisplayFormat price_display_format { get => _price_display_format; set => Set(ref _price_display_format, value); }
public IEnumerable price_format_options => EnumHelper.get_values();
+ public IEnumerable price_display_format_options => EnumHelper.get_values();
// time in force
public TimeInForce default_time_in_force { get => _default_time_in_force; set => Set(ref _default_time_in_force, value); }
public IEnumerable time_in_force_options => EnumHelper.get_values_except(TimeInForce.Undefined);
@@ -182,6 +186,8 @@ namespace mbts.spark {
public double zoom_factor { get => _zoom_factor; set => Set(ref _zoom_factor, value); }
// safety checks
public bool show_warn_on_cross { get => _show_warn_on_cross; set => Set(ref _show_warn_on_cross, value); }
+ public bool enforce_max_clip { get => _enforce_max_clip; set => Set(ref _enforce_max_clip, value); }
+ public uint max_clip { get => _max_clip.Value; set => _max_clip.Value = value; }
// favorites
public FavoriteAlgosVM favorite_algos_vm { get; }
@@ -354,8 +360,11 @@ namespace mbts.spark {
_cancel_sells_visibility.show = settings.cancel_sells_visible;
_cancel_all_visibility.show = settings.cancel_all_visible;
price_format = settings.net_change;
+ price_display_format = settings.price_display_format;
// safety checks
show_warn_on_cross = settings.show_warn_on_cross;
+ enforce_max_clip = settings.enforce_max_clip;
+ max_clip = settings.max_clip;
}
}
@@ -428,8 +437,11 @@ namespace mbts.spark {
clone.cancel_all_visible = _cancel_all_visibility.show;
clone.zoom_slider_visible = _zoom_slider_visbility.show;
clone.net_change = price_format;
+ clone.price_display_format = price_display_format;
// safety checks
clone.show_warn_on_cross = show_warn_on_cross;
+ clone.enforce_max_clip = enforce_max_clip;
+ clone.max_clip = max_clip;
return clone;
}
diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
index d5d1c38da..ca85b7b7f 100644
--- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
+++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
@@ -35,7 +35,14 @@ namespace mbts.spark {
_show_cancel_sells, _show_cancel_all, _show_zoom;
readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground;
readonly HashSet _sticky_algos = new HashSet();
- double _position, _day_position, _raw_day_position;
+ double
+ _position,
+ _day_position,
+ _raw_day_position,
+ _left_panel_extent_height,
+ _left_panel_view_port_height,
+ _left_panel_scroll_position,
+ _left_panel_scroll_position_target;
bool _show_account_position, _show_day_position, _show_raw_day_position;
ulong _misc_time = 0;
ulong _last_trade_time = 0;
@@ -76,6 +83,7 @@ namespace mbts.spark {
_volume_column_width = backing(nameof(volume_column_width), ws.volume_column_width);
_left_panel_width = backing(nameof(left_panel_width), ws.order_entry_panel_width);
_zoom_factor = backing(nameof(zoom_factor), ws.zoom_factor);
+ _left_panel_scroll_position_target = init.left_panel_scroll_position;
// remember: account_positions needs to subscribe to selected_account; both the sub and account_positions need to be disposed
_volume = backing(nameof(volume), 0ul);
_auto_clear = backing(nameof(auto_clear), init.auto_clear);
@@ -333,6 +341,33 @@ namespace mbts.spark {
public bool show_cancel_sells => _show_cancel_sells.view;
public bool show_cancel_all => _show_cancel_all.view;
public bool show_zoom => _show_zoom.view;
+ // left panel scroll props
+ public double left_panel_view_port_height {
+ get => _left_panel_view_port_height;
+ set {
+ using (detect_property_changes(nameof(left_panel_scroll_position)))
+ _left_panel_view_port_height = value;
+ }
+ }
+ public double left_panel_scroll_position {
+ get {
+ if (!_left_panel_scroll_position_target.is_nan()) {
+ if (_left_panel_scroll_position_target < _max_left_panel_scroll_position) {
+ _left_panel_scroll_position = _left_panel_scroll_position_target;
+ _left_panel_scroll_position_target = double.NaN;
+ }
+ }
+ return Math.Min(_left_panel_scroll_position, _left_panel_extent_height);
+ }
+ set => Set(ref _left_panel_scroll_position, value);
+ }
+ public double left_panel_extent_height {
+ get => _left_panel_extent_height;
+ set {
+ using (detect_property_changes(nameof(left_panel_scroll_position)))
+ Set(ref _left_panel_extent_height, value);
+ }
+ }
public double left_panel_width { get => _left_panel_width.Value; set => _left_panel_width.set(value); }
public double zoom_factor { get => _zoom_factor.Value; set => _zoom_factor.set(value); }
public string position_display_text {
@@ -362,8 +397,14 @@ namespace mbts.spark {
public uint volume_column_width { get => _volume_column_width.Value; set => _volume_column_width.set(value); }
public uint alternate_order_size_from_settings => current_settings.alternate_order_size;
public bool show_warn_on_cross_from_settings => current_settings.show_warn_on_cross;
+ public bool enforce_max_clip_from_settings => current_settings.enforce_max_clip;
+ public uint max_clip_from_settings => current_settings.max_clip;
internal LadderModel model => _model;
internal IObservable settings { get; }
+
+ double _max_left_panel_scroll_position =>
+ Math.Max(0, _left_panel_extent_height - _left_panel_view_port_height);
+
internal OrderRecordImmutable get_root_at_price((OrderRecordImmutable order, uint? _, AlgoData? __, AlgoDefinitionMetadata? meta) op) {
var order = op.order;
double p = order.price();
@@ -394,6 +435,7 @@ namespace mbts.spark {
zoom_factor,
piq_column_width));
rv.auto_clear = auto_clear;
+ rv.left_panel_scroll_position = left_panel_scroll_position;
if (order_properties_vm != null) {
rv.default_time_in_force = order_properties_vm.selected_time_in_force;
if (order_properties_vm.selected_account.HasValue)
@@ -407,6 +449,9 @@ namespace mbts.spark {
public void key_down(KeyEventArgs e) {
if (order_properties_vm == null)
return;
+ if (KeyboardExtensions.IsDown(Key.Space)) {
+ _bus?.post(SparkTags.RequestRecenterLadder, null);
+ }
// the ctrl modifier requirement helps avoid keyboard-input collisions w/ algo-templates popup
if (!KeyboardExtensions.IsCtrlDown()) return;
var new_algo = order_properties_vm.algo_definitions.FirstOrDefault(o => o.algo_root.key_match(e));
@@ -422,6 +467,10 @@ namespace mbts.spark {
settings_invalidated?.Invoke();
}
+ public void recenter_all_ladders() {
+ _bus?.post(SparkTags.RequestRecenterLadder, null);
+ }
+
public Task send_order_async((double price, Side? side, MouseButton button) args) {
if (order_properties_vm != null && args.button != MouseButton.Middle) {
var size_from_alternate = args.button == MouseButton.Right;
@@ -430,6 +479,10 @@ namespace mbts.spark {
size_calculator.flash_error();
} else {
uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0);
+ // enforce max clip
+ if (enforce_max_clip_from_settings && size > max_clip_from_settings) {
+ size = max_clip_from_settings;
+ }
return send_order_async(args.side.Value, size, args.price);
}
}
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs
index b78519f62..7a51bc6d2 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs
@@ -350,6 +350,17 @@ namespace mbts.spark {
}
} else if (_vm != null) {
uint size = e.ChangedButton == MouseButton.Right ? _vm.alternate_order_size_from_settings : _vm.size_calculator.value ?? 0;
+
+ // does the size violate the local max clip
+ if (_vm.enforce_max_clip_from_settings && size > _vm.max_clip_from_settings) {
+ // note this size is only used for the cross market message, not the actual order command
+ size = _vm.max_clip_from_settings;
+ // only update the calculator value when it's a standard left-click order
+ if (e.ChangedButton == MouseButton.Left) {
+ _vm.size_calculator.value = _vm.max_clip_from_settings;
+ }
+ }
+
// if warning enabled && (buy above opposite inside market || ask below opposite inside market)
// when 1-sided market, _get_top_price will return NaN, and so the price comparison is false
// meaning show no warning == correct
@@ -479,8 +490,14 @@ namespace mbts.spark {
protected override void OnMouseDoubleClick(MouseButtonEventArgs e) {
var column = _column_for_point(e.GetPosition(this));
- if (column.column_type == ColumnType.Price)
- _scroll_to_center();
+ if (column.column_type == ColumnType.Price) {
+ if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift) ||
+ Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt)) {
+ _vm?.recenter_all_ladders();
+ } else {
+ _scroll_to_center();
+ }
+ }
}
#region Row Utility Methods
@@ -588,7 +605,8 @@ namespace mbts.spark {
_settings.row_height,
_price_list,
column.settings,
- security.ContractSpec);
+ security.ContractSpec,
+ _settings.price_display_format);
}
break;
case ColumnType.Ask: render_market_col(_asks); break;
@@ -911,7 +929,7 @@ namespace mbts.spark {
var prev_price_list = _price_list;
_price_list = (!(_settings.net_change == LadderSettings.NetChangeTerms.None)) ?
LadderRender.render_prices(_price_vis_tup.visual, _price_vis_tup.glyph_context, _mkt_break_lines.origin, _vm.md.settlement_price, _settings.net_change == LadderSettings.NetChangeTerms.Ticks, _row_count, _settings.row_height, _settings.price_column, security.ContractSpec) :
- LadderRender.render_prices(_price_vis_tup.visual, _price_vis_tup.glyph_context, _mkt_break_lines.origin, _row_count, _settings.row_height, _settings.price_column, security.ContractSpec);
+ LadderRender.render_prices(_price_vis_tup.visual, _price_vis_tup.glyph_context, _mkt_break_lines.origin, _row_count, _settings.row_height, _settings.price_column, security.ContractSpec, _settings.price_display_format);
_ordershost.update_settings(_price_list, _price_comparer, _settings.row_height, _settings.orders_column);
if (prev_price_list != null) {
// maintain previous visible price range if possible
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs
index d12c79a6c..c6d5e6a2e 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs
@@ -40,6 +40,8 @@ namespace mbts.spark {
// Note: the orders-column has a separate "row_padding" value: Badge.DefaultMargin
// (see how it is incorporated in measure_row_height() below)
public static readonly Thickness row_padding = new Thickness(6);
+ const string tick_separator_period = ".";
+ const string tick_separator_dash = "-";
// IMPORTANT: this method ONLY WORKS if Badges use the BadgeRender.margin/border_thickness/padding values.
// TODO: elminate the dependency on BadgeRender.margin/border_thickness/padding by integrating them into settings.
@@ -52,8 +54,11 @@ namespace mbts.spark {
public static int index_of(double[] prices, double price, IComparer comparer) =>
Array.BinarySearch(prices, price, comparer);
- public static GlyphRun format_text(string text, int row, double row_height, LadderColumnSettings settings, GlyphContext glyph_context) =>
- glyph_context.get_glyph_run(text, settings.font_size, settings.width, row_height, HorizontalAlignment.Center, 0, VerticalAlignment.Center, row * row_height, true);
+ public static GlyphRun format_text(string text, int row, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, LadderSettings.PriceDisplayFormat price_display_format = LadderSettings.PriceDisplayFormat.Default) =>
+ glyph_context.get_glyph_run(
+ // long term there is probably a better way to get rid of the separator, such as in the TickExtensions._format_tick
+ price_display_format == LadderSettings.PriceDisplayFormat.Integer ? text.Replace(tick_separator_period, string.Empty).Replace(tick_separator_dash, string.Empty) : text,
+ settings.font_size, settings.width, row_height, HorizontalAlignment.Center, 0, VerticalAlignment.Center, row * row_height, true);
public static double[] gen_prices(double mid, int row_count, ContractSpecificationImmutable spec) {
// require odd number
@@ -79,10 +84,10 @@ namespace mbts.spark {
result[i] = format_text(spec.format(prices[i], reference_price, format_in_tick_terms), i, row_height, settings, glyph_context));
return result;
}
- public static GlyphRun[] format_prices(double[] prices, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, ContractSpecificationImmutable spec) {
+ public static GlyphRun[] format_prices(double[] prices, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, ContractSpecificationImmutable spec, LadderSettings.PriceDisplayFormat price_display_format) {
var result = new GlyphRun[prices.Length];
Parallel.For(0, prices.Length, i =>
- result[i] = format_text(spec.format(prices[i]), i, row_height, settings, glyph_context));
+ result[i] = format_text(spec.format(prices[i]), i, row_height, settings, glyph_context, price_display_format));
return result;
}
@@ -104,9 +109,9 @@ namespace mbts.spark {
}
public static double[] render_prices(DrawingVisual price, GlyphContext glyph_context, double mid, int row_count, double row_height,
- LadderColumnSettings settings, ContractSpecificationImmutable spec) {
+ LadderColumnSettings settings, ContractSpecificationImmutable spec, LadderSettings.PriceDisplayFormat price_display_format) {
var dprices = gen_prices(mid, row_count, spec);
- render_prices(price, glyph_context, row_count, row_height, dprices, settings, spec);
+ render_prices(price, glyph_context, row_count, row_height, dprices, settings, spec, price_display_format);
return dprices;
}
@@ -122,10 +127,10 @@ namespace mbts.spark {
}
}
- public static void render_prices(DrawingVisual price, GlyphContext glyph_context, int row_count, double row_height, double[] dprices, LadderColumnSettings settings, ContractSpecificationImmutable spec) {
+ public static void render_prices(DrawingVisual price, GlyphContext glyph_context, int row_count, double row_height, double[] dprices, LadderColumnSettings settings, ContractSpecificationImmutable spec, LadderSettings.PriceDisplayFormat price_display_format) {
var foreground = settings.foreground.rgb_brush();
//var background = new SolidColorBrush(settings.background.rgb_color());
- var fprices = format_prices(dprices, row_height, settings, glyph_context, spec);
+ var fprices = format_prices(dprices, row_height, settings, glyph_context, spec, price_display_format);
using (var dc = price.RenderOpen())
using (_draw_with_clip(dc, settings, row_height, row_count)) {
//dc.DrawRectangle(background, null, new Rect(0, 0, settings.width, row_count * row_height));
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml
index 92ab62e4d..21d19bb24 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml
@@ -178,6 +178,14 @@
+
+
@@ -630,7 +638,11 @@
-
+
+
+
+
+
@@ -710,6 +722,7 @@
+
+
+
@@ -991,21 +1013,45 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
index b761e9b75..c0275583a 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
@@ -301,7 +301,14 @@
-
+
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
index 015680d5c..21c233eac 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
@@ -1,11 +1,17 @@
using bts;
using bts.collections;
using bts.utils;
+using mbts.ui;
using mbts.ui.converters;
+using mbts.ui.extensions;
using mbts.utils;
+using System;
+using System.Collections.Generic;
using System.Linq;
+using System.Reactive.Linq;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Input;
@@ -80,6 +86,8 @@ namespace mbts.spark {
_ladder.visible_columns_changed += () => _column_headers_presenter.Columns.SetItems(
_ladder.visible_column_types.Select(t => ColumnFactory.create(_ladder, t)));
this.vm = vm;
+ this.ConnectDataContext(lvm => lvm.bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(sec_map => Resources[ResourceKeys.Securities] = sec_map));
+ vm.SubscribeDisposed(_connect_left_panel_scroll());
DataContext = vm;
DataContextChanged += datacontext_changed;
_ui_scaler.MouseDoubleClick += _ui_scaler_MouseDoubleClick;
@@ -87,7 +95,39 @@ namespace mbts.spark {
this.PreviewMouseDown += LadderView_PreviewMouseDown;
}
-
+ IDisposable _connect_left_panel_scroll() {
+ // extent height
+ bool busy = false;
+ var extent_height_hook = _left_panel_scroll.ObserveProperty(ScrollViewer.ExtentHeightProperty, (s, e) => {
+ if (!busy) {
+ double scroll_pos = vm.left_panel_scroll_position;
+ busy = true;
+ Dispatcher.InvokeAsync(() => {
+ vm.left_panel_extent_height = _left_panel_scroll.ExtentHeight;
+ if (_left_panel_scroll.VerticalOffset != scroll_pos)
+ _left_panel_scroll.TryScrollToVerticalOffset(scroll_pos);
+ busy = false;
+ }, System.Windows.Threading.DispatcherPriority.ApplicationIdle);
+ }
+ });
+ // view port height
+ _left_panel_scroll.Loaded += on_loaded;
+ var dispose = Disposable.CreateDisposeOnce(dispose_impl);
+ return Disposable.Create(dispose, vm.SubscribeDisposed(dispose));
+ // local methods
+ void on_loaded(object sender, RoutedEventArgs e) {
+ if (_left_panel_scroll.descendants_of_type().TryGetFirst(sb => sb.Orientation == Orientation.Vertical, out var vscroll)) {
+ vscroll.SetBinding(ScrollBar.ViewportSizeProperty, new Binding(nameof(LadderVM.left_panel_view_port_height)) {
+ Converter = ValueConverter.create(d => new Size(0, d), sz => sz.Height),
+ Mode = BindingMode.OneWayToSource
+ });
+ }
+ }
+ void dispose_impl() {
+ Disposable.dispose(ref extent_height_hook);
+ _left_panel_scroll.Loaded -= on_loaded;
+ }
+ }
// (Left|Right) CTRL + Wheel to zoom
// This is neat b/c the user doesn't even need to have the slider visible to zoom
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
index d9d27d638..7779621e7 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
@@ -62,15 +62,15 @@
Header="{Binding security}"
IsEditMode="False"
IsLazy="True"
- SecurityMap="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.SecuritiesKey}}"
+ SecurityMap="{DynamicResource ResourceKey={x:Static u:ResourceKeys.Securities}}"
SelectedSecurity="{Binding security, UpdateSourceTrigger=Explicit}"
ShowDialogSkirt="True"
ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
OKClick="{x:Static c:ContractPickerPopup.FlushSelectedSecurityHandler}"
/>
-
-
-
+
+
+
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs
index 0c597bf14..48a5d5ffa 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs
@@ -6,12 +6,6 @@ namespace mbts.ui.spark {
/// Interaction logic for ManualFillRowEditor.xaml
///
partial class ManualFillRowEditor : UserControl {
- public const string
- SecuritiesKey = nameof(SecuritiesKey),
- AccountsKey = nameof(AccountsKey),
- UsersKey = nameof(UsersKey),
- SidesKey = nameof(SidesKey);
-
public static readonly RoutedCommand
CommitCommand = new RoutedCommand(),
CancelCommand = new RoutedCommand();
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs
index 78fb5b10b..cbc3ed8bc 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs
@@ -50,11 +50,11 @@ namespace mbts.ui.spark {
row_editor.CommandBindings.Add(new CommandBinding(ManualFillRowEditor.CommitCommand, commit_executed));
row_editor.CommandBindings.Add(new CommandBinding(ManualFillRowEditor.CancelCommand, cancel_executed));
// dynamic resources
- row_editor.Resources[ManualFillRowEditor.AccountsKey] = vm.accounts;
- row_editor.Resources[ManualFillRowEditor.UsersKey] = vm.users;
- row_editor.Resources[ManualFillRowEditor.SidesKey] = vm.sides;
+ row_editor.Resources[ResourceKeys.Accounts] = vm.accounts;
+ row_editor.Resources[ResourceKeys.Users] = vm.users;
+ row_editor.Resources[ResourceKeys.Sides] = vm.sides;
FocusManager.SetIsFocusScope(row_editor, true);
- var sec_hook = vm.as_demuxer().subscribe(nameof(ManualFillsVM.security_map)).OnDispatcher().Subscribe(v => row_editor.Resources[ManualFillRowEditor.SecuritiesKey] = v);
+ var sec_hook = vm.as_demuxer().subscribe(nameof(ManualFillsVM.security_map)).OnDispatcher().Subscribe(v => row_editor.Resources[ResourceKeys.Securities] = v);
// popup adorner
var popup_adorner = new PopupAdorner(
data_grid, data_grid,
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
index 44fee4c18..8644745b1 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs
@@ -108,7 +108,7 @@ namespace mbts.spark {
public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root.algo.value.CustomCase;
public OrderMetadata root_algo_order_metadata => _owner.get_metadata(root_algo_order_type);
public Brush root_algo_badge_fill => _root_algo_badge_fill ?? (_root_algo_badge_fill = new SolidColorBrush(_root_algo_badge_color));
- public string root_algo_display_name => order_tuple.root.algo.name;
+ public string root_algo_display_name => order_tuple.root.display_name();
// Tree
public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); }
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs
index bcbc64aca..b416e6937 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs
@@ -66,6 +66,10 @@ namespace mbts.spark {
_vm = new OrderBookVM(_bus, _notification_service, _model, _settings_manager);
_vm.load_from(_state);
_view = new OrderBookView(_vm);
+ _vm.SubscribeDisposed(
+ _bus.subscribe(SparkTags.SecuritiesTag)
+ .OnDispatcher()
+ .Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map));
var show_fills_command = SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills).complete(() => new FillsSettings(_vm.selected_orders.Select(r => r.Key).ToArray()));
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs
index 47a36196f..518e259a6 100644
--- a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs
@@ -1,220 +1,223 @@
-using bts.collections;
-using bts.utils;
-using mbts;
-using mbts.collections;
-using mbts.expression;
-using mbts.spark;
-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.ObjectModel;
-using System.Collections.Specialized;
-using System.Dynamic;
-using System.Linq;
-using ColumnKeys = bts.shell.pnl.PNLView.Columns;
-
-namespace bts.shell.pnl {
- class PNLSettingsVM : DisposableViewModelBase, IWindowSettingsVM, IValueFactory, IObservable, ITemplateSelectorKey {
- readonly IReadOnlyDictionary _anchor_cache;
- readonly DeferrableActionWrapper _sync_anchors;
-
- PNLCalculationType _calculation_type;
- PNLHeaderRowDisplay _header_row_display;
- PNLSettings _last_loaded;
-
- public PNLSettingsVM(PNLSettings settings) {
- // init anchor cache, deferrable resync
- _anchor_cache = PNLSettings.anchorable_columns.ToDictionary(k => k, k => new AnchorItemVM(this, k));
- _sync_anchors = new DeferrableActionWrapper(() => {
- for (int i = 0; i < anchor_items.Count; i++) {
- anchor_items[i].anchor_index = i + 1;
- anchor_items[i].refresh();
- }
- });
- core_settings_vm = new SimpleGridSettingsVM(column_factory: col_settings => {
- var col_vm = new PNLColumnVM(core_settings_vm, EnumHelper.parse(col_settings.id));
- col_vm.load_from(col_settings);
- return col_vm;
- });
- core_settings_vm.selection_highlight.bind_opacity_to_alpha = true;
- _dispose = Disposable.Create(
- anchor_items.Subscribe((s, e) => _sync_anchors.execute()));
- load(settings);
- }
-
- public IEnumerable anchor_item_headers => _anchor_cache.Values;
- public ObservableCollection anchor_items { get; } = new ObservableCollection();
- public SimpleGridSettingsVM core_settings_vm { get; }
- public PNLGroupRowAppearanceVM group_row_defaults { get; } = new PNLGroupRowAppearanceVM();
- public PNLCellAppearanceVM header_row_defaults { get; } = new PNLCellAppearanceVM();
- public PNLCalculationType calculation_type { get => _calculation_type; set => Set(ref _calculation_type, value); }
- public IEnumerable calculation_types => EnumHelper.get_values_except(PNLCalculationType.None, PNLCalculationType.Same, PNLCalculationType.Opposite);
- public PNLHeaderRowDisplay header_row_display { get => _header_row_display; set => Set(ref _header_row_display, value); }
- public IEnumerable header_row_display_options => PNLSettings.header_row_display_options;
-
- string ITemplateSelectorKey.key => GridSettingsTemplateKeys.PNL;
-
- public PNLSettings get_result() {
- var s = _last_loaded == null ? new PNLSettings() : SparkUtils.clone_proto(_last_loaded);
- s.calculation_type = _calculation_type;
- s.grid = core_settings_vm.create();
- // move anchor cols to the left, order wrt grouping hierarchy
- var new_cols = new Lazy>(() => s.grid.columns.ToList());
- for (int i = 0; i < s.grid.columns.Count; i++) {
- var key = s.grid.columns[i].strong_id();
- if (_anchor_cache.TryGetValue(key, out var a) && a.anchor_index.HasValue) {
- // anchor index is 1 based, subtract 1 to get 0 based
- int anchor_index = a.anchor_index.Value - 1;
- if (anchor_index != i && anchor_index >= 0 && anchor_index < s.grid.columns.Count) {
- new_cols.Value.RemoveAt(i);
- new_cols.Value.Insert(anchor_index, s.grid.columns[i]);
- }
+using bts.collections;
+using bts.utils;
+using mbts;
+using mbts.collections;
+using mbts.expression;
+using mbts.spark;
+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.ObjectModel;
+using System.Collections.Specialized;
+using System.Dynamic;
+using System.Linq;
+using ColumnKeys = bts.shell.pnl.PNLView.Columns;
+
+namespace bts.shell.pnl {
+ class PNLSettingsVM : DisposableViewModelBase, IWindowSettingsVM, IValueFactory, IObservable, ITemplateSelectorKey {
+ readonly IReadOnlyDictionary _anchor_cache;
+ readonly DeferrableActionWrapper _sync_anchors;
+
+ PNLCalculationType _calculation_type;
+ PNLHeaderRowDisplay _header_row_display;
+ PNLSettings _last_loaded;
+
+ public PNLSettingsVM(PNLSettings settings) {
+ // init anchor cache, deferrable resync
+ _anchor_cache = PNLSettings.anchorable_columns.ToDictionary(k => k, k => new AnchorItemVM(this, k));
+ _sync_anchors = new DeferrableActionWrapper(() => {
+ for (int i = 0; i < anchor_items.Count; i++) {
+ anchor_items[i].anchor_index = i + 1;
+ anchor_items[i].refresh();
}
- }
- // rule-based animations
- var trigger_anims = core_settings_vm.columns
- .OfType()
- .SelectMany(c => c.get_triggers())
- .GroupBy(tup => tup.expression)
- .Where(g => CoreExpressionEvaluator.validate(g.Key))
- .Select(g => (
- expression: g.Key,
- animations: g.ToArray()))
- .ToList();
-
- var normalized_anims = trigger_anims
- .Where(tup => CoreExpressionEvaluator.validate(tup.expression))
- .ToList();
-
- s = s.with(anchors: anchor_items.Select(vm => vm.key),
- grid: new_cols.IsValueCreated ? s.grid.with(columns: new_cols.Value) : null,
- group_columns: core_settings_vm.columns.OfType().Select(c => {
- var col_settings = c.create();
- col_settings = c.group_column_vm.apply_to(col_settings);
- return col_settings;
- }),
- header_columns: core_settings_vm.columns.OfType().Select(c => {
- var col_settings = c.create();
- col_settings = c.header_column_vm.apply_to(col_settings);
- return col_settings;
- }),
- animations: trigger_anims.Select(
- ta => new PNLAnimationTriggerData {
- expression = ta.expression,
- animations = Array.ConvertAll(ta.animations, t => t.row)
- }),
- group_header_animations: normalized_anims
- .Select(
- ta => new PNLAnimationTriggerData {
- expression = ta.expression,
- animations = Array.ConvertAll(ta.animations, t => t.group)
- }),
- header_row_animations: normalized_anims.Select(
- ta => new PNLAnimationTriggerData {
- expression = ta.expression,
- animations = Array.ConvertAll(ta.animations, t => t.header)
- }));
- s.header_row_display = header_row_display;
- s.header_cell_appearance = PNLCellAppearanceProto.from_appearance(header_row_defaults.to_appearance());
- // group
- var (group_cell_appearance, group_row_background_colors) = group_row_defaults.create();
- s.group_cell_appearance = PNLCellAppearanceProto.from_appearance(group_cell_appearance);
- s.group_background_colors.SetItems(group_row_background_colors.Select(c => c.rgb_color()));
- //
- return s;
- }
-
- public void load(PNLSettings value) {
- _last_loaded = value;
- header_row_defaults.load(value.header_cell_appearance.to_appearance());
- group_row_defaults.load_from((value.group_cell_appearance.to_appearance(), value.group_background_colors.WrapSelectorRO(c => c.argb_color())));
- var column_map = _map_column_data(value.grid.columns, value.animations);
- var group_column_map = _map_column_data(value.group_columns, value.group_header_animations);
- var header_column_map = _map_column_data(value.header_columns, value.header_row_animations);
-
- core_settings_vm.load_from(value.grid);
-
- for (int i = 0; i < core_settings_vm.columns.Count; i++) {
- var col_vm = core_settings_vm.columns[i] as PNLColumnVM ?? throw new InvalidOperationException($"In {nameof(PNLSettingsVM)}, all columns should be of type {typeof(PNLColumnVM)}.");
- var key = EnumHelper.parse(col_vm.id);
- var (col_settings, trigger_animations) = column_map[key];
- var group_data = group_column_map.GetNullable(key);
- var header_data = header_column_map.GetNullable(key);
- col_vm.load_from(col_settings, trigger_animations, group_data?.settings, group_data?.triggers, header_data?.triggers, header_data?.settings);
- }
- using (_sync_anchors.defer_execution())
- anchor_items.WrapSelector(a => a.key, k => _anchor_cache[k]).sync_with(value.anchors.Intersect(PNLSettings.anchorable_columns));
- header_row_display = value.header_row_display;
- calculation_type = value.calculation_type;
- }
-
- PNLSettings IValueFactory.create() => get_result();
- void IValueFactory.load_from(PNLSettings value) => load(value);
- IDisposable IObservable.Subscribe(IObserver observer) => throw new NotImplementedException();
-
- static Dictionary triggers)> _map_column_data(IEnumerable columns, IEnumerable triggers) {
- var map = columns.ToDictionary(
- c => c.strong_id(),
- c => (settings: c, triggers: new Dictionary()));
- foreach (var trig in triggers) {
- foreach (var anim in trig.animations) {
- if (map.TryGetValue(anim.column, out var col_data))
- col_data.triggers[trig.expression] = anim;
- }
- }
- return map;
- }
-
- void _append_or_remove_anchor(ColumnKeys key, bool include) {
- if (!_anchor_cache.TryGetValue(key, out var vm))
- throw new KeyNotFoundException($"Column key '{key}' is not anchorable (expected one of: {string.Join(", ", PNLSettings.anchorable_columns)}).");
- if (vm.include == include)
- return;
- if (include) {
- if (anchor_items.Any(a => a.key == key))
- throw new InvalidOperationException($"{nameof(anchor_items)} already contains an element with key '{key}.'");
- anchor_items.Add(vm);
- vm.anchor_index = anchor_items.Count;
- } else {
- if (!anchor_items.Remove(vm))
- throw new InvalidOperationException($"{nameof(anchor_items)} does not contain an element with key '{key}.'");
- vm.anchor_index = null;
- }
- _sync_anchors.execute();
- }
-
- public class AnchorItemVM : ViewModelBase, IEquatable {
- readonly PNLSettingsVM _owner;
- int? _anchor_index;
-
- public AnchorItemVM(PNLSettingsVM owner, ColumnKeys key) {
- _owner = owner;
- this.key = key;
- }
-
- public ColumnKeys key { get; }
- public bool include { get => anchor_index.HasValue; set => _owner._append_or_remove_anchor(key, value); }
- public int? anchor_index { get => _anchor_index; set => Set(ref _anchor_index, value); }
-
- public void refresh() =>
- RaisePropertyChanged(nameof(include), nameof(anchor_index));
-
- public bool Equals(AnchorItemVM other) =>
- other != null && key == other.key;
-
- public override bool Equals(object obj) =>
- Equals(obj as AnchorItemVM);
-
- public override int GetHashCode() =>
- key.GetHashCode();
-
- public override string ToString() =>
- EnumHelper.get_display_name(key);
- }
- }
+ });
+ core_settings_vm = new SimpleGridSettingsVM(column_factory: col_settings => {
+ var col_vm = new PNLColumnVM(core_settings_vm, EnumHelper.parse(col_settings.id));
+ col_vm.load_from(col_settings);
+ return col_vm;
+ });
+ core_settings_vm.selection_highlight.bind_opacity_to_alpha = true;
+ _dispose = Disposable.Create(
+ anchor_items.Subscribe((s, e) => _sync_anchors.execute()));
+ load(settings);
+ }
+
+ public IEnumerable anchor_item_headers => _anchor_cache.Values;
+ public ObservableCollection anchor_items { get; } = new ObservableCollection();
+ public SimpleGridSettingsVM core_settings_vm { get; }
+ public PNLGroupRowAppearanceVM group_row_defaults { get; } = new PNLGroupRowAppearanceVM();
+ public PNLCellAppearanceVM header_row_defaults { get; } = new PNLCellAppearanceVM();
+ public PNLCalculationType calculation_type { get => _calculation_type; set => Set(ref _calculation_type, value); }
+ public IEnumerable calculation_types => EnumHelper.get_values_except(PNLCalculationType.None, PNLCalculationType.Same, PNLCalculationType.Opposite);
+ public PNLHeaderRowDisplay header_row_display { get => _header_row_display; set => Set(ref _header_row_display, value); }
+ public IEnumerable header_row_display_options => PNLSettings.header_row_display_options;
+
+ string ITemplateSelectorKey.key => GridSettingsTemplateKeys.PNL;
+
+ public PNLSettings get_result() {
+ var s = _last_loaded == null ? new PNLSettings() : SparkUtils.clone_proto(_last_loaded);
+ s.calculation_type = _calculation_type;
+ s.grid = core_settings_vm.create();
+ // move anchor cols to the left, order wrt grouping hierarchy
+ List new_cols = null;
+ IEnumerable cols = s.grid.columns;
+ var sorted_anchors = anchor_items.OrderBy(a => a.anchor_index).ToList();
+ for (int i = 0; i < sorted_anchors.Count; i++) {
+ if (GridSettingsHelper.try_find_column(cols, sorted_anchors[i].key, out var match, out int pos) && pos != i) {
+ if (new_cols == null) {
+ new_cols = s.grid.columns.ToList();
+ // set cols to new_cols so subsequent position lookups
+ // take previous column order manipulations into account.
+ cols = new_cols;
+ }
+ new_cols.RemoveAt(pos);
+ new_cols.Insert(i, match);
+ }
+ }
+ // rule-based animations
+ var trigger_anims = core_settings_vm.columns
+ .OfType()
+ .SelectMany(c => c.get_triggers())
+ .GroupBy(tup => tup.expression)
+ .Where(g => CoreExpressionEvaluator.validate(g.Key))
+ .Select(g => (
+ expression: g.Key,
+ animations: g.ToArray()))
+ .ToList();
+
+ var normalized_anims = trigger_anims
+ .Where(tup => CoreExpressionEvaluator.validate(tup.expression))
+ .ToList();
+
+ s = s.with(anchors: anchor_items.Select(vm => vm.key),
+ grid: new_cols == null ? null : s.grid.with(columns: new_cols),
+ group_columns: core_settings_vm.columns.OfType().Select(c => {
+ var col_settings = c.create();
+ col_settings = c.group_column_vm.apply_to(col_settings);
+ return col_settings;
+ }),
+ header_columns: core_settings_vm.columns.OfType().Select(c => {
+ var col_settings = c.create();
+ col_settings = c.header_column_vm.apply_to(col_settings);
+ return col_settings;
+ }),
+ animations: trigger_anims.Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.row)
+ }),
+ group_header_animations: normalized_anims
+ .Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.group)
+ }),
+ header_row_animations: normalized_anims.Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.header)
+ }));
+ s.header_row_display = header_row_display;
+ s.header_cell_appearance = PNLCellAppearanceProto.from_appearance(header_row_defaults.to_appearance());
+ // group
+ var (group_cell_appearance, group_row_background_colors) = group_row_defaults.create();
+ s.group_cell_appearance = PNLCellAppearanceProto.from_appearance(group_cell_appearance);
+ s.group_background_colors.SetItems(group_row_background_colors.Select(c => c.rgb_color()));
+ //
+ return s;
+ }
+
+ public void load(PNLSettings value) {
+ _last_loaded = value;
+ header_row_defaults.load(value.header_cell_appearance.to_appearance());
+ group_row_defaults.load_from((value.group_cell_appearance.to_appearance(), value.group_background_colors.WrapSelectorRO(c => c.argb_color())));
+ var column_map = _map_column_data(value.grid.columns, value.animations);
+ var group_column_map = _map_column_data(value.group_columns, value.group_header_animations);
+ var header_column_map = _map_column_data(value.header_columns, value.header_row_animations);
+
+ core_settings_vm.load_from(value.grid);
+
+ for (int i = 0; i < core_settings_vm.columns.Count; i++) {
+ var col_vm = core_settings_vm.columns[i] as PNLColumnVM ?? throw new InvalidOperationException($"In {nameof(PNLSettingsVM)}, all columns should be of type {typeof(PNLColumnVM)}.");
+ var key = EnumHelper.parse(col_vm.id);
+ var (col_settings, trigger_animations) = column_map[key];
+ var group_data = group_column_map.GetNullable(key);
+ var header_data = header_column_map.GetNullable(key);
+ col_vm.load_from(col_settings, trigger_animations, group_data?.settings, group_data?.triggers, header_data?.triggers, header_data?.settings);
+ }
+ using (_sync_anchors.defer_execution())
+ anchor_items.WrapSelector(a => a.key, k => _anchor_cache[k]).sync_with(value.anchors.Intersect(PNLSettings.anchorable_columns));
+ header_row_display = value.header_row_display;
+ calculation_type = value.calculation_type;
+ }
+
+ PNLSettings IValueFactory.create() => get_result();
+ void IValueFactory.load_from(PNLSettings value) => load(value);
+ IDisposable IObservable.Subscribe(IObserver observer) => throw new NotImplementedException();
+
+ static Dictionary triggers)> _map_column_data(IEnumerable columns, IEnumerable triggers) {
+ var map = columns.ToDictionary(
+ c => c.strong_id(),
+ c => (settings: c, triggers: new Dictionary()));
+ foreach (var trig in triggers) {
+ foreach (var anim in trig.animations) {
+ if (map.TryGetValue(anim.column, out var col_data))
+ col_data.triggers[trig.expression] = anim;
+ }
+ }
+ return map;
+ }
+
+ void _append_or_remove_anchor(ColumnKeys key, bool include) {
+ if (!_anchor_cache.TryGetValue(key, out var vm))
+ throw new KeyNotFoundException($"Column key '{key}' is not anchorable (expected one of: {string.Join(", ", PNLSettings.anchorable_columns)}).");
+ if (vm.include == include)
+ return;
+ if (include) {
+ if (anchor_items.Any(a => a.key == key))
+ throw new InvalidOperationException($"{nameof(anchor_items)} already contains an element with key '{key}.'");
+ anchor_items.Add(vm);
+ vm.anchor_index = anchor_items.Count;
+ } else {
+ if (!anchor_items.Remove(vm))
+ throw new InvalidOperationException($"{nameof(anchor_items)} does not contain an element with key '{key}.'");
+ vm.anchor_index = null;
+ }
+ _sync_anchors.execute();
+ }
+
+ public class AnchorItemVM : ViewModelBase, IEquatable {
+ readonly PNLSettingsVM _owner;
+ int? _anchor_index;
+
+ public AnchorItemVM(PNLSettingsVM owner, ColumnKeys key) {
+ _owner = owner;
+ this.key = key;
+ }
+
+ public ColumnKeys key { get; }
+ public bool include { get => anchor_index.HasValue; set => _owner._append_or_remove_anchor(key, value); }
+ public int? anchor_index { get => _anchor_index; set => Set(ref _anchor_index, value); }
+
+ public void refresh() =>
+ RaisePropertyChanged(nameof(include), nameof(anchor_index));
+
+ public bool Equals(AnchorItemVM other) =>
+ other != null && key == other.key;
+
+ public override bool Equals(object obj) =>
+ Equals(obj as AnchorItemVM);
+
+ public override int GetHashCode() =>
+ key.GetHashCode();
+
+ public override string ToString() =>
+ EnumHelper.get_display_name(key);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLRowComparer.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLRowComparer.cs
index 0932b01db..9d88699da 100644
--- a/src/client/spark/Modules/Trading/PNL/VM/PNLRowComparer.cs
+++ b/src/client/spark/Modules/Trading/PNL/VM/PNLRowComparer.cs
@@ -90,12 +90,11 @@ namespace bts.shell.pnl {
}
int? _try_compare_groups(CollectionViewGroup x, CollectionViewGroup y) {
- if (x == null || y == null)
- return null;
- var xcell = (IPNLCellData)x.Name;
- var ycell = (IPNLCellData)y.Name;
- var comp = _get_column_comparer(xcell.column);
- return comp.value_comparer.Compare(xcell.value, ycell.value);
+ if (x?.Name is IPNLCellData xcell && y?.Name is IPNLCellData ycell) {
+ var comp = _get_column_comparer(xcell.column);
+ return comp.value_comparer.Compare(xcell.value, ycell.value);
+ }
+ return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
index f30696473..3109114d0 100644
--- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
+++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml
@@ -698,8 +698,8 @@
c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference _grid}}"
c:DataGridFilterProperties.FilterOpen="{Binding DataContext.security_filter.open, Source={u:DirectReference _grid}}"
key="Security"
- sort_member_path="security_cell.cell_data"
- data_member_path="security"
+ data_member_path="security_cell.cell_data"
+ sort_member_path="security"
HeaderTemplate="{StaticResource AnchorableColumnHeaderTemplate}"
/>
diff --git a/src/client/spark/Orders/AlgoParamVM.cs b/src/client/spark/Orders/AlgoParamVM.cs
index e8ded6009..cc7a43a2a 100644
--- a/src/client/spark/Orders/AlgoParamVM.cs
+++ b/src/client/spark/Orders/AlgoParamVM.cs
@@ -1,4 +1,5 @@
-using mbts.ui.shell;
+using mbts.ui;
+using mbts.ui.shell;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -6,8 +7,9 @@ using System.Reactive.Linq;
using System.Runtime.CompilerServices;
namespace mbts.spark {
- class AlgoParamVM : IAlgoParamVM, INotifyPropertyChanged {
+ class AlgoParamVM : IAlgoParamVM, INotifyPropertyChanged, ITemplateSelectorKey {
readonly IEqualityComparer _comparer;
+ readonly string _template_key;
AlgoParamPermissions _permissions;
bool _is_enabled, _has_value;
T _committed_value, _value;
@@ -15,15 +17,16 @@ namespace mbts.spark {
public AlgoParamVM(string id, string display_name)
: this(id, display_name, default, EqualityComparer.Default) { }
- public AlgoParamVM(string id, string display_name, T value)
- : this(id, display_name, value, EqualityComparer.Default) { }
+ public AlgoParamVM(string id, string display_name, T value, string template_key = null)
+ : this(id, display_name, value, EqualityComparer.Default, template_key) { }
- public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer) {
+ public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer, string template_key = null) {
this.id = id;
this.display_name = display_name;
_value = value;
_committed_value = value;
_comparer = comparer;
+ _template_key = template_key;
}
public event PropertyChangedEventHandler PropertyChanged;
@@ -50,7 +53,9 @@ namespace mbts.spark {
public bool is_enabled { get => _is_enabled; set => _set(ref _is_enabled, value); }
public bool has_value { get => _has_value; set => _set(ref _has_value, value); }
public bool is_dirty { get; private set; }
- object IAlgoParamVM.value { get => value; set => this.value = (T)value; }
+ object IAlgoParamVM.value { get => value; set => this.value = (T)value; }
+
+ string ITemplateSelectorKey.key => _template_key;
public void revert() {
if (is_dirty) {
diff --git a/src/client/spark/Orders/FillTuple.cs b/src/client/spark/Orders/FillTuple.cs
index 87d4bb38c..a639fe575 100644
--- a/src/client/spark/Orders/FillTuple.cs
+++ b/src/client/spark/Orders/FillTuple.cs
@@ -36,6 +36,8 @@ namespace mbts.spark {
public AlgoDefinitionMetadata? root_algo_meta =>
_order_tuple.HasValue ? _order_tuple.Value.root.meta : null;
+ public OrderSecurityAlgo? root_order_security => _order_tuple?.root;
+
public string account {
get {
var account_string = string.Empty;
@@ -85,4 +87,4 @@ namespace mbts.spark {
public static string user(this FillTuple fill_tuple) =>
fill_tuple.order.HasValue ? fill_tuple.order.Value.user() : string.Empty;
}
-}
+}
\ No newline at end of file
diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs
index 81178590c..7a657e393 100644
--- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs
+++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs
@@ -62,6 +62,7 @@ namespace mbts.spark {
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: param.AsInt32 = 0; break;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: param.AsOrderDef = new CustomOrderDefinition(); break;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: param.AsString = string.Empty; break;
+ case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey:
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: param.AsUint32 = 0u; break;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: param.AsQuantity = new bts.spark.QuantityMeasure(); break;
}
diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs
index ade3260a4..b2cf2b1d3 100644
--- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs
+++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs
@@ -12,7 +12,7 @@ using System.Reactive.Linq;
namespace mbts.spark {
interface IDynamicOrderParamVM {
DynamicOrderParamDescriptor descriptor { get; }
- DynamicOrderParam param { get; set; }
+ DynamicOrderParam param { get; }
}
interface IDynamicOrderParamVM : IDynamicOrderParamVM {
@@ -21,26 +21,16 @@ namespace mbts.spark {
}
abstract class DynamicOrderParamVM : DisposableViewModelBase, IDynamicOrderParamVM {
- DynamicOrderParam _param;
-
protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor)
: this(descriptor, DynamicOrderHelper.init_param(descriptor)) { }
private DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) {
this.descriptor = descriptor;
- _param = param;
+ this.param = param;
}
public DynamicOrderParamDescriptor descriptor { get; set; }
- public DynamicOrderParam param {
- get => _param;
- set {
- _param = value;
- on_param_changed();
- }
- }
-
- protected abstract void on_param_changed();
+ public DynamicOrderParam param { get; }
}
class DynamicOrderParamVM : DynamicOrderParamVM, IDynamicOrderParamVM {
@@ -53,14 +43,12 @@ namespace mbts.spark {
_field_desc = field_descriptor;
_convert = convert;
_convert_back = convert_back;
+ value = _convert(ConvertUtils.try_convert(_field_desc.Accessor.GetValue(param)));
}
public TView value {
get => _value;
- set {
- _field_desc.Accessor.SetValue(param, _convert_back(_value = value));
- RaisePropertyChanged();
- }
+ set => Set(ref _value, value);
}
public IObservable subscribe_value() =>
@@ -70,11 +58,6 @@ namespace mbts.spark {
void on_prop_changed(object sender, PropertyChangedEventArgs e) =>
o.OnNext(value);
});
-
- protected override void on_param_changed() {
- _value = _convert(ConvertUtils.try_convert(_field_desc.Accessor.GetValue(param)));
- RaisePropertyChanged(nameof(value));
- }
}
class DynamicOrderEnumeratedVM : DynamicOrderParamVM, IDynamicOrderParamVM {
@@ -105,11 +88,6 @@ namespace mbts.spark {
o.OnNext(selected_element);
});
- protected override void on_param_changed() {
- _sync_elements();
- RaisePropertyChanged(nameof(selected_element));
- }
-
static IEnumerable _get_elements(DynamicOrderParamDescriptor descriptor) =>
descriptor.ParamType?.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated ?
descriptor.ParamType.Enumerated.Element : Enumerable.Empty();
@@ -148,10 +126,5 @@ namespace mbts.spark {
o.OnNext(quantity);
});
}
-
- protected override void on_param_changed()
- {
- RaisePropertyChanged(nameof(quantity));
- }
}
}
diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs
index cdf5a4906..d27c0e4d4 100644
--- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs
+++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs
@@ -20,6 +20,7 @@ namespace mbts.ui.spark
public DataTemplate StringTemplate { get; set; }
public DataTemplate OrderDefTemplate { get; set; }
public DataTemplate QuantityMeasureTemplate { get; set; }
+ public DataTemplate SecurityKeyTemplate { get; set; }
public DataTemplate EnumTemplate { get; set; }
@@ -38,6 +39,7 @@ namespace mbts.ui.spark
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return DoubleTemplate;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return IntTemplate;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return UIntTemplate;
+ case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: return SecurityKeyTemplate;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return StringTemplate;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: return OrderDefTemplate;
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: return QuantityMeasureTemplate;
diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs
index d69230589..d28c554a2 100644
--- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs
+++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs
@@ -4,6 +4,7 @@ using bts.collections;
using bts.spark;
using mbts.collections;
using mbts.spark.utilities;
+using mbts.ui;
using mbts.ui.utility;
using mbts.utils;
using System;
@@ -73,9 +74,9 @@ namespace mbts.spark {
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN);
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault());
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault());
+ case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault(), template_key: TemplateKeys.SecurityKey);
case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v);
- case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity:
- {
+ case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: {
var qm = new DynamicOrderQuantityVM(descriptor);
return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 });
}
@@ -88,16 +89,16 @@ namespace mbts.spark {
default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.DescriptorCase, nameof(descriptor));
}
- DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default) {
+ DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default, string template_key = null) {
var fdesc = DynamicOrderParam.Descriptor.FindFieldByNumber(field_number);
var pvm = new DynamicOrderParamVM(descriptor, fdesc, convert, convert_back);
- return attached>(pvm, get_from_param, assign_to_param, default_value);
+ return attached>(pvm, get_from_param, assign_to_param, default_value, template_key);
TView get_from_param(DynamicOrderParam param) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param)));
void assign_to_param(DynamicOrderParam param, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
}
- TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM {
+ TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default, string template_key = null) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM {
add_property(
pvm.descriptor.ParamName,
mdef => mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p) ? selector(p) : default_value,
@@ -105,7 +106,8 @@ namespace mbts.spark {
() => pvm.value,
v => pvm.value = v,
pvm.subscribe_value(),
- default_value);
+ default_value,
+ template_key: template_key);
return pvm;
}
}
diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs
index b24547c8e..4243de0be 100644
--- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs
+++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs
@@ -89,6 +89,7 @@ namespace mbts.spark {
case AlgoType.Dynamic: vm = dynamic(key, name, name, editing_permissions); break;
case AlgoType.Splitter: vm = splitter(key,name,editing_permissions); break;
case AlgoType.Composite: vm = composite(key, name, editing_permissions); break;
+ case AlgoType.None: vm = new DefaultAlgoVM(); break;
default: vm = generic(key, name, algo_type, editing_permissions); break;
//default:
// Log.Ui.debug_fatal($"Failed to create {typeof(IAlgoVM)}: unknown algo type '{algo_type}.'");
@@ -166,7 +167,8 @@ namespace mbts.spark {
};
void subscribe_new_algo(IAlgoVM old_algo, IAlgoVM new_algo) {
RaisePropertyChanged(sd.prop_name);
- Disposable.replace(ref def_sub, new CompositeDisposable());
+ Disposable.dispose(ref def_sub);
+ def_sub = new CompositeDisposable();
if (assert(new_algo != null, sd.prop_name, "No algo specified.")) {
def_sub.Add(new_algo.subscribe_definition().Subscribe(_ => _def_change_notifier.execute()));
if (new_algo is INotifyDataErrorInfo ndei)
@@ -255,14 +257,14 @@ namespace mbts.spark {
_security_changed += o.OnNext;
return Disposable.Create(() => _security_changed -= o.OnNext);
});
- Disposable.replace(ref _pending_load, Disposable.Create(
+ Disposable.dispose(ref _pending_load);
+ _pending_load = Disposable.Create(
// load children
ObservableAutoWrapper.connect_item_hooks(
_child_algo_selector_data.AsCollection(),
sd => security_src.SubscribeEach(_ => ObservableAutoWrapper.connect_item_actions(_child_algo_selector_data.AsCollection(), selector_load_impl))),
// load regular props
- ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load(algom))));
-
+ ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load(algom)));
}
void selector_load_impl(AlgoSelectorData sd) {
@@ -298,11 +300,12 @@ namespace mbts.spark {
_security_changed += o.OnNext;
return Disposable.Create(() => _security_changed -= o.OnNext);
});
- Disposable.replace(ref _pending_load, Disposable.Create(
+ Disposable.dispose(ref _pending_load);
+ _pending_load = Disposable.Create(
ObservableAutoWrapper.connect_item_hooks(
_child_algo_selector_data.AsCollection(),
sd => security_src.Subscribe(_ => ObservableAutoWrapper.connect_item_actions(_child_algo_selector_data.AsCollection(), selector_load_impl))),
- ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load_many(algos))));
+ ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load_many(algos)));
void selector_load_impl(AlgoSelectorData sd) {
// **assume that algos has more than 1 element
@@ -542,8 +545,19 @@ namespace mbts.spark {
}
}
- protected void add_property(string prop_name, Func get_from_def, Action assign_to_def, Func get_local, Action set_local, IObservable subscribe_local, TValue non_uniform_value = default, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
- var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local()) { permissions = permissions };
+ protected void add_property(
+ string prop_name,
+ Func get_from_def,
+ Action assign_to_def,
+ Func get_local,
+ Action set_local,
+ IObservable subscribe_local,
+ TValue non_uniform_value = default,
+ AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite,
+ string template_key = null) {
+ var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local(), template_key) {
+ permissions = permissions
+ };
_algo_params.Add(param);
_auto_props[prop_name] = new AutoProp(prop_name,
def => {
@@ -816,12 +830,11 @@ namespace mbts.spark {
var default_algo = AlgoKey.from_known_type(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.Value.ContractCase)));
foreach (var sd in _child_algo_selectors)
sd.load_algo_data_recursive(algo_data, default_algo);
- Disposable.replace(
- ref _selector_data_hooks,
- ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => {
- s.load_algo_data_recursive(algo_data, default_algo);
- return Disposable.empty;
- }));
+ Disposable.dispose(ref _selector_data_hooks);
+ _selector_data_hooks = ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => {
+ s.load_algo_data_recursive(algo_data, default_algo);
+ return Disposable.empty;
+ });
}
}
diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs
index 2b4773a67..3c78d22b7 100644
--- a/src/client/spark/Orders/OrderUtils.cs
+++ b/src/client/spark/Orders/OrderUtils.cs
@@ -158,7 +158,9 @@ namespace mbts.spark {
public static string display_name(this OrderSecurity order_tuple) =>
display_name(order_tuple.order, order_tuple.algo);
- public static string display_name(OrderRecordImmutable order, AlgoData? algo) {
+ public static string display_name(OrderRecordImmutable order, AlgoData? algo, SecurityImmutable? security = null) {
+ if (order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader && security.HasValue)
+ return security.Value.ToString();
if (algo.HasValue) {
return algo.Value.name;
} else if (order.HasDef && order.Def.HasCustomDef) {
@@ -250,7 +252,7 @@ namespace mbts.spark {
order_type.ToString().ToUpper();
public static string display_name(this OrderSecurityAlgo order_sec_algo) =>
- display_name(order_sec_algo.order, order_sec_algo.algo);
+ display_name(order_sec_algo.order, order_sec_algo.algo, order_sec_algo.security);
public static string display_name(this CustomOrderDefinitionImmutable algo) =>
algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic ? algo.Dynamic.DynamicOrderType : algo.CustomCase.display_name();
diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs
index ffeceeb34..ccc189f82 100644
--- a/src/client/spark/Orders/OrdersModel.cs
+++ b/src/client/spark/Orders/OrdersModel.cs
@@ -210,6 +210,7 @@ namespace mbts.spark {
// manual fills
on_manual_fills_securities = _position_service.subscribei_manual_fills()
.Naggle(interval, scheduler)
+ .Filter(f => f.FillType == ManualFill.Types.FillType.Local)
.join(sstore, mf => mf.SecurityKey)
.Table().Cache();
var manual_fill_tuples_account_join = on_manual_fills_securities.LeftJoin(
diff --git a/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs
new file mode 100644
index 000000000..f16dc8ed8
--- /dev/null
+++ b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs
@@ -0,0 +1,80 @@
+using bts.api;
+using bts.api.orderman;
+using bts.shell;
+using bts.utils;
+using mbts.spark;
+using mbts.ui.settings;
+using ProtoBuf;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace mbts {
+ static class OrderSentEventPredicateVMFactory {
+ public static Dictionary> get_oneofs(IBus bus) =>
+ new Dictionary> {
+ { OrderSentEventPredicate.PredicateTypeOneofCase.AnyOrder, PredicateVMWrapper.create(p => p.security = null) },
+ { OrderSentEventPredicate.PredicateTypeOneofCase.SecurityOrder, SecurityCriteriaVMFactory.create(bus, o => o.security?.is_value ?? new SecurityCriteria(),
+ (p, s) => {
+ if (p.security == null) {
+ p.security = new SecurityPredicate();
+ }
+ p.security.is_value = s;
+ })
+ }
+ };
+ }
+
+ [ProtoContract]
+ class OrderSentEventPredicate : IEquatable {
+ static readonly int _type_hash = typeof(OrderSentEventPredicate).GetHashCode();
+ // arbitrary short time period (can override in config)
+ static readonly TimeSpan _stale_order_threshold = TimeSpan.FromSeconds(config.Configuration.get().stale_order_threshold_seconds);
+
+ public enum PredicateTypeOneofCase {
+ [Description("(any order)")]
+ AnyOrder,
+ [Description("choose securities")]
+ SecurityOrder
+ }
+
+ [ProtoMember(1)]
+ public SecurityPredicate security { get; set; }
+
+ public PredicateTypeOneofCase predicate_type_case {
+ get {
+ if (security != null)
+ return PredicateTypeOneofCase.SecurityOrder;
+ return PredicateTypeOneofCase.AnyOrder;
+ }
+ }
+
+ public IPredicate create(object obj) =>
+ create_predicate((INotificationServiceDataCache)obj);
+
+ public IPredicate create_predicate(INotificationServiceDataCache data_cache) {
+ var sec_pred = security?.create();
+ return PredicateBuilder.create(os =>
+ // verify security
+ (sec_pred == null || (os.security.HasValue && sec_pred.trigger(os.security.Value))) &&
+ // verify not stale
+ ((DateTime.Now - os.order.created()) < _stale_order_threshold) &&
+ // verify order hasn't been added yet
+ // Note: the notification service should offer a way to connect predicates so that they only receive items in TableUpdate.added,
+ // however, the notification service predated TableUpdate.Changes, so for now, just check that the history.Count == 1)
+ (data_cache.order_history.TryGetValue(os.order.Key, out var hist) && hist.Count == 1));
+ }
+
+ public INotificationPredicate create_toast(INotificationServiceDataCache data_cache) =>
+ throw new NotImplementedException();
+
+ public bool Equals(OrderSentEventPredicate other) =>
+ other != null && other.security.safe_equals(other.security);
+
+ public override bool Equals(object obj) =>
+ Equals(obj as OrderSentEventPredicate);
+
+ public override int GetHashCode() =>
+ EqualityComparer.auto_phase(_type_hash, security?.GetHashCode() ?? 0);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs b/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs
index c137f7d0b..be4a346fb 100644
--- a/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs
+++ b/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs
@@ -5,14 +5,9 @@ using bts.utils;
using mbts.spark;
using mbts.ui;
using mbts.ui.settings;
-using mbts.ui.utility;
-using mbts.utils;
using ProtoBuf;
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
-using OrderType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
using PTOC = mbts.OrderRecordTuplePredicate.PredicateTypeOneofCase;
namespace mbts {
@@ -20,6 +15,7 @@ namespace mbts {
// TODO: uncomment the remaining cases when ready
public static Dictionary> get_oneofs(IBus bus, OrdersModel orders_model) {
return new Dictionary> {
+ { PTOC.SentEvent, wrap(rp => rp.sent_event, (rp, p) => rp.sent_event = p, p => p.predicate_type_case, OrderSentEventPredicateVMFactory.get_oneofs(bus)) },
{ PTOC.FilledEvent, wrap(rp => rp.filled_event, (rp, p) => rp.filled_event = p, p => p.predicate_type_case, OrderFilledEventPredicateVMFactory.get_oneofs(bus)) },
{ PTOC.CompletedEvent, wrap(rp => rp.completed_event, (rp, p) => rp.completed_event = p, p => p.predicate_type_case, OrderCompletedEventPredicateVMFactory.get_oneofs(bus)) },
{ PTOC.CanceledEvent, wrap(rp => rp.canceled_event, (rp, p) => rp.canceled_event = p, p => p.predicate_type_case, OrderCanceledEventPredicateVMFactory.get_oneofs(bus)) },
@@ -77,6 +73,7 @@ namespace mbts {
OrderFilledEventPredicate _filled_event;
OrderCompletedEventPredicate _completed_event;
OrderCanceledEventPredicate _canceled_event;
+ OrderSentEventPredicate _sent_event;
public enum PredicateTypeOneofCase {
None,
@@ -120,6 +117,8 @@ namespace mbts {
OrderKey,
[PredicateCase(is_toastable:false)]
ParentKey,
+ [PredicateCase("When order is sent", PredicateCategory.Event)]
+ SentEvent,
[PredicateCase("When order gets a fill", PredicateCategory.Event)]
FilledEvent,
[PredicateCase("When order is completed", PredicateCategory.Event)]
@@ -176,6 +175,8 @@ namespace mbts {
public OrderCompletedEventPredicate completed_event { get => _completed_event; set => _set(ref _completed_event, value); }
[ProtoMember(23)]
public OrderCanceledEventPredicate canceled_event { get => _canceled_event; set => _set(ref _canceled_event, value); }
+ [ProtoMember(26)]
+ public OrderSentEventPredicate sent_event { get => _sent_event; set => _set(ref _sent_event, value); }
[ProtoMember(24)]
public bool is_toast_enabled { get; set; }
[ProtoMember(25)]
@@ -206,6 +207,7 @@ namespace mbts {
if (_filled_event != null) return PTOC.FilledEvent;
if (_completed_event != null) return PTOC.CompletedEvent;
if (_canceled_event != null) return PTOC.CanceledEvent;
+ if (_sent_event != null) return PTOC.SentEvent;
if (_attached_target_order_key != null) return PTOC.AttachedTargetOrderKey;
return PTOC.None;
}
@@ -236,6 +238,7 @@ namespace mbts {
case PTOC.FilledEvent: return _filled_event.create_predicate(data_cache);
case PTOC.CompletedEvent: return _completed_event.create_predicate(data_cache);
case PTOC.CanceledEvent: return _canceled_event.create(data_cache);
+ case PTOC.SentEvent: return _sent_event.create(data_cache);
case PTOC.AttachedTargetOrderKey: return wrap(_attached_target_order_key.create(), r => r.order.attached_target_order_key());
default: return null;
}
@@ -285,6 +288,7 @@ namespace mbts {
case PTOC.FilledEvent: return _filled_event.Equals(other._filled_event);
case PTOC.CompletedEvent: return _completed_event.Equals(other._completed_event);
case PTOC.CanceledEvent: return _canceled_event.Equals(other._canceled_event);
+ case PTOC.SentEvent: return _sent_event.Equals(other._sent_event);
case PTOC.AttachedTargetOrderKey: return _attached_target_order_key.Equals(other._attached_target_order_key);
case PTOC.None: return true;
default: throw ExceptionHelper.unexpected_oneof_case(ptoc);
@@ -320,6 +324,7 @@ namespace mbts {
case PTOC.FilledEvent: raw_hash = _filled_event.GetHashCode(); break;
case PTOC.CompletedEvent: raw_hash = _completed_event.GetHashCode(); break;
case PTOC.CanceledEvent: raw_hash = _canceled_event.GetHashCode(); break;
+ case PTOC.SentEvent: raw_hash = _sent_event.GetHashCode(); break;
case PTOC.AttachedTargetOrderKey: raw_hash = _attached_target_order_key.GetHashCode(); break;
case PTOC.None: raw_hash = 0; break;
default: throw ExceptionHelper.unexpected_oneof_case(ptoc);
@@ -355,6 +360,7 @@ namespace mbts {
_filled_event = null;
_completed_event = null;
_canceled_event = null;
+ _sent_event = null;
_attached_target_order_key = null;
}
field = value;
diff --git a/src/client/spark/core/GlobalExtensions/DoubleHelper.cs b/src/client/spark/core/GlobalExtensions/DoubleHelper.cs
index 747747963..4b9292936 100644
--- a/src/client/spark/core/GlobalExtensions/DoubleHelper.cs
+++ b/src/client/spark/core/GlobalExtensions/DoubleHelper.cs
@@ -1,7 +1,36 @@
-using System.Linq;
+using System;
+using System.Linq;
namespace mbts {
public static class DoubleHelper {
+ public static bool any_nan_or_infinity(params double[] values) {
+ for (int i = 0; i < values.Length; i++) {
+ if (double.IsNaN(values[i]) || double.IsInfinity(values[i]))
+ return true;
+ }
+ return false;
+ }
+
+ public static bool are_close(double v1, double v2, double threshold) =>
+ !any_nan_or_infinity(v1, v2, threshold) && Math.Abs(threshold) > Math.Abs(v1 - v2);
+
+ // bc double.IsNaN gets annoying write, and a lazy programmer is a happy programmer ;)
+ public static bool is_nan(this double value) =>
+ double.IsNaN(value);
+
+ ///
+ /// If the specified value is a , , or , returns the equivalent ; otherwise, returns .
+ ///
+ /// The value to convert to a .
+ /// The equivalent value if the cast succeeds, otherwise .
+ public static double nan_cast(object value) {
+ // devs: add numeric type checks as needed
+ if (value is double d) return d;
+ if (value is int i) return i;
+ if (value is uint u) return u;
+ return double.NaN;
+ }
+
public static bool IsNaNOrInfinity(double d) => double.IsNaN(d) || double.IsInfinity(d);
public static bool IsNaNOrInfinityOr(double d, params double[] values) => IsNaNOrInfinity(d) || values.Contains(d);
public static bool IsOneOf(double d, params double[] values) => values.Contains(d);
diff --git a/src/client/spark/core/Utility/MiscUtils.cs b/src/client/spark/core/Utility/MiscUtils.cs
index 047eff9f3..4aa6074c8 100644
--- a/src/client/spark/core/Utility/MiscUtils.cs
+++ b/src/client/spark/core/Utility/MiscUtils.cs
@@ -102,14 +102,14 @@ namespace mbts.utils
string identifier = ((felem.Name != null) && (felem.Name.Length > 0)) ?
felem.Name :
felem.GetType().ToString();
- return "$FrameworkElement [{identifier}]";
+ return $"FrameworkElement [{identifier}]";
} else {
// Maybe a FrameworkContentElement has focus
if (elem is FrameworkContentElement fcelem) {
string identifier = ((fcelem.Name != null) && (fcelem.Name.Length > 0)) ?
fcelem.Name :
fcelem.GetType().ToString();
- return "$FrameworkContentElement [{identifier}]";
+ return $"FrameworkContentElement [{identifier}]";
}
return $"Element of type [{elem.GetType().ToString()}] has focus";
}
diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs
index c2c8db794..9e8e44cda 100644
--- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs
+++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs
@@ -114,6 +114,7 @@ namespace mbts.ui.controls {
Aggressor = "Aggressor",
Volume = "Volume",
Last = "Last",
+ S = "S",
Pos = "Pos",
Working = "Working",
Bid = "Bid",
@@ -124,6 +125,7 @@ namespace mbts.ui.controls {
SessionLow = "Low",
SessionHigh = "High",
FillKind = "Fill Kind",
+ FillStatus = "Fill Status",
Name = "Name",
Description = "Description",
N_Legs = "# Legs",
diff --git a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs
index aa2019135..cce6cb9bc 100644
--- a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs
+++ b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs
@@ -4,6 +4,8 @@ using System.Linq;
namespace mbts.ui.controls {
static class DoubleUtil {
public const int API_DECIMAL_PRECISION = 9;
+ // arbitrary small number that can be used to determine whether or not scroll changes are significant
+ public const double MIN_SCROLL_DELTA = 0.000015;
/* smallest such that 1.0+DBL_EPSILON != 1.0 */
private const double EPSILON = 2.2204460492503131e-016;
private const double BIG_EPSILON = EPSILON * 10;
diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
index a1e3937f2..1a522bcce 100644
--- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
+++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml
@@ -1139,6 +1139,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1383,13 +1407,11 @@
diff --git a/src/client/spark/view/Converters/AnonymousValueConverter.cs b/src/client/spark/view/Converters/AnonymousValueConverter.cs
index 29ba7db43..2e1df9262 100644
--- a/src/client/spark/view/Converters/AnonymousValueConverter.cs
+++ b/src/client/spark/view/Converters/AnonymousValueConverter.cs
@@ -11,6 +11,9 @@ namespace mbts.ui.converters {
public static IValueConverter create(Func convert) =>
new AnonymousValueConverter(convert);
+ public static IValueConverter create(Func convert, Func convert_back) =>
+ new AnonymousValueConverter(convert, convert_back);
+
public static IMultiValueConverter create(Func convert) =>
new AnonymousMultiValueConverter(convert);
@@ -28,9 +31,17 @@ namespace mbts.ui.converters {
IntTextConverter = new IntTextConverter(),
UIntTextConverter = new UIntTextConverter(),
QuantityMeasureTextConverter = ValueConverter.create(fmt),
+ SecuritySelectorText,
SimpleString = new AnonymousValueConverter(obj => obj?.ToString()),
ThicknessToDouble = new ThicknessToDoubleConverter();
+ static ValueConverters() {
+ SecuritySelectorText = new NullSubstitutionConverterWrapper {
+ Converter = SimpleString,
+ ValueForNull = "(None)"
+ };
+ }
+
public static readonly IMultiValueConverter
AreEqualConverter = new AreEqualConverter();
diff --git a/src/client/spark/view/Converters/DictionaryLookupConverter.cs b/src/client/spark/view/Converters/DictionaryLookupConverter.cs
new file mode 100644
index 000000000..cdc635b02
--- /dev/null
+++ b/src/client/spark/view/Converters/DictionaryLookupConverter.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+
+namespace mbts.ui.converters {
+ class DictionaryLookupConverter : IMultiValueConverter {
+ [ThreadStatic]
+ Dictionary _type_impls_backing;
+ Dictionary _type_impls => _type_impls_backing ?? (_type_impls_backing = new Dictionary());
+
+ delegate bool Lookup(object source, object key, out object result);
+
+ public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+ if (values.Length == 2 && values[0] != null && values[1] != null) {
+ var lookup_type = values[0].GetType();
+ var lookup = _type_impls.GetOrAdd(lookup_type, TypeImplResolver.resolve);
+ if (lookup(values[0], values[1], out var result))
+ return result;
+ }
+ return null;
+ }
+
+ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) =>
+ throw new NotImplementedException();
+
+ static class TypeImplResolver {
+ public static Lookup resolve(Type lookup_type) =>
+ _prioritized_impls(lookup_type)
+ .OrderBy(tup => tup.priority)
+ .Select(tup => tup.impl)
+ .FirstOrDefault() ?? _lookup_fail;
+
+ static bool _lookup_fail(object source, object key, out object result) {
+ result = null;
+ return false;
+ }
+
+ static IEnumerable<(int priority, Lookup impl)> _prioritized_impls(Type lookup_type) {
+ foreach (var itype in lookup_type.GetInterfaces()) {
+ if (itype.IsGenericType) {
+ var gen_def = itype.GetGenericTypeDefinition();
+ if (gen_def == typeof(IDictionary<,>))
+ yield return (1, _get_generic_impl(nameof(_GenericImpls.idictionary), itype));
+ if (gen_def == typeof(IReadOnlyDictionary<,>))
+ yield return (2, _get_generic_impl(nameof(_GenericImpls.ireadonly_dictionary), itype));
+ if (gen_def == typeof(ILookup<,>))
+ yield return (3, _get_generic_impl(nameof(_GenericImpls.ilookup), itype));
+ }
+ if (itype == typeof(IDictionary))
+ yield return (4, _NonGenericImpls.idictionary);
+ }
+ }
+
+ static Lookup _get_generic_impl(string impl_name, Type impl_type) =>
+ _get_generic_impl(impl_name, impl_type.GetGenericArguments());
+
+ static Lookup _get_generic_impl(string impl_name, Type[] key_value_types) =>
+ (Lookup)typeof(_GenericImpls<,>)
+ .MakeGenericType(key_value_types)
+ .GetField(nameof(_GenericImpls.idictionary))
+ .GetValue(null);
+
+ static class _GenericImpls {
+ public static readonly Lookup
+ idictionary = _idictionary,
+ ireadonly_dictionary = _ireadonly_dictionary,
+ ilookup = _ilookup;
+
+ static bool _idictionary(object lookup, object key, out object result) {
+ if (key is TKey k && lookup is IDictionary d && d.TryGetValue(k, out var value)) {
+ result = value;
+ return true;
+ }
+ result = null;
+ return false;
+ }
+
+ static bool _ireadonly_dictionary(object lookup, object key, out object result) {
+ if (key is TKey k && lookup is IReadOnlyDictionary rod && rod.TryGetValue(k, out var value)) {
+ result = value;
+ return true;
+ }
+ result = null;
+ return false;
+ }
+
+ static bool _ilookup(object lookup, object key, out object result) {
+ if ((key is TKey k) && lookup is ILookup l && l.Contains(k)) {
+ result = l[k];
+ return true;
+ }
+ result = null;
+ return false;
+ }
+ }
+
+ static class _NonGenericImpls {
+ public static readonly Lookup
+ idictionary = _idictionary;
+
+ static bool _idictionary(object lookup, object key, out object result) {
+ var dict = (IDictionary)lookup;
+ if (dict.Contains(key)) {
+ result = dict[key];
+ return true;
+ }
+ result = null;
+ return false;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/view/Extensions/FrameworkElementExtensions.cs b/src/client/spark/view/Extensions/FrameworkElementExtensions.cs
index 5e1fca80f..56bc99d47 100644
--- a/src/client/spark/view/Extensions/FrameworkElementExtensions.cs
+++ b/src/client/spark/view/Extensions/FrameworkElementExtensions.cs
@@ -9,6 +9,29 @@ using CompositeDisposable = System.Reactive.Disposables.CompositeDisposable;
namespace mbts.ui.extensions {
static class FrameworkElementHelper {
+ ///
+ /// Invokes the specified action immediately if the element is already loaded, otherwise hooks up to the event,
+ /// and [conditionally]invokes the specified action if returns true.
+ ///
+ /// The element that must be loaded before the specified action is invoked.
+ /// The action to invoke when the element is loaded.
+ /// If the element is not already loaded, this delegate determines whether or not to invoke the action in the Loaded event callback.
+ ///
+ public static void InvokeOnLoaded(this FrameworkElement element, Action action, Func should_still_execute) {
+ if (action == null)
+ throw new ArgumentNullException(nameof(action));
+ if (element.IsLoaded) {
+ action();
+ } else {
+ element.Loaded += on_loaded;
+ void on_loaded(object sender, RoutedEventArgs e) {
+ element.Loaded -= on_loaded;
+ if (should_still_execute())
+ action();
+ }
+ }
+ }
+
public static Point GetCenter(this FrameworkElement element) =>
new Point(element.ActualWidth * 0.5, element.ActualHeight * 0.5);
diff --git a/src/client/spark/view/Extensions/ScrollViewerBehavior.cs b/src/client/spark/view/Extensions/ScrollViewerBehavior.cs
new file mode 100644
index 000000000..e9db14fd4
--- /dev/null
+++ b/src/client/spark/view/Extensions/ScrollViewerBehavior.cs
@@ -0,0 +1,61 @@
+using mbts.ui.controls;
+using mbts.ui.extensions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace mbts.ui {
+ static class ScrollViewerBehavior {
+ public static readonly DependencyProperty VerticalOffsetProperty =
+ DependencyProperty.RegisterAttached("VerticalOffset", typeof(double), typeof(ScrollViewerBehavior), new PropertyMetadata(double.NaN, OnVerticalOffsetChanged));
+
+ static void OnVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) {
+ if (d is ScrollViewer scroll) {
+ double voff = DoubleHelper.nan_cast(e.NewValue);
+ // Ignore small deltas to prevent strange layout rounding issues/loops.
+ // Be mindful that small deltas are not accumulated into a single larger delta.
+ if (!double.IsNaN(voff) && !DoubleHelper.are_close(DoubleHelper.nan_cast(e.OldValue), voff, DoubleUtil.MIN_SCROLL_DELTA)) {
+ scroll.InvokeOnLoaded(() => scroll.ScrollToVerticalOffset(voff),
+ () => scroll.GetValue(VerticalOffsetProperty) is double curr_voff && curr_voff == voff);
+ }
+ }
+ }
+
+ public static double GetVerticalOffset(DependencyObject d) => (double)d.GetValue(VerticalOffsetProperty);
+ public static void SetVerticalOffset(DependencyObject d, double value) => d.SetValue(VerticalOffsetProperty, value);
+
+ public static readonly DependencyProperty EnableTwoWayVerticalOffsetBindingProperty =
+ DependencyProperty.RegisterAttached("EnableTwoWayVerticalOffsetBinding", typeof(bool), typeof(ScrollViewerBehavior), new PropertyMetadata(false, OnEnableTwoWayVerticalOffsetBindingChanged));
+
+ static void OnEnableTwoWayVerticalOffsetBindingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) {
+ if (d is ScrollViewer scroll) {
+ if ((bool)e.NewValue) {
+ scroll.ScrollChanged += EnableTwoWayVerticalOffsetBindingUtils.on_scroll_changed;
+ } else {
+ scroll.ScrollChanged -= EnableTwoWayVerticalOffsetBindingUtils.on_scroll_changed;
+ }
+ }
+ }
+
+ public static bool GetEnableTwoWayVerticalOffsetBinding(DependencyObject d) => (bool)d.GetValue(EnableTwoWayVerticalOffsetBindingProperty);
+ public static void SetEnableTwoWayVerticalOffsetBinding(DependencyObject d, bool value) => d.SetValue(EnableTwoWayVerticalOffsetBindingProperty, value);
+
+ public static readonly DependencyProperty VerticalOffsetMirrorBusyProperty =
+ DependencyProperty.RegisterAttached("VerticalOffsetMirrorBusy", typeof(bool), typeof(ScrollViewerBehavior), new PropertyMetadata(false));
+
+ static class EnableTwoWayVerticalOffsetBindingUtils {
+ public static void on_scroll_changed(object sender, ScrollChangedEventArgs e) {
+ if (e.VerticalChange != 0 && sender is ScrollViewer scroll) {
+ if (!(bool)scroll.GetValue(VerticalOffsetMirrorBusyProperty)) {
+ scroll.SetValue(VerticalOffsetMirrorBusyProperty, true);
+ // scroll changes could get noisy while layouts are being processed;
+ // let everything settle down before updating the VerticalOffset binding sources/targets.
+ scroll.Dispatcher.InvokeAsync(() => {
+ scroll.SetCurrentValue(VerticalOffsetProperty, scroll.VerticalOffset);
+ scroll.SetValue(VerticalOffsetMirrorBusyProperty, false);
+ }, System.Windows.Threading.DispatcherPriority.ApplicationIdle);
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/view/Extensions/UIElementExtensions.cs b/src/client/spark/view/Extensions/UIElementExtensions.cs
index 0e5924fd2..3b48769a0 100644
--- a/src/client/spark/view/Extensions/UIElementExtensions.cs
+++ b/src/client/spark/view/Extensions/UIElementExtensions.cs
@@ -236,6 +236,14 @@ namespace mbts.ui.extensions {
target.ScrollChanged += callback;
return Disposable.Create(() => target.ScrollChanged -= callback);
}
+
+ public static bool TryScrollToVerticalOffset(this ScrollViewer scroll_viewer, double vertical_offset) {
+ if (vertical_offset >= 0 && scroll_viewer.IsLoaded && vertical_offset < scroll_viewer.ExtentHeight - scroll_viewer.ViewportHeight) {
+ scroll_viewer.ScrollToVerticalOffset(vertical_offset);
+ return true;
+ }
+ return false;
+ }
}
public static class TextBoxExtensions {
diff --git a/src/client/spark/view/Resources/ResourceKeys.cs b/src/client/spark/view/Resources/ResourceKeys.cs
new file mode 100644
index 000000000..634de738b
--- /dev/null
+++ b/src/client/spark/view/Resources/ResourceKeys.cs
@@ -0,0 +1,9 @@
+namespace mbts.ui {
+ static class ResourceKeys {
+ public const string
+ Securities = nameof(Securities),
+ Accounts = nameof(Accounts),
+ Users = nameof(Users),
+ Sides = nameof(Sides);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/view/Resources/TemplateKeys.cs b/src/client/spark/view/Resources/TemplateKeys.cs
new file mode 100644
index 000000000..d376785ed
--- /dev/null
+++ b/src/client/spark/view/Resources/TemplateKeys.cs
@@ -0,0 +1,6 @@
+namespace mbts.ui {
+ static class TemplateKeys {
+ public const string
+ SecurityKey = nameof(SecurityKey);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs
index b51a4989a..6cc76049e 100644
--- a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs
+++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs
@@ -130,8 +130,10 @@ namespace mbts.spark {
DialogSkirtItem _apply_item, _ok_item, _cancel_item;
MenuItemVM _import_item, _export_item, _load_factory_item;
- public ProfiledShellSettingsDialogVM(ISettingsProfileService profile_service, Func get_fallback, Func vm_factory, Func normalize, T init, string file_ext, uint settings_id = 0) {
+ public ProfiledShellSettingsDialogVM(ISettingsProfileService profile_service, Func get_fallback, Func vm_factory, Func normalize, T init, string file_ext, Func profile_equals = null, uint settings_id = 0) {
_vm_factory = vm_factory;
+ if (profile_equals == null)
+ profile_equals = EqualityComparer.Default.Equals;
// profile collections
var skip_local = profiles.WrapSkip(1);
var skip_local_wrapper = skip_local.WrapSelector(
@@ -185,12 +187,19 @@ namespace mbts.spark {
continue;
i = ~i;
var temp = ns.with(value: normalize(ns.value));
- skip_local_wrapper.Insert(i, temp);
if (settings_id == temp.id) {
- if (temp.value.Equals(init))
- selected_profile = skip_local[i];
settings_id = 0;
+ if (profile_equals(temp.value, init)) {
+ if (!temp.value.Equals(init)) {
+ // they aren't exactly equal (don't overwrite any props in 'init' - use it to create the vm)
+ temp = temp.with(value: init);
+ }
+ skip_local_wrapper.Insert(i, temp);
+ selected_profile = skip_local[i];
+ continue;
+ }
}
+ skip_local_wrapper.Insert(i, temp);
}
}));
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
index ad43e7aee..b4f3aa76b 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs
@@ -20,8 +20,8 @@ namespace mbts.spark {
readonly IRaiseCanExecuteChangedCommand _add_criteria_command, _remove_criteria_command, _ok_button_command;
bool _allow_empty, _is_edit_mode;
- SecurityImmutable? _pending_sec;
- (SecurityCriteria criteria, SecurityImmutable? sec, SecurityMD? md)? _snapshot;
+ uint? _pending_sec_key;
+ (SecurityCriteria criteria, uint? sec, SecurityMD? md)? _snapshot;
public ContractPickerModel(IBus bus, bool edit_mode, SecurityCriteria existing_criteria, SecurityCriteria world_view_filter = null)
: this(bus.subscribe(SecuritiesTag), edit_mode, existing_criteria, world_view_filter) { }
@@ -209,9 +209,9 @@ namespace mbts.spark {
_update_security_types();
_update_symbols();
_update_securities();
- if (_pending_sec.HasValue && changed_securities.ContainsKey(_pending_sec.Value.Id)) {
- select_security_request?.Invoke(_pending_sec.Value);
- _pending_sec = null;
+ if (_pending_sec_key.HasValue && changed_securities.TryGetValue(_pending_sec_key.Value, out var smd)) {
+ select_security_request?.Invoke(smd.security);
+ _pending_sec_key = null;
}
}
internal void criteria_selection_changed(IEnumerable selected_clauses) {
@@ -229,6 +229,8 @@ namespace mbts.spark {
security_criteria_clause_changed?.Invoke(this, e);
}
+ public bool is_editing => _snapshot.HasValue;
+
public ObservableCollection all_exchanges { get; } = new ObservableCollection();
public List selected_exchanges = new List();
@@ -298,7 +300,22 @@ namespace mbts.spark {
if (all_securities.ContainsKey(value.Value.security.Id)) {
select_security_request?.Invoke(value.Value.security);
} else {
- _pending_sec = value.Value.security;
+ _pending_sec_key = value.Value.security.Id;
+ }
+ }
+ }
+ }
+ }
+
+ public uint? selected_security_key {
+ get => selected_securities.Count == 1 && all_securities.TryGetValue(selected_securities[0], out var smd) ? smd.security.Id : (uint?)null;
+ set {
+ if (value != selected_security_key) {
+ if (value.HasValue) {
+ if (all_securities.TryGetValue(value.Value, out var smd)) {
+ select_security_request?.Invoke(smd.security);
+ } else {
+ _pending_sec_key = value.Value;
}
}
}
@@ -313,7 +330,7 @@ namespace mbts.spark {
if (all_securities.ContainsKey(value.Value.Id)) {
select_security_request?.Invoke(value.Value);
} else {
- _pending_sec = value.Value;
+ _pending_sec_key = value.Value.Id;
}
}
}
@@ -336,18 +353,19 @@ namespace mbts.spark {
}
#region IEditableObject
- public void BeginEdit() => _snapshot = (result_criteria, _pending_sec ?? selected_security, selected_security_md);
+ public void BeginEdit() => _snapshot = (result_criteria, _pending_sec_key ?? selected_security_key, selected_security_md);
public void EndEdit() => _snapshot = null;
public void CancelEdit() {
if (_snapshot.HasValue) {
var (criteria, sec, md) = _snapshot.Value;
security_criteria_clauses.SetItems(criteria.clauses);
- selected_security = sec;
+ selected_security_key = sec;
/// A may have been used to create the snapshot when was called (this happens when securities are loaded lazily).
/// If this is the case, pending sec was assigned to the security;
/// check if the security is now present in , if so, use that value instead of the null.
- selected_security_md = sec.HasValue && !md.HasValue && all_securities.TryGetValue(sec.Value.Id, out var md_match) ? md_match : md;
+ selected_security_md = sec.HasValue && !md.HasValue && all_securities.TryGetValue(sec.Value, out var md_match) ? md_match : md;
_snapshot = null;
+ RaisePropertyChanged(nameof(selected_security));
_add_criteria_command.RaiseCanExecuteChanged();
_remove_criteria_command.RaiseCanExecuteChanged();
}
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs
index 49eb0599b..28e76b6c6 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs
@@ -2,6 +2,7 @@
using mbts.spark;
using mbts.ui.converters;
using mbts.ui.shell;
+using mbts.ui.utility;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
@@ -16,8 +17,11 @@ namespace mbts.ui.controls {
partial class ContractPickerPopup : PopupControl {
public static readonly EventHandler
FlushSelectedCriteriaHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedCriteriaProperty)?.UpdateSource(),
+ FlushSelectedSecurityKeyHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedSecurityKeyProperty)?.UpdateSource(),
FlushSelectedSecurityHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedSecurityProperty)?.UpdateSource();
+ readonly PropertyUpdateGate _selection_sync_gate = new PropertyUpdateGate();
+
IReadOnlyDictionary _cached_security_map = DictionaryHelper.empty();
ContractPickerPopupController _controller;
bool _allow_empty, _is_lazy;
@@ -97,12 +101,55 @@ namespace mbts.ui.controls {
}
#endregion
+ #region SelectedSecurityKey
+ public static readonly DependencyProperty SelectedSecurityKeyProperty =
+ WPFHelper.create_dp(
+ nameof(SelectedSecurityKey),
+ FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+ (o, v) => {
+ o.Controller.model.selected_security_key = v;
+ o._selection_sync_gate.try_update(() => o._sync_selection_props(o.SelectedSecurityMD, o.SelectedSecurity, v, v));
+ });
+ //(o, base_value) => base_value is uint u && u != 0 ? u : (uint?)null);
+
+ public uint? SelectedSecurityKey {
+ get => GetValue(SelectedSecurityKeyProperty) as uint?;
+ set => SetValue(SelectedSecurityKeyProperty, value);
+ }
+ #endregion
+
+ enum SecurityProp {
+ Security,
+ SecurityMD,
+ ID
+ }
+
+ void _sync_selection_props(SecurityMD? curr_sec_md, SecurityImmutable? curr_sec, uint? curr_sec_key, uint? target_sec_key) {
+ if (curr_sec_key != target_sec_key) {
+ SetCurrentValue(SelectedSecurityKeyProperty, target_sec_key);
+ }
+ bool sec_md_dirty = target_sec_key != (curr_sec_md?.security)?.Id;
+ bool sec_dirty = target_sec_key != curr_sec?.Id;
+ if (sec_md_dirty || sec_dirty) {
+ curr_sec_md = target_sec_key.HasValue && _cached_security_map.TryGetValue(target_sec_key.Value, out var smd) ? smd : (SecurityMD?)null;
+ if (sec_md_dirty)
+ SetCurrentValue(SelectedSecurityMDProperty, curr_sec_md);
+ if (sec_dirty)
+ SetCurrentValue(SelectedSecurityProperty, curr_sec_md?.security);
+ }
+ if (!IsEditMode)
+ SetCurrentValue(SelectedCriteriaProperty, target_sec_key.HasValue ? SecurityCriteria.from_keys(new[] { target_sec_key.Value }) : null);
+ }
+
#region SelectedSecurity
public static readonly DependencyProperty SelectedSecurityProperty =
WPFHelper.create_dp(
nameof(SelectedSecurity),
FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
- (o, v) => o.Controller.model.selected_security = v);
+ (o, v) => {
+ o.Controller.model.selected_security = v;
+ o._selection_sync_gate.try_update(() => o._sync_selection_props(o.SelectedSecurityMD, v, o.SelectedSecurityKey, v?.Id));
+ });
public SecurityImmutable? SelectedSecurity {
get => GetValue(SelectedCriteriaProperty) as SecurityImmutable?;
@@ -115,7 +162,10 @@ namespace mbts.ui.controls {
WPFHelper.create_dp(
nameof(SelectedSecurityMD),
FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
- (o, v) => o.Controller.model.selected_security_md = v);
+ (o, v) => {
+ o.Controller.model.selected_security_md = v;
+ o._selection_sync_gate.try_update(() => o._sync_selection_props(v, o.SelectedSecurity, o.SelectedSecurityKey, (v?.security)?.Id));
+ });
public SecurityMD? SelectedSecurityMD {
get => GetValue(SelectedCriteriaProperty) as SecurityMD?;
@@ -248,12 +298,10 @@ namespace mbts.ui.controls {
}
void on_cancel() {
model.CancelEdit();
- propagate_to_owner();
owner.CancelClick?.Invoke(owner, EventArgs.Empty);
}
void propagate_to_owner() {
- owner.set_current_if_changed(SelectedSecurityMDProperty, owner.Controller.model.selected_security_md);
- owner.set_current_if_changed(SelectedSecurityProperty, owner.Controller.model.selected_security);
+ owner.set_current_if_changed(SelectedSecurityKeyProperty, owner.Controller.model.selected_security_key);
owner.set_current_if_changed(SelectedCriteriaProperty, owner.Controller.model.result_criteria);
}
}
@@ -262,4 +310,4 @@ namespace mbts.ui.controls {
public SecurityCriteria selected_criteria => _selected_criteria.Value;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/view/Utility/BindingProxy.cs b/src/client/spark/view/Utility/BindingProxy.cs
new file mode 100644
index 000000000..c00646a04
--- /dev/null
+++ b/src/client/spark/view/Utility/BindingProxy.cs
@@ -0,0 +1,13 @@
+using System.Windows;
+
+namespace mbts.ui {
+ class BindingProxy : FrameworkElement {
+ public static readonly DependencyProperty ValueProperty =
+ DependencyProperty.Register(nameof(Value), typeof(object), typeof(BindingProxy));
+
+ public object Value {
+ get => GetValue(ValueProperty);
+ set => SetValue(ValueProperty, value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark_api/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs
index 7b03bdaee..36b560c1a 100644
--- a/src/client/spark_api/Co2/MDConsumerHandle.cs
+++ b/src/client/spark_api/Co2/MDConsumerHandle.cs
@@ -133,6 +133,12 @@ namespace mbts.co2 {
total_volume = _cold->total_volume;
return (_cold->last_trade.load_if_new(ref time, out ps));
}
+ public bool get_last_trade(ref ulong time, out NativePriceSize ps, out DateTime timestamp, out ulong total_volume, out bool from_spread) {
+ timestamp = _cold->last_trade_time;
+ total_volume = _cold->total_volume;
+ from_spread = (_cold->from_spread != 0);
+ return (_cold->last_trade.load_if_new(ref time, out ps));
+ }
public ulong misc_timestamp { get { return _cold->misc_timestamp; } }
public ulong total_volume { get { return _cold->total_volume; } }
@@ -259,7 +265,7 @@ namespace mbts.co2 {
// Last trade
public AtomicPriceSize last_trade;
public ulong total_volume;
- public utils.LLDateTime last_trade_time;
+ public utils.LLDateTime last_trade_time;
//// Settlement
public UInt64 misc_timestamp;
@@ -280,6 +286,7 @@ namespace mbts.co2 {
public double session_low_offer;
public double fixing_price;
+ public int from_spread;
public int deleted;
// FixedSecurity will not be directly addressable. Instead the security is available through the callback
public Int64 security_size;
diff --git a/src/client/spark_api/utils/Log.cs b/src/client/spark_api/utils/Log.cs
index 649f7d202..891548cf1 100644
--- a/src/client/spark_api/utils/Log.cs
+++ b/src/client/spark_api/utils/Log.cs
@@ -34,7 +34,7 @@ namespace bts {
Latency,
DataFlow,
Plugin,
- ClientSdk,
+ Sdk,
Http,
// Please keep this list in sync with logging.h/logging.cpp
}
@@ -103,7 +103,7 @@ namespace bts {
internal static Logger Ui => new Logger(Subsystem.Ui);
internal static Logger Testing => new Logger(Subsystem.Testing);
internal static Logger DataFlow => new Logger(Subsystem.DataFlow);
- public static Logger ClientSdk => new Logger(Subsystem.ClientSdk);
+ public static Logger Sdk => new Logger(Subsystem.Sdk);
public static Logger Http => new Logger(Subsystem.Http);
internal static void log_at(this Logger logger, Level level, string message) {
diff --git a/src/client/spark_core/utils/FileUtils.cs b/src/client/spark_core/utils/FileUtils.cs
index 6be341755..e210be5a7 100644
--- a/src/client/spark_core/utils/FileUtils.cs
+++ b/src/client/spark_core/utils/FileUtils.cs
@@ -61,15 +61,17 @@ namespace bts.support {
// Delete the oldest files matching pattern (*.txt) keeping {count} files
public static void keep_n_matching_files(string directory, string pattern, int count) {
- var to_delete =
- Directory.GetFiles(directory, pattern)
- .Select(f => new { name = f, modified = File.GetLastWriteTimeUtc(f) })
- .OrderBy(f => f.modified)
- .Reverse()
- .Skip(count);
+ if (Directory.Exists(directory)) {
+ var to_delete =
+ Directory.GetFiles(directory, pattern)
+ .Select(f => new { name = f, modified = File.GetLastWriteTimeUtc(f) })
+ .OrderBy(f => f.modified)
+ .Reverse()
+ .Skip(count);
- foreach (var f in to_delete) {
- try_delete(f.name);
+ foreach (var f in to_delete) {
+ try_delete(f.name);
+ }
}
}
}
diff --git a/src/client/spark_core/utils/ObservableExtensions.cs b/src/client/spark_core/utils/ObservableExtensions.cs
index 8544f29d0..fd1b102f8 100644
--- a/src/client/spark_core/utils/ObservableExtensions.cs
+++ b/src/client/spark_core/utils/ObservableExtensions.cs
@@ -212,7 +212,10 @@ namespace System.Reactive.Linq {
IDisposable source_sub = source.Select(v => v).Subscribe(on_source);
return Disposable.Create(dispose);
// local methods
- void on_source(T value) => Disposable.replace(ref value_sub, subscribe_value(value));
+ void on_source(T value) {
+ Disposable.dispose(ref value_sub);
+ value_sub = subscribe_value(value);
+ }
void dispose() {
Disposable.dispose(ref source_sub);
Disposable.dispose(ref value_sub);
diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs
index 9f48e2e54..857db8664 100644
--- a/src/client/spark_sdk/samples/SDKMain.cs
+++ b/src/client/spark_sdk/samples/SDKMain.cs
@@ -23,7 +23,7 @@ namespace bts.sdk
public static void Main(string[] args)
{
BTS.init();
- Log.ClientSdk.info("Welcome to the BTS Client Side SDK example");
+ Log.Sdk.info("Welcome to the BTS Client Side SDK example");
var ctx = new ServiceContext();
string u = args.FirstOrDefault(x => x.Contains("--user="));
diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj
index e2f93fec3..9ee2d2b4a 100644
--- a/src/client/spark_sdk/spark_sdk.csproj
+++ b/src/client/spark_sdk/spark_sdk.csproj
@@ -71,10 +71,6 @@
-
-
-
-
diff --git a/src/client/spark_test/Co2/Co2Tests.cs b/src/client/spark_test/Co2/Co2Tests.cs
index a5f1b292a..af5edc856 100644
--- a/src/client/spark_test/Co2/Co2Tests.cs
+++ b/src/client/spark_test/Co2/Co2Tests.cs
@@ -142,7 +142,8 @@ namespace mbts.co2.tests
Assert.IsTrue(entry.session_low_offer == 5.5);
Assert.IsTrue(entry.fixing_price == 6.6);
- Assert.IsTrue(entry.deleted == 1);
+ Assert.IsTrue(entry.from_spread == 0);
+ Assert.IsTrue(entry.deleted == 1);
}
[Test]
diff --git a/src/client/spark_test/Utils/MarketDataUtilities.cs b/src/client/spark_test/Utils/MarketDataUtilities.cs
index 5ab58171a..c08ab7678 100644
--- a/src/client/spark_test/Utils/MarketDataUtilities.cs
+++ b/src/client/spark_test/Utils/MarketDataUtilities.cs
@@ -2,6 +2,7 @@
using bts.co2;
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -39,8 +40,29 @@ namespace bts.tests {
return null;
}
+public static async Task> get_multiple_securities(MarketDataRelay relay, IEnumerable products, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) {
+ var request = new MDRequest() { Host = _MD_HOST };
+ request.Channels.AddRange(products.Select(z =>
+ new SecurityChannel() {
+ Time = 0,
+ Flags = (uint)flags,
+ Type = security_type,
+ Exchange = v,
+ Symbol = z.Symbol,
+ TradeCursor = 0,
+ RfqCursor = 0
+ }));
+
+ var result = await relay.requestmd_async(request);
+
+ if (result.success) {
+ return result.value.Channels.Where(s => s.Updates.Count > 0).Select(x => (SecurityImmutable) x.Updates.First().Security);
+ }
+ return Enumerable.Empty();
+ }
+
public static async Task> get_expirations(MarketDataRelay relay, string symbol, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) {
- var request = new MDRequest() {
+ var request = new MDRequest() {
Host = _MD_HOST,
Channels = {
new SecurityChannel() {
diff --git a/src/client/spark_test/Utils/SpreaderUtilities.cs b/src/client/spark_test/Utils/SpreaderUtilities.cs
index 5de24e9a6..6a09b97ca 100644
--- a/src/client/spark_test/Utils/SpreaderUtilities.cs
+++ b/src/client/spark_test/Utils/SpreaderUtilities.cs
@@ -67,7 +67,12 @@ namespace bts.tests
return (s1: sec1.Value, s2: sec2.Value);
}
- public static async Task<(IEnumerable book, (Security security, ExecutionStrategy strategy) synthetic)> common_setup_one(OrderService order_service, SyntheticSecurityService synthetic_service, (SecurityImmutable? s1, SecurityImmutable? s2) securities, (String name, uint id) account, (String name, uint id) user) {
+ public static async Task<(IEnumerable book, (Security security, ExecutionStrategy strategy) synthetic)> common_setup_one(
+ OrderService order_service,
+ SyntheticSecurityService synthetic_service,
+ (SecurityImmutable? s1, SecurityImmutable? s2) securities,
+ (String name, uint id) account, (String name, uint id) user)
+ {
var order_defs = new (OrderDefinition order_def, double price, uint size)[10];
for (int i = 0; i < 4; i ++) {
diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs
index b36693280..8e01b02b9 100644
--- a/src/client/spark_test/Utils/TestUtils.cs
+++ b/src/client/spark_test/Utils/TestUtils.cs
@@ -85,6 +85,8 @@ namespace bts.tests.utils {
if(timeout == null) {
timeout = TimeSpan.FromMinutes(2);
}
+ Console.WriteLine("Please Wait... this is going to take some time...");
+ await Task.Delay(180000);
System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
sw.Start();
@@ -131,6 +133,13 @@ namespace bts.tests.utils {
System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch();
watch.Start();
+ var prts = mbts.config.Configuration.get();
+ Console.WriteLine("\n\n\n\n\n\n\n\n\n\n");
+ Console.WriteLine("config_port: " + prts.config_port);
+ Console.WriteLine("qbus_port: " + prts.qbus_port);
+ Console.WriteLine("glbx_sim_fix_port: " + prts.glbx_sim_fix_port);
+ Console.WriteLine("\n\n\n\n\n\n\n\n\n\n");
+
var ctx = new ServiceContext();
var mdrelay = ctx.locate();
@@ -143,20 +152,28 @@ namespace bts.tests.utils {
products = tmpp.value;
break;
}
+ else {
+ Console.WriteLine("mdrelay.request_products_async Error: ");
+ Console.WriteLine(tmpp.error_message);
+ }
await Task.Delay(10000);
}
+ //UserSymbol.get_all() in MDConsumer.cs
bts.test.Assert.IsTrue(products != null, "No products found");
- var filtered_products = products.Products.Where(z => z.Exchange == Venue.Sim && z.Type == SecurityType.Future);
- bts.test.Assert.IsTrue(filtered_products.Count() > 0, "No suitable products found");
+ IEnumerable filtered_products = products.Products.Where(z => z.Exchange == Venue.Sim && z.Type == SecurityType.Future);
+ bts.test.Assert.IsTrue(filtered_products.Count() > 0, "No suitable products found"); //products are not guaranteed to have securities, so I need to get the product from the list of securities
uint? sec_id = null;
+ /* get securities if the list is not empty use the top one */
+
for(int i = 0; i < 10; i++) {
- var test_security = await MarketDataUtilities.get_security(mdrelay, filtered_products.First().Symbol, SecurityType.Future, f => true);
- if(test_security.HasValue) {
+ var test_security = await MarketDataUtilities.get_multiple_securities(mdrelay, filtered_products, SecurityType.Future);
+
+ if(test_security.Count() > 0) {
Console.Write("," + i);
- sec_id = test_security.Value.Id;
+ sec_id = test_security.FirstOrDefault().Id;
break;
}
await Task.Delay(10000);
@@ -237,7 +254,7 @@ namespace bts.tests.utils {
Result? md_result = await await_with_timeout(
md_relay.requestmd_async(md_request),
timeout);
-
+ Console.Write(md_result);
return md_result != null;
}
}
diff --git a/src/client/spark_test/system_test_scripts/delete_dbs.sh b/src/client/spark_test/system_test_scripts/delete_dbs.sh
index 423cb3f23..8b1a24f1f 100644
--- a/src/client/spark_test/system_test_scripts/delete_dbs.sh
+++ b/src/client/spark_test/system_test_scripts/delete_dbs.sh
@@ -11,7 +11,7 @@ if [ -d "$sparkdata_dir/data" ]
then
[ -d $sparkdata_dir/data/databases/orders ] && rm -rf $sparkdata_dir/data/databases/orders
[ -d $sparkdata_dir/data/databases/fills ] && rm -rf $sparkdata_dir/data/databases/fills
- [ -d $sparkdata_dir/data/databases/ex_sim_orders ] && rm -rf $sparkdata_dir/data/databases/ex_sim_orders
+ [ -d $sparkdata_dir/data/databases/ex_sim_orders_venue_sim ] && rm -rf $sparkdata_dir/data/databases/ex_sim_orders_venue_sim
[ -d $sparkdata_dir/data/jetfix ] && rm -rf $sparkdata_dir/data/jetfix
[ -d $sparkdata_dir/data/exchange_sim ] && rm -rf $sparkdata_dir/data/exchange_sim
diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh
index 2c94a2393..93ca9761c 100644
--- a/src/client/spark_test/system_test_scripts/test_position_limits.sh
+++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh
@@ -30,6 +30,8 @@ cat << EOF > $sparkdata_dir/conf/spark.conf
}
EOF
+echo "Port"
+./sparkd configcheck Ports
nohup ./sparkd run &
pid=$!
diff --git a/src/client/sparkcmd/Cmd/OrderStress.cs b/src/client/sparkcmd/Cmd/OrderStress.cs
index 643703155..1a0bd48a5 100644
--- a/src/client/sparkcmd/Cmd/OrderStress.cs
+++ b/src/client/sparkcmd/Cmd/OrderStress.cs
@@ -54,6 +54,7 @@ namespace bts {
var result = relay.requestmd(request);
foreach (var ch in result.Channels) {
+ // if (ch.Platform != Platform.Sim) continue;
foreach (var update in ch.Updates) {
if (update.Security != null) {
var m = new Market() {
@@ -129,6 +130,7 @@ namespace bts {
}
var orders = ctx.locate();
+ var factor = TimeSpan.TicksPerMillisecond / 1000;
foreach (var m in all_markets(ctx)) {
ConsoleEx.WriteLine(m.security.security_desc(), ConsoleColor.White);
var tick = m.security.ContractSpec.LowTick;
@@ -136,7 +138,12 @@ namespace bts {
for (var x = 0; x < o.depth; ++x) {
var price = m.ask.Value.price() + (tick * x);
ConsoleEx.WriteLine($"Sell {o.quantity} at {price}", ConsoleColor.Red);
- orders.create_order_async(mkorder(m.security.Id, price, o.quantity, Side.Sell));
+ var sw = new System.Diagnostics.Stopwatch();
+ sw.Start();
+ var r = orders.create_order(mkorder(m.security.Id, price, o.quantity, Side.Sell));
+ sw.Stop();
+ // Log.Api.info($"Order: id {r.OrderKey} time {sw.ElapsedTicks/factor}us");
+ Log.Api.info($"Order {m.security.security_desc()}: id {r.OrderKey} {r.ErrorCode} time {sw.ElapsedTicks/factor}us");
System.Threading.Thread.Sleep(o.sleep);
}
}
@@ -145,7 +152,11 @@ namespace bts {
for (var x=0; x < o.depth; ++x) {
var price = m.bid.Value.price() - (tick * x);
ConsoleEx.WriteLine($"Buy {o.quantity} at {price}", ConsoleColor.Blue);
- orders.create_order_async(mkorder(m.security.Id, price, o.quantity, Side.Buy));
+ var sw = new System.Diagnostics.Stopwatch();
+ sw.Start();
+ var r = orders.create_order(mkorder(m.security.Id, price, o.quantity, Side.Buy));
+ sw.Stop();
+ Log.Api.info($"Order {m.security.security_desc()}: id {r.OrderKey} {r.ErrorCode} time {sw.ElapsedTicks/factor}us");
System.Threading.Thread.Sleep(o.sleep);
}
}
diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs
index 52dcee6cd..87a7b5776 100644
--- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs
+++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs
@@ -9,6 +9,7 @@ using System.Threading;
namespace bts {
+ [Verb("servicetest", HelpText="Scratch space for testing services")]
public class ServiceTestOptions {
[Option(nameof(synthetic))]
public bool synthetic { get; set; }
@@ -16,10 +17,10 @@ namespace bts {
public bool user { get; set; }
[Option(nameof(admin))]
public bool admin { get; set; }
-
+ [Option(nameof(latency))]
+ public bool latency { get; set; }
}
- [Verb("servicetest", HelpText="Scratch space for testing services")]
public class ServiceTest {
public static int Run(ServiceTestOptions o) {
if (o.synthetic) {
@@ -31,6 +32,9 @@ namespace bts {
if (o.admin) {
admin_test();
}
+ if (o.latency) {
+ latency_test();
+ }
return 0;
}
@@ -114,5 +118,21 @@ namespace bts {
Thread.Sleep(100);
}
}
+
+ private static void latency_test() {
+ var ctx = new ServiceContext();
+ var s = ctx.locate();
+
+ UInt64 sequence = 0;
+ var factor = TimeSpan.TicksPerMillisecond / 1000;
+ while(true) {
+ var sw = new System.Diagnostics.Stopwatch();
+ sw.Start();
+ var reply = s.ping(new metrics.BufferMessage() { Sequence = ++sequence });
+ sw.Stop();
+ Console.WriteLine($"{reply.Sequence} - {sw.ElapsedMilliseconds}ms -- {sw.ElapsedTicks/factor} us");
+ System.Threading.Thread.Sleep(1000);
+ }
+ }
}
}
diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs
index 96b1d2dc8..61b1ba983 100644
--- a/src/client/sparkcmd/Program.cs
+++ b/src/client/sparkcmd/Program.cs
@@ -31,6 +31,7 @@ namespace sparkcmd {
var parser = new Parser(ps => {
ps.CaseInsensitiveEnumValues = true;
+ ps.HelpWriter = Console.Out;
});
// note: this can be made to infer the options type list from the list of delegates
diff --git a/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml b/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml
index 334c3c48f..e4d4d7acc 100644
--- a/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml
+++ b/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml
@@ -11,7 +11,6 @@
-->
-
63.247.113.163
@@ -19,7 +18,7 @@
bluetrd-psStarts123N
- Legacy
+ New
@@ -28,7 +27,7 @@
Value from ICE SupportValue from ICE SupportN
- Legacy
+ New
@@ -37,7 +36,7 @@
bluetrdl-psStarts123N
- Legacy
+ New
diff --git a/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml b/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml
index 23680779e..94edae6c4 100644
--- a/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml
+++ b/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml
@@ -17,10 +17,10 @@
63.247.113.2143000
- Value from ICE Support
- Value from ICE Support
+ bt_ps
+ Starts123N
- Legacy
+ New
diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake
index 2c14978ea..e058a8be6 100644
--- a/src/lib/CMakeDeps_win.cmake
+++ b/src/lib/CMakeDeps_win.cmake
@@ -1 +1 @@
-set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp)
\ No newline at end of file
+set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp)
\ No newline at end of file
diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp
index 80001cbf4..261acaeae 100644
--- a/src/lib/api/service_helpers/AdminServiceUtils.cpp
+++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp
@@ -46,12 +46,15 @@ bool AdminServiceUtils::has_exchange(const ExchangeConnection& conn,
break;
case api::Venue::VENUE_UNSET:
case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
rv = conn.has_sim_connection();
+ break;
+ case api::Venue::VENUE_ICE:
+ rv = conn.has_ice_connection();
break;
case api::Venue::VENUE_BTS:
case api::Venue::VENUE_CBOE:
case api::Venue::VENUE_CBOECFE:
- case api::Venue::VENUE_ICE:
case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_:
case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_:
rv = false;
@@ -89,6 +92,23 @@ const ExchangeConnection* AdminServiceUtils::resolve_cme_connection(
return nullptr;
}
+const bts::api::admin::ExchangeConnection*
+AdminServiceUtils::resolve_ice_connection(const bts::api::admin::AdminData& data,
+ const bts::api::admin::BTSAccount& account,
+ const bts::api::Security&)
+{
+ if(account.has_connections())
+ {
+ for (const std::string& conn_name : account.connections().exchange_connection_names())
+ {
+ const bts::api::admin::ExchangeConnection* conn = find_connection(data, conn_name);
+ if (conn!=nullptr && conn->has_ice_connection())
+ return conn;
+ }
+ }
+ return nullptr;
+}
+
const bts::api::admin::ExchangeConnection*
AdminServiceUtils::resolve_sim_connection(const bts::api::admin::AdminData& data,
const bts::api::admin::BTSAccount& account,
@@ -117,14 +137,22 @@ AdminServiceUtils::resolve_connection(const bts::api::admin::AdminData& data,
rv = resolve_sim_connection(data, account, sec);
break;
}
+ case api::Venue::VENUE_ICE:
+ {
+ rv = resolve_ice_connection(data, account, sec);
+ auto deployment_type = boost::to_lower_copy(config::get().type());
+ if (rv == nullptr && (deployment_type == "dev" || deployment_type == "demo"))
+ rv = resolve_sim_connection(data, account, sec);
+ break;
+ }
case api::Venue::VENUE_UNSET:
case api::Venue::VENUE_BTS:
case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
rv = resolve_sim_connection(data, account, sec);
break;
case api::Venue::VENUE_CBOE:
case api::Venue::VENUE_CBOECFE:
- case api::Venue::VENUE_ICE:
case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_:
case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_:
rv = nullptr;
@@ -161,9 +189,15 @@ void AdminServiceUtils::fill_connections_from_config(bts::api::admin::AdminData&
case config::JetFIX::Connection::CBOE:
break;
case config::JetFIX::Connection::SIM:
+ case config::JetFIX::Connection::SIMICE:
connection.mutable_sim_connection();
add_connection(admin_data,connection);
break;
+ case config::JetFIX::Connection::ICE:
+ connection.mutable_ice_connection()->set_sender_compid(c.sender_compid());
+ add_connection(admin_data,connection);
+ break;
+
}
}
for(int i=0;iclearing_account();
break;
}
- case api::Venue::VENUE_ICE:{
+ case api::Venue::VENUE_ICE:
+ {
auto ice_account_data = get_account_ice_data(account, data);
if (ice_account_data != nullptr)
- rv = ice_account_data->clearing_account_override();
- break;
+ rv = ice_account_data->clearing_account();
+ break;
}
- case api::Venue::VENUE_SIM: {
+ case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
+ {
auto sim_account_data = get_account_sim_data(account, data);
if (sim_account_data != nullptr)
rv = sim_account_data->clearing_account();
@@ -466,6 +503,46 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt
return rv;
}
switch (sec.exchange()) {
+ case api::Venue::VENUE_ICE:
+ {
+ const bts::api::admin::ICEUserData* ice_user_data = get_user_ice_data(*user_ptr, data);
+ if(ice_user_data==nullptr)
+ {
+ out_result.set_is_success(false);
+ out_result.set_error_text("Could not find ICE data for user");
+ return rv;
+ }
+ const bts::api::admin::ICEAccountData* ice_account_data = get_account_ice_data(*account_ptr, data);
+ if(ice_account_data==nullptr)
+ {
+ out_result.set_is_success(false);
+ out_result.set_error_text("Could not find ICE data for account");
+ return rv;
+ }
+ // check for data corectness
+ if (ice_user_data->operator_id().length() == 0)
+ {
+ out_result.set_is_success(false);
+ out_result.set_error_text("Operator ID is not set");
+ return rv;
+ }
+
+ rv.set_session(conn_ptr->name());
+ rv.set_sender_compid(conn_ptr->ice_connection().sender_compid());
+ rv.set_account(ice_account_data->clearing_account());
+ rv.set_operator_id(ice_user_data->operator_id());
+ rv.set_cti_code(ice_account_data->cti());
+ rv.set_customer_or_firm(ice_account_data->origin());
+ rv.set_clearing_firm(ice_account_data->clearing_firm());
+ rv.set_customer_account_ref_id(ice_account_data->customer_account_ref_id());
+ rv.set_account_code(ice_account_data->account_code());
+ rv.set_company_id(std::to_string(ice_user_data->company_id()));
+ rv.set_authorized_trader(ice_user_data->authorized_trader());
+ rv.set_authorized_group(ice_user_data->authorized_group());
+ rv.set_cust_order_handing_inst(ice_user_data->cust_order_handing_inst());
+
+ return rv;
+ }
case bts::api::Venue::VENUE_GLBX: {
const bts::api::admin::CMEUserData* cme_user_data = get_user_cme_data(*user_ptr, data);
if(cme_user_data==nullptr){
@@ -516,7 +593,9 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt
rv.set_customer_or_firm(cme_account_data->origin());
return rv;
}
- case api::Venue::VENUE_SIM: {
+ case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
+ {
const bts::api::admin::SIMUserData* sim_user_data = get_user_sim_data(*user_ptr, data);
if(sim_user_data==nullptr){
out_result.set_is_success(false);
@@ -562,8 +641,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt
case api::Venue::VENUE_UNSET:
case api::Venue::VENUE_BTS:
case api::Venue::VENUE_CBOE:
- case api::Venue::VENUE_CBOECFE:
- case api::Venue::VENUE_ICE:
+ case api::Venue::VENUE_CBOECFE:
case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_:
case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_:
out_result.set_is_success(false);
@@ -710,6 +788,18 @@ const bts::api::admin::CMEUserData* AdminServiceUtils::get_group_cme_data(const
return nullptr;
}
+const bts::api::admin::ICEUserData* AdminServiceUtils::get_group_ice_data(const bts::api::admin::BTSUserGroup& group,
+ const bts::api::admin::AdminData& data){
+ if (group.has_user_data() && group.user_data().has_exchange_user_data() && group.user_data().exchange_user_data().has_ice_data())
+ return &(group.user_data().exchange_user_data().ice_data());
+ else if (has_id(group.parent_group_id())){
+ const bts::api::admin::BTSUserGroup* parent_group = find_group(data, group.parent_group_id());
+ if (parent_group != nullptr)
+ return get_group_ice_data(*parent_group, data);
+ }
+ return nullptr;
+}
+
const bts::api::admin::SIMUserData* AdminServiceUtils::get_group_sim_data(const bts::api::admin::BTSUserGroup& group,
const bts::api::admin::AdminData& data){
if (group.has_user_data() && group.user_data().has_exchange_user_data() && group.user_data().exchange_user_data().has_sim_data())
@@ -840,6 +930,18 @@ const bts::api::admin::CMEUserData* AdminServiceUtils::get_user_cme_data(const b
return nullptr;
}
+const bts::api::admin::ICEUserData* AdminServiceUtils::get_user_ice_data(const bts::api::admin::BTSUser& user,
+ const bts::api::admin::AdminData& data){
+ if (user.has_user_data() && user.user_data().has_exchange_user_data() && user.user_data().exchange_user_data().has_ice_data())
+ return &(user.user_data().exchange_user_data().ice_data());
+ else{
+ const bts::api::admin::BTSUserGroup* parent_group = find_group(data, user.parent_group_id());
+ if (parent_group != nullptr)
+ return get_group_ice_data(*parent_group, data);
+ }
+ return nullptr;
+}
+
const bts::api::admin::SIMUserData* AdminServiceUtils::get_user_sim_data(const bts::api::admin::BTSUser& user,
const bts::api::admin::AdminData& data){
if (user.has_user_data() && user.user_data().has_exchange_user_data() && user.user_data().exchange_user_data().has_sim_data())
@@ -867,7 +969,16 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm
rv = cme_user_data->operator_id();
break;
}
- case api::Venue::VENUE_SIM: {
+ case api::Venue::VENUE_ICE:
+ {
+ auto ice_user_data = get_user_ice_data(user, data);
+ if (ice_user_data != nullptr)
+ rv = ice_user_data->operator_id();
+ break;
+ }
+ case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
+ {
auto sim_user_data = get_user_sim_data(user, data);
if (sim_user_data != nullptr)
rv = sim_user_data->operator_id();
@@ -877,8 +988,38 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm
case api::Venue::VENUE_UNSET:
case api::Venue::VENUE_BTS:
case api::Venue::VENUE_CBOE:
- case api::Venue::VENUE_CBOECFE:
+ case api::Venue::VENUE_CBOECFE:
+ case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_:
+ case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_:
+ out_result.set_is_success(false); out_result.set_error_text("Exchange not supported");
+ break;
+ }
+ return rv;
+}
+
+std::string AdminServiceUtils::find_user_company_id (const bts::api::admin::AdminData& data,
+ const bts::api::admin::BTSUser& user,
+ api::Venue exchange,
+ bts::api::admin::AdminServiceOperationResult& out_result)
+{
+ out_result.set_is_success(true);
+ std::string rv = "";
+ switch(exchange)
+ {
case api::Venue::VENUE_ICE:
+ {
+ auto ice_user_data = get_user_ice_data(user, data);
+ if (ice_user_data != nullptr)
+ rv = std::to_string(ice_user_data->company_id());
+ break;
+ }
+ case api::Venue::VENUE_SIM:
+ case api::Venue::VENUE_SIMICE:
+ case api::Venue::VENUE_GLBX:
+ case api::Venue::VENUE_UNSET:
+ case api::Venue::VENUE_BTS:
+ case api::Venue::VENUE_CBOE:
+ case api::Venue::VENUE_CBOECFE:
case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_:
case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_:
out_result.set_is_success(false); out_result.set_error_text("Exchange not supported");
@@ -905,6 +1046,16 @@ AdminServiceUtils::find_user_account_matches (const AdminData& admin_data,
exchange_user))
matching_users.push_back(u);
}
+ // i.5
+ //At the ice, they send back the login level tag50 in exec reports which doesn't match any user level tag50s in the exchange_user
+ //so instead we look for the CompanyID (or client_id, tag 109) field here. If this field matches we have a good bet that
+ //the user we find is enough to fulfill the routing record enough to cancel or modify orphaned orders, etc
+ for (BTSUser const* u : user_ptrs)
+ {
+ auto exchange_u = find_user_company_id(admin_data, *u, exchange, find_user_result);
+ if (find_user_result.is_success() && boost::algorithm::iequals ( exchange_u, exchange_user))
+ matching_users.push_back(u);
+ }
// ii. uses the exchange, connection and exchange_account to reverse lookup the account(s)
auto account_ptrs = accounts(admin_data, false);
std::vector matching_accounts;
@@ -1016,16 +1167,26 @@ void AdminServiceUtils::validate_user_exchange_data (const bts::api::admin::BTSU
}
void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data,
std::vector& entitlements){
- for (const auto& user : admin_data.users()){
- const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user,
- admin_data);
- if(cme_data!=nullptr){
- for (const auto& cme_mic_data : cme_data->md_permissions()){
- MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user,
- cme_mic_data);
+ for (const auto& user : admin_data.users())
+ {
+ const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user, admin_data);
+ if(cme_data!=nullptr)
+ {
+ for (const auto& cme_mic_data : cme_data->md_permissions())
+ {
+ MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, cme_mic_data);
entitlements.push_back(rv);
}
}
+ const ICEUserData* ice_data=AdminServiceUtils::get_user_ice_data(user, admin_data);
+ if(ice_data!=nullptr)
+ {
+ for (const auto& ice_mic_data : ice_data->md_permissions())
+ {
+ MDEntitlementReportUnit rv=get_ice_md_entitlement_unit(user, ice_mic_data);
+ entitlements.push_back(rv);
+ }
+ }
}
}
MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit(
@@ -1073,6 +1234,22 @@ MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit(
rv.set_record_id(key.str());
return rv;
}
+MDEntitlementReportUnit AdminServiceUtils::get_ice_md_entitlement_unit(
+ const BTSUser& user,
+ const ICEMicData& ice_mic_data){
+ MDEntitlementReportUnit rv;
+ rv.set_user(user.name());
+ rv.set_user_id(user.id());
+ rv.set_exchange( bts::api::Venue_Name(bts::api::Venue::VENUE_ICE) );
+ rv.set_mic( bts::api::ICEMics_Name( ice_mic_data.mic()) );
+
+ rv.set_enabled(ice_mic_data.enabled());
+ std::ostringstream key;
+ key << rv.user() << rv.exchange() << rv.mic();
+ rv.set_record_id(key.str());
+ return rv;
+}
+
void AdminServiceUtils::get_user_symbol_permissions(const AdminData& data,
const BTSUser& user,
std::vector& rv){
@@ -1147,13 +1324,13 @@ void AdminServiceUtils::set_user_exchange_data(bts::api::admin::BTSUser* user,
if (!user->user_data().has_exchange_user_data())
user->mutable_user_data()->mutable_exchange_user_data()->CopyFrom(exchange_user_data);
}
-void AdminServiceUtils::set_user_md_entitlement_data(bts::api::admin::BTSUser* user,
- const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){
- if (!user->has_user_data())
- user->mutable_user_data();
- if (!user->user_data().has_exchange_md_entitlement_data())
- user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data);
-}
+// void AdminServiceUtils::set_user_md_entitlement_data(bts::api::admin::BTSUser* user,
+// const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){
+// if (!user->has_user_data())
+// user->mutable_user_data();
+// if (!user->user_data().has_exchange_md_entitlement_data())
+// user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data);
+// }
void AdminServiceUtils::clear_user_accounts (bts::api::admin::BTSUser* user){
if(user->has_user_data() && user->user_data().has_account_permissions())
user->mutable_user_data()->clear_account_permissions();
@@ -1398,6 +1575,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
auto account_1 = create_account(data, parent_account->id(), std::string("ACC A1"), std::string("description"), true, account_result); account_1->set_is_active(true);
auto account_2 = create_account(data, parent_account->id(), std::string("ACC A2"), std::string("description"), true, account_result); account_2->set_is_active(true);
auto account_3 = create_account(data, parent_account->id(), std::string("ACC A3"), std::string("description"), true, account_result); account_3->set_is_active(true);
+ auto account_4 = create_account(data, parent_account->id(), std::string("BLUETST"), std::string("description"), true, account_result); account_4->set_is_active(true);
create_account(data, parent_account->id(), std::string("ACC A4"), std::string("description"), true, account_result);
// add group
auto def_group = create_group(data, 0, std::string("default"), result);
@@ -1408,8 +1586,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
auto user_2 = create_user(data, def_group->id(), std::string("bts_2"), std::string("bts_2"), empty, empty, false, license_data, license_entitlements, user_result); user_2->set_is_active(true);
auto user_3 = create_user(data, def_group->id(), std::string("bts_3"), std::string("bts_3"), empty, empty, false, license_data, license_entitlements, user_result); user_3->set_is_active(true);
//associate users
- bts::api::admin::UserAccountPermissionUnit permission_unit;
- permission_unit.mutable_trading_permission()->set_submit_market_orders(true);
+ bts::api::admin::UserAccountPermissionUnit permission_unit;
permission_unit.mutable_trading_permission()->set_has_permissions(true);
permission_unit.mutable_admin_permission()->set_has_permissions(true);
bts::api::admin::UserAccountPermissions account_permissions;
@@ -1417,6 +1594,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_1->id(), permission_unit));
account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_2->id(), permission_unit));
account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_3->id(), permission_unit));
+ account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_4->id(), permission_unit));
set_user_accounts(user_1, account_permissions);
set_user_accounts(user_2, account_permissions);
set_user_accounts(user_3, account_permissions);
@@ -1426,6 +1604,12 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
exchange_account_data.mutable_cme_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1);
exchange_account_data.mutable_cme_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM);
exchange_account_data.mutable_cme_account_data()->set_clearing_account(parent_account->name());
+
+ exchange_account_data.mutable_ice_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_UNDEFINED);
+ exchange_account_data.mutable_ice_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM);
+ exchange_account_data.mutable_ice_account_data()->set_clearing_account(parent_account->name());
+ exchange_account_data.mutable_ice_account_data()->set_clearing_firm("649");
+
exchange_account_data.mutable_sim_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1);
exchange_account_data.mutable_sim_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM);
exchange_account_data.mutable_sim_account_data()->set_clearing_account(parent_account->name());
@@ -1433,33 +1617,87 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_1->name());
+ exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_1->name());
exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_1->name());
set_account_exchange_data(account_1, exchange_account_data);
exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_2->name());
+ exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_2->name());
exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_2->name());
set_account_exchange_data(account_2, exchange_account_data);
exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_3->name());
+ exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_3->name());
exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_3->name());
set_account_exchange_data(account_3, exchange_account_data);
+ exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_4->name());
+ set_account_exchange_data(account_4, exchange_account_data);
+
+
// add cme and sim user data
bts::api::admin::ExchangeUserData exchange_user_data;
exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_1->name());
exchange_user_data.mutable_cme_data()->set_location("us,nc");
+
+ exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_1->name());
+ exchange_user_data.mutable_ice_data()->set_company_id(51251);
+ exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx");
+ exchange_user_data.mutable_ice_data()->set_authorized_group("Group");
+ exchange_user_data.mutable_ice_data()->set_password("Starts123");
+ exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_id(1);
+
exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_1->name());
exchange_user_data.mutable_sim_data()->set_location("us,nc");
set_user_exchange_data(user_1, exchange_user_data);
exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_2->name());
exchange_user_data.mutable_cme_data()->set_location("us,nc");
+
+ exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_2->name());
+ exchange_user_data.mutable_ice_data()->set_company_id(51251);
+ exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx");
+ exchange_user_data.mutable_ice_data()->set_authorized_group("Group");
+ exchange_user_data.mutable_ice_data()->set_password("Starts123");
+ exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_id(1);
+
+
exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_2->name());
exchange_user_data.mutable_sim_data()->set_location("us,nc");
set_user_exchange_data(user_2, exchange_user_data);
exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_3->name());
exchange_user_data.mutable_cme_data()->set_location("us,nc");
+
+ exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_3->name());
+ exchange_user_data.mutable_ice_data()->set_company_id(51251);
+ exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx");
+ exchange_user_data.mutable_ice_data()->set_authorized_group("Group");
+ exchange_user_data.mutable_ice_data()->set_password("Starts123");
+ exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1);
+ exchange_user_data.mutable_ice_data()->set_mifid_id(1);
+
+
exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_3->name());
exchange_user_data.mutable_sim_data()->set_location("us,nc");
set_user_exchange_data(user_3, exchange_user_data);
@@ -1501,6 +1739,13 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){
add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_SPREAD,100);
add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_SIM, api::SecurityType::SECURITYTYPE_FUTURE,100);
add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_SIM, api::SecurityType::SECURITYTYPE_SPREAD,100);
+
+ //ICE limits
+ add_product_position_limits(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_FUTURE,50000);
+ add_product_position_limits(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_SPREAD,50000);
+ add_security_clip_sizes_to_account(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_FUTURE,50);
+ add_security_clip_sizes_to_account(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_SPREAD,50);
+
}
bool AdminServiceUtils::has_id (uint32_t id){return id>0;}
bool AdminServiceUtils::is_symbol_set (const std::string& symbol){
diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h
index 70d1e1e5b..dc6095e41 100644
--- a/src/lib/api/service_helpers/AdminServiceUtils.h
+++ b/src/lib/api/service_helpers/AdminServiceUtils.h
@@ -35,6 +35,10 @@ public:
const AdminData& data,
const BTSAccount& account,
const api::Security& sec);
+ static const ExchangeConnection* resolve_ice_connection(
+ const AdminData& data,
+ const BTSAccount& account,
+ const api::Security& sec);
static const ExchangeConnection* resolve_sim_connection(
const AdminData& data,
const BTSAccount& account,
@@ -164,6 +168,8 @@ public:
// travels up the group tree until it finds a populated cme data
static const CMEUserData* get_group_cme_data(const BTSUserGroup& group,
const AdminData& data);
+ static const ICEUserData* get_group_ice_data(const BTSUserGroup& group,
+ const AdminData& data);
static const SIMUserData* get_group_sim_data(const BTSUserGroup& group,
const AdminData& data);
static const UserAccountPermissions* const get_group_user_permissions (
@@ -198,6 +204,8 @@ public:
static uint32_t find_max_user_id (const AdminData& data);
static const CMEUserData* get_user_cme_data(const BTSUser& user,
const AdminData& data);
+ static const ICEUserData* get_user_ice_data(const BTSUser& user,
+ const AdminData& data);
static const SIMUserData* get_user_sim_data(const BTSUser& user,
const AdminData& data);
// finds the "exchange user" (ex: "operator_id" at CME or "authorized_trader"
@@ -210,6 +218,12 @@ public:
// i. uses the exchange and exchange_user to reverse lookup the user(s)
// ii. uses the exchange, connection and exchange_account to reverse lookup the account(s)
// iii. finds the first account from ii that a user from i is authorized to trade
+ static std::string find_user_company_id (
+ const AdminData& data,
+ const BTSUser& user,
+ api::Venue exchange,
+ AdminServiceOperationResult& out_result);
+
static std::pair
find_user_account_matches (const AdminData& admin_data,
const std::string& connection,
@@ -249,6 +263,9 @@ public:
static MDEntitlementReportUnit get_cme_md_entitlement_unit(
const BTSUser& user,
const CMEMicData& cme_mic_data);
+ static MDEntitlementReportUnit get_ice_md_entitlement_unit(
+ const BTSUser& user,
+ const ICEMicData& ice_mic_data);
static void get_user_symbol_permissions(
const AdminData& data,
const BTSUser& user,
@@ -275,8 +292,6 @@ public:
static void set_user_exchange_data(
BTSUser* user,
const ExchangeUserData& exchange_user_data);
- static void set_user_md_entitlement_data(BTSUser* user,
- const ExchangeUserMarketDataEntitlementData&);
static void clear_user_accounts (BTSUser* user);
static void set_user_accounts (BTSUser* user,
const UserAccountPermissions& user_account_permissions);
diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto
index a274c3cb6..1a1f57fff 100644
--- a/src/lib/api/services/AdminService.proto
+++ b/src/lib/api/services/AdminService.proto
@@ -55,11 +55,12 @@ message BTSUser{
string name = 30;
string password = 40;
string full_name = 42;
- string company = 44;
+ string company = 44;
bool is_active = 50;
bool can_create = 55;
- LicenseData license_data = 60; //unused
- LicenseEntitlements license_entitlements = 70; //unused
+ LicenseData license_data = 60;
+ LicenseEntitlements license_entitlements = 70;
+
BTSUserDerivableData user_data = 80;
}
@@ -76,7 +77,7 @@ message BTSUserDerivableData{
// b. else its overridden at the user level
UserAccountPermissions account_permissions = 70;
ExchangeUserData exchange_user_data = 80;
- ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90;
+ reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90;
}
message LicenseData{
@@ -91,21 +92,22 @@ message LicenseEntitlements{
bool spreader = 30;
}
-message AlgoTradingPermissionsUnit{
- bool submit_iceberg_orders = 10; //unused
- bool submit_time_box_orders = 20; //unused
- bool submit_spreader_orders = 30; //unused
-}
+// message AlgoTradingPermissionsUnit{
+// bool submit_iceberg_orders = 10; //unused
+// bool submit_time_box_orders = 20; //unused
+// bool submit_spreader_orders = 30; //unused
+// }
message TradingPermissionUnit{
+ reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused
+ reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused
+ reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused
+
bool has_permissions = 5;
- bool submit_market_orders = 10; //unused
- bool submit_gtc_orders = 20; //unused
- AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused
}
message AdminPermissionUnit{
- // TODO: needs to be more ellaborate (account writing,
+ // TODO: needs to be more ellaborate (account writing,
// reading etc, routing etc)
bool has_permissions = 10;
bool has_md_permissions = 20;
@@ -119,15 +121,15 @@ message UserAccountPermissionUnit{
message UserAccountPermissions{
//uint32 = account_id
- map account_permissions = 10;
+ map account_permissions = 10;
}
-// unused now
-message UserSecurityTradingLimit{
- SecurityScope security = 10;
- uint32 clip_size = 20;
- bool can_trade = 30;
-}
+// // unused now
+// message UserSecurityTradingLimit{
+// SecurityScope security = 10;
+// uint32 clip_size = 20;
+// bool can_trade = 30;
+// }
/************************************************************************/
/********************************BTS Account*****************************/
@@ -152,7 +154,7 @@ message BTSAccount{
AccountLossLimit account_loss_limit = 130;
}
-message RiskLimitEnforcement{
+message RiskLimitEnforcement{
bool product_limit_in_net_terms = 10;
bool ignore_spread_position_limits = 20;
}
@@ -204,23 +206,22 @@ message AccountLossLimit{
message CMEMicData{
api.CMEMics mic=10;
bool enabled=20;
- // there are other things here
+ // there are other things here
}
message ICEMicData{
- api.CMEMics mic=10;
+ api.ICEMics mic=10;
bool enabled=20;
}
-message ExchangeUserMarketDataEntitlementData{
- CMEUserMarketDataEntitlementData cme_data = 10;
- ICEUserMarketDataEntitlementData ice_data = 20;
-}
message ExchangeUserData{
CMEUserData cme_data = 10;
ICEUserData ice_data = 20;
SIMUserData sim_data = 30;
+
+ enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
+ AdminDisplay admin_display_flag = 120;
}
message ExchangeAccountData{
@@ -229,9 +230,6 @@ message ExchangeAccountData{
SIMAccountData sim_account_data = 30;
}
-message MarketDataEntitlement{
- bool can_view = 10;
-}
message ExchangeConnection{
uint32 id = 10;
@@ -274,19 +272,19 @@ message CMEMSGWConnection{
uint32 market_segment_id = 60;
}
-message CMEAccountData{
- // should perhaps be an enum
+message CMEAccountData {
+ reserved 30; reserved "takeup_member_code"; //string takeup_member_code = 30;
+ reserved 50; reserved "direct_electronic_access"; //string direct_electronic_access = 50;
+ reserved 60; reserved "trading_capacity"; //string trading_capacity = 60;
+ reserved 70; reserved "liquidity_provision"; //string liquidity_provision = 70;
+ reserved 80; reserved "commodity_derivative_indicator"; //string commodity_derivative_indicator = 80;
+ reserved 90; reserved "investment_decision_id"; //string investment_decision_id = 90;
+ reserved 100; reserved "execution_decision_id"; //string execution_decision_id = 100;
+ reserved 110; reserved "client_id"; //string client_id = 110;
+
api.orderman.CTICode cti = 10;
api.orderman.CustomerOrFirm origin = 20;
- string takeup_member_code = 30;
string clearing_account = 40;
- string direct_electronic_access = 50;
- string trading_capacity = 60;
- string liquidity_provision = 70;
- string commodity_derivative_indicator = 80;
- string investment_decision_id = 90;
- string execution_decision_id = 100;
- string client_id = 110;
map misc_tags = 120;
}
@@ -309,21 +307,22 @@ enum DisplayDesignation
}
message CMEUserData{
+ reserved 20; reserved "ats_operator_id"; //string ats_operator_id = 20;
+ reserved 40; reserved "text_a"; //string text_a = 40;
+ reserved 50; reserved "text_b"; //string text_b = 50;
+ reserved 80; reserved "max_order_rate_per_connection"; //string max_order_rate_per_connection = 80;
+ //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
+ reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120;
+ repeated CMEMicData md_permissions = 1000;
+
string operator_id = 10;
- string ats_operator_id = 20;
string smp_id = 30;
- string text_a = 40;
- string text_b = 50;
map misc_tags = 60;
string smp_instruction = 70;
- string max_order_rate_per_connection = 80;
+
string location = 90;
ProfessionalDesignation pro_nonpro = 100;
DisplayDesignation display_nondisplay = 110;
-
- enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
- AdminDisplay admin_display_flag = 120;
- repeated CMEMicData md_permissions = 1000;
}
message SIMUserData {
@@ -331,58 +330,67 @@ message SIMUserData {
string location = 90;
}
-message CMEUserMarketDataEntitlementData{
- MarketDataEntitlement cbot_entitlement = 10;
- MarketDataEntitlement cme_entitlement = 20;
- MarketDataEntitlement nymex_entitlement = 30;
- MarketDataEntitlement bmandf_entitlement = 40;
- MarketDataEntitlement comex_entitlement = 50;
- MarketDataEntitlement cme_europe_entitlement = 60;
-}
-
/********************************ICE Data*********************************/
-message ICEConnection{
- string authorized_member_id = 10;
- string sender_company_id = 20;
- string sender_sub_id = 30;
- string session_id = 40;
- string session_password = 50;
- string host_ip = 60;
- string port = 70;
- string default_routing_trader = 80;
- string routing_trader_password = 90;
- int32 max_order_rate = 100;
+message ICEConnection {
+ string sender_compid = 10;
}
-message ICEAccountData{
- string nybit_house = 10;
- int32 wce_house = 20;
- string clearing_account_override = 30;
- bool direct_electronic_access = 40;
- string trading_capacity = 50;
- bool liquidity_provision = 60;
- bool commodity_derivative_indicator = 70;
- string investment_decision_id = 80;
- string execution_decision_id = 90;
- string client_id = 100;
- string mfid_id = 110;
+message ICEAccountData {
+ reserved 10; reserved "nybit_house"; //string nybit_house = 10;
+ reserved 20; reserved "wce_house"; //int32 wce_house = 20;
+ reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30;
+ reserved 40; reserved "direct_electronic_access"; //bool direct_electronic_access = 40;
+ reserved 50; reserved "trading_capacity"; //string trading_capacity = 50;
+ reserved 60; reserved "liquidity_provision"; //bool liquidity_provision = 60;
+ reserved 70; reserved "commodity_derivative_indicator"; //bool commodity_derivative_indicator = 70;
+ reserved 80; reserved "investment_decision_id"; //string investment_decision_id = 80;
+ reserved 90; reserved "execution_decision_id"; //string execution_decision_id = 90;
+ reserved 100; reserved "client_id"; //string client_id = 100;
+ reserved 110; reserved "mfid_id"; //string mfid_id = 110;
+
+ api.orderman.CTICode cti = 3;
+ api.orderman.CustomerOrFirm origin = 5;
+ string clearing_firm = 200;
+ string clearing_account = 210;
+ string customer_account_ref_id = 220;
+ string account_code = 230;
+ map misc_tags = 500;
}
-message ICEUserData{
- string authorized_trader = 10;
- string memo_field = 20;
- string text_b = 30;
- uint32 max_order_rate = 40;
-}
+message ICEUserData {
+ reserved 20; reserved "memo_field"; //string memo_field = 20;
+ reserved 30; reserved "text_b"; //string text_b = 30;
+ reserved 40; reserved "max_order_rate"; //uint32 max_order_rate = 40;
-message ICEUserMarketDataEntitlementData{
+ int32 company_id = 3; //tag 109 clientid
+ string operator_id = 5; //tag 50
+ string authorized_trader = 10; //tag 553 user_name
+ string authorized_group = 15; //tag 553 user_name
+ string password = 21; //tag 96 raw data
+ string cust_order_handing_inst = 25;
+
+ //mifid
+ int32 mifid_direct_electronic_access = 500;
+ int32 mifid_trading_capacity = 510;
+ int32 mifid_liquidity_provision = 520;
+ int32 mifid_commodity_deriv_indicator = 530;
+ int64 mifid_investment_decision = 540;
+ int64 mifid_execution_decision = 550;
+ int64 mifid_client_id_code = 560;
+ int64 mifid_id = 570;
+
+ map misc_tags = 60;
+ ProfessionalDesignation pro_nonpro = 100;
+ DisplayDesignation display_nondisplay = 110;
+
+ repeated ICEMicData md_permissions = 1000;
}
///////////////////////////////////////////////////////////
// Order Auxiliary Service ////////////////////////////////
-message OrdersSummaryUnit{
+message OrdersSummaryUnit{
string account = 10;
string user = 20;
uint32 total_orders = 30;
@@ -393,11 +401,11 @@ message OrdersSummary{
}
message OrderSummaryRequest{
}
-// top level orders that have account
+// top level orders that have account
// and user that are present here, will
// be cancelled. wild cards are not
// supported.
-message OrderCancelRequest{
+message OrderCancelRequest{
repeated string accounts = 10;
repeated string users = 20;
}
@@ -433,7 +441,7 @@ message AccountCreateAPIArgument{
string creator_user = 40;
}
message AccountUpdateAPIArgument{
- BTSAccount complete_data=10;
+ BTSAccount complete_data=10;
}
message UserCreateAPIArgument{
uint32 parent_group_id = 20;
@@ -477,7 +485,7 @@ service AdminService {
// users
rpc create_user(UserCreateAPIArgument) returns (AdminServiceCreateEntityResult);
rpc update_user(UserUpdateAPIArgument) returns (AdminServiceOperationResult);
- rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult);
+ rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult);
// subscription
rpc admin_data(bts.api.VoidMessage) returns (stream AdminData);
rpc get_admin_data(bts.api.VoidMessage) returns (AdminData);
diff --git a/src/lib/api/services/AuthService.proto b/src/lib/api/services/AuthService.proto
index 2dd9997d2..f7b984497 100644
--- a/src/lib/api/services/AuthService.proto
+++ b/src/lib/api/services/AuthService.proto
@@ -57,4 +57,7 @@ service AuthService {
rpc get_users(GetUsersRequest) returns (GetUsersResponse)
{option (bts.api.method_description)="Returns list of valid users";}
+
+ rpc clear_all_sessions(bts.api.VoidMessage) returns (bts.api.ResultMessage)
+ {option (bts.api.method_description)="Clears all reserved auth sessions";}
}
diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto
index f2b48d8fb..3448f79ea 100644
--- a/src/lib/api/services/OrderService.proto
+++ b/src/lib/api/services/OrderService.proto
@@ -310,6 +310,13 @@ message Fill {
FILL_KIND_SOD = 2;
}
FillKind fill_kind = 10;
+
+ enum FillStatus {
+ FILL_STATUS_ACTIVE = 0;
+ FILL_STATUS_CORRECTED = 1;
+ FILL_STATUS_BUSTED = 2;
+ }
+ FillStatus fill_status = 20;
}
enum OrderSubType {
@@ -328,6 +335,16 @@ message RoutingRecord {
SelfMatchPreventionInstruction smp_instruction = 7;
string location = 8;
string cust_order_handling_inst = 9;
+
+ string sender_compid = 15;
+ string clearing_firm = 20;
+ string customer_account_ref_id = 25;
+ string account_code = 30;
+ string company_id = 45;
+ string authorized_trader = 50;
+ string authorized_group = 60;
+ string cust_order_handing_inst = 70;
+ string order_server_id = 200;
}
message NativeOrderState {
@@ -586,6 +603,7 @@ enum DynamicOrderPrimitiveDescriptor {
DYNAMIC_ORDER_PRIMITIVE_BOOL = 4;
DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF = 5;
DYNAMIC_ORDER_PRIMITIVE_QUANTITY = 6;
+ DYNAMIC_ORDER_PRIMITIVE_SECURITY_KEY = 7;
}
message DynamicOrderTypeDescriptor {
diff --git a/src/lib/api/services/ShellLatencyService.proto b/src/lib/api/services/ShellLatencyService.proto
index 272310703..8d1a253ae 100644
--- a/src/lib/api/services/ShellLatencyService.proto
+++ b/src/lib/api/services/ShellLatencyService.proto
@@ -15,8 +15,13 @@ message Report {
string user = 3;
uint64 timestamp = 10;
}
+message BufferMessage {
+ uint64 sequence = 1;
+ string data = 10;
+}
service ShellLatencyService {
rpc clock(bts.api.VoidMessage) returns (stream Tick);
rpc report(Report) returns (bts.api.VoidMessage);
+ rpc ping(BufferMessage) returns (BufferMessage);
}
\ No newline at end of file
diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp
index b7eabbb88..0678fbd61 100755
--- a/src/lib/config/ConfigurationState.cpp
+++ b/src/lib/config/ConfigurationState.cpp
@@ -24,6 +24,7 @@
#include