Merge branch 'dotnet' of bitbucket.org:bluetradesys/spark into windows_docker

Merge branch 'master' of bitbucket.org:bluetradesys/spark into dotnet
remove externals sharing
2020-01-08 17:25:30 -05:00 · 2020-01-08 17:24:55 -05:00 · 2020-01-08 17:08:49 -05:00 · 2019-12-31 12:39:54 -05:00 · 2019-12-31 10:44:32 -05:00 · 2019-12-31 10:07:55 -05:00
4932 changed files with 138427 additions and 979510 deletions
@@ -1,11 +1 @@
 IndentWidth: 3
-BinPackArguments: true
-BinPackParameters: false 
-AlignAfterOpenBracket: AlwaysBreak
-AlwaysBreakTemplateDeclarations: true
-PenaltyReturnTypeOnItsOwnLine: 140
-ReflowComments: false
---
-Language: Proto
-IndentWidth: 2
-AllowShortFunctionsOnASingleLine: None
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-format": {
-      "version": "5.1.225507",
-      "commands": [
-        "dotnet-format"
-      ]
-    },
-    "fable": {
-      "version": "4.0.0-theta-018",
-      "commands": [
-        "fable"
-      ]
-    },
-    "fantomas": {
-      "version": "5.2.2",
-      "commands": [
-        "fantomas"
-      ]
-    },
-    "fake-cli": {
-      "version": "6.0.0",
-      "commands": [
-        "fake"
-      ]
-    }
-  }
-}
@@ -1,251 +0,0 @@
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
-root = true
-
-# C# files
-[*.cs]
-
-#### Core EditorConfig Options ####
-
-# Indentation and spacing
-indent_size = 3
-indent_style = space
-tab_width = 3
-
-# New line preferences
-end_of_line = crlf
-insert_final_newline = true
-
-#### .NET Coding Conventions ####
-
-# Organize usings
-dotnet_separate_import_directive_groups = true
-dotnet_sort_system_directives_first = false
-file_header_template = unset
-
-# this. and Me. preferences
-dotnet_style_qualification_for_event = false:silent
-dotnet_style_qualification_for_field = false:silent
-dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_property = false:silent
-
-# Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
-
-# Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-
-# Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
-
-# Expression-level preferences
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_prefer_compound_assignment = true:suggestion
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
-dotnet_style_prefer_simplified_interpolation = true:suggestion
-
-# Field preferences
-dotnet_style_readonly_field = true:suggestion
-
-# Parameter preferences
-dotnet_code_quality_unused_parameters = all:suggestion
-
-# Suppression preferences
-dotnet_remove_unnecessary_suppression_exclusions = none
-
-#### C# Coding Conventions ####
-
-# var preferences
-csharp_style_var_elsewhere = false:silent
-csharp_style_var_for_built_in_types = false:silent
-csharp_style_var_when_type_is_apparent = false:silent
-
-# Expression-bodied members
-csharp_style_expression_bodied_accessors = true:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_lambdas = true:silent
-csharp_style_expression_bodied_local_functions = false:silent
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-
-# Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_prefer_not_pattern = true:suggestion
-csharp_style_prefer_pattern_matching = true:silent
-csharp_style_prefer_switch_expression = true:suggestion
-
-# Null-checking preferences
-csharp_style_conditional_delegate_call = true:suggestion
-
-# Modifier preferences
-csharp_prefer_static_local_function = true:suggestion
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
-
-# Code-block preferences
-csharp_prefer_braces = true:silent
-csharp_prefer_simple_using_statement = true:suggestion
-
-# Expression-level preferences
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_style_inlined_variable_declaration = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_style_prefer_index_operator = true:suggestion
-csharp_style_prefer_range_operator = true:suggestion
-csharp_style_throw_expression = true:suggestion
-csharp_style_unused_value_assignment_preference = discard_variable:suggestion
-csharp_style_unused_value_expression_statement_preference = discard_variable:silent
-
-# 'using' directive preferences
-csharp_using_directive_placement = inside_namespace:silent
-
-#### C# Formatting Rules ####
-
-# New line preferences
-csharp_new_line_before_catch = false
-csharp_new_line_before_else = false
-csharp_new_line_before_finally = false
-csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = none
-csharp_new_line_between_query_expression_clauses = true
-
-# Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
-csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = one_less_than_current
-csharp_indent_switch_labels = true
-
-# Space preferences
-csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
-csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
-# Wrapping preferences
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true
-
-#### Naming styles ####
-
-# Naming rules
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-# Symbol specifications
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers =
-
-# user types
-dotnet_naming_symbols.user_types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.user_types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.user_types.required_modifiers =
-
-# non_field_members
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers =
-
-# public symbols
-dotnet_naming_symbols.public_symbols.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_symbols.public_symbols.applicable_accessibilities = public,internal
-
-# parameters
-dotnet_naming_symbols.parameters.applicable_kinds = parameter
-dotnet_naming_symbols.parameters.applicable_accessibilities = public,internal,protected,private,protected_internal,private_internal
-
-# private symbols
-dotnet_naming_symbols.private_symbols.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_symbols.private_symbols.applicable_accessibilities = protected,private
-
-# Naming styles
-
-dotnet_naming_style.snake_case.required_prefix =
-dotnet_naming_style.snake_case.required_suffix =
-dotnet_naming_style.snake_case.word_separator = _
-dotnet_naming_style.snake_case.capitalization = all_lower
-
-dotnet_naming_style.private_snake_case.required_prefix = _
-dotnet_naming_style.private_snake_case.required_suffix =
-dotnet_naming_style.private_snake_case.word_separator = _
-dotnet_naming_style.private_snake_case.capitalization = all_lower
-
-dotnet_naming_style.user_types.required_prefix =
-dotnet_naming_style.user_types.required_suffix =
-dotnet_naming_style.user_types.word_separator =
-dotnet_naming_style.user_types.capitalization = pascal_case
-
-dotnet_naming_style.interface.required_prefix = I
-dotnet_naming_style.interface.required_suffix =
-dotnet_naming_style.interface.word_separator =
-dotnet_naming_style.interface.capitalization = pascal_case
-
-# rules
-dotnet_naming_rule.user_types.symbols = user_types
-dotnet_naming_rule.user_types.style = user_types
-dotnet_naming_rule.user_types.severity = suggestion
-
-dotnet_naming_rule.interfaces.symbols = interface
-dotnet_naming_rule.interfaces.style = interface_style
-dotnet_naming_rule.interfaces.severity = suggestion
-
-dotnet_naming_rule.public_members_snake_case.symbols = public_symbols
-dotnet_naming_rule.public_members_snake_case.style = snake_case
-dotnet_naming_rule.public_members_snake_case.severity = suggestion
-
-dotnet_naming_rule.private_members_snake_case.symbols = private_symbols
-dotnet_naming_rule.private_members_snake_case.style = private_snake_case
-dotnet_naming_rule.private_members_snake_case.severity = suggestion
-
-dotnet_naming_rule.parameters.symbols = parameters
-dotnet_naming_rule.parameters.style = snake_case
-dotnet_naming_rule.parameters.severity = suggestion
@@ -1,14 +1,11 @@
 nohup.out
-build/**
-install/**
-.build_proxy/
+build/
 cmake-build-debug/
-.cache/
-.ipynb_checkpoints/
 .idea/
 .dir-locals.el
 *.pyc
-**.vscode
+.vscode/*
+!.vscode/*.json
 .vs
 obj/
 *.csproj.user
@@ -20,13 +17,10 @@ vcxproj.user
 src/client/spark/Properties/launchSettings.json
 compile_commands.json
 .cquery_cached_index/
-.cache/*
-.clangd/*
 src/client/sparkcmd/Properties/launchSettings.json
 node_modules
 paket-files
 project.lock.json
-src/.clang-format
 src/server/sparkd/orderman/perf_analysis/data
 src/server/sparkd/orderman/perf_analysis/logs/
 src/server/sparkd/orderman/perf_analysis/trace_data/
@@ -40,18 +34,4 @@ trace_data/
 /doc/user/public/*
 .ionide/*
 /.ignore
-*.rej
-.clangd/
-*CMakeDeps.cmake
-/sniper.ipynb
-/src/.clang-format
-/src/server/sparkd/cmds/spartan/analysis/.ipynb_checkpoints
-/src/server/sparkd/cmds/spartan/analysis/data
-*.tmp/*
-/.venv*/*
-.cache/
-/src/Spark.Admin.WebApp/tsconfig.*.g.json
-/src/Spark.Admin.WebApp/src/bin/
-**/CMakeDeps.cmake
-**/CMakeDeps_win.cmake
-**/devcontainer.json
+CMakeDeps.cmake
@@ -1,3 +1,9 @@
 [submodule "externals"]
 	path = externals
 	url = git@bitbucket.org:bluetradesys/externals.git
+[submodule "docker/linux"]
+	path = docker/linux
+	url = git@bitbucket.org:bluetradesys/linux_docker.git
+[submodule "docker/windows"]
+	path = docker/windows
+	url = git@bitbucket.org:bluetradesys/windows_docker.git
@@ -0,0 +1,102 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "Windows",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [
+                "${workspaceRoot}/src",
+                "${workspaceRoot}/build/src",
+                "${workspaceRoot}/build/ninja_debug/src",
+                "${workspaceRoot}/externals/windows/include",
+                "${workspaceRoot}/externals/linux/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
+                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
+                "${workspaceRoot}/externals/windows/vscode/usr/include"
+            ],
+            "defines": [
+                "__linux__",
+                "__x86_64__"
+            ],
+            "browse": {
+                "path": [
+                    "${workspaceRoot}/src",
+                    "${workspaceRoot}/build/src",
+                    "${workspaceRoot}/build/ninja_debug/src",
+                    "${workspaceRoot}/externals/windows/include",
+                    "${workspaceRoot}/externals/linux/include",
+                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
+                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
+                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
+                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
+                    "${workspaceRoot}/externals/windows/vscode/usr/local/include",
+                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
+                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
+                    "${workspaceRoot}/externals/windows/vscode/usr/include/*"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "WindowsQuick",
+            "intelliSenseMode": "clang-x64",
+            "includePath": [
+                "${workspaceRoot}/src",
+                "${workspaceRoot}/build/src",
+                "${workspaceRoot}/build/ninja_debug/src",
+                "${workspaceRoot}/externals/windows/include",
+                "${workspaceRoot}/externals/linux/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
+                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
+                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
+                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
+                "${workspaceRoot}/externals/windows/vscode/usr/include"
+            ],
+            "defines": [
+                "__linux__",
+                "__x86_64__"
+            ],
+            "browse": {
+                "path": [
+                    "${workspaceRoot}/src"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 4
+}
@@ -0,0 +1,370 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "SparkVM Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
+            "args": [
+                "run"
+            ],
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/server/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+                "engineLogging": false
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "enable pretty-printer",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Skip STL",
+                    "text": "skip -gfi /usr/include/c++/7/bits/*.h",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "LD LIBRARY",
+                    "text": "set env LD_LIBRARY_PATH=.",
+                    "ignoreFailures": false
+                }
+            ],
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },     
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceRoot}/build/ninja_debug/server/sparkd/sparkd",
+            "args": [
+                "run"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${workspaceRoot}/build/ninja_debug/src/server/sparkd",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "Client Launch",
+            "type": "clr",
+            "request": "launch",
+            "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "externalConsole": true,
+            "requireExactSource": false
+        },
+        {
+            "name": "SDK Launch",
+            "type": "clr",
+            "request": "launch",
+            "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe",
+            "args": [
+                "md",
+                "GLBX",
+                "Future",
+                "CL",
+                "CLZ9",
+                "--user=bts",
+                "--pass="
+            ],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "externalConsole": true,
+            "requireExactSource": false
+        },
+        {
+            "name": "Excel Launch",
+            "type": "clr",
+            "request": "launch",
+            "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE",
+            "args": [
+                "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "externalConsole": true,
+            "requireExactSource": false
+        },
+        {
+            "name": "Client Tests",
+            "type": "clr",
+            "request": "launch",
+            "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
+            "args": [
+                "test",
+                "ApiUpdateTests"
+            ],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "externalConsole": true,
+            "requireExactSource": false
+        },
+        {
+            "name": "Client Attach",
+            "type": "clr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        },
+        {
+            "name": "Spreader Tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
+            "args": [
+                "test",
+                "[spreader]"
+            ],
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/server/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+                "engineLogging": false
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "enable pretty-printer",
+                    "ignoreFailures": true
+                }
+            ],
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "Admin Service Tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
+            "args": [
+                "test",
+                "[admin_service]"
+            ],
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+                "engineLogging": false
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "enable pretty-printer",
+                    "ignoreFailures": true
+                }
+            ],
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "Limiter Tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
+            "args": [
+                "test",
+                "[limiter]"
+            ],
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+                "engineLogging": false
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "enable pretty-printer",
+                    "ignoreFailures": true
+                }
+            ],
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "MD Tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/home/bts/spark/build/ninja_debug/server/sparkd",
+            "args": [
+                "test",
+                "[algo]"
+            ],
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/server/",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "preLaunchTask": "",
+            "logging": {
+                "engineLogging": false
+            },
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Skip STL",
+                    "text": "skip -gfi /usr/include/c++/7/bits/*.h",
+                    "ignoreFailures": true
+                }
+            ],
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "SparkVM attach",
+            "type": "cppdbg",
+            "request": "attach",
+            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
+            "processId": "${command:pickRemoteProcess}",
+            "MIMode": "gdb",
+            "pipeTransport": {
+                "pipeCwd": "${workspaceRoot}",
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/usr/bin/gdb"
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            }
+        },
+        {
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "args": [
+                "DEBUG"
+            ],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": ".NET Core Remote Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickRemoteProcess}",
+            "pipeTransport": {
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/home/bts/vsdbg/vsdbg",
+                "pipeCwd": "${workspaceRoot}",
+                "quoteArgs": true
+            },
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            },
+            "justMyCode": true
+        },
+        {
+            "name": ".NET Core Remote Launch",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "sparkcmd",
+            "args": [
+                "test",
+            ],
+            "env": {"LD_LIBRARY_PATH" : "."},
+            "stopAtEntry": false,
+            "cwd": "/home/bts/spark/build/ninja_debug/server",
+            "pipeTransport": {
+                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
+                "pipeArgs": [
+                    "bts@sparkvm"
+                ],
+                "debuggerPath": "/home/bts/vsdbg/vsdbg",
+                "pipeCwd": "${workspaceRoot}",
+                "quoteArgs": true
+            },           
+            "sourceFileMap": {
+                "/home/bts/spark/": "${workspaceRoot}"
+            },
+            "justMyCode": false
+        },               
+    ]
+}
@@ -0,0 +1,16 @@
+{
+"files.associations": {
+        "utility": "cpp",
+        "initializer_list": "cpp",
+        "list": "cpp",
+        "type_traits": "cpp",
+        "vector": "cpp",
+        "xhash": "cpp",
+        "xstring": "cpp",
+    "system_error": "cpp",
+    "array": "cpp",
+    "string_view": "cpp"
+        "xutility": "cpp",
+        "*.ipp": "cpp"
+}
+}
@@ -0,0 +1,54 @@
+{ 
+   // See https://go.microsoft.com/fwlink/?LinkId=733558
+   // for the documentation about the tasks.json format
+   "version": "2.0.0",
+   "tasks": [
+      {
+         "label": "client_build",
+         "type": "shell",
+         "command": ".\\tools\\buildspark.cmd",
+         "problemMatcher":"$msCompile",
+         "presentation": {
+            "echo": true,
+            "reveal": "always",
+            "focus": false,
+            "panel": "shared"
+         },
+         "group": {
+            "kind": "build",
+            "isDefault": true
+         }
+      },
+      {
+         "label": "server_build",         
+         "type": "shell",
+         "command": ".\\tools\\buildsparkd.cmd",
+         "problemMatcher": {                        
+            "base": "$gcc",       
+            "owner": "cpp",
+            "fileLocation": [
+               "relative",
+               "${workspaceFolder}"               
+            ],
+            "pattern": {
+               "regexp": "(.?)(home)(.?)(bts)(.?)(spark)(.?)(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)",               
+               "file": 8,
+               "line": 9,
+               "column": 10,
+               "severity": 11,
+               "message": 12
+            }
+         },
+         "presentation": {
+            "echo": true,
+            "reveal": "always",
+            "focus": false,
+            "panel": "new"
+         },
+         "group": {
+            "kind": "build",
+            "isDefault": true
+         }
+      }      
+   ]
+} 
@@ -1,194 +1,76 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.5)
 project(spark)

-if(WIN32)
-  set(platform "windows")
-else()
-  set(platform "linux")
-endif()
-
-set(
-  EXTERNALS_ROOT
-  "${CMAKE_SOURCE_DIR}/externals/${platform}"
-  CACHE
-  STRING
-  "External dependencies root folder (should contain folders: lib, bin, include")
-set(SPARK_BIN "${EXTERNALS_ROOT}/bin")
-set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
-set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
-set(BUILD_SPARK_CONFIG OFF CACHE BOOL "Build lib_spark_config")
-set(BUILD_API_SERVER OFF CACHE BOOL "Build the api server")
-set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
-set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
-set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
 if (WIN32)
-  set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
-else()
-  set(BUILD_SPARKD ON CACHE BOOL "Build sparkd")
-endif()
+  set (platform "windows")
+else ()
+  set (platform "linux")
+endif ()

-include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
-link_directories(${SPARK_LIB})
+set (EXTERNALS_ROOT "${CMAKE_SOURCE_DIR}/externals/${platform}")
+set (SPARK_PYTHON "${EXTERNALS_ROOT}/python")
+set (SPARK_BIN "${EXTERNALS_ROOT}/bin")
+set (SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
+set (SPARK_LIB "${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}")
+
+include_directories (BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
+link_directories (${SPARK_LIB})
+
+if (WIN32)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+                        /MP \ 
+                        /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \
+                        /DCURL_STATICLIB \
+                        /D_WINSOCK_DEPRECATED_NO_WARNINGS \
+                        /D__TBB_NO_IMPLICIT_LINKAGE \
+                        /DBOOST_ALL_NO_LIB \
+                        /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600")
+
+  set (CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} /MTd") 
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT")
+  set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG")

-if(WIN32)
-  add_compile_definitions(SHARED_MEMORY_PREFIX="spark")
-  add_compile_definitions(APP_DATA_DIR="\$\{APPDATA\}/bts/")
-  # subdirs
-  add_subdirectory(src/lib_expression)
  add_subdirectory(src/lib)
-elseif(BUILD_SPARK_CONFIG)
-  add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
-  add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
-  add_subdirectory(src/lib_core)
-  add_subdirectory(src/lib_logging)
-  add_subdirectory(src/lib_io)
-  add_subdirectory(src/lib_domain)
-  add_subdirectory(src/lib_protobuf)
-  add_subdirectory(src/lib_threading)
-  add_subdirectory(src/lib_expression)
-  add_subdirectory(src/lib_md)
-  add_subdirectory(src/lib_spark_config)
-else()
-  # make sparkd look for libspark.so in its directory
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-  set(CMAKE_INSTALL_RPATH ".")
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
-  set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")
+else ()
+# so that sparkd looks for libspark.so in its directory
+  set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
+  set (CMAKE_INSTALL_RPATH ".")

-  if(BUILD_API_SERVER)
-    add_compile_definitions(SPARK_ENABLE_API_SERVER)
-    add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/spark_api/")
-    add_compile_definitions(SHARED_MEMORY_PREFIX="spark_api")
-  elseif(BUILD_SPARKD)
-    add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
-    add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
-
-    # Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
-    # read by their code). We override some below.
-    add_compile_definitions(SPARK_ENABLE_CCAPI)
-
-    # This allows us to override hardcoded exchange-urls with ones read from
-    # config (i.e., resolved at runtime rather than compile-time)
-    add_compile_definitions(CCAPI_EXPOSE_INTERNAL)
-
-    # Enable ccapi exchanges/services
-    add_compile_definitions(CCAPI_ENABLE_SERVICE_MARKET_DATA)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_DERIBIT)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_FTX)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_US)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_USDS_FUTURES)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_BINANCE_COIN_FUTURES)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI_USDT_SWAP)
-    add_compile_definitions(CCAPI_ENABLE_EXCHANGE_HUOBI_COIN_SWAP)
-
-    set(CCAPI_LOG_LEVEL
-      "Warn"
-      CACHE STRING "<Fatal|Error|Warn|Info|Debug|Trace> Log level for ccapi")
-    string(TOUPPER "${CCAPI_LOG_LEVEL}" _ccapi_log_level_upper)
-    add_compile_definitions("CCAPI_ENABLE_LOG_${_ccapi_log_level_upper}")
-
-    # ** Binance **
-    add_compile_definitions(CCAPI_BINANCE_URL_REST_BASE="https://api.binance.com")
-    add_compile_definitions(BINANCE_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
-    add_compile_definitions(BINANCE_PRICE_STATS_PATH="/api/v3/ticker/24hr")
-
-    # ** Binance US **
-    add_compile_definitions(BINANCE_US_INSTRUMENTS_PATH="/api/v3/exchangeInfo")
-    add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
-
-    # ** Binance USDS Futures **
-    add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://dapi.binance.com")
-    add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
-    add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
-
-  endif()
-
-  # subdirs
-  if (BUILD_SPARKD)
-    add_subdirectory(src/server/sparkd)
-    add_subdirectory(src/data_files)
-    # add_subdirectory(src/lib_md)
-    add_subdirectory(src/lib_core)
-    add_subdirectory(src/lib_logging)
-    add_subdirectory(src/lib_threading)
-    add_subdirectory(src/lib_expression)
-    add_subdirectory(src/lib_spark_config)
-  endif()
+  set (CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} \
+                               -fPIC -Wall -pedantic -Wextra -Werror \
+                               -Wno-missing-braces -Wno-ignored-qualifiers \
+                               --std=c++17 -fdiagnostics-color")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3")
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef")
+  add_subdirectory(src/server/sparkd)
  add_subdirectory(src/lib)
-  if (BUILD_ADMIN_WEB_APP)
-    add_subdirectory(src/Spark.Admin.WebApp)
-  endif()
-  if (BUILD_API_SERVER)
-    set(_cs_source_dirs
-      spark_api
-      spark_api_server
-      spark_core
-      spark_websocket)
-    foreach(cs_source_dir IN LISTS _cs_source_dirs)
-      file(GLOB cs_source_dir "${CMAKE_SOURCE_DIR}/src/client/${cs_source_dir}/*.cs")
-      list(APPEND _api_server_sources ${cs_source_dir})
-    endforeach()
+  add_subdirectory(src/web)
+  add_subdirectory(doc/user)
+  add_subdirectory(src/sdk)
+  add_subdirectory(src/data_files)
+  add_subdirectory(src/client)

-    list(APPEND _api_server_sources
-      ${CMAKE_SOURCE_DIR}/src/client/spark_api/spark_api.csproj
-      ${CMAKE_SOURCE_DIR}/src/client/spark_api_server/spark_api_server.csproj
-      ${CMAKE_SOURCE_DIR}/src/client/spark_core/spark_core.csproj
-      ${CMAKE_SOURCE_DIR}/src/client/spark_websocket/spark_websocket.csproj)
+  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server
+    COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
+    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
+    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server
+    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
+    COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
+    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
+    COMMENT "Creating server runtime layout"
+    DEPENDS sparkd data_files_dir spark_client_dir
+    DEPENDS sparkd data_files_dir)  

-    set(_out_dir ${CMAKE_BINARY_DIR}/$<CONFIG>)
-    set(_api_server_dlls
-      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_api.dll
-      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_core.dll
-      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_websocket.dll
-      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/spark_api_server)
-    add_custom_command(
-      OUTPUT ${_api_server_dlls}
-      COMMAND dotnet build ${CMAKE_SOURCE_DIR}/Spark.Api.Server.sln --verbosity minimal --configuration $<CONFIG>
-      COMMENT "Building Spark.Api.Server.sln"
-      DEPENDS ${_api_server_sources})
-    add_custom_command(
-      OUTPUT
-      ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/libspark.so
-      COMMAND ln -sf ARGS ${CMAKE_BINARY_DIR}/src/lib/$<CONFIG>/libspark.so ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0
-      COMMENT "Symlink libspark to api server bins"
-      DEPENDS ${_api_server_dlls})
-    add_custom_target(websocket_api_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/$<CONFIG>/bin/net7.0/libspark.so)
-  endif()
-  if(BUILD_DOCS)
-    add_subdirectory(doc/user)
-  endif()
-  if(BUILD_SDK)
-    add_subdirectory(src/sdk)
-  endif()
-
-  if(BUILD_SPARKD)
-    add_custom_command(
-      OUTPUT ${CMAKE_BINARY_DIR}/server
-      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
-      COMMAND
-        ln ARGS -sf
-        ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.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
-      COMMENT "Creating server runtime layout"
-      DEPENDS sparkd data_files_dir)
-
-    add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
-
-    install(
-      DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
-      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
-    install(
-      FILES
-      "${SPARK_LIB}/libACE-5.7.5.so"
-      "${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
-      "${CMAKE_SOURCE_DIR}/externals/src/emumba/sparkd.lic"
-      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
-  endif()
+  add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
+  
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+   add_custom_command(TARGET server_layout POST_BUILD
+      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
+else()
+   add_custom_command(TARGET server_layout POST_BUILD
+      COMMAND ln -fs ${CMAKE_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/bin/netcoreapp3.0/linux-x64/publish/sparkcmd ${CMAKE_BINARY_DIR}/server/ ) 
+endif()
+      
 endif()
@@ -1,283 +0,0 @@
-{
-  "version": 4,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 23,
-    "patch": 0
-  },
-
-  "configurePresets": [
-    {
-      "name": "spark",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build",
-      "environment": {
-        "SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++17 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
-      },
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
-        "CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
-        "CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
-        "CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/DEBUG /OPT:REF /OPT:ICF /LTCG",
-        "EXTERNALS_ROOT": "${sourceDir}/externals/windows"
-      }
-    },
-
-    {
-      "name": "sparkd",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      },
-      "hidden": true,
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "cacheVariables": {
-        "platform": "",
-        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "CMAKE_INSTALL_RPATH": ".",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
-        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
-        "EXTERNALS_ROOT": "${sourceDir}/externals/linux",
-        "CMAKE_CXX_STANDARD": "17",
-        "BUILD_SDK": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_ADMIN_WEB_APP": {
-          "type": "BOOL",
-          "value": "ON"
-        }
-      }
-    },
-
-    {
-      "name": "sparkd-debug",
-      "inherits": "sparkd",
-      "hidden": true,
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "CCAPI_LOG_LEVEL": "Debug"
-      }
-    },
-
-    {
-      "name": "sparkd-release",
-      "inherits": "sparkd",
-      "hidden": true,
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "CCAPI_LOG_LEVEL": "Warn"
-      }
-    },
-
-    {
-      "name": "sparkd-debug-clang",
-      "inherits": "sparkd-debug",
-      "displayName": "Debug (clang)",
-      "description": "Debug build compiled w/ clang",
-      "binaryDir": "${sourceDir}/build/clang/debug",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -DDEBUG",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/debug/sparkd"
-      }
-    },
-
-    {
-      "name": "sparkd-debug-gcc",
-      "inherits": "sparkd-debug",
-      "displayName": "Debug (gcc)",
-      "description": "Debug build compiled w/ gcc",
-      "binaryDir": "${sourceDir}/build/gcc/debug",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "gcc",
-        "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -Wno-stringop-overread -DDEBUG",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/debug/sparkd"
-      }
-    },
-
-    {
-      "name": "sparkd-release-clang",
-      "inherits": "sparkd-release",
-      "displayName": "Release (clang)",
-      "description": "Release build compiled w/ clang",
-      "binaryDir": "${sourceDir}/build/clang/release",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/release/sparkd"
-      }
-    },
-
-    {
-      "name": "sparkd-release-gcc",
-      "inherits": "sparkd-release",
-      "displayName": "Release (gcc)",
-      "description": "Release build compiled w/ gcc",
-      "binaryDir": "${sourceDir}/build/gcc/release",
-      "cacheVariables": {
-        "CMAKE_C_COMPILER": "gcc",
-        "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++17 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/release/sparkd"
-      }
-    },
-
-    {
-      "name": "sparkd-publish",
-      "inherits": "sparkd-release-gcc",
-      "displayName": "Publish",
-      "description": "Production build compiled w/ gcc and ready to ship"
-    },
-
-    {
-      "name": "spark-config",
-      "displayName": "Spark Config",
-      "description": "Test build for lib_spark_config",
-      "binaryDir": "${sourceDir}/build/${presetName}",
-      "generator": "Unix Makefiles",
-      "cacheVariables": {
-        "platform": "linux",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "CMAKE_INSTALL_RPATH": ".",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
-        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
-        "EXTERNALS_ROOT": "${sourceDir}/externals/linux",
-        "CMAKE_CXX_STANDARD": "17",
-        "BUILD_SPARKD": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_DOCS": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_SDK": {
-          "type": "BOOL",
-          "value": "OFF"
-        },
-        "BUILD_SPARK_CONFIG": {
-          "type": "BOOL",
-          "value": "ON"
-        },
-        "BUILD_ADMIN_WEB_APP": {
-          "type": "BOOL",
-          "value": "OFF"
-        }
-      }
-    }
-  ],
-
-  "buildPresets": [
-    {
-      "name": "spark",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "hidden": true,
-      "jobs": 4
-    },
-
-    {
-      "name": "spark-dev",
-      "displayName": "Development",
-      "inherits": "spark",
-      "configurePreset": "spark",
-      "configuration": "Debug"
-    },
-
-    {
-      "name": "spark-prod",
-      "displayName": "Production",
-      "inherits": "spark",
-      "configurePreset": "spark",
-      "configuration": "Release"
-    },
-
-    {
-      "name": "sparkd",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      },
-      "hidden": true,
-      "jobs": 4,
-      "targets": [
-        "data_files_dir",
-        "admin_web_app_bundle",
-        "install",
-        "libspark",
-        "rapidjson_project",
-        "server_layout",
-        "sparkd"
-      ]
-    },
-
-    {
-      "name": "sparkd-debug-clang",
-      "configurePreset": "sparkd-debug-clang",
-      "displayName": "Debug (clang)",
-      "inherits": "sparkd"
-    },
-
-    {
-      "name": "sparkd-debug-gcc",
-      "configurePreset": "sparkd-debug-gcc",
-      "displayName": "Debug (gcc)",
-      "inherits": "sparkd"
-    },
-
-    {
-      "name": "sparkd-release-clang",
-      "configurePreset": "sparkd-release-clang",
-      "displayName": "Release (clang)",
-      "inherits": "sparkd"
-    },
-
-    {
-      "name": "sparkd-release-gcc",
-      "configurePreset": "sparkd-release-gcc",
-      "displayName": "Release (gcc)",
-      "inherits": "sparkd"
-    },
-
-    {
-      "name": "spark-config",
-      "configurePreset": "spark-config",
-      "displayName": "Spark Config",
-      "inherits": "sparkd"
-    },
-
-    {
-      "name": "sparkd-publish",
-      "configurePreset": "sparkd-publish",
-      "displayName": "Publish",
-      "inherits": "sparkd",
-      "targets": "install"
-    }
-  ]
-}
@@ -1,83 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32922.545
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		MinSizeRel|x64 = MinSizeRel|x64
-		Release|x64 = Release|x64
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.ActiveCfg = Debug|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Debug|x64.Build.0 = Debug|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.MinSizeRel|x64.Build.0 = Debug|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.ActiveCfg = Release|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.Release|x64.Build.0 = Release|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
-		{EFC9FC4D-E92B-4C6D-9B97-26D38EAA118D}.RelWithDebInfo|x64.Build.0 = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.ActiveCfg = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.Debug|x64.Build.0 = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.MinSizeRel|x64.Build.0 = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.ActiveCfg = Release|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
-		{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-EndGlobal
@@ -1,158 +0,0 @@
-set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
-set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
-set(PROTOBUF_STATIC_LIB "libprotobuf")
-
-function(Protobuf_Generate_Cpp SRCS HDRS)
-  set(${SRCS})
-  set(${HDRS})
-
-  foreach(FIL ${ARGN})
-    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
-    get_filename_component(FIL_WE ${FIL} NAME_WE)
-    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
-    if(FIL_DIR)
-      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
-    endif()
-
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
-    set(PROTOBUF_INCLUDE_DIR_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
-    # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS " -I ")
-    # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
-    foreach(INC ${PROTOBUF_INCLUDE_DIRS})
-      set(PROTOBUF_INCLUDE_DIR_ARGS ${PROTOBUF_INCLUDE_DIR_ARGS} -I ${INC})
-      # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS " -I ")
-      # list(APPEND PROTOBUF_INCLUDE_DIR_ARGS ${INC})
-    endforeach()
-    set(PROTOBUF_INCLUDE_DIR_ARGS ${PROTOBUF_INCLUDE_DIR_ARGS} -I ${CMAKE_CURRENT_BINARY_DIR})
-    # string(JOIN " -I " PROTOBUF_INCLUDE_DIR_ARGS_ ${PROTOBUF_INCLUDE_DIR_ARGS})
-    message("pb inc: ${PROTOBUF_INCLUDE_DIR_ARGS}")
-    # set(cmd_text "${Protobuf_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS_} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}")
-    message("CMD: ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}")
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
-      COMMAND ${Protobuf_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}
-      # COMMAND
-      #   ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR} -I
-      #   ${PROTOBUF_INCLUDE_DIR_ARGS} ${ABS_FIL}
-      DEPENDS ${ABS_FIL}
-      COMMENT "Running C++ protocol buffer compiler on ${FIL}"
-      VERBATIM)
-  endforeach()
-
-  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
-
-  # remove some warnings from protobuf generated files
-  if(WIN32)
-    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
-                                                      "/wd4309 /wd4838")
-  else()
-    set_source_files_properties(
-      ${${SRCS}}
-      PROPERTIES
-        COMPILE_FLAGS
-        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
-    )
-  endif()
-
-  set(${SRCS}
-      ${${SRCS}}
-      PARENT_SCOPE)
-  set(${HDRS}
-      ${${HDRS}}
-      PARENT_SCOPE)
-endfunction()
-
-function(Service_Compiler_Generate_Cpp SRCS HDRS)
-  set(${SRCS})
-  set(${HDRS})
-
-  foreach(FIL ${ARGN})
-    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
-    get_filename_component(FIL_WE ${FIL} NAME_WE)
-    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
-    if(FIL_DIR)
-      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
-    endif()
-
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
-
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
-
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
-
-    set(TEMPLATES
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
-    )
-
-    if(WIN32)
-      add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
-        COMMAND SET PYTHONPATH=${SPARK_PYTHON}
-        COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
-        COMMAND
-          ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
-          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
-          --service_out=lang=cpp:${CMAKE_CURRENT_BINARY_DIR} -I
-          ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES}
-                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
-        COMMENT "Running C++ service compiler on ${FIL}"
-        VERBATIM)
-    else()
-      add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
-        COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
-        ARGS
-          ${Protobuf_PROTOC_EXECUTABLE}
-          --cpp_out=${CMAKE_CURRENT_BINARY_DIR}
-          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
-          --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_CURRENT_BINARY_DIR}
-          -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES}
-                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
-        COMMENT "Running C++ service compiler on ${FIL}"
-        VERBATIM)
-    endif()
-
-  endforeach()
-
-  # remove some warnings from protobuf generated files
-  if(WIN32)
-    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
-                                                      "/wd4309 /wd4838")
-  else()
-    set_source_files_properties(
-      ${${SRCS}}
-      PROPERTIES
-        COMPILE_FLAGS
-        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
-    )
-  endif()
-
-  set(${SRCS}
-      ${${SRCS}}
-      PARENT_SCOPE)
-  set(${HDRS}
-      ${${HDRS}}
-      PARENT_SCOPE)
-
-endfunction()
-
@@ -1,32 +0,0 @@
-# inspired by https://stackoverflow.com/questions/1027247/specify-source-files-globally-with-glob
-
-# Compare the new contents with the existing file, if it exists and is the same we don't want to
-# trigger a make by changing its timestamp.
-function(update_file path content)
-  set(old_content "")
-  if(EXISTS "${path}")
-    file(READ "${path}" old_content)
-  endif()
-  if(NOT old_content STREQUAL content)
-    file(WRITE "${path}" "${content}")
-  endif()
-endfunction(update_file)
-
-# Creates a file called CMakeDeps.cmake next to your CMakeLists.txt with the list of dependencies in
-# it - this file should be treated as part of CMakeLists.txt (source controlled, etc.).
-function(update_deps_file deps)
-  if(WIN32)
-    set(deps_file "CMakeDeps_win.cmake")
-  else()
-    set(deps_file "CMakeDeps.cmake")
-  endif()
-
-  # Normalize the list so it's the same on every machine
-  list(REMOVE_DUPLICATES deps)
-  list(SORT deps)
-  # Update the deps file
-  set(content "set(sources ${deps})")
-  update_file(${deps_file} "${content}")
-  # Include the file so it's tracked as a generation dependency we don't need the content.
-  include(${deps_file})
-endfunction(update_deps_file)
@@ -1,76 +0,0 @@
-[cmake ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
-[cmake presets]: https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html
-[cpp ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools
-[clangd ext]: https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd
-[py venv]: https://docs.python.org/3/library/venv.html
-
-# C++ Intellisense for Spark on Windows (VS Code)
-**Steps**
-1. Install the **[C++ extension][cpp ext]**
-2. Install the **[CMake extension][cmake ext]**
-3. Copy `c_cpp_properties.json` from this folder to `$workspaceFolder/.vscode/`
-4. In the VS Code Command Palette, run **CMake: Select Configure Preset**, then
-   select '**spark**' from the dropdown
-
-**Notes**
-* Intellisense won't work for generated files/types until you build libspark
-
-# C++ Intellisense for Sparkd on Linux (VS Code)
-1. Install the **[CMake extension][cmake ext]**
-2. Install the **[Clangd extension][clangd ext]**
-3. (Optional) Install the **[C++ extension][cpp ext]** (*needed for debugging,
-   but intellisense should work without it*).
-4. If the **[C++ extension][cpp ext]** is installed, disable its intellisense in
-  your workspace settings (*Clangd intellisense is better*)
-   ```
-   "C_Cpp.intelliSenseEngine": "disabled"
-   ```
-5. In the VS Code Command Palette, run **CMake: Select Configure Preset**, then select the
-  **[preset][cmake presets]** you wish to build from the dropdown
-   * *The **Clang** presets may work best with the **Clangd** extension*
-   * *Intellisense won't work for generated files/types until you build libspark*
-
-# Build Sparkd on Linux
-
-**Notes**
-* Sparkd is built using **[CMakePresets][cmake presets]**
-
-**Steps**
-1. Set up the **[Python virtual environment][py venv]**<br>
-   * *Run commands from the repo root dir unless otherwise noted*
-   1. Create the virtual environment
-      ```
-      python3 -m venv .venv
-      ```
-   2. Activate the virtual environment
-      ```
-      . .venv/bin/activate
-      ```
-   3. Verify `python` in the venv is first in the path<br>
-      * ***Expected:** output shows the absolute path to `.venv/bin/python`*
-      ```
-      which python
-      ```
-   4. Update `pip`<br>
-      * *The venv module initializes virtual environments with its own version
-        of pip, rather than the system's version. Even if the latter is up-to-date, the
-        former may not be.*
-      ```
-      python -m pip install --upgrade pip
-      ```
-   5. Install the packages listed `requirements.txt`
-      ```
-      pip install -r requirements.txt
-      ```
-2. Build **Sparkd**<br>
-   * From the terminal
-      ```
-      tools/build_sparkd.sh
-      ```
-      * *Run with `--help` to see available options*
-   * From VS Code
-      1. Install the **[CMake extension][cmake ext]**
-      2. In the VS Code Command Palette, run **CMake: Select Configure
-         Preset**, then select the **[preset][cmake presets]** you wish to
-         build from the dropdown
-      3. Run **CMake: Build** in the command palette.
@@ -1,27 +0,0 @@
-{
-  "version": 4,
-  "configurations": [
-    {
-      "name": "Windows",
-      "intelliSenseMode": "windows-msvc-x64",
-      "includePath": [
-        "${workspaceFolder}/src/",
-        "${workspaceFolder}/build/src/",
-        "${workspaceFolder}/externals/windows/include/"
-      ],
-      "defines": ["_WIN32", "__x86_64__"],
-      "browse": {
-        "path": [
-          "${workspaceRoot}/src",
-          "${workspaceRoot}/build/src"
-        ],
-        "limitSymbolsToIncludedHeaders": true
-      },
-      "cStandard": "c17",
-      "cppStandard": "c++17",
-      "configurationProvider": "ms-vscode.cmake-tools",
-      "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe",
-      "mergeConfigurations": true
-    }
-  ]
-}
@@ -1,54 +0,0 @@
-{
-    "FormattingOptions": {
-            "NewLine": "\n",
-            "UseTabs": false,
-            "TabSize": 3,
-            "IndentationSize": 3,
-            "SpacingAfterMethodDeclarationName": false,
-            "SpaceWithinMethodDeclarationParenthesis": false,
-            "SpaceBetweenEmptyMethodDeclarationParentheses": false,
-            "SpaceAfterMethodCallName": false,
-            "SpaceWithinMethodCallParentheses": false,
-            "SpaceBetweenEmptyMethodCallParentheses": false,
-            "SpaceAfterControlFlowStatementKeyword": true,
-            "SpaceWithinExpressionParentheses": false,
-            "SpaceWithinCastParentheses": false,
-            "SpaceWithinOtherParentheses": false,
-            "SpaceAfterCast": false,
-            "SpacesIgnoreAroundVariableDeclaration": false,
-            "SpaceBeforeOpenSquareBracket": false,
-            "SpaceBetweenEmptySquareBrackets": false,
-            "SpaceWithinSquareBrackets": false,
-            "SpaceAfterColonInBaseTypeDeclaration": true,
-            "SpaceAfterComma": true,
-            "SpaceAfterDot": false,
-            "SpaceAfterSemicolonsInForStatement": true,
-            "SpaceBeforeColonInBaseTypeDeclaration": true,
-            "SpaceBeforeComma": false,
-            "SpaceBeforeDot": false,
-            "SpaceBeforeSemicolonsInForStatement": false,
-            "SpacingAroundBinaryOperator": "single",
-            "IndentBraces": false,
-            "IndentBlock": true,
-            "IndentSwitchSection": true,
-            "IndentSwitchCaseSection": true,
-            "LabelPositioning": "oneLess",
-            "WrappingPreserveSingleLine": true,
-            "WrappingKeepStatementsOnSingleLine": true,
-            "NewLinesForBracesInTypes": false,
-            "NewLinesForBracesInMethods": false,
-            "NewLinesForBracesInProperties": false,
-            "NewLinesForBracesInAccessors": false,
-            "NewLinesForBracesInAnonymousMethods": false,
-            "NewLinesForBracesInControlBlocks": false,
-            "NewLinesForBracesInAnonymousTypes": false,
-            "NewLinesForBracesInObjectCollectionArrayInitializers": false,
-            "NewLinesForBracesInLambdaExpressionBody": false,
-            "NewLineForElse": false,
-            "NewLineForCatch": false,
-            "NewLineForFinally": false,
-            "NewLineForMembersInObjectInit": true,
-            "NewLineForMembersInAnonymousTypes": true,
-            "NewLineForClausesInQuery": true
-    }
-}
@@ -1,120 +0,0 @@
-FROM spark-crypto_18.04
-
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get update \
-    && apt-get install -y \
-    htop \
-    locales \
-    source-highlight \
-    powerline \
-    fonts-powerline
-
-
-# Hide these in the .docker directory to avoid conflicts with existing repos on
-# this computer (in case a parent dir, such as $HOME, is mounted inside a
-# container)
-ARG repo_root="/home/john/Documents/repos/.docker"
-
-# Create dirs for public/private repos
-USER john
-RUN \
-    mkdir -p $repo_root/public \
-    && mkdir -p $repo_root/private
-
-
-## Get latest fish (build from source)
-# 1) get build deps
-USER root
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get update \
-    && apt-get install -y software-properties-common
-RUN \
-    apt-add-repository ppa:fish-shell/release-3 \
-    && sed -i "s/^# deb/deb/g" /etc/apt/sources.list
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get build-dep -y fish
-
-
-# 2) Clone repo
-USER john
-RUN \
-    cd $repo_root/public \
-    && git clone https://github.com/fish-shell/fish-shell.git
-
-RUN \
-    cd $repo_root/public/fish-shell \
-    && mkdir build \
-    && cd build \
-    && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 .. \
-    && cmake --build .
-
-# Switch to root, rather than running inline w/ sudo cmd, to avoid having to
-# enter a password
-USER root
-RUN \
-    cd $repo_root/public/fish-shell/build \
-    && make install
-USER john
-
-
-## Get oh-my-fish
-RUN \
-    cd $repo_root/public \
-    && git clone https://github.com/oh-my-fish/oh-my-fish.git
-
-RUN \
-    cd $repo_root/public/oh-my-fish \
-    && ./bin/install --noninteractive --yes
-
-
-## Get my fish config
-RUN \
-    cd $repo_root/private \
-    && git clone https://github.com/johncolvin-og/myfishconfig
-
-RUN \
-    cd $repo_root/private/myfishconfig \
-    && cp src/config.fish /home/john/.config/fish/ \
-    && cp src/aliases.fish /home/john/.config/fish/ \
-    && cp -r src/functions /home/john/.config/fish/ \
-    && cp -r src/themes/johncolvin /home/john/.local/share/omf/themes/ \
-    && fish --command "omf theme johncolvin"
-
-
-## Get my bash config (back up existing)
-RUN \
-    cd $repo_root/private \
-    && git clone https://github.com/johncolvin-og/mybashconfig \
-    && cd mybashconfig \
-    && cp src/* /home/john/
-
-
-# Get vim files/tools
-USER root
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get update \
-    && apt-get install -y curl
-USER john
-RUN curl -fLo home/john/.vim/autoload/plug.vim --create-dirs \
-    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-
-
-# Some fonts look sketchy if the language isn't set to english:
-#   * The powerline git glyphs in the fish prompt are all displayed as question
-#   marks.
-#
-#   * The shell confuses the position of the cursor, so characters are left
-#   around when they should have been cleared, and the cursor's home position
-#   is pushed one or two places to the right.
-#
-#   * Most likely, the bad cursor position is caused by some dependencies the
-#   interpretation of escape sequences have on the language setting.  At this
-#   point I don't even care anymore (literally took 8 hours to figure this
-#   out).  I just know this shit is needed to make the prompt work correctly.
-USER root
-RUN locale-gen "en_US.UTF-8"
-USER john
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-RUN fc-cache -vf
@@ -1,16 +0,0 @@
-#!/usr/bin/env fish
-
-set this_dir (realpath (dirname (status -f)))
-set image_working_dir (realpath "$this_dir/../..")
-
-set image_name $argv[1]
-if test (count $argv) -eq 0
-    set image_name_cmd "$this_dir/docker_image_name.fish"
-    set image_name (eval $image_name_cmd)
-end
-
-docker build \
-    -f "$this_dir/Dockerfile" \
-    -t "$image_name" \
-    "$image_working_dir"
-
@@ -1,11 +0,0 @@
-#!/usr/bin/env fish
-
-if test (count $argv) -gt 0
-    echo $argv
-    exit 0
-end
-
-set image_name_cmd (realpath (dirname (status -f)))"/docker_image_name.fish"
-set image_name (eval $image_name_cmd)
-echo $image_name
-
@@ -1,4 +0,0 @@
-#!/usr/bin/env fish
-
-echo "$USER""s_"(basename (git rev-parse --show-toplevel))"-dev"
-
@@ -1,12 +0,0 @@
-#!/usr/bin/env fish
-
-set inst_name $argv[1]
-if test (count $argv) -eq 0
-    set script_dir (realpath (dirname (status -f)))
-    set inst_name (eval $script_dir"/docker_container_name.fish")
-end
-
-set working_dir (realpath (pwd))
-echo $inst_name
-docker exec -w $working_dir -it "$inst_name" bash
-
@@ -1,148 +0,0 @@
-#!/usr/bin/env fish
-
-function print_help_and_exit
-    echo "\
-Usage: setup_builds.sh [OPTIONS] compiler build-type
-
-Positionals:
-  gcc                Compile with gcc
-  clang              Compile with clang
-  debug              Build debug
-  release            Build release
-
-Options:
-  --compiler         <clang|gcc> Specify the compiler
-  --type             <debug|release> Specify the type of build 
-  -f,--force         Overwrite existing build directories
-  -h,--help          Print this help message and exit
-
-"
-    exit $argv[1]
-end
-
-function assert_dir
-    if test ! -d "$argv[1]"
-        if test -n "$argv[2]"
-            echo "Invalid variable "$argv[2]": '"$argv[1]"' is not a directory"
-        else
-            echo "'"$argv[1]"' is not a directory"
-        end
-        exit 1
-    end
-end
-
-# common variables
-
-set tools_path (realpath (dirname (status -f)))
-set spartan_path_cmd $tools_path/spartan_path.fish
-set repo_root (eval $spartan_path_cmd "repo-root")
-set build_root "$repo_root"/"build"
-mkdir -p "$build_root"
-
-# Initialize the build directory.  Expected arguments: <compiler>, <build_type>
-# Note: this method assumes the variables 'repot_root' and 'build_root' have
-# already been properly initialized
-function setup_build
-    assert_dir $repo_root
-    assert_dir $build_root
-    set compiler "$argv[1]"
-    set c_compiler (which cc)
-    set build_type "$argv[2]"
-
-    if test \( -z "$build_type" \) -o \( \( "$build_type" != debug \) -a \( "$build_type" != release \) \)
-        print_help_and_exit 1
-    end
-
-    if test "$build_type" = debug
-        set build_type_arg Debug
-        if test "$compiler" = gcc
-            set compiler_arg "/usr/lib/ccache/g++"
-        else
-            # set compiler_arg "/usr/lib/ccache/clang++"
-            set compiler_arg "clang++"
-            set c_compiler (which clang)
-        end
-    else if test "$build_type" = release
-        set build_type_arg Release
-        if test "$compiler" = gcc
-            set compiler_arg "g++"
-        else
-            set compiler_arg "clang++"
-        end
-    end
-
-    if test \( -z "$compiler" \) -o \( \( "$compiler" != gcc \) -a \( "$compiler" != clang \) \)
-        print_help_and_exit 1
-    end
-
-    set build_dest $build_root"/"$compiler"/"$build_type
-
-    echo "Set up build: "$compiler" "$build_type
-
-    if test \( -z "$force" \) -a \( -d $build_dest \)
-        echo "The build directory '"$build_dest"' already exists (use -f to overwrite)"
-        return 1
-    end
-
-    rm -rf "$build_dest"
-    mkdir -p "$build_dest"
-    cd "$build_dest"
-    cmake -G Ninja -DCMAKE_BUILD_TYPE=$build_type_arg -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_C_COMPILER=$c_compiler -DCMAKE_CXX_COMPILER=$compiler_arg $repo_root
-end
-
-# The while loop below removes arguments (via shift) as it parses them.
-# Additional information that needs to be extracted from the arguments must be
-# done so before the loop is executed.
-
-set i 1
-while test $i -le (count $argv)
-    switch $argv[$i]
-        case --compiler
-            set i (math "$i + 1")
-            set compiler $argv[$i]
-        case clang
-            set compiler clang
-        case gcc
-            set compiler gcc
-        case --type
-            set i (math "$i + 1")
-            set build_type $argv[$i]
-        case release
-            set build_type release
-        case debug
-            set build_type debug
-        case -f
-            set force 1
-        case --force
-            set force 1
-        case -h
-            print_help_and_exit 0
-        case --help
-            print_help_and_exit 0
-        case '*'
-            print_help_and_exit 1
-    end
-    set i (math "$i + 1")
-end
-
-echo "compiler in "$compiler
-echo "build type in "$build_type
-if test -n "$compiler"
-    if test -n "$build_type"
-        setup_build $compiler $build_type
-    else
-        # all builds for the specified compiler
-        setup_build $compiler debug
-        setup_build $compiler release
-    end
-else if test -n "$build_type"
-    # all builds for the specified build type
-    setup_build gcc $build_type
-    setup_build clang $build_type
-else
-    # all builds
-    setup_build gcc debug
-    setup_build gcc release
-    setup_build clang debug
-    setup_build clang release
-end
@@ -1,153 +0,0 @@
-#!/usr/bin/env fish
-
-function print_help_and_exit
-  echo "\
-Usage: setup_builds.sh [OPTIONS] compiler build-type
-
-Positionals:
-  gcc                Compile with gcc
-  clang              Compile with clang
-  debug              Build debug
-  release            Build release
-
-Options:
-  --compiler         <clang|gcc> Specify the compiler
-  --type             <debug|release> Specify the type of build 
-  -f,--force         Overwrite existing build directories
-  -h,--help          Print this help message and exit
-
-"
-  exit $argv[1]
-end
-
-function assert_dir
-  if test ! -d "$argv[1]"
-    if test -n "$argv[2]"
-      echo "Invalid variable "$argv[2]": '"$argv[1]"' is not a directory"
-    else
-      echo "'"$argv[1]"' is not a directory"
-    end
-    exit 1
-  end
-end
-
-# common variables
-
-#set tools_path (readlink -f (pwd))
-#set tools_path (cd (dirname (status --current-filename)); and pwd)
-set tools_path (realpath (dirname (status -f)))
-set spartan_path_cmd $tools_path/spartan_path.fish
-set repo_root (eval $spartan_path_cmd "repo-root")
-# Don't call 'spartan_path_cmd "build"' bc it returns specific build path
-# (i.e., for a particular compiler/build type), not the root build path
-# set build_root (eval $spartan_path_cmd "build")
-set build_root "$repo_root"/"build"
-mkdir -p "$build_root"
-
-# Initialize the build directory.  Expected arguments: <compiler>, <build_type>
-# Note: this method assumes the variables 'repot_root' and 'build_root' have
-# already been properly initialized
-function setup_build
-  assert_dir $repo_root
-  assert_dir $build_root
-  set compiler "$argv[1]"
-  set build_type "$argv[2]"
-
-  if test \( -z "$build_type" \) -o \( \( "$build_type" != "debug" \) -a \( "$build_type" != "release" \) \)
-    print_help_and_exit 1
-  end
-
-  if test "$build_type" = "debug"
-    set build_type_arg "Debug"
-    if test "$compiler" = "gcc"
-      set compiler_arg "/usr/lib/ccache/g++"
-    else
-      set compiler_arg "/usr/lib/ccache/clang++"
-    end
-  else if test "$build_type" = "release"
-    set build_type_arg "Release"
-    if test "$compiler" = "gcc"
-      set compiler_arg "g++"
-    else
-      set compiler_arg "clang++"
-    end
-  end
-
-  if test \( -z "$compiler" \) -o \( \( "$compiler" != "gcc" \) -a \( "$compiler" != "clang" \) \)
-    print_help_and_exit 1
-  end
-
-  set build_dest $build_root"/"$compiler"/"$build_type
-  set conan_dest $repo_root"/conan/"$compiler"_"$build_type
-
-  echo "Set up build: "$compiler" "$build_type
-
-  if test \( -z "$force" \) -a \( -d $build_dest \)
-    echo "The build directory '"$build_dest"' already exists (use -f to overwrite)"
-    return 1
-  end
-
-  rm -rf "$build_dest"
-  mkdir -p "$build_dest"
-  mkdir -p "$conan_dest"
-  cd "$build_dest"
-  conan install --build missing --profile $conan_dest $repo_root
-  cmake -G Ninja -DCMAKE_BUILD_TYPE=$build_type_arg -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CXX_COMPILER=$compiler_arg $repo_root
-end
-
-# The while loop below removes arguments (via shift) as it parses them.
-# Additional information that needs to be extracted from the arguments must be
-# done so before the loop is executed.
-
-set i 1
-while test $i -le (count $argv)
-  switch $argv[$i]
-    case '--compiler'
-      set i (math "$i + 1")
-      set compiler $argv[$i]
-    case 'clang'
-      set compiler 'clang'
-    case 'gcc'
-      set compiler 'gcc'
-    case '--type'
-      set i (math "$i + 1")
-      set build_type $argv[$i]
-    case 'release'
-      set build_type 'release'
-    case 'debug'
-      set build_type 'debug'
-    case '-f'
-      set force 1
-    case '--force'
-      set force 1
-    case '-h'
-      print_help_and_exit 0
-    case '--help'
-      print_help_and_exit 0
-    case '*'
-      print_help_and_exit 1
-  end
-  set i (math "$i + 1")
-end
-
-echo "compiler in "$compiler
-echo "build type in "$build_type
-if test -n "$compiler"
-  if test -n "$build_type"
-    setup_build $compiler $build_type
-  else
-    # all builds for the specified compiler
-    setup_build $compiler "debug"
-    setup_build $compiler "release"
-  end
-else if test -n "$build_type"
-  # all builds for the specified build type
-  setup_build "gcc" $build_type
-  setup_build "clang" $build_type
-else
-  # all builds
-  setup_build "gcc" "debug"
-  setup_build "gcc" "release"
-  setup_build "clang" "debug"
-  setup_build "clang" "release"
-end
@@ -1,92 +0,0 @@
-#!/usr/bin/env fish
-
-#basename (git rev-parse --show-toplevel)
-
-function print_help_and_exit
-  echo "\
-Print paths to core parts of the repository
-Usage: sparkd_path.sh SUBCOMMAND
-
-Subcommands:
-  build              Print build path
-  repo-root          Print repo root path
-
-"
-  exit $argv[1]
-end
-
-function print_build_help_and_exit
-  echo "\
-Print build path
-Usage: sparkd_path.sh build [OPTIONS] compiler build-type
-
-Positionals:
-  gcc                Print gcc build path
-  clang              Print clang build path
-  debug              Print debug build path
-  release            Print release build path
-
-Options:
-  --compiler         <clang|gcc> Specify the compiler
-  --type             <debug|release> Specify the type of build 
-  -h,--help          Print this help message and exit
-
-"
-  exit $argv[1]
-end
-
-function print_repo_root
-  git rev-parse --show-toplevel
-end
-
-function run_repo_root
-  print_repo_root
-end
-
-function run_build
-  set compiler "gcc"
-  set build_type "release"
-  set i 1
-  while test $i -lt (count $argv)
-    switch $argv[$i]
-      case '--compiler'
-        set i (math "$i + 1")
-        set compiler $argv[$i]
-      case 'clang'
-        set compiler 'clang'
-      case 'gcc'
-        set compiler 'gcc'
-      case '--type'
-        set i (math "$i + 1")
-        set build_type $argv[$i]
-      case 'release'
-        set build_type 'release'
-      case 'debug'
-        set build_type 'debug'
-      '-h'
-        print_build_help_and_exit 0
-      '--help'
-        print_build_help_and_exit 0
-      '*'
-        print_build_help_and_exit 1
-      end
-      set i (math "$i + 1")
-    end
-  if test \( $compiler = "clang" \) -o \( $compiler = "gcc" \)
-    set comp_path $compiler
-  else
-    print_build_help_and_exit 1
-  end
-  set src_root (print_repo_root)
-  set build_root (readlink -f "$src_root""/build")
-  set build_dest $build_root"/"$compiler"/"$build_type
-  echo $build_dest
-end
-
-if test "$argv[1]" = "repo-root"
-  print_repo_root $argv[2..-1]
-else if test "$argv[1]" = "build"
-  run_build $argv[2..-1]
-else
-  print_help_and_exit 1
-end
@@ -1,43 +0,0 @@
-#!/usr/bin/env fish
-
-set image_name $argv[1]
-set cont_name $argv[2]
-
-if test (count $argv) -lt 2
-   if test (count $argv) -lt 1
-      set image_name_cmd (realpath (dirname (status -f)))"/docker_image_name.fish"
-      set image_name (eval $image_name_cmd)
-   end
-   set cont_name_cmd (realpath (dirname (status -f)))"/docker_container_name.fish "$image_name
-   set cont_name (eval $cont_name_cmd)
-end
-
-set working_dir (realpath (pwd))
-
-set home_path /home/john
-set repo_path (git rev-parse --show-toplevel)
-set repo_path_out /home/john/Documents/repos/bts/(basename $repo_path)
-set working_dir $repo_path_out
-
-echo "starting docker instance '"$cont_name"' (image '"$image_name"')"
-echo "working dir "$working_dir
-
-docker run \
-  --rm \
-  --net host \
-  -h (hostname) \
-  -e "TZ=America/New_York" \
-  --cap-add=SYS_PTRACE \
-  --security-opt seccomp=unconfined \
-  --name $cont_name \
-  -v $repo_path:$repo_path_out \
-  -u (id -u $USER) \
-  -w $working_dir \
-  --shm-size=4024m \
-  -t \
-  -i \
-  -d \
-  -e DISPLAY="$DISPLAY" \
-  "$image_name" \
-  bash
-
@@ -1,107 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/src",
-                "${workspaceRoot}/externals/linux/include"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}",
-                    "${workspaceFolder}/src",
-                    "${workspaceRoot}/externals/linux/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "compileCommands": "${workspaceFolder}/build/ninja_debug/compile_commands.json"
-        },
-        {
-            "name": "Windows",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}/src",
-                "${workspaceRoot}/build/src",
-                "${workspaceRoot}/build/ninja_debug/src",
-                "${workspaceRoot}/externals/windows/include",
-                "${workspaceRoot}/externals/linux/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                "${workspaceRoot}/externals/windows/vscode/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${workspaceRoot}/src",
-                    "${workspaceRoot}/build/src",
-                    "${workspaceRoot}/build/ninja_debug/src",
-                    "${workspaceRoot}/externals/windows/include",
-                    "${workspaceRoot}/externals/linux/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "WindowsQuick",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}/src",
-                "${workspaceRoot}/build/src",
-                "${workspaceRoot}/build/ninja_debug/src",
-                "${workspaceRoot}/externals/windows/include",
-                "${workspaceRoot}/externals/linux/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                "${workspaceRoot}/externals/windows/vscode/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${workspaceRoot}/src"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        }
-    ],
-    "version": 4
-}
@@ -1,513 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Spark Local",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/gcc/debug/server/sparkd",
-      "args": [
-        "run",
-        "test",
-        "-a",
-        "OutrightVanillaOrder"
-      ],
-      "stopAtEntry": false,
-      "cwd": "${workspaceRoot}/build/gcc/debug/server/",
-      "environment": [
-        {
-          "name": "TZ",
-          "value": "America/Chicago"
-        }
-      ],
-      "externalConsole": false,
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        }
-      ]
-    },
-    {
-      "name": "SparkVM Launch",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "-a",
-        "[ilink3]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        },
-        {
-          "description": "Skip STL",
-          "text": "skip -gfi /usr/include/c++/7/bits/*.h",
-          "ignoreFailures": true
-        },
-        {
-          "description": "LD LIBRARY",
-          "text": "set env LD_LIBRARY_PATH=.",
-          "ignoreFailures": false
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "(gdb) Launch",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/gcc/debug/server/sparkd/sparkd",
-      "args": [
-        "run"
-      ],
-      "stopAtEntry": false,
-      "cwd": "${workspaceRoot}/build/gcc/debug/src/server/sparkd",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        }
-      ]
-    },
-    {
-      "name": "Client Launch",
-      "type": "clr",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe",
-      "args": [],
-      "cwd": "${workspaceRoot}",
-      "stopAtEntry": false,
-      "externalConsole": true,
-      "requireExactSource": false
-    },
-    {
-      "name": "SDK Launch",
-      "type": "clr",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe",
-      "args": [
-        "md",
-        "GLBX",
-        "Future",
-        "CL",
-        "CLZ9",
-        "--user=bts",
-        "--pass="
-      ],
-      "cwd": "${workspaceRoot}",
-      "stopAtEntry": false,
-      "externalConsole": true,
-      "requireExactSource": false
-    },
-    {
-      "name": "Excel Launch",
-      "type": "clr",
-      "request": "launch",
-      "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE",
-      "args": [
-        "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"
-      ],
-      "cwd": "${workspaceRoot}",
-      "stopAtEntry": false,
-      "externalConsole": true,
-      "requireExactSource": false
-    },
-    {
-      "name": "Client Tests",
-      "type": "clr",
-      "request": "launch",
-      "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
-      "args": [
-        "test",
-        "ApiUpdateTests"
-      ],
-      "cwd": "${workspaceRoot}",
-      "stopAtEntry": false,
-      "externalConsole": true,
-      "requireExactSource": false
-    },
-    {
-      "name": "Client Attach",
-      "type": "clr",
-      "request": "attach",
-      "processId": "${command:pickProcess}"
-    },
-    {
-      "name": "Spreader Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "[spreader]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "MD Synthetic Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "[md][synthetic]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "Spartan Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "[spartan_md]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "Matcher Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "[matcher]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "Admin Service Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd",
-      "args": [
-        "test",
-        "[admin_service]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "Limiter Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd",
-      "args": [
-        "test",
-        "[limiter]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/src/server/sparkd/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "enable pretty-printer",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "MD Tests",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-      "args": [
-        "test",
-        "[algo]"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server/",
-      "environment": [],
-      "externalConsole": true,
-      "MIMode": "gdb",
-      "preLaunchTask": "",
-      "logging": {
-        "engineLogging": false
-      },
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "description": "Skip STL",
-          "text": "skip -gfi /usr/include/c++/7/bits/*.h",
-          "ignoreFailures": true
-        }
-      ],
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "SparkVM attach",
-      "type": "cppdbg",
-      "request": "attach",
-      "program": "/home/bts/spark/build/gcc/debug/src/server/sparkd/sparkd",
-      "processId": "${command:pickRemoteProcess}",
-      "MIMode": "gdb",
-      "pipeTransport": {
-        "pipeCwd": "${workspaceRoot}",
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/usr/bin/gdb"
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      }
-    },
-    {
-      "name": "Python",
-      "type": "python",
-      "request": "launch",
-      "stopOnEntry": false,
-      "python": "${command:python.interpreterPath}",
-      "program": "${file}",
-      "cwd": "${workspaceRoot}",
-      "env": {},
-      "envFile": "${workspaceRoot}/.env",
-      "args": [
-        "DEBUG"
-      ],
-      "debugOptions": [
-        "WaitOnAbnormalExit",
-        "WaitOnNormalExit",
-        "RedirectOutput"
-      ]
-    },
-    {
-      "name": ".NET Core Remote Attach",
-      "type": "coreclr",
-      "request": "attach",
-      "processId": "${command:pickRemoteProcess}",
-      "pipeTransport": {
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/home/bts/vsdbg/vsdbg",
-        "pipeCwd": "${workspaceRoot}",
-        "quoteArgs": true
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      },
-      "justMyCode": true
-    },
-    {
-      "name": ".NET Core Remote Launch",
-      "type": "coreclr",
-      "request": "launch",
-      "program": "/usr/bin/dotnet",
-      "args": [
-        "sparkcmd.dll",
-        "test",
-        "test_join_create_and_takeout_market"
-      ],
-      "stopAtEntry": false,
-      "cwd": "/home/bts/spark/build/gcc/debug/server",
-      "pipeTransport": {
-        "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-        "pipeArgs": [
-          "bts@sparkvm"
-        ],
-        "debuggerPath": "/home/bts/vsdbg/vsdbg",
-        "pipeCwd": "${workspaceRoot}",
-        "quoteArgs": true
-      },
-      "sourceFileMap": {
-        "/home/bts/spark/": "${workspaceRoot}"
-      },
-      "justMyCode": false
-    },
-  ]
-}
@@ -1,941 +0,0 @@
-{
-	"$schema": "vscode://schemas/color-theme",
-	"type": "dark",
-	"colors": {
-		"activityBar.background": "#111111",
-		"activityBar.border": "#111111",
-		"activityBar.foreground": "#888888",
-		"activityBarBadge.background": "#88cc44",
-		"activityBarBadge.foreground": "#222222",
-		"badge.background": "#88cc44",
-		"badge.foreground": "#222222",
-		"button.background": "#333333",
-		"button.foreground": "#888888",
-		"button.hoverBackground": "#222222",
-		"debugExceptionWidget.background": "#333333",
-		"debugExceptionWidget.border": "#222222",
-		"debugToolBar.background": "#111111",
-		"diffEditor.insertedTextBackground": "#ffdd440c",
-		"diffEditor.insertedTextBorder": "#ffdd44",
-		"diffEditor.removedTextBackground": "#88bbff0c",
-		"diffEditor.removedTextBorder": "#88bbff",
-		"dropdown.background": "#222222",
-		"dropdown.border": "#222222",
-		"dropdown.foreground": "#888888",
-		"editor.background": "#222222",
-		"editor.findMatchBackground": "#44446655",
-		"editor.findMatchHighlightBackground": "#444466aa",
-		"editor.foreground": "#ffffff",
-		"editor.hoverHighlightBackground": "#44446655",
-		"editor.inactiveSelectionBackground": "#44446655",
-		"editor.lineHighlightBackground": "#00000066",
-		"editor.lineHighlightBorder": "#00000000",
-		"editor.rangeHighlightBackground": "#333333",
-		"editor.selectionBackground": "#444466",
-		"editor.selectionHighlightBackground": "#44446655",
-		"editor.wordHighlightBackground": "#44446655",
-		"editor.wordHighlightStrongBackground": "#44446655",
-		"editorBracketMatch.background": "#222222",
-		"editorBracketMatch.border": "#666666",
-		"editorCodeLens.foreground": "#666666",
-		"editorCursor.foreground": "#ffffff",
-		"editorError.foreground": "#ee5500",
-		"editorGroup.border": "#111111",
-		"editorGroup.dropBackground": "#111111bb",
-		"editorGroupHeader.noTabsBackground": "#111111",
-		"editorGroupHeader.tabsBackground": "#111111",
-		"editorGroupHeader.tabsBorder": "#222222",
-		"editorGutter.addedBackground": "#ffdd44",
-		"editorGutter.background": "#222222",
-		"editorGutter.deletedBackground": "#88bbff",
-		"editorGutter.modifiedBackground": "#88bbff",
-		"editorHoverWidget.background": "#333333",
-		"editorHoverWidget.border": "#222222",
-		"editorIndentGuide.background": "#333333",
-		"editorLineNumber.foreground": "#555555",
-		"editorLink.activeForeground": "#bba0ff",
-		"editorMarkerNavigation.background": "#333333",
-		"editorMarkerNavigationError.background": "#88bbff",
-		"editorMarkerNavigationWarning.background": "#88bbff",
-		"editorOverviewRuler.addedForeground": "#ffdd44",
-		"editorOverviewRuler.border": "#222222",
-		"editorOverviewRuler.currentContentForeground": "#333333",
-		"editorOverviewRuler.deletedForeground": "#88bbff",
-		"editorOverviewRuler.errorForeground": "#88bbff",
-		"editorOverviewRuler.findMatchForeground": "#555555",
-		"editorOverviewRuler.incomingContentForeground": "#333333",
-		"editorOverviewRuler.infoForeground": "#bba0ff",
-		"editorOverviewRuler.modifiedForeground": "#88bbff",
-		"editorOverviewRuler.rangeHighlightForeground": "#333333",
-		"editorOverviewRuler.selectionHighlightForeground": "#555555",
-		"editorOverviewRuler.warningForeground": "#88bbff",
-		"editorOverviewRuler.wordHighlightForeground": "#333333",
-		"editorOverviewRuler.wordHighlightStrongForeground": "#555555",
-		"editorRuler.foreground": "#ffffff",
-		"editorSuggestWidget.background": "#333333",
-		"editorSuggestWidget.border": "#333333",
-		"editorSuggestWidget.foreground": "#888888",
-		"editorSuggestWidget.highlightForeground": "#ffffff",
-		"editorSuggestWidget.selectedBackground": "#666666",
-		"editorWarning.border": "#00000000",
-		"editorWarning.foreground": "#88bbff",
-		"editorWhitespace.foreground": "#333333",
-		"editorWidget.background": "#333333",
-		"editorWidget.border": "#333333",
-		"errorForeground": "#88bbff",
-		"extensionButton.prominentBackground": "#333333",
-		"extensionButton.prominentForeground": "#ffffff",
-		"extensionButton.prominentHoverBackground": "#555555",
-		"focusBorder": "#666666",
-		"foreground": "#ffffff",
-		"gitDecoration.modifiedResourceForeground": "#cccccc",
-		"gitDecoration.untrackedResourceForeground": "#cccccc",
-		"input.background": "#333333",
-		"input.border": "#333333",
-		"input.foreground": "#ffffff",
-		"input.placeholderForeground": "#555555",
-		"inputOption.activeBorder": "#555555",
-		"inputValidation.errorBackground": "#333333",
-		"inputValidation.errorBorder": "#88bbff",
-		"inputValidation.infoBackground": "#333333",
-		"inputValidation.infoBorder": "#bba0ff",
-		"inputValidation.warningBackground": "#333333",
-		"inputValidation.warningBorder": "#88bbff",
-		"list.activeSelectionBackground": "#111111",
-		"list.activeSelectionForeground": "#ffffff",
-		"list.dropBackground": "#111111bf",
-		"list.focusBackground": "#222222",
-		"list.focusForeground": "#ffffff",
-		"list.highlightForeground": "#ffffff",
-		"list.hoverBackground": "#333333",
-		"list.hoverForeground": "#ffffff",
-		"list.inactiveSelectionBackground": "#000000",
-		"list.inactiveSelectionForeground": "#ffffff",
-		"menu.background": "#333333",
-		"menu.foreground": "#ffffff",
-		"merge.border": "#222222",
-		"merge.currentContentBackground": "#333333",
-		"merge.currentHeaderBackground": "#555555",
-		"merge.incomingContentBackground": "#555555",
-		"merge.incomingHeaderBackground": "#666666",
-		"panel.background": "#111111",
-		"panel.border": "#111111",
-		"panelTitle.activeBorder": "#ffffff",
-		"panelTitle.activeForeground": "#ffffff",
-		"panelTitle.inactiveForeground": "#888888",
-		"peekView.border": "#222222",
-		"peekViewEditor.background": "#333333",
-		"peekViewEditor.matchHighlightBackground": "#555555",
-		"peekViewEditorGutter.background": "#333333",
-		"peekViewResult.background": "#333333",
-		"peekViewResult.fileForeground": "#888888",
-		"peekViewResult.lineForeground": "#888888",
-		"peekViewResult.matchHighlightBackground": "#555555",
-		"peekViewResult.selectionBackground": "#333333",
-		"peekViewResult.selectionForeground": "#ffffff",
-		"peekViewTitle.background": "#333333",
-		"peekViewTitleDescription.foreground": "#888888",
-		"peekViewTitleLabel.foreground": "#ffffff",
-		"pickerGroup.border": "#222222",
-		"pickerGroup.foreground": "#555555",
-		"progressBar.background": "#333333",
-		"scrollbar.shadow": "#191919",
-		"scrollbarSlider.activeBackground": "#ffffff12",
-		"scrollbarSlider.background": "#ffffff12",
-		"scrollbarSlider.hoverBackground": "#ffffff12",
-		"selection.background": "#2255aa",
-		"sideBar.background": "#111111",
-		"sideBar.border": "#111111",
-		"sideBar.foreground": "#888888",
-		"sideBarSectionHeader.background": "#111111",
-		"sideBarSectionHeader.foreground": "#666666",
-		"sideBarTitle.foreground": "#555555",
-		"statusBar.background": "#111111",
-		"statusBar.border": "#111111",
-		"statusBar.debuggingBackground": "#666666",
-		"statusBar.debuggingForeground": "#ffffff",
-		"statusBar.foreground": "#666666",
-		"statusBar.noFolderBackground": "#111111",
-		"statusBar.noFolderForeground": "#666666",
-		"statusBarItem.activeBackground": "#222222",
-		"statusBarItem.hoverBackground": "#222222",
-		"statusBarItem.prominentBackground": "#333333",
-		"statusBarItem.prominentHoverBackground": "#444444",
-		"tab.activeBackground": "#222222",
-		"tab.border": "#111111",
-		"tab.inactiveBackground": "#111111",
-		"tab.inactiveForeground": "#888888",
-		"tab.unfocusedActiveBorder": "#888888",
-		"tab.unfocusedActiveForeground": "#888888",
-		"tab.unfocusedInactiveForeground": "#888888",
-		"terminal.ansiBlack": "#333333",
-		"terminal.ansiBlue": "#88bbff",
-		"terminal.ansiBrightBlack": "#666666",
-		"terminal.ansiBrightBlue": "#88bbff",
-		"terminal.ansiBrightCyan": "#bba0ff",
-		"terminal.ansiBrightGreen": "#ffdd44",
-		"terminal.ansiBrightMagenta": "#88bbff",
-		"terminal.ansiBrightRed": "#88bbff",
-		"terminal.ansiBrightWhite": "#ffffff",
-		"terminal.ansiBrightYellow": "#88cc44",
-		"terminal.ansiCyan": "#bba0ff",
-		"terminal.ansiGreen": "#ffdd44",
-		"terminal.ansiMagenta": "#88bbff",
-		"terminal.ansiRed": "#88bbff",
-		"terminal.ansiWhite": "#ffffff",
-		"terminal.ansiYellow": "#88cc44",
-		"terminal.background": "#151515",
-		"terminal.foreground": "#ffffff",
-		"titleBar.activeBackground": "#111111",
-		"titleBar.activeForeground": "#888888",
-		"titleBar.inactiveBackground": "#111111",
-		"titleBar.inactiveForeground": "#555555",
-		"walkThrough.embeddedEditorBackground": "#111111",
-		"widget.shadow": "#111111",
-		//"activityBar.activeBorder": "#888888",
-		//"activityBar.dropBorder": "#888888",
-		//"activityBar.inactiveForeground": "#88888866",
-		//"banner.background": "#111111",
-		//"banner.foreground": "#ffffff",
-		//"banner.iconForeground": "#3794ff",
-		//"bookmarks.lineBackground": "#00000000",
-		//"bookmarks.lineBorder": "#00000000",
-		//"bookmarks.overviewRuler": "#157efb88",
-		//"breadcrumb.activeSelectionForeground": "#ffffff",
-		//"breadcrumb.background": "#222222",
-		//"breadcrumb.focusForeground": "#ffffff",
-		//"breadcrumb.foreground": "#ffffffcc",
-		//"breadcrumbPicker.background": "#333333",
-		//"button.secondaryBackground": "#3a3d41",
-		//"button.secondaryForeground": "#ffffff",
-		//"button.secondaryHoverBackground": "#45494e",
-		//"charts.blue": "#3794ff",
-		//"charts.foreground": "#ffffff",
-		//"charts.green": "#89d185",
-		//"charts.lines": "#ffffff80",
-		//"charts.orange": "#d18616",
-		//"charts.purple": "#b180d7",
-		//"charts.red": "#ee5500",
-		//"charts.yellow": "#88bbff",
-		//"checkbox.background": "#222222",
-		//"checkbox.border": "#222222",
-		//"checkbox.foreground": "#888888",
-		//"debugConsole.errorForeground": "#88bbff",
-		//"debugConsole.infoForeground": "#3794ff",
-		//"debugConsole.sourceForeground": "#ffffff",
-		//"debugConsole.warningForeground": "#88bbff",
-		//"debugConsoleInputIcon.foreground": "#ffffff",
-		//"debugIcon.breakpointCurrentStackframeForeground": "#ffcc00",
-		//"debugIcon.breakpointDisabledForeground": "#848484",
-		//"debugIcon.breakpointForeground": "#e51400",
-		//"debugIcon.breakpointStackframeForeground": "#89d185",
-		//"debugIcon.breakpointUnverifiedForeground": "#848484",
-		//"debugIcon.continueForeground": "#75beff",
-		//"debugIcon.disconnectForeground": "#f48771",
-		//"debugIcon.pauseForeground": "#75beff",
-		//"debugIcon.restartForeground": "#89d185",
-		//"debugIcon.startForeground": "#89d185",
-		//"debugIcon.stepBackForeground": "#75beff",
-		//"debugIcon.stepIntoForeground": "#75beff",
-		//"debugIcon.stepOutForeground": "#75beff",
-		//"debugIcon.stepOverForeground": "#75beff",
-		//"debugIcon.stopForeground": "#f48771",
-		//"debugTokenExpression.boolean": "#4e94ce",
-		//"debugTokenExpression.error": "#f48771",
-		//"debugTokenExpression.name": "#c586c0",
-		//"debugTokenExpression.number": "#b5cea8",
-		//"debugTokenExpression.string": "#ce9178",
-		//"debugTokenExpression.value": "#cccccc99",
-		//"debugView.exceptionLabelBackground": "#6c2022",
-		//"debugView.exceptionLabelForeground": "#ffffff",
-		//"debugView.stateLabelBackground": "#88888844",
-		//"debugView.stateLabelForeground": "#ffffff",
-		//"debugView.valueChangedHighlight": "#569cd6",
-		//"descriptionForeground": "#ffffffb3",
-		//"diffEditor.diagonalFill": "#cccccc33",
-		//"editor.findRangeHighlightBackground": "#3a3d4166",
-		//"editor.focusedStackFrameHighlightBackground": "#7abd7a4d",
-		//"editor.foldBackground": "#4444664d",
-		//"editor.inlineValuesBackground": "#ffc80033",
-		//"editor.inlineValuesForeground": "#ffffff80",
-		//"editor.linkedEditingBackground": "#ff00004d",
-		//"editor.snippetFinalTabstopHighlightBorder": "#525252",
-		//"editor.snippetTabstopHighlightBackground": "#7c7c7c4d",
-		//"editor.stackFrameHighlightBackground": "#ffff0033",
-		//"editor.symbolHighlightBackground": "#444466aa",
-		//"editorActiveLineNumber.foreground": "#c6c6c6",
-		//"editorBracketHighlight.foreground1": "#ffd700",
-		//"editorBracketHighlight.foreground2": "#da70d6",
-		//"editorBracketHighlight.foreground3": "#179fff",
-		//"editorBracketHighlight.foreground4": "#00000000",
-		//"editorBracketHighlight.foreground5": "#00000000",
-		//"editorBracketHighlight.foreground6": "#00000000",
-		//"editorBracketHighlight.unexpectedBracket.foreground": "#ff1212cc",
-		//"editorBracketPairGuide.activeBackground1": "#00000000",
-		//"editorBracketPairGuide.activeBackground2": "#00000000",
-		//"editorBracketPairGuide.activeBackground3": "#00000000",
-		//"editorBracketPairGuide.activeBackground4": "#00000000",
-		//"editorBracketPairGuide.activeBackground5": "#00000000",
-		//"editorBracketPairGuide.activeBackground6": "#00000000",
-		//"editorBracketPairGuide.background1": "#00000000",
-		//"editorBracketPairGuide.background2": "#00000000",
-		//"editorBracketPairGuide.background3": "#00000000",
-		//"editorBracketPairGuide.background4": "#00000000",
-		//"editorBracketPairGuide.background5": "#00000000",
-		//"editorBracketPairGuide.background6": "#00000000",
-		//"editorGhostText.foreground": "#ffffff56",
-		//"editorGutter.commentRangeForeground": "#c5c5c5",
-		//"editorGutter.foldingControlForeground": "#c5c5c5",
-		//"editorHint.foreground": "#eeeeeeb3",
-		//"editorHoverWidget.foreground": "#ffffff",
-		//"editorHoverWidget.highlightForeground": "#ffffff",
-		//"editorHoverWidget.statusBarBackground": "#3d3d3d",
-		//"editorIndentGuide.activeBackground": "#333333",
-		//"editorInfo.foreground": "#3794ff",
-		//"editorInlayHint.background": "#88cc4499",
-		//"editorInlayHint.foreground": "#222222cc",
-		//"editorInlayHint.parameterBackground": "#88cc4499",
-		//"editorInlayHint.parameterForeground": "#222222cc",
-		//"editorInlayHint.typeBackground": "#88cc4499",
-		//"editorInlayHint.typeForeground": "#222222cc",
-		//"editorLightBulb.foreground": "#ffcc00",
-		//"editorLightBulbAutoFix.foreground": "#75beff",
-		//"editorLineNumber.activeForeground": "#c6c6c6",
-		//"editorMarkerNavigationError.headerBackground": "#88bbff1a",
-		//"editorMarkerNavigationInfo.background": "#3794ff",
-		//"editorMarkerNavigationInfo.headerBackground": "#3794ff1a",
-		//"editorMarkerNavigationWarning.headerBackground": "#88bbff1a",
-		//"editorOverviewRuler.bracketMatchForeground": "#a0a0a0",
-		//"editorOverviewRuler.commonContentForeground": "#60606066",
-		//"editorOverviewRuler.unicodeForeground": "#d186167e",
-		//"editorPane.background": "#222222",
-		//"editorSuggestWidget.focusHighlightForeground": "#ffffff",
-		//"editorSuggestWidget.selectedForeground": "#ffffff",
-		//"editorSuggestWidgetStatus.foreground": "#88888880",
-		//"editorUnicodeHighlight.border": "#bd9b03",
-		//"editorUnnecessaryCode.opacity": "#000000aa",
-		//"editorWidget.foreground": "#ffffff",
-		//"extensionBadge.remoteBackground": "#88cc44",
-		//"extensionBadge.remoteForeground": "#222222",
-		//"extensionIcon.preReleaseForeground": "#1d9271",
-		//"extensionIcon.starForeground": "#ff8e00",
-		//"extensionIcon.verifiedForeground": "#3794ff",
-		//"gitDecoration.addedResourceForeground": "#81b88b",
-		//"gitDecoration.conflictingResourceForeground": "#e4676b",
-		//"gitDecoration.deletedResourceForeground": "#c74e39",
-		//"gitDecoration.ignoredResourceForeground": "#8c8c8c",
-		//"gitDecoration.renamedResourceForeground": "#73c991",
-		//"gitDecoration.stageDeletedResourceForeground": "#c74e39",
-		//"gitDecoration.stageModifiedResourceForeground": "#e2c08d",
-		//"gitDecoration.submoduleResourceForeground": "#8db9e2",
-		//"gitlens.closedAutolinkedIssueIconColor": "#a371f7",
-		//"gitlens.closedPullRequestIconColor": "#f85149",
-		//"gitlens.decorations.addedForegroundColor": "#81b88b",
-		//"gitlens.decorations.branchAheadForegroundColor": "#35b15e",
-		//"gitlens.decorations.branchBehindForegroundColor": "#b15e35",
-		//"gitlens.decorations.branchDivergedForegroundColor": "#d8af1b",
-		//"gitlens.decorations.branchMissingUpstreamForegroundColor": "#c74e39",
-		//"gitlens.decorations.branchUnpublishedForegroundColor": "#35b15e",
-		//"gitlens.decorations.branchUpToDateForegroundColor": "#888888",
-		//"gitlens.decorations.copiedForegroundColor": "#73c991",
-		//"gitlens.decorations.deletedForegroundColor": "#c74e39",
-		//"gitlens.decorations.ignoredForegroundColor": "#8c8c8c",
-		//"gitlens.decorations.modifiedForegroundColor": "#cccccc",
-		//"gitlens.decorations.renamedForegroundColor": "#73c991",
-		//"gitlens.decorations.untrackedForegroundColor": "#cccccc",
-		//"gitlens.gutterBackgroundColor": "#ffffff13",
-		//"gitlens.gutterForegroundColor": "#bebebe",
-		//"gitlens.gutterUncommittedForegroundColor": "#00bcf299",
-		//"gitlens.lineHighlightBackgroundColor": "#00bcf233",
-		//"gitlens.lineHighlightOverviewRulerColor": "#00bcf299",
-		//"gitlens.mergedPullRequestIconColor": "#a371f7",
-		//"gitlens.openAutolinkedIssueIconColor": "#3fb950",
-		//"gitlens.openPullRequestIconColor": "#3fb950",
-		//"gitlens.trailingLineBackgroundColor": "#00000000",
-		//"gitlens.trailingLineForegroundColor": "#99999959",
-		//"gitlens.unpublishedCommitIconColor": "#35b15e",
-		//"gitlens.unpulledChangesIconColor": "#b15e35",
-		//"gitlens.unpushlishedChangesIconColor": "#35b15e",
-		//"icon.foreground": "#c5c5c5",
-		//"inputOption.activeBackground": "#66666666",
-		//"inputOption.activeForeground": "#ffffff",
-		//"inputOption.hoverBackground": "#5a5d5e80",
-		//"interactive.activeCodeBorder": "#222222",
-		//"interactive.inactiveCodeBorder": "#000000",
-		//"keybindingLabel.background": "#8080802b",
-		//"keybindingLabel.border": "#33333399",
-		//"keybindingLabel.bottomBorder": "#44444499",
-		//"keybindingLabel.foreground": "#cccccc",
-		//"keybindingTable.headerBackground": "#ffffff0a",
-		//"keybindingTable.rowsBackground": "#ffffff0a",
-		//"list.deemphasizedForeground": "#8c8c8c",
-		//"list.errorForeground": "#f88070",
-		//"list.filterMatchBackground": "#444466aa",
-		//"list.focusHighlightForeground": "#ffffff",
-		//"list.focusOutline": "#666666",
-		//"list.invalidItemForeground": "#b89500",
-		//"list.warningForeground": "#cca700",
-		//"listFilterWidget.background": "#653723",
-		//"listFilterWidget.noMatchesOutline": "#be1100",
-		//"listFilterWidget.outline": "#00000000",
-		//"menu.selectionBackground": "#111111",
-		//"menu.selectionForeground": "#ffffff",
-		//"menu.separatorBackground": "#bbbbbb",
-		//"menubar.selectionBackground": "#ffffff1a",
-		//"menubar.selectionForeground": "#888888",
-		//"merge.commonContentBackground": "#60606029",
-		//"merge.commonHeaderBackground": "#60606066",
-		//"minimap.errorHighlight": "#ff1212b3",
-		//"minimap.findMatchHighlight": "#d18616",
-		//"minimap.foregroundOpacity": "#000000",
-		//"minimap.selectionHighlight": "#264f78",
-		//"minimap.selectionOccurrenceHighlight": "#676767",
-		//"minimap.unicodeHighlight": "#d18616",
-		//"minimap.warningHighlight": "#88bbff",
-		//"minimapGutter.addedBackground": "#587c0c",
-		//"minimapGutter.deletedBackground": "#94151b",
-		//"minimapGutter.modifiedBackground": "#0c7d9d",
-		//"minimapSlider.activeBackground": "#ffffff09",
-		//"minimapSlider.background": "#ffffff09",
-		//"minimapSlider.hoverBackground": "#ffffff09",
-		//"notebook.cellBorderColor": "#000000",
-		//"notebook.cellEditorBackground": "#111111",
-		//"notebook.cellInsertionIndicator": "#666666",
-		//"notebook.cellStatusBarItemHoverBackground": "#ffffff26",
-		//"notebook.cellToolbarSeparator": "#80808059",
-		//"notebook.focusedCellBorder": "#666666",
-		//"notebook.focusedEditorBorder": "#666666",
-		//"notebook.inactiveFocusedCellBorder": "#000000",
-		//"notebook.selectedCellBackground": "#000000",
-		//"notebook.selectedCellBorder": "#000000",
-		//"notebook.symbolHighlightBackground": "#ffffff0b",
-		//"notebookScrollbarSlider.activeBackground": "#ffffff12",
-		//"notebookScrollbarSlider.background": "#ffffff12",
-		//"notebookScrollbarSlider.hoverBackground": "#ffffff12",
-		//"notebookStatusErrorIcon.foreground": "#88bbff",
-		//"notebookStatusRunningIcon.foreground": "#ffffff",
-		//"notebookStatusSuccessIcon.foreground": "#89d185",
-		//"notificationCenterHeader.background": "#424242",
-		//"notificationLink.foreground": "#3794ff",
-		//"notifications.background": "#333333",
-		//"notifications.border": "#424242",
-		//"notifications.foreground": "#ffffff",
-		//"notificationsErrorIcon.foreground": "#ee5500",
-		//"notificationsInfoIcon.foreground": "#3794ff",
-		//"notificationsWarningIcon.foreground": "#88bbff",
-		//"panel.dropBorder": "#ffffff",
-		//"panelSection.border": "#111111",
-		//"panelSection.dropBackground": "#111111bb",
-		//"panelSectionHeader.background": "#80808033",
-		//"ports.iconRunningProcessForeground": "#88cc44",
-		//"problemsErrorIcon.foreground": "#ee5500",
-		//"problemsInfoIcon.foreground": "#3794ff",
-		//"problemsWarningIcon.foreground": "#88bbff",
-		//"quickInput.background": "#333333",
-		//"quickInput.foreground": "#ffffff",
-		//"quickInputList.focusBackground": "#111111",
-		//"quickInputList.focusForeground": "#ffffff",
-		//"quickInputTitle.background": "#ffffff1b",
-		//"sash.hoverBorder": "#666666",
-		//"scm.providerBorder": "#454545",
-		//"searchEditor.findMatchBackground": "#44446670",
-		//"searchEditor.textInputBorder": "#333333",
-		//"settings.checkboxBackground": "#222222",
-		//"settings.checkboxBorder": "#222222",
-		//"settings.checkboxForeground": "#888888",
-		//"settings.dropdownBackground": "#222222",
-		//"settings.dropdownBorder": "#222222",
-		//"settings.dropdownForeground": "#888888",
-		//"settings.dropdownListBorder": "#333333",
-		//"settings.focusedRowBackground": "#80808024",
-		//"settings.focusedRowBorder": "#ffffff1f",
-		//"settings.headerForeground": "#e7e7e7",
-		//"settings.modifiedItemIndicator": "#0c7d9d",
-		//"settings.numberInputBackground": "#333333",
-		//"settings.numberInputBorder": "#333333",
-		//"settings.numberInputForeground": "#ffffff",
-		//"settings.rowHoverBackground": "#80808012",
-		//"settings.textInputBackground": "#333333",
-		//"settings.textInputBorder": "#333333",
-		//"settings.textInputForeground": "#ffffff",
-		//"sideBar.dropBackground": "#111111bb",
-		//"sideBySideEditor.horizontalBorder": "#111111",
-		//"sideBySideEditor.verticalBorder": "#111111",
-		//"statusBar.debuggingBorder": "#111111",
-		//"statusBar.noFolderBorder": "#111111",
-		//"statusBarItem.compactHoverBackground": "#ffffff33",
-		//"statusBarItem.errorBackground": "#0066eb",
-		//"statusBarItem.errorForeground": "#ffffff",
-		//"statusBarItem.prominentForeground": "#666666",
-		//"statusBarItem.remoteBackground": "#88cc44",
-		//"statusBarItem.remoteForeground": "#222222",
-		//"statusBarItem.warningBackground": "#0066eb",
-		//"statusBarItem.warningForeground": "#ffffff",
-		//"symbolIcon.arrayForeground": "#ffffff",
-		//"symbolIcon.booleanForeground": "#ffffff",
-		//"symbolIcon.classForeground": "#ee9d28",
-		//"symbolIcon.colorForeground": "#ffffff",
-		//"symbolIcon.constantForeground": "#ffffff",
-		//"symbolIcon.constructorForeground": "#b180d7",
-		//"symbolIcon.enumeratorForeground": "#ee9d28",
-		//"symbolIcon.enumeratorMemberForeground": "#75beff",
-		//"symbolIcon.eventForeground": "#ee9d28",
-		//"symbolIcon.fieldForeground": "#75beff",
-		//"symbolIcon.fileForeground": "#ffffff",
-		//"symbolIcon.folderForeground": "#ffffff",
-		//"symbolIcon.functionForeground": "#b180d7",
-		//"symbolIcon.interfaceForeground": "#75beff",
-		//"symbolIcon.keyForeground": "#ffffff",
-		//"symbolIcon.keywordForeground": "#ffffff",
-		//"symbolIcon.methodForeground": "#b180d7",
-		//"symbolIcon.moduleForeground": "#ffffff",
-		//"symbolIcon.namespaceForeground": "#ffffff",
-		//"symbolIcon.nullForeground": "#ffffff",
-		//"symbolIcon.numberForeground": "#ffffff",
-		//"symbolIcon.objectForeground": "#ffffff",
-		//"symbolIcon.operatorForeground": "#ffffff",
-		//"symbolIcon.packageForeground": "#ffffff",
-		//"symbolIcon.propertyForeground": "#ffffff",
-		//"symbolIcon.referenceForeground": "#ffffff",
-		//"symbolIcon.snippetForeground": "#ffffff",
-		//"symbolIcon.stringForeground": "#ffffff",
-		//"symbolIcon.structForeground": "#ffffff",
-		//"symbolIcon.textForeground": "#ffffff",
-		//"symbolIcon.typeParameterForeground": "#ffffff",
-		//"symbolIcon.unitForeground": "#ffffff",
-		//"symbolIcon.variableForeground": "#75beff",
-		//"tab.activeForeground": "#ffffff",
-		//"tab.activeModifiedBorder": "#3399cc",
-		//"tab.inactiveModifiedBorder": "#3399cc80",
-		//"tab.lastPinnedBorder": "#585858",
-		//"tab.unfocusedActiveBackground": "#222222",
-		//"tab.unfocusedActiveModifiedBorder": "#3399cc80",
-		//"tab.unfocusedInactiveBackground": "#111111",
-		//"tab.unfocusedInactiveModifiedBorder": "#3399cc40",
-		//"terminal.border": "#111111",
-		//"terminal.dropBackground": "#111111bb",
-		//"terminal.selectionBackground": "#ffffff40",
-		//"testing.iconErrored": "#f14c4c",
-		//"testing.iconFailed": "#f14c4c",
-		//"testing.iconPassed": "#73c991",
-		//"testing.iconQueued": "#cca700",
-		//"testing.iconSkipped": "#848484",
-		//"testing.iconUnset": "#848484",
-		//"testing.message.error.decorationForeground": "#ee5500",
-		//"testing.message.error.lineBackground": "#ff000033",
-		//"testing.message.info.decorationForeground": "#ffffff80",
-		//"testing.peekBorder": "#ee5500",
-		//"testing.peekHeaderBackground": "#ee55001a",
-		//"testing.runAction": "#73c991",
-		//"textBlockQuote.background": "#7f7f7f1a",
-		//"textBlockQuote.border": "#007acc80",
-		//"textCodeBlock.background": "#0a0a0a66",
-		//"textLink.activeForeground": "#3794ff",
-		//"textLink.foreground": "#3794ff",
-		//"textPreformat.foreground": "#d7ba7d",
-		//"textSeparator.foreground": "#ffffff2e",
-		//"toolbar.activeBackground": "#63666750",
-		//"toolbar.hoverBackground": "#5a5d5e50",
-		//"tree.indentGuidesStroke": "#585858",
-		//"tree.tableColumnsBorder": "#cccccc20",
-		//"tree.tableOddRowsBackground": "#ffffff0a",
-		//"welcomePage.progress.background": "#333333",
-		//"welcomePage.progress.foreground": "#3794ff",
-		//"welcomePage.tileBackground": "#333333",
-		//"welcomePage.tileHoverBackground": "#3d3d3d",
-		//"welcomePage.tileShadow": "#111111",
-		//"activityBar.activeBackground": null,
-		//"activityBar.activeFocusBorder": null,
-		//"button.border": null,
-		//"contrastActiveBorder": null,
-		//"contrastBorder": null,
-		//"debugToolBar.border": null,
-		//"diffEditor.border": null,
-		//"dropdown.listBackground": null,
-		//"editor.findMatchBorder": null,
-		//"editor.findMatchHighlightBorder": null,
-		//"editor.findRangeHighlightBorder": null,
-		//"editor.rangeHighlightBorder": null,
-		//"editor.selectionForeground": null,
-		//"editor.selectionHighlightBorder": null,
-		//"editor.snippetFinalTabstopHighlightBackground": null,
-		//"editor.snippetTabstopHighlightBorder": null,
-		//"editor.symbolHighlightBorder": null,
-		//"editor.wordHighlightBorder": null,
-		//"editor.wordHighlightStrongBorder": null,
-		//"editorCursor.background": null,
-		//"editorError.background": null,
-		//"editorError.border": null,
-		//"editorGhostText.background": null,
-		//"editorGhostText.border": null,
-		//"editorGroup.emptyBackground": null,
-		//"editorGroup.focusedEmptyBorder": null,
-		//"editorGroupHeader.border": null,
-		//"editorHint.border": null,
-		//"editorInfo.background": null,
-		//"editorInfo.border": null,
-		//"editorOverviewRuler.background": null,
-		//"editorSuggestWidget.selectedIconForeground": null,
-		//"editorUnnecessaryCode.border": null,
-		//"editorWarning.background": null,
-		//"editorWidget.resizeBorder": null,
-		//"inputValidation.errorForeground": null,
-		//"inputValidation.infoForeground": null,
-		//"inputValidation.warningForeground": null,
-		//"list.activeSelectionIconForeground": null,
-		//"list.filterMatchBorder": null,
-		//"list.inactiveFocusBackground": null,
-		//"list.inactiveFocusOutline": null,
-		//"list.inactiveSelectionIconForeground": null,
-		//"menu.border": null,
-		//"menu.selectionBorder": null,
-		//"menubar.selectionBorder": null,
-		//"minimap.background": null,
-		//"notebook.cellHoverBackground": null,
-		//"notebook.focusedCellBackground": null,
-		//"notebook.inactiveSelectedCellBorder": null,
-		//"notebook.outputContainerBackgroundColor": null,
-		//"notebook.outputContainerBorderColor": null,
-		//"notificationCenter.border": null,
-		//"notificationCenterHeader.foreground": null,
-		//"notificationToast.border": null,
-		//"panelInput.border": null,
-		//"panelSectionHeader.border": null,
-		//"panelSectionHeader.foreground": null,
-		//"peekViewEditor.matchHighlightBorder": null,
-		//"quickInput.list.focusBackground": null,
-		//"quickInputList.focusIconForeground": null,
-		//"searchEditor.findMatchBorder": null,
-		//"sideBarSectionHeader.border": null,
-		//"tab.activeBorder": null,
-		//"tab.activeBorderTop": null,
-		//"tab.hoverBackground": null,
-		//"tab.hoverBorder": null,
-		//"tab.hoverForeground": null,
-		//"tab.unfocusedActiveBorderTop": null,
-		//"tab.unfocusedHoverBackground": null,
-		//"tab.unfocusedHoverBorder": null,
-		//"tab.unfocusedHoverForeground": null,
-		//"terminal.tab.activeBorder": null,
-		//"terminalCursor.background": null,
-		//"terminalCursor.foreground": null,
-		//"testing.message.info.lineBackground": null,
-		//"titleBar.border": null,
-		//"toolbar.hoverOutline": null,
-		//"welcomePage.background": null,
-		//"window.activeBorder": null,
-		//"window.inactiveBorder": null
-	},
-	"tokenColors": [
-		{
-			"scope": [
-				"variable.language.this"
-			],
-			"settings": {
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": "markup.bold",
-			"settings": {
-				"fontStyle": "bold"
-			}
-		},
-		{
-			"scope": [
-				"invalid",
-				"markup.italic",
-				"markup.quote"
-			],
-			"settings": {
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"scope": "markup.underline",
-			"settings": {
-				"fontStyle": "underline"
-			}
-		},
-		{
-			"scope": [
-				"source.js.jsx punctuation.section.embedded",
-				"entity.name.tag",
-				"string.other.link.description.title",
-				"support.constant",
-				"support.variable",
-				"support.type",
-				"variable.other.class",
-				"support.class.builtin.js",
-				"support.class.console.js",
-				"meta.property-value",
-				"variable.parameter.keyframe-list",
-				"meta.at-rule.keyframes entity.name.function",
-				"expression.embedded.vue punctuation.definition"
-			],
-			"settings": {
-				"foreground": "#BBA0FF",
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": [
-				"entity.other.attribute-name.pseudo-class.css",
-				"entity.name.type.object.console",
-				"variable.language",
-				"variable.parameter.function.language.special.self.python",
-				"storage.type",
-				"entity.other.attribute-name.pseudo-element.css"
-			],
-			"settings": {
-				"foreground": "#BBA0FF",
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"scope": [
-				"punctuation.definition.string.template"
-			],
-			"settings": {
-				"foreground": "#BBA0FF",
-				"fontStyle": "bold"
-			}
-		},
-		{
-			"scope": [
-				"entity.other.attribute-name.class.css",
-				"entity.other.attribute-name.parent-selector-suffix.css",
-				"entity.other.attribute-name.parent-selector-suffix.css punctuation.definition.entity.css",
-				"meta.definition.function",
-				"markup.underline.link",
-				"markup.inserted",
-				"meta.function-call",
-				"meta.instance.constructor",
-				"meta.attribute-with-value.class string",
-				"string.other.ref",
-				"string.other.restructuredtext.ref",
-				"variable.function",
-				"entity.name.type",
-				"entity.name.function",
-				"variable.other.object.property",
-				"punctuation.separator.key-value",
-				"meta.definition.function.js",
-				"support.class.component.js",
-				"entity.other.inherited-class",
-				"support.class",
-				"support.function.misc",
-				"support.function",
-				"entity.other.attribute-name.id.css",
-				"entity.other.attribute-name.id.css punctuation",
-				"entity.other.attribute-name.class.css punctuation",
-				"meta.function-call support.function.construct",
-				"entity.other.attribute-name"
-			],
-			"settings": {
-				"foreground": "#FFDD44"
-			}
-		},
-		{
-			"scope": "storage.type.function.arrow",
-			"settings": {
-				"foreground": "#FFDD44",
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": [
-				"entity.name.section",
-				"constant.numeric.line-number.match.find-in-files",
-				"markup.heading",
-				"markup.changed",
-				"meta.attribute-with-value.id string",
-				"string",
-				"punctuation.definition.string.begin",
-				"punctuation.definition.string.end",
-				"meta.attribute-selector"
-			],
-			"settings": {
-				"foreground": "#88CC44"
-			}
-		},
-		{
-			"scope": [
-				"keyword",
-				"keyword.control",
-				"constant",
-				"constant.numeric",
-				"constant.language",
-				"constant.other.property",
-				"constant.character.escape",
-				"comment keyword.codetag.notation",
-				"keyword.other.template.begin",
-				"keyword.other.template.end",
-				"markup.raw",
-				"markup.deleted",
-				"meta.property-list.css variable.other",
-				"entity.name.constant.preprocessor",
-				"meta.preprocessor",
-				"punctuation.section.embedded",
-				"punctuation.template-string.element.begin",
-				"punctuation.template-string.element.end",
-				"string.quoted.template punctuation.definition.string.begin",
-				"string.quoted.template punctuation.definition.string.end",
-				"meta.paragraph.markdown meta.dummy.line-break",
-				"meta.paragraph.markdown meta.hard-line-break.markdown",
-				"storage",
-				"storage.class.restructuredtext.ref",
-				"string.other.link.title",
-				"string.other.link.description",
-				"string.regexp punctuation.definition.string.begin",
-				"string.regexp punctuation.definition.string.end",
-				"variable.language.arguments",
-				"storage.modifier",
-				"keyword.operator.new",
-				"keyword.operator",
-				"keyword.operator.spread",
-				"punctuation.section.embedded.end.php source.php",
-				"support.function.construct",
-				"meta.at-rule.keyframes",
-				"meta.at-rule.keyframes entity.other.attribute-name"
-			],
-			"settings": {
-				"foreground": "#88BBFF"
-			}
-		},
-		{
-			"scope": [
-				"variable.other.substitution"
-			],
-			"settings": {
-				"foreground": "#88BBFF",
-				"fontStyle": "bold"
-			}
-		},
-		{
-			"scope": [
-				"meta.function-call meta.function-call.arguments",
-				"meta.function-call meta.arguments",
-				"meta.function-call meta.group",
-				"source.json meta.structure.dictionary",
-				"meta.object.member",
-				"punctuation.definition.group",
-				"string.unquoted.label",
-				"variable.other.member",
-				"entity.name.class",
-				"entity.name.namespace",
-				"constant.other",
-				"variable",
-				"variable.other",
-				"variable.other.constant.js",
-				"text.find-in-files",
-				"source",
-				"entity.name.type.module",
-				"source.sql support.function",
-				"support.other.namespace.php"
-			],
-			"settings": {
-				"foreground": "#FFFFFF",
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": [
-				"variable.parameter",
-				"parameters variable.function"
-			],
-			"settings": {
-				"foreground": "#FFFFFF",
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"scope": [
-				"variable.other.property",
-				"support.variable.property",
-				"punctuation.separator.key-value",
-				"meta.object-literal.key",
-				"variable.other.object.property",
-				"variable.object.property",
-				"text.html.basic",
-				"text.html.vue-html",
-				"text.html.php",
-				"text.html.derivative",
-				"punctuation.definition.variable",
-				"punctuation.definition.keyword.scss",
-				"meta.jsx.children.js",
-				"meta.tag.attributes keyword.operator.assignment",
-				"support.type.vendored.property-name.css",
-				"support.type.property-name.json",
-				"variable.other.constant.property"
-			],
-			"settings": {
-				"foreground": "#BBBBCC"
-			}
-		},
-		{
-			"scope": "meta.property-name support.type",
-			"settings": {
-				"foreground": "#BBBBCC",
-				"fontStyle": ""
-			}
-		},
-		{
-			"scope": [
-				"keyword.other.substitution",
-				"keyword.operator.heading.restructuredtext",
-				"keyword.operator.table.row.restructuredtext",
-				"keyword.operator.table.data.restructuredtext",
-				"punctuation",
-				"markup.ignored",
-				"markup.untracked",
-				"meta.brace.round",
-				"meta.brace.square",
-				"meta.brace.curly",
-				"meta.delimiter.comma.js",
-				"meta.function-call.without-arguments.js",
-				"meta.function-call.method.without-arguments.js",
-				"source.scss",
-				"string source punctuation.section.embedded",
-				"punctuation.definition.tag.begin source",
-				"source.php"
-			],
-			"settings": {
-				"foreground": "#9999AA"
-			}
-		},
-		{
-			"scope": [
-				"comment",
-				"comment punctuation"
-			],
-			"settings": {
-				"foreground": "#888899",
-				"fontStyle": "italic"
-			}
-		},
-		{
-			"scope": "token.info-token",
-			"settings": {
-				"foreground": "#6796E6"
-			}
-		},
-		{
-			"scope": "token.warn-token",
-			"settings": {
-				"foreground": "#CD9731"
-			}
-		},
-		{
-			"scope": "token.error-token",
-			"settings": {
-				"foreground": "#F44747"
-			}
-		},
-		{
-			"scope": "token.debug-token",
-			"settings": {
-				"foreground": "#B267E6"
-			}
-		}
-	]
-}
@@ -1,16 +0,0 @@
-{
-  "files.associations": {
-    "utility": "cpp",
-    "initializer_list": "cpp",
-    "list": "cpp",
-    "type_traits": "cpp",
-    "vector": "cpp",
-    "xhash": "cpp",
-    "xstring": "cpp",
-    "system_error": "cpp",
-    "array": "cpp",
-    "string_view": "cpp",
-    "xutility": "cpp",
-    "*.ipp": "cpp"
-  }
-}
@@ -1,41 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Touch CMakeLists.txt",
-      "type": "process",
-      "promptOnClose": false,
-      "isBackground": true,
-      "command": "touch",
-      "args": ["${workspaceRoot}/CMakeLists.txt"],
-      "problemMatcher": [],
-      "presentation": {
-        "echo": false,
-        "revealProblems": "onProblem",
-        "reveal": "silent",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": false,
-        "clear": true
-      }
-    }
-  ],
-  "inputs": [
-    {
-      "id": "build_configuration",
-      "type": "pickString",
-      "default": "debug",
-      "description": "Configuration:",
-      "options": ["debug", "release"]
-    },
-    {
-      "id": "compiler",
-      "type": "pickString",
-      "default": "gcc",
-      "description": "Compiler",
-      "options": ["clang", "gcc"]
-    }
-  ]
-}
@@ -1,41 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Spark Client",
-      "type": "coreclr",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/Debug/bin/net6.0-windows/Spark.exe",
-      "cwd": "${workspaceFolder}/build/Debug/bin/net6.0-windows",
-      "enableStepFiltering": false,
-      "console": "internalConsole",
-      "stopAtEntry": false
-    },
-    {
-      "name": "Spark Test",
-      "type": "coreclr",
-      "request": "launch",
-      "program": "${workspaceFolder}/build/Debug/bin/net6.0/sparkcmd.exe",
-      "args": ["test", "${input:test}"],
-      "cwd": "${workspaceFolder}/build/Debug/bin/net6.0-windows",
-      "enableStepFiltering": false,
-      "console": "internalConsole",
-      "stopAtEntry": false
-    },
-    {
-      "name": "Attach (.NET Core)",
-      "type": "coreclr",
-      "request": "attach"
-    }
-  ],
-  "inputs": [
-    {
-      "id": "test",
-      "description": "The test(s) to run",
-      "type": "promptString"
-    }
-  ]
-}
@@ -1,37 +0,0 @@
-{
-  "cmake.configureOnOpen": false,
-  "workbench.colorTheme": "Default Dark+",
-  "C_Cpp.intelliSenseEngine": "Disabled",
-  "files.associations": {
-    "*.js": "javascript",
-    "*.conf": "jsonc",
-    "array": "cpp",
-    "xtree": "cpp",
-    "chrono": "cpp",
-    "*.ipp": "cpp",
-    "optional": "cpp",
-    "regex": "cpp",
-    "system_error": "cpp",
-    "format": "cpp",
-    "future": "cpp",
-    "istream": "cpp",
-    "memory": "cpp",
-    "tuple": "cpp",
-    "type_traits": "cpp",
-    "utility": "cpp",
-    "variant": "cpp",
-    "xlocmes": "cpp",
-    "xlocmon": "cpp",
-    "xlocnum": "cpp",
-    "xloctime": "cpp",
-    "xutility": "cpp",
-    "xstring": "cpp",
-    "string": "cpp",
-    "cstdint": "cpp"
-  },
-
-  "files.exclude": {
-    "**/.g.cs": true,
-    "**/.g.i.cs": true
-  }
-}
@@ -1,44 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Build Spark Client",
-      "type": "process",
-      "command": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\Common7\\Tools\\VsDevCmd.bat",
-      "args": [
-        "-arch=x64",
-        "-host_arch=x64",
-        "&&",
-        "${workspaceRoot}\\tools\\buildspark.cmd"
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "new",
-        "showReuseMessage": false,
-        "clear": false,
-        "close": false
-      }
-    },
-
-    {
-      "label": "Run Spark Client",
-      "type": "process",
-      "command": "${workspaceRoot}\\build\\Debug\\bin\\net6.0-windows\\Spark.exe",
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": false
-      },
-      "problemMatcher": []
-    }
-  ]
-}
@@ -1,107 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/src",
-                "${workspaceRoot}/externals/linux/include"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}",
-                    "${workspaceFolder}/src",
-                    "${workspaceRoot}/externals/linux/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "compileCommands": "${workspaceFolder}/build/ninja_debug/compile_commands.json"
-        },
-        {
-            "name": "Windows",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}/src",
-                "${workspaceRoot}/build/src",
-                "${workspaceRoot}/build/ninja_debug/src",
-                "${workspaceRoot}/externals/windows/include",
-                "${workspaceRoot}/externals/linux/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                "${workspaceRoot}/externals/windows/vscode/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${workspaceRoot}/src",
-                    "${workspaceRoot}/build/src",
-                    "${workspaceRoot}/build/ninja_debug/src",
-                    "${workspaceRoot}/externals/windows/include",
-                    "${workspaceRoot}/externals/linux/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                    "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                    "${workspaceRoot}/externals/windows/vscode/usr/include/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "WindowsQuick",
-            "intelliSenseMode": "clang-x64",
-            "includePath": [
-                "${workspaceRoot}/src",
-                "${workspaceRoot}/build/src",
-                "${workspaceRoot}/build/ninja_debug/src",
-                "${workspaceRoot}/externals/windows/include",
-                "${workspaceRoot}/externals/linux/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu/c++/6",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/c++/6/backward",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/local/include",
-                "${workspaceRoot}/externals/windows/vscode/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed",
-                "${workspaceRoot}/externals/windows/vscode/usr/include/x86_64-linux-gnu",
-                "${workspaceRoot}/externals/windows/vscode/usr/include"
-            ],
-            "defines": [
-                "__linux__",
-                "__x86_64__"
-            ],
-            "browse": {
-                "path": [
-                    "${workspaceRoot}/src"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        }
-    ],
-    "version": 4
-}
@@ -1,402 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Spark Local",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/gcc/debug/server/sparkd",
-            "args": [
-                "run",
-                "test",
-                "-a",
-                "OutrightVanillaOrder"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceRoot}/build/gcc/debug/server/",
-            "environment": [
-                {
-                    "name": "TZ",
-                    "value": "America/Chicago"
-                }
-            ],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-        {
-            "name": "SparkVM Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-            "args": [
-                "test",
-                "-a",
-                "[ilink3]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/gcc/debug/server/",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "preLaunchTask": "",
-            "logging": {
-                "engineLogging": false
-            },
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "enable pretty-printer",
-                    "ignoreFailures": true
-                },
-                {
-                    "description": "Skip STL",
-                    "text": "skip -gfi /usr/include/c++/7/bits/*.h",
-                    "ignoreFailures": true
-                },
-                {
-                    "description": "LD LIBRARY",
-                    "text": "set env LD_LIBRARY_PATH=.",
-                    "ignoreFailures": false
-                }
-            ],
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "(gdb) Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/gcc/debug/server/sparkd/sparkd",
-            "args": [
-                "run"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceRoot}/build/ninja_debug/src/server/sparkd",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        },
-        {
-            "name": "Client Launch",
-            "type": "clr",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/Debug/bin/net471/spark.exe",
-            "args": [],
-            "cwd": "${workspaceRoot}",
-            "stopAtEntry": false,
-            "externalConsole": true,
-            "requireExactSource": false
-        },
-        {
-            "name": "SDK Launch",
-            "type": "clr",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/Debug/bin/net471/spark_sdk.exe",
-            "args": [
-                "md",
-                "GLBX",
-                "Future",
-                "CL",
-                "CLZ9",
-                "--user=bts",
-                "--pass="
-            ],
-            "cwd": "${workspaceRoot}",
-            "stopAtEntry": false,
-            "externalConsole": true,
-            "requireExactSource": false
-        },
-        {
-            "name": "Excel Launch",
-            "type": "clr",
-            "request": "launch",
-            "program": "C:/Program Files/Microsoft Office/Office14/EXCEL.EXE",
-            "args": [
-                "${workspaceRoot}/build/Debug/bin/net471/spark_excel-addin64-packed.xll"
-            ],
-            "cwd": "${workspaceRoot}",
-            "stopAtEntry": false,
-            "externalConsole": true,
-            "requireExactSource": false
-        },
-        {
-            "name": "Client Tests",
-            "type": "clr",
-            "request": "launch",
-            "program": "${workspaceRoot}/build/Debug/bin/net471/sparkcmd.exe",
-            "args": [
-                "test",
-                "ApiUpdateTests"
-            ],
-            "cwd": "${workspaceRoot}",
-            "stopAtEntry": false,
-            "externalConsole": true,
-            "requireExactSource": false
-        },
-        {
-            "name": "Client Attach",
-            "type": "clr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        },
-        {
-            "name": "Spreader Tests",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-            "args": [
-                "test",
-                "[spreader]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/gcc/debug/server/",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "preLaunchTask": "",
-            "logging": {
-                "engineLogging": false
-            },
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "enable pretty-printer",
-                    "ignoreFailures": true
-                }
-            ],
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "Admin Service Tests",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
-            "args": [
-                "test",
-                "[admin_service]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "preLaunchTask": "",
-            "logging": {
-                "engineLogging": false
-            },
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "enable pretty-printer",
-                    "ignoreFailures": true
-                }
-            ],
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "Limiter Tests",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
-            "args": [
-                "test",
-                "[limiter]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/ninja_debug/src/server/sparkd/",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "preLaunchTask": "",
-            "logging": {
-                "engineLogging": false
-            },
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "enable pretty-printer",
-                    "ignoreFailures": true
-                }
-            ],
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "MD Tests",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "/home/bts/spark/build/gcc/debug/server/sparkd",
-            "args": [
-                "test",
-                "[algo]"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/gcc/debug/server/",
-            "environment": [],
-            "externalConsole": true,
-            "MIMode": "gdb",
-            "preLaunchTask": "",
-            "logging": {
-                "engineLogging": false
-            },
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                },
-                {
-                    "description": "Skip STL",
-                    "text": "skip -gfi /usr/include/c++/7/bits/*.h",
-                    "ignoreFailures": true
-                }
-            ],
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "SparkVM attach",
-            "type": "cppdbg",
-            "request": "attach",
-            "program": "/home/bts/spark/build/ninja_debug/src/server/sparkd/sparkd",
-            "processId": "${command:pickRemoteProcess}",
-            "MIMode": "gdb",
-            "pipeTransport": {
-                "pipeCwd": "${workspaceRoot}",
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/usr/bin/gdb"
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            }
-        },
-        {
-            "name": "Python",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "${workspaceRoot}",
-            "env": {},
-            "envFile": "${workspaceRoot}/.env",
-            "args": [
-                "DEBUG"
-            ],
-            "debugOptions": [
-                "WaitOnAbnormalExit",
-                "WaitOnNormalExit",
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": ".NET Core Remote Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickRemoteProcess}",
-            "pipeTransport": {
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/home/bts/vsdbg/vsdbg",
-                "pipeCwd": "${workspaceRoot}",
-                "quoteArgs": true
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            },
-            "justMyCode": true
-        },
-        {
-            "name": ".NET Core Remote Launch",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "/usr/bin/dotnet",
-            "args": [
-                "sparkcmd.dll",
-                "test",
-                "test_join_create_and_takeout_market"
-            ],
-            "stopAtEntry": false,
-            "cwd": "/home/bts/spark/build/gcc/debug/server",
-            "pipeTransport": {
-                "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe",
-                "pipeArgs": [
-                    "bts@sparkvm"
-                ],
-                "debuggerPath": "/home/bts/vsdbg/vsdbg",
-                "pipeCwd": "${workspaceRoot}",
-                "quoteArgs": true
-            },
-            "sourceFileMap": {
-                "/home/bts/spark/": "${workspaceRoot}"
-            },
-            "justMyCode": false
-        }
-    ]
-}
@@ -1,16 +0,0 @@
-{
-"files.associations": {
-        "utility": "cpp",
-        "initializer_list": "cpp",
-        "list": "cpp",
-        "type_traits": "cpp",
-        "vector": "cpp",
-        "xhash": "cpp",
-        "xstring": "cpp",
-    "system_error": "cpp",
-    "array": "cpp",
-    "string_view": "cpp"
-        "xutility": "cpp",
-        "*.ipp": "cpp"
-}
-}
@@ -1,63 +0,0 @@
-{ 
-   // See https://go.microsoft.com/fwlink/?LinkId=733558
-   // for the documentation about the tasks.json format
-   "version": "2.0.0",
-   "tasks": [
-      {
-         "label": "client_build",
-         "type": "shell",
-         "command": ".\\tools\\buildspark.cmd",
-         "problemMatcher":"$msCompile",
-         "presentation": {
-            "echo": true,
-            "reveal": "always",
-            "focus": false,
-            "panel": "shared"
-         },
-         "group": "build"
-      },
-      {
-         "label": "server_build",
-         "type": "shell",
-         "command": ".\\tools\\buildsparkd.cmd",
-         "problemMatcher": {
-            "base": "$gcc",
-            "owner": "cpp",
-            "fileLocation": [
-               "relative",
-               "${workspaceFolder}"
-            ],
-            "pattern": {
-               "regexp": "(.?)(home)(.?)(bts)(.?)(spark)(.?)(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)",
-               "file": 8,
-               "line": 9,
-               "column": 10,
-               "severity": 11,
-               "message": 12
-            }
-         },
-         "presentation": {
-            "echo": true,
-            "reveal": "always",
-            "focus": false,
-            "panel": "new"
-         },
-         "group": {
-            "kind": "build",
-            "isDefault": true
-         }
-      },
-      {
-         "label": "linux build (Debug)",
-         "type": "shell",
-         "command": "cd build/ninja_debug; time ninja",
-         "group": {
-            "kind": "build",
-            "isDefault": true
-         },
-         "problemMatcher": [
-            "$gcc"
-         ]
-      }
-   ]
-} 
@@ -1,6 +1,6 @@
 +++
 title="Client API"
-redirect_to = "client/getting-started/overview/"
+template="client.html"
 sort_by="weight"
 +++

@@ -1,5 +1,6 @@
 +++
 title="Getting Started"
+template="client.html"
 sort_by="weight"
 weight = 1
 +++ 
@@ -1,25 +1,9 @@
 +++
 title = "Install Prerequisites"
-weight = 10
+template="client.html"
+weight = 1
 +++

-# C#/.NET
-
-We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+.  Simply add a reference to the [Spark Nuget package](https://www.nuget.org/packages/spark_sdk/) to get started.
-
-```
-dotnet new console -lang c#
-dotnet add package spark_sdk
-dotnet build
-```
-
-# C++
-
-The easiest way to get started with C++ is to use the Spark Server SDK to develop your application.  Follow the instructions to [download and install the Spark Server SDK](/server/getting-started/install) and open the client_sdk sample project. If you want to run your C++ Client SDK application on Windows [contact us](mailto://api@bluetradesys.com) to get the required headers and binaries.
-
-# JavaScript
-
-We use JavaScript internally with the Spark Client API over a websocket connection but the documentation and packaging isn't ready yet.  If this is something you're interested in get in touch with us at [api@bluetradesys.com](mailto:api@bluetradesys.com).
-
-
+## Coming Soon

+* Install .net core
@@ -1,31 +0,0 @@
-+++
-title = "Overview"
-weight = 1
-+++
-
-The Spark Client SDK is a high level command and control API which can be used to build scripts or integrate Spark into your existing ecosystem.  The API is divided into several independent **"services"** responsible for different aspects of the system.  A Service can define both [remote procedure call (RPC)](/client/getting-started/services#rpc) and incremental [streaming](/client/getting-started/services#streams) data.
-
-The [Spark Desktop](https://www.bluetradingsystems.com/bts-spark/) is built on top of this API so you can be assured that it is complete and well tested.
-
-Spark uses [Google Protocol Buffers](https://developers.google.com/protocol-buffers/) as an interface definition language similar to [GRPC](https://grpc.io) but backed by our custom high-performance TCP protocol.  We currently support C#/.NET and C++ <!--and Javascript--> but the architecture is designed for easy extension so contact us about your specific business needs.
-
-## Orders
-
-Use the [OrderService](/client/services/orderservice) to send and manage orders including native exchange orders, spreader orders, and custom Algo orders created using the [Spark Server SDK](https://api.bluetradesys.com/server/).
-
-## Spreader
-
-Use the [SyntheticSecurityService](/client/services/syntheticsecurityservice) to create and manage synthetic spreads.  Once created these spreads show up in the security and market data feeds just like exchange listed spreads.
-
-## Position
-
-Use the [PositionService](/client/services/positionservice) to get your position and P&L reports or add fills manually to keep the Spark system up to date with an external system.
-
-## Administration
-
-Use the [AdminService](/client/services/adminservice) to manage users and control limits.
-
-## Market Data
-
-For .NET subscribe to market data though the high level MarketDataClient interface.  From C++ or JavaScript use the MarketDataRelay service directly.
-
@@ -1,140 +0,0 @@
-+++
-title = "Services"
-weight = 20
-+++
-
-The Spark Client SDK uses [Google Protocol Buffers](https://developers.google.com/protocol-buffers/) to define the interface for each service in a language independent manner.  Services have both functions which return a single result and streams of data which return values continuously while subscribed.  This page describes the mapping from the Protocol Buffer definition to the concrete definition in each supported language.
-
-# ServiceContext
-
-To connect your client to the Spark Server you need to get or create a `ServiceContext` instance.  A `ServiceContext` represents a connection to the Spark Server and a background thread for handling messages on that connection.  Generally there should be a single `ServiceContext` per process.  All of the methods on the `ServiceContext` are safe thread safe.
-
-Construct a ServiceContext by calling the default constructor.  The ServiceContext will find the Spark Server by loading the server configuration over an HTTP connection.  To determine the URL it will search the following locations and use the first one that is present.  
-
-* A command line argument `-configserver <url>`
-* An environment variable `BTSCONFIG`
-* `%APPDATA%/bts/conf/spark.conf` (Windows)
-* /sparkdata/conf/spark.conf (Linux)
-* $HOME/sparkdata/conf/spark.conf (Linux)
-
-If your application is running on a system with the BTS Client installed this will probably work without any further configuration.  If you plan to run your client application on a separate machine we recommend setting the `BTSCONFIG` environment variable.
-
-<div class="info">
-<i class="fa fa-lightbulb-o fa-fw" aria-hidden="true"></i>
-If you are using the Spark Server SDK to run a local copy of the Spark server set <p><strong>BTSCONFIG = http://localhost:9000/config/</strong></p>
-</div>
-
-To get a proxy for a given service call ServiceContext.locate&lt;T>("qualifier") where T is the type of the service and "qualifier" is an optional qualifier used to disambiguate between 2 instances of the same service.  The locate call cannot fail but it may return a disconnected proxy.  When you make a call on the proxy you should check the call result to see if the method call succeeded.
-
-# RPC
-
-Here is the OrderService reduced to a single method definition. A RPC method always takes exactly 1 argument and returns 1 value.  In this example the `create_order` call takes a `Create` instance and returns a `Response`.  
-
-```C
-service OrderService { 
-  rpc create_order(Create) returns (Response);
-  ...
-}
-```
-
-The `Create` and `Response` types are also defined as protocol buffer messages.  Each field can either be a primitive type another message or a list or map.
-
-```C
-message Create {
-  OrderDefinition new_order = 1;
-  double price = 2;
-  uint32 quantity = 3;
-}
-
-message Response {
-    uint32 order_key = 1; 
-    OrderError error_code = 2; 
-    string msg = 3;
-}
-```
-
-Each RPC call generates both synchronous (blocking) and asynchronous variants. In C# the asynchronous calls have the `_async` suffix and return a `Task`.  In C++ the call is overloaded to either return a value synchronously or accept a callback function to be called on the ServiceContext thread when the call completes. <!-- In Javascript only async methods returning a Promise are generated because it never makes sense to make a blocking call in the browser. -->
-
-To call the resulting service locate a proxy using the [ServiceContext](#servicecontext) and then call `cancel_order` or `cancel_order_async`.  If you are calling the Spark API from a GUI application you should always prefer the `_async` version of the calls.
-
-
-### C# example
-```c#
-var ctx = new ServiceContext();
-var orders = ctx.locate<OrderService>();
-var response = 
-  await orders.create_order_async(
-    new Create { price = 2.25, quantity = 42 });
-if (response.success) {
-  Console.WriteLine($"success: {response.value}");
-}
-else {
-  Console.WriteLine($"Error: {response.error_message}");
-}
-```
-### C++ example
-```cpp
-auto ctx = ServiceContext{};
-auto orders = ctx.locate<OrderService>();
-Create c;
-c.set_price(2.25);
-c.set_quantity(42);
-// Instead of providing an _async method C++ uses overloading.
-// To make a syncronous call simply omit the callback
-orders.create_order(c, [=](const Result<Response>& response) {
-  if(response.success()) {
-    std::cout << "success.";
-  }
-  else {
-    std::cout << "error: " << response.error_message();
-  }
-});
-```
-
-# Streams
-
-Streams allow you to subscribe to live updating data. Each stream represents a changing collection of protocol buffer objects.  Similar to a database row each item has an `id` which uniquely identifies it within the collection.  Updates from the Spark server can add, remove or replace entries in the collection.  Since only the changed items are sent over the wire the stream can remain responsive even when it represents a large collection.
-
-Streams are implemented using the language bindings for [ReativeX](http://reactivex.io/) which provide utility functions to drill down to the specific data your application needs. In C# we provide both mutable and immutable versions of the generated data types (C++ users can rely on `const`).
-
-When defined in a proto file streams use the `stream` keyword on the result type.
-```C
-service OrderService { 
-  ...
-  rpc fills (FillsSub) returns (stream Fill);
-}
-```
-
-### C# example
-```c#
-  var sc = new ServiceContext();
-  var orders = sc.locate<OrderService>();
-  var fills_observable = orders.subscribei_fills();
-  var unsub = fills_observable.Subscribe(update => {
-    Console.WriteLine(
-        "Added {0} items, Removed {1} items, Updated {2} items.  Total items {3}", 
-        update.added.Count(), 
-        update.removed.Count(), 
-        update.changes.Count(), 
-        update.all.Count());
-  });
-
-  Thread.Sleep(TimeSpan.FromMinutes(5));
-  unsub.Dispose();
-```
-### C++ Example
-```cpp
-#include "lib/api/public/ServiceContext.h"
-#include "lib/api/services/OrderService.client.pb.h"
-using namespace bts::api;
-ServiceContext ctx;
-auto orders = ctx.locate<orderman::OrderService>();
-auto unsub = orders.subscribe_fills().subscribe([](const auto& update) {
-  std::cout 
-    << "Added " << update.added().size() << " items, "
-    << "Removed " << update.removed().size() << " items, "
-    << "Updated " << update.updated().size() << " items, "
-    << "Total items " << update.all().size() << std::endl;
-});
-std::this_thread::sleep_for(std::chrono::minutes(5));
-```
@@ -1,6 +0,0 @@
-+++
-title="Samples"
-sort_by="weight"
-weight = 30
-+++ 
-
@@ -1,3 +0,0 @@
-+++
-title = "AdminService"
-+++
@@ -1,3 +0,0 @@
-+++
-title = "OrderService"
-+++
@@ -1,3 +0,0 @@
-+++
-title = "PositionService"
-+++
@@ -1,3 +0,0 @@
-+++
-title = "SyntheticService"
-+++
@@ -1,6 +0,0 @@
-+++
-title="Services"
-#sort_by="weight"
-weight = 10
-+++ 
-
@@ -1,51 +0,0 @@
-+++
-title = "Market Data"
-+++
-
-
-Use the MarketDataService to subscribe enumerate all available securities.
-
-```cs
-using System;
-using System.Threading;
-using bts.api;
-using bts.api.core;
-
-namespace sample {
-   class Program {
-      static void Main(string[] args) {
-         using var context = new ServiceContext();
-         var md = context.locate<MarketDataService>();
-         using var sub = md.subscribe_securities().Subscribe(update => {
-            foreach (var security in update.added) {
-               Console.WriteLine($"Added security {security.Id}: {security.Symbol}");
-            }
-         });
-
-         Thread.Sleep(TimeSpan.FromMinutes(5));
-      }
-   }
-}
-```
-
-```cpp
-#include "lib/api/public/ServiceContext.h"
-#include "spark/lib/domain_model/Security.h"
-#include "lib/api/services/MarketDataService.client.pb.h"
-#include <thread>
-
-using namespace bts::api;
-
-int main(int argc, char** argv) {
-   ServiceContext ctx;
-   auto md_service = ctx.locate<bts::api::MarketDataService>();
-   auto sub = md_service.subscribe_securities().subscribe([](const auto& update) {
-      for (const auto& s : update.added()) {
-         std::cout << "Added security: " << s->id() << ": " << s->symbol() << std::endl;
-      }
-   });
-
-   std::this_thread::sleep_for(std::chrono::minutes(5));
-   return 0;
-}
-```
@@ -1,5 +1,6 @@
 +++
 title="Algo API"
+template="documentation.html"
 redirect_to = "server/getting-started/overview/"
 sort_by="weight"
 +++ 
@@ -1,5 +1,6 @@
 +++
 title="Getting Started"
+template="documentation.html"
 sort_by="weight"
 weight = 1
 +++ 
@@ -71,12 +71,12 @@ The first step is to start the spark_sdk Docker container with the examples dire

 Windows Command Prompt:
 {% clipable() %}
-docker run --rm -it -v %CD%:/examples -u bts -w /examples --shm-size 2048m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
+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 2048m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash
+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
@@ -5,7 +5,7 @@ weight = 2

 ## Request Access 🔑

-To start using the Server SDK you will need to request access though our sales department.  Please email <a href="mailto:api@bluetradesys.com">api@bluetradesys.com</a> or call <a href="tel:919-913-0850">(919) 913-0850</a> and we will provide download credentials.
+To start using the Server SDK you will need to request access though our sales department.  Please email <a href="mailto:info@bluetradesys.com">info@bluetradesys.com</a> or call <a href="tel:919-913-0850">(919) 913-0850</a> and we will provide download credentials.

 ## Download

@@ -68,21 +68,12 @@ To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://

 To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.

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

+``` -->

@@ -1,5 +1,6 @@
 +++
 title="Reference"
+template="documentation.html"
 sort_by="weight"
 weight = 2
 +++ 
@@ -6,9 +6,3 @@ 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.
-
-## I don't see the header files in the .zip file. Where are they?
-
-The SDK headers are baked into the docker image along with the build tools. Once you've loaded the image with `docker load < spark_sdk.img` you can run this command to copy them out to your local file system `docker run --rm -it -v $PWD:/out spark_sdk /bin/tar -cvf /out/headers.tar /sdk/include`  This will copy the headers to the current directory in headers.tar.  We still recommend doing the actual build inside the docker environment but having a copy of the headers can be useful for setting up your development environment.
-
-
@@ -1,5 +1,6 @@
 +++
 title="Samples"
+template="documentation.html"
 sort_by="weight"
 weight = 3
 +++ 
@@ -0,0 +1,31 @@
+{% extends "index.html" %}
+
+{% block extra_nav_class %}{% endblock extra_nav_class %}
+{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
+
+{% block content %}
+{% set section = get_section(path="client/_index.md") %}
+<div class="documentation">
+    <aside class="documentation__sidebar">
+        <ul>
+        {% for p in section.subsections %}
+            {% set subsection = get_section(path=p) %}
+            <li>
+                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
+                <ul>
+                    {% for page in subsection.pages %}
+                        <li class="{% if current_path == page.path %}active{% endif %}">
+                            <a href="{{page.permalink}}">{{page.title}}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </li>
+        {% endfor %}
+        </ul>
+    </aside>
+    <div class="documentation__content">
+        {% block doc_content %}
+        {% endblock doc_content %}
+    </div>
+</div>
+{% endblock content %}
@@ -0,0 +1,36 @@
+{% extends "index.html" %}
+
+{% block extra_nav_class %}{% endblock extra_nav_class %}
+{% block extra_content_class %}content--reversed{% endblock extra_content_class %}
+
+{% block content %}
+{%if page.extra.section %}
+{% set section = get_section(path="{{page.extra.section}}/_index.md") %}
+{% else %}
+{% set section = get_section(path="server/_index.md") %}
+{% endif %}
+<div class="documentation">
+    <aside class="documentation__sidebar">
+        <ul>
+        {% for p in section.subsections %}
+            {% set subsection = get_section(path=p) %}
+            <li>
+                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
+                <ul>
+                    {% for page in subsection.pages %}
+                        <li class="{% if current_path == page.path %}active{% endif %}">
+                            <a href="{{page.permalink}}">{{page.title}}</a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </li>
+        {% endfor %}
+        </ul>
+    </aside>
+    <div class="documentation__content">
+        {% block doc_content %}
+        {% endblock doc_content %}
+        {% block next_link %} {% endblock next_link %}
+    </div>
+</div>
+{% endblock content %}
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-us">
+<html lang="en-gb">
    <head>
        <meta charset="UTF-8">
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,7 +14,6 @@
        <link rel="stylesheet" href="{{ get_url(path="site.css") }}"/>
        <link rel="icon" href="{{ get_url(path="favicon.ico") }}">
        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-        <script> dataLayer = [{ 'visitorType': 'geek' }]; </script>
    </head>
    <body>

@@ -37,13 +36,13 @@
            </nav>
        </header>

-        <div class="content content--reversed">
+        <div class="content {% block extra_content_class %}{% endblock extra_content_class %}">
            {% block content %}
                <div class="hero">
                    <h1>Spark SDK</h1>
                    <p class="hero__tagline">
                        Spark consists of a client UI 
-                        (<a href="https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen">Spark Client</a>), 
+                        (<a class="white" href="https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen">Spark Client</a>), 
                        a high-performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols.
                        Use the Spark SDK to extend Spark Server with your custom Algos, then use the Client SDK to launch and control them.
                    </p>
@@ -65,7 +64,7 @@
                            <a href="{{ get_url(path="@/server/_index.md") }}" class="button">Get started</a>
                        </div>

-                        <div class="selling-point">
+                        <div class="selling-point disabled">
                            <h2>
                                Client SDK
                                <i class="fa fa-gamepad" aria-hidden="true"></i>
@@ -73,9 +72,19 @@
                            <p>
                                The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
                            </p>
-                            <a href="{{ get_url(path="@/client/_index.md") }}" class="button">Get started</a>
+                            <a href="" class="button" disabled>Get started</a>
                        </div>
                        
+                        <!-- <div class="selling-point disabled">
+                            <h2>
+                                Microsoft Excel
+                                <i class="fa fa-table" aria-hidden="true"></i>
+                            </h2>
+                            <p>
+                                More of your business is built on excel than probably should be. Continue this worrying trend with the Spark Excel API.
+                            </p>
+                            <a href="" class="button" disabled>Get started</a>
+                        </div> -->
                    </div>
                </div>

@@ -85,15 +94,6 @@
            © Blue Trading Systems
        </footer>

-        <script>
-            if (location.hostname == "api.bluetradesys.com") {
-                (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-                new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-                j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-                'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-                })(window,document,'script','dataLayer','GTM-56FHG8R');
-            }
-        </script>
        <script type="text/javascript" src="{{ get_url(path="elasticlunr.min.js") }}"></script>
        <script type="text/javascript" src="{{ get_url(path="search_index.en.js") }}"></script>
        <script type="text/javascript" src="{{ get_url(path="search.js") }}"></script>
@@ -1,39 +1,13 @@
-{% extends "index.html" %}
-{# this has access to the "page" variable but documentation.html does not #}
+{% extends "documentation.html" %}

 {% block title %}{{ page.title }} | {{ super() }} {% endblock title %}
+{% block doc_content %}
+    <h1>{{page.title}}</h1>
+    {{page.content | safe}}
+{% endblock doc_content %}

 {% block next_link %}
-{% endblock next_link %}
-
-{% block content %}
-{% set section = get_section(path=page.ancestors[1]) %}
-{# 
-{#<div>{{ section.title }} </div>#}
-<div class="documentation">
-    <aside class="documentation__sidebar">
-        <ul>
-        {% for p in section.subsections %}
-            {% set subsection = get_section(path=p) %}
-            <li>
-                <span class="documentation__sidebar__title">{{ subsection.title }}</span>
-                <ul>
-                    {% for page in subsection.pages %}
-                        <li class="{% if current_path == page.path %}active{% endif %}">
-                            <a href="{{page.permalink}}">{{page.title}}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </li>
-        {% endfor %}
-        </ul>
-    </aside>
-    <div class="documentation__content">
-        <h1>{{page.title}}</h1>
-        {{page.content | safe}}
-
-    {# next/pre links #}
-    <p>
+<p>
    {% if page.lighter %}
        <a href="{{ page.lighter.permalink }}">
            <i class="fa fa-chevron-left fa-fw" aria-hidden="true"></i>
@@ -47,7 +21,5 @@
            <i class="fa fa-chevron-right fa-fw" aria-hidden="true"></i>
        </a>
    {% endif %}
-    </p>
-    </div>
-</div>
-{% endblock content %}
+</p>
+{% endblock next_link %}
@@ -0,0 +1 @@
+set(sources /home/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(doc)

-include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
-include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)
+include(${CMAKE_SOURCE_DIR}/tools/safe_dep_glob.cmake)
+include(${CMAKE_SOURCE_DIR}/tools/Protobuf.cmake)

 # DEPENDENCIES
 set(DOC_GLOBS
@@ -1,38 +1,9 @@
-+++
+++
 title = "Release notes"
 weight = 3
 sort_by = "weight"
 insert_anchor_links = "right"
 +++
-## 2.16.2
-### User Visible Change
-  - Synthetic creation dialog has a "fractional" checkbox next to the tick settings.  Users may uncheck this box to enter integer tick sizes, so the synthetic security's prices will be displayed without decimals, or fractional units.
-## 2.16.1
-### Bug Fixes
-  - OrderBook's algo state parameters (in the panel on the right side) are sorted alphabetically
-## 2.16.0
-### Bug Fixes
-  - Solved an issue that could result in incorrect ladder levels
-  - Solved an issue that could lead to incorrect routing of orders in the event of certain MSGW changes
-### API Changes
-  - Add C# client side API samples for order entry, position monitoring and market data observation
-
-## 2.15.10
-### Bug Fixes
-  - Solved an issue that could cause the user interface to fail when playing some alert sounds
-### API Changes
-  - Added settlement and position information to the API
-  - Added the ability for user algos to report custom state to the user interface
-  - Added the ability for algos to discover all active securities
-## 2.15.3
-### Bug Fixes
-  - Fixed a bug where some CME currency spreads exhibited incorrect tick values
-## 2.15.2
-### User Visible Changes  
-  - Excel RTD plugin can now receive ICE market data
-## 2.15.1
-### Bug Fixes
-  - Fixed a FIX log parsing issue that resulted in exchange gateway logon problems
 ## 2.15.0
 ### User Visible Changes  
  - Added ability to hide Ladder status messages via Ladder Settings -> Left Panel tab -> Show/Hide groupbox -> Status Message
@@ -728,4 +699,3 @@ insert_anchor_links = "right"
 - Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively
 - Corrected cash per point values, used in pnl calculations, for a number of products
 - PnL report will now remember any customizations you make to filtering and/or sorting criteria
-
@@ -1,103 +0,0 @@
-FROM ubuntu:22.10
-
-RUN \
-    apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    clang-13 \
-    clang-format-13 \
-    clangd-13 \
-    clang-15 \
-    clang-format-15 \
-    clangd-15 \
-    cmake \
-    curl \
-    dotnet7 \
-    fish \
-    g++-11 \
-    g++-12 \
-    gnupg \
-    liblttng-ust-dev \
-    libssh2-1-dev \
-    libpcap0.8-dev \
-    locales \
-    ninja-build \
-    nodejs \
-    npm \
-    openssh-server \
-    python3-pip \
-    python3-venv \
-    rapidjson-dev \
-    software-properties-common \
-    sqlite3 \
-    sudo \
-    tar \
-    vim \
-    wget
-
-# this is done here so that ccache sees clang++ installed, not clang-10
-RUN \
-    apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y ccache 
-
-# emumba deps
-RUN \
-    apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    tzdata \
-    build-essential \
-    cmake-curses-gui \
-    git-all \
-    doxygen \
-    python3-sphinx \
-    graphviz \
-    libgtest-dev \
-    libssl-dev \
-    libboost-filesystem-dev \
-    libboost-program-options-dev \
-    libboost-test-dev \
-    libboost-date-time-dev \
-    zlib1g-dev \
-    netcat-traditional \
-    net-tools \
-    gdb gdbserver \
-    pkg-config
-
-# set up default executables (update-alternatives)
-RUN \
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100; \
-    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100; \
-    update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100; \
-    update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-13 100; \
-    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100; \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
-
-# Add compiler symlinks for ccache 
-RUN \
-    ln -s /usr/bin/ccache /usr/local/bin/clang; \
-    ln -s /usr/bin/ccache /usr/local/bin/clang++; \
-    ln -s /usr/bin/ccache /usr/local/bin/clang-13; \
-    ln -s /usr/bin/ccache /usr/local/bin/clang++-13; \
-    ln -s /usr/bin/ccache /usr/local/bin/clang-15; \
-    ln -s /usr/bin/ccache /usr/local/bin/clang++-15; \
-    ln -s /usr/bin/ccache /usr/local/bin/gcc; \
-    ln -s /usr/bin/ccache /usr/local/bin/g++; \
-    ln -s /usr/bin/ccache /usr/local/bin/gcc-11; \
-    ln -s /usr/bin/ccache /usr/local/bin/g++-11; \
-    ln -s /usr/bin/ccache /usr/local/bin/gcc-12; \
-    ln -s /usr/bin/ccache /usr/local/bin/g++-12
-
-RUN locale-gen en_US.UTF-8
-
-ARG docker_user="bts"
-ARG docker_uid="1000"
-ARG docker_pass="bts"
-
-RUN \
-    groupadd -g "$docker_uid" "$docker_user" \
-    && useradd \
-    -m \
-    -u "$docker_uid" \
-    -g "$docker_uid" \
-    -G sudo \
-    --password "$(openssl passwd -1 "$docker_pass")" \
-    "$docker_user"
@@ -1,64 +0,0 @@
-[dev containers]: https://code.visualstudio.com/docs/devcontainers/containers
-[dev containers ext]: https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers
-[docker repo sparkd-dev]: https://hub.docker.com/repository/docker/bluetradingsystems/sparkd-dev/general
-# Sparkd Dev Container
-## How to create a VS Code [Dev Container][dev containers]
-
-1. Make sure the **[Dev Containers][dev containers ext]** extension is installed
-1. Make sure your Docker image is up to date
-   ```
-   docker pull bluetradingsystems/sparkd-dev:latest
-   ```
-1. Copy **devcontainer.json** from this folder to **$workspaceFolder/.devcontainer/**.
-
-1. In the VS Code Command Palette, run **Dev Containers: Reopen in Container**
-
---
-## How to create a Sparkd Container in the terminal (without VS Code)
-
-1. Make sure your Docker image is up to date
-   ```
-   docker pull bluetradingsystems/sparkd-dev:latest
-   ```
-2. Start the container
-   ```
-   # Replace <cont_name> with a name for the container. The container's
-   # "$HOME" dir will be mounted to "$HOME/.sparkd-dev/mounts/<cont_name> on
-   # the host
-   
-   ./start_docker.sh --container <cont_name> --mount-existing
-   ```
-   * *Replace <cont_name> with a name for the container*
-   * *The container's `$HOME` dir will be mounted to
-   `$HOME/.sparkd-dev/mounts<cont_name>` on the host*<br>
-   * *Run: `./start_docker.sh --help` to see additional options*
-3. *(Optional) Attach VS Code to the running container.*<br>
-Run **Dev Containers: Attach to Running Container** from the command palette,
-then select your container in the dropdown
-
---
-## How to update the Docker image
-
-1. Change the image by modifying the Dockerfile (don't tag arbitrary
-  images on your machine and push them to our repo on Docker Hub)
-
-1. After modifying the Dockerfile, (re)build the image
-   ```
-   # Run in this dir
-   docker build -t bluetradingsystems/sparkd-dev:latest .
-   ```
-   ***Note:** Your docker login must have write permissions to push to the
-   [sparkd-dev][docker repo sparkd-dev] repository*
-
-2. Commit the changes to Dockerfile in git
-
-3. Push the new image to Docker Hub
-
-   ```
-   docker push johncolvin/bluetradingsystems:sparkd-dev
-   ```
-   ***Note:** The image doesn't have to be on Docker Hub, we can simply build
-   it from scratch on our local machines (with the Dockerfile). However, this
-   takes time. It is significantly quicker to download a prebuilt image, so we
-   store it on a remote repository to save time when setting up a new dev
-   machine.*
@@ -1,119 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-export PATH="$HOME/.local/bin:$PATH"
@@ -1,22 +0,0 @@
-set fish_config_home $XDG_CONFIG_HOME/fish
-if test -f "$fish_config_home/aliases.fish"
-    source "$fish_config_home/aliases.fish"
-end
-# enable general colors and case insensitive search in 'less'
-set -x LESS "$LESS -R -Q -I"
-set -x LC_ALL en_US.UTF-8
-# enable syntax highlighting in 'less'
-# set highlight color scheme in 'less' (fg)(bg)
-set -g LESS_TERMCAP_md (tput bold)(tput setaf 36)
-set -g LESS_TERMCAP_me (tput sgr0)
-set -g LESS_TERMCAP_so (tput setaf 232)(tput setab 49)
-
-set -q TERM
-if test $status != 0; or test $TERM = 'xterm'
-    set -g TERM 'xterm-256color'
-end
-
-# Fix impossible-to-see navy blue command text color
-set fish_color_command F8F8F2
-
-set -g PATH "$HOME/.local/bin" "$PATH"
@@ -1,26 +0,0 @@
-{
-  "image": "bluetradingsystems/sparkd-dev:latest",
-  "initializeCommand": "${localWorkspaceFolder}/docker/sparkd/dev/devcontainer_initialize.sh",
-  "postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh",
-  "containerUser": "bts",
-  "workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind",
-  "workspaceFolder": "/home/bts/spark",
-  "updateRemoteUserUID": true,
-  "shutdownAction": "none",
-  // Note: If running multiple containers on the same host, each must use a
-  // unique set of ports. Usually we just add 1000 to each port as needed. For
-  // example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
-  "runArgs": [
-    "-p",
-    "8000:8000",
-    "-p",
-    "8001:8001",
-    "-p",
-    "8002:8002",
-    "-p",
-    "8003:8003"
-  ],
-  "mounts": [
-    "source=${localEnv:HOME}/.sparkd-dev/mounts/sparkd-dev,target=/home/bts,type=bind"
-  ]
-}
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir -p "$HOME/.sparkd-dev/mounts/sparkd-dev"
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-this_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
-repo_dir="$(cd "$this_dir" && git rev-parse --show-toplevel)"
-tools_dir="$repo_dir/tools"
-gen_tag="GENERATED BY $(basename "${BASH_SOURCE[0]}")"
-
-function copy_if_not_exist() {
-  src="$1"
-  dest="$2"
-  if [[ ! -e "$src" ]]; then
-    echo "Unable to copy $src to $dest. Source file doesn't exist"
-    exit 1
-  fi
-  if [[ ! -e "$dest" ]]; then
-    cp "$src" "$dest"
-  fi
-}
-
-# Init bashrc
-echo "Initializing bashrc"
-copy_if_not_exist "$this_dir/bashrc" "$HOME/.bashrc"
-
-# Init fish config
-echo "Initializing fish config"
-fish_cfg_dir="$HOME/.config/fish/"
-mkdir -p "$fish_cfg_dir"
-exec "$tools_dir/write_tag_block.sh" \
-  --tag "$gen_tag" \
-  --replace \
-  --in-place \
-  --file "$fish_cfg_dir/config.fish" \
-  --text "$(cat "$this_dir/config.fish")"
@@ -1,250 +0,0 @@
-#!/usr/bin/env bash
-
-function _exit() {
-  if [[ "$#" -gt 1 ]]; then
-    # When there are multiple args, the last arg is the exit code.
-    echo "${@:1:($# - 1)}"
-    exit "${@: -1}"
-  fi
-  echo "$1"
-  exit 0
-}
-
-help_text="\
-Add or update a user's uid
-
-This script is intended to be run in a Docker container as a means to obtain
-file permissions in mounted directories owned by the specified UID.
-
-Usage: set_user.sh [OPTIONS] USER UID
-
-Positionals:
-  USER               The name of the user
-
-Options:
-  --user USER        The name of the user (defaults to 'bts')
-  --uid UID          The new uid to give USER (defaults to '1000')
-  --group GROUP      The primary group to give USER (defaults to USER)
-  --gid GID          The primary gid to give USER (defaults to UID)
-  --pass PASSWORD    The password to give USER (defaults to USER, only applies
-                     if USER hasn't been created yet) 
-  --modify-existing  Update UID/GID even if USER already exists
-  -h,--help          Print this help message and exit
-
-"
-
-function _add_group() {
-  if [[ "$#" -ne 2 ]]; then
-    _exit "'_add_group' requires exactly 2 args (group, gid). Received $#." 1
-  fi
-  local group="$1"
-  local gid="$2"
-  # Check if gid already exists
-  local existing_group=""
-  existing_group="$(getent group "$gid" | cut -d : -f 1)"
-  if [[ -n "$existing_group" ]]; then
-    if [[ "$existing_group" != "$group" ]]; then
-      echo "\
-The gid '$gid' is already in use by group '$existing_group' (will not rename \
-the group)"
-    fi
-    return
-  fi
-
-  # Check if group with same name already exists
-  local existing_gid=""
-  existing_gid="$(getent group "$group" | cut -d : -f 3)"
-  if [[ -n "$existing_gid" ]]; then
-    # The group already exists. Only modify if --modify-existing was specified.
-    if [[ "$modify_existing" -eq 0 ]]; then
-      _exit "\
-The group '$group' already exists with gid '$existing_gid'.
-Specify --modify-existing to change the gid anyways." 1
-    fi
-    echo "Changing gid for group '$group' from '$existing_gid' to '$gid'"
-    groupmod -g "$gid" "$group"
-  else
-    # The group doesn't exist. Add it
-    echo "Adding group '$group:$gid'"
-    groupadd -g "$gid" "$group"
-  fi
-}
-
-function _add_user() {
-  local user="$1"
-  local uid="$2"
-  local group="$3"
-  local gid="$4"
-  local pass="$5"
-  if [[ "$#" -ne 5 ]]; then
-    _exit "'_add_user' requires exactly 5 args (user, uid, group, gid, pass). \
-Received $#." 1
-  fi
-
-  # Check if uid is being used by another user
-  local existing_user=""
-  existing_user="$(getent passwd "$uid" | cut -d : -f 1)"
-  if [[ -n "$existing_user" ]]; then
-    if [[ "$existing_user" != "$user" ]]; then
-      _exit "The uid '$uid' is already in use by user '$existing_user'." 1
-    fi
-
-    echo "The user '$user' already has the specified uid '$uid'."
-    # Modify gid if necessary
-    local existing_gid=""
-    existing_gid="$(id -g "$user" 2> /dev/null)"
-    if [[ "$existing_gid" = "$gid" ]]; then
-      echo "The user '$user' already has the specified gid '$gid'."
-      return
-    fi
-
-    if [[ "$modify_existing" -eq 0 ]]; then
-      _exit "\
-The user '$user' is associated with the primary group '$existing_gid'.
-Specify --modify-existing to change the gid anyways." 1
-    fi
-
-    echo "Changing primary group for '$user' from '$existing_gid' to '$gid'."
-    usermod -g "$gid" "$user"
-    return
-  fi
-
-  # Check if user with same name already exists
-  local existing_uid=""
-  existing_uid="$(id -u "$user" 2> /dev/null)"
-  if [[ -n "$existing_uid" ]]; then
-    if [[ "$existing_uid" = "$uid" ]]; then
-      _exit "The user '$user' already has the specified uid '$uid'" 0
-    fi
-
-    if [[ "$modify_existing" -eq 0 ]]; then
-      _exit "\
-User '$user' already exists with uid '$existing_uid'.
-Specify --modify-existing to change the uid anyways." 1
-    fi
-
-    echo "Changing uid for user '$user' from '$existing_uid' to '$uid'"
-    if ! usermod -u "$uid" -g "$gid" "$user"; then
-      _exit "usermod exited with code $?" 1
-    fi
-    return
-  fi
-
-  # The user doesn't exist. Add it
-  echo "Adding user '$user:$uid' (group='$group:$gid', password='$pass')"
-  useradd -m -u "$uid" -g "$gid" -G sudo --password "$(openssl passwd -1 "$pass")" "$user"
-}
-
-function _update_fish_dir_perms() {
-  local user="$1"
-  local uid="$2"
-  local gid="$3"
-  # When a fish shell session starts, a temp dir named '/tmp/fish.<user>' is
-  # created with the user's current uid/gid. If such a dir exists for the
-  # specified USER, make sure the uid/gid match the new values.
-  fish_dir="/tmp/fish.$user"
-  if [[ -d "$fish_dir" ]]; then
-    perms="$uid:$gid"
-    existing_perms="$(stat -c %u:%g "$fish_dir")"
-    if [[ "$existing_perms" != "$perms" ]]; then
-      echo "Changing uid:gid for dir '$fish_dir' from '$existing_perms' to '$perms'"
-      chown -R "$perms" "$fish_dir"
-    fi
-  fi
-}
-
-user=""
-group=""
-pass=""
-declare -i uid=0
-declare -i gid=0
-declare -i modify_existing=0
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --user)
-      if [[ -z "$2" ]]; then
-        _exit "USER (--user) must be non-empty" 1
-      elif [[ "$2" = "root" ]]; then
-        _exit "USER (--user) cannot be 'root'" 1
-      fi
-      user="$2"
-      shift 2
-      ;;
-    --group)
-      if [[ -z "$2" ]]; then
-        _exit "GROUP (--group) must be non-empty" 1
-      elif [[ "$2" = "root" ]]; then
-        _exit "GROUP (--group) cannot be 'root'" 1
-      fi
-      group="$2"
-      shift 2
-      ;;
-    --uid)
-      if [[ -z "$2" ]]; then
-        _exit "UID (--uid) must be non-empty" 1
-      fi
-      uid="$2"
-      shift 2
-      ;;
-    --gid)
-      if [[ -z "$2" ]]; then
-        _exit "GID (--gid) must be non-empty" 1
-      fi
-      gid="$2"
-      shift 2
-      ;;
-    --pass)
-      if [[ -z "$2" ]]; then
-        _exit "PASS (--pass) must be non-empty" 1
-      fi
-      pass="$2"
-      shift 2
-      ;;
-    --modify-existing)
-      modify_existing=1
-      shift 1
-      ;;
-    -h)
-      ;&
-    --help)
-      _exit "$help_text" 0
-      ;;
-    *)
-      if [[ -z "$1" ]]; then
-        _exit "Invalid positional argument '$1'" 1
-      elif [[ -z "$user" ]]; then
-        user="$1"
-      elif [[ -z "$uid" ]]; then
-        uid="$1"
-      else
-        _exit "Unexpected argument '$1'" 1
-      fi
-      shift 1
-      ;;
-  esac
-done
-
-if [[ -z "$user" ]]; then
-  user="bts"
-fi
-
-if [[ $uid -eq 0 ]]; then
-  uid=1000
-fi
-
-# In general, a user's primary group/gid matches the user's name/uid.
-# If group/gid args weren't specified, set them to name/uid.
-if [[ -z "$group" ]]; then
-  group="$user"
-fi
-if [[ $gid -eq 0 ]]; then
-  gid=$uid
-fi
-if [[ -z "$pass" ]]; then
-  pass="$user"
-fi
-
-_add_group "$group" "$gid"
-_add_user "$user" "$uid" "$group" "$gid" "$pass"
-_update_fish_dir_perms "$user" "$uid" "$gid"
@@ -1,230 +0,0 @@
-#!/usr/bin/env bash
-
-function _exit() {
-  if [[ "$#" -gt 1 ]]; then
-    # When there are multiple args, the last arg is the exit code.
-    echo "${@:1:($# - 1)}"
-    exit "${@: -1}"
-  fi
-  echo "$1"
-  exit 0
-}
-
-help_text="\
-Start a docker dev container
-Usage: start_docker.sh [OPTIONS] image container
-
-Positionals:
-  image             The image to instantiate
-  container         The name for the container
-
-Options:
-  -u,--user USER      The user to add in the container (defaults to 'bts')
-  -p,--pass PASS      The password for USER in the container (defaults to USER)
-  -i,--image IMAGE    The image to instantiate (defaults to 'bluetradingsystems/sparkd-dev:latest')
-  -c,--container CONT The name for the container
-  -m,--mount MOUNT    The name for the folder (outside the container) to create/mount to the home
-                      directory in the container. Mount folders are added here: $mount_prefix
-  --mount-existing    Mount the specified dir even if it already exists
-  --port <cont_port>:<host_port> OR [<cont_port>:<host_port>,...] Port mapping(s). May be
-                      specified multiple times.
-  -h,--help           Print this help message and exit
-
-"
-
-mount_prefix="$HOME/.sparkd-dev/mounts"
-declare docker_user=""
-declare docker_pass=""
-declare image_name=""
-declare cont_name=""
-declare mount_name=""
-declare -i mount_existing=0
-declare -a port_mappings=()
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -u)
-      ;&
-    --user)
-      if [[ -z "$2" ]]; then
-        _exit "User (-u,--user) must be non-empty" 1
-      fi
-      docker_user="$2"
-      shift 2
-      ;;
-    -p)
-      ;&
-    --pass)
-      if [[ -z "$2" ]]; then
-        _exit "Password (-p,--pass) must be non-empty" 1
-      fi
-      docker_pass="$2"
-      shift 2
-      ;;
-    -i)
-      ;&
-    --image)
-      if [[ -n "$image_name" ]]; then
-        _exit "Unexpected argument '$1'" 1
-      elif [[ -z "$2" ]]; then
-        _exit "Image (-i,--image) must be non-empty" 1
-      fi
-      image_name="$2"
-      shift 2
-      ;;
-    -c)
-      ;&
-    --container)
-      if [[ -n "$cont_name" ]]; then
-        _exit "Unexpected argument '$1'" 1
-      elif [[ -z "$2" ]]; then
-        _exit "Container (-c,--container) must be non-empty" 1
-      fi
-      cont_name="$2"
-      shift 2
-      ;;
-    --port)
-      # Parse port(s) arg, and append the result to 'port_mappings'
-      # Note: port(s) may be specified in bracketed notation:
-      #   [a:b,c:d,...,y:z]
-      next_ports="$(echo "$2" | sed -e 's/\[//g' -e 's/\]//g' -e 's/,/ /g')"
-      if [[ "${#port_mappings[@]}" -gt 0 ]]; then
-        next_ports=" $next_ports"
-      fi
-      port_mappings+=("$next_ports")
-      shift 2
-      ;;
-    -m)
-      ;&
-    --mount)
-      if [[ -z "$2" ]]; then
-        echo "Mount (-m,--mount) must be non-empty"
-      fi
-      mount_name="$2"
-      shift 2
-      ;;
-    --mount-existing)
-      mount_existing=1
-      shift 1
-      ;;
-    -h)
-      ;&
-    --help)
-      _exit "$help_text" 0
-      ;;
-    *)
-      if [[ -z "$1" ]]; then
-        _exit "Invalid positional argument '$1'" "$help_text" 1
-      elif [[ -z "$image_name" ]]; then
-        image_name="$1"
-      elif [[ -z "$cont_name" ]]; then
-        cont_name="$1"
-      else
-        _exit "Unexpected argument '$1'" "$help_text" 1
-      fi
-      shift 1
-      ;;
-  esac
-done
-
-
-if [[ -z "$image_name" ]]; then
-  image_name="bluetradingsystems/sparkd-dev:latest"
-fi
-
-host_name="$(hostname)"
-if [[ -n "$cont_name" ]]; then
-  host_name="$host_name.$cont_name"
-fi
-
-if [[ -z "$mount_name" ]]; then
-  mount_name="$cont_name"
-fi
-
-if [[ -z "$mount_name" && -z "$cont_name" ]]; then
-  _exit "Please specify mount (-m,--mount) and/or container (-c,--container)" 1
-fi
-
-if [[ -z "$docker_user" ]]; then
-  docker_user="bts"
-fi
-
-if [[ "$docker_user" = "root" ]]; then
-  _exit "USER (--user) cannot be 'root'" 1
-fi
-
-cont_home="/home/$docker_user"
-home_src="$mount_prefix/$mount_name"
-home_tgt="$cont_home"
-this_dir="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-repo_src="$(cd "$this_dir" && git rev-parse --show-toplevel)"
-repo_tgt="$cont_home/spark"
-working_dir="$cont_home"
-
-if [[ $mount_existing -eq 0 && -e "$home_src" ]]; then
-  # Don't overwrite existing dir (might be mounted in another container)
-  _exit "Mount dir '$home_src' already exists (use --mount-existing to mount \
-an existing directory)" 1
-fi
-
-mkdir -p "$home_src"
-
-if [[ "${#port_mappings[@]}" -eq 0 ]]; then
-  port_mappings=("8000:8000" "8001:8001" "8002:8002" "8003:8003")
-fi
-
-# Adapt port_mappings into args for `docker run` by prepending "-p " to each
-# item
-declare -a docker_port_args=()
-for port_mapping in "${port_mappings[@]}"; do
-  docker_port_args+=("-p $port_mapping")
-done
-
-echo "Starting container '$cont_name'
-image_name  : $image_name
-cont_name   : $cont_name
-home_src    : $home_src
-home_tgt    : $home_tgt
-repo_src    : $repo_src
-repo_tgt    : $repo_tgt
-working dir : $working_dir
-ports       : ${port_mappings[*]}
-"
-
-# DON'T wrap $docker_port_args in quotes. We want bash to split args by
-# whitespace
-docker run \
-  --net bridge \
-  -h "$host_name" \
-  -e "TZ=America/New_York" \
-  --cap-add=SYS_PTRACE \
-  --security-opt seccomp=unconfined \
-  --name "$cont_name" \
-  -v "$home_src:$home_tgt" \
-  -v "$repo_src:$repo_tgt" \
-  -w "$working_dir" \
-  ${docker_port_args[*]} \
-  --shm-size=4024m \
-  -t \
-  -i \
-  -d \
-  -e DISPLAY="$DISPLAY" \
-  "$image_name"
-
-# Add user w/ same uid and gid as the current user outside of docker, so the
-# user inside the docker has file permissions in the mounted dir.
-docker_group="$docker_user"
-docker_uid="$(id -u "$USER")"
-docker_gid="$(id -g "$USER")"
-if [[ -z "$docker_pass" ]]; then
-  docker_pass="$docker_user"
-fi
-docker exec -u root -it "$cont_name" "$repo_tgt/docker/sparkd/dev/set_user.sh" \
--user "$docker_user" \
--uid "$docker_uid" \
--group "$docker_group" \
--gid "$docker_gid" \
--pass "$docker_pass"
-
-# Run same script VS Code runs to initialize the container
-docker exec -u "$docker_user" -it "$cont_name" "$repo_tgt/docker/sparkd/dev/devcontainer_post_create.sh"
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-function print_help_and_exit() {
-  cat <<EOF
-Open a shell inside the docker container
-Usage: docker_shell.sh [OPTIONS] [CONTAINER]
-
-Options:
-  -u,--user         The user to login with in the container (defaults to the current user)
-  -c,--container    The container name (may also be specified as positional arg)
-  -h,--help         Print this help message and exit
-
-EOF
-  exit "$1"
-}
-
-
-declare docker_user=""
-declare cont_name=""
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -u)
-      ;&
-    --user)
-      if [[ -z "$2" ]]; then
-        echo "User (-u,--user) must be non-empty"
-        print_help_and_exit 1
-      fi
-      docker_user="$2"
-      shift 2
-      ;;
-    -h)
-      ;&
-    --help)
-      print_help_and_exit 0
-      ;;
-    -c)
-      ;&
-    --container)
-      shift 1
-      ;&
-    *)
-      if [[ ! -z "$cont_name" ]]; then
-        echo "Unexpected argument '$1'"
-        print_help_and_exit 1
-      fi
-      cont_name="$1"
-      shift 1
-      ;;
-  esac
-done
-
-
-if [[ -z "$cont_name" ]]; then
-  echo "Please specify the container ([-c,--container])"
-  print_help_and_exit 1
-fi
-
-if [[ -z "$docker_user" ]]; then
-  docker_user="$USER"
-fi
-
-docker exec -u "$docker_user" -it "$cont_name" bash
@@ -1,233 +0,0 @@
-#!/usr/bin/env bash
-
-mount_prefix="$HOME/.spark-dev/mounts"
-
-function print_help_and_exit() {
-  cat <<EOF
-Start a docker dev container
-Usage: start_docker.sh [OPTIONS] image container
-
-Positionals:
-  image             The image to instantiate
-  container         The name for the container
-
-Options:
-  -u,--user USER      The user to add in the container (defaults to the current user)
-  -p,--pass PASS      The password for USER in the container (defaults to USER)
-  -i,--image IMAGE    The image to instantiate
-  -c,--container CONT The name for the container
-  -m,--mount MOUNT    The name for the folder (outside the container) to create/mount to the home
-                      directory in the container. Mount folders are added here: $mount_prefix
-  --mount-existing    Mount the specified dir even if it already exists
-  --port <cont_port>:<host_port> OR [<cont_port>:<host_port>,...] Port mapping(s). May be
-                      specified multiple times.
-  -h,--help           Print this help message and exit
-
-EOF
-  exit "$1"
-}
-
-
-declare docker_user=""
-declare docker_pass=""
-declare image_name=""
-declare cont_name=""
-declare mount_name=""
-declare -i mount_existing=0
-declare -a port_mappings=()
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -u)
-      ;&
-    --user)
-      if [[ -z "$2" ]]; then
-        echo "User (-u,--user) must be non-empty"
-        print_help_and_exit 1
-      fi
-      docker_user="$2"
-      shift 2
-      ;;
-    -p)
-      ;&
-    --pass)
-      if [[ -z "$2" ]]; then
-        echo "Password (-p,--pass) must be non-empty"
-        print_help_and_exit 1
-      fi
-      docker_pass="$2"
-      shift 2
-      ;;
-    -i)
-      ;&
-    --image)
-      if [[ -n "$image_name" ]]; then
-        echo "Unexpected argument '$1'"
-        print_help_and_exit 1
-      elif [[ -z "$2" ]]; then
-        echo "Image (-i,--image) must be non-empty"
-        print_help_and_exit 1
-      fi
-      image_name="$2"
-      shift 2
-      ;;
-    -c)
-      ;&
-    --container)
-      if [[ -n "$cont_name" ]]; then
-        echo "Unexpected argument '$1'"
-        print_help_and_exit 1
-      elif [[ -z "$2" ]]; then
-        echo "Container (-c,--container) must be non-empty"
-        print_help_and_exit 1
-      fi
-      cont_name="$2"
-      shift 2
-      ;;
-    --port)
-      # Parse port(s) arg, and append the result to 'port_mappings'
-      # Note: port(s) may be specified in bracketed notation:
-      #   [a:b,c:d,...,y:z]
-      next_ports="$(echo "$2" | sed -e 's/\[//g' -e 's/\]//g' -e 's/,/ /g')"
-      if [[ "${#port_mappings[@]}" -gt 0 ]]; then
-        next_ports=" $next_ports"
-      fi
-      port_mappings+=("$next_ports")
-      shift 2
-      ;;
-    -m)
-      ;&
-    --mount)
-      if [[ -z "$2" ]]; then
-        echo "Mount (-m,--mount) must be non-empty"
-      fi
-      mount_name="$2"
-      shift 2
-      ;;
-    --mount-existing)
-      mount_existing=1
-      shift 1
-      ;;
-    -h)
-      ;&
-    --help)
-      print_help_and_exit 0
-      ;;
-    *)
-      if [[ -z "$1" ]]; then
-        echo "Invalid positional argument '$1'"
-        print_help_and_exit 1
-      elif [[ -z "$image_name" ]]; then
-        image_name="$1"
-      elif [[ -z "$cont_name" ]]; then
-        cont_name="$1"
-      else
-        echo "Unexpected argument '$1'"
-        print_help_and_exit 1
-      fi
-      shift 1
-      ;;
-  esac
-done
-
-
-if [[ -z "$image_name" ]]; then
-  image_name="bluetradingsystems/spark-crypto-dev"
-fi
-
-host_name="$(hostname)"
-if [[ -n "$cont_name" ]]; then
-  host_name="$host_name.$cont_name"
-fi
-
-if [[ -z "$mount_name" ]]; then
-  mount_name="$cont_name"
-fi
-
-if [[ -z "$mount_name" && -z "$cont_name" ]]; then
-  echo "Please specify mount (-m,--mount) and/or container (-c,--container)"
-  print_help_and_exit 1
-fi
-
-if [[ -z "$docker_user" ]]; then
-  docker_user="$USER"
-fi
-
-home_src=$mount_prefix/$mount_name
-home_tgt=$HOME
-repo_src=$(git rev-parse --show-superproject-working-tree)
-repo_tgt=$HOME/$(basename "$repo_src")
-working_dir=$HOME
-
-if [[ $mount_existing -eq 0 && -e "$home_src" ]]; then
-  # Don't overwrite existing dir (might be mounted in another container)
-  echo "Mount dir '$home_src' already exists (use --mount-existing to mount an existing directory)"
-  print_help_and_exit 1
-fi
-
-mkdir -p "$home_src"
-
-if [[ "${#port_mappings[@]}" -eq 0 ]]; then
-  port_mappings=("8000:8000" "8001:8001" "8002:8002" "8003:8003")
-fi
-
-# Adapt port_mappings into args for `docker run` by prepending "-p " to each
-# item
-declare -a docker_port_args=()
-for port_mapping in "${port_mappings[@]}"; do
-  docker_port_args+=("-p $port_mapping")
-done
-
-echo "Starting container '$cont_name'
-image_name  : $image_name
-cont_name   : $cont_name
-home_src    : $home_src
-home_tgt    : $home_tgt
-repo_src    : $repo_src
-repo_tgt    : $repo_tgt
-working dir : $working_dir
-ports       : ${port_mappings[*]}
-"
-
-# DON'T wrap $docker_port_args in quotes. We want bash to split args by
-# whitespace
-docker run \
-  --net bridge \
-  -h "$host_name" \
-  -e "TZ=America/New_York" \
-  --cap-add=SYS_PTRACE \
-  --security-opt seccomp=unconfined \
-  --name "$cont_name" \
-  -v "$home_src:$home_tgt" \
-  -v "$repo_src:$repo_tgt" \
-  -w "$working_dir" \
-  ${docker_port_args[*]} \
-  --shm-size=4024m \
-  -t \
-  -i \
-  -d \
-  -e DISPLAY="$DISPLAY" \
-  "$image_name" \
-  bash
-
-# Add user w/ same uid and gid as the current user outside of docker, so the
-# user inside the docker has file permissions in the mounted dir.
-docker_group="$docker_user"
-docker_user_uid="$(id -u "$USER")"
-docker_user_gid="$(id -g "$USER")"
-
-echo "Adding user in container '$cont_name'
-name : $docker_user
-uid  : $docker_user_uid
-gid  : $docker_user_gid"
-
-if [[ -z "$docker_pass" ]]; then
-  docker_pass="$docker_user"
-  echo "Giving user '$docker_user' a secure password: $docker_pass"
-fi
-
-docker exec -u root -it "$cont_name" groupadd -g "$docker_user_gid" "$docker_group"
-docker exec -u root -it "$cont_name" useradd -u "$docker_user_uid" -g "$docker_user_gid" "$docker_user"
-docker exec -u root -it "$cont_name" usermod --password "$(openssl passwd -1 "$docker_pass")" "$docker_user"
-docker exec -u root -it "$cont_name" usermod -aG sudo "$docker_user"
-docker exec -u root -it "$cont_name" "$repo_tgt/externals/src/emumba/install_emumba-deribit-connector.sh"
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "6.0.200",
-    "rollForward": "latestMajor"
-  }
-}
@@ -1,20 +0,0 @@
-{
-  "FormattingOptions": {
-    "NewLineForCatch": false,
-    "NewLineForClausesInQuery": true,
-    "NewLineForElse": false,
-    "NewLineForFinally": false,
-    "NewLineForMembersInAnonymousTypes": true,
-    "NewLineForMembersInObjectInit": true,
-    "NewLinesForBracesInAccessors": false,
-    "NewLinesForBracesInAnonymousMethods": false,
-    "NewLinesForBracesInAnonymousTypes": false,
-    "NewLinesForBracesInControlBlocks": false,
-    "NewLinesForBracesInLambdaExpressionBody": false,
-    "NewLinesForBracesInMethods": false,
-    "NewLinesForBracesInObjectCollectionArrayInitializers": false,
-    "NewLinesForBracesInProperties": false,
-    "NewLinesForBracesInTypes": false,
-    "TabSize": 3
-  }
-}
@@ -1,18 +0,0 @@
-astroid==2.7.3
-autopep8==1.5.7
-cffi==1.14.6
-colorama==0.4.4
-isort==5.9.3
-lazy-object-proxy==1.6.0
-mccabe==0.6.1
-platformdirs==2.3.0
-protobuf==4.21.12
-pybars3==0.9.7
-pycodestyle==2.7.0
-pycparser==2.20
-pylint==2.10.2
-PyMeta3==0.5.1
-termcolor==1.1.0
-toml==0.10.2
-wrapt==1.12.1
-yapf==0.31.0
@@ -1,108 +1,224 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32922.545
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2024
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{3335AAF0-489D-359D-8305-9B7A44E2C760}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\sparkcmd\sparkcmd.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{2256015B-E7D5-3614-8F39-814CA68A4444}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25} = {FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}
+		{3335AAF0-489D-359D-8305-9B7A44E2C760} = {3335AAF0-489D-359D-8305-9B7A44E2C760}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_excel", "src\client\spark_excel\spark_excel.csproj", "{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		MinSizeRel|Any CPU = MinSizeRel|Any CPU
 		MinSizeRel|x64 = MinSizeRel|x64
+		MinSizeRel|x86 = MinSizeRel|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU
 		RelWithDebInfo|x64 = RelWithDebInfo|x64
+		RelWithDebInfo|x86 = RelWithDebInfo|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x86.ActiveCfg = Debug|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x86.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|Any CPU.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Debug|x64.ActiveCfg = Debug|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Debug|x64.Build.0 = Debug|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Release|x64.ActiveCfg = Release|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.Release|x64.Build.0 = Release|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{FDC3A021-386E-3A2C-A7EB-CBE94A95BE25}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x64.Build.0 = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Debug|x86.ActiveCfg = Debug|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|Any CPU.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x64.Build.0 = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.Release|x86.ActiveCfg = Release|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{3335AAF0-489D-359D-8305-9B7A44E2C760}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x86.ActiveCfg = Debug|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x86.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|Any CPU.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x86.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|Any CPU.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x86.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x86.ActiveCfg = Debug|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x86.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|Any CPU.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x64.Build.0 = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Debug|x86.ActiveCfg = Debug|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|Any CPU.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x64.Build.0 = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.Release|x86.ActiveCfg = Release|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{2256015B-E7D5-3614-8F39-814CA68A4444}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x86.ActiveCfg = Debug|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|Any CPU.Build.0 = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x86.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|Any CPU.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
-		{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x86.Build.0 = Release|x64
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x86.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+		{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x64.Build.0 = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Debug|x86.ActiveCfg = Debug|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|Any CPU.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.MinSizeRel|x86.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.Release|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|Any CPU.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.ActiveCfg = Release|x64
+		{BE9F27C3-B583-47DF-95FA-1F8BBC89DCCB}.RelWithDebInfo|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -0,0 +1,41 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.10
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparkd", "src\server\sparkd\sparkd.vcxproj", "{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspark", "build\src\lib\libspark.vcxproj", "{502FD050-679A-3B50-B438-098500700919}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		MinSizeRel|x64 = MinSizeRel|x64
+		Release|x64 = Release|x64
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Debug|x64.ActiveCfg = Debug|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Debug|x64.Build.0 = Debug|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.MinSizeRel|x64.ActiveCfg = Release|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.MinSizeRel|x64.Build.0 = Release|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Release|x64.ActiveCfg = Release|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.Release|x64.Build.0 = Release|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{BBBAFD38-312D-4A8D-9AF0-F2BDEE72CE6F}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{502FD050-679A-3B50-B438-098500700919}.Debug|x64.ActiveCfg = Debug|x64
+		{502FD050-679A-3B50-B438-098500700919}.Debug|x64.Build.0 = Debug|x64
+		{502FD050-679A-3B50-B438-098500700919}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{502FD050-679A-3B50-B438-098500700919}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{502FD050-679A-3B50-B438-098500700919}.Release|x64.ActiveCfg = Release|x64
+		{502FD050-679A-3B50-B438-098500700919}.Release|x64.Build.0 = Release|x64
+		{502FD050-679A-3B50-B438-098500700919}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{502FD050-679A-3B50-B438-098500700919}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6A7249D7-B40C-4656-9347-60072D0B8FDB}
+	EndGlobalSection
+EndGlobal
@@ -0,0 +1,17 @@
+{
+   "files.associations": {
+      "chrono": "cpp",
+      "future": "cpp",
+      "system_error": "cpp",
+      "ios": "cpp",
+      "utility": "cpp",
+      "iosfwd": "cpp",
+      "xhash": "cpp",
+      "xstring": "cpp",
+      "xtree": "cpp",
+      "xutility": "cpp",
+      "exception": "cpp",
+      "bitset": "cpp",
+      "xlocale": "cpp"
+   }
+}
@@ -1,108 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(Spark.Admin.WebApp)
-
-include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
-include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)
-
-# dependencies
-set(PROTO_GLOBS
-  ../lib/api/*.proto
-  ../lib/api/services/*.proto
-  ../lib/domain_model/*.proto
-  ../lib/sparkproto/*.proto
-  ../lib/md/protos/*.proto
-  ../../externals/linux/include/google/protobuf/descriptor.proto
-  ../../externals/linux/include/google/protobuf/timestamp.proto)
-
-file(
-  GLOB_RECURSE _proto_rel_SOURCES
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  ${PROTO_GLOBS})
-
-file(
-  GLOB_RECURSE _proto_abs_SOURCES
-  ${PROTO_GLOBS})
-
-file(
-  GLOB_RECURSE _ts_SOURCES
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  src/*.ts)
-
-file(
-  GLOB_RECURSE _fs_SOURCES
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  src/*.fs)
-
-set(_tools ${CMAKE_SOURCE_DIR}/tools)
-set(_quiet_exec ${_tools}/quiet_exec.sh)
-set(_venv_exec ${_tools}/venv_exec.sh)
-set(_tools_py ${CMAKE_SOURCE_DIR}/tools/py)
-
-# The tsconfig file is generated as a function of the cmake build type, and
-# binary dir. Depending on the build type, it extends either
-# 'tsconfig.debug.json' or 'tsconfig.release.json'.
-set(_tsconfig_base "${CMAKE_CURRENT_SOURCE_DIR}/tsconfig.$<IF:$<CONFIG:Debug>,debug,release>.json")
-set(WEBPACK_MODE $<IF:$<CONFIG:Debug>,"development","production">)
-set(_tsconfig "${CMAKE_CURRENT_BINARY_DIR}/tsconfig.json")
-
-set(_venv_python ${CMAKE_SOURCE_DIR}/.venv/bin/python)
-set(_gen_tsconfig_py ${_tools_py}/gen_tsconfig.py)
-set(_build_admin_web_app_py ${_tools_py}/build_admin_web_app.py)
-
-set(_gen_tsconfig_deps ${_venv_exec} ${_venv_python} ${_gen_tsconfig_py} ${_tsconfig_base})
-
-set(_build_admin_web_app_deps
-  ${_quiet_exec}
-  ${_venv_exec}
-  ${_venv_python}
-  ${_build_admin_web_app_py}
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/Spark.Admin.WebApp.fsproj
-  ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js
-  ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs
-  ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
-  ${_proto_rel_SOURCES}
-  ${_api_ts_SOURCES}
-  ${_ui_fs_SOURCES}
-  ${_tsconfig})
-
-update_deps_file("${_build_admin_web_app_deps}")
-
-function(npm_install path)
-  add_custom_command(
-    OUTPUT ${path}/package-lock.json
-    COMMAND "npm" ARGS "install"
-    DEPENDS ${path}/package.json
-    WORKING_DIRECTORY ${path}
-    COMMENT "Run 'npm install' in ${path}")
-endfunction()
-
-npm_install(${CMAKE_CURRENT_SOURCE_DIR})
-
-add_custom_command(
-  OUTPUT ${_tsconfig}
-  COMMAND ${_venv_exec}
-  ARGS
-  ${_venv_python}
-  ${_gen_tsconfig_py}
-  --config-base ${_tsconfig_base}
-  --config-out ${_tsconfig}
-  --build-out ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS ${_gen_tsconfig_deps})
-
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bundle.js
-  COMMAND ${_quiet_exec}
-  ARGS
-  ${_venv_exec}
-  ${_venv_python}
-  ${_build_admin_web_app_py}
-  --protos ${_proto_abs_SOURCES}
-  --tsconfig ${_tsconfig}
-  --mode ${WEBPACK_MODE}
-  --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Building Spark.Admin.WebApp"
-  DEPENDS ${_build_admin_web_app_deps})
-
-add_custom_target(admin_web_app_bundle ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.js)
-
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Spark.Admin.WebApp", "src\Spark.Admin.WebApp.fsproj", "{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3143A6F-8D32-4F9E-84EE-B34AF3F3A862}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
@@ -1,49 +0,0 @@
-{
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "npx webpack serve",
-    "build": "npx webpack"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@babel/plugin-transform-runtime": "^7.21.0",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/runtime": "^7.21.0",
-    "babel-loader": "^9.1.2",
-    "fable-utils": "^1.2.0",
-    "node-sass": "^8.0.0",
-    "protobufjs": "^7.2.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "remotedev": "^0.2.9",
-    "ts2fable": "^0.7.1",
-    "tslib": "^2.5.0",
-    "watch": "^1.0.2",
-    "webpack": "^5.75.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.21.0",
-    "@fortawesome/fontawesome-free": "^5.15.4",
-    "bulma": "^0.9.4",
-    "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.28.0",
-    "css-loader": "^6.7.3",
-    "html-webpack-plugin": "^5.5.0",
-    "jest": "^29.4.3",
-    "mini-css-extract-plugin": "^2.7.2",
-    "npx": "^10.2.2",
-    "protobufjs-cli": "^1.1.1",
-    "sass": "^1.58.3",
-    "sass-loader": "^13.2.0",
-    "style-loader": "^3.3.1",
-    "ts-jest": "^29.0.5",
-    "ts-loader": "^9.4.2",
-    "tsutils": "^3.21.0",
-    "typescript": "^4.9.5",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
-    "ws": "^8.12.1"
-  }
-}
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>BTS Spark Admin</title>
-  <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" type="image/ico" href="public/img/favicon.ico" />
-  <link rel="stylesheet" href="public/font-awesome.min.css" />
-  <script src="https://cdn.polyfill.io/v2/polyfill.js?features=es6"></script>
-</head>
-<body>
-  <div id="elmish-app"></div>
-  <script src="bundle.js"></script>
-</body>
-</html>
@@ -1,676 +0,0 @@
-module Accounts.State
-
-open Accounts.Types
-open bts.api.admin
-open bts.api.position
-open Global
-open Elmish
-open Fable.Import
-open bts.co2
-open Fable
-open Fable.Core
-open bts.api.position
-
-let isNewAccount (account:BTSAccount) =
-  account.id = 0u && account.isPresent
-
-let currentAccountIsDefault (account:BTSAccount) = (account.id = 0u)
-
-let userToId userName model =
-      match model.adminData with
-      | Some ad ->  let u = Array.tryFind (fun (i:BTSUser) -> i.name = userName) ad.users
-                    match u with | Some btsu -> btsu.id | None -> uint32 0
-      | None -> uint32 0
-
-let idToUser userID model =
-      match model.adminData with
-      | Some ad ->  let u = Array.tryFind (fun (i:BTSUser) -> i.id = userID) ad.users
-                    match u with | Some btsu -> btsu.name | None -> ""
-      | None -> ""
-
-let stringToSide side =
-  match side with
-  | "Buy" -> bts.api.Side.BUY
-  | "Sell" -> bts.api.Side.SELL
-  | _ -> bts.api.Side.BUY
-
-let sideToString side =
-  match side with
-  | bts.api.Side.BUY -> "Buy"
-  | bts.api.Side.SELL -> "Sell"
-  | _ -> "Buy"
-
-
-let emptyTempManualFill = {id = 0u; newId = 0u; qty = "0"; price = "0"; side="Buy"; user=""; venue=""; symbol=""; expiration=""; SecurityId="0"; fillType = ManualFill.FillType.AdminDay }
-
-let validateManualFill (fill:TempFillData) =
-  let couldParseQty, parsedQty = System.Int32.TryParse fill.qty
-  let couldParsePrice, parsedPrice = System.Double.TryParse fill.price
-  couldParseQty && couldParsePrice && fill.SecurityId <> "0" && fill.user <> ""
-
-let convertTempManualFIll (tempFill:TempFillData) (model: Model) =
-  let dto = System.DateTimeOffset (System.DateTime.UtcNow)
-  { emptyManualFill with
-      recordId = int tempFill.id
-      securityKey = uint32 tempFill.SecurityId
-      accountId = uint32 model.scratch.id
-      accountName = model.scratch.name
-      userId = (userToId tempFill.user model)
-      side = (stringToSide tempFill.side)
-      quantity = double tempFill.qty
-      price = double tempFill.price
-      fillType = tempFill.fillType
-      timestamp = { seconds = dto.ToUnixTimeSeconds(); nanos = 0 }
-  }
-
-let convertTempFillList (fills:TempFillData list) (model:Model) =
-  let lst =
-    fills
-    |> List.filter (fun mf -> mf |> validateManualFill)
-    |> List.map (fun mf -> convertTempManualFIll mf model)
-  {
-    manualFill = Array.ofList lst
-  }
-
-let convertManualFIll (fill:ManualFill) (model: Model) =
-  { emptyTempManualFill with
-      id = uint32 fill.recordId
-      SecurityId = string fill.securityKey
-      user = (idToUser fill.userId model)
-      side = (sideToString fill.side)
-      qty = string fill.quantity
-      price = string fill.price
-      fillType = fill.fillType
-  }
-
-let init (context:ServiceContext.ServiceContext) =
-  let admin = AdminService.Create context ""
-  let posServ = PositionService.Create context ""
-  let basePosServ = BasePositionService.Create context ""
-  let mdr = MarketDataRelay.Create context ""
-  let span = MarginService.Create context ""
-  { tab = General
-    admin = admin
-    context = Some context
-    unsub = None
-    basePositionService = basePosServ
-    positionService = posServ
-    marginService = span
-    marginData = emptyMargin
-    marginScratch = emptyMargin
-    adminData = None
-    ordersData = []
-    SelectedOrders = []
-    mdRelay = mdr
-    mdRelayProductData = [||]
-    mdRelayExpNameData = Array.empty<ExpirationNameList>
-    scratch = emptyAccount
-    previousScratch = emptyAccount
-    AllValue = "*"
-    AllValueDisplay = "All"
-    OptionsMenuOpen = ""
-    ConfirmModal = "", (Msg.SelectTab General)
-    SelectedClipLimits = []
-    SelectedPositionLimits = []
-    token = context.token
-    can_create = context.can_create
-    this_username = context.username
-    ShowLoading = false
-    ManualFillData = {
-      fills = { manualFill = (Array.empty: bts.api.position.ManualFill [])}
-      newFills = list.Empty
-      updatedFills = list.Empty
-      deletedFills = { manualFill = (Array.empty: bts.api.position.ManualFill [])}
-      tempSODFillData = emptyTempManualFill
-      tempDayFillData = emptyTempManualFill
-    }
-  }, Access.getAdminData admin UpdateAdminData NoAdminData
-
-let positionSub model dispatch =
-    match model.unsub with
-    | Some (unsub) -> unsub.Dispose()
-    | None -> ()
-    let svc = model.positionService
-    svc.subscribe_manual_fills "" (
-        fun (subUpdate:StreamUtils.IUpdate<ManualFill>) ->
-            subUpdate.all
-            |> JSMap.toArray
-            |> Array.map snd
-            |> SetPositionData
-            |> dispatch
-            )
-
-    |> SetUnsub
-    |> dispatch
-
-let marginSub model dispatch =
-    match model.unsub with
-    | Some (unsub) -> unsub.Dispose()
-    | None -> ()
-    let svc = model.marginService
-    svc.subscribe_excess_liquidity_report "" (
-        fun (subUpdate:StreamUtils.IUpdate<ExcessLiquidityReport>) ->
-            (*
-              The update does not seem to contain any data
-              and there is no way to specify the account.
-              this should be revisited
-            *)
-
-            //subUpdate.all
-            //|> JSMap.toArray
-            //|> Array.map snd
-            //|> UpdateMarginData
-            //|> dispatch
-
-            GetMarginData |> dispatch
-            )
-    |> SetUnsub
-    |> dispatch
-
-
-let selectSub (tab:Tab option) model =
-  match tab, model.tab with
-  | Some PositionManagementTab, _ | None, PositionManagementTab -> Cmd.ofEffect (positionSub model)
-  | Some MarginTab, _ | None, MarginTab -> Cmd.ofMsg GetMarginData //Cmd.ofEffect (marginSub model)
-  | _ ->
-    match model.unsub with
-    | Some (unsub) -> unsub.Dispose()
-    | None ->
-      System.Console.WriteLine "...?"
-      ()
-    Cmd.none
-
-let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData)  =
-  List.choose id [
-    data.accounts |> Array.tryFind (fun a -> a.id = scratch.id || (scratch.id = 0u && a.name = scratch.name))
-    data.accounts |> Array.tryFind (fun a -> a.id = previousScratch.id || (scratch.id = 0u && a.name = previousScratch.name))
-    data.accounts |> Array.tryHead
-    Some emptyAccount]
-  |> List.head
-
-let preserveSelection (data:AdminData) model =
-  let account = existingSelection model.scratch model.previousScratch data
-  { model with scratch = account }
-
-
-let applyUpdate (account:BTSAccount) = function
-  | AccountName name -> { account with name = name }
-  | Description desc -> { account with description = desc }
-  | IsActive b -> { account with isActive = b }
-
-let applyCMEUpdate (data:CMEAccountData) = function
- | CMEExchangeField.CTI v -> { data with cti = v }
- | CMEExchangeField.Origin v -> { data with origin = v }
- | CMEExchangeField.ClearingAccount v -> { data with clearingAccount = v }
- | CMEExchangeField.MiscTagMapping mp -> { data with miscTags = mp }
-
-let applyICEUpdate (data:ICEAccountData) = function
- | ICEExchangeField.CTI v -> { data with cti = v }
- | ICEExchangeField.Origin v -> { data with origin = v }
- | ICEExchangeField.ClearingFirm v -> { data with clearingFirm = v }
- | ICEExchangeField.ClearingAccount v -> { data with clearingAccount = v }
- | ICEExchangeField.MiscTagMapping mp -> { data with miscTags = mp }
- | ICEExchangeField.CustomerAccountRefId v -> { data with customerAccountRefId = v }
- | ICEExchangeField.AccountCode v -> { data with accountCode = v }
-
-let applySIMUpdate (data:SIMAccountData) = function
- | CTI v -> { data with cti = v }
- //| SIMExchangeField.Origin v -> { data with origin = v }
- | Origin v -> { data with origin = v }
- | ClearingAccount v -> { data with clearingAccount = v }
-
-let saveAccount (admin:IAdminService) (account:BTSAccount) (manualFillData:ManualFillData) (model:Model) = promise {
-  let! result = admin.update_account { completeData = account }
-  let! result2 = model.marginService.set_cash_factor  { account = model.scratch.name; leverageFactor = model.marginScratch.leverageFactor }
-  let! result3 = model.marginService.set_cash_balance  { account = model.scratch.name; cashBalance = model.marginScratch.cashBalance }
-  let! result4 = model.marginService.set_should_enforce_margin  { account = model.scratch.name; shouldEnforceMargin = model.marginScratch.shouldEnforceMargin }
-  let! result5 = model.positionService.create_manual_fill (convertTempFillList manualFillData.newFills model)
-  let! result6 = model.positionService.update_manual_fill (convertTempFillList manualFillData.updatedFills model)
-  let! result7 = model.positionService.remove_manual_fill manualFillData.deletedFills
-
-  let result5Msg = result5.response |> Array.tryFind (fun i -> (not i.ok))
-  let result6Msg = result6.response |> Array.tryFind (fun i -> (not i.ok))
-  let result7Msg = result7.response |> Array.tryFind (fun i -> (not i.ok))
-
-  match result.isSuccess, result2.success, result3.success, result4.success, result5Msg, result6Msg, result7Msg with
-  //match result.isSuccess, true, true, true, result5Msg, result6Msg, result7Msg with
-  | false, _, _, _, _, _, _ ->
-    return ErrorOccured (sprintf "Error saving account: %s" result.errorText)
-  | _, false, _, _, _, _, _ ->
-    return ErrorOccured (sprintf "Error  leverage factor: %s" result.errorText)
-  | _, _, false, _, _, _, _ ->
-    return ErrorOccured (sprintf "Error Enforce Margin: %s" result.errorText)
-  | _, _, _, false, _, _, _ ->
-    return ErrorOccured (sprintf "Error cash balance: %s" result.errorText)
-  | _, _, _, _, Some r, _, _ ->
-    return ErrorOccured (sprintf "Error saving positions: %s" r.msg)
-  | _, _, _, _, _, Some r, _ ->
-    return ErrorOccured (sprintf "Error updating positions: %s" r.msg)
-  | _, _, _, _, _, _, Some r ->
-    return ErrorOccured (sprintf "Error deleting positions: %s" r.msg)
-  | _ ->
-    let! data = admin.get_filtered_admin_data ()
-    return UpdateAdminData data
-
-}
-
-let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise {
-    let args = { parentAccountId = 0u; accountName = account.name; description = account.description; creatorUser = model.this_username }
-    let! result = admin.create_account args
-    if result.isSuccess then
-      return! saveAccount admin { account with id = result.newId } model.ManualFillData model
-    else
-      return ErrorOccured (sprintf "Error creating account: %s" result.errorText)
-  }
-
-let deleteAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise {
-  let! result = admin.delete_account  { id = account.id }
-  if result.isSuccess then
-    let! data = admin.get_filtered_admin_data ()
-    return UpdateAdminData data
-  else
-    return ErrorOccured (sprintf "Error deleting account: %s" result.errorText)
-}
-
-let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummaryUnit list) (model:Model) = promise {
-  let users = (Array.map (fun (ord:OrdersSummaryUnit) -> ord.user) (Array.ofList orders))
-  let accounts = [| accountName |]
-  let! result = admin.cancel_orders  {accounts = accounts; users = users }
-
-  let! data = admin.get_filtered_admin_data ()
-  return UpdateAdminData data
-}
-
-let parseGMIFile (data:string) (model:Model) =
-  promise {
-    let! result = model.basePositionService.parse_gmi_csv { text = data }
-
-    match result.success.positions.Length with
-    | 0 -> return ErrorOccured result.failure
-    | _ -> return SavePositionBatch result.success
-
-  }
-
-let setBasePosition basePosBatch (model:Model) =
-  promise {
-    let! result = model.positionService.set_base_position basePosBatch
-
-    match result.ok with
-    | true -> Browser.Dom.console.log result.msg
-    | false -> Browser.Dom.console.log result.msg
-
-    return (Msg.SelectTab model.tab)
-  }
-
-let requestProducts (mdRelay:IMarketDataRelay) = promise {
-    let! result = mdRelay.request_products()
-    return UpdateProducts result.products
-}
-
-let requestExpNames (mdRelay:IMarketDataRelay) = promise {
-  let! result = mdRelay.request_names()
-  return UpdateExpirationNames result.securities
-}
-
-let erase (arr:'a[]) i =
-  let left = arr.[..i-1]
-  let right = arr.[1+i..]
-  Array.concat [left;right]
-
-let clearSelection model =
-  { model with
-          SelectedClipLimits = []
-          SelectedPositionLimits = []
-          SelectedOrders = []
-          ShowLoading = false
-  }
-
-
-let orderIsEqual (order1:OrdersSummaryUnit) (order2:OrdersSummaryUnit) =
-  (order1.account = order2.account)
-  && (order1.user = order2.user)
-
-let ClipLimitIsEqual (limit1:AccountSecurityClipLimitUnit) (limit2:AccountSecurityClipLimitUnit) =
-  (limit1.security.exchange = limit2.security.exchange)
-  && (limit1.security.securityType = limit2.security.securityType)
-  && (limit1.security.securitySymbol = limit2.security.securitySymbol)
-
-let PositionLimitIsEqual (limit1:AccountProductPositionLimitUnit) (limit2:AccountProductPositionLimitUnit) =
-  (limit1.product.exchange = limit2.product.exchange)
-  && (limit1.product.securityType = limit2.product.securityType)
-  && (limit1.product.securitySymbol = limit2.product.securitySymbol)
-
-let modifyClipLimitRow limits (oldRow:AccountSecurityClipLimitUnit) (newRow:AccountSecurityClipLimitUnit) =
-  match (Array.tryFindIndex (fun l -> oldRow = l) limits) with
-  | None -> limits
-  | Some ind ->
-    let left = Array.append (limits.[..ind-1]) [| newRow |]
-    let right = limits.[1+ind..]
-    Array.concat [left; right]
-
-let modifyProductPositionRow limits (oldRow:AccountProductPositionLimitUnit) (newRow:AccountProductPositionLimitUnit) =
-    match (Array.tryFindIndex (fun l -> oldRow = l) limits) with
-    | None -> limits
-    | Some ind ->
-      let left = Array.append (limits.[..ind-1]) [| newRow |]
-      let right = limits.[1+ind..]
-      Array.concat [left; right]
-
-let clearValidNewFills model =
-  model.ManualFillData.newFills |> List.filter (validateManualFill >> not)
-
-let clearManualFill model =
-  {model with ManualFillData = {model.ManualFillData with newFills = clearValidNewFills model; updatedFills = []; deletedFills = {manualFill = Array.empty}}}
-
-let validateManualFillQty (value: string) : bool =
-  let couldParse, parsedQty = System.Int32.TryParse value
-  match value.Length, couldParse, parsedQty with
-  | 0, _, _ -> true
-  | _, true, v when v > 0 -> true
-  | _, _, _ -> false
-
-let update msg (model:Model) : Model * Cmd<Msg> =
-  match msg with
-  | UpdateAdminData data ->
-    let presentAccounts = data.accounts |> Array.filter (fun a -> a.isPresent) |> Array.sortBy (fun a -> a.name.ToLower())
-    let data = { data with accounts = presentAccounts }
-    { model with adminData = Some data }
-    |> preserveSelection data, Cmd.ofExistingPromise (requestProducts model.mdRelay) id (box>>ErrorOccured)
-  | NoAdminData msg ->
-    Global.alert Global.Info msg
-    model, Cmd.Empty
-  | SetUnsub u -> { model with unsub = Some u }, Cmd.none
-  | GetOrdersData ->
-    { model with ShowLoading = false}, (Access.getAccountOrdersData model.admin UpdateOrdersData (box>>ErrorOccured))
-  | UpdateOrdersData summary ->
-    {model with ordersData = List.ofArray summary.units}, Cmd.Empty
-  | CancelOrders orders ->
-    { model with ConfirmModal = ("", Msg.SelectTab model.tab); SelectedOrders = []; ShowLoading = true },
-      Cmd.batch [
-        Cmd.ofExistingPromise (cancelOrders model.admin model.scratch.name orders model ) id (box>>ErrorOccured)
-        Cmd.ofExistingPromise (promise {
-          do! Promise.sleep 1000
-          return GetOrdersData
-        }) id (fun _ -> GetOrdersData)
-      ]
-  | SelectOrder (chckd, orders) ->
-    let so = match chckd, orders with
-              | true, h::m::tail -> orders
-              | true, h::_ -> h::model.SelectedOrders
-              | false, h::_ -> List.filter (fun elm -> (orderIsEqual elm h) |> not) model.SelectedOrders
-              | _ -> []
-    {model with SelectedOrders = so}, Cmd.Empty
-  | SelectAccount account ->
-    { (clearSelection model) with previousScratch = model.scratch
-                                  scratch = account
-                                  ManualFillData = {
-                                      fills = { manualFill = (Array.empty: bts.api.position.ManualFill [])}
-                                      newFills = list.Empty
-                                      updatedFills = list.Empty
-                                      deletedFills = { manualFill = (Array.empty: bts.api.position.ManualFill [])}
-                                      tempSODFillData = emptyTempManualFill
-                                      tempDayFillData = emptyTempManualFill
-                                    }
-                                  marginScratch = emptyMargin
-    }, selectSub None model
-  | GetMarginData ->
-    { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured))
-  | UpdateMarginData newData ->
-    let cmd = match model.tab with
-              | MarginTab -> Cmd.OfPromise.either (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData)
-              | _ -> Cmd.none
-    match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name),
-          (compareDouble model.marginData.leverageFactor model.marginScratch.leverageFactor 10000u),
-          (compareDouble model.marginData.cashBalance model.marginScratch.cashBalance 10000u),
-          (model.marginData.shouldEnforceMargin = model.marginScratch.shouldEnforceMargin) with
-    | true, _, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd
-    | false, true, true, true -> {model with marginData = newData; marginScratch = newData}, cmd
-    | false, false, true, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance; shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd
-    | false, true, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor; shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd
-    | false, false, false, true -> {model with marginData = newData; marginScratch = { model.marginScratch with shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd
-    | false, true, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance; leverageFactor = newData.leverageFactor}}, cmd
-    | false, false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd
-    | false, true, false, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd
-    | false, false, false, false -> {model with marginData = newData}, cmd
-
-  | SetMarginCashBalance newBalance ->
-    { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty
-  | SetMarginCashFactor newFactor ->
-    { model with marginScratch = { model.marginScratch with leverageFactor = newFactor}},Cmd.Empty
-  | SetEnforceMargin enf ->
-    { model with marginScratch = { model.marginScratch with shouldEnforceMargin = enf}},Cmd.Empty
-
-  | ParseCSV (t, data) ->
-    model, Cmd.ofExistingPromise (parseGMIFile data model) id (box>>ErrorOccured)
-  | SavePositionBatch bpb ->
-    model, Cmd.ofExistingPromise (setBasePosition bpb model) id (box>>ErrorOccured)
-
-  | DeleteAccount account ->
-    let mdl = { model with OptionsMenuOpen = ""}
-    match Browser.Dom.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with
-    | true -> mdl, Cmd.ofExistingPromise (deleteAccount model.admin account model ) id (box>>ErrorOccured)
-    | false -> mdl, Cmd.Empty
-  | AddAccount ->
-    match model.can_create with
-    // Create a new scratch account. Send to server after user has filled in details
-    | true-> { model with previousScratch = model.scratch; scratch = { emptyAccount with name = "New Account" } }, Cmd.ofMsg <| SelectTab General
-    | false-> model, Cmd.Empty
-  | SaveScratch ->
-    match isNewAccount model.scratch with
-    | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch model ) id (box>>ErrorOccured)
-    | false -> { model with marginScratch = model.marginData }, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model.ManualFillData model) id (box>>ErrorOccured)
-  | ErrorOccured msg ->
-    Global.alert Global.Error (string msg)
-    Browser.Dom.console.log msg
-    model,Cmd.Empty
-  | SelectTab tab ->
-    match tab with
-    | OrdersTab ->
-      { (clearSelection model) with tab = tab }, Cmd.batch [
-                                                    Cmd.ofMsg GetOrdersData
-                                                    selectSub (Some OrdersTab) model
-                                                    ]
-    | PositionManagementTab ->
-      { (clearSelection model) with tab = tab }, selectSub (Some PositionManagementTab) model
-    | MarginTab ->
-      { (clearSelection model) with tab = tab }, selectSub (Some MarginTab) model
-    | _ ->
-      { (clearSelection model) with tab = tab }, selectSub (Some tab) model
-
-  | Update field ->
-    { model with scratch = applyUpdate model.scratch field }, Cmd.Empty
-  | ClipLimits (oldLimit, newLimit) ->
-    let limits = modifyClipLimitRow model.scratch.securityClipLimits.limit oldLimit newLimit
-    let selectedlimits = List.ofArray (modifyClipLimitRow (Array.ofList model.SelectedClipLimits) oldLimit newLimit)
-    { model with scratch = { model.scratch with securityClipLimits = { limit = limits } }; SelectedClipLimits = selectedlimits }, Cmd.Empty
-  | AddClipLimit limit ->
-    let limits = match (Array.exists (fun (elm:AccountSecurityClipLimitUnit) -> elm.security.securitySymbol = "") model.scratch.securityClipLimits.limit) with
-                  | true -> model.scratch.securityClipLimits.limit
-                  | false -> Array.concat [ model.scratch.securityClipLimits.limit; [| limit |] ]
-
-    { model with scratch = { model.scratch with securityClipLimits = { limit = limits } }}, Cmd.Empty
-  | ChangeMultipleClipLimits (value, selectedLimits) ->
-    let newLimits = Array.ofList [for row in (List.ofArray model.scratch.securityClipLimits.limit) do yield (
-                                                                                                              match (Array.tryFindIndex (fun elm -> ClipLimitIsEqual elm row) selectedLimits) with
-                                                                                                              | None -> row
-                                                                                                              | Some _ -> {row with clipSize = value}
-                                                                                                            )]
-    let newSelected = [for row in (List.ofArray selectedLimits) do yield ( {row with clipSize = value})]
-    { model with scratch = { model.scratch with securityClipLimits = { limit = newLimits } }; SelectedClipLimits = newSelected }, Cmd.Empty
-  | SelectClipLimit (chckd, limits) ->
-    let scl = match chckd, limits.Length > 1 with
-              | true, false -> (limits.[0]::model.SelectedClipLimits)
-              | false, false -> List.filter (fun elm -> (ClipLimitIsEqual elm limits.[0]) |> not) model.SelectedClipLimits
-              | true, true -> List.ofArray limits
-              | false, true -> []
-    {model with SelectedClipLimits = scl}, Cmd.Empty
-  | DeleteClipLimit i ->
-    let limits = erase model.scratch.securityClipLimits.limit i
-    { model with scratch = { model.scratch with securityClipLimits = { limit = limits } } }, Cmd.Empty
-  | ProductLimits (oldLimit, newLimit) ->
-    let limits = modifyProductPositionRow model.scratch.productPositionLimits oldLimit newLimit
-    let selectedlimits = List.ofArray (modifyProductPositionRow (Array.ofList model.SelectedPositionLimits) oldLimit newLimit)
-    { model with scratch = { model.scratch with productPositionLimits = limits }; SelectedPositionLimits = selectedlimits }, Cmd.Empty
-  | AddProductLimit limit ->
-    let limits = match Array.exists (fun (elm:AccountProductPositionLimitUnit) -> elm.product.securitySymbol = "") model.scratch.productPositionLimits with
-                  | true -> model.scratch.productPositionLimits
-                  | false -> Array.concat [ model.scratch.productPositionLimits; [| limit |]]
-    { model with scratch = { model.scratch with productPositionLimits = limits }}, Cmd.Empty
-  | ChangeMultipleProductLimits (valueName, value, selectedLimits) ->
-    let newLimits = Array.ofList [for row in (List.ofArray model.scratch.productPositionLimits) do yield (
-                                                                                                              match (Array.tryFindIndex (fun elm -> PositionLimitIsEqual elm row) selectedLimits), valueName with
-                                                                                                              | Some _, "long" -> {row with longPositionLimit = value}
-                                                                                                              | Some _, "short" -> {row with shortPositionLimit = value}
-                                                                                                              | Some _, _ -> row
-                                                                                                              | None, _ -> row
-                                                                                                            )]
-    let newSelected = [for row in (List.ofArray selectedLimits) do yield (
-                                                                    match valueName with
-                                                                    | "long" -> { row with longPositionLimit = value}
-                                                                    | "short" -> { row with shortPositionLimit = value}
-                                                                    | _ -> row
-                                                              )]
-    { model with scratch = { model.scratch with productPositionLimits = newLimits }; SelectedPositionLimits = newSelected }, Cmd.Empty
-  | SelectProductLimit (chckd, limits) ->
-    let spl = match chckd, limits.Length > 1 with
-              | true, false -> (limits.[0]::model.SelectedPositionLimits)
-              | false, false -> List.filter (fun elm -> (PositionLimitIsEqual elm limits.[0]) |> not) model.SelectedPositionLimits
-              | true, true -> List.ofArray limits
-              | false, true -> []
-
-    {model with SelectedPositionLimits = spl}, Cmd.Empty
-  | DeleteProductLimit i ->
-    let limits = erase model.scratch.productPositionLimits i
-    { model with scratch = { model.scratch with productPositionLimits = limits } }, Cmd.Empty
-  | EnforceProductLimitInNetTerms value ->
-    {model with scratch = {model.scratch with riskLimitEnforcement = { model.scratch.riskLimitEnforcement with productLimitInNetTerms = value } } }, Cmd.none
-  | IgnoreSpreadPositionLimits ig ->
-    {model with scratch = {model.scratch with riskLimitEnforcement = { model.scratch.riskLimitEnforcement with ignoreSpreadPositionLimits = ig } } }, Cmd.none
-  | EnforceLossLimit e ->
-    { model with scratch = { model.scratch with accountLossLimit = { model.scratch.accountLossLimit with enforce = e} } }, Cmd.Empty
-  | TotalLossLimit tll ->
-    { model with scratch = { model.scratch with accountLossLimit = { model.scratch.accountLossLimit with totalLossLimit = tll} } }, Cmd.Empty
-
-  | SecurityLimits limits ->
-    { model with scratch = { model.scratch with securityPositionLimits = limits } }, Cmd.Empty
-  | DeleteSecurityLimit i ->
-    let limits = erase model.scratch.securityPositionLimits i
-    { model with scratch = { model.scratch with securityPositionLimits = limits } }, Cmd.Empty
-  | AddConnection conId ->
-    //ExchangeConnection
-    let cons = match model.adminData with
-                | None -> Array.empty<ExchangeConnection>
-                | Some data -> data.connections
-    let newNameArr = Array.filter<ExchangeConnection> (fun a -> a.id.ToString() = conId) cons
-    let newName = newNameArr.[0].name
-    let newCons = Array.append model.scratch.connections.exchangeConnectionNames [| newName |]
-    { model with scratch = { model.scratch with connections = { model.scratch.connections with exchangeConnectionNames = newCons }}}, Cmd.Empty
-  | RemoveConnection conName ->
-    let newCons = erase model.scratch.connections.exchangeConnectionNames (Array.findIndex (fun a -> a = conName) model.scratch.connections.exchangeConnectionNames)
-    { model with scratch = { model.scratch with connections = { model.scratch.connections with exchangeConnectionNames = newCons }}; ConfirmModal = ("", Msg.SelectTab model.tab)}, Cmd.Empty
-  //
-  // Exchange data
-  | UpdateCME (field:CMEExchangeField) ->
-    let newCme = applyCMEUpdate model.scratch.exchangeAccountData.cmeAccountData field
-    let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = newCme; iceAccountData = model.scratch.exchangeAccountData.iceAccountData; simAccountData = model.scratch.exchangeAccountData.simAccountData } }
-    { model with scratch = scratch }, Cmd.Empty
-  | UpdateICE (field:ICEExchangeField) ->
-    let newICE = applyICEUpdate model.scratch.exchangeAccountData.iceAccountData field
-    let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = model.scratch.exchangeAccountData.cmeAccountData; iceAccountData = newICE; simAccountData = model.scratch.exchangeAccountData.simAccountData } }
-    { model with scratch = scratch }, Cmd.Empty
-  | UpdateSIM field ->
-    let newSim = applySIMUpdate model.scratch.exchangeAccountData.simAccountData field
-    let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = model.scratch.exchangeAccountData.cmeAccountData ; iceAccountData = model.scratch.exchangeAccountData.iceAccountData; simAccountData = newSim } }
-    { model with scratch = scratch }, Cmd.Empty
-  | RequestProducts ->
-      model, Cmd.ofExistingPromise (requestProducts model.mdRelay) id (box>>ErrorOccured)
-  | UpdateProducts data ->
-      { model with mdRelayProductData = data}, Cmd.ofExistingPromise (requestExpNames model.mdRelay) id (box>>ErrorOccured)
-  | RequestExpirationNames ->
-      model, Cmd.ofExistingPromise (requestExpNames model.mdRelay) id (box>>ErrorOccured)
-  | UpdateExpirationNames (data:ExpirationNameList[]) ->
-      { (clearManualFill model) with mdRelayExpNameData = data }, selectSub None model
-  | OpenOptionsMenu acc ->
-    {model with OptionsMenuOpen = acc}, Cmd.Empty
-  | OpenConfirmModal (title, okMessage) ->
-    {model with ConfirmModal = title, okMessage}, Cmd.Empty
-  | SetPositionData data->
-    { model with ManualFillData = {model.ManualFillData with fills = { manualFill = data }}}, Cmd.none
-  | RemoveManualFill (badFillId, isNew) ->
-    match isNew with
-    | false ->
-      let badFill = Array.filter (fun i -> i.recordId = badFillId) model.ManualFillData.fills.manualFill
-      let newDeletedFills = { manualFill = Array.append model.ManualFillData.deletedFills.manualFill [|badFill.[0]|]}
-      { model with ManualFillData = {model.ManualFillData with deletedFills = newDeletedFills} }, Cmd.Empty
-    | true ->
-      let newAdds = List.filter (fun (i:TempFillData) -> i.newId <> uint32 badFillId) model.ManualFillData.newFills
-      { model with ManualFillData = {model.ManualFillData with newFills = newAdds} }, Cmd.Empty
-
-  | AddManualFill isSOD ->
-    let fType = match isSOD with true -> ManualFill.FillType.AdminSod | false -> ManualFill.FillType.AdminDay
-    let nID = match model.ManualFillData.newFills.Length with  0 -> 0u | _ -> ((model.ManualFillData.newFills |> List.maxBy (fun i -> i.newId)).newId + 1u)
-    let newFills = model.ManualFillData.newFills @ [{ emptyTempManualFill with newId = nID; fillType = fType }]
-    { model with ManualFillData = {model.ManualFillData with newFills = newFills; tempDayFillData = {model.ManualFillData.tempDayFillData with qty = ""; price = ""} }}, Cmd.Empty
-
-  | UpdateManualFill (id, input, place, isNew) ->
-    match isNew with
-    | false ->
-      let fill = match List.tryFind (fun (t:TempFillData) -> t.id = id) model.ManualFillData.updatedFills with
-                  | None ->
-                        let f = Array.find (fun (o:ManualFill) -> o.recordId = int id) model.ManualFillData.fills.manualFill
-                        convertManualFIll f model
-                  | Some f -> f
-
-      let updatedFill = match place with
-                        | "qty" -> if (validateManualFillQty input) then { fill with qty = input} else fill
-                        | "price" -> { fill with price = input}
-                        | "side" -> { fill with side = input}
-                        | "user" -> { fill with user = input}
-                        | "venue" -> { fill with venue = input; symbol = ""; SecurityId = "0" }
-                        | "symbol" -> { fill with symbol = input; SecurityId = "0" }
-                        | "expiration" -> { fill with expiration = input}
-                        | "SecurityId" -> { fill with SecurityId = input}
-                        | _ -> fill
-
-      let filteredList = List.filter (fun (g:TempFillData) -> g.id <> id) model.ManualFillData.updatedFills
-      let finalList = filteredList @ [updatedFill]
-      match Array.tryFind (fun i -> i.recordId = int id) model.ManualFillData.deletedFills.manualFill with
-      | Some _ -> model, Cmd.Empty
-      | None -> { model with ManualFillData = {model.ManualFillData with updatedFills = finalList}}, Cmd.Empty
-    | true ->
-      let fill = match List.tryFind (fun (t:TempFillData) -> t.newId = id) model.ManualFillData.newFills with
-                  | None -> emptyTempManualFill
-                  | Some f -> f
-
-      let updatedFill = match place with
-                        | "qty" -> if (validateManualFillQty input) then { fill with qty = input} else fill
-                        | "price" -> { fill with price = input}
-                        | "side" -> { fill with side = input}
-                        | "user" -> { fill with user = input}
-                        | "venue" -> { fill with venue = input; symbol = ""; SecurityId = "0" }
-                        | "symbol" -> { fill with symbol = input; SecurityId = "0" }
-                        | "expiration" -> { fill with expiration = input}
-                        | "SecurityId" -> { fill with SecurityId = input}
-                        | _ -> fill
-
-      let filteredList = List.filter (fun (g:TempFillData) -> g.newId <> id) model.ManualFillData.newFills
-      let finalList = filteredList @ [updatedFill]
-      let sortedList = finalList |> List.sortBy (fun i -> i.newId)
-
-      { model with ManualFillData = {model.ManualFillData with newFills = sortedList}}, Cmd.Empty
-
-  | CreateManualFillUpdate  (id, venue, symbol) ->
-    let fill = match List.tryFind (fun (t:TempFillData) -> t.id = id) model.ManualFillData.updatedFills with
-                | None ->
-                      let f = Array.find (fun (o:ManualFill) -> o.recordId = int id) model.ManualFillData.fills.manualFill
-                      convertManualFIll f model
-                | Some f -> f
-
-    let updatedFill =  { fill with venue = venue;  symbol = symbol}
-
-    let finalList = model.ManualFillData.updatedFills @ [updatedFill]
-    match Array.tryFind (fun i -> i.recordId = int id) model.ManualFillData.deletedFills.manualFill with
-    | Some _ -> model, Cmd.Empty
-    | None -> { model with ManualFillData = {model.ManualFillData with updatedFills = finalList}}, Cmd.Empty
-
-
@@ -1,187 +0,0 @@
-module Accounts.Types
-
-open bts.api.admin
-open bts.api
-open bts.api.orderman
-open JSMap
-open bts.co2
-open bts.api.position
-
-type Tab =
-  | General
-  | LimitsTab
-  | CreditLimitsTab
-  | ExchangeSettingsTab
-  | ConnectionsTab
-  | OrdersTab
-  | PositionManagementTab
-  | MarginTab
-
-let venues = [| Venue.DERIBIT; Venue.GLBX; Venue.ICE; Venue.SIM; |]
-
-let securityTypes = [| SecurityType.FUTURE; SecurityType.OPTION; SecurityType.SPREAD; |]
-
-let emptyAccount = Access.Accounts.empty
-
-type AccountField =
-  | AccountName of string
-  | Description of string
-  | IsActive of bool
-
-
-type CMEExchangeField =
-  | CTI of CTICode
-  | Origin of CustomerOrFirm
-  | ClearingAccount of string
-  | MiscTagMapping of JSMap<string>
-
-type DERIBITExchangeField =
-  | CTI of CTICode
-  | Origin of CustomerOrFirm
-  | ClearingAccount of string
-
-type ICEExchangeField =
-  | CTI of CTICode
-  | Origin of CustomerOrFirm
-  | ClearingAccount of string
-  | ClearingFirm of string
-  | CustomerAccountRefId of string
-  | AccountCode of string
-  | MiscTagMapping of JSMap<string>
-
-type SIMExchangeField =
-  | CTI of CTICode
-  | Origin of CustomerOrFirm
-  | ClearingAccount of string
-
-type PositionSecurity =
-  {
-    securityName: string
-    venue: bts.api.Venue
-    symbol: string
-  }
-
-type FileType =
-  | GMI
-  | Money
-
-type Msg =
-  | UpdateAdminData of AdminData
-  | NoAdminData of string
-  | SetUnsub of System.IDisposable
-  // Orders
-  | GetOrdersData
-  | UpdateOrdersData of OrdersSummary
-  | SelectOrder of bool * OrdersSummaryUnit list
-  | CancelOrders of OrdersSummaryUnit list
-  // Margin / Span
-  | GetMarginData
-  | UpdateMarginData of ExcessLiquidityReport
-  | SetMarginCashBalance of double
-  | SetMarginCashFactor of double
-  | SetEnforceMargin of bool
-
-  | ParseCSV of FileType * string
-  | SavePositionBatch of BasePositionBatch
-
-  | SelectAccount of BTSAccount
-  | DeleteAccount of BTSAccount
-  | AddAccount
-  | SaveScratch
-
-  | ErrorOccured of obj
-  // Tabs
-  | SelectTab of Tab
-  // General
-  | Update of AccountField
-  // Clip Limits
-  | ClipLimits of AccountSecurityClipLimitUnit * AccountSecurityClipLimitUnit
-  | AddClipLimit of AccountSecurityClipLimitUnit
-  | ChangeMultipleClipLimits of uint32 * AccountSecurityClipLimitUnit[]
-  | SelectClipLimit of bool * AccountSecurityClipLimitUnit[]
-  | DeleteClipLimit of int
-  //Product (position) Limits
-  | ChangeMultipleProductLimits of string * uint32 * AccountProductPositionLimitUnit []
-  | SelectProductLimit of bool * AccountProductPositionLimitUnit[]
-  | ProductLimits of AccountProductPositionLimitUnit * AccountProductPositionLimitUnit
-  | AddProductLimit of AccountProductPositionLimitUnit
-  | DeleteProductLimit of int
-  | EnforceProductLimitInNetTerms of bool
-
-  | EnforceLossLimit of bool
-  | TotalLossLimit of uint32
-  | IgnoreSpreadPositionLimits of bool
-
-  | SetPositionData of ManualFill []
-  | RemoveManualFill of int * bool
-  | AddManualFill of bool
-  | UpdateManualFill of uint32 * string * string * bool
-  | CreateManualFillUpdate of uint32 * string * string
-
-  | SecurityLimits of AccountSecurityPositionLimitUnit[]
-  | DeleteSecurityLimit of int
-  // ExchangeData
-  | UpdateCME of CMEExchangeField
-  | UpdateICE of ICEExchangeField
-  | UpdateSIM of SIMExchangeField
-  | RequestProducts
-  | UpdateProducts of Product[]
-  | RequestExpirationNames
-  | UpdateExpirationNames of ExpirationNameList[]
-  | AddConnection of string
-  | RemoveConnection of string
-  | OpenOptionsMenu of string
-  | OpenConfirmModal of string * Msg
-
-type TempFillData = { id: uint32
-                      newId: uint32
-                      qty:string
-                      price:string
-                      side:string
-                      user:string
-                      venue:string
-                      symbol:string
-                      expiration:string
-                      SecurityId:string
-                      fillType: ManualFill.FillType
-                    }
-
-type ManualFillData = {
-    fills: ManualFillBatch
-    newFills: TempFillData list
-    updatedFills: TempFillData list
-    tempSODFillData: TempFillData
-    tempDayFillData: TempFillData
-    deletedFills: ManualFillBatch
-  }
-
-type Model = {
-  tab : Tab
-  admin : IAdminService
-  context : ServiceContext.ServiceContext option
-  unsub : System.IDisposable option
-  basePositionService: IBasePositionService
-  positionService: IPositionService
-  marginService: IMarginService
-  marginData: ExcessLiquidityReport
-  marginScratch: ExcessLiquidityReport
-  adminData : AdminData option
-  ordersData : OrdersSummaryUnit list
-  SelectedOrders: OrdersSummaryUnit list
-  mdRelay : IMarketDataRelay
-  mdRelayProductData: Product[]
-  mdRelayExpNameData: ExpirationNameList[]
-  scratch : BTSAccount
-  previousScratch : BTSAccount
-  AllValue: string
-  AllValueDisplay: string
-  SelectedClipLimits: AccountSecurityClipLimitUnit list
-  SelectedPositionLimits: AccountProductPositionLimitUnit list
-  OptionsMenuOpen:string
-  ConfirmModal: string * Msg
-  token: string
-  can_create: bool
-  this_username: string
-  ShowLoading: bool
-  ManualFillData: ManualFillData
-}
@@ -1,7 +0,0 @@
-module Cmd
-  let ofExistingPromise p ok err =
-    Elmish.Cmd.OfPromise.either
-      (fun _ -> p)
-      ()
-      ok
-      err
@@ -1,158 +0,0 @@
-module ReactGrid
-open Fable.React
-open Fable.React.Props
-// open Fable.React.Props.HTMLAttr
-open Fable.Core.JsInterop
-open Fable.Core
-(* open Fable.Core.JS.Constructors *)
-open Fable.Core.DynamicExtensions
-open Fable.Import
-
-(*  *)
-type GridUpdate = {
-  cellKey : string
-  fromRow : int
-  toRow : int
-  rowIds: int[]
-  updated: obj
-}
-
-type ColumnProps =
-  | Key of string
-  | Name of string
-  | Width of int
-  | Editable of bool
-  | Editor of ReactElement
-  | Formatter of ReactElement
-
-type Row = obj
-type GridProps =
-  | EnableCellSelect of bool
-  | EnableRowSelect of bool
-  | RowsCount of int
-  | MinHeight of int
-  | RowGetter of (int->Row)
-  | OnGridRowsUpdated of (GridUpdate->unit)
-  | OnRowSelect of (Row list->unit)
-  | RowKey of string
-
-
-let reactGrid (columns:ColumnProps list[]) props = 
-  let props' = (keyValueList CaseRules.LowerFirst props)
-  let columns' = Array.map (keyValueList CaseRules.LowerFirst) columns
-  props'.["columns"] <- columns'
-  ofImport "default" "react-data-grid" props' []
-
-(*  *)
-type SelectEditorProps = {
-  options : string[]
-}
-let selectEditor (props:SelectEditorProps) =
-  ofImport "Editors.DropDownEditor" "react-data-grid-addons" props []
-
-let selectFormatter (props:SelectEditorProps) =
-  ofImport "Formatters.DropDownFormatter" "react-data-grid-addons" props []
-
-let selectColumn<'a> key header (options:'a[]) =
-    [ Key key
-      Name header
-      Editor (selectEditor { options = unbox options })
-      Formatter (selectFormatter { options = unbox options })
-    ]
-
-
-
-type MyStu = {
-    value: int
-}
-
-type MyUpd = {
-    incr: int
-}
-
-(*  *)
-type private ButtonProps = {
-  icon : string
-  title: string
-  action : int->unit
-  // .value will be row.[ColumnProps.Key] -but- if we set it then it does't get overwritten
-  // value : obj option
-  rowIdx : int
-  misc : obj
-}
-
-let private my_do_upd (u: MyUpd) (s: MyStu): MyStu =
-    {
-        value = s.value + u.incr
-    }
-
-let private my_to_view (m: ReactiveComponents.Model<ButtonProps, MyStu>) (proc_msg: MyUpd->unit): ReactElement =
-    div [] []
-
-let private my_initagain (p: ButtonProps): MyStu =
-    {
-        value = 0
-    }
-
-// let my_to_view (m: Mod)
-let private my_init (arg: ButtonProps): ReactiveComponents.Props<ButtonProps, MyStu, MyUpd> =
-    {
-        key = "id"
-        props = arg
-        update = my_do_upd
-        view = my_to_view
-        init = my_initagain
-    }
-
-
-// let private init_button_ = 
-
-// type private ButtonFormatter(initProps : ButtonProps) as self =
-//   inherit ReactiveComponents.ReactiveCom<ButtonProps, obj, obj>(initProps) with
-//   do self.setInitState ()
-//   override __.render() =
-//     // Browser.console.log(self.props)
-//     p [ ClassName "control" ] [
-//       a [ ClassName "button"
-//           Title self.props.title
-//           OnClick (fun _ -> self.props.action self.props.rowIdx) ] [
-//           span [ ClassName "icon is-small" ] [ 
-//             i [ ClassName (sprintf "fa fa-%s" self.props.icon)] [ ] ]
-//       ]
-//     ]
-
-
-type private ButtonFormatter(initProps: ButtonProps)  as self =
-    inherit ReactiveComponents.ReactiveCom<ButtonProps, MyStu, MyUpd>(initProps |> my_init)
-
-    override __.render() =
-        p [ ClassName "control" ] [
-            a [ ClassName "button"
-                Title self.props.props.title
-                OnClick (fun _ -> self.props.props.action self.props.props.rowIdx ) ] [
-                span [ ClassName "icon is-small" ] [
-                    i [ ClassName (sprintf "fa fa-%s" self.props.props.icon)] []
-                ]
-            ]
-        ]
-
-
-
-let buttonColumn action header icon misc =
-    let (bn_col_props: ButtonProps) = {
-        title = header;
-        icon = icon;
-        action = action;
-        rowIdx = 0;
-        misc = misc;
-    }
-    [ HTMLAttr.Name header
-      Style [ Fable.React.Props.CSSProp.Width 60 ]
-    ]
-
-//   [ Name header
-//     Style [ Width 60 ]
-//     Formatter (ofType<ButtonFormatter, MyStu, MyUpd> { title = header; icon = icon; action = action; rowIdx = 0; misc = misc } [])
-//   ]
-
-
@@ -1,7 +0,0 @@
-module nbsp
-
-
-open Fable.Core
-open Fable.React
-open Fable.React.Props
-let element = span [ Style [PaddingLeft "1ex"] ] [str " "]
@@ -1,23 +0,0 @@
-module Imports
-
-open Fable.Core
-open Fable.Core.JS
-open Fable.Core.JsInterop
-
-
-// [<Import("*",from="/home/john/Documents/repos/bts/spark-crypto/src/web/ui/src/web/api/ServiceContext")>]
-// let ServiceContext : ServiceContext.IExports = jsNative
-
-// [<Import("*",from="/home/john/Documents/repos/bts/spark-crypto/src/web/ui/src/web/api/DynamicService")>]
-// let DynamicService : DynamicService.IExports = jsNative
-[<Import("*",from="ServiceContext")>]
-let ServiceContext : ServiceContext.IExports = jsNative
-
-[<Import("*",from="DynamicService")>]
-let DynamicService : DynamicService.IExports = jsNative
-
-
-// let ServiceContext : ServiceContext.IExports = importAll "ServiceContext"
-// let DynamicService : DynamicService.IExports = importAll "DynamicService"
-
-// let DynamicService : DynamicService.IExports = importAll "web/api/DynamicService"
@@ -1,86 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>1.0.0</Version>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(SPARK_ADMIN_WEB_APP_OUTPUT_DIR)'==''">
-      <PropertyGroup>
-        <API>../../../build/Spark.Admin.WebApp</API>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <API>$(SPARK_ADMIN_WEB_APP_OUTPUT_DIR)</API>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <!-- Global to the app -->
-    <Compile Include="Lens.fs" />
-    <Compile Include="Cmd.fs" />
-
-    <Compile Include="$(API)/ServiceContext.fs" />
-    <Compile Include="$(API)/DynamicService.fs" />
-    <Compile Include="Imports.fs" />
-    <Compile Include="Util/JSMap.fs" />
-    <Compile Include="Util/StreamUtils.fs" />
-    <Compile Include="Util/EnumUtils.fs" />
-    <Compile Include="$(API)/fable/timestamp.fable.fs" />
-    <Compile Include="$(API)/fable/apicore.fable.fs" />
-    <Compile Include="$(API)/fable/apioptions.fable.fs" />
-    <Compile Include="$(API)/fable/Security.fable.fs" />
-    <Compile Include="$(API)/fable/SparkProtos.fable.fs" />
-    <Compile Include="$(API)/fable/HelloService.fable.fs" />
-    <Compile Include="$(API)/fable/OrderService.fable.fs" />
-    <Compile Include="$(API)/fable/AdminService.fable.fs" />
-    <Compile Include="$(API)/fable/PositionService.fable.fs" />
-    <Compile Include="$(API)/fable/BasePositionService.fable.fs" />
-    <Compile Include="$(API)/fable/MarginService.fable.fs" />
-    <Compile Include="$(API)/fable/co2.fable.fs" />
-    <Compile Include="$(API)/fable/MarketDataRelay.fable.fs" />
-    <!-- Global to the app -->
-    <Compile Include="Global.fs" />
-    <Compile Include="Controls/nbsp.fs" />
-    <Compile Include="Controls/Button.fs" />
-    <Compile Include="Controls/ReactGrid.fs" />
-    <Compile Include="Controls/DataGrid.fs" />
-    <Compile Include="Controls/Fields.fs" />
-    <Compile Include="Controls/Table.fs" />
-    <Compile Include="Controls/Modal.fs" />
-    <Compile Include="Access.fs" />
-    <!-- Login -->
-    <Compile Include="Login/Login.fs" />
-    <!-- Accounts -->
-    <Compile Include="Accounts/Types.fs" />
-    <Compile Include="Accounts/ClipLimits.fs" />
-    <Compile Include="Accounts/ProductLimits.fs" />
-    <Compile Include="Accounts/SecurityLimits.fs" />
-    <Compile Include="Accounts/State.fs" />
-    <Compile Include="Accounts/View.fs" />
-    <!-- Users -->
-    <Compile Include="Users/Types.fs" />
-    <Compile Include="Users/State.fs" />
-    <Compile Include="Users/View.fs" />
-    <!-- App -->
-    <Compile Include="Types.fs" />
-    <Compile Include="State.fs" />
-    <Compile Include="Nav.fs" />
-    <Compile Include="App.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Elmish" Version="4.0.1" />
-    <PackageReference Include="Elmish.Navigation" Version="1.0.0" />
-    <PackageReference Include="Fable.Core" Version="4.0.0-theta-007" />
-    <PackageReference Include="Fable.Elmish" Version="4.0.1" />
-    <PackageReference Include="Fable.Elmish.Browser" Version="4.0.1" />
-    <PackageReference Include="Fable.Elmish.React" Version="4.0.0" />
-    <PackageReference Include="Fable.Elmish.UrlParser" Version="1.0.1" />
-    <PackageReference Include="Fable.Elmish.Debugger" Version="4.0.0" />
-    <PackageReference Include="Fable.Elmish.HMR" Version="7.0.0" />
-    <PackageReference Include="Fable.Promise" Version="3.2.0" />
-    <PackageReference Include="Fable.React" Version="9.2.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
-  </ItemGroup>
-</Project>
@@ -1,36 +0,0 @@
-module App.State
-
-open Elmish
-open Types
-
-
-let init () =
-    let model,cmd = Login.init()
-    PreLogin model, Cmd.map LoginMsg cmd
-
-let updateLoggedIn msg model =
-    match msg, model.page with
-    | UsersMsg msg, UsersModel m ->
-        let (users, usersCmd) = Users.State.update msg m
-        { model with page = UsersModel users }, Cmd.map UsersMsg usersCmd
-    | AccountsMsg msg, AccountsModel m ->
-        let (acc, msg) = Accounts.State.update msg m
-        { model with page = AccountsModel acc }, Cmd.map AccountsMsg msg
-    | Navigate (page,pcmd), _ ->
-        { model with page = page }, pcmd
-    | _ -> model, Cmd.Empty
-
-let update msg model =
-    match model with
-    | PreLogin p ->
-        match msg with
-        | LoginMsg (Login.LoginSuccess ctx) ->
-            let (lmodel, lmsg) = Users.State.init ctx
-            LoggedIn { context = ctx; page = UsersModel lmodel }, Cmd.map UsersMsg lmsg
-        | LoginMsg m' ->
-            let (lmodel, lmsg) = Login.update m' p
-            PreLogin lmodel, Cmd.map LoginMsg lmsg
-        | _ -> model, Cmd.Empty
-    | LoggedIn m ->
-        let lmodel, lmsg = updateLoggedIn msg m
-        LoggedIn lmodel, lmsg
@@ -1,24 +0,0 @@
-module App.Types
-
-open Global
-open ServiceContext
-
-type Page =
-  | UsersModel of Users.Types.Model
-  | AccountsModel of Accounts.Types.Model
-
-type Msg =
-  | UsersMsg of Users.Types.Msg
-  | LoginMsg of Login.Message
-  | Navigate of Page*Elmish.Cmd<Msg>
-  | AccountsMsg of Accounts.Types.Msg
-
-
-type LoggedInModel = {
-  context : ServiceContext
-  page : Page
-}
-
-type Model =
-  | PreLogin of Login.Model
-  | LoggedIn of LoggedInModel
Author	SHA1	Message	Date
Kevin Darby	0d24062f03	Merge branch 'dotnet' of bitbucket.org:bluetradesys/spark into windows_docker	2020-01-08 17:25:30 -05:00
Kevin Darby	44e0eae281	Merge branch 'master' of bitbucket.org:bluetradesys/spark into dotnet	2020-01-08 17:24:55 -05:00
Kevin Darby	152ab05b4e	remove externals sharing	2020-01-08 17:08:49 -05:00
Kevin Darby	4257a172c1	fixed shared obj dir on linux build	2019-12-31 12:39:54 -05:00
Kevin Darby	721a08c4b4	remove these CMakeDeps so gitignore can ignore	2019-12-31 10:44:32 -05:00
Kevin Darby	41a3535e84	made some minor changes to support running a dev environment in our api docker on windows	2019-12-31 10:07:55 -05:00
Kevin Darby	626629bf06	added spark_vm_shell for windows	2019-12-31 10:06:54 -05:00
Eric Harding	487aaef02f	update cmake	2019-12-16 13:12:50 -05:00
Eric Harding	f22fc03e56	merge master	2019-12-16 12:54:19 -05:00
Kevin Darby	5f45ddf210	wack vs backwack	2019-11-28 02:46:27 +00:00
Kevin Darby	d6a533ca5c	PR feedback	2019-11-27 17:21:24 -05:00
Kevin Darby	20e58dc80b	address PR concerns	2019-11-13 16:46:36 -05:00
Kevin Darby	5773945791	add data dir for .net in linux make sparkcmd build in the right place on windows again	2019-11-11 17:12:55 -05:00
Kevin Darby	721c889235	release mode uses published sparkcmd	2019-11-06 18:22:06 -05:00
Kevin Darby	9957af655f	hooked sparkcmd linux build to the main server build stuff	2019-11-06 17:47:21 -05:00
Kevin Darby	eab92fb486	damn windows casing	2019-11-06 13:55:29 -05:00
Kevin Darby	9f1cd47cfa	hooking build to cmake	2019-11-06 13:55:07 -05:00
Kevin Darby	90c3edbbe7	adding core 2 back to docker per eric	2019-11-06 13:24:57 -05:00
Kevin Darby	adee8b584c	capitalized first letter of proto to work around a protoc bug	2019-11-06 12:43:27 -05:00
Kevin Darby	329ad323e0	delete protos to change case on windows	2019-11-06 12:41:37 -05:00
Kevin Darby	c713b97441	cleanup csproj	2019-11-05 18:23:09 -05:00
Kevin Darby	eb79264b9b	netcore builds on linux through dotnet build	2019-11-05 18:19:17 -05:00
				`@@ -0,0 +1 @@`
				set(sources /home/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)