From 159e8fba2392e896dcff46eb81767e156447fdaa Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 12 Jun 2019 18:17:09 -0400 Subject: [PATCH 001/198] beginnings of span, should't be long --- src/lib/api/services/MarginService.proto | 28 +++++ .../sparkd/position/IMarginObserver.cpp | 9 -- src/server/sparkd/position/IMarginObserver.h | 18 --- src/server/sparkd/position/MarginResult.h | 4 +- .../sparkd/position/MarginServiceCore.cpp | 104 +++++++++-------- .../sparkd/position/MarginServiceCore.h | 16 +-- .../sparkd/position/MarginServiceServer.cpp | 105 ++++++++++++++++++ .../sparkd/position/MarginServiceServer.h | 33 ++++++ src/server/sparkd/position/Position.h | 13 +-- 9 files changed, 236 insertions(+), 94 deletions(-) create mode 100644 src/lib/api/services/MarginService.proto delete mode 100644 src/server/sparkd/position/IMarginObserver.cpp delete mode 100644 src/server/sparkd/position/IMarginObserver.h create mode 100644 src/server/sparkd/position/MarginServiceServer.cpp create mode 100644 src/server/sparkd/position/MarginServiceServer.h diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto new file mode 100644 index 000000000..e870029ce --- /dev/null +++ b/src/lib/api/services/MarginService.proto @@ -0,0 +1,28 @@ +syntax="proto3"; +package bts.api.position; +option csharp_namespace="bts.api.position"; +import "lib/api/apioptions.proto"; +import "lib/api/apicore.proto"; +import "lib/domain_model/Security.proto"; + +message MarginResult { + int32 id = 1 [(bts.api.key)=true]; + string account = 10; + string portfolio_id = 15; + string settle_indicator = 20; + string settle_qualifier = 30; + string as_of_time = 40; + string calculation_id = 50; + + double opt_value = 100; + double nonopt_value = 110; + double maint_margin = 120; + double initial_margin = 130; +} + +service MarginService { + option (bts.api.service_description) = "Provides CME Margin Information per account"; + + // subscription + rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); +} \ No newline at end of file diff --git a/src/server/sparkd/position/IMarginObserver.cpp b/src/server/sparkd/position/IMarginObserver.cpp deleted file mode 100644 index 6536da462..000000000 --- a/src/server/sparkd/position/IMarginObserver.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "IMarginObserver.h" - -namespace bts -{ -namespace position -{ - IMarginObserver::~IMarginObserver() {} -} -} diff --git a/src/server/sparkd/position/IMarginObserver.h b/src/server/sparkd/position/IMarginObserver.h deleted file mode 100644 index de4a0e278..000000000 --- a/src/server/sparkd/position/IMarginObserver.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" - -namespace bts -{ -namespace position -{ -struct MarginResult; -class -IMarginObserver -{ -public: - virtual ~IMarginObserver(); - virtual void on_margin_change(const orderman::AccountName&, const MarginResult&) = 0; -}; -} -} diff --git a/src/server/sparkd/position/MarginResult.h b/src/server/sparkd/position/MarginResult.h index 53cd29332..c04f0a09b 100644 --- a/src/server/sparkd/position/MarginResult.h +++ b/src/server/sparkd/position/MarginResult.h @@ -9,7 +9,9 @@ namespace position { struct MarginResult { - bool valid; + enum class ResultStatus { NewValid, CachedValid, Error }; + ResultStatus result_status; + std::string settle_indicator; std::string settle_qualifier; std::string portfolio_id; diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 3bc45e612..b98720bff 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -3,7 +3,6 @@ #include "PositionServiceCore.h" #include "Position.h" #include "MarginResult.h" -#include "IMarginObserver.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" @@ -39,25 +38,22 @@ namespace position using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { - securities::ISecurityDB& db; - PositionServiceCore position_service; - IMarginObserver* observer; MarginMap last_results, last_valid_results; std::string url_base, core_user, core_password, post_margin_path, get_margin_path; size_t max_iterations; bool verbose; int throttle; - bts::datetime::PTime last_update; - PImpl(securities::ISecurityDB& d, IMarginObserver* obs) : - db(d), position_service(d), observer(obs), last_results(), last_valid_results(), - url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("BT5u53r!"), + bts::datetime::PTime last_call; + PImpl() : + last_results(), last_valid_results(), //api_bts_span BT5Margin! + url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("Summer123"), post_margin_path("margins/?complete=true"), get_margin_path("margins/"), max_iterations(20), verbose(false), throttle(30000), - last_update() + last_call() { auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) @@ -321,7 +317,7 @@ struct MarginServiceCore::PImpl }; bool compute_margin(const std::string& account_name, const std::string& portfolid_id, - const std::vector& pos, MarginResult& margin) + const std::vector& pos, std::function cb) { margin.valid = false; pugi::xml_document doc; @@ -331,12 +327,9 @@ struct MarginServiceCore::PImpl size_t count = 0; for(const auto& i : pos) { - if(i.security && i.security->has_glbx()) - { - int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security->glbx().security_desc(), p, "\n"); - count++; - } + int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); + request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security_desc, p, "\n"); + count++; } if(count > 0) { @@ -345,6 +338,30 @@ struct MarginServiceCore::PImpl xml_string_writer writer(xml); doc.save(writer); + post(post_margin_path, xml, reply); + std::string portid_resp, calcid_resp; + if(parse_margin_response(reply, portid_resp, calcid_resp)) + { + utils::Dispatcher::get_named("MarginServiceServer").post( + [=]() + { + try + { + if(get(get_margin_path + calcid_resp, reply2)) + { + parse_margin_calculation(reply2, margin); + return true; + } + } + catch(...) + { + } + }, 5000); + return true; + } + } + + size_t iters = 0; while(iters++ < max_iterations) { @@ -368,56 +385,49 @@ struct MarginServiceCore::PImpl } }; -MarginServiceCore::MarginServiceCore(securities::ISecurityDB& db, IMarginObserver* obs) - : me(new PImpl(db, obs)) +MarginServiceCore::MarginServiceCore() : me(new PImpl()) { } MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::pump(const orderman::AccountName& acct) -{ - MarginResult result; - return compute_margin(acct, result); -} -bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, + std::function cb) { auto now = bts::datetime::now(); - auto diff = bts::datetime::ptime_diff_in_ms(now, me->last_update); - if(me->last_update.is_not_a_date_time() || abs(diff) > me->throttle) + auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); + if(me->last_call.is_not_a_date_time() || diff > me->throttle) { - query_margin_webapi(acct, result); - me->last_update = now; - return true; + me->last_call = now; + return query_margin_webapi(acct, pos, cb); } else { - get_last_valid_result(acct, result); - return false; //false, we did not get new data + MarginResult result; + if(get_last_valid_result(acct, result)) + { + result.status = MarginResult::ResultStatus::CachedValid; + cb(result); + } + return false; //no error } } -bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, MarginResult& margin) +bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, + std::function cb) { - std::vector pos; - me->position_service.query_all_positions(acct, pos); utils::Uuid guid; - bool succ = me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, margin); - if(me->observer) - me->observer->on_margin_change(acct, margin); - me->last_results.insert_or_assign(acct, margin); - if(succ && margin.valid) - me->last_valid_results.insert_or_assign(acct, margin); - return succ; + return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + [this, &] (const MarginResult& m) + { + me->last_results.insert_or_assign(acct, m); + if(m.status == MarginResult::ResultStatus::NewValid) + me->last_valid_results.insert_or_assign(acct, m); + cb(m); + }); } -bool MarginServiceCore::query_margin_webapi(const std::vector& pos, MarginResult& margin) -{ - utils::Uuid guid; - std::string str = guid.to_text_string(); - return me->compute_margin(str.substr(0, 3), str, pos, margin); -} void MarginServiceCore::set_verbose_debugging(bool verb) { diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index 51ab6321e..db3226098 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -17,22 +17,18 @@ class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); public: - MarginServiceCore(securities::ISecurityDB&, IMarginObserver* obs = nullptr); + + MarginServiceCore(); ~MarginServiceCore(); - - //Call as much as you want; it will update IMarginObserver at most once every 30s - bool pump(const orderman::AccountName&); - //Call as much as you want; it will query the webapi at most once every 30s - bool compute_margin(const orderman::AccountName&, MarginResult&); + void compute_margin(const orderman::AccountName&, const std::vector&, std::function); private: friend class PositionTests; bool get_last_valid_result(const orderman::AccountName&, MarginResult&); bool get_last_result(const orderman::AccountName&, MarginResult&); - //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, MarginResult&); - //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const std::vector&, MarginResult&); + + //This is a blocking call to a WebAPI. Very Slow. + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); void set_verbose_debugging(bool); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp new file mode 100644 index 000000000..fbf6872e3 --- /dev/null +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -0,0 +1,105 @@ +#include "MarginServiceServer.h" +#include "Position.h" + +#include "lib/persistence/SqliteStore.h" +#include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" +#include "lib/utils/PBUtils.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/AuthToken.h" +#include "lib/utils/Dispatcher.h" + +#include +#include +#include +#include +#include +#include + +using namespace bts::api::orderman; +using namespace bts::api::position; +using namespace std; + +namespace bts { +namespace position { + +MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md::MDClient& mdclient) + : bts::api::position::MarginServiceBase (context), + _publisher(make_margin_data_stateful_publisher()), + _position_service(context.locate()), + _position_map(), + _oracle(mdclient) +{ + LOG(Gen, Info, "MarginServiceServer: service started"); + + _position_service.subscribe_position_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + for (const auto& o : update.removed()) + { + const auto& it = _position_map.find(o->record_id()); + if(it != _position_map.end()) + _position_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _position_map[o->record_id()] = *o; + } + for (const auto& o : update.added()) + { + _position_map[o->record_id()] = *o; + } + }); + + auto& disp = utils::Dispatcher::get_named("MarginServiceServer"); + utils::DispatcherTimer web_api_timer(disp, 250, [&]() + { + for (auto& p: platforms) + p->send_heartbeats(); + }); + web_api_timer.start(); + + disp.run(); +} + +MarginServiceServer::~MarginServiceServer() {} + +void MarginServiceServer::query_accounts_and_positions(std::map, std::vector& result) + +void MarginServiceServer::query_all_positions(const orderman::AccountName& account, std::vector& result) +{ + result.reserve(_position_map.size()); + for(auto& entry : _position_map) + { + if(entry.second.account() != account) + continue; + const PositionUnit& unit = entry.second; + auto sec = _oracle.get_security(unit.security_id()); + if(sec && sec->has_glbx()) + { + Position pos; + pos.account = unit.account(); + pos.security_desc = securities::descriptor(*sec); + int32_t pos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); + pos.position = Quantity(abs(pos)); + pos.side = (pos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } +} + +void MarginServiceServer::_publish_margin() +{ + // // TODO, need to delete all state + // std::vector entitlements; + // AdminServiceUtils::get_md_entitlement_report(_state,entitlements); + // for (const auto& e : entitlements) + // _md_entit_publisher.add_or_update(e); + // _md_entit_publisher.flush(); +} +}} + diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h new file mode 100644 index 000000000..917466af9 --- /dev/null +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/api/services/MarginService.server.pb.h" +#include "lib/md/SecurityOracle.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" +#include "lib/utils/bts_no_copy.h" +#include +#include + +namespace bts { +namespace securities { class ISecurityDB; } +namespace position { +struct Position; + +class MarginServiceServer : public api::position::MarginServiceBase +{ +public: + MarginServiceServer(bts::api::ServiceContext&, md::MDClient&); + ~MarginServiceServer(); + +private: + void query_all_positions(const orderman::AccountName&, std::vector&); + void _publish_margin(); + +private: + MarginServiceBase::Margin_dataStatefulPublisher _publisher; + api::position::PositionService _position_service; + std::map _position_map; + securities::SecurityOracle _oracle; +}; +}} diff --git a/src/server/sparkd/position/Position.h b/src/server/sparkd/position/Position.h index 715f27724..c36fab8c0 100644 --- a/src/server/sparkd/position/Position.h +++ b/src/server/sparkd/position/Position.h @@ -1,19 +1,14 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/domain_model/Security.pb.h" -namespace bts -{ -namespace position -{ +namespace bts { +namespace position { struct Position { orderman::AccountName account; - const api::Security* security; + std::string security_desc; Quantity position; api::Side side; - Price avg_price; }; -} -} +}} From 21f5fd919d6c019028d79935c27e1993a50bf2e6 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 13 Jun 2019 15:37:43 -0400 Subject: [PATCH 002/198] Changes in the API for Loss Limit and new parameter in the account to enforce that limit --- src/lib/api/services/AdminService.proto | 6 ++++++ src/lib/api/services/PositionService.proto | 19 ++++++++++++++++++- src/web/ui/src/Access.fs | 5 +++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 23ae7337a..f79cc5b1c 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -149,6 +149,7 @@ message BTSAccount{ ExchangeAccountData exchange_account_data = 110; // extra parameters for risk enforcement RiskLimitEnforcement risk_limit_enforcement=120; + AccountLossLimit account_loss_limit = 130; } message RiskLimitEnforcement{ @@ -190,6 +191,11 @@ message AccountExchangeConnections{ repeated string exchange_connection_names = 20; } +message AccountLossLimit{ + bool enforce = 10; + uint32 total_loss_limit = 20; + // if we need per product we can add it here +} /************************************************************************/ /***************************Exchange Data********************************/ /************************************************************************/ diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index fa14b930c..a2842f7a5 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -19,6 +19,22 @@ message PositionUnit{ double day_short_avg_price = 100; } +message PNLUnit{ + int32 record_id = 1 [(bts.api.key)=true]; + PositionUnit pos = 10; + double cash_value = 20; + double bid_price = 30; + double ask_price = 40; + double last_price = 50; + double settllement_price = 60; +} + +message AccountPNL{ + uint32 account_id = 1 [(bts.api.key)=true]; + string account = 10; + double mid_pnl = 20; +} + message ManualFill { int32 record_id = 1 [(bts.api.key)=true]; uint32 security_key = 2; @@ -53,5 +69,6 @@ service PositionService { // subscription rpc manual_fills(bts.api.VoidMessage) returns (stream ManualFill); rpc position_data(bts.api.VoidMessage) returns (stream PositionUnit); - + rpc pnl_data(bts.api.VoidMessage) returns (stream PNLUnit); + rpc pnl_account_data(bts.api.VoidMessage) returns (stream AccountPNL); } \ No newline at end of file diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 3de9afcff..d52725e30 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -106,6 +106,11 @@ module Accounts = riskLimitEnforcement = { productLimitInNetTerms = true } + accountLossLimit = + { + enforce = false + totalLossLimit = 0u + } } From be5d037ca96ffa8ea37ba16e3a5c01dbe15139c8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 13 Jun 2019 17:52:47 -0400 Subject: [PATCH 003/198] span works again --- .vscode/launch.json | 2 +- src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/services/MarginService.proto | 11 +- src/lib/utils/Dispatcher.cpp | 14 ++ src/lib/utils/Dispatcher.h | 1 + src/server/sparkd/cmds/Span.cpp | 62 ++++++- src/server/sparkd/position/MarginResult.h | 27 --- .../sparkd/position/MarginServiceCore.cpp | 157 +++++++++--------- .../sparkd/position/MarginServiceCore.h | 19 ++- .../sparkd/position/MarginServiceServer.cpp | 84 +++------- .../sparkd/position/MarginServiceServer.h | 23 ++- .../sparkd/position/PositionAggregator.cpp | 91 ++++++++++ .../sparkd/position/PositionAggregator.h | 32 ++++ .../sparkd/position/PositionServiceCore.cpp | 141 ---------------- .../sparkd/position/PositionServiceCore.h | 36 ---- .../sparkd/position/tests/PositionTests.cpp | 21 +-- 16 files changed, 342 insertions(+), 381 deletions(-) delete mode 100644 src/server/sparkd/position/MarginResult.h create mode 100644 src/server/sparkd/position/PositionAggregator.cpp create mode 100644 src/server/sparkd/position/PositionAggregator.h delete mode 100644 src/server/sparkd/position/PositionServiceCore.cpp delete mode 100644 src/server/sparkd/position/PositionServiceCore.h diff --git a/.vscode/launch.json b/.vscode/launch.json index fac8a7668..8ddf7d5a1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ - "run" + "span" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index f862b0d26..2222ef991 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index e870029ce..cb63f8d48 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -3,11 +3,13 @@ package bts.api.position; option csharp_namespace="bts.api.position"; import "lib/api/apioptions.proto"; import "lib/api/apicore.proto"; -import "lib/domain_model/Security.proto"; message MarginResult { + enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } + int32 id = 1 [(bts.api.key)=true]; - string account = 10; + string account = 10; + ResultStatus status = 12; string portfolio_id = 15; string settle_indicator = 20; string settle_qualifier = 30; @@ -20,9 +22,14 @@ message MarginResult { double initial_margin = 130; } +message MarginRequest { + string account = 10; +} + service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; // subscription rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); + rpc get_margin(MarginRequest) returns (MarginResult); } \ No newline at end of file diff --git a/src/lib/utils/Dispatcher.cpp b/src/lib/utils/Dispatcher.cpp index 1d7ab64d3..c45d28c54 100755 --- a/src/lib/utils/Dispatcher.cpp +++ b/src/lib/utils/Dispatcher.cpp @@ -214,6 +214,20 @@ void Dispatcher::post(Action&& action, int64_t delay_ms) } } +void Dispatcher::post_copy(Action action, int64_t delay_ms) +{ + if (delay_ms > 0) + { + shared_ptr timer = make_shared(_me->service); + timer->expires_from_now(boost::posix_time::milliseconds(delay_ms)); + timer->async_wait([timer, action] (const boost::system::error_code& err) { if (!err) action(); }); + } + else + { + _me->service.post(action); + } +} + io_service* Dispatcher::io_service() { return &_me->service; } // diff --git a/src/lib/utils/Dispatcher.h b/src/lib/utils/Dispatcher.h index 2adc656af..997ab1220 100755 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib/utils/Dispatcher.h @@ -88,6 +88,7 @@ public: void invoke(Action action); // Queue an action on the dispatcher thread and return immediately. void post(Action&& action, int64_t delay_ms=0); + void post_copy(Action action, int64_t delay_ms=0); boost::asio::io_service* io_service(); diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index 8499a465e..51f65b5ee 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -1,15 +1,66 @@ #include "Span.h" +#include "server/sparkd/position/PositionAggregator.h" #include "server/sparkd/position/MarginServiceCore.h" +#include "server/sparkd/position/Position.h" +#include "lib/orderman/orderman_utils/orderman_common.h" -namespace bts -{ -namespace cmd -{ +#include "lib/config/config.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/AuthService.client.pb.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/utils/helper_macros.h" +#include "lib/utils/Dispatcher.h" + +#include +#include +#include +#include +#include +#include +#include + +using namespace bts::position; +using namespace bts::api::position; + +namespace bts { +namespace cmd { int Span::execute(const std::vector&) { + srand (time(NULL)); + std::condition_variable cv; + std::mutex cv_m; + std::unique_lock lk(cv_m); + + auto& disp = utils::Dispatcher::create_new("SPAN"); + MarginServiceCore core(disp); + + auto acct = orderman::to("ACC A"); + Position p; + p.security_desc = "ESU9"; + p.account = acct; + p.position = Quantity(rand() % 100); + p.side = api::SIDE_BUY; + std::vector pos; + pos.push_back(p); + p.position = Quantity(rand() % 200); + p.side = api::SIDE_SELL; + pos.push_back(p); + + //core.set_verbose_debugging(true); + core.compute_margin(acct, pos, [&cv](const api::position::MarginResult& m) + { + std::string str; + google::protobuf::TextFormat::PrintToString(m, &str); + + std::cout << std::endl << str << std::endl << std::endl; + cv.notify_all(); + }); + + std::cout << "Waiting for margin results, press any key to exit" << std::endl; + cv.wait(lk); return 0; } @@ -18,7 +69,6 @@ std::string Span::help() return "\t test CME CORE Span integration \n"; } -} -} +}} diff --git a/src/server/sparkd/position/MarginResult.h b/src/server/sparkd/position/MarginResult.h deleted file mode 100644 index c04f0a09b..000000000 --- a/src/server/sparkd/position/MarginResult.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/domain_model/Security.pb.h" - -namespace bts -{ -namespace position -{ -struct MarginResult -{ - enum class ResultStatus { NewValid, CachedValid, Error }; - ResultStatus result_status; - - std::string settle_indicator; - std::string settle_qualifier; - std::string portfolio_id; - std::string as_of_time; - std::string calculation_id; - - double opt_value; - double nonopt_value; - double maint_margin; - double initial_margin; -}; -} -} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index b98720bff..49647f877 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,13 +1,11 @@ #include "MarginServiceCore.h" -#include "PositionServiceCore.h" #include "Position.h" -#include "MarginResult.h" - #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/Uuid.h" +#include "lib/utils/Dispatcher.h" #include "lib/utils/bts_chrono.h" #include "lib/logging/logging.h" #include "lib/utils/helper_macros.h" @@ -22,13 +20,7 @@ #include #include -#define CONSOLE_LOG(...) std::cout , __VA_ARGS__ , std::endl - -template std::ostream& operator,(std::ostream& out, const T& t) { out << t; return out; } -std::ostream& operator,(std::ostream& out, std::ostream&(*f)(std::ostream&)) { out << f; return out; } -#define MARGIN_LOG(subsystem,level,...) \ - bts::log::_thread_logger.logger->enqueue(log::log_ts(),bts::log::subsystem,level,__FILE__,__LINE__,__VA_ARGS__); \ -CONSOLE_LOG(__VA_ARGS__) +using bts::api::position::MarginResult; namespace bts { @@ -38,19 +30,18 @@ namespace position using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { - MarginMap last_results, last_valid_results; - + utils::Dispatcher& dispatcher; + MarginMap last_results, last_valid_results; std::string url_base, core_user, core_password, post_margin_path, get_margin_path; - size_t max_iterations; bool verbose; int throttle; bts::datetime::PTime last_call; - PImpl() : + PImpl(utils::Dispatcher& disp) : + dispatcher(disp), last_results(), last_valid_results(), //api_bts_span BT5Margin! url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("Summer123"), post_margin_path("margins/?complete=true"), get_margin_path("margins/"), - max_iterations(20), verbose(false), throttle(30000), last_call() @@ -58,7 +49,7 @@ struct MarginServiceCore::PImpl auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) { - MARGIN_LOG(Gen,Error,"curl_global_init() failed: ", std::string(curl_easy_strerror(res))); + LOG(Gen,Error,"curl_global_init() failed: {}", std::string(curl_easy_strerror(res))); } } ~PImpl() @@ -147,7 +138,7 @@ struct MarginServiceCore::PImpl struct curl_slist* setup_url_and_headers(CURL* curl, const std::string& xpath) { std::string full_url = url_base + xpath; - MARGIN_LOG(Gen,Info,"CORE Margin URL: ",full_url); + LOG(Gen,Info,"CORE Margin URL: {}",full_url); curl_easy_setopt(curl, CURLOPT_URL, full_url.c_str()); //curl_easy_setopt(curl, CURLOPT_URL, "https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/margins/"); curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_callback); @@ -178,19 +169,19 @@ struct MarginServiceCore::PImpl curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&reply); curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload.c_str()); - MARGIN_LOG(Gen,Info,"CORE Margin Payload: ", payload); + LOG(Gen,Info,"CORE Margin Payload: {}", payload); auto res = curl_easy_perform(curl); if(res == CURLE_OK) { std::string resp(reply.data.begin(), reply.data.end()); - MARGIN_LOG(Gen,Info,"CORE Margin Post Response: ", resp); + LOG(Gen,Info,"CORE Margin Post Response: {}", resp); succ = true; } else { std::string error(curl_easy_strerror(res)); - MARGIN_LOG(Gen,Error,"POST curl_easy_perform() failed: ", error); - std::cout << fmt::format("CORE Margin CURL Error: ", error); + LOG(Gen,Error,"POST curl_easy_perform() failed: {}", error); + //std::cout << fmt::format("CORE Margin CURL Error: ", error); } curl_easy_cleanup(curl); if(header) @@ -198,7 +189,7 @@ struct MarginServiceCore::PImpl } else { - MARGIN_LOG(Gen,Error,"curl_easy_init() failed\n"); + LOG(Gen,Error,"curl_easy_init() failed\n"); } return succ; } @@ -217,12 +208,12 @@ struct MarginServiceCore::PImpl if(res == CURLE_OK) { std::string resp(reply.data.begin(), reply.data.end()); - MARGIN_LOG(Gen,Info,"CORE Margin GET Response: ", resp); + LOG(Gen,Info,"CORE Margin GET Response: {}", resp); succ = true; } else { - MARGIN_LOG(Gen,Error,"GET curl_easy_perform() failed: ", std::string(curl_easy_strerror(res))); + LOG(Gen,Error,"GET curl_easy_perform() failed: {}", std::string(curl_easy_strerror(res))); } curl_easy_cleanup(curl); if(header) @@ -230,7 +221,7 @@ struct MarginServiceCore::PImpl } else { - MARGIN_LOG(Gen,Error,"curl_easy_init() failed\n"); + LOG(Gen,Error,"curl_easy_init() failed\n"); } return succ; } @@ -280,7 +271,7 @@ struct MarginServiceCore::PImpl void parse_margin_calculation(const CurlMsg& msg, MarginResult& result) { - result.valid = false; + result.set_status(MarginResult::Error); std::string str(msg.data.begin(), msg.data.end()); pugi::xml_document doc; doc.load_string(str.c_str()); @@ -289,19 +280,19 @@ struct MarginServiceCore::PImpl child = child.child("margin"); if(child) { - result.settle_indicator = child.attribute("settleInd").as_string(); - result.settle_qualifier = child.attribute("settleQual").as_string(); - result.portfolio_id = child.attribute("portfolioId").as_string(); - result.as_of_time = child.attribute("asOfTime").as_string(); - result.calculation_id = child.attribute("id").as_string(); + result.set_settle_indicator(child.attribute("settleInd").as_string()); + result.set_settle_qualifier(child.attribute("settleQual").as_string()); + result.set_portfolio_id(child.attribute("portfolioId").as_string()); + result.set_as_of_time(child.attribute("asOfTime").as_string()); + result.set_calculation_id(child.attribute("id").as_string()); auto val = child.child("amounts"); - if(val && result.portfolio_id != "") + if(val && result.portfolio_id() != "") { - result.opt_value = child.attribute("optVal").as_double(); - result.nonopt_value = child.attribute("nonOptVal").as_double(); - result.maint_margin = child.attribute("maint").as_double(); - result.initial_margin = child.attribute("init").as_double(); - result.valid = true; + result.set_opt_value(val.attribute("optVal").as_double()); + result.set_nonopt_value(val.attribute("nonOptVal").as_double()); + result.set_maint_margin(val.attribute("maint").as_double()); + result.set_initial_margin(val.attribute("init").as_double()); + result.set_status(MarginResult::NewValid); } } } @@ -317,18 +308,17 @@ struct MarginServiceCore::PImpl }; bool compute_margin(const std::string& account_name, const std::string& portfolid_id, - const std::vector& pos, std::function cb) - { - margin.valid = false; + const std::vector& pos, std::function cb) + { pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); - std::string request = "\nFirm Id, Acct Id, Ticker Symbol, Net Positions\n"; + std::string request = "\nFirm Id, Acct Id, Exchange, Ticker Symbol, Net Positions\n"; size_t count = 0; for(const auto& i : pos) { int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security_desc, p, "\n"); + request += fmt::format("BTS, {}, {}, {}, {}, {}", account_name, "CME", i.security_desc, p, "\n"); count++; } if(count > 0) @@ -338,54 +328,48 @@ struct MarginServiceCore::PImpl xml_string_writer writer(xml); doc.save(writer); + CurlMsg reply; post(post_margin_path, xml, reply); std::string portid_resp, calcid_resp; if(parse_margin_response(reply, portid_resp, calcid_resp)) - { - utils::Dispatcher::get_named("MarginServiceServer").post( + { + std::function do_web; + do_web = [=]() { + MarginResult margin; + margin.set_status(MarginResult::Error); + margin.set_account(account_name); + CurlMsg reply2; bool done = false; try { if(get(get_margin_path + calcid_resp, reply2)) { parse_margin_calculation(reply2, margin); - return true; + cb(margin); + done = true; } } + catch(const std::exception& ex) + { + LOG(Gen, Error, "Exception in parse_margin_calculation {}", std::string(ex.what())); + } catch(...) { - } - }, 5000); + LOG(Gen, Error, "Unknown Exception in parse_margin_calculation"); + } + if(!done) + dispatcher.post_copy(do_web, 5000); + }; + dispatcher.post_copy(do_web, 5000); return true; } } - - - size_t iters = 0; - while(iters++ < max_iterations) - { - CurlMsg reply; - sleep_for(5s); - post(post_margin_path, xml, reply); - std::string portid_resp, calcid_resp; - if(parse_margin_response(reply, portid_resp, calcid_resp)) - { - CurlMsg reply2; - sleep_for(2s); - if(get(get_margin_path + calcid_resp, reply2)) - { - parse_margin_calculation(reply2, margin); - return true; - } - } - } - } return false; } }; -MarginServiceCore::MarginServiceCore() : me(new PImpl()) +MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(disp)) { } @@ -393,7 +377,7 @@ MarginServiceCore::~MarginServiceCore() {} bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, - std::function cb) + std::function cb) { auto now = bts::datetime::now(); auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); @@ -407,10 +391,10 @@ bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const MarginResult result; if(get_last_valid_result(acct, result)) { - result.status = MarginResult::ResultStatus::CachedValid; + result.set_status(MarginResult::CachedValid); cb(result); } - return false; //no error + return true; //no error, just returning cached } } @@ -418,14 +402,27 @@ bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, c std::function cb) { utils::Uuid guid; - return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, - [this, &] (const MarginResult& m) - { - me->last_results.insert_or_assign(acct, m); - if(m.status == MarginResult::ResultStatus::NewValid) - me->last_valid_results.insert_or_assign(acct, m); - cb(m); - }); + try + { + return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + [=] (const MarginResult& m) + { + me->last_results.insert_or_assign(acct, m); + if(m.status() == MarginResult::NewValid) + me->last_valid_results.insert_or_assign(acct, m); + cb(m); + }); + } + catch(const std::exception& ex) + { + LOG(Gen, Error, "Exception in query_margin_webapi {}", std::string(ex.what())); + return false; + } + catch(...) + { + LOG(Gen, Error, "Unknown Exception in query_margin_webapi"); + return false; + } } diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index db3226098..7964b5f55 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/api/services/MarginService.pb.h" #include "server/sparkd/position/Position.h" #include "lib/domain_model/Security.pb.h" @@ -8,29 +9,31 @@ namespace bts { +namespace utils { class Dispatcher; } namespace securities { class ISecurityDB; } namespace position { -struct MarginResult; class IMarginObserver; class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); public: - MarginServiceCore(); + MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - void compute_margin(const orderman::AccountName&, const std::vector&, std::function); + bool compute_margin(const orderman::AccountName&, const std::vector&, + std::function); + void set_verbose_debugging(bool); private: friend class PositionTests; - bool get_last_valid_result(const orderman::AccountName&, MarginResult&); - bool get_last_result(const orderman::AccountName&, MarginResult&); + bool get_last_valid_result(const orderman::AccountName&, api::position::MarginResult&); + bool get_last_result(const orderman::AccountName&, api::position::MarginResult&); //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); - void set_verbose_debugging(bool); - + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, + std::function); + private: struct PImpl; std::unique_ptr me; diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index fbf6872e3..e4a6c61b6 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -1,26 +1,22 @@ #include "MarginServiceServer.h" +#include "MarginServiceCore.h" +#include "PositionAggregator.h" #include "Position.h" -#include "lib/persistence/SqliteStore.h" +#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" -#include "lib/utils/PBUtils.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/utils/TimeStamp.h" -#include "lib/utils/AuthToken.h" #include "lib/utils/Dispatcher.h" -#include -#include -#include -#include #include #include using namespace bts::api::orderman; using namespace bts::api::position; using namespace std; +using bts::api::position::MarginResult; namespace bts { namespace position { @@ -28,71 +24,41 @@ namespace position { MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md::MDClient& mdclient) : bts::api::position::MarginServiceBase (context), _publisher(make_margin_data_stateful_publisher()), - _position_service(context.locate()), - _position_map(), - _oracle(mdclient) + _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), + _position(new PositionAggregator(context.locate(), mdclient)), + _margin(new MarginServiceCore(_dispatcher)) { LOG(Gen, Info, "MarginServiceServer: service started"); - _position_service.subscribe_position_data() | - rxcpp::operators::subscribe( - [this](auto const& update) - { - for (const auto& o : update.removed()) - { - const auto& it = _position_map.find(o->record_id()); - if(it != _position_map.end()) - _position_map.erase(it); - } - for (const auto& ch : update.changed()) - { - const auto& o = ch.current(); - _position_map[o->record_id()] = *o; - } - for (const auto& o : update.added()) - { - _position_map[o->record_id()] = *o; - } - }); - - auto& disp = utils::Dispatcher::get_named("MarginServiceServer"); - utils::DispatcherTimer web_api_timer(disp, 250, [&]() + utils::DispatcherTimer web_api_timer(_dispatcher, 30000, [this]() { - for (auto& p: platforms) - p->send_heartbeats(); + std::map> posmap; + _position->query_accounts_and_positions(posmap); + for(const auto& i : posmap) + _margin->compute_margin(i.first, i.second, [this](const MarginResult& m) { publish_margin(m); } ); }); web_api_timer.start(); - - disp.run(); } MarginServiceServer::~MarginServiceServer() {} -void MarginServiceServer::query_accounts_and_positions(std::map, std::vector& result) - -void MarginServiceServer::query_all_positions(const orderman::AccountName& account, std::vector& result) +void MarginServiceServer::get_margin(const api::position::MarginRequest& request, + const api::Response& reply) { - result.reserve(_position_map.size()); - for(auto& entry : _position_map) - { - if(entry.second.account() != account) - continue; - const PositionUnit& unit = entry.second; - auto sec = _oracle.get_security(unit.security_id()); - if(sec && sec->has_glbx()) + orderman::AccountName acct; + orderman::str_to(request.account(), &acct); + std::vector pos; + _position->query_all_positions(acct, pos); + + _margin->compute_margin(acct, pos, + [=](const MarginResult& m) { - Position pos; - pos.account = unit.account(); - pos.security_desc = securities::descriptor(*sec); - int32_t pos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); - pos.position = Quantity(abs(pos)); - pos.side = (pos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.push_back(pos); - } - } + reply(m); + }); } -void MarginServiceServer::_publish_margin() + +void MarginServiceServer::publish_margin(const api::position::MarginResult&) { // // TODO, need to delete all state // std::vector entitlements; diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 917466af9..2ab269a7d 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/MarginService.server.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/api/public/ServiceContext.h" @@ -8,26 +9,34 @@ #include "lib/utils/bts_no_copy.h" #include #include +#include namespace bts { -namespace securities { class ISecurityDB; } +namespace utils { class Dispatcher; } namespace position { + struct Position; +class PositionAggregator; +class MarginServiceCore; class MarginServiceServer : public api::position::MarginServiceBase { public: MarginServiceServer(bts::api::ServiceContext&, md::MDClient&); ~MarginServiceServer(); + + void get_margin(const api::position::MarginRequest& request, + const api::Response& reply) override; private: - void query_all_positions(const orderman::AccountName&, std::vector&); - void _publish_margin(); + void query_accounts_and_positions(std::map>& result); + void query_all_positions(const orderman::AccountName& account, std::vector&); + void publish_margin(const api::position::MarginResult&); private: - MarginServiceBase::Margin_dataStatefulPublisher _publisher; - api::position::PositionService _position_service; - std::map _position_map; - securities::SecurityOracle _oracle; + MarginServiceBase::Margin_dataStatefulPublisher _publisher; + utils::Dispatcher& _dispatcher; + std::unique_ptr _position; + std::unique_ptr _margin; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp new file mode 100644 index 000000000..b0c9cc68d --- /dev/null +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -0,0 +1,91 @@ + +#include "PositionAggregator.h" +#include "Position.h" + +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/Dispatcher.h" + +#include +#include + +using namespace bts::api::orderman; +using namespace bts::api::position; +using namespace std; + +namespace bts { +namespace position { + +PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) + : _position_service(std::move(pos)), + _position_map(), + _oracle(mdclient), + _lock() +{ + _position_service.subscribe_position_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + std::lock_guard l(_lock); + for (const auto& o : update.removed()) + { + const auto& it = _position_map.find(o->record_id()); + if(it != _position_map.end()) + _position_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _position_map[o->record_id()] = *o; + } + for (const auto& o : update.added()) + { + _position_map[o->record_id()] = *o; + orderman::AccountName acct; + orderman::str_to(o->account(), &acct); + _accounts.insert(acct); + } + }); +} + +PositionAggregator::~PositionAggregator() {} + +void PositionAggregator::query_accounts_and_positions(std::map> & result) +{ + std::lock_guard l(_lock); + for(const auto& i : _accounts) + { + std::vector pos; + query_all_positions(i, pos); + result[i] = pos; + } +} + +void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) +{ + std::lock_guard l(_lock); + result.reserve(_position_map.size()); + for(auto& entry : _position_map) + { + const PositionUnit& unit = entry.second; + if(unit.account() != orderman::to_str(account)) + continue; + auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); + if(sec && sec->has_glbx() && sec->has_future()) + { + Position pos; + pos.account = account; + pos.security_desc = securities::descriptor(*sec); + int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); + pos.position = Quantity(abs(totalpos)); + pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } +} + +}} + diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h new file mode 100644 index 000000000..9701ccb44 --- /dev/null +++ b/src/server/sparkd/position/PositionAggregator.h @@ -0,0 +1,32 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/md/SecurityOracle.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" +#include "lib/utils/bts_no_copy.h" +#include +#include +#include + +namespace bts { +namespace position { +struct Position; + +class PositionAggregator +{ +public: + PositionAggregator(api::position::PositionService&&, md::MDClient&); + ~PositionAggregator(); + + void query_accounts_and_positions(std::map>& result); + void query_all_positions(const orderman::AccountName& account, std::vector&); + +private: + api::position::PositionService _position_service; + std::map _position_map; + std::set _accounts; + md::SecurityOracle _oracle; + std::mutex _lock; +}; +}} diff --git a/src/server/sparkd/position/PositionServiceCore.cpp b/src/server/sparkd/position/PositionServiceCore.cpp deleted file mode 100644 index 8fca5da02..000000000 --- a/src/server/sparkd/position/PositionServiceCore.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include "PositionServiceCore.h" - -#include "Position.h" -#include "IPositionObserver.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/securities/ISecurityDB.h" - -#include "lib/utils/bts_assert.h" -#include "lib/logging/logging.h" - -#include -#include - -namespace bts -{ -namespace position -{ - -template int sgn(T val) { - return (T(0) < val) - (val < T(0)); -} - -class BookEntry -{ -public: - orderman::AccountName account; - SecurityKey security_key; - double position; - double avg_price; -public: - BookEntry(const orderman::AccountName& acc, SecurityKey k) : - account(acc), security_key(k), position(0.0), avg_price(0.0) - { - } - void add_fill(double last_size, double last_price, api::Side side) - { - if(side == api::SIDE_SELL) - last_size = -last_size; - if(position == 0.0 || sgn(position) == sgn(last_size)) - { - double prev = position * avg_price; - position += last_size; - avg_price = prev + (last_size*last_price) / position; - } - else - position += last_size; - } -}; - -struct PositionServiceCore::PImpl -{ - typedef std::pair KeyType; - boost::container::flat_map> book; - IPositionObserver* observer; - PImpl(IPositionObserver* obs) : book(), observer(obs) - { - } - - BookEntry& find_entry(const orderman::AccountName& account, SecurityKey skey) - { - KeyType key(account, skey); - auto& entry = book[key]; - if(!entry) - entry = std::make_shared(account, skey); - return *entry; - } - - void book_raw_fill(const orderman::AccountName& account, SecurityKey sec, - double last_size, double last_price, api::Side side) - { - auto& entry = find_entry(account, sec); - entry.add_fill(last_size, last_price, side); - if(observer) - observer->on_position_change(account, sec, entry.position, entry.avg_price); - } -}; - -PositionServiceCore::PositionServiceCore(securities::ISecurityDB& db, IPositionObserver* obs) - : me(new PImpl(obs)), _db(db) -{ -} - -PositionServiceCore::~PositionServiceCore() {} - -bool PositionServiceCore::query_position(const orderman::AccountName& account, SecurityKey seckey, Position& result) -{ - auto& entry = me->find_entry(account, seckey); - auto sec = _db.resolve(entry.security_key); - if(sec) - { - result.account = entry.account; - result.avg_price = Price(entry.avg_price); - result.position = Quantity(abs(entry.position)); - result.side = (entry.position < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.security = sec; - return true; - } - else - return false; -} - -void PositionServiceCore::query_all_positions(const orderman::AccountName& account, std::vector& result) -{ - result.reserve(me->book.size()); - for(auto& entry : me->book) - { - if(entry.first.first != account) - continue; - auto sec = _db.resolve(entry.second->security_key); - if(sec) - { - Position pos; - pos.account = entry.second->account; - pos.avg_price = Price(entry.second->avg_price); - pos.position = Quantity(abs(entry.second->position)); - pos.side = (entry.second->position < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - pos.security = sec; - result.push_back(pos); - } - } -} - -void PositionServiceCore::consume_raw_fill(const std::string& account, uint32_t security_key, - double last_size, double last_price, api::Side side) -{ - orderman::AccountName acc = orderman::to(account); - SecurityKey skey(security_key); - auto sec = _db.resolve(skey); - if(sec->Contract_case() == api::Security::ContractCase::kSpread) - { - //TODO this is wrong; need the leg fills - for(int i = 0; i < sec->spread().legs_size(); i++) - me->book_raw_fill(acc, SecurityKey(sec->spread().legs(i).security().id()), - 0.0, 0.0, side); - } - else - me->book_raw_fill(acc, skey, last_size, last_price, side); -} - -} -} diff --git a/src/server/sparkd/position/PositionServiceCore.h b/src/server/sparkd/position/PositionServiceCore.h deleted file mode 100644 index b6e2482f7..000000000 --- a/src/server/sparkd/position/PositionServiceCore.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/domain_model/Security.pb.h" - -#include - -namespace bts -{ -namespace securities { class ISecurityDB; } -namespace position -{ -struct Position; -class IPositionObserver; -class PositionServiceCore -{ - BTS_NO_COPY(PositionServiceCore); -public: - PositionServiceCore(securities::ISecurityDB&, IPositionObserver* obs = nullptr); - ~PositionServiceCore(); - - bool query_position(const orderman::AccountName&, SecurityKey, Position&); - void query_all_positions(const orderman::AccountName&, std::vector&); - -private: - void consume_raw_fill(const std::string& account, uint32_t security_key, - double last_size, double last_price, api::Side side); - -private: - struct PImpl; - std::unique_ptr me; - securities::ISecurityDB& _db; -}; -} -} diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index 62c93aec6..51d1f5086 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -1,11 +1,6 @@ #include "catch/catch.hpp" -#include "../MarginServiceCore.h" -#include "../PositionServiceCore.h" #include "../Position.h" -#include "../MarginResult.h" -#include "../IMarginObserver.h" - #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/config/config.h" @@ -26,14 +21,14 @@ namespace position class PositionTests { public: - static bool query_margin_webapi(MarginServiceCore& svc, const std::vector& pos, MarginResult& res) - { - return svc.query_margin_webapi(pos, res); - } - static void set_verbose_debugging(MarginServiceCore& svc, bool verb) - { - return svc.set_verbose_debugging(verb); - } + // static bool query_margin_webapi(MarginServiceCore& svc, const std::vector& pos, MarginResult& res) + // { + // return svc.query_margin_webapi(pos, res); + // } + // static void set_verbose_debugging(MarginServiceCore& svc, bool verb) + // { + // return svc.set_verbose_debugging(verb); + // } }; From 9883553fb524bee43971de748aae70a005bb4c13 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 14 Jun 2019 11:21:09 -0400 Subject: [PATCH 004/198] MarginService --- .vscode/launch.json | 2 +- src/lib/api/services/MarginService.proto | 2 +- src/lib/api/services/PositionService.proto | 1 + src/lib/config/defaults/toggles.conf | 6 ++ src/lib/config/protos/toggles.proto | 4 ++ src/server/sparkd/cmds/Run.cpp | 6 +- src/server/sparkd/cmds/Span.cpp | 5 +- src/server/sparkd/position/AccountInfo.cpp | 27 ++++++++ src/server/sparkd/position/AccountInfo.h | 20 ++++++ .../sparkd/position/MarginServiceCore.cpp | 20 ++++-- .../sparkd/position/MarginServiceCore.h | 12 ++-- .../sparkd/position/MarginServiceServer.cpp | 66 ++++++++++++------- .../sparkd/position/MarginServiceServer.h | 8 +-- .../sparkd/position/PositionAggregator.cpp | 15 +++-- .../sparkd/position/PositionAggregator.h | 8 ++- .../sparkd/position/PositionServiceServer.cpp | 11 ++-- .../sparkd/position/PositionServiceServer.h | 3 +- 17 files changed, 154 insertions(+), 62 deletions(-) create mode 100644 src/server/sparkd/position/AccountInfo.cpp create mode 100644 src/server/sparkd/position/AccountInfo.h diff --git a/.vscode/launch.json b/.vscode/launch.json index 8ddf7d5a1..fac8a7668 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ - "span" + "run" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index cb63f8d48..eec52bbb8 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -7,7 +7,7 @@ import "lib/api/apicore.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } - int32 id = 1 [(bts.api.key)=true]; + int32 account_id = 5 [(bts.api.key)=true]; string account = 10; ResultStatus status = 12; string portfolio_id = 15; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index fa14b930c..671654eaf 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -8,6 +8,7 @@ import "lib/domain_model/Security.proto"; message PositionUnit{ int32 record_id = 1 [(bts.api.key)=true]; string account = 10; + uint32 account_id = 15; uint32 security_id = 20; double sod_long_pos = 30; double sod_long_avg_price = 40; diff --git a/src/lib/config/defaults/toggles.conf b/src/lib/config/defaults/toggles.conf index 939c2e230..eb250ba1e 100644 --- a/src/lib/config/defaults/toggles.conf +++ b/src/lib/config/defaults/toggles.conf @@ -8,4 +8,10 @@ OrdersSoftCleanup { value { enabled: true } +} + +SpanMargin { + value { + enabled: true + } } \ No newline at end of file diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 1c53353c4..812e868be 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -49,4 +49,8 @@ message EnsureOnScreenWithWorkAreaRect { // and the new ensure_onscreen code has only been tested with a single monitor arrangement. // Should verify that the code works with every monitor arrangement before enabling by default. optional bool enabled = 1 [default = false]; +} + +message SpanMargin { + optional bool enabled = 1 [default = false]; } \ No newline at end of file diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 3c9b1ec1c..76ae2a7e7 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -29,6 +29,7 @@ #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" +#include "server/sparkd/position/MarginServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" @@ -84,11 +85,10 @@ int Run::execute(std::vector const &) { md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); //orderman::AlgoServiceServer algo_server(sc); bts::api::orderman::algo::AlgoDefinitionServiceServer algo_definition_server(sc); - - - + position::PositionServiceServer position_service(sc); + position::MarginServiceServer margin_service(sc, mdclient); metrics::ShellLatencyServer shell_latency_service( sc, stats, utils::Dispatcher::background()); diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index 51f65b5ee..ee9efd1a9 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -37,10 +37,11 @@ int Span::execute(const std::vector&) auto& disp = utils::Dispatcher::create_new("SPAN"); MarginServiceCore core(disp); - auto acct = orderman::to("ACC A"); + auto name = orderman::to("ACC A"); + AccountInfo acct(name); Position p; p.security_desc = "ESU9"; - p.account = acct; + p.account = name; p.position = Quantity(rand() % 100); p.side = api::SIDE_BUY; std::vector pos; diff --git a/src/server/sparkd/position/AccountInfo.cpp b/src/server/sparkd/position/AccountInfo.cpp new file mode 100644 index 000000000..b3ff450e0 --- /dev/null +++ b/src/server/sparkd/position/AccountInfo.cpp @@ -0,0 +1,27 @@ +#include "AccountInfo.h" + +#include + +namespace bts { +namespace position { + +AccountInfo::AccountInfo(uint32_t accid, orderman::AccountName accname) : account_id(accid), account_name(accname) +{ +} + +AccountInfo::AccountInfo(orderman::AccountName accname) : account_id(UINT32_MAX), account_name(accname) +{ +} + + +bool AccountInfo::operator<(const AccountInfo &o) const +{ + return this->account_id < o.account_id && this->account_name < o.account_name; +} + +bool AccountInfo::operator==(const AccountInfo &o) const +{ + return this->account_id == o.account_id && this->account_name == o.account_name; +} + +}} \ No newline at end of file diff --git a/src/server/sparkd/position/AccountInfo.h b/src/server/sparkd/position/AccountInfo.h new file mode 100644 index 000000000..67634d69f --- /dev/null +++ b/src/server/sparkd/position/AccountInfo.h @@ -0,0 +1,20 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts { +namespace position { + +struct AccountInfo +{ + AccountInfo(uint32_t, orderman::AccountName); + AccountInfo(orderman::AccountName); + + uint32_t account_id; + orderman::AccountName account_name; + + bool operator<(const AccountInfo &o) const; + bool operator==(const AccountInfo &o) const; +}; + +}} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 49647f877..fba759b68 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,6 +1,7 @@ #include "MarginServiceCore.h" #include "Position.h" +#include "AccountInfo.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" @@ -27,7 +28,8 @@ namespace bts namespace position { -using MarginMap = boost::container::flat_map; +using MarginMap = boost::container::flat_map; + struct MarginServiceCore::PImpl { utils::Dispatcher& dispatcher; @@ -307,9 +309,11 @@ struct MarginServiceCore::PImpl } }; - bool compute_margin(const std::string& account_name, const std::string& portfolid_id, + bool compute_margin(const AccountInfo& acct, const std::string& portfolid_id, const std::vector& pos, std::function cb) { + auto account_name = orderman::to_str(acct.account_name); + auto account_id = acct.account_id; pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); @@ -340,6 +344,7 @@ struct MarginServiceCore::PImpl MarginResult margin; margin.set_status(MarginResult::Error); margin.set_account(account_name); + margin.set_account_id(account_id); CurlMsg reply2; bool done = false; try { @@ -376,7 +381,7 @@ MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(dis MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, +bool MarginServiceCore::compute_margin(const AccountInfo& acct, const std::vector& pos, std::function cb) { auto now = bts::datetime::now(); @@ -398,13 +403,14 @@ bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const } } -bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, + +bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std::vector& pos, std::function cb) { utils::Uuid guid; try { - return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + return me->compute_margin(acct, guid.to_text_string(), pos, [=] (const MarginResult& m) { me->last_results.insert_or_assign(acct, m); @@ -431,7 +437,7 @@ void MarginServiceCore::set_verbose_debugging(bool verb) me->verbose = verb; } -bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::get_last_valid_result(const AccountInfo& acct, MarginResult& result) { auto it = me->last_valid_results.find(acct); if(it != me->last_valid_results.end()) @@ -442,7 +448,7 @@ bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, return false; } -bool MarginServiceCore::get_last_result(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::get_last_result(const AccountInfo& acct, MarginResult& result) { auto it = me->last_results.find(acct); if(it != me->last_results.end()) diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index 7964b5f55..d7b3c32d5 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -14,6 +14,8 @@ namespace securities { class ISecurityDB; } namespace position { class IMarginObserver; +struct AccountInfo; + class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); @@ -21,17 +23,17 @@ public: MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - bool compute_margin(const orderman::AccountName&, const std::vector&, - std::function); + bool compute_margin(const AccountInfo&, const std::vector&, + std::function); void set_verbose_debugging(bool); private: friend class PositionTests; - bool get_last_valid_result(const orderman::AccountName&, api::position::MarginResult&); - bool get_last_result(const orderman::AccountName&, api::position::MarginResult&); + bool get_last_valid_result(const AccountInfo&, api::position::MarginResult&); + bool get_last_result(const AccountInfo&, api::position::MarginResult&); //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, const std::vector&, + bool query_margin_webapi(const AccountInfo&, const std::vector&, std::function); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index e4a6c61b6..1afc98bba 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -3,6 +3,8 @@ #include "PositionAggregator.h" #include "Position.h" +#include "lib/config/config.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" @@ -25,19 +27,31 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: : bts::api::position::MarginServiceBase (context), _publisher(make_margin_data_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), + _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)) { LOG(Gen, Info, "MarginServiceServer: service started"); + publish_all(); + _timer.start(); +} - utils::DispatcherTimer web_api_timer(_dispatcher, 30000, [this]() +void MarginServiceServer::publish_all() +{ + if(config::get().enabled()) { - std::map> posmap; + PositionAggregator::PositionMap posmap; _position->query_accounts_and_positions(posmap); for(const auto& i : posmap) - _margin->compute_margin(i.first, i.second, [this](const MarginResult& m) { publish_margin(m); } ); - }); - web_api_timer.start(); + { + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i.first.account_name) ); + _margin->compute_margin(i.first, i.second, + [this, i](const MarginResult& m) + { + publish_margin(m); + }); + } + } } MarginServiceServer::~MarginServiceServer() {} @@ -45,27 +59,35 @@ MarginServiceServer::~MarginServiceServer() {} void MarginServiceServer::get_margin(const api::position::MarginRequest& request, const api::Response& reply) { - orderman::AccountName acct; - orderman::str_to(request.account(), &acct); - std::vector pos; - _position->query_all_positions(acct, pos); - - _margin->compute_margin(acct, pos, - [=](const MarginResult& m) - { - reply(m); - }); + if(!config::get().enabled()) + { + MarginResult res; + res.set_account(request.account()); + reply(res); + } + else + { + orderman::AccountName acct; + orderman::str_to(request.account(), &acct); + std::vector pos; + _position->query_all_positions(acct, pos); + + AccountInfo info(acct); + _margin->compute_margin(info, pos, + [=](const MarginResult& m) + { + reply(m); + }); + } } -void MarginServiceServer::publish_margin(const api::position::MarginResult&) +void MarginServiceServer::publish_margin(const api::position::MarginResult& account_result) { - // // TODO, need to delete all state - // std::vector entitlements; - // AdminServiceUtils::get_md_entitlement_report(_state,entitlements); - // for (const auto& e : entitlements) - // _md_entit_publisher.add_or_update(e); - // _md_entit_publisher.flush(); + //account_result here is keyed on account_id, which is included for streaming margin computations but not + //on-demand computations + _publisher.add_or_update(account_result); + _publisher.flush(); } }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 2ab269a7d..d645e17c4 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -27,16 +27,16 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; - + private: - void query_accounts_and_positions(std::map>& result); - void query_all_positions(const orderman::AccountName& account, std::vector&); void publish_margin(const api::position::MarginResult&); + void publish_all(); private: MarginServiceBase::Margin_dataStatefulPublisher _publisher; utils::Dispatcher& _dispatcher; + utils::DispatcherTimer _timer; std::unique_ptr _position; - std::unique_ptr _margin; + std::unique_ptr _margin; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index b0c9cc68d..1c2857209 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -29,7 +29,7 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: rxcpp::operators::subscribe( [this](auto const& update) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); for (const auto& o : update.removed()) { const auto& it = _position_map.find(o->record_id()); @@ -46,32 +46,33 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: _position_map[o->record_id()] = *o; orderman::AccountName acct; orderman::str_to(o->account(), &acct); - _accounts.insert(acct); + _accounts.insert( AccountInfo{o->account_id(), acct}); } }); } PositionAggregator::~PositionAggregator() {} -void PositionAggregator::query_accounts_and_positions(std::map> & result) +void PositionAggregator::query_accounts_and_positions(PositionMap& result) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); for(const auto& i : _accounts) { std::vector pos; - query_all_positions(i, pos); + query_all_positions(i.account_name, pos); result[i] = pos; } } void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); result.reserve(_position_map.size()); + auto the_account = orderman::to_str(account); for(auto& entry : _position_map) { const PositionUnit& unit = entry.second; - if(unit.account() != orderman::to_str(account)) + if(unit.account() != the_account) continue; auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); if(sec && sec->has_glbx() && sec->has_future()) diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 9701ccb44..c493470a9 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -1,5 +1,6 @@ #pragma once +#include "AccountInfo.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/md/SecurityOracle.h" #include "lib/api/services/PositionService.pb.h" @@ -19,14 +20,15 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - void query_accounts_and_positions(std::map>& result); + typedef std::map< AccountInfo, std::vector > PositionMap; + void query_accounts_and_positions(PositionMap& result); void query_all_positions(const orderman::AccountName& account, std::vector&); private: api::position::PositionService _position_service; std::map _position_map; - std::set _accounts; + std::set _accounts; md::SecurityOracle _oracle; - std::mutex _lock; + std::recursive_mutex _lock; }; }} diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 6f4bfa843..a5c7b63d9 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -105,8 +105,7 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - std::string fill_account=_fill_account(f); - PositionUnit& pu=_get_or_add(fill_account,f.security_key()); + PositionUnit& pu=_get_or_add(f); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -147,14 +146,16 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, - uint32_t seckey){ +PositionUnit& PositionServiceServer::_get_or_add (const Fill& f) { + const std::string& acct = _fill_account(f); + uint32_t seckey = f.security_key(); auto &pu = me->state[acct][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); pu.set_account(acct); - pu.set_security_id(seckey); + pu.set_security_id(seckey); + pu.set_account_id(f.internal_account_id()); } return pu; } diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index cd983e8c6..ec669eca8 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -28,8 +28,7 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { _on_fill(const bts::api::orderman::Fill &fill, bool is_add); // given an account and key, finds (or adds if absent) // the PositionUnit entry - bts::api::position::PositionUnit &_get_or_add(const std::string &acct, - uint32_t sec_id); + bts::api::position::PositionUnit &_get_or_add(const bts::api::orderman::Fill&); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, From 419833d398c4aae0eafdd72f6b7356177cd19892 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 14 Jun 2019 18:10:41 -0400 Subject: [PATCH 005/198] slight timing issue with span --- src/lib/api/services/MarginService.proto | 3 +- src/lib/api/services/PositionService.proto | 1 - src/server/sparkd/cmds/Span.cpp | 18 ++--- src/server/sparkd/position/AccountInfo.cpp | 27 ------- src/server/sparkd/position/AccountInfo.h | 20 ----- .../sparkd/position/MarginServiceCore.cpp | 42 +++------- .../sparkd/position/MarginServiceCore.h | 10 +-- .../sparkd/position/MarginServiceServer.cpp | 33 ++++---- .../sparkd/position/MarginServiceServer.h | 2 + .../sparkd/position/PositionAggregator.cpp | 79 +++++++++++-------- .../sparkd/position/PositionAggregator.h | 11 +-- .../sparkd/position/PositionServiceServer.cpp | 11 ++- .../sparkd/position/PositionServiceServer.h | 3 +- 13 files changed, 103 insertions(+), 157 deletions(-) delete mode 100644 src/server/sparkd/position/AccountInfo.cpp delete mode 100644 src/server/sparkd/position/AccountInfo.h diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index eec52bbb8..02ac20f04 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -7,8 +7,7 @@ import "lib/api/apicore.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } - int32 account_id = 5 [(bts.api.key)=true]; - string account = 10; + string account = 10 [(bts.api.key)=true]; ResultStatus status = 12; string portfolio_id = 15; string settle_indicator = 20; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index 671654eaf..fa14b930c 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -8,7 +8,6 @@ import "lib/domain_model/Security.proto"; message PositionUnit{ int32 record_id = 1 [(bts.api.key)=true]; string account = 10; - uint32 account_id = 15; uint32 security_id = 20; double sod_long_pos = 30; double sod_long_avg_price = 40; diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index ee9efd1a9..3fce29a98 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -29,19 +29,14 @@ namespace cmd { int Span::execute(const std::vector&) { - srand (time(NULL)); - std::condition_variable cv; - std::mutex cv_m; - std::unique_lock lk(cv_m); - - auto& disp = utils::Dispatcher::create_new("SPAN"); + srand(time(NULL)); + auto& disp = utils::Dispatcher::current(); MarginServiceCore core(disp); - auto name = orderman::to("ACC A"); - AccountInfo acct(name); + auto acct = orderman::to("ACC A"); Position p; p.security_desc = "ESU9"; - p.account = name; + p.account = acct; p.position = Quantity(rand() % 100); p.side = api::SIDE_BUY; std::vector pos; @@ -51,17 +46,16 @@ int Span::execute(const std::vector&) pos.push_back(p); //core.set_verbose_debugging(true); - core.compute_margin(acct, pos, [&cv](const api::position::MarginResult& m) + core.compute_margin(acct, pos, [](const api::position::MarginResult& m) { std::string str; google::protobuf::TextFormat::PrintToString(m, &str); std::cout << std::endl << str << std::endl << std::endl; - cv.notify_all(); }); std::cout << "Waiting for margin results, press any key to exit" << std::endl; - cv.wait(lk); + disp.run(); return 0; } diff --git a/src/server/sparkd/position/AccountInfo.cpp b/src/server/sparkd/position/AccountInfo.cpp deleted file mode 100644 index b3ff450e0..000000000 --- a/src/server/sparkd/position/AccountInfo.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "AccountInfo.h" - -#include - -namespace bts { -namespace position { - -AccountInfo::AccountInfo(uint32_t accid, orderman::AccountName accname) : account_id(accid), account_name(accname) -{ -} - -AccountInfo::AccountInfo(orderman::AccountName accname) : account_id(UINT32_MAX), account_name(accname) -{ -} - - -bool AccountInfo::operator<(const AccountInfo &o) const -{ - return this->account_id < o.account_id && this->account_name < o.account_name; -} - -bool AccountInfo::operator==(const AccountInfo &o) const -{ - return this->account_id == o.account_id && this->account_name == o.account_name; -} - -}} \ No newline at end of file diff --git a/src/server/sparkd/position/AccountInfo.h b/src/server/sparkd/position/AccountInfo.h deleted file mode 100644 index 67634d69f..000000000 --- a/src/server/sparkd/position/AccountInfo.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" - -namespace bts { -namespace position { - -struct AccountInfo -{ - AccountInfo(uint32_t, orderman::AccountName); - AccountInfo(orderman::AccountName); - - uint32_t account_id; - orderman::AccountName account_name; - - bool operator<(const AccountInfo &o) const; - bool operator==(const AccountInfo &o) const; -}; - -}} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index fba759b68..0abf89902 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,7 +1,6 @@ #include "MarginServiceCore.h" #include "Position.h" -#include "AccountInfo.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" @@ -28,7 +27,7 @@ namespace bts namespace position { -using MarginMap = boost::container::flat_map; +using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { @@ -37,7 +36,6 @@ struct MarginServiceCore::PImpl std::string url_base, core_user, core_password, post_margin_path, get_margin_path; bool verbose; int throttle; - bts::datetime::PTime last_call; PImpl(utils::Dispatcher& disp) : dispatcher(disp), last_results(), last_valid_results(), //api_bts_span BT5Margin! @@ -45,8 +43,7 @@ struct MarginServiceCore::PImpl post_margin_path("margins/?complete=true"), get_margin_path("margins/"), verbose(false), - throttle(30000), - last_call() + throttle(30000) { auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) @@ -309,11 +306,10 @@ struct MarginServiceCore::PImpl } }; - bool compute_margin(const AccountInfo& acct, const std::string& portfolid_id, + bool compute_margin(const orderman::AccountName& acct, const std::string& portfolid_id, const std::vector& pos, std::function cb) { - auto account_name = orderman::to_str(acct.account_name); - auto account_id = acct.account_id; + auto account_name = orderman::to_trim_str(acct); pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); @@ -344,7 +340,6 @@ struct MarginServiceCore::PImpl MarginResult margin; margin.set_status(MarginResult::Error); margin.set_account(account_name); - margin.set_account_id(account_id); CurlMsg reply2; bool done = false; try { @@ -381,30 +376,16 @@ MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(dis MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::compute_margin(const AccountInfo& acct, const std::vector& pos, +void MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, std::function cb) { - auto now = bts::datetime::now(); - auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); - if(me->last_call.is_not_a_date_time() || diff > me->throttle) + me->dispatcher.post([=] () { - me->last_call = now; - return query_margin_webapi(acct, pos, cb); - } - else - { - MarginResult result; - if(get_last_valid_result(acct, result)) - { - result.set_status(MarginResult::CachedValid); - cb(result); - } - return true; //no error, just returning cached - } + query_margin_webapi(acct, pos, cb); + }, me->throttle); } - -bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std::vector& pos, +bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, std::function cb) { utils::Uuid guid; @@ -431,13 +412,12 @@ bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std:: } } - void MarginServiceCore::set_verbose_debugging(bool verb) { me->verbose = verb; } -bool MarginServiceCore::get_last_valid_result(const AccountInfo& acct, MarginResult& result) +bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, MarginResult& result) { auto it = me->last_valid_results.find(acct); if(it != me->last_valid_results.end()) @@ -448,7 +428,7 @@ bool MarginServiceCore::get_last_valid_result(const AccountInfo& acct, MarginRes return false; } -bool MarginServiceCore::get_last_result(const AccountInfo& acct, MarginResult& result) +bool MarginServiceCore::get_last_result(const orderman::AccountName& acct, MarginResult& result) { auto it = me->last_results.find(acct); if(it != me->last_results.end()) diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index d7b3c32d5..55da6185b 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -14,7 +14,6 @@ namespace securities { class ISecurityDB; } namespace position { class IMarginObserver; -struct AccountInfo; class MarginServiceCore { @@ -23,17 +22,18 @@ public: MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - bool compute_margin(const AccountInfo&, const std::vector&, + void compute_margin(const orderman::AccountName&, const std::vector&, std::function); void set_verbose_debugging(bool); + bool get_last_valid_result(const orderman::AccountName&, api::position::MarginResult&); + bool get_last_result(const orderman::AccountName&, api::position::MarginResult&); + private: friend class PositionTests; - bool get_last_valid_result(const AccountInfo&, api::position::MarginResult&); - bool get_last_result(const AccountInfo&, api::position::MarginResult&); //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const AccountInfo&, const std::vector&, + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 1afc98bba..b8c1fb0a3 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -29,7 +29,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), - _margin(new MarginServiceCore(_dispatcher)) + _margin(new MarginServiceCore(_dispatcher)), + _latest_position(0) { LOG(Gen, Info, "MarginServiceServer: service started"); publish_all(); @@ -40,17 +41,21 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - PositionAggregator::PositionMap posmap; - _position->query_accounts_and_positions(posmap); - for(const auto& i : posmap) + auto accts = _position->get_accounts(); + for(const auto& i : accts) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i.first.account_name) ); - _margin->compute_margin(i.first, i.second, - [this, i](const MarginResult& m) - { - publish_margin(m); - }); + datetime::LLDateTime since = _latest_position; + std::vector pos; + if(_position->query_positions(i, pos, &since)) + { + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); + _margin->compute_margin(i, pos, [this](const MarginResult& m) + { + publish_margin(m); + }); + } } + _latest_position = datetime::ll_now(); } } @@ -70,11 +75,9 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request orderman::AccountName acct; orderman::str_to(request.account(), &acct); std::vector pos; - _position->query_all_positions(acct, pos); - - AccountInfo info(acct); - _margin->compute_margin(info, pos, - [=](const MarginResult& m) + _position->query_positions(acct, pos); + + _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); }); diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index d645e17c4..0647f512a 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -7,6 +7,7 @@ #include "lib/api/services/PositionService.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" +#include "lib/utils/datetime.h" #include #include #include @@ -38,5 +39,6 @@ private: utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; + datetime::LLDateTime _latest_position; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 1c2857209..82b8ca683 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -22,8 +22,9 @@ namespace position { PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) : _position_service(std::move(pos)), _position_map(), + _accounts(), _oracle(mdclient), - _lock() + _lock() { _position_service.subscribe_position_data() | rxcpp::operators::subscribe( @@ -40,52 +41,66 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: { const auto& o = ch.current(); _position_map[o->record_id()] = *o; + _accounts[o->account()] = bts::datetime::ll_now(); } for (const auto& o : update.added()) { _position_map[o->record_id()] = *o; - orderman::AccountName acct; - orderman::str_to(o->account(), &acct); - _accounts.insert( AccountInfo{o->account_id(), acct}); + _accounts[o->account()] = bts::datetime::ll_now(); } }); } PositionAggregator::~PositionAggregator() {} -void PositionAggregator::query_accounts_and_positions(PositionMap& result) +std::vector PositionAggregator::get_accounts() { - std::scoped_lock l(_lock); + std::vector vec; for(const auto& i : _accounts) - { - std::vector pos; - query_all_positions(i.account_name, pos); - result[i] = pos; - } + vec.push_back(orderman::to(i.first)); + return vec; } -void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) +void eraseSubStr(std::string & mainStr, const std::string & toErase) { - std::scoped_lock l(_lock); - result.reserve(_position_map.size()); - auto the_account = orderman::to_str(account); - for(auto& entry : _position_map) - { - const PositionUnit& unit = entry.second; - if(unit.account() != the_account) - continue; - auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); - if(sec && sec->has_glbx() && sec->has_future()) - { - Position pos; - pos.account = account; - pos.security_desc = securities::descriptor(*sec); - int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); - pos.position = Quantity(abs(totalpos)); - pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.push_back(pos); - } - } + size_t pos = mainStr.find(toErase); + if (pos != std::string::npos) + mainStr.erase(pos, toErase.length()); +} + +bool PositionAggregator::query_positions(const orderman::AccountName& account, std::vector& result, + datetime::LLDateTime* since) +{ + std::string acc = orderman::to_trim_str(account); + auto last_update = _accounts[acc]; + if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) + { + std::scoped_lock l(_lock); + result.reserve(_position_map.size()); + auto the_account = orderman::to_trim_str(account); + for(auto& entry : _position_map) + { + const PositionUnit& unit = entry.second; + if(unit.account() != the_account) + continue; + auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); + if(sec && sec->has_glbx() && sec->has_future()) + { + Position pos; + pos.account = account; + pos.security_desc = securities::descriptor(*sec); + eraseSubStr(pos.security_desc, "SIM:"); + int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); + pos.position = Quantity(abs(totalpos)); + pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } + if(since) + *since = _accounts[acc]; + return true; + } + return false; } }} diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index c493470a9..7571d2cc0 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -1,11 +1,12 @@ #pragma once -#include "AccountInfo.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/md/SecurityOracle.h" #include "lib/api/services/PositionService.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" +#include "lib/utils/datetime.h" + #include #include #include @@ -20,14 +21,14 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - typedef std::map< AccountInfo, std::vector > PositionMap; - void query_accounts_and_positions(PositionMap& result); - void query_all_positions(const orderman::AccountName& account, std::vector&); + std::vector get_accounts(); + bool query_positions(const orderman::AccountName& account, std::vector& result, + datetime::LLDateTime* since = nullptr); private: api::position::PositionService _position_service; std::map _position_map; - std::set _accounts; + std::map _accounts; md::SecurityOracle _oracle; std::recursive_mutex _lock; }; diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index a5c7b63d9..6f4bfa843 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -105,7 +105,8 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - PositionUnit& pu=_get_or_add(f); + std::string fill_account=_fill_account(f); + PositionUnit& pu=_get_or_add(fill_account,f.security_key()); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -146,16 +147,14 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const Fill& f) { - const std::string& acct = _fill_account(f); - uint32_t seckey = f.security_key(); +PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, + uint32_t seckey){ auto &pu = me->state[acct][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); pu.set_account(acct); - pu.set_security_id(seckey); - pu.set_account_id(f.internal_account_id()); + pu.set_security_id(seckey); } return pu; } diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index ec669eca8..cd983e8c6 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -28,7 +28,8 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { _on_fill(const bts::api::orderman::Fill &fill, bool is_add); // given an account and key, finds (or adds if absent) // the PositionUnit entry - bts::api::position::PositionUnit &_get_or_add(const bts::api::orderman::Fill&); + bts::api::position::PositionUnit &_get_or_add(const std::string &acct, + uint32_t sec_id); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, From cddadcb2788ce72addb56c6574b75519dc1d6570 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 16 Jun 2019 22:02:16 -0400 Subject: [PATCH 006/198] PositionService exposes new streaming calls pnl_data and pnl_account_data to get detailed and summary pnls --- src/lib/api/services/PositionService.proto | 6 +- src/lib/orderman/limiter/Limiter.cpp | 3 + src/lib/orderman/limiter/Limiter.h | 1 + src/server/sparkd/cmds/Run.cpp | 2 +- .../position/PositionServicePNLHelper.cpp | 199 ++++++++++++++++++ .../position/PositionServicePNLHelper.h | 29 +++ .../sparkd/position/PositionServiceServer.cpp | 62 +++++- .../sparkd/position/PositionServiceServer.h | 22 +- 8 files changed, 301 insertions(+), 23 deletions(-) create mode 100644 src/server/sparkd/position/PositionServicePNLHelper.cpp create mode 100644 src/server/sparkd/position/PositionServicePNLHelper.h diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index a2842f7a5..c7879cc5d 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -8,6 +8,7 @@ import "lib/domain_model/Security.proto"; message PositionUnit{ int32 record_id = 1 [(bts.api.key)=true]; string account = 10; + uint32 account_id = 15; uint32 security_id = 20; double sod_long_pos = 30; double sod_long_avg_price = 40; @@ -26,13 +27,12 @@ message PNLUnit{ double bid_price = 30; double ask_price = 40; double last_price = 50; - double settllement_price = 60; + double settlement_price = 60; } message AccountPNL{ uint32 account_id = 1 [(bts.api.key)=true]; - string account = 10; - double mid_pnl = 20; + double day_pnl = 20; } message ManualFill { diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 8f5fbe1c7..20bf88710 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -73,6 +73,9 @@ void Limiter::remove(const api::Security &security, else remove(security, AccountID(acct_ptr->id()), side, quantity, recurse); } +void Limiter::set_day_pnl (AccountID, double){ + // TODO: implement +} Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index ff6e94c1d..82f9c8528 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -33,6 +33,7 @@ class Limiter { api::Side, Quantity, bool recurse); void remove(api::Security const &, std::string const & /* account_name */, api::Side, Quantity, bool recurse); + void set_day_pnl (AccountID account_id, double pnl); enum LimiterErrorCode { OK, diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 3c9b1ec1c..770f1a0a1 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -88,7 +88,7 @@ int Run::execute(std::vector const &) { - position::PositionServiceServer position_service(sc); + position::PositionServiceServer position_service(sc,mdclient); metrics::ShellLatencyServer shell_latency_service( sc, stats, utils::Dispatcher::background()); diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp new file mode 100644 index 000000000..8c87075fb --- /dev/null +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -0,0 +1,199 @@ +#include "lib/api/services/OrderService.client.pb.h" +#include "lib/logging/logging.h" +#include "lib/md/MDClient.h" +#include "lib/os/os.h" +#include "PositionServicePNLHelper.h" +#include "lib/config/protos/cme_reference_data.pb.h" +#include "lib/config/config.h" + +#include "lib/utils/LockBox.h" +#include +#include + +#include +#include +#include +#include +#include + +namespace bts { +namespace position{ + +using namespace bts::api::position; +using namespace bts::api::orderman; +using namespace bts::md; + + +class HandleIndex { +public: + bts::md::MDClient& _client; + int _sub; + std::optional _consumer; + +public: + utils::LockBox> index; + + HandleIndex(md::MDClient& client): + _client(client), + _sub(0), + _consumer(std::nullopt), + index() { + _sub = _client.on_consumer().subscribe([=](const MDConsumer& c) { on_consumer(c); }); + on_consumer(_client.current_consumer()); + } + ~HandleIndex() { _client.on_consumer().unsubscribe(_sub); } + const std::string& symbol (SecurityKey key){ + auto handle = index.lock([id=key](const auto& index) { + auto iter = index.find(id); + return iter != index.end() ? iter->second : MDConsumerHandle {}; + }); + return handle.get_usersymbol().symbol(); + } + void get_md(SecurityKey key, + double& bid, double& ask, double& last, double& settle){ + auto handle = index.lock([id=key](const auto& index) { + auto iter = index.find(id); + return iter != index.end() ? iter->second : MDConsumerHandle {}; + }); + bid = bts::os::nan(); + ask = bid; + last = bid; + settle = bid; + if(handle.is_initialized()){ + TimeStamp time; + PriceSize bid_ps,ask_ps; + handle.get_direct_book(time, 1, &bid_ps, &ask_ps); + bid = bid_ps.price(); + ask = ask_ps.price(); + PriceSize last_ps; + datetime::LLDateTime trade_time; + handle.get_last_trade(time, last_ps, trade_time, nullptr); + last = last_ps.price(); + settle = handle.settlement_price().price(); + } + } + +private: + void on_consumer(const MDConsumer& c) { + MDConsumer temp(c); + if (temp.all_heartbeats_ok()) { + auto existing = _consumer ? _consumer->id() : 0; + LOG(md,Info, "Updating MBOService MDConsumer. Old {} new {}", existing, temp.id()); + // clear the index + index.lock([](auto& index) { index.clear(); }); + // Swap to new consumer + if (_consumer) { + _consumer->swap(temp); + } + else { _consumer = temp; } + // Subscribe to on_security + auto id = _consumer->id(); + _consumer->on_security([this,id](const SecurityPtr&, MDConsumerHandle handle) { + if (_consumer->id() == id) { + index.lock([handle](auto& index) { + index[SecurityKey(handle.key())] = handle; + }); + } + }); + } + } +}; + +struct PositionServicePNLHelper::PImpl { + HandleIndex handle_index; + std::map symbol_cpp_map; + std::map sec_cpp_map; + PImpl(bts::md::MDClient& md_client) + : + handle_index(md_client), + symbol_cpp_map(), + sec_cpp_map() + { + const auto& cpp_map = config::get().cpp_entry(); + for (const auto& p : cpp_map){ + symbol_cpp_map[std::string(p.first)]=p.second; + LOG(md,Info,"PositionServicePNLHelper loading cpp's Sym:{} cpp:{}", + p.first,p.second); + } + } +}; + + +void PositionServicePNLHelper::compute_pnl( + const std::vector& in_pos, + std::vector& out_pnl, + std::vector& out_account_pnl){ + out_account_pnl.clear(); + std::map acc_pnl; + for (const PositionUnit* pu_ptr : in_pos) { + const PositionUnit& pu = *pu_ptr; + uint32_t sec_key = pu.security_id(); + uint32_t acct_id = pu.account_id(); + double cpp = _get_cpp(sec_key); + double bid, ask, last, settle; + me->handle_index.get_md(SecurityKey(sec_key),bid,ask,last,settle); + PNLUnit pnlu; + pnlu.set_record_id(pu.record_id()); + pnlu.mutable_pos()->CopyFrom(pu); + pnlu.set_cash_value(cpp); + pnlu.set_bid_price(bid); + pnlu.set_ask_price(ask); + pnlu.set_last_price(last); + pnlu.set_settlement_price(settle); + out_pnl.push_back(pnlu); + // enter into account map + double pnl_dollars = _compute_day_pnl(pnlu); + auto it=acc_pnl.find(acct_id); + if(it==acc_pnl.end()){ + AccountPNL new_acc; + new_acc.set_account_id(acct_id); + new_acc.set_day_pnl(0.0); + acc_pnl[acct_id]=new_acc; + it=acc_pnl.find(acct_id); + } + AccountPNL& acc_pnl = it->second; + acc_pnl.set_day_pnl(acc_pnl.day_pnl()+pnl_dollars); + } + for(auto& u : acc_pnl) + out_account_pnl.push_back(u.second); +} +double PositionServicePNLHelper::_compute_day_pnl ( + const bts::api::position::PNLUnit& u){ + // long + double mid = (u.bid_price() + u.ask_price())*0.5, + long_pnl = std::abs(u.pos().day_long_pos()) * u.cash_value() * + (mid - u.pos().day_long_avg_price()), + short_pnl = std::abs(u.pos().day_short_pos()) * u.cash_value() * + (u.pos().day_short_avg_price() - mid); + return long_pnl + short_pnl; +} +double PositionServicePNLHelper::_get_cpp(uint32_t sec_key){ + auto it = me->sec_cpp_map.find(sec_key); + if(it == me->sec_cpp_map.end()){ + // TODO + // try to find it and put the value there + // const auto& symbol = me->handle_index.symbol(SecurityKey(sec_key)); + // auto cppit = me->symbol_cpp_map.find(symbol); + // if(cppit == me->symbol_cpp_map.end()){ + // LOG(md,Warn,"Could not find cpp for key:{} symbol:{}", + // sec_key,symbol); + // return bts::os::nan(); + // } + // else{ + // double cpp = cppit->second; + // me->sec_cpp_map[sec_key]=cpp; + // return cpp; + // } + return 1000; + } + else + return it->second; +} +PositionServicePNLHelper::PositionServicePNLHelper(md::MDClient& md_client) +: +me(new PImpl(md_client)){ +} +PositionServicePNLHelper::~PositionServicePNLHelper(){ +} + +}} \ No newline at end of file diff --git a/src/server/sparkd/position/PositionServicePNLHelper.h b/src/server/sparkd/position/PositionServicePNLHelper.h new file mode 100644 index 000000000..ff0faf994 --- /dev/null +++ b/src/server/sparkd/position/PositionServicePNLHelper.h @@ -0,0 +1,29 @@ +#pragma once + +#include "lib/api/services/PositionService.server.pb.h" +#include "lib/utils/bts_no_copy.h" +#include + +namespace bts { +namespace md { class MDClient;} + +namespace position { + +class MDClient; + +class PositionServicePNLHelper { +private: + struct PImpl; + std::unique_ptr me; +private: + double _compute_day_pnl (const bts::api::position::PNLUnit&); + double _get_cpp (uint32_t); + public: + PositionServicePNLHelper(md::MDClient& client); + ~PositionServicePNLHelper(); + void compute_pnl(const std::vector& in_pos, + std::vector& out_pnl, + std::vector& out_account_pnl); +}; +} // namespace position +} // namespace bts diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 6f4bfa843..d9fef7dc8 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -6,6 +6,7 @@ #include "lib/utils/PBUtils.h" #include "lib/persistence/SqliteStore.h" #include "lib/utils/Puid.h" +#include "PositionServicePNLHelper.h" #include #include @@ -19,40 +20,57 @@ namespace position{ using namespace bts::api::position; using namespace bts::api::orderman; +using namespace bts::md; static auto const manual_fills_ns = "manual_fills"; struct PositionServiceServer::PImpl { + bts::api::ServiceContext& context; PositionServiceBase::Position_dataStatefulPublisher publisher; + PositionServiceBase::Pnl_dataStatefulPublisher pnl_publisher; + PositionServiceBase::Pnl_account_dataStatefulPublisher pnl_account_publisher; bts::api::orderman::OrderService order_service; std::map> state; std::map manual_fills; int id; - + PositionServicePNLHelper pnl_helper; + int64_t poll_period_ms; // manual fills management std::unique_ptr manual_fills_store ; PositionServiceBase::Manual_fillsStatefulPublisher manual_fills_publisher; PImpl(bts::api::ServiceContext& context, const PositionServiceBase::Position_dataStatefulPublisher& publisher, - const PositionServiceBase::Manual_fillsStatefulPublisher &manual_fills_publisher) + const PositionServiceBase::Pnl_dataStatefulPublisher& pnl_publisher, + const PositionServiceBase::Pnl_account_dataStatefulPublisher& pnl_account_publisher, + const PositionServiceBase::Manual_fillsStatefulPublisher &manual_fills_publisher, + bts::md::MDClient& md_client) : + context(context), publisher(publisher), + pnl_publisher(pnl_publisher), + pnl_account_publisher(pnl_account_publisher), order_service(context.locate()), state(), id(0), + pnl_helper(md_client), + poll_period_ms(1000), manual_fills_store(std::make_unique ("manual_fills")), - manual_fills_publisher(manual_fills_publisher) + manual_fills_publisher(manual_fills_publisher) { } }; -PositionServiceServer::PositionServiceServer(bts::api::ServiceContext& context) +PositionServiceServer::PositionServiceServer(bts::api::ServiceContext& context, + bts::md::MDClient& md_client) : PositionServiceBase (context), me(new PImpl(context, make_position_data_stateful_publisher(), - make_manual_fills_stateful_publisher())) + make_pnl_data_stateful_publisher(), + make_pnl_account_data_stateful_publisher(), + make_manual_fills_stateful_publisher(), + md_client)) { me->order_service.subscribe_fills() | rxcpp::operators::subscribe( @@ -67,8 +85,9 @@ me(new PImpl(context, me->publisher.add_or_update(_on_fill(*f.current(),true)); } me->publisher.flush(); + _compute_pnl_and_publish(); }); - + me->context.post([this](){_periodic_poll();},me->poll_period_ms); auto all = me->manual_fills_store->retrieve_all()[manual_fills_ns]; LOG(persist, Info, "Finished loading all {} manual fills", all.size()); ManualFill rec; @@ -102,11 +121,11 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu return result; } - const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ std::string fill_account=_fill_account(f); - PositionUnit& pu=_get_or_add(fill_account,f.security_key()); + PositionUnit& pu=_get_or_add(fill_account,f.internal_account_id(), + f.security_key()); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -147,13 +166,15 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, +PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, + uint32_t account_id, uint32_t seckey){ auto &pu = me->state[acct][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); pu.set_account(acct); + pu.set_account_id(account_id); pu.set_security_id(seckey); } return pu; @@ -293,4 +314,27 @@ void PositionServiceServer::remove_manual_fill( me->manual_fills_publisher.flush(); } +void PositionServiceServer::_compute_pnl_and_publish(){ + std::vector in_pos; + for (auto& acct_p : me->state) { + for (auto& sec_p : acct_p.second) { + const PositionUnit& pu = sec_p.second; + in_pos.push_back(&pu); + } + } + std::vector pnl; + std::vector account_pnl; + me->pnl_helper.compute_pnl(in_pos,pnl,account_pnl); + for (const auto& u : pnl) + me->pnl_publisher.add_or_update(u); + for (const auto& u : account_pnl) + me->pnl_account_publisher.add_or_update(u); + me->pnl_publisher.flush(); + me->pnl_account_publisher.flush(); +} + +void PositionServiceServer::_periodic_poll(){ + _compute_pnl_and_publish(); + me->context.post([this](){_periodic_poll();},me->poll_period_ms); +} }} diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index cd983e8c6..4390d6694 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -5,16 +5,14 @@ #include namespace bts { -namespace api { -class ServiceContext; -} -namespace api { -namespace orderman { -class Fill; -} -} // namespace api +namespace md { class MDClient;} +namespace api { class ServiceContext; } +namespace api { namespace orderman { class Fill;}} + namespace position { +class MDClient; + class PositionServiceServer : public bts::api::position::PositionServiceBase { private: struct PImpl; @@ -29,15 +27,19 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { // given an account and key, finds (or adds if absent) // the PositionUnit entry bts::api::position::PositionUnit &_get_or_add(const std::string &acct, + uint32_t account_id, uint32_t sec_id); + void _periodic_poll(); + void _compute_pnl_and_publish(); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, double &tot_qty); - static std::string _fill_account(const bts::api::orderman::Fill &fill); + static std::string _fill_account(const bts::api::orderman::Fill &fill); public: - PositionServiceServer(bts::api::ServiceContext &context); + PositionServiceServer(bts::api::ServiceContext &context, + md::MDClient&); void create_manual_fill( const ::bts::api::position::ManualFillBatch &, From d7d319f1e3fbb6f28215f1421d705992b19cac29 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 10:43:27 -0400 Subject: [PATCH 007/198] fixed span timing --- .../sparkd/position/MarginServiceCore.cpp | 4 +-- .../sparkd/position/MarginServiceServer.cpp | 27 ++++++++++++------- .../sparkd/position/MarginServiceServer.h | 3 ++- .../sparkd/position/PositionAggregator.cpp | 3 +-- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 0abf89902..3e221b9e5 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -313,12 +313,12 @@ struct MarginServiceCore::PImpl pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); - std::string request = "\nFirm Id, Acct Id, Exchange, Ticker Symbol, Net Positions\n"; + std::string request = "\nFirm Id, Acct Id, Ticker Symbol, Net Positions\n"; size_t count = 0; for(const auto& i : pos) { int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {}, {}, {}", account_name, "CME", i.security_desc, p, "\n"); + request += fmt::format("BTS, {}, {}, {}, {}", account_name, i.security_desc, p, "\n"); count++; } if(count > 0) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index b8c1fb0a3..2ed1644b0 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -30,7 +30,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), - _latest_position(0) + _last_update(), + _lock() { LOG(Gen, Info, "MarginServiceServer: service started"); publish_all(); @@ -41,21 +42,29 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - auto accts = _position->get_accounts(); + auto accts = _position->get_accounts(); for(const auto& i : accts) - { - datetime::LLDateTime since = _latest_position; + { + datetime::LLDateTime since = 0; + { + std::scoped_lock l(_lock); + auto it = _last_update.find(i); + if(it != _last_update.end()) + since = it->second; + } std::vector pos; - if(_position->query_positions(i, pos, &since)) + orderman::AccountName acct = i; + if(_position->query_positions(acct, pos, &since)) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); - _margin->compute_margin(i, pos, [this](const MarginResult& m) + _margin->compute_margin(i, pos, [this, since, acct](const MarginResult& m) { publish_margin(m); - }); - } + std::scoped_lock l(_lock); + _last_update[acct] = since; + }); + } } - _latest_position = datetime::ll_now(); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 0647f512a..c63a121ec 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -39,6 +39,7 @@ private: utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; - datetime::LLDateTime _latest_position; + std::map _last_update; + std::recursive_mutex _lock; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 82b8ca683..066e4e753 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -76,7 +76,6 @@ bool PositionAggregator::query_positions(const orderman::AccountName& account, s if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) { std::scoped_lock l(_lock); - result.reserve(_position_map.size()); auto the_account = orderman::to_trim_str(account); for(auto& entry : _position_map) { @@ -97,7 +96,7 @@ bool PositionAggregator::query_positions(const orderman::AccountName& account, s } } if(since) - *since = _accounts[acc]; + *since = last_update; return true; } return false; From f3294701653fbf24ca0f1a80efc8ed1daba63063 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 16:49:21 -0400 Subject: [PATCH 008/198] added spreadsheet to help test span --- .../spark_excel/margin_data_example.xlsm | Bin 0 -> 16839 bytes .../rtd/formatting/JsonFormatter.cs | 4 +- src/lib/api/apicore.proto | 5 +- src/lib/api/services/MarginService.proto | 29 +++- .../sparkd/position/MarginServiceServer.cpp | 150 +++++++++++++++--- .../sparkd/position/MarginServiceServer.h | 24 ++- .../sparkd/position/PositionAggregator.cpp | 17 +- .../sparkd/position/PositionAggregator.h | 3 +- 8 files changed, 186 insertions(+), 46 deletions(-) create mode 100644 src/client/spark_excel/margin_data_example.xlsm diff --git a/src/client/spark_excel/margin_data_example.xlsm b/src/client/spark_excel/margin_data_example.xlsm new file mode 100644 index 0000000000000000000000000000000000000000..0decb97da7ba9119dc4c2799b50c3a1ac7aca6a9 GIT binary patch literal 16839 zcmeHuW1A)0vUS;Z7rSiRwr$&1muauO4%eHN+i*N0H?z#J%-sir5;NJX@nd@0= zjP>N4BW6U#jF6KA20;M;1AqVk0Kf-;(fP4Z1_%If4h8^#3;+S7DQIisWNhQ4tK@EH z?5IuSW^MH~4+MxT2LR~v_y2eNFCKw0<#Cx^I)qNbYq+>7G8aJeAUQ=iYHaiZV>~?z zSuDk&My?;Loo_NT{s2kA;Sy~ruk5#PW5d}YtYw3!l2S$iRsAj4p+FsQgU{~7-n<)0 zs(Cpu8@|xElr7fczscSh^%h z(MLc-N>FY1?W^Ww^UM*^e5g80j$-pYo%8S;z^N|Eh5iYJxO3Ajt(>>n*pGdZqr+fQ zGIA1-SwCi(Mw!+_U}vpYQVyDrxahG}FlE=bcQKCCEI>IO&H}==b>9d2#n`FWkuczc zBcKg~$D^sOyXFIG$32qvorf!0K`bgb(qVOTHiz@+!JIJ?EE;kEM(k`G7s zQTarCj}L*s{t||((+`J}yqX&q2j)t6*aoyReXV5tHH-!xixzGb*(&fk1_Y+&C_|Xh z*!rsL8&iK9Bl>33315nh*An-+gS&9$ zsJZ5QEFi!=z)N|axqj6)F-hCH(H?jiq{u|_Wg&Bpy6g*@K$lFe7JnBQ6%RnY&6q{} z`9fd_oJF#tC42YL$YxI<88#)hb<4FG?#Op~>PM4pR`S#_!L?HqxGin;q~9|DucZ6= z;D5K04{vu2=1;W<~oCLvgirur#o>wfw^u{?ljxKON%dZ~u26?TON| zpP~uA6nhP!aQ*Jp{WR5zlN#$HNaxL$+-j|crD~6HwrL1;!ch_^IY1n*Tjq^dRC72Q zQyTfOHJl^e&xRWYQ9d}g#Dz$k9uk3t7^ljjOspZ+4=6^3erS42N|tmOQ%uJ!tTmuO z0CjoFNiL2qM;=}SHkt;bUC0$elhQE5nG}!_DZ+T%%G|$GU{WuGyuCpFVhhL2`Js(f zH)f`m>s{9Uj0@c|M0Fd$tAS$8RCy50fYp6{FR3ogo-;y!UTk|r)>Q}{M6-GIwdmj<2qNa!puhx zf)Kq*u%PRZT2A4)e*BkF{B!Oq%q@Rj#5wg`VhHI)o0w zYxv~LWi}fvX64!WMymlGgqh^?<^F_0jiG3(6sMpkR}x5SVY@9R#;n6bR@?Sg-lkwr zV7&S|;_(X%Vm->DdhX=AQSTHgGDvw1;;1^g8CHlp@3;5$QrGwUGRGZOuQTjTy2yxA%DSPCY98fJ1+tE@%^O%8ghw-3AK)&*2gyZI7OEK($R z5s^eZ%yrOKo%xmSQ6|JV?MLy(;ukA2dWL?{Lc-#BC@O7uAM7W^CU*0Hb%Q~Z#2i?< z_4m%DgElM8>cFreX$Btz0z^&~qVlC1Ps0AbWNYs!C$EP6x~`T^TPL>Hn+PP(2ClSb z(R>{pa`tXswym!VwUawD0YMldh%KqN*Y|ffmkYd~Gxhg5d@(4rPW%k7i?IF(vHzSyCo^Mf zW7)Ht1Kv8@Jp^=ooua18?nHh!UDuAC+AH*bTF-9e4z_1qPLxc!?JU=#f37zj(0zz{I z35fRXSIe|3zlHYm;LWm`dAJ6@Nn+u~Lk$^@xk;^TWQbj^EWBK552RBNA@W!AB&Ro@ z2T2g8CxzeXV~mb+;nR;vH-}dHt0F250^tF!hbk|W&YKYTGCjye5`OjYV94d+7nGh^ z9SMEJXdjd~0n85bBazNP1>?+GU=o-xPJwg^RbK_>G4y64f=>*=NQNR=(V2g3A6b}( z+K@u0Z!oad*WP@caX$9Hb{fAz=^-=KI9=3Kb#ZtG>z-q%Ts(F5XvoL{)Y}A?uAmbB ze*Z2~kuXi=d$!APZqp!N(e?!Nc2At9nJH5=En!?E1Ut;LkaC4JZ{p=K-h&l8z?yt@ zKjG4}>U0HWbUjY&`5{rJ?s^S|!hk88GPRQX<}JY;BE_~!9b^mOng6{Poh&q%tCcAN zGG@M1E#k_H<{4m$FBml{?mMZGzgOrEO|*!=!8m{|l2&SsV5b)5OndAdsI=1R3tdkv zBJ{VaET4~)Uy64pzY=ysCZqA*onDWoulw+*sZFyUmwnXMpW^ z6O$6!ccS(oD4K%8`ME$IXF=g?Rj`{FH^bRSxvKJAlL6~wue%!I1RDG>gFM92-vfAL zGsU5ifVC66rBHKYiwJNyFi`2o(eqRrY>O})YUof0Qf7pf7AT2k}lzIfkipv8r=LcV?rU{T71V zDkcUoCJ~5-bdY+@kwuQ36o7j} z4J_C};rxP|E=r?7#zCF$j_jx-ba7?Q+ApsVj5EbXWxyM&2q7Q&&_WS#Y0oNn$N2;} zM7i#jf;6;VgznGDWGAEn5}K73hNP=Qx)!$ClOatjUxGzi|Oi_V_v}&0? z!KtzACQD`r%xt>%gQ=q_5Y}uhgui0~n?u|iK~lhNE)50-TkC7JdH{$jo;)g?KnCBY z&Mi|M-;V;|FeIAocC%nfb4#wf_mM0XtY>Tk%8-7Gn3(gcR@{kbEcP#i%6b#^U-F%$ zx5~#BstSbon-=v|W(6|SG{-|t!t?s5Rn^m%GDds$S}f>NHIX^6K;974S|EqK$1x{3 zQ{!qH+wSEL&~}3&oZ?`vQww-zzR|uEn`9&ojKmXYz+=HYpSgw4L#=6iKf|))j7SJS zJE2@M-ta)CHAZZ|LXzW5i>9I>A&r=pU$tajz{I_=pLrm$Qwkm;1FVu_DZM< zgndy=ST_3An_eMB&kAW__o9E^Sx~JAj)XrCmz)a=%a{}l5W!4J`Jn+k_DvotQ7OMp zyrvVd=c-B^(8Wnxk_36DEUyllaK+_;nYz&PM<_<%E+LZvqrGp>8;25qHhq%au0Dmo zx8EtdwKd~D+9A_%c!~j-=@7l7Kt{4=W}Z5UW;3~13(P^qSKK2NiZ=O+*V5F)uCL1B z`mel-!k46Wpfx-TxL4aQYI+5Xh3EFU0&vP?kR_YwQ*5a#fYU&#?R2pGpssTVU0*|< zyT;ii`wEydh~@!dV{@wUO5_k~;f;R^ZIbs}9B&wl*Cxh>75g_c)ELAJe8W}b>1N?eAk~hUTUfiI0mK3PbvMfh_aobSy7=TiCM+Wu-zRoirJ^Pfk12*7kG!a z^ih13_O_MFI)~5eyArfAA;Vir!2?x%upZxF+>#Ic@Xo z_^&Lw#^f`qcb=k}+k-LV!@V70OwNXCLrc!anYpdy1ac_BgtM=P*oK{nsJtfE(_VIW zaGorw^u*G1Jw+6LxgofzT)ulv*yA%5U7s%M?@lb*h2)prr+bV23`8*g3Pc>ujE$Wf zY5%-1{Nc$W#ID()>-nx%7|c|9v#EON$j`L zNFNNlyc4M5ei(OcwTqPW z=?PWy97;p1Ye7_D(#?=A`4y%>Wybjls6ubD#~SMzY0!($g6kJFz6zzbSz@RuYxE$^ zPx!);h6bpBecxnly#*dGwzLyzJ+H(fXTrf}X`SC*5@ctz=&YpXXfYRm)c2&F@4g6t zZl4~>9iku#L@wf|WuEMpLMR!2=5FT{84YGNFCH@0It+{;pkywINTvf>a-5R;3d(T*Y57F<*!<=+Dnvh z+;Xe{CO#*#a7CeAQDI80shR|Nks8{-;@rq?glVg3PsFVmd#?RcMMb+o6C2et*j#m?ENC+v)c{ zTePhm=&3(L&sa2buVzax zKBj11OJ8kv`&!4`F%<`tFG?T%R+8j?YGd)(eE_xE0HyKZYs+u6bJ6rru2Aa7Pw&k* zkp~c2kXpJWRW2;lp_TGjj-+ww&jd~YwyALv?|}*OIYwhT;0|vyeQ{L54|YT->Ub^O z`3%|rZc0;88#EiA@!%xR|7c2o28D_0mX13tC~q5S@8B^n#F@uC=m*S@nFv6ss*UUC zF3(|zA|SGn11tVSADybT^kPr!b?PvOM`Eq2tvt1tAFoRK5zT)nSr*`aE7J60tnp2oD%Td(h+Mo8~Mfj zaBKiZlD*t{SInOCd4i$S!K^DU-%C!Ztz+8xqENr-qr%p%f1|-gdTbs7j1m?&BZS(G zaoNDE=o@Hu-q+3>N#ZcM@;Vyzy5T5@ z6i03Cn}G&@=Q5#PQRb)cku|h!SmY^L7O}P zuyGU;vYB6I8I*U=dS;li1G^`utY)(i*iN4Z%zIqUDWexZT(|+rtH0?ZM~YVPNO}oE zlM76JzWw~Xwi;@R4A#-3>2!Czx##8Iv4|67V;u?ytzdi0-X90O>=%voV_ZplCjjKN z>Wo{>ghUA4>uS=~R?u~7#bU{Nox!)Vc_=jgtqU@iDF%xrA^0kd>5L`v#|DKtSYA8t z6W8Nn$($~wIYj!_+LTo)&T6%LiY4}R+z^Q_+lfscP&Rs!Q!A=4%u<>s(%BAGzOIS9 zGFUL?C?C=U!#Gpu0EI?|Xs1wcXx_V**aqrSQ*6wUuNo?y$1i9=6#znbUs(DGJ^8HX z=MESDq=Q~OvqJyak`sSHJw|>^|Gi}GJUXFli+1;57h6F3(<&a%F2KC)RVbIYGISv} zE`Dlt;UVX};0;XDt|}I~hPKVi25PLY4%!YdW*kyHL5HWfe#jkGU46-@;)HQ~1e@H0 zK_kndV>QEfKr!Ejb+6>Z$HIn<_7hC5vE$HVeX)<=_wWkoWrTHD%t_+mhzc}!JcP0a zwf2Nl74SHF1|1QJbJ^mA(H^S^Z#pVMXtng^yKTyA$b2(t!WBQRkHy`Y`sukM5|d5T zk&sQc<>FEYVkWwZ^xn>L( z$5Pe+jw(yC3QyBx?MYX*{@AdN=ocrMzDTtu@0UTFUZB>z{0?hgC^dj6A;E|kl`x-} zKpekk6lTU>oBFd%t1F~C*hpWe%SY29#-KbaVq2b`izb+Kpjr_|Hey?yo{KgZy`{RE zwi{#)g1I_EKpQ3|eA}L$i##~fz)b^YGJM;ezI`|-NRF{ciEtrO2jvXOQ^`L@@=6@? zB5`XL$y3FDQqs;O&tZp9Bol|60zJVG&`IUlow+5ERlYX43mY@6XY4uvEaOL{3$b7* zuNJm2<>rg~9g7{4R#0k7HmCBNpggi^F&d|^K3$87yaB5F0G35P)>k~xN~3dE z_Fi$J?i0#diCcPQRk!$@Xf@7Rd-$U}Vu?_=q84%14n#xnbQ98pu=$RCPDBmmbz@2gq0Yu6eP4<)TKa$TY*7&N_V6tJbUkZyw5DHkaIndK^<|{!86tiP+%^}u71>TKmXf?uhvcE{K_`By1ucEv?exH>l_AbaIrAia-Qs#Und;#`jIlz1J;AnN)SVaOGJzP?dglM+c0J__-61{ zfLP`hEB=#<_*DXb3OHW0rn8E-Cr1R%+dh9df^ONuv{m5Femw{c=EJ|3Do}2H3v#B@PtclbrE}-Nno1sLglJ(`fr$_>D{^k z>{yUGn%WC+RLy6qLWiutk(n;8$dApT+7qE%ID#93=5x8;fHg96xt{98`=?xMuf;=E zvpcTD;B2@9lP81&Lz<~Y8@_Go7+t)(i;37zRS3n*xmRdsuh!tSGW6}7(^v?()cAL= zK^?V{x&sd%;Qz@dnu6W23jC2A;R66b{JebTxm*nN4kzPO5idim#$WQ>F@##^##<9fig_a-EK!P9vB%zJ@JTA>R5We+n3_CZd?S{0fg@+n znrFS;^m%vxxW&zUaz9QVil$}z=`e;m)+Pu$ z2T2XW6YZ-{ulwywm7fk;A8ijd)v(C+;Id8q)Yv$eStJ$c@u1Ve)u`pjBJEp{0X}}F zq>Ta3!Tz55GE1ZwgV)Twr->Dwtm+TjnU2^}1T-0$Hzw84|{X?m6&mCQQGWL#E(a)6REUL*RMK z&i5)mSwr8Jk6AVW!)~Rw>_O<0mxyf+Ut&H~IoLS>Nk8LmVm@j+@@i}~z;X~WEABOA zf0y3EZ;rsYIe=y$-+fJTK-FNiz_j4%fm8u}K;*P^nt8h6L43bX!8rj~`ZjcPY)RxG z9|0`@uLA^iLD|qwfm;Ev0Hynmch7ep`da#0`gw10Y<<&%=Gzvu1NY_EgMa{D^*!%~ z`wFxM00S(q2Z8}=(2Ze7hyXt52SNvU24Vx`0@&u4?x*Ri>BrrzqlXs@lIV^W`3Pl* zr}@PLE7AlNltS+_bEXIZ2Gg#7j$ar&SB{Ana`lE{7Q{7Uku4GBXL7cY7g5#q%e1TG zCOUb*=TriRjb}5MOrHdHwOCsQGM(Vpk?Mdbt#>}>RZu=?gm?2(r_W+{9l&rPJ!E(Wru)$lJOTo)mZRt-I;?lpT1!RSWzy&&Fu96ppvr{nGrx`_w3{!(RNVZ zwTVkW1>ow+Vg-*z(}m6FMq4th2tYZ?1i_tl5B=B2GLEpE{qs%by?e%=ZtT_`a(vF| zF@qLM^N!4PnZ;K!B-rJk9God&MMT(w@o~RAn+3cQG)wyJC}{6{j;eTK>K9^rN#^rQ zl5F$8`NI5+EeYaTx?*HPd?nP4iY6hw4< z=a4Pr(+)0A*z0zZrvdhx1a{BoGk(wTX@f)p*4m2UY_`4lv~XGPD*g*HNa#A~%JCd$ z&59@@8CJ|!WfzRb(=1(G-EO*K>Y?tn2>z6hWWisVsUp2kusIR+dTO`^5@`sIy%oW} z$aT_ivr%DUrnXlM@*|pY50rC%B9&jP%Mp0{QlDTvIS-`s?{b*O z)KQ6ylIf>aK4XB&@wi+jl)^7-RT@7{#(KC)t11wwx%vfC&2fVy+lf=jES4>pgFWy0 zq6I1uX(YHW*=|XYu7|sY{DW}PJvA3XMEL4CN?Fdj9V{KGc(@QE%=?syU0$?1r<(IN z3ODmkTO}{eT^i@;rJI&s9o1Sie#{-U7THg}$7^!t)%eLNvFF}L1%V~CtqRJYx;48E zBA;5dDhh-u( zT$*eRxDc_z+TH4y_3V?DJmPN?BCw-7!vKfQU2TtLqJu;&X{l@S`wb1JhxN!1^=qcT z`H*q2<&tGRgqhW|a^*-1F;1A#G}|~MpJgUdt9NW>?KJ6B^b+oKj?_~F`3W^b4%e7OhY{}RZDu2 zov@9=I!!9g)WDEdCdGxdV4{gwKbN?0?W6>C`~8WFsR`9(Ds-Th*}o8+m8mw1wd)j9 zZi)QC=3BYyvSnUlLhpKIyoQZxN{_c(VcduNDEJ`RmGAYv-wkkEZ&pL>q>D370S`sa zwKs%P;d9P2?$PUZv`$VfILwC+MQR}KtES(4sybP}3!x}ek+`9uHC0%QNp}HLuxpFH zsb=(@>8GI2&_u2^BX1!>wL%A|UK})pj0;J;knP8eN0_A=!fa}2(^n^FmxnT~I6G^o z)BPCi2(_=xGyD-UkL#9KWW3t|utt0sv?&vGeT~F<<8FXrmqy$v3bAKrQbZJ&J?|6-{4|&2|;&4rD((xmFj2}$896+7T%|2s?U~kYmWh$}AV2S&Ya|L8 zd(B=vn$*VR3!9o0nf&;?+l5BbndeT-S3lc5pqEs**d+^Q2_#J!v~_T9UMmQxE7u_9 zjUQ#6y(TBIFvc~Z5Wgu@mcs&h;`o3?;?@*|w$CzZg zu{6_?#wc48PuVz|IZf@eNIxASaK+c%EA`kTa1FabZW(S6-X~C%92TxL6r*vFTqbmg zvyAvDOcN0;&8fdMMh_Jg*UgMb~AY zAY9>L67V8hgSPwK>j0r1%k<3I9+No`tMW+-NE%=8Fg1;5VDUpS^vANRpGMF*?3dej zRaUmTI;OKOGgxU+sKl7Gz;~!Xo-OFh^1Dn%$PB`OJ5%lV-OycO#L3N|i~LO0QV7tm z?bfIsJWrHlNh3TgGM${YHZfdN@ehtm&Puy??YNxp7T8s)f}1M45Lu_X;Pq1xSQ4ac z-baS$-s{aBI~g==g8QV9d7~==?LL${A(WzyF5+ET^4pn!9GBTi}DA)wh+3A zYt0;TV6FGAUkB)4^T1dG>mac2c9NaB$|{+IXrO9O{cNV!4wc|#_Ua(r=cMluL{C=Z zst{~E$YT)qs3OOaY8WQv(~5365r#ueRKguP@u{FrZ+%hgJ?G-Y(43rGHi zVbfe9@@&_~9o-%zuj&LiYwH=uJO3p}))$ixdwtjo!T3r58R-g-|7|3hg|(h^eS*eJ zj#FkAXgC1eSuMm8ACFB(PUb4(sT3F}w29x$553b#_M|7~R=b&cpV)kuLOf` zpGTUuSQBCuUNO3yj;LM?!K3L67{_Fu$9KAu(E3~)-V;Xtd};B3=kD>lD9`VD3%PaE zpqR{0Rk2C>8Puw%Ebzqu9RL>sIU~)=74A3ShF7P{&8+OiJmhTJqmiYBsqMZ-GV@P+5Zx>h=SQcOw zXcjQpnLFbPW^>m^?&^o*_VWa|Dqiz9W9dHoa6gfas>N5cr|Fr)6`Qt;<4$E>uaDS0 zc;VRp*pGJvgdk-W2o@=V1^Ln}Y-nvW4?9+8UxDX`bD95#@3&;w&HBhb4 z1C_+8y5o?;)@(_KEnPX4TIiNA`J&r3r{?GEXf(I{^s2+(s_pmySvy?^T`;hMiut;M zj9I6FSa97o?{D!9CUJZPIc6OJSBmW%-Lkyejf);7BKUH-l%A9LD_6Ex^lNLAbp%W> z?e{4)dwN{@VOE&Frq03|0wZQ)`K9Eo2{|XAqAJu6F@C$(h}lh7v;y-z1~q8k)yu6-+Bg9YX{N>>hx?F-jbeFl}{&^E;5eZyu)#Q6W^JS7^+yLUnMA; zpFBI!Dul7sQQOV3Q0>r(y07wa=B>w$SVfLwLpvh1o#sx1jk+P*vLl++#~3c_~Tp5-^5pW(#+OOJ$DbdA`9> zl;!k%;_0U+$naFUn11IG4_YbMv)5te!Ns&=7V~v+H+n^TJSv6c<*gQ|C?i^yEX7B9M##Z-qNMm+(bAC}9ulVS!{Jq_!dT9HO?ZjF1vHLxnjf0dB z_*%}BmBm?N-W2XNAW7S;Tfsvt(`O5DqayX1#jH7CnKB;TMvO-!y$LuyLH5gJ9cj{K zKS>fOZ(H~MGbl9aD4lTmHTeX(i>(3jEzhZ9l7A8{mApkM&CRmPQ{pe$Gk)|le!Mfc z+}f%Nj7u1(lo_zzGgB{7smU6G%$@X-TsKapG-+&@xB|&Yvh#O_!Uk0 zi+6IH7?T5%7k`VNq0E+&(@k^YvOt~ruj`nZHFF>%b9ymE@l=y6iu zAys@~BziP>#E4hgSSPAL-Mm*bmPD2?3w_+>J2(c@MYrCs@hEp4M0I&%JD#+?{ni_Y zbq1GQ+GBkyI($#6u9}8$aq!Mb!|-5PSsNG8I+r@8U0rQuWggt2l@0G37d!|U zXpqv?{?hk;6EbPA5fE^)Q3(%^()U!Wi%@Tr{vSw)(L#)uPEXI#;3fwpO018yb0 zq)#MWkJ5LLxC=(3XQ%A*G|xe;YQy2zI&hDJW|N0Vs@!0nX^JIZ)+BfR&WD63?#SyX zD4$RhHj&ijhC4)i)kRDiZu>)=@pLsyxNob}g2CSln<6Dk`0+C}XFZb<5j(>oI)NyN9rHyUEvZ7?FbRI|XN-IMULoza*DCP%urc;FTNgJ)G}|6G zt-3t6r%Gc z&JuM2$bb`8SPMBi`j?>_Q5PjYRCz!HIW}HQzer6RMjwsIS4@{Sjj}ar8#AUGFhCzw zQA=e(MM1&pC-r>bs}32O$&aof1MP-Ks5QLW7RxA-#o)_X5mof z#Kh#T!cj?HbNk(PUX^3U$GgXQf4|kS#dIMxvi}3}GoAMLO(?cAbG-J?z1*D7jVRcE zB-|XG+^viq|JWX^SGKlXr9*hf zM{FJmKeu(ecb-1H1YFd_DM1YcVQ$b~*Qf#J_tRAgfl&oD$xe}iIy5MM1MJ64BFZ2) z5?5;Qw)t0xge5{M;de{~{yQ)2CK6 zbgIRX;+beb8ad;i4$oX8!qpG}jiAMSjO<`BwH*pCJ<-7bL2WXe5y)=T`{oeJRmSeSNo| z$!g|{hH{VXkMbZH@jU;yiuk|)46Y6{P%+Y?jLlZSUn;ozm!tee-Nh|u+OuqkNan&Z zhwyMdp$9eK)r?Rt6wc|_`=_v^ zB^!MJt#3qkzSWcTqNLi?VDk9&@TWzG&rL_IQ4Kt;6b|T9XpYFKFxsS@L7YK@qz-h_ zx-%XuSm*!v!a>U?$}g$l=&`6h*qqWeADFdNT*sIM2*4GkRTXk=x~O4a)@)c9@kuu*ti;<%1?cg2*x^ zl70GqCoIb>PpdlUyFEQ2n`1w7wpoLd8c76IQ)oYSiJ<#G0(G^b={Z z75z(gr2eKMh)w}w3ENO2q1YEkQ@1e)>c>zda7SHbN@V<46&`7#{R@e*u-?PKabdT) z2?slsHOf7j*cC~9AzF*uEgfrpfE%_UtM4M#mEof; zQ16fXEoabgSN56ju3q3e3R$AyRQG}*A-iKNg$9qGHvacTz!*)|@bz!IIL`I}YIZMDkG-q>vOkLlNQ<2Nf`*u00v> zUZuYSHF3q-%7hMdqiMgIrW%?Ta^L63*OSH-;hf?A+h+7X6q!zFI!Rut6Z zrc;IzOcNLJqt&U+iD@lQ|MXZ{&KH~hdB~=|D-bCYCO(jUMCp?0&L5Ydl|A`kN*mqXH5!5A5zThQ$jBJef;E;)MM zzKu=HfJG46gl$FcEgm7J6V8&sEIlrafT+mnJ6n8I%_a8imlGMqE^r%UFJ>C`uX^M* z(TUvB$%!(ZS__M1ylXZVJ-`I4+pX}S-#{T%eYS@8clG&`W1@VEed64HwJ*PYI)%S0 zWs>i;KH^g;Ou&CA1p?5>*6?$4#?Fye-_Gt2rF{00{9j4@rv+ss$jW~9NDW+4UgHpK zmdv76s3aK%J`uu|H!479L@}CEX>s1b$hT#ClZHtsqS36G9B^~LaW&5G+nm;+A+=&a z(P!=v1n3za_x?bLIc>YuB@krDW#R!N>&KPTI;q36NHYKq!`2%_1ca7HW`-u8UZ`ef z(`T<%7^r9Nw_X`mQ=aIRuD8{MATo7-SL}`cnkbjWdg*5%rd5BpKE<#S4WGU6671K| zYJquKj?Yv0er^?xK{;aMiq;-)C{Mo*b*AZ1zt|GLt5Q*ZZ8zT2%7DxNbC+*D;5fOF zi6&Qtnp&e8MKSn-w#u5M7Cm5U8zqnVXBuDR{BrP*DzAXVJ4dN1HDCmapTYV|DTbHL zF6iGju$tMJT>yb0po>B+MRBiW8<@g)@UvpVJc9jPyVadNXX!UN&1uIwlfh=LOP+=4 zH^KA3(RHqC)Q7MH?UtU7@v!C)t`4Y%UTF^E&ke%im$(Uix!;EXe$&k{VDz4cf$l+tKHrc_4> zRy@o`I0oRHM2@RRs#KkGa2vbb)4r@PUg2?bssp{{8sd0bcvfN^1_#S^RU@XlQ_voD zfnG*TF~gP?bWJ2>qxv(lfc(n<-uS8MV|wa3A1>o-OzPmCiNxS8;57&tgXcAKINs+t z{(b$FW8m-P{ghtZr>FgF1Nd`)+ty0o$=u3V$k@)<#>m*l(EK04cX{%7bRHi{&||_F zC&B{+guhh(#??nY)*&DixhAqOaKBX7TO#*t*mKKSR9Ml(+eHahORd|BBZr0RGJJ?5 z`pHB84D+(}dj%yz`f_1r`BE$IUj4_vo|(v zmz3ku#lAR9!mY5&iIMAttbvm5i>qVvokD$|&d9YBQ&IAM8max!-9EY`7AoCb(rGh$ zh7plSE}Si{wd+xcJWka4lrCxGDcFY1icQ52d#qLT=-p8hR`|ds$FuVai*~ZJnQHU{ z=N62?h+n^2oV13_zpLvp^&$nYP886iXVH1;eycP8x;JKz{^N#Hpz1yscexVN_j_a| z#79BWIk%*x#{(6yld(}@}tcC zk)UOCrvVsw2BCr8@Aw1~mS}_hi-{7oDoz!llgFiQL(GL4IE1YVJB$+Kj`N8NXKHnZ z;^dvCX-y$Fj)tDMGS%FR=0|sPO8LrvCVEzYPdP{Tb{2=LYY8 zTKPY(|DoMmPV(Og{=IwjpTIw^d!NC;zx0y+4*d6qx_<>ieb#{d&+T=;^Zece^%qn2 zr#1c75%oLx_vV|wz=qI&f`4zt`JLeR!sovT$dLZ~-~Uzy{X5I=g}HyROng?o{MR%5 zE6bl{y1%phUOD;~izDiPWcjm>^mmruYi<5w3Bmr8<=-oBeuw{_Irt0yMEfWFuROx< z(BI$2{(^2Y`~&*?yV>syzrV5k#qh@XC&RzJzx;6u-lNcL9G9m~#GO*#8HIASVg>nWXun{|_Eu=F{Xhx&Qd|{{Y()), _publisher(make_margin_data_stateful_publisher()), + _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), + //state below + _lock(), _last_update(), - _lock() + _admin_data() { LOG(Gen, Info, "MarginServiceServer: service started"); + + _admin_data = *_admin_service.get_admin_data(api::VoidMessage()).value(); + _admin_service.subscribe_admin_data() | + rxcpp::operators::subscribe( + [this](auto const &update) + { + std::scoped_lock l(_lock); + bts_assert(update.all().size() == 1); + _admin_data = *update.all()[0]; + }); + publish_all(); _timer.start(); } @@ -42,25 +60,24 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - auto accts = _position->get_accounts(); + std::scoped_lock l(_lock); + auto accts = AdminServiceUtils::accounts(_admin_data, false); for(const auto& i : accts) { datetime::LLDateTime since = 0; - { - std::scoped_lock l(_lock); - auto it = _last_update.find(i); - if(it != _last_update.end()) - since = it->second; - } - std::vector pos; - orderman::AccountName acct = i; + std::string acct = i->name(); + auto it = _last_update.find(acct); + if(it != _last_update.end()) + since = it->second; + std::vector pos; if(_position->query_positions(acct, pos, &since)) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); - _margin->compute_margin(i, pos, [this, since, acct](const MarginResult& m) + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); + auto aname = orderman::to(acct); + _margin->compute_margin(aname, pos, [this, since, acct](const MarginResult& m) { - publish_margin(m); - std::scoped_lock l(_lock); + std::scoped_lock l(_lock); + publish_margin(m); _last_update[acct] = since; }); } @@ -84,8 +101,7 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request orderman::AccountName acct; orderman::str_to(request.account(), &acct); std::vector pos; - _position->query_positions(acct, pos); - + _position->query_positions(request.account(), pos); _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); @@ -94,12 +110,104 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request } -void MarginServiceServer::publish_margin(const api::position::MarginResult& account_result) +void MarginServiceServer::publish_margin(const api::position::MarginResult& result) { - //account_result here is keyed on account_id, which is included for streaming margin computations but not - //on-demand computations - _publisher.add_or_update(account_result); + std::scoped_lock l(_lock); + _publisher.add_or_update(result); _publisher.flush(); + + publish_excess_liquidity_report(result); } + +void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result) +{ + std::scoped_lock l(_lock); + ExcessLiquidityReport report; + report.set_account(result.account()); + report.mutable_margin_result()->CopyFrom(result); + auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); + double netliq = 0.0; + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + netliq = report.leverage_factor() * report.cash_balance(); + } + netliq -= result.maint_margin(); + report.set_excess_liquidity(netliq); + _report_publisher.add_or_update(report); + _report_publisher.flush(); +} + +void MarginServiceServer::update_report(const std::string& account) +{ + MarginResult res; + auto acct = orderman::to(account); + if(_margin->get_last_valid_result(acct, res)) + publish_excess_liquidity_report(res); +} + +void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_leverage_factor_percentage(request.leverage_factor()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + update_report(request.account()); + }); + } +} + +void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_cash_balance(request.cash_balance()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + update_report(request.account()); + }); + } +} + }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index c63a121ec..3fb3e06ad 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -1,11 +1,12 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/api/services/MarginService.server.pb.h" #include "lib/md/SecurityOracle.h" +#include "lib/persistence/IStore.h" #include "lib/api/public/ServiceContext.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/api/services/PositionService.client.pb.h" +#include "lib/api/services/MarginService.server.pb.h" +#include "lib/api/services/AdminService.pb.h" +#include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/bts_no_copy.h" #include "lib/utils/datetime.h" #include @@ -28,18 +29,33 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; + + void set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; + + void set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; private: void publish_margin(const api::position::MarginResult&); + void publish_excess_liquidity_report(const api::position::MarginResult&); + void update_report(const std::string&); void publish_all(); private: + api::admin::AdminService _admin_service; MarginServiceBase::Margin_dataStatefulPublisher _publisher; + MarginServiceBase::Excess_liquidity_reportStatefulPublisher _report_publisher; utils::Dispatcher& _dispatcher; utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; - std::map _last_update; + +private: + //state std::recursive_mutex _lock; + std::map _last_update; + bts::api::admin::AdminData _admin_data; + }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 066e4e753..74f0131e5 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -53,13 +53,6 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: PositionAggregator::~PositionAggregator() {} -std::vector PositionAggregator::get_accounts() -{ - std::vector vec; - for(const auto& i : _accounts) - vec.push_back(orderman::to(i.first)); - return vec; -} void eraseSubStr(std::string & mainStr, const std::string & toErase) { @@ -68,25 +61,23 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) mainStr.erase(pos, toErase.length()); } -bool PositionAggregator::query_positions(const orderman::AccountName& account, std::vector& result, +bool PositionAggregator::query_positions(const std::string& account, std::vector& result, datetime::LLDateTime* since) { - std::string acc = orderman::to_trim_str(account); - auto last_update = _accounts[acc]; + auto last_update = _accounts[account]; if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) { std::scoped_lock l(_lock); - auto the_account = orderman::to_trim_str(account); for(auto& entry : _position_map) { const PositionUnit& unit = entry.second; - if(unit.account() != the_account) + if(unit.account() != account) continue; auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); if(sec && sec->has_glbx() && sec->has_future()) { Position pos; - pos.account = account; + pos.account = orderman::to(account); pos.security_desc = securities::descriptor(*sec); eraseSubStr(pos.security_desc, "SIM:"); int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 7571d2cc0..db9ec5ad5 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -21,8 +21,7 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - std::vector get_accounts(); - bool query_positions(const orderman::AccountName& account, std::vector& result, + bool query_positions(const std::string& account, std::vector& result, datetime::LLDateTime* since = nullptr); private: From e9f61dc3c055644ebc1f71ce6c8c2ba47a02daaf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 18:15:05 -0400 Subject: [PATCH 009/198] added get_excess_liquidity_report rpc for adminui --- .../spark_excel/margin_data_example.xlsm | Bin 16839 -> 17157 bytes src/lib/api/services/MarginService.proto | 1 + .../sparkd/position/MarginServiceServer.cpp | 21 +++++++++++++++--- .../sparkd/position/MarginServiceServer.h | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/client/spark_excel/margin_data_example.xlsm b/src/client/spark_excel/margin_data_example.xlsm index 0decb97da7ba9119dc4c2799b50c3a1ac7aca6a9..58d601e8c01d87018a85563e8e32032eca0a7b4e 100644 GIT binary patch delta 9018 zcmZ8{Wl){L(kAZiPH?y2?k>UI-JRgPxck8+xJ!VO5S)WUaCZ+92<{Tt+`C)#?e6^O z>FMd}sd{Q=o|^6%iGYrZhHeVON1>Z!{j!e;1vN_plE5JbxY+$%oHGnvyw(J;-a@z^ zC`EcW+H(nB`(J1`BC+}d^Z3ptgMSjygfk3Rwtg7v?ag#XGh|)$UPHJRF;whaTclZC zeh+dEa`{xcf*L`(Sx?j<2g7e1(07{jcH@8fy~2shC%j@m2D*J#T(SOr{_jo7=>um# z!g8cKIxE~2kknJ@ycgvTIZx1|Hj3 zm7o;Q5mxP9>oyJG6ehr7qpllL}CC<zfAg020dc__lBSzbEIPH3+*4_@#xU^!_AiI89Uz7+uIupC|C;f zoRM^(zM$|^Z_I`CUUwr?VmSteRmdr;_zUf4D)Skip<3=b*W(D}N3(UmrfXLBwwpen zCs4T~dTCOr+hK)%hS!&H-u=c6rF;?;%_+QYw zvP*#H8?$bm>ym#qD$ab^2>n+wAK~vX;wid7%kL~6OR1J?#U@Nd?qLrCn@NZ|E;m+W zM6ThX%=b)39QhuZXAGZ?WsS#1NoHx0y@mmlh{ZGxIDP2E4OqTM)@Ymd3zFqU(Rv=j zx3GqZ4>Gk~ePT_yk|bec_%FvYX*V?tPYYjtZFj)u<1rU{5c}JEn5dmaR7;$*lCCab zuv7Mr+*WvbFJREW(D>HV*th~kzKre*JsCY#IXDR4=5CjvZlOz^9pi1NTUJt^zl-Y2w73g?Gh}vySqE*U5BVP5)$PWzgh5e zt{c`_5nbxN@Zpl84I(rI%p>%S`kP0noLpPTo_E@=e_T^d6PTb|GSa=t!3kS(p#>M8H?0~NT)8*yFm%qz+)0alfzJAW*iZtitKp|-IXi5dFE@YMB z?BmeW?N?XL+ubNv7^h1Yt4R?&H#xJBc1H#^D6X6)`A&IpSIH7!WsYTJK<2BlJot(N z`qZ^Z1oOcar@oXcSgif04`w&aYAn1W>I0aLe$~LH5>t_U9E`3Yz^T``qGI38PhtIB9q^>zsuX`D=jA<8?2v z*LMp?ErA2u;^ataxz|3R7R~3oCLRJ!W_)bLT)f?a-=C6&&Or#ME^MEqNLJWDraq33iQ_?xb!>(xYiH?2h@JZI!+@<}0evdrZa7CP{|OfdY0?t;dW+$Mv_eWoWH&N$R>G8{|xAZ{m@^sl*M|#@Bd;@sl?bEN-qdC`hD%N6k{{)B~?;^RWUdf zZ}`iJN#^IGW-O?x6pQX6#63~aju{2_S{rX~R2#2!*95;02R}-G#Dv#G*m7oYz1n*y zHbc-qhQ;Z^&wzbNV^>|@SbkobO5Dyc-G&iRc(w%9lpoPgE8Q^pu}<#cT zv6k|%JX#3}_O;_p$MsI`xPTpQ<@ehI6-rD|g7lN7M7gN}HJF#M)4|hhS38wG6q9ccy3;<)5qH4h>wW}!U+?{IQ7qaB zP0 zdh!d!cs7ix8g{&6%F`fIhp&wq)fs3u3Z+WvXJS-j_Vd_HKUYItGr*e*&$8k8>J_{t zT{2&i1$~86CCvmzRU$q$JiGmM7WZrRk-&8zT^`(gIDks>#|4Q|S>w6`?j7x`>*aR1 z6(LnrHU-A^(&Y(SnEZhp{G26z^zCI-;ir~tkB)a(D5&>;LR}da4i5?e3Y0>I0RJ=F zqf`=!+hruT?qI7)V{Sd}z{}TQmJO7r%(&47p#69)_R8 z`hXk;_lJ*%7Arn%hW3C;0R!DdaYC@X;#<{@#B^Bs5u9Njj7#_5H(~Bh-(?nq7B7Xd ztNNbY_qUtrm!gN`$LaBHkpSm6j)gXADK28!VW~BZxZy}dU^Dq%R zF7q!^D8))ux1`e#^_1Ux5VHQXUgIVK^b0p<|; zCd|(L&9YUxG^HXttyw-Ssg(13n&0iO%T1wYJN@jj1qj-t{pg$?fb5ChguDRKL%! zNZc7#zdP;B6PcgC^CZs@aT>f=U4=itQMX|L=3MHq3ot$q9CIdjDs@a_I9Av!SQaRh zbtK=4;zIYDt&LDbeRv+|NeR>@5`9=>G-H@=FxfCgu#D^+#*{mVFcMfu&}R@sbMhvN zHnd|Xp)hm_LWy0Dn044&7}79Rh^;wl6aJ%!JG?vH45Bf-F}gD>V-S(6I42Yu47NFd z*o3xM=wg2dqssZtWxs^-gzi94%)h1a<~ zuDWq_`rMWF`cz<2$ggk7`vk9%pQQR2ql7rjn922j@h zIq~XR(HeN90y3Jr&QE>Upu@i<+@lef91b@Vy%yHF(KKHm7t`l*VcMT<5D!9YyY$A@ zeZ5ffOlWGJq%gpBsnW;FhB6Kd%54SC)bK)e(um&sN8y|O1;?c5;blkaA$`E)^R@fN zeKByxOA@tQTY7A7#w)v4peC%2;_1VTE+;1tO+`WcY#;F|)utRe=V@{fH2yh=#G-;M zSh-A6nSMv|Zz$SWYE6vT$|W}s_G@Q*E6E$1l&i4u9o96Z!oY<9Hgy(j=H!J`y(uGr zn8M0?JtA#YATPz-Kl`A)n+Qz&#i%c$7A2mHp*Os?JrT2w9~gL{!yn+hv~*bl{pObp zVx(r5Ji+K=SPF!HB-!&uPP3Chjpx$4y-HY8tVDjYD9| zZ=5fA+8RKrSm4O>Soa5GrLi+4*av%{xD^f73lqWQ%?RPZ*ODY|XBkLgZy_1D{-DJi znS<-f23L^da-HLV8BXl^z1NIX1fx3kXW zMpA*;U@=uoO$APjYn76V@(%ujR#C#pwiB|b#Ak(Zs1fX17JD_zt8dk|(B8STZDy!jcE)-r+D z-5#Pw@a{hUl`~m33Ghwu@`0WAPM8!=(5b~&Dr^kQyQg66tPv%+z#PfgH@vX-lW6D0 zOEwsxu84S(p)L3p^c4A#JbZrnOJFVt3IDm$AZUyzp`KJx4re*a$8FuWgx1-Eor(LYDVRqE1vwa3{FtT_vZXXVccWyL93nBo@29Jcmj5I5_$$~WKc zM9VFC9r~KUq6m*|O(xzk2dXZ7R%#R0(Ht*4(Oki-<^it7-JT#s@aOzJV(KC0dMjXp z>(!dZm<4%Ro-NGqT3t%@ZCDe5jkFu>&%L|vpJZ`oA^?^a5^mI}6^CE3hdd6>^+^?% zvoJXs!v>;~VKkTWBCukv+9e-SVIJ_7yC7CLbafMxo6)l;`?JCDP6l z0)XlU4(PcH4i{Gk8?>3V{d4^?lfp`W~@ML zp96hm*Qga48a%hJ3(1f??Wm8`dYdeS?FpGhqq2=`^n~q( zn(UtB5uRyAQxsVV#zw~Mo(3wco(W&IfYU+hA3Tn%o}X&Mh;QFBg{v{9?tsPsI~U;j z!l>b{4f=+Z-(aDmiofk0&xxyXwF*JuK~B6gIs%ooP{kPUJ99cc%j4}~E#c25^FU)ZbZ&cSQ> zOM6mLo)(RTY@>ZhYQOf|b}LDK51~I0T@y%}%)+Y_UCF*_+u?~J*HU_TQ$0v#^r5OM z^aDh9EJkY^GhbAMJBuZ$fP!K8R7A{^Cg^1;G54cEI#m7sN_2-_3!w$VwTl<>&G-{+&daFFm!ng?R!_qv z@zJ55!1J&3qd0^c#7xN$+Ar+%TIz;*v})?C7#E}52DPDvlI-j90>Y-(CLR8?94a>& zSyN;l0vX)bX9pZ4;Ax-wV)VDAs=ebJXt;~#!pqss`7Da zWTGGx>oOnGpSfxrdR_-}4njIK(wPIVL_uCWC(9WZTM~I#r&9NkuMC8>`>uQ4p?6pUua)g+8doVGuU(J9t`uSzH`{) ziT8ZSUkEG&dx!C|3Q`2U4MPF`Oh!JcJtphIm0miQ3tk!am%I`i%qZD>GM+ya*$`g$5xxu9?x7yADcp zQO!5w^+`R^&Cctp3(Bn5zT-`w?2wmC^iN{9f8QSujW#3FfydlMj<*LlVDl}rqj%fe z$FQpT%8Jon%84E3P8TX+pDO_2}SSIO&f~yDB*3upBeU+Wf0QUUf@Ys*vXYKhON>% zTb(Af(;hk7^zRU^DsHa`;qzU2AkTA=)c zz}wL83*j5?Z>O8AXK(n&AM5;3xV|-@PNSa-OZunRmoO(4GFaaKWI(z~L(F!l*KA4} zLGs>UF{PQYiuBFbaNJF?Lw@#1a@f-nQBS?VwKVI%^XH!>W};8X3qKo0F$3d?VX$xmIeyb`tq_c{a{=9;LL^WeTuRlEw<7h`8Q`{*^6U2QUR zg3&zG%LT*?{1{IatbmB@3)vdn?{V$BWE?(2gRZ51j9TYQmpc4uM*_|olo-Tx*_@@T z(1zBITS;gBqaY4QEj-n<)-YuS$8*KUdZvUbn(Vzl=@e zt8JD|@R{FjdVd{ZijkXnYm{zX(dy!=68u(IQ)Tz}M!9Z+Q?vIxF?&IR@5?E7cjv^) zLevAUdPQ`5{U>}&X6uXCgDs!QJ{erf*hmINy4d|J`EbjNMcyVDyJ#FQYi0wB7_ki~ zWp3wdV!-9HU^yZmQ?NSdJxOgLRDJP$CJ74Lsnx#J`O1IrP#$j_6HybmG9}};f*nu2 zY?b`H$)-wJ@%(zVyZabh5qak$hlq34EU=#DeS40=(DduiDN5ARQ}fd8t-H~Q1ZhBt!=Jh++_`xOT?#2-~nau|3UVvA} zyN}D`i;dZ}W47D=bpZ#-dUcx|dYxvqrk|$P7nOf>Yd0|UsA{@=JU7W^>s$_h&@JB| z)NbNT#|s8gQSdK(LV3T8_r--npC2aAx*+g+6YF%Bt$(5S`nu!!(mt?lfNR1|te`$V zlPKzTqW>P`;Xf}w&Fb8FHs}Iev}wNIkeQa2fG%-iC}=yMTU(@m$f-2f{;6goZTNGC z(#aPyo-?2EC0qixcfO4eCu_qwOj4cJvKvr zB}{Oq%?qv?SoRfZ`)1Q~wBmUqnvYsdL8b7dHh8duPYjaAmtz)7dhkHp*LJTHUzsJ^ zAj!zhR&}W7<)J9qWJv%b-ExD6{AxlO9_f1@RBt^fmaNDBocb@aKSy;ajK*J?Vmu7n zPaomv(I5onYSj>LDDQ`z$;&d|GJ%;{9`QljmImsh-SYi{a<2hJ+o3lGP-WoVSfAeBFMlCOJ$-h>R|36Vy3)} zd*r;z$#7X3e1PaDA6oHuGsJ(Qm+(ItCT%Y@ge5SXffOf5Cpp;DgW<`>I9ai$83T`w zsctZ&{#5s)BvG!`A3YowKbclfED(YW~ufsHAEz&W(TxyAwIpcNH>} zDOhySnDVgGaHRj>m)lh2>50UD$uaCS^9~gi!gPMxP5R2fpCS#Y-oaBi-WRX4~b z?RVsxSmbBqzKz=|Tp>LKQi7;wp-JP61mo>~GXVK>l=^r-4)?yTvUvBc9l^`*ifQ`4 zk260joUSgnIO)-MQG}z4oKVDllPSNv$s0N~5n!!5Fz&4>I4@9+&^&D_YMPVRPo@p( z^N0cAn?sDBx&AiCt}hzyo1T4cHy$O0do4U`;QdlOvi%3m&rnMBt@wule*|9F`m*6Z zx}S8NiC7i?v3Gzp*`?D14OK6NcV{6xP;Bskh|EUim$~}Ym~^C-xlNdum^hJ^>{Raa z;8$j_o#XIoKw0O|848d8EdpTweQU@2SsGn~O){lZa=E+X-$P{jRnPyyG%<5#C|A7$ zn;ZR))niH&67|G==c9UEokLW_%*G$nUH!#B2D@#g6H}+%I%d10uTSvHI;p2qM_)|M zCUD*vpukrguP}h2`*_G56ciK$8VU;UU+?G4;bm{(X=APB?djlZ=k=c&oVUif+5jh3 z7tIwW%XW(ol_|4WvP(b|?0 zBtK^3$cq`*w41CD^pzuFPbtt_GAzj|wIHy}9PK=~{F#t3gK0HabAqOF34TSX^|FFM z>x5%3rb}GkGCGFUCkeDK?qY;fohIBiKoL<?)QBB<*Rnlpb!8Ff&qn*;Q@Hzv+rCmP*B{cP*7O^8yPDLXDexY z3kTQ#qLQ`lx~7gLyUlV($=b_5T&~Iib3NnLyArn$5^A#%3Ws2!{T(oS@KkBx50% zHws_)4h8XbvfNuq^ca3yb;wP4S_u-yNVDq{FPglVrZ(vg&Ts7bbABvyWq0*fWSj7oY>pZ<})7Jb<-LI@kr>Uu>*VIU+l24^+6!@*8 z=_{*)uS&!ukBuxNLMKlh9k6(71m}q+m|mbTsFhji&$Ag-%B-ARWtv{ggRNX%Nv1rg z;j5a=FrvXBs}rUst)5BCkdAw_PvX~#HV3-rypo}a%W+7f9r+iKnVJ_!lc!GaV4;qV zW$-izaX5@8Q`~gqVmrQ3^>p~jSf^I4W*#g?bV!k%yWR7DjR>i{w%+xTG_fU1Il z&E@iz0NR3&JO0?6hl5?MzqV!_6xmI2gU)#4>Q8WNHLX~M?jLq2X`W7d#n`Rct>}vD2Rq5?cP;2J`=VVTe4*}y?H%^ zBraNBy37I#PNY0^I<6ll45EQBh0Vod87ED%lcvZc0&|CkH^05P$N{3l!3VuaV1T9h zz%cM}x>VBg;1>aIXrNJAJ#TE=?Q4Py6oZFIA3!HSpJUYq9o@lDN~3v6 zQPZnB3j;TzE`j{hK!rLS=*CcSc<-8FhP7kblzdSeX_Ic`5!anI?O_Yd-s(9#F+<))2Hn|H|Lf8YX zZZ8Y99!xKz55|jb#@cE^1WY?Jf2)zrt8c!|k##O-J_QmQ^*ErF{UP!1@OHH6sp$(c zczRF zR<%Y9R_y%$Ox)RJah*UiYij1t{d7ynDtaELh|ZcR<$@iYqu=;)C!Nf`eK8B1)E0PK zFk}3R-EesyhEy3+XR@y|(#YoPu)Q>H(X~cd`9ijWIyQ5%%{6j~Vjl>}?m{j0x z1HGWzcr9-kxqJ5O#A7!gN(5*jzG|T`VrR?+dLNkA4$)|ZF&(9-VCWHveB{bV9~)KN zRVv1-W`MyBXX-0&44LXl=8b6R$Ff>OvDS<9RO0HFX5><0=KP*IE9gw+jGTd_6d$fh z%V7SK0UkOY2|x6s6!Dibl$+@lq>S)cCl#tIJw z;=|LbWpwegoOn#t9<66d9nM&YUdYmxVY0(!0`pBLwtXi~GEySlD!Df8*hap8_hsy+ z72B>{0-(XGqI=N)_dk;%aS^ir)|hbr-S84nP}u*v|7nTjAaV&&m{(4au>>XA|4)_w zlp)E6Kra3t>;D2Bf-RN+ delta 8696 zcmZvCWl)_l*X_aGi(7GbJGi@3w73*^r%)cGxO0HwPH`yE;&O0`Q>?hVyTk4K{kZRU zXKsEZYmzm|OlD`TnY|Mh4l@`E^CK7^buw<1eH9S|njnWr;1UB|?7mKpDFzN6oBZ!y zRx@6a5}xRC4mJsQ`A~AOVbk>*S5CYiqj2Ql)noe?LulVR_3F74?gbkR(D(KgTJ>7R z>d)Su|2_?)L?p?FAkEtDSA@WQb8KI~k$l;E+E

p^gs0xKs?HoKYt$2X29vo!6YN zE>oD66+u$iqGf=v5|*fH%rg0EQJEwr7-Xf~BU*UQ7cg5W9XS;)u=tc&e#GXK&@K^& z|JfWLqkiQxI|c4t^B_!|tkf|L>Q;jHDwR;>$qKW(|GQ3dEK{R;@u0rNE78Z_vO1s6 zZnNiuzS^Gjwu{HoyH6}WkHkH%dPw6Yu{i~06JT9?j~fHkmBCtXxq}-HWfDIwa8C*n zTv)TiD{jsNC`RK;WKb?{CCPdHInw$;tNRfVYekg~VTCsW$ClqVF}5{y^quFvwsRH2 zi62x6tC=Mam8_zOo38;H3&_7w!K#t#Aj`G!I55 zzjUD_@+Oe-L&DE9c#rvGzppaeAr`ia-;3PMm(Q58*db@FFHbtAlP~@7`{qD4l{83i z3O;l$gv}#N^=!qLMgN--fP1{jT4ZXise>3!G9m%sj&qOkM)os*%$Dzz36Cs%{i3jn z|F!*x_E7SIJ#xUq!l{ZdIN0~V2FGmsth+74eOVd$#m=ls>ScJ_;n^u4>W zJGw0(q#_o!cSI44*WuXJn})AQleA5}COQx{ybw8BH*^h~@OjAeTr+w!YRGB_VtqlD zM3@*vwvV+&1+zA!S2tPt-W&l%=JyOMM{j z=8c9!E;usiH;kP;Ta(IaW*Qd5z>*s0lRZ?H$WjM0qN6MzJHQf__nqxCO%fzrNQR&A~QsTjhgUqHt=#sasqHHDW(|=bQbwxnKt;|ij07Lr( zi>ln14NWc)_Hc&&A0N=wV>S%9L^#3;TYmiDfWprp^ZkgCGDc5`-f-g*VG7T&@coEB z5xwEZ)jkv!romIHO*0p3^6nTnKsy9TP(D{gIZaug#tqO7nNW7ME_C0dk;@@xVkU$H z!+7dG`th}-2x!))b&-)ob&pnFAUN&21=p~mWjJ{H-hiMCUOs5DTd=)q6Q;=r5s1eOL6N-Yx$ zk3inXPgwV4^6$v#8}q96h)Q=bB*f)fYGS9;t#SL36zMmvW0bOPR#|&RB}`D~mAg$f zvZ;`QN+EBb4gInk}^2QRR=JNJbFE8 ze^oV%YVSsReWLFrF3oP~`z^N4N}I-8SpsiE>1IN!Ytq>*Hvik_xY5IjYuVl1Iqx}$ zhq-%@?*8kBoz#`wMoO8A^0@(u7)LiD-F-d0jlgL(BdY)G*FmFM4*@gadgiN9MJgi- z*65)EtY~VATA=zapKVE&>~U>w0(b2fZI;w+ha(h;TUM6JYb*n4eSzPR?jjJoo7@bA zS7}}qJ@#ntO0Q$tQ^fBJp@9>-`%6=wbd|^mA={El&e3bVm3tp7IPC?Y!5Lr)v7@YY z)6g+b84KW-^C{fzv!E()t9pI{z9-i49U@6XS_@wfRmfQvpt|=~JcmerL!yi~^wJFs z5Q-sx*^!LKHm#hSa)j>N1?&W%nvGl6AI`$bsXrYRE7Pv3fa=Grh8nGhgqfBU)295b zQFneXyR&>jf}DvO$homkz_E{&=+s7YeI|*_f|`a3lA@Rx8qWcktj))IGJ67Wu{qv8 zcz4Z_#^aG9Gn7VNOSgc$lzb+3%^hiPn(RcYtPqHe{g=hgiQ}VP zzx^ji=h7DQ_z%+w94ni~ny@R8J8m;q4F#SMggky&v z4)y~b^!B^51U*1u^Ktc&0|?#&J$_eDwZSF?y&Tx$%!8 z#y%49$EYZCm{mv}d@!Z*`DhN=Bl6-*XS=_tGns>%?>A_u=POqK0{KJF1A)#U9m1il8w3`jZn6O>MZ z&6Vi~nLbPvJfoxNvQCJ1PswKwIEs82TlmZ%>wE-#3?oD%%%8A&AOK#&$fQ{eiUl9^ zeiG9Yq2$rm_%{}@xx{XjX`IjdqECC4#9!zLhGN+&?Gjb zU6Fz$&5)7dfTf@lDCT?EWe_@?rWrgDf(4Ywl?EGWAQ+w#<`~`?)*GfRI4jsN$S_zG zYGOv22%q9d5POGeNoh#zPa12DkHBo^$TIl>84}*A;bhW z-**D@&<4=ZS1$a5@90I0{H~G3JqzxkJM?2u(t3$V8>WADGl1S9ZVY*m;I+J!P}uV0 zMYUlV9lyM^@A0mvnZ|VG2vV30m5I{(BU!R`Gb1h8j?@T3mC{I_TYDiZquKkUULi#` znt|QG*!`vJ@@+nF!bK7`Us1SkYs#m%n5`tJf$HwXj3Fln4yU3ZezXmJrfyaa-qbSQ z2^i50ATci?`=VSVsZ75i`4WWwJFz@W?C&`bFU~WKks-#LHB}RS&F92Dtl|xy5M&(X z@ZoJA99@o-E;#vb#1C5qT;nuU_#6BFt*&ywZXnW}dQxuet~4H-UxOE=K>xv%^UA^{i|?ezEkf|n4%fX8FWfaocU6l#I`>Y+UFc5+6v zdSI>ODI*G616s{kzL#Nj9IcuF$+M0(QR7jrsi`THvy5#Jx*Q|tiQtU@DoYP122>+f=gFxG zTf8^@9z8&KSGDLmpKsIvpVlgkYfAT@+t-XG74W_*AzrTi_}hB4Tco148i!4!Pb%Gx zB22lRE}hYS!JaQX;6@@|ss@K$N%RZ=U(w@U3_)c=!pO4%4Cf-`Bz_82@E=3n9XwdY zM6hG*dUfc$pNu;vn+sP<)(VeWmCx+F8)vvwoBlp~=(l|QKC|Ci>NfG3Y$#k<7p$Qz zSa1^;hM3y6B&~Vm+w40;i4}p{I4N;m*e`l!XM4 zpb31HA1Gu^K}PDi7*dP*=-uREA%a61)$ZHCXXcjr*FX6R583i+V;^T6l79S?> zz`<5m)MsfqHDtz!V_rA)8DJCw7cl1DM%n%p5Xo1SDU|lH?;wS(3ha&dWlf5#KVO`Z z0eA9f<9`y)ZtVo@qB^L-LdAgZyD85yM)OTlNb);p!+4esKmT+5Z`-L#u#ivcnY$e^ z-zOlA=vU1C;p}YVll2Uzd5{fqfhh)6-e24ql`0~nbJm79KW9?rE((QIZ6_`HdhAFrEip z+yr03we{rwN}TZaA}f27!d-iSBJuSY_E1DMmlQal?5&!!tN_IcCD z^Oh=FS~{^tC0Ij?dBc5L%xw(guWkN?^)Z3mg<mYKkJkGN10D0^k4AYMn4Vn zsr-s^uH(pBnwVY~%y9&SJL}l8g1KF3j4$l6L$GrW8WtAS0^2~O!vME2ON!HoE^C+5 z&&Cn{bM8@#4NO-77qPG*yLi911F^BYQFM%}NCb-%_2HEaY0fG>;-?Q(ej7_j6+Yv)rCo0cn<@ztxI0Jx!n_qfXzLscF%B_ZSME9zIVb+ogp>l_}G zY?{z(8{^ll$Sql%iM6oPq8z;nWQ6zaPWb*}_biO5!(#kuox=6b2_lopw;q4Jw70I? zDTH6`$!hha*L1g#bB|1seon@aDlvcq_bmwnSDJy2&20AN!AA_y6Fjn-ju)wzEbM5o zJICd293g zKq3Hlm!q|4U*6a#P6(}#{t!bbGUc)#ukQe_U(!p4>L`gJ`U~i8!u($2V~&CibjaXT zIH~l?KI$p^_WNwJMuAbfgAI>6XEfdek#lpo+@ou+XncE^rk*Fvv`ave_$+aldJu^O z*~-ut>`&)Xc(~`3k}tz)`~p82R>s+FHG~1RE!d$@Brp942P#UiiH6#F_I(8$Y-E$9 zZ7^Y{r}|-c!j*9|+YX)G5VK;!RQ$u@La={^u|gA0EoB*@hKamc0`;BEA4H*vLjO$8 z!^ocn$reSv$=wXDFhO}``W}*^K3Rfe15DlPzUH#Du1|HXAFq_ z7VyoP;`h~bKuQUZJQ?PvxB%MPbW*L!UlCQ!Xjz9j>Mc|8E%RT>XXp-R%oEk(BD1ZN zREdT^lv_+|7UIcI6vJlNu7taP*J7D*Y|)NZn;p{F;S@()J1#Sl)5h>CtQd(N4s-n} z$xyVHFzh5Vo6b<7W1!iBgI|5~yXrR}^J%8G9uB>55*n_2?T9W5CVde1G_Yqekkf)u z1hh^Ac`sqs-@B5!3ZD-`_kyLNc_1H<5A5~s2AXRZasUb#J%G5Gv>6Eun>ebs5s1-D zcrO%$kJv_;&-3O2!UAEz$_HCQ^I!nX06bshd$e^!XfL!W_zaW)N`PHM04U&Iaec}1 zuXBT*MAsEBUQ%2E&|L&HA*c&67cmzm7afU@5IL#rD#RX}gkJs;fcz)7ZBGnroE3z>K_?V8aK z_VTcrS-5{Tk!&^gxJ9X-YCtRQU&JSQUd1D6_=r<{(KZ`m{~0}HY!NSE1)D+zd_w3@ z^}|<$>s?Iv*+K=EFx`8Ryf5+3txZlb=;0ihllpF46kJ0B=)FyyKuI0772hY#ziI2^ z8lJGFwfJuelCIA&(`!Bi#dh;;#EUO1lXSWl?<{_|$LF6<3f|(x53EXQulIgxu-~9J$3^HAw2$#;q0%`_dUf(t1 z*(%cw*UM8!D7B%B0XFkxymuyrg`$17zhJNYU@AjL$&M>oo4bn%R7!S3@|5fnx7R)_ z$qtZe_4~R-6*r*U$utTIt9g@MDjQtLB;N}DMEUcr@^FKiU)Q90pa-+eao?#Df5M)C zyBswF5f34K?jorAIb3RXwPJCv%&lZuS3_U7IE`32ou*3P81QMa&l^nfO|G2AKYYF} zy|nHfFGTo@J>uv5uN?vw)if&;b99+ukTUgJ@KitT@V}|`m5{bS_&}Yy7 zo4U5X8?M`h9#B40W_}7C#kY0A+^1l*BMmrN6)Mg3d^`*YHk0PQub9ue_D@Erk?!8^ zaP$}9-Ly@3Kfe{fXgn78jsEGSE-C46SxMxLk1XO=-38H7n(Orma(~_S@tL!W>CxcF z>FKrEd1K15{o|_FcJCj98`t1NFZny@YaUpLfd=kE0|*e{_fnd*!F&!)HTH#S`77iA z>o}{`=@Tj|(TCKKR1Q{6`wI5U1>O6U2aaP&!edFwW8Z@M+G?TWoM$p)UJiYpL9e$*LGjva z21@@HzTIK#G7u?FSKu1wY~yUlblY=<}J=tduPAU^!i$TnD0o~n-YYd zbNHr8l7r!Y@s9ny`W}BX@hz1<@OrecQCNNT0f=XL5TDqfBN0Lor&^cfu5@7$_Lcwp zu5vhjfqQD$r1l4CLvyU4>OnbUO3J7gQ_Uo+)!l^DZMx#zaQsO4u$8##CzH5h1G^r> zM0$0aT*5K$Oe7-SQ>fX)Se%~;j)CSUSFw!koz_eD6>jeWjstT?PO1RbuDZ)ah{%I? z5`g8EI)sIoo4a}%Z*pd0)78~hS?MntS@Y|4^;8U-hyX?PM~Lc8@VHtAMhr5hdK~2T zPW6U$X&&{3CFBhkCtil<%=7*+9_d@-=v`Rjalph5Y=u0sR_7L%pl{gVjz(BgwEEV| zayJ;ieUb9G3d@8%CF7f_T@@cMMZpS741|dt3qYZmvl=-*5}aj!3~SXNioP(xyc@8c z*u&KmMGVOJP)@w8ycK*hD8qcs)WFPgj}KYHHP9I9knb^&v;K9}7vV)|YFI9MRjVJ4 z^jgvst6VNgm18&^kcJI`A0snJby2}{PfLWz$hlYr`)=8apgggBkF`ea%h*Lq9kg=& z3QVgU4iqIJd={1Wq7}b0Mf%ru5&j2Z(RQ&yS^Se3me}tr$ey-0)h?Br$shri>xUKv0e`jV6{)6;?5x0 zHWCSa&bOcQRVY`HqB~T0xf#U5!BsTW-JTig?6fWlt*R<_Km9(E+E%yr;ec z8#1{TF^Nf)p7W|AWiw*dTc}}Lni1okbdvRUR10M%w9hcL@LpCqut|G8wh(W)ZYicD zHTmU;L9t3YP)ucHUV7o7y0tfc**pE_>VQ87YaxswYlIgc|6u7$+r=V@S{3?>iHtI# zPp+zu;WAyr`i zMmWd0t8L}X&hApc724FBP)u@7pV!oXV29r5n~6Lw=bQSs))=pMfVr6khk_h+klaDO zslSG$uJmYN;d4ye!U-zx=W8LrKgMLw^Kt1YGnB$7r^eq4h{3~pktS{TXYc*EU+>Ad z5}6Tx>-Ib$MTBGh*~GDVcDDJCq^-SsttT(9pRQ01Q{7dj%dDQzA0V*XYiFm`qs3+} zJ+|)+1ww_3-+;=s2aAGj9W!zKFUwW{dE_Aj5+&7pInl$;6rLj(ebVB4;Tgw%>KwzD zcKdOc&&%0oIsi43^;Kg7RX1wpB-vHSIJ-e@P7iV4O3NbZnSgTY`ymfw6nh-T++o4 z9%?u3_|BUiItN}=Q!ct^0+O~eLf%348n@lT2@mPqO;x>8Ak2K^ZYqlKy8{)-Dm3RA!Lzy@1V z@qg^Aw5F}bs1N(`1}#iN&1qGKHMVT!L;V19Siyx|?OLj}5ODmrzEECd{mT_dOdrKN zP4ruheEQyMp4jAqVki(H^}gsjEq>Om4Xj|nFO6mmUetI=#!l$Obl|qlN{XVUE%nR< zC&$&DkxdgHs(t7}a>o0@$8PZ6jLA7ZMN~B{MXl3lZoX1{+1b7uj#^-&6)W;H0t%%b zus*c2WiFYP5EoPiB>6tHFTBA1H(VebQbY}50u8VTbbAz63Jsz{JTQQ>G#GjdP;w#`=F}qEXiZSGj!~Ivyouh3 zYc%Xp+2+rxcia0Qg0YyR%2>M|X1Iy(f6TH$q`t}ZUk}Kfa;D)eM;hOk$F)oQxfv5H z=7?uv%%yyp!dT~xXV3>iin4{GNzKaqsfDNokCGmjQrLoc(CHL3#y4q|&THp`lWr%_ zs<~a2HZT``ga*j#1&{hxJDLgw=Df&fi}=GQ^49N42fsDiGio=mAeIe*X+}X_sZ11R z4B9{PcdrsRy4x4b6|4O(k4(_keIh)LN{-8&qA)Q;&g&HPHj8=N<4y@H>6rh3Gr}%t zRh;#H#}+dY_fw7?+1zENuSihvJSU_NY+EZ0Y{6W>Gja!9@I_PpM}H7BxFtKqA#Eaj z0CI>*-|G2W5$PTbDw83eEL@*T*Gr1%bkt+Zaa>gC_{(WIX-mEDlZTMK-U3#H2jSsu z-ygmOr-_pSf2^CetiJT4Mb79N{6P-}=@)6t$EC}?g#Md=hEr(ON8-TBh~^~Uz->j}nu|Y|7lReuJeV zQ>RTvQ^ci*Wx$o%57Bu$t2UmhIiLZfNmE#IG-n|3#B=u{*md{x+MGfAzI&%}F)P8a zFq|n^>tbW@iUeU|`|Fs65>p9!8EldgqAyHgN(gzd_R6a=g|1y}1&LC0#XC#osY*GW z@HV;YAS0=AzlUh8U>V|+cTwE5!yAfFMGYPEXgV;0v^?idb0DTCyn2)b0=ozTn2TMv zh*_?OC>MSkS1H~^kbC|-h0Gx2mP?{P$Gxk6^zBT;zWPgtD%%@u1EKgP%>Vu&0VgR! zX7isC5#B%DmH>fp{tf?a5o8cUNm1B)4oIdXCE5S=yMI#u?!TmeXpI~4#zO!(lEfza zA2ax0UhrSu3lD@)N(7dHAEF~gP4+)3@Q-KnPb2={L-)ZDh!hRk|AhFz#iW0xLi*ob S{vjJ-$R8;-#5K|X%>EyId64=5 diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index cf52ed475..502602749 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -49,6 +49,7 @@ service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; rpc get_margin(MarginRequest) returns (MarginResult); + rpc get_excess_liquidity_report(MarginRequest) returns (ExcessLiquidityReport); rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage); rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage); diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index f1a02d6f5..26bc54e56 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -38,7 +38,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: //state below _lock(), _last_update(), - _admin_data() + _admin_data(), + _last_report() { LOG(Gen, Info, "MarginServiceServer: service started"); @@ -70,7 +71,7 @@ void MarginServiceServer::publish_all() if(it != _last_update.end()) since = it->second; std::vector pos; - if(_position->query_positions(acct, pos, &since)) + if(_position->query_positions(acct, pos, &since) && pos.size()) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); auto aname = orderman::to(acct); @@ -109,6 +110,19 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request } } +void MarginServiceServer::get_excess_liquidity_report(const api::position::MarginRequest& request, + const api::Response& reply) +{ + std::scoped_lock l(_lock); + ExcessLiquidityReport rep; + rep.set_account(request.account()); + auto it = _last_report.find(request.account()); + if(it != _last_report.end()) + rep.CopyFrom(it->second); + reply(rep); +} + + void MarginServiceServer::publish_margin(const api::position::MarginResult& result) { @@ -134,7 +148,8 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M netliq = report.leverage_factor() * report.cash_balance(); } netliq -= result.maint_margin(); - report.set_excess_liquidity(netliq); + report.set_excess_liquidity(netliq); + _last_report[result.account()] = report; _report_publisher.add_or_update(report); _report_publisher.flush(); } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 3fb3e06ad..b99836099 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -30,6 +30,9 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; + void get_excess_liquidity_report(const api::position::MarginRequest& request, + const api::Response& reply) override; + void set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; @@ -56,6 +59,7 @@ private: std::recursive_mutex _lock; std::map _last_update; bts::api::admin::AdminData _admin_data; + std::map _last_report; }; }} From 6a4930767b7833254460a0a28909c0e5282f73fd Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 18 Jun 2019 16:32:14 -0400 Subject: [PATCH 010/198] SP-34: Add Loss Limit to Spark Admin --- src/web/ui/sass/main.scss | 16 ++++++++++++++++ src/web/ui/src/Accounts/State.fs | 6 ++++++ src/web/ui/src/Accounts/Types.fs | 3 +++ src/web/ui/src/Accounts/View.fs | 15 ++++++++++++++- src/web/ui/src/Controls/Fields.fs | 20 ++++++++++++++++++-- 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/src/web/ui/sass/main.scss b/src/web/ui/sass/main.scss index c37815561..dbf86783d 100644 --- a/src/web/ui/sass/main.scss +++ b/src/web/ui/sass/main.scss @@ -340,3 +340,19 @@ body { } } +.inline-label { + line-height: 1.5; + padding-bottom: 0.6em; + padding-left: 0.625em; + padding-right: 0.625em; + padding-top: 0.6em; + display: inline-flex; +} + +.inline-label:not(:last-child) { + margin-bottom: 0; +} + +.disabled-label { + color: $grey; +} \ No newline at end of file diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index fcbaac147..bccf5c126 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -286,6 +286,12 @@ let update msg (model:Model) : Model * Cmd = { model with scratch = { model.scratch with productPositionLimits = limits } }, Cmd.Empty | EnforceProductLimitInNetTerms value -> {model with scratch = {model.scratch with riskLimitEnforcement = {productLimitInNetTerms = value}}}, 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 -> diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index f249085bf..143a1fa7d 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -73,6 +73,9 @@ type Msg = | DeleteProductLimit of int | EnforceProductLimitInNetTerms of bool + | EnforceLossLimit of bool + | TotalLossLimit of uint32 + | SecurityLimits of AccountSecurityPositionLimitUnit[] | DeleteSecurityLimit of int // ExchangeData diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 0b66c54cb..454977ea3 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -550,6 +550,19 @@ let lazyProductLimitsView model dispatch = productLimits model dispatch +let lossLimitView model dispatch = + div [] [ + div [ ClassName "columns" ][ + h1 [ ClassName "is-size-3 column is-narrow" ][str "Loss Limit" ] + div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ] + [str "If Enabled, this limits the account's loss."] + ] + div [][ + Fields.checkbox "Enable Loss Limit" "" model.scratch.accountLossLimit.enforce [] (EnforceLossLimit >> dispatch) + Fields.inlineText "Total Loss Limit" (string model.scratch.accountLossLimit.totalLossLimit) [] (not model.scratch.accountLossLimit.enforce) (TotalLossLimit >> dispatch) + ] + ] + let securityLimitsView model dispatch = let headerRow:TableControl.row = { @@ -670,7 +683,7 @@ let LimitsView model dispatch = div [ Class "limits-container"] [ lazyClipLimitsView model dispatch lazyProductLimitsView model dispatch - + lossLimitView model dispatch //securityLimitsView model dispatch accountControls model dispatch diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 2fbd6cd2f..0c81a8d28 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -31,6 +31,22 @@ let text (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = ] ] +let inlineText (lbl:string) (dv:string) (attrs:IHTMLProp list) (disabled:bool) onchange = + let disabledLabel = if disabled then "disabled-label" else "" + span [ ClassName "field" ] + [ + label [ ClassName ("label inline-label " + disabledLabel)][str lbl] + span [ ClassName "control" ] + [ input ([ + ClassName "input" + Type "text" + Value dv + OnChange (fun ev -> !!ev.target?value |> onchange) + Disabled disabled + ] @ attrs) + ] + ] + let textPair (v:string*string) (keyAttrs:IHTMLProp list) (valueAttrs:IHTMLProp list) (thirdCol:ReactElement list) (onchange: (string*string) -> string -> string -> unit) = div [ ClassName "columns" ] [ @@ -194,7 +210,7 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = - let dis = + let dis = match is_disabled with | None -> false | Some a -> a @@ -214,7 +230,7 @@ let mapSelectEx (lbl:string) (options:Map) (defaultText:string op Label lbl div [ ClassName "control" ] [ - div [ ClassName "select"] + div [ ClassName "select"] [ select [ Value dv From e47af3d7bd5aaf5e4695a14a8ffee7e4af59d6bf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 20 Jun 2019 10:34:06 -0400 Subject: [PATCH 011/198] update api docs --- src/client/spark_sdk/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/spark_sdk/README.md b/src/client/spark_sdk/README.md index a5367bce8..15e1ed463 100644 --- a/src/client/spark_sdk/README.md +++ b/src/client/spark_sdk/README.md @@ -73,6 +73,10 @@ Commands: order [] Arguments: --pump= + +Example: + To print simulated market data to the screen: + spark_sdk.exe md SIM FUTURE ES SIM:ESU9 --user=bts ``` * Check out sample code From 60ab67213fb36767dc87740ebf2025a347eb2e92 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 20 Jun 2019 15:57:09 -0400 Subject: [PATCH 012/198] Ran clang format. --- .../orderman/server/OrderServiceServer.cpp | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index af49ce401..fd6f18152 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -4,8 +4,8 @@ #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" #include "lib/config/protos/orderman_cfg.pb.h" -#include "lib/md/MDConsumer.h" #include "lib/md/MDClient.h" +#include "lib/md/MDConsumer.h" #include "lib/mercury/actors/Timer.h" #include "lib/mercury/executor/Executor.h" #include "lib/metrics/metrics.h" @@ -45,14 +45,14 @@ struct ActorThread { stats.publish(loop_metric); } - void start(trace::PerfLog& log) { + void start(trace::PerfLog &log) { if (cfg.poll()) - thread = threading::make_thread(cfg.thread_name(), [this,&log]() { + thread = threading::make_thread(cfg.thread_name(), [this, &log]() { for (;;) executor.do_work(log); }); else { - thread = threading::make_thread(cfg.thread_name(), [this,&log]() { + thread = threading::make_thread(cfg.thread_name(), [this, &log]() { const auto inner_iter = 1000; while (!done) { auto start = Timer::now(); @@ -90,14 +90,14 @@ ActorThread *find_thread_for_actor( } struct OrderServiceServer::PImpl { - PImpl(bts::api::ServiceContext &ctx, - md::MDClient& mdc, + PImpl(bts::api::ServiceContext &ctx, md::MDClient &mdc, DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, trace::PerfLog &log) : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), - admin_service(ctx.locate()), md_consumer(mdc.current_consumer()), - stats(stats), dyn_order_registry(d), log(log), in_flight_order_ops(), + admin_service(ctx.locate()), + md_consumer(mdc.current_consumer()), stats(stats), + dyn_order_registry(d), log(log), in_flight_order_ops(), current_req_op_id(0) {} ServiceBridge *service_bridge; @@ -111,7 +111,7 @@ struct OrderServiceServer::PImpl { OrderServiceServer::OrdersPublisher publish_orders; OrderServiceServer::FillsPublisher publish_fills; api::admin::AdminService admin_service; - bts::md::MDConsumer& md_consumer; + bts::md::MDConsumer &md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; trace::PerfLog &log; @@ -120,12 +120,13 @@ struct OrderServiceServer::PImpl { uint32_t current_req_op_id; }; -OrderServiceServer::OrderServiceServer( - bts::api::ServiceContext &ctx, - md::MDClient& mdc, - DynamicOrderRegistry const &d, metrics::MetricsContainer &stats, - trace::PerfLog &log) - : api::orderman::OrderServiceBase(ctx), me(new PImpl(ctx, mdc, d, stats,log)) { +OrderServiceServer::OrderServiceServer(bts::api::ServiceContext &ctx, + md::MDClient &mdc, + DynamicOrderRegistry const &d, + metrics::MetricsContainer &stats, + trace::PerfLog &log) + : api::orderman::OrderServiceBase(ctx), + me(new PImpl(ctx, mdc, d, stats, log)) { me->publish_orders = make_orders_publisher(); me->publish_fills = make_fills_publisher(); @@ -152,7 +153,7 @@ OrderServiceServer::OrderServiceServer( bts_assert_msg(thread, "Could not find a configured thread for OrderManager. See " "the OrdermanCfg key"); - thread->executor.spawn(d,me->log, mdc.oracle()); + thread->executor.spawn(d, me->log, mdc.oracle()); // Timer thread = find_thread_for_actor("Timer", me->actor_threads); @@ -212,12 +213,10 @@ OrderServiceServer::OrderServiceServer( }, [this, &ctx](auto const &order_op_result) { ctx.post([this, order_op_result] { - this->on_order_op_result(order_op_result); + this->on_order_op_result(order_op_result); }); }, - me->dyn_order_registry, - thread->executor.make_proxy(),mdc.oracle()); - + me->dyn_order_registry, thread->executor.make_proxy(), mdc.oracle()); thread->executor.activate(me->service_bridge); @@ -358,7 +357,7 @@ void OrderServiceServer::get_registered_dynamic_order_types( void OrderServiceServer::on_order_op_result( OrderOpResultEvent const &op_result) { auto it = me->in_flight_order_ops.find(op_result.req_id); - bts_assert(it!=me->in_flight_order_ops.end()); + bts_assert(it != me->in_flight_order_ops.end()); auto &responder = it->second; api::orderman::Response r; r.set_order_key(op_result.ok.value()); From e936b80dc6b7e9faa56de31e82aeec73aff21d0d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 21 Jun 2019 11:44:51 -0400 Subject: [PATCH 013/198] Forwarded pnl updates to order manager. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/public/Update.h | 9 +++++-- src/lib/orderman/actors/ServiceBridge.cpp | 19 +++++++++++++ src/lib/orderman/actors/ServiceBridge.h | 25 ++++++++++------- .../actors/order_manager/OrderManager.cpp | 15 ++++++++--- .../actors/order_manager/OrderManager.h | 2 ++ .../orderman/events/AccountPnLUpdateEvent.h | 27 +++++++++++++++++++ .../orderman/server/OrderServiceServer.cpp | 10 +++++++ src/server/sparkd/CMakeDeps.cmake | 2 +- 9 files changed, 94 insertions(+), 17 deletions(-) create mode 100644 src/lib/orderman/events/AccountPnLUpdateEvent.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index b05780e88..bef6d7f85 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/public/Update.h b/src/lib/api/public/Update.h index bc2885e2f..3d18c5d6d 100644 --- a/src/lib/api/public/Update.h +++ b/src/lib/api/public/Update.h @@ -27,7 +27,12 @@ namespace api { _removed_items(std::move(removed)) {} - Update(const Update& other) = delete; + Update(const Update& other) : _all_items(other._all_items), + _added_items(other._added_items), + _changed_items(other._changed_items), + _removed_items(other._removed_items) + {} + Update(Update&& other) : _all_items(std::move(other._all_items)), _added_items(std::move(other._added_items)), @@ -104,4 +109,4 @@ namespace api { } -}}//namespace \ No newline at end of file +}}//namespace diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 4d104dd5f..227d86c84 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,7 +1,9 @@ #include "ServiceBridge.h" #include "lib/api/public/ServiceContext.h" +#include "lib/api/services/PositionService.pb.h" #include "lib/mercury/broker/BrokerProxy.h" +#include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" @@ -50,6 +52,7 @@ struct ServiceBridge::PImpl { mercury::Stream cancel_order_pub; mercury::Stream detach_order_pub; mercury::Stream new_admin_data_pub; + mercury::Stream account_pnl_pub; std::unordered_set known_orders; std::vector> admin_data_updates; mercury::BrokerProxy &service_call_marshaller; @@ -81,6 +84,7 @@ void ServiceBridge::init() { me->cancel_order_pub = make_stream(); me->detach_order_pub = make_stream(); me->new_admin_data_pub = make_stream(); + me->account_pnl_pub = make_stream(); me->ready.set_value(); } @@ -217,6 +221,21 @@ void ServiceBridge::update_admin_data( }); } +void ServiceBridge::update_account_pnl( + api::position::Pnl_account_dataUpdate const &pnl) { + me->service_call_marshaller.schedule_action([this, pnl]() { + for (auto const &account_pnl : pnl.added()) { + publish(me->account_pnl_pub, AccountID(account_pnl->account_id()), + account_pnl->day_pnl()); + } + for (auto const &account_pnl : pnl.changed()) { + publish(me->account_pnl_pub, + AccountID(account_pnl.current()->account_id()), + account_pnl.current()->day_pnl()); + } + }); +} + bool ServiceBridge::is_ready() const { return me->have_orders && me->order_manager_ready; } diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index bcf225db1..c31e45653 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -1,18 +1,25 @@ #pragma once #include "lib/config/protos/jetfix.pb.h" -#include "lib/mercury/actors/Actor.h" #include "lib/md/SecurityOracle.h" +#include "lib/mercury/actors/Actor.h" +#include "lib/api/services/PositionService.client.pb.h" + #include // fwds namespace bts { -namespace mercury {class BrokerProxy;} +namespace mercury { +class BrokerProxy; +} namespace api { class ServiceContext; namespace admin { class AdminData; } +namespace position { +class AccountPNL; +}; namespace orderman { class OrderRecord; class Fill; @@ -45,16 +52,14 @@ class ServiceBridge : public mercury::Actor { using OnReady = std::function; using OnOrders = - std::function const &)>; + std::function const &)>; using OnFills = - std::function const &)>; + std::function const &)>; + + using OnOrderOpResult = std::function; - using OnOrderOpResult = - std::function; - ServiceBridge(OnReady const &, OnOrders const &, OnFills const &, - OnOrderOpResult const&, - DynamicOrderRegistry const &, + OnOrderOpResult const &, DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o); void init() override; @@ -71,7 +76,7 @@ class ServiceBridge : public mercury::Actor { void update_admin_data(std::shared_ptr const &admin); - + void update_account_pnl (api::position::Pnl_account_dataUpdate const&); private: struct PImpl; std::unique_ptr me; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 6aa189e0b..737bee203 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -4,6 +4,7 @@ #include "lib/mercury/events/TimerEvent.h" #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" +#include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" @@ -52,6 +53,8 @@ OrderManager::~OrderManager() {} void OrderManager::init() { subscribe( [this](auto const &admin_update) { this->on_admin_data(admin_update); }); + subscribe( + [this](auto const &pnl_update) { this->on_pnl_update(pnl_update); }); } void OrderManager::on_admin_data(const mercury::Update &m) { @@ -74,6 +77,12 @@ void OrderManager::on_admin_data(const mercury::Update &m) { } } +void OrderManager::on_pnl_update(const mercury::Update &u) { + if (u.events) + for (auto ev : *u.events) + me->services_data.limiter.set_day_pnl(ev.account_id,ev.day_pnl); +} + void OrderManager::on_securities( const mercury::Update &update) { @@ -116,9 +125,9 @@ void OrderManager::on_fill_recovery( for (auto const &ev : *(update.events)) { auto trimmed_account_name = boost::algorithm::trim_copy(ev.fill.account()); - me->services_data.limiter.add(*ev.security, trimmed_account_name, - ev.fill.side(), - Quantity(ev.fill.last_shares()),false); + me->services_data.limiter.add( + *ev.security, trimmed_account_name, ev.fill.side(), + Quantity(ev.fill.last_shares()), false); } me->stored_order_sub = subscribe( diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index bc702c5a5..c97980372 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -34,6 +34,7 @@ class OrderServices; class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; +class AccountPnLUpdateEvent; struct SessionServicesData; class DynamicOrderRegistry; } // namespace orderman @@ -83,6 +84,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_gateway_state(const mercury::Update &); void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); + void on_pnl_update(const mercury::Update &); void on_poll(trace::PerfLog& log) override; // end external events diff --git a/src/lib/orderman/events/AccountPnLUpdateEvent.h b/src/lib/orderman/events/AccountPnLUpdateEvent.h new file mode 100644 index 000000000..e6882df8e --- /dev/null +++ b/src/lib/orderman/events/AccountPnLUpdateEvent.h @@ -0,0 +1,27 @@ +#pragma once + +#include "lib/api/services/AdminService.pb.h" + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/MergeByKey.h" + +#include + +namespace bts { +namespace orderman { + +class AccountPnLUpdateEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::MergeByKey; + AccountID key() const { return account_id; } + + AccountPnLUpdateEvent(AccountID id, double pnl) + : account_id(id), day_pnl(pnl) {} + + AccountID account_id; + double day_pnl; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index fd6f18152..a777b7ccb 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -1,6 +1,7 @@ #include "OrderServiceServer.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/PositionService.client.pb.h" #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" #include "lib/config/protos/orderman_cfg.pb.h" @@ -96,6 +97,7 @@ struct OrderServiceServer::PImpl { : service_bridge(), service_ready(false), known_orders(), known_fills(), publish_orders(), publish_fills(), admin_service(ctx.locate()), + position_service(ctx.locate()), md_consumer(mdc.current_consumer()), stats(stats), dyn_order_registry(d), log(log), in_flight_order_ops(), current_req_op_id(0) {} @@ -111,6 +113,7 @@ struct OrderServiceServer::PImpl { OrderServiceServer::OrdersPublisher publish_orders; OrderServiceServer::FillsPublisher publish_fills; api::admin::AdminService admin_service; + api::position::PositionService position_service; bts::md::MDConsumer &md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; @@ -234,6 +237,13 @@ OrderServiceServer::OrderServiceServer(bts::api::ServiceContext &ctx, bts_assert(update.all().size() == 1); me->service_bridge->update_admin_data(update.all()[0]); }); + + // subscribe to position updates and foward them to the service bridge + me->position_service.subscribe_pnl_account_data() | + rxcpp::operators::subscribe( + [this](auto const &update) { + me->service_bridge->update_account_pnl(update); + }); } OrderServiceServer::~OrderServiceServer() { diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e12c685e9..ff12df496 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file From 6e07a0c109d1fdb75d3bb05dae202e09b11abc08 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 21 Jun 2019 11:51:20 -0400 Subject: [PATCH 014/198] Fixed build. --- src/lib/orderman/actors/ServiceBridge.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index c31e45653..621aaf256 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -1,9 +1,9 @@ #pragma once +#include "lib/api/services/PositionService.client.pb.h" #include "lib/config/protos/jetfix.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/mercury/actors/Actor.h" -#include "lib/api/services/PositionService.client.pb.h" #include @@ -19,7 +19,7 @@ class AdminData; } namespace position { class AccountPNL; -}; +} namespace orderman { class OrderRecord; class Fill; @@ -76,7 +76,8 @@ class ServiceBridge : public mercury::Actor { void update_admin_data(std::shared_ptr const &admin); - void update_account_pnl (api::position::Pnl_account_dataUpdate const&); + void update_account_pnl(api::position::Pnl_account_dataUpdate const &); + private: struct PImpl; std::unique_ptr me; From a014dcc98401d93b7e0d92fc142d508744ee8278 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 21 Jun 2019 17:58:08 -0400 Subject: [PATCH 015/198] abstracted _get_handle in PositionServicePNLHelper::HandleIndex --- .../sparkd/position/PositionServicePNLHelper.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 8c87075fb..26de78fef 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -42,19 +42,22 @@ public: on_consumer(_client.current_consumer()); } ~HandleIndex() { _client.on_consumer().unsubscribe(_sub); } - const std::string& symbol (SecurityKey key){ + + MDConsumerHandle _get_handle(SecurityKey key) const{ auto handle = index.lock([id=key](const auto& index) { auto iter = index.find(id); return iter != index.end() ? iter->second : MDConsumerHandle {}; }); + return handle; + } + + const std::string& symbol (SecurityKey key){ + auto handle = _get_handle(key); return handle.get_usersymbol().symbol(); } void get_md(SecurityKey key, double& bid, double& ask, double& last, double& settle){ - auto handle = index.lock([id=key](const auto& index) { - auto iter = index.find(id); - return iter != index.end() ? iter->second : MDConsumerHandle {}; - }); + auto handle = _get_handle(key); bid = bts::os::nan(); ask = bid; last = bid; @@ -184,7 +187,7 @@ double PositionServicePNLHelper::_get_cpp(uint32_t sec_key){ // me->sec_cpp_map[sec_key]=cpp; // return cpp; // } - return 1000; + return 5000; } else return it->second; From a1ead3d1c1711262936a9bf257f096696c8233d4 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 22 Jun 2019 14:24:15 -0400 Subject: [PATCH 016/198] cpp routed correctly now --- .../position/PositionServicePNLHelper.cpp | 41 ++++++++++--------- .../sparkd/position/PositionServiceServer.cpp | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 26de78fef..df9396c4d 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -51,7 +51,7 @@ public: return handle; } - const std::string& symbol (SecurityKey key){ + std::string get_symbol (SecurityKey key) const{ auto handle = _get_handle(key); return handle.get_usersymbol().symbol(); } @@ -113,6 +113,7 @@ struct PositionServicePNLHelper::PImpl { sec_cpp_map() { const auto& cpp_map = config::get().cpp_entry(); + LOG(md,Info,"PositionServicePNLHelper::cons loaded {} cpps",cpp_map.size()); for (const auto& p : cpp_map){ symbol_cpp_map[std::string(p.first)]=p.second; LOG(md,Info,"PositionServicePNLHelper loading cpp's Sym:{} cpp:{}", @@ -163,31 +164,33 @@ void PositionServicePNLHelper::compute_pnl( double PositionServicePNLHelper::_compute_day_pnl ( const bts::api::position::PNLUnit& u){ // long - double mid = (u.bid_price() + u.ask_price())*0.5, - long_pnl = std::abs(u.pos().day_long_pos()) * u.cash_value() * - (mid - u.pos().day_long_avg_price()), + double md = (u.bid_price() + u.ask_price())*0.5; + md = bts::os::is_nan(md) ? u.bid_price() : md; + md = bts::os::is_nan(md) ? u.ask_price() : md; + md = bts::os::is_nan(md) ? u.settlement_price() : md; + + double long_pnl = std::abs(u.pos().day_long_pos()) * u.cash_value() * + (md - u.pos().day_long_avg_price()), short_pnl = std::abs(u.pos().day_short_pos()) * u.cash_value() * - (u.pos().day_short_avg_price() - mid); + (u.pos().day_short_avg_price() - md); return long_pnl + short_pnl; } double PositionServicePNLHelper::_get_cpp(uint32_t sec_key){ auto it = me->sec_cpp_map.find(sec_key); if(it == me->sec_cpp_map.end()){ - // TODO // try to find it and put the value there - // const auto& symbol = me->handle_index.symbol(SecurityKey(sec_key)); - // auto cppit = me->symbol_cpp_map.find(symbol); - // if(cppit == me->symbol_cpp_map.end()){ - // LOG(md,Warn,"Could not find cpp for key:{} symbol:{}", - // sec_key,symbol); - // return bts::os::nan(); - // } - // else{ - // double cpp = cppit->second; - // me->sec_cpp_map[sec_key]=cpp; - // return cpp; - // } - return 5000; + std::string symbol = me->handle_index.get_symbol(SecurityKey(sec_key)); + auto cppit = me->symbol_cpp_map.find(symbol); + if(cppit == me->symbol_cpp_map.end()){ + LOG(md,Warn,"Could not find cpp for key:{} symbol:{}", + sec_key,symbol); + return bts::os::nan(); + } + else{ + double cpp = cppit->second; + me->sec_cpp_map[sec_key]=cpp; + return cpp; + } } else return it->second; diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 50025e4c0..fc0ff04bb 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -54,7 +54,7 @@ struct PositionServiceServer::PImpl { state(), id(0), pnl_helper(md_client), - poll_period_ms(1000), + poll_period_ms(300), manual_fills_store(std::make_unique ("manual_fills")), manual_fills_publisher(manual_fills_publisher) { From 6f7c6db918205bf8a2611dc8ee4b451071575143 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sat, 22 Jun 2019 16:29:55 -0400 Subject: [PATCH 017/198] Updated fill account_id in FillStore. --- src/lib/orderman/actors/FillStore.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 2de9e5eab..13c99fda3 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -126,6 +126,7 @@ void FillStore::on_execution_report( if (it != me->known_orders.end()) { auto &order_def = it->second; fill.set_account(order_def.account()); + fill.set_internal_account_id(order_def.account_id()); } else me->fills_with_unresolved_accounts[er.order_key] .fills.push_back(fill); @@ -153,6 +154,7 @@ void FillStore::on_order_definition_update( auto &unresolved_fills = me->fills_with_unresolved_accounts[ev.key]; for (auto &f : unresolved_fills.fills) { f.set_account(ev.def->account()); + f.set_internal_account_id(ev.def->account_id()); auto fv = utils::pb::to_string(f); me->store->update(fills_ns, f.fill_key(), fv); publish(me->fill_stream, f, *unresolved_fills.security); From b2766c283d3e79b64ac2f6ee0441cc942128404f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 22 Jun 2019 22:05:32 -0400 Subject: [PATCH 018/198] Setting account id in PositionUnit --- .../position/PositionServicePNLHelper.cpp | 38 ++++++++++++------- .../position/PositionServicePNLHelper.h | 8 +++- .../sparkd/position/PositionServiceServer.cpp | 4 +- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index df9396c4d..75393ff0c 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -128,11 +128,9 @@ void PositionServicePNLHelper::compute_pnl( std::vector& out_pnl, std::vector& out_account_pnl){ out_account_pnl.clear(); - std::map acc_pnl; for (const PositionUnit* pu_ptr : in_pos) { const PositionUnit& pu = *pu_ptr; uint32_t sec_key = pu.security_id(); - uint32_t acct_id = pu.account_id(); double cpp = _get_cpp(sec_key); double bid, ask, last, settle; me->handle_index.get_md(SecurityKey(sec_key),bid,ask,last,settle); @@ -145,22 +143,36 @@ void PositionServicePNLHelper::compute_pnl( pnlu.set_last_price(last); pnlu.set_settlement_price(settle); out_pnl.push_back(pnlu); - // enter into account map - double pnl_dollars = _compute_day_pnl(pnlu); - auto it=acc_pnl.find(acct_id); - if(it==acc_pnl.end()){ - AccountPNL new_acc; - new_acc.set_account_id(acct_id); - new_acc.set_day_pnl(0.0); - acc_pnl[acct_id]=new_acc; - it=acc_pnl.find(acct_id); + } + _aggregate_account_pnl(out_pnl,out_account_pnl); +} + +void PositionServicePNLHelper::_aggregate_account_pnl( + const std::vector& in_pnl, + std::vector& out_account_pnl){ + out_account_pnl.clear(); + std::map acc_pnl; + for (const auto& pnlu : in_pnl){ + uint32_t acct_id = pnlu.pos().account_id(); + if(acct_id > 0){ + //valid account + auto it=acc_pnl.find(acct_id); + if(it==acc_pnl.end()){ + AccountPNL new_acc; + new_acc.set_account_id(acct_id); + new_acc.set_day_pnl(0.0); + acc_pnl[acct_id]=new_acc; + it=acc_pnl.find(acct_id); + } + AccountPNL& acc_pnl = it->second; + double pnl_dollars = _compute_day_pnl(pnlu); + acc_pnl.set_day_pnl(acc_pnl.day_pnl()+pnl_dollars); } - AccountPNL& acc_pnl = it->second; - acc_pnl.set_day_pnl(acc_pnl.day_pnl()+pnl_dollars); } for(auto& u : acc_pnl) out_account_pnl.push_back(u.second); } + double PositionServicePNLHelper::_compute_day_pnl ( const bts::api::position::PNLUnit& u){ // long diff --git a/src/server/sparkd/position/PositionServicePNLHelper.h b/src/server/sparkd/position/PositionServicePNLHelper.h index ff0faf994..1e2bf82c0 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.h +++ b/src/server/sparkd/position/PositionServicePNLHelper.h @@ -15,9 +15,13 @@ class PositionServicePNLHelper { private: struct PImpl; std::unique_ptr me; -private: +private: double _compute_day_pnl (const bts::api::position::PNLUnit&); - double _get_cpp (uint32_t); + double _get_cpp (uint32_t); + // aggregates [sec, account]->pnl tp [account]->pnl + void _aggregate_account_pnl( + const std::vector& in_pnl, + std::vector& out_account_pnl); public: PositionServicePNLHelper(md::MDClient& client); ~PositionServicePNLHelper(); diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index fc0ff04bb..0928c0511 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -173,10 +173,10 @@ PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); - pu.set_account(acct); - pu.set_account_id(account_id); + pu.set_account(acct); pu.set_security_id(seckey); } + pu.set_account_id(account_id); return pu; } From 7c6a26ebd9797e83fae7d0b1650b82d906c699f0 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 23 Jun 2019 19:25:06 -0400 Subject: [PATCH 019/198] All hooked up, on updates, loss limit is checked only on size increases --- src/lib/orderman/limiter/LimitStore.cpp | 15 ++++- src/lib/orderman/limiter/LimitStore.h | 58 ++++++++++++++++++- src/lib/orderman/limiter/Limiter.cpp | 8 ++- src/lib/orderman/limiter/Limiter.h | 3 +- .../sparkd/position/PositionServiceServer.cpp | 7 ++- 5 files changed, 82 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index e25807d7c..3fbd2d1df 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -7,6 +7,8 @@ LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, const std::map &sec_map) : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { + for (const auto& acct : _admin_data.accounts()) + _account_data_map[acct.id()] = AccountData{&acct,os::nan()}; for (auto it = sec_map.begin(); it != sec_map.end(); it++) { const api::Security &security = *(it->second); _add_product_entry(security, _admin_data); @@ -22,7 +24,7 @@ LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, } _set_user_data(); } -void LimitStore::copy_positions_from(LimitStore &source) { +void LimitStore::copy_data_from(LimitStore &source) { // copy securities for (auto it = _sec_map.begin(); it != _sec_map.end(); it++) { SecurityLimitTree *source_security_limit_tree = @@ -30,6 +32,17 @@ void LimitStore::copy_positions_from(LimitStore &source) { if (source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } + // copy pnl's + for (auto it=_account_data_map.begin();it!=_account_data_map.end();it++){ + auto source_it = source._account_data_map.find(it->first); + if(source_it != source._account_data_map.end()) + it->second.curr_day_pnl = source_it->second.curr_day_pnl; + } +} +void LimitStore::set_pnl (AccountID account_id, double pnl){ + auto it = _account_data_map.find(account_id.value()); + bts_assert(it != _account_data_map.end()); + it->second.curr_day_pnl = pnl; } void LimitStore::_add_product_entry( const api::Security &security, diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 90a3a7888..b79dfeeab 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -9,6 +9,7 @@ #include "Limiter.h" #include "ProductLimitTree.h" #include "SecurityLimitTree.h" +#include "lib/os/os.h" namespace bts { namespace orderman { @@ -33,9 +34,17 @@ private: return nullptr; } }; + + class AccountData{ + public: + const bts::api::admin::BTSAccount* account; + double curr_day_pnl; + }; const bts::api::admin::AdminData _admin_data; // just an easy way to find accounts const std::map _account_map; + // easy account access (uses for loss limit) + std::map _account_data_map; // map of user id's vs the user pointer and acccounts std::map _user_data_map; // map of securities vs their account limits and positions @@ -57,9 +66,13 @@ public: bool has_security (uint32_t sec_id) const {return _sec_map.find(sec_id) != _sec_map.end();} const bts::api::admin::AdminData& admin_data () const {return _admin_data;} - // position updates //////// - //////////////////////////// - void copy_positions_from(LimitStore& source); + // data updates //////////// + // once the LimitStore is created its position and + // pnl is updated from outside. + //////////////////////////// + // copy_data_from copies the position and + // data from another source + void copy_data_from(LimitStore& source); void add_position(const api::Security& security, AccountID account_id, api::Side side, Quantity quantity, bool recurse){ @@ -88,6 +101,7 @@ public: } } } + void set_pnl (AccountID account_id, double pnl); // risk limit checks //////////////////// // checks to see if the user is allowed to trade @@ -132,6 +146,9 @@ public: api::Side side, Quantity quantity) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; + _loss_limit(account_id, rv); + if(!rv.ok()) + return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); bts_assert(sec_tree != nullptr); rv = sec_tree->can_send_new_order(account_id, side, quantity); @@ -154,6 +171,10 @@ public: api::Side side, Quantity from, Quantity to) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; + if (to.value() > from.value()) + _loss_limit(account_id, rv); + if(!rv.ok()) + return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); bts_assert(sec_tree != nullptr); rv = sec_tree->can_update_order(account_id, side, from, to); @@ -190,5 +211,36 @@ private: void _add_product_entry(const api::Security& security, const bts::api::admin::AdminData& admin_data); void _set_user_data(); + void _loss_limit(AccountID account_id, + Limiter::LimiterQueryResult& rv) const{ + rv.result = Limiter::LimiterErrorCode::OK; + const auto acct_it = _account_data_map.find(account_id.value()); + if(acct_it != _account_data_map.end() && + acct_it->second.account != nullptr){ + const auto& account_data = acct_it->second; + const auto& account = *(account_data.account); + if (account.has_account_loss_limit() && + account.account_loss_limit().enforce()){ + double pnl = account_data.curr_day_pnl; + if(os::is_nan(pnl)){ + rv.result = Limiter::LimiterErrorCode::LOSS_LIMIT_BREACHED; + rv.error_msg = "Could not find account PNL"; + } + else{ + double loss_limit = -1.0 * static_cast( + account.account_loss_limit().total_loss_limit()); + if(pnlid()), side, quantity, recurse); } -void Limiter::set_day_pnl (AccountID, double){ - // TODO: implement +void Limiter::set_day_pnl (AccountID account_id, double pnl){ + if (!me->limit_store->has_account(account_id)) + _add_account_and_reset(account_id); + me->limit_store->set_pnl(account_id, pnl); } Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { @@ -122,7 +124,7 @@ void Limiter::_add_account_and_reset(AccountID account_id) { } void Limiter::_reset(const bts::api::admin::AdminData &admin_data) { LimitStore *new_store = new LimitStore(admin_data, me->sec_map); - new_store->copy_positions_from(*me->limit_store); + new_store->copy_data_from(*me->limit_store); me->limit_store.reset(new_store); } diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index 82f9c8528..1b7df944e 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -46,7 +46,8 @@ class Limiter { ACCOUNT_DEACTIVATED, NO_SUCH_ACCOUNT, USER_DEACTIVATED, - NO_SUCH_USER + NO_SUCH_USER, + LOSS_LIMIT_BREACHED }; struct LimiterQueryResult { diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 0928c0511..188bec458 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -176,7 +176,12 @@ PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, pu.set_account(acct); pu.set_security_id(seckey); } - pu.set_account_id(account_id); + // TODO: this is getting uglier. The reason + // for if is that SOD records dont have an + // account id, so if there is no day trades + // this will never be populated + if(pu.account_id()==0) + pu.set_account_id(account_id); return pu; } From 7afe1e103d445d758008aba31f0c40b5c6c63369 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 24 Jun 2019 13:18:29 -0500 Subject: [PATCH 020/198] refactor string formatting out of LadderRender --- src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 0c7511bcd..8f0168332 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -196,8 +196,7 @@ namespace mbts.spark { ContractSpecificationImmutable spec, VolumeColumnSettings settings, int last_index, - NativePriceSize last_trade, - string direction_arrow + string last_size_and_direction ) { if (!data.Any()) { _clear_visual(dv); @@ -259,7 +258,7 @@ namespace mbts.spark { } if (settings.show_ltq && last_trade_here) { numbers_text.Clear(); - numbers_text.Add($"{direction_arrow} {last_trade.size} "); + numbers_text.Add(last_size_and_direction); } if (numbers_text.Count > 0) { string str = string.Join("/", numbers_text); From 43129427f6e75de21c6b3e81406138f102f88ba3 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 24 Jun 2019 13:20:38 -0500 Subject: [PATCH 021/198] fix arrow disappearing from non-Last-based renders --- .../Trading/Ladder/View/LadderGridHost.cs | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index 619cfeed2..b822d3af3 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -67,7 +67,8 @@ namespace mbts.spark { NativePriceSize _last_trade; Func _fmt_size = MDDisplayHelper.get_formatter_nps(MarketSizeDisplay.get_default()); int _old_tooltip_row = int.MaxValue; - double _old_last_trade_price = 0.0; + NativePriceSize _old_last_trade; + string _direction_arrow = string.Empty; bool _tooltips_are_hooked_up = false; ToolTip tooltip_view = new ToolTip(); IDisposable _parameterized_order_popup; @@ -848,21 +849,39 @@ namespace mbts.spark { void _refresh_volume_at_price() { if (!_settings.volume_column.general.show) return; + + // if the last trade has a new size then we need to explicitly + // mark the volume container as dirty because there is a chance + // we have arrived here off a size change and not a volume change + // or a random change, like applying new settings + bool last_trade_size_changed = _last_trade.size != _old_last_trade.size; + if (last_trade_size_changed && _settings.volume_column.show_ltq) { + _volume_container.mark_dirty(); + } var vapls = _volume_container.read_new_value(); if (vapls != null) { Log.assert_d(_price_list != null); - var ltp = _last_trade.price; - var last_index = LadderRender.index_of(_price_list, ltp, _price_comparer); - string direction_arrow = string.Empty; - if (MathUtils.epsilon_equals(ltp, _old_last_trade_price)) { - // do nothing if in here b/c direction_arrow already string.empty - } else if (ltp > _old_last_trade_price) { - direction_arrow = "▲"; - } else { - direction_arrow = "▼"; - } - LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _last_trade, direction_arrow); - _old_last_trade_price = ltp; + var last_index = LadderRender.index_of(_price_list, _last_trade.price, _price_comparer); + LadderRender.render_volumes(_volume_vis_tup.visual, _volume_vis_tup.glyph_context, _price_list, vapls, _settings.row_height, security.ContractSpec, _settings.volume_column, last_index, _get_last_arrow_string()); + _old_last_trade = _last_trade; + } + + string _get_last_arrow_string() { + // if the Lasts are different then we need to reformat the direction arrow in some fashion + if (_old_last_trade != _last_trade) { + var ltp = _last_trade.price; + if (MathUtils.epsilon_equals(ltp, _old_last_trade.price)) { + // update on the same price, so size must be different + _direction_arrow = string.Empty; + } else if (ltp > _old_last_trade.price) { + _direction_arrow = "▲"; + } else { + _direction_arrow = "▼"; + } + } + // regardless of if we've arrived here via a new Last (and new direction arrow) + // or we're reusing the old one, this format bit is the same + return $"{_direction_arrow} {_last_trade.size} "; } } From 179ee000a321464e4c5d24b8bda9c16e0d965344 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 24 Jun 2019 14:02:24 -0500 Subject: [PATCH 022/198] adding case for when the ladder is first brought up and the market has not yet moved --- .../Trading/Ladder/View/LadderGridHost.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index b822d3af3..b38bfb319 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -67,7 +67,7 @@ namespace mbts.spark { NativePriceSize _last_trade; Func _fmt_size = MDDisplayHelper.get_formatter_nps(MarketSizeDisplay.get_default()); int _old_tooltip_row = int.MaxValue; - NativePriceSize _old_last_trade; + NativePriceSize? _old_last_trade; string _direction_arrow = string.Empty; bool _tooltips_are_hooked_up = false; ToolTip tooltip_view = new ToolTip(); @@ -849,12 +849,12 @@ namespace mbts.spark { void _refresh_volume_at_price() { if (!_settings.volume_column.general.show) return; - + // if the last trade has a new size then we need to explicitly // mark the volume container as dirty because there is a chance // we have arrived here off a size change and not a volume change // or a random change, like applying new settings - bool last_trade_size_changed = _last_trade.size != _old_last_trade.size; + bool last_trade_size_changed = _old_last_trade.HasValue ? _last_trade.size != _old_last_trade.Value.size : true; if (last_trade_size_changed && _settings.volume_column.show_ltq) { _volume_container.mark_dirty(); } @@ -867,13 +867,17 @@ namespace mbts.spark { } string _get_last_arrow_string() { - // if the Lasts are different then we need to reformat the direction arrow in some fashion - if (_old_last_trade != _last_trade) { + // if _old_last_trade doesn't have a value, this is the first time the ladder has been launched + // and so the direction should be drawn without an arrow since there is no basis for comparison + if (!_old_last_trade.HasValue) { + _direction_arrow = string.Empty; + // if the Lasts are different then we need to reformat the direction arrow in some fashion + } else if (_old_last_trade != _last_trade) { var ltp = _last_trade.price; - if (MathUtils.epsilon_equals(ltp, _old_last_trade.price)) { + if (MathUtils.epsilon_equals(ltp, _old_last_trade.Value.price)) { // update on the same price, so size must be different _direction_arrow = string.Empty; - } else if (ltp > _old_last_trade.price) { + } else if (ltp > _old_last_trade.Value.price) { _direction_arrow = "▲"; } else { _direction_arrow = "▼"; From 10593513349cfb4d807dbd1e41d3aab6624660a8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 24 Jun 2019 14:15:53 -0500 Subject: [PATCH 023/198] adding the settings_subscription to be disposed; fixes swallowed NullRef; not directly related to this branch --- src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index bbc3f0824..ad66f5af2 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -99,6 +99,7 @@ namespace bts.shell { bool initialized = false; var settings_subscription = _settings_hub.subscribe_default_settings().Subscribe(on_user_settings); vm.OnDisposed += disposing => { + Disposable.dispose(ref settings_subscription); Disposable.dispose(ref active_settings_dialog); Disposable.dispose(ref settings_subject); }; From 60b7966f2f098ce0ca2ad164c2251be205b19034 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 24 Jun 2019 15:33:47 -0400 Subject: [PATCH 024/198] Loss limit manual test --- testing/manual/admin/loss_limit.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 testing/manual/admin/loss_limit.txt diff --git a/testing/manual/admin/loss_limit.txt b/testing/manual/admin/loss_limit.txt new file mode 100644 index 000000000..a9e211c9f --- /dev/null +++ b/testing/manual/admin/loss_limit.txt @@ -0,0 +1,27 @@ +This test verifies that account loss limits work. + +-1. This needs sim market data **not** to be merged with replay (or cert), so we can create our own markets. + +0. Blow away the orders and fills databases (/home/bts/sparkdata/data/databases/orders,fills, +ex_sim_orders) + +Pick a future and 2 accounts (lets call them A and B). + +In the risk admin +a. make sure the clip limits and position limits are high enough for the 2 accounts +b. make sure the loss limit is unchecked for both accounts + +1. Bring up 2 ladders for the contract you selected, each set to one of the accounts above. Bring up the +PNL window and set it to Mid. Now from account A enter a 100 lot bid and 100 lot ask (so now we have markets). + +2. From Account B cross the sell with a 1 lot buy. Now you should see a negative PNL for B, and a positive for A. + +3. Go to the risk admin and enter a loss limit for account B (~4 times the PNL for B) + +4. Repeat 2 and continue monitoring the PNL. Sell a few more at the market bid. As soon as the PNL goes below +the loss limits, orders should be rejected with a message saying exactly why. + +5. Increase the loss limit, and hit it again with a few loser trades. + +6. For bonus points, move the markets and try to get B's PNL within the loss limit range. Now enter loser trades +in B and make it hit the limit again. From 29d14404e6648c5f95fa9761c7e1b37bbe25024f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 24 Jun 2019 17:15:04 -0400 Subject: [PATCH 025/198] PositionService has access to AdminService to resolve accounts now --- .../sparkd/position/PositionServiceServer.cpp | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 188bec458..09e027718 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -1,6 +1,8 @@ #include "PositionServiceServer.h" #include "lib/api/services/OrderService.pb.h" #include "lib/api/services/OrderService.client.pb.h" +#include "lib/api/services/AdminService.pb.h" +#include "lib/api/services/AdminService.client.pb.h" #include "lib/api/public/ServiceContext.h" #include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" @@ -30,6 +32,7 @@ struct PositionServiceServer::PImpl { PositionServiceBase::Pnl_dataStatefulPublisher pnl_publisher; PositionServiceBase::Pnl_account_dataStatefulPublisher pnl_account_publisher; bts::api::orderman::OrderService order_service; + bts::api::admin::AdminService admin_service; std::map> state; std::map manual_fills; int id; @@ -38,6 +41,7 @@ struct PositionServiceServer::PImpl { // manual fills management std::unique_ptr manual_fills_store ; PositionServiceBase::Manual_fillsStatefulPublisher manual_fills_publisher; + api::admin::AdminData admin_data; PImpl(bts::api::ServiceContext& context, const PositionServiceBase::Position_dataStatefulPublisher& publisher, @@ -51,12 +55,14 @@ struct PositionServiceServer::PImpl { pnl_publisher(pnl_publisher), pnl_account_publisher(pnl_account_publisher), order_service(context.locate()), + admin_service(context.locate()), state(), id(0), pnl_helper(md_client), poll_period_ms(300), manual_fills_store(std::make_unique ("manual_fills")), - manual_fills_publisher(manual_fills_publisher) + manual_fills_publisher(manual_fills_publisher), + admin_data() { } }; @@ -79,7 +85,7 @@ me(new PImpl(context, for (const auto& f : update.removed()) me->publisher.add_or_update(_on_fill(*f,false)); for (const auto& f : update.added()) - me->publisher.add_or_update(_on_fill(*f,true)); + me->publisher.add_or_update(_on_fill(*f,true)); for (const auto& f : update.changed()) { me->publisher.add_or_update(_on_fill(*f.previous(),false)); me->publisher.add_or_update(_on_fill(*f.current(),true)); @@ -87,6 +93,16 @@ me(new PImpl(context, me->publisher.flush(); _compute_pnl_and_publish(); }); + + me->admin_service.subscribe_admin_data() | + rxcpp::operators::subscribe( + [this](auto const& update) { + for (const auto& r : update.added()) + {me->admin_data = *r;} + for (const auto& r : update.changed()) + {me->admin_data = *r.current();} + }); + me->context.post([this](){_periodic_poll();},me->poll_period_ms); auto all = me->manual_fills_store->retrieve_all()[manual_fills_ns]; LOG(persist, Info, "Finished loading all {} manual fills", all.size()); From 73336df814a9ad2576cae0b6a6d2efb2b29bcc90 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 16:04:24 -0500 Subject: [PATCH 026/198] SP-78 In miniob settings changing the column width directly through the grid (i.e. not through the dialog) has no effect beyond the current popup. --- .../Trading/Ladder/LadderWindowFactory.cs | 39 +++++++++++++++++-- .../Trading/Ladder/VM/LadderSettingsVM.cs | 13 ++++++- .../Modules/Trading/Ladder/VM/LadderVM.cs | 8 +++- .../Trading/Ladder/View/LadderOrdersHost.cs | 7 ++-- .../Trading/OrderBook/OrderBookColumns.cs | 1 - 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index faab2022d..de31cd1c3 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -96,14 +96,28 @@ namespace bts.shell { lp => new SettingsProfile(lp.id, lp.name, LadderSettings.sanitize(lp.value), lp.security_criteria))), (us, lps) => us.with(ladder_profiles: lps.Values.Select(lp => new LadderSettingsProfile(lp.id, lp.name, lp.value, lp.security_criteria)).ToArray())); state_settings?.sanitize(); + /// When settings are adjusted outside of the settings dialog, the vm should raise the event. + /// In response to that event, 'needs_resync' is set to true. This causes 'last_value' to be refreshed when the next caller requests the latest settings + /// (i.e., an IObserver subscribing to the settings_source, or the settings-dialog viewmodel). + bool initialized = false, needs_resync = false; LadderSettings last_value = fit_to_sec(state_settings); - var settings_subject = new BehaviorSubject(last_value); + LadderVM vm = null; + var settings_subject = new Subject(); + var settings_source = Observable.Create(o => { + ensure_synced(); + if (last_value != null) + o.OnNext(last_value); + return settings_subject.Subscribe(s => { + if (s != null) + o.OnNext(s); + }); + }); // vm - var vm = LadderVM.create(_bus, model, last_value ?? _settings_hub.current.ladder, settings_subject.Where(s => s != null)); + vm = LadderVM.create(_bus, model, last_value ?? _settings_hub.current.ladder, settings_source); + vm.settings_invalidated += on_settings_invalidated; vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select; vm.order_properties_vm.use_algo_param_grid = _ladder_conf.use_algo_param_grid; vm.request_settings_dialog += open_settings_dialog; - bool initialized = false; var settings_subscription = _settings_hub.subscribe_default_settings().Subscribe(on_user_settings); vm.OnDisposed += disposing => { Disposable.dispose(ref settings_subscription); @@ -119,8 +133,25 @@ namespace bts.shell { LadderSettings fit_to_sec(LadderSettings s) => _fit_to_sec(s, md.security.ContractCase); + void on_settings_invalidated() => + needs_resync = true; + + void ensure_synced() { + if (!needs_resync) + return; + var curr = vm.get_save_state(); + if (settings_id == 0) { + last_value = curr; + } else if (!curr.Equals(last_value)) { + settings_id = 0; + last_value = curr; + } + needs_resync = false; + } + void on_user_settings(UserSettings us) { if (initialized) { + ensure_synced(); if (settings_id == 0) { // not on a profile, don't respond to default settings changes return; @@ -290,4 +321,4 @@ namespace bts.shell { [ProtoMember(3)] public uint settings_id; } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 21fb574cb..ea67bad1d 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -355,8 +355,17 @@ namespace mbts.spark { } public LadderSettings get_result() { - var clone = SparkUtils.clone_proto(_current); - clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create()); + LadderSettings clone; + if (_current == null) { + clone = new LadderSettings { + mini_ob = new LadderMiniOrderBookSettings(mini_ob.create()) + }; + } else { + clone = SparkUtils.clone_proto(_current); +#pragma warning disable CS0612 // Type or member is obsolete + clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion)); +#pragma warning restore CS0612 // Type or member is obsolete + } clone.badge_style = badge_style; clone.alternate_order_size = alternate_order_size; clone.favorite_algos = favorite_algos_vm.create(); diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 809fdb0b9..006fc8f67 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -241,7 +241,7 @@ namespace mbts.spark { public IBus bus => _bus; - public event Action on_tick, request_settings_dialog; + public event Action on_tick, request_settings_dialog, settings_invalidated; public MDConsumerHandle md => _model.md; // we return only entries who have piqs and whose piqs are not uint.Max @@ -394,6 +394,12 @@ namespace mbts.spark { } } + public void on_mini_orderbook_closed(bts.shell.orderbook.OrderBookStartupData ob_state) { + current_settings = SparkUtils.clone_proto(current_settings); + current_settings.mini_ob = new LadderMiniOrderBookSettings(ob_state.orderbook_grid.general); + settings_invalidated?.Invoke(); + } + public void send_order((double price, Side? side, MouseButton button) args) { if (order_properties_vm == null || args.button == MouseButton.Middle) return; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs index 6ccb3d81c..903e97ab3 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs @@ -9,9 +9,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Input; -using System.Windows.Interactivity; using System.Windows.Media; namespace mbts.spark { @@ -156,7 +154,10 @@ namespace mbts.spark { popup.SetBinding(System.Windows.Controls.Primitives.Popup.IsOpenProperty, nameof(OrderBookVM.is_row_collection_populated) ); - popup.Closed += (sender, event_args) => (popup.DataContext as IDisposable)?.Dispose(); + popup.Closed += (sender, event_args) => { + (_parent.DataContext as LadderVM)?.on_mini_orderbook_closed(obvm.create()); + (popup.DataContext as IDisposable)?.Dispose(); + }; popup.MouseUp += (sender, event_args) => { if (event_args.ChangedButton == MouseButton.Middle) { popup.IsOpen = false; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 6ae3e6f72..d917adaac 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1177,7 +1177,6 @@ namespace mbts.spark { public class CommitColumn : FrameworkElementColumnBase { public CommitColumn() : base(Columns.Commit) { id = key.ToString(); - Header = ""; Width = 20; } From 2e4dff4d91f2fa248b7c9d4d0cbf9b75ec903de3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 16:20:08 -0500 Subject: [PATCH 027/198] SP-76 In miniob settings, the miniob's width seems to have a minimum that does not reflect the currently displayed columns --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index a3c025aa5..70dc3b094 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -14,7 +14,6 @@ xmlns:order="clr-namespace:bts.api.orderman;assembly=spark_api" mc:Ignorable="d" MaxHeight="240" - MinWidth="875" d:DesignHeight="600" d:DesignWidth="1080" FocusManager.IsFocusScope="True" Background="{StaticResource CommonBackground}"> From 71c576bbc061dc4f70809c093e9ce591882d31d0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 17:05:41 -0500 Subject: [PATCH 028/198] SP-80 / SP-82 Algos should be private --- src/client/spark/Admin/AdminModel.cs | 18 ++----- .../AlgoStudioDefinitionTemplateModel.cs | 50 +++++-------------- .../Model/AlgoStudioFlatDefinitionModel.cs | 35 ++++--------- src/client/spark/Orders/OrderDataHelper.cs | 9 ++-- .../spark/view/Shell/Login/LoginModel.cs | 14 ++++-- 5 files changed, 41 insertions(+), 85 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index af7cf9499..3c5c1af30 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -7,12 +7,12 @@ using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; using bts.api.core; +using mbts.ui.shell; namespace mbts.spark { [Export] class AdminModel : IDisposable { - readonly string _user_name; - public string user_name => _user_name; + public readonly UserTuple user; readonly BehaviorSubject> _accounts_subject = new BehaviorSubject>(new Dictionary()), @@ -24,10 +24,10 @@ namespace mbts.spark { IDisposable _dispose; [ImportingConstructor] - AdminModel(AdminService service, [Import("username")]string user_name) { - _user_name = user_name; + AdminModel(AdminService service, [Import(LoginModel.Exports.UserID)]uint user_id, [Import(LoginModel.Exports.UserName)]string user_name) { + user = new UserTuple(user_id, user_name); _dispose = service.subscribei_admin_data().Select(update => { - _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), _user_name)); + _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user_name)); IEnumerable active_users = from admin_data in update.all from bts_user in admin_data.Users @@ -62,14 +62,6 @@ namespace mbts.spark { public IObservable> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList()); public IObservable on_admin_data => _wrapper_subject.AsObservable(); - public UserTuple? get_current_user() { - foreach (var kv in _user_map) { - // just for good measure, there should never be > 1 element in _user_map, and it should always match _user_name - if (kv.Value == _user_name) - return new UserTuple(kv.Key, kv.Value); - } - return null; - } public AccountTuple? get_default_account() { foreach (var kv in _account_map) { return new AccountTuple(kv.Key, kv.Value); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs index 1e0f3b8b9..b036f0671 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs @@ -1,5 +1,4 @@ using bts; -using bts.api; using bts.api.core; using bts.api.orderman; using bts.persist.algo; @@ -110,38 +109,24 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); - async Task _create_definition(CompositeAlgoDefinitionImmutable definition) { - if (_try_get_user(out uint user_id)) { - return await _create_definition(definition, user_id); - } else { - _report_no_user_id(ActionMetadata.CreateDefinition); - } - return null; - } + async Task _create_definition(CompositeAlgoDefinitionImmutable definition) => + await _create_definition(definition, _admin_model.user.id); async Task _create_template(AlgoTemplateImmutable template) { - if (_try_get_user(out uint user_id)) { - var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async( - new TemplateCreateRequest { UserId = user_id, NewTemplate = template.CloneToMutable() }), - r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate); - if (success) - return _Utils.template_data(value.Record); - } else { - _report_no_user_id(ActionMetadata.CreateTemplate); - } + var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async( + new TemplateCreateRequest { UserId = _admin_model.user.id, NewTemplate = template.CloneToMutable() }), + r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate); + if (success) + return _Utils.template_data(value.Record); return null; } async Task _update_template(AlgoTemplateRecordImmutable template) { - if (_try_get_user(out uint user_id)) { - var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async( - new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }), - r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate); - if (success) - return _Utils.template_data(template); - } else { - _report_no_user_id(ActionMetadata.UpdateTemplate); - } + var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async( + new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }), + r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate); + if (success) + return _Utils.template_data(template); return null; } @@ -175,17 +160,6 @@ namespace mbts.spark { void _report_no_user_id(string desc) => _error_reporter.report_error($"{desc} failed: did not find current user id"); - bool _try_get_user(out uint id) { - var user = _admin_model.get_current_user(); - if (user.HasValue) { - id = user.Value.id; - return true; - } else { - id = 0; - return false; - } - } - // used for error handling/reporting interface IActionMetadata { string desc { get; } diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs index d71801748..57518ae9f 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs @@ -1,14 +1,11 @@ using bts; -using bts.api; using bts.api.core; using bts.api.orderman.algo; using bts.persist.algo; using bts.spark; -using mbts.spark.utilities; using mbts.utils; using System; using System.Collections.Generic; -using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; @@ -27,7 +24,12 @@ namespace mbts.spark { _admin_model = admin_model; _error_reporter = error_reporter; this.ui_configuration = ui_configuration; - definitions = service.subscribei_algo_definitions().Filter(r => r.Metadata.IsActive).SelectKeyValue(_definition_data, d => d.key).Table().Cache(); + definitions = + service.subscribei_algo_definitions() + .Filter(r => r.Metadata.IsActive && r.Metadata.CreatorUserId == _admin_model.user.id) + .SelectKeyValue(_definition_data, d => d.key) + .Table() + .Cache(); } public IObservable> definitions { get; } @@ -39,15 +41,11 @@ namespace mbts.spark { Observable.Return(TableUpdate.mk_empty(t => t.key)); public async Task save_definition(AlgoData definition_data) { - if (_try_get_user(out uint user_id)) { - var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async( - _with_key(new AlgoDefinitionUpdateRequest { UserId = user_id, Algo = _template(definition_data) }, definition_data.key)), - r => r.Success, r => r.ErrorMessage, "saving template"); - if (success) - return _definition_data(new AlgoDefinitionRecordImmutable(value.Record)); - } else { - _report_no_user_id("save template"); - } + var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async( + _with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _template(definition_data) }, definition_data.key)), + r => r.Success, r => r.ErrorMessage, "saving template"); + if (success) + return _definition_data(new AlgoDefinitionRecordImmutable(value.Record)); return null; } @@ -105,16 +103,5 @@ namespace mbts.spark { void _report_no_user_id(string desc) => _error_reporter.report_error($"{desc} failed: did not find current user id"); - - bool _try_get_user(out uint id) { - var user = _admin_model.get_current_user(); - if (user.HasValue) { - id = user.Value.id; - return true; - } else { - id = 0; - return false; - } - } } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 511dc6711..81e342b38 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -168,17 +168,14 @@ namespace mbts.spark.utilities { // this will be the tag 50 on CME orders // current user might be okay, but we might also want to get it // from the store that serves the risk admin gui - ManualOrderIndicator = ManualOrderIndicator.Yes + ManualOrderIndicator = ManualOrderIndicator.Yes, + User = _admin_model.user.name, + UserId = _admin_model.user.id }; if (account.HasValue) { rv.Account = account.Value.name; rv.AccountId = account.Value.id; } - var user = _admin_model.get_current_user(); - if (user.HasValue) { - rv.User = user.Value.name; - rv.UserId = user.Value.id; - } return rv; } diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 8f8095007..9655978c0 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -28,11 +28,12 @@ namespace mbts.ui.shell { model.Dispose(); } - [Export("username")] + [Export(LoginModel.Exports.UserName)] public string UserName { get; private set; } - [Export("userid")] + [Export(LoginModel.Exports.UserID)] public uint UserId { get; private set; } + [Export] public AuthTokenImmutable Token { get; private set; } @@ -49,8 +50,13 @@ namespace mbts.ui.shell { public readonly UInt32 id; } - public class LoginModel : IDisposable - { + public class LoginModel : IDisposable { + public static class Exports { + public const string + UserName = "username", + UserID = "userid"; + } + // Singleton to help bootstrap the system private static LoginModel _instance = new LoginModel(); public static LoginModel instance { get { return _instance; } } From 8a7e2db4ac16ffecb90b57fb8d01865f2000de67 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 19:01:57 -0500 Subject: [PATCH 029/198] SP-80 / SP-81 Synths should be private --- src/client/spark/Daemons/MDDaemon.cs | 5 ++- .../spark/Modules/Spreader/SpreaderModel.cs | 16 ++++++-- .../Modules/Spreader/VM/SyntheticEditorVM.cs | 2 +- src/client/spark_api/md/MDSource.cs | 38 +++++++++---------- src/lib/domain_model/Security.proto | 1 + 5 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 70361557b..058f8207d 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -15,6 +15,7 @@ using System.Collections.Concurrent; using System.Threading; using bts.api.user; using bts.md; +using mbts.ui.shell; namespace bts { [Export(typeof(IInitializable))] @@ -27,8 +28,8 @@ namespace bts { static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; [ImportingConstructor] - public MDDaemon(Lazy bus, Lazy token, Lazy ss) : - base(get_naggle(), MDSourceOptions.DeferInit) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginModel.Exports.UserID)]uint user_id) : + base(get_naggle(), MDSourceOptions.DeferInit, user_id) { _bus = bus; _token = token; _ss = ss; diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index 346f74e22..7e1d4535c 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -1,6 +1,7 @@ using bts.api; using bts.api.synthetic; using bts.spark; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -14,12 +15,14 @@ namespace mbts.spark { readonly IBus _bus; readonly SyntheticSecurityService _service; readonly ErrorReporter _error; + readonly uint _user_id; [ImportingConstructor] - public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error) { + public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginModel.Exports.UserID)]uint user_id) { _bus = bus; _service = service; _error = error; + _user_id = user_id; } public IObservable> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag); @@ -53,8 +56,15 @@ namespace mbts.spark { return null; } - public async Task create_synthetic(SecurityImmutable? synthetic) { - var result = await _service.create_synthetic_async(synthetic.Value); + public async Task create_synthetic(SecurityImmutable synthetic) { + if (synthetic.ContractCase != Security.ContractOneofCase.Synthetic) + return null; + if (synthetic.Synthetic.UserId != _user_id) { + var msynth = synthetic.CloneToMutable(); + msynth.Synthetic.UserId = _user_id; + synthetic = new SecurityImmutable(msynth); + } + var result = await _service.create_synthetic_async(synthetic); return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result; } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 6e1ddca65..017eb24c0 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -134,7 +134,7 @@ namespace mbts.spark { _synthetic.ContractSpec.PriceBreak = double.MaxValue; _synthetic.ContractSpec.MainFraction = (uint)MathUtils.factor_out(_tick_factors.tick_base, 10); _synthetic.ContractSpec.PriceDisplayFormat = (uint)_tick_factors.display_digits(); - uint? id = await model.create_synthetic(_synthetic); + uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic)); if (id.HasValue && id != 0) { if (await model.save_strategy(id.Value, get_strategy())) { var (smd, success) = await SparkUtils.get_security_md_async(bus, id.Value); diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index 392fc6844..7281aba04 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -1,36 +1,33 @@ using bts.api; -using bts.api.synthetic; using mbts; using mbts.co2; using System; -using System.Collections.Generic; -using System.Reactive.Linq; -using System.Threading.Tasks; -using System.Linq; -using SecurityKey = System.UInt32; using System.Collections.Concurrent; -using System.Threading; -using bts.api.user; +using System.Collections.Generic; using System.Reactive.Subjects; +using System.Threading.Tasks; +using SecurityKey = System.UInt32; -namespace bts.md -{ +namespace bts.md { [Flags] enum MDSourceOptions { DeferInit = 1, } class MDSource : IObserver>, IDisposable - { + { + const uint _no_user_id = 0; protected readonly MDConsumer _consumer = new MDConsumer(); protected readonly Co2RelayControl _relay; protected DateTime _version = DateTime.MinValue; protected readonly ConcurrentDictionary _exchange_sec_map = new ConcurrentDictionary(); protected List _dispose = new List(); protected readonly MDSourceOptions _options; + readonly uint _user_id; - public MDSource(uint naggle_ms, MDSourceOptions options = 0) + public MDSource(uint naggle_ms, MDSourceOptions options = 0, uint user_id = _no_user_id) { _options = options; + _user_id = user_id; _relay = new Co2RelayControl(_consumer, naggle_ms); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); _dispose.Add(_consumer.on_security.Subscribe(this)); @@ -54,12 +51,15 @@ namespace bts.md public void OnCompleted() { } public void OnError(Exception error) => Log.Md.error(error.ToString()); - public void OnNext(List values) - { - if (values.Count > 0) - { - foreach (var v in values) - { + public void OnNext(List values) { + if (values.Count > 0) { + foreach (var v in values) { + if (_user_id != _no_user_id && + v.security.ContractCase == Security.ContractOneofCase.Synthetic && + v.security.Synthetic.UserId != _user_id && + v.security.Synthetic.UserId != _no_user_id) { + continue; + } var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle); _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); } @@ -93,4 +93,4 @@ namespace bts.md } } -} \ No newline at end of file +} diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 9e16fd9b4..52ca35299 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -143,6 +143,7 @@ message SpreadContract { message SyntheticContract { string name = 1; + uint32 user_id = 2; repeated ContractLeg legs = 20; PriceCalc price_calc = 30; enum PriceCalc { From 94fc2c42488019ec9b75f7c9af62377e3f29b342 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 23:18:43 -0500 Subject: [PATCH 030/198] refactor LoginModel.Exports -> LoginContainer.Exports --- src/client/spark/Admin/AdminModel.cs | 2 +- src/client/spark/Daemons/MDDaemon.cs | 2 +- .../spark/Modules/Spreader/SpreaderModel.cs | 2 +- src/client/spark/view/Shell/Login/LoginModel.cs | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 3c5c1af30..9b73bcc57 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -24,7 +24,7 @@ namespace mbts.spark { IDisposable _dispose; [ImportingConstructor] - AdminModel(AdminService service, [Import(LoginModel.Exports.UserID)]uint user_id, [Import(LoginModel.Exports.UserName)]string user_name) { + AdminModel(AdminService service, [Import(LoginContainer.Exports.UserID)]uint user_id, [Import(LoginContainer.Exports.UserName)]string user_name) { user = new UserTuple(user_id, user_name); _dispose = service.subscribei_admin_data().Select(update => { _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user_name)); diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 058f8207d..a2f866421 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -28,7 +28,7 @@ namespace bts { static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; [ImportingConstructor] - public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginModel.Exports.UserID)]uint user_id) : + public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginContainer.Exports.UserID)]uint user_id) : base(get_naggle(), MDSourceOptions.DeferInit, user_id) { _bus = bus; _token = token; diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index 7e1d4535c..bc0fb491f 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -18,7 +18,7 @@ namespace mbts.spark { readonly uint _user_id; [ImportingConstructor] - public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginModel.Exports.UserID)]uint user_id) { + public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) { _bus = bus; _service = service; _error = error; diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 9655978c0..0be6c3388 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -28,10 +28,10 @@ namespace mbts.ui.shell { model.Dispose(); } - [Export(LoginModel.Exports.UserName)] + [Export(Exports.UserName)] public string UserName { get; private set; } - [Export(LoginModel.Exports.UserID)] + [Export(Exports.UserID)] public uint UserId { get; private set; } [Export] @@ -39,6 +39,12 @@ namespace mbts.ui.shell { [Export("workspace")] public string Workspace { get; private set; } + + public static class Exports { + public const string + UserName = "username", + UserID = "userid"; + } } public struct User { @@ -51,12 +57,6 @@ namespace mbts.ui.shell { } public class LoginModel : IDisposable { - public static class Exports { - public const string - UserName = "username", - UserID = "userid"; - } - // Singleton to help bootstrap the system private static LoginModel _instance = new LoginModel(); public static LoginModel instance { get { return _instance; } } From 490add84d91327e3aa8714d8e640b63d4607ab08 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 25 Jun 2019 23:19:20 -0500 Subject: [PATCH 031/198] replace magic consts w/ regular consts --- src/client/spark/Daemons/AboutDaemon.cs | 3 ++- src/client/spark/Daemons/ErrorReporter.cs | 3 ++- src/client/spark/Daemons/ShellLatencyDaemon.cs | 3 ++- .../spark/Modules/Market/MarketShellModule.cs | 3 ++- .../spark/view/Shell/ViewModels/LauncherVM.cs | 14 +++++++------- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Daemons/AboutDaemon.cs b/src/client/spark/Daemons/AboutDaemon.cs index 8abe6cc66..8a8ad2f06 100644 --- a/src/client/spark/Daemons/AboutDaemon.cs +++ b/src/client/spark/Daemons/AboutDaemon.cs @@ -3,6 +3,7 @@ using mbts; using mbts.config; using mbts.spark; using mbts.ui; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -22,7 +23,7 @@ namespace bts.ui { IDisposable _dispose; [ImportingConstructor] - public AboutDaemon(IBus bus, [Import("username")]string username) { + public AboutDaemon(IBus bus, [Import(LoginContainer.Exports.UserName)]string username) { _user = username; _bus = bus; _dispose = bus.subscribe(SparkTags.About).OnDispatcher().Subscribe(_ => show_about()); diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index d19f7ef04..53b4bbc60 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -10,6 +10,7 @@ using System.Reactive.Linq; using System.Windows.Threading; using System.Windows; using System.Threading.Tasks; +using mbts.ui.shell; namespace bts.spark { @@ -20,7 +21,7 @@ namespace bts.spark IDisposable _dispose; [ImportingConstructor] - public ErrorReporter(ErrorReportService svc, IBus bus, [Import("username")] string username) { + public ErrorReporter(ErrorReportService svc, IBus bus, [Import(LoginContainer.Exports.UserName)] string username) { _svc = svc; _username = username; _dispose = bus.subscribe(SparkTags.Support).OnDispatcher().Subscribe(msg => show_support_window(msg, "Report a problem")); diff --git a/src/client/spark/Daemons/ShellLatencyDaemon.cs b/src/client/spark/Daemons/ShellLatencyDaemon.cs index 34e0f1065..0f4e10fd3 100644 --- a/src/client/spark/Daemons/ShellLatencyDaemon.cs +++ b/src/client/spark/Daemons/ShellLatencyDaemon.cs @@ -3,6 +3,7 @@ using bts.metrics; using mbts; using mbts.config; using mbts.ui; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -23,7 +24,7 @@ namespace bts.perf { Ping _pinger = new Ping(); [ImportingConstructor] - public ShellLatencyDaemon(ShellLatencyService service, [Import("username")] string user) { + public ShellLatencyDaemon(ShellLatencyService service, [Import(LoginContainer.Exports.UserName)] string user) { _service = service; _version = Configuration.get().version; _username = user; diff --git a/src/client/spark/Modules/Market/MarketShellModule.cs b/src/client/spark/Modules/Market/MarketShellModule.cs index ad95c0472..f2db00136 100644 --- a/src/client/spark/Modules/Market/MarketShellModule.cs +++ b/src/client/spark/Modules/Market/MarketShellModule.cs @@ -5,6 +5,7 @@ using mbts.co2; using mbts.persist; using mbts.spark; using mbts.ui; +using mbts.ui.shell; using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; @@ -18,7 +19,7 @@ namespace bts.shell class MarketShellModule : IShellModule { [ImportingConstructor] - public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import("username")]string user_name) { + public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import(LoginContainer.Exports.UserName)]string user_name) { _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub); _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model); } diff --git a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs index c870865ec..63b760725 100644 --- a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs +++ b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs @@ -1,14 +1,14 @@ -using System; +using bts; +using bts.api; +using bts.spark; +using mbts.ui.native; +using mbts.ui.utility; +using System; using System.Collections.ObjectModel; using System.ComponentModel.Composition; using System.Windows; using System.Windows.Controls; using System.Windows.Input; -using mbts.ui.native; -using mbts.ui.utility; -using bts.api; -using bts.spark; -using bts; namespace mbts.ui.shell { [Export(typeof(ILauncher))] @@ -23,7 +23,7 @@ namespace mbts.ui.shell { [ImportingConstructor] public LauncherVM( ObservableCollection modules, - [Import("username")]string username, + [Import(LoginContainer.Exports.UserName)]string username, ErrorReporter errors, IBus bus) { _user = username; _modules = new ObservableAutoWrapper(modules, m => new ShellModuleVM(m, bus)); From 345e45c5bf2b5d9c9e8e1ca439466819aa620472 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 10:28:05 -0500 Subject: [PATCH 032/198] MEFExport UserTuple --- src/client/spark/Admin/AdminModel.cs | 8 ++++---- src/client/spark/view/Shell/Login/LoginModel.cs | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 9b73bcc57..1f9083152 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -24,14 +24,14 @@ namespace mbts.spark { IDisposable _dispose; [ImportingConstructor] - AdminModel(AdminService service, [Import(LoginContainer.Exports.UserID)]uint user_id, [Import(LoginContainer.Exports.UserName)]string user_name) { - user = new UserTuple(user_id, user_name); + AdminModel(AdminService service, [Import(LoginContainer.Exports.UserTuple)]UserTuple user) { + this.user = user; _dispose = service.subscribei_admin_data().Select(update => { - _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user_name)); + _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user.name)); IEnumerable active_users = from admin_data in update.all from bts_user in admin_data.Users - where bts_user.Name == user_name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions + where bts_user.Name == user.name && bts_user.HasUserData && bts_user.UserData.HasAccountPermissions select bts_user; IEnumerable active_accounts = diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 0be6c3388..8ffec03cf 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -34,6 +34,9 @@ namespace mbts.ui.shell { [Export(Exports.UserID)] public uint UserId { get; private set; } + [Export(Exports.UserTuple)] + public UserTuple UserTuple => new UserTuple(UserId, UserName); + [Export] public AuthTokenImmutable Token { get; private set; } @@ -43,7 +46,8 @@ namespace mbts.ui.shell { public static class Exports { public const string UserName = "username", - UserID = "userid"; + UserID = "userid", + UserTuple = "usertuple"; } } From e0ba27a0a91f254bced50f7bae0fa80ce790a2f7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 11:34:50 -0500 Subject: [PATCH 033/198] SpreaderModel - remove unneccesary 'async/await' wrappers --- src/client/spark/Daemons/ErrorReporter.cs | 28 +++++++++++++ .../spark/Modules/Spreader/SpreaderModel.cs | 42 ++++++++++--------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index 53b4bbc60..d454c7aae 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -50,6 +50,8 @@ namespace bts.spark } } + delegate bool TryGetAPIResult(T value, out string error_msg, out TResult result); + static class ErrorReporterExtensions { public static bool handle_error(this ErrorReporter error_reporter, Result result, string template, TError error, bool error_ok) => handle_error(error_reporter, result, template, error, error_ok, false, true); @@ -102,5 +104,31 @@ namespace bts.spark void _report_error(string msg) => error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning); } + + public static async Task safe_execute( + this ErrorReporter error_reporter, + Func>> execute, + Func get_success, + Func get_error_msg, + Func result_selector, + string desc) { + // + try { + var result = await execute(); + if (!result.success) { + _report_error(result.error_message); + } else if (!get_success(result.value)) { + _report_error(get_error_msg(result.value)); + } else { + return result_selector(result.value, true); + } + } catch (Exception ex) { + _report_error(ex.ToString()); + } + return result_selector(default, false); + // + void _report_error(string msg) => + error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning); + } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index bc0fb491f..f34af26ab 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -42,21 +42,18 @@ namespace mbts.spark { return (result, success); }); - public async Task lookup_strategy_async(SecurityImmutable security) => - await lookup_strategy_async(security.Id); + public Task lookup_strategy_async(SecurityImmutable security) => + lookup_strategy_async(security.Id); - public async Task lookup_strategy_async(uint id) { - var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } }); - if (result.success) { - var metadata = result.value.Data.FirstOrDefault(i => i.SecurityKey == id); - if (metadata != null) { - return metadata.Strategy; - } - } - return null; - } + public Task lookup_strategy_async(uint id) => + _error.safe_execute( + () => _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } }), + mdc => mdc.Data.Count == 1 && mdc.Data[0].SecurityKey == id, + mdc => $"did not find strategy for security id '{id}.'", + (mdc, success) => success ? mdc.Data[0].Strategy : (ExecutionStrategyImmutable?)null, + "lookup strategy"); - public async Task create_synthetic(SecurityImmutable synthetic) { + public Task create_synthetic(SecurityImmutable synthetic) { if (synthetic.ContractCase != Security.ContractOneofCase.Synthetic) return null; if (synthetic.Synthetic.UserId != _user_id) { @@ -64,14 +61,21 @@ namespace mbts.spark { msynth.Synthetic.UserId = _user_id; synthetic = new SecurityImmutable(msynth); } - var result = await _service.create_synthetic_async(synthetic); - return _error.handle_error(result, "Error creating synthetic: {0}", r => r.Error, e => e == CreateResult.Types.Error.Ok, r => new uint?(r.Key), () => null).result; + return _error.safe_execute( + () => _service.create_synthetic_async(synthetic), + r => r.Error == CreateResult.Types.Error.Ok, + r => r.Error.ToString(), + (r, success) => success ? r.Key : (uint?)null, + "creating synthetic"); } - public async Task save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) { - var result = await _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() }); - return _error.handle_error(result, "Error saving execution strategy: {0}", r => r.Error, e => e == UpdateResult.Types.Error.Ok); - } + public Task save_strategy(uint synthetic, ExecutionStrategyImmutable strategy) => + _error.safe_execute( + () => _service.update_security_metadata_async(new Metadata { SecurityKey = synthetic, Strategy = strategy.CloneToMutable() }), + r => r.Error == UpdateResult.Types.Error.Ok, + r => r.Error.ToString(), + (r, success) => success, + "saving strategy"); public async Task verify_name_is_unique(string name) { var (result, success) = await strategy_tuple.FirstAsyncTask(SparkUtils.DefaultTimeOut); From b0726ad3eaa7c042f888d74339a1a9378e551163 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 11:39:18 -0500 Subject: [PATCH 034/198] just noticed some iobservables in OrderBookVM without OnDispatcher()s (adding them preemptively) --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 77ecffeb4..f1024f0da 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -331,8 +331,8 @@ namespace mbts.spark { IDisposable connect_order_mod_vm() => Disposable.Create( - _selected_params_mon.subscribe_algos().Subscribe(order_mod_vm.algo_vm.load_many), - order_mod_vm.subscribe_is_dirty().Subscribe(_ => { + _selected_params_mon.subscribe_algos().OnDispatcher().Subscribe(order_mod_vm.algo_vm.load_many), + order_mod_vm.subscribe_is_dirty().OnDispatcher().Subscribe(_ => { modify_selected_orders_async_cmd.RaiseCanExecuteChanged(); revert_selected_orders_cmd.RaiseCanExecuteChanged(); }), @@ -340,10 +340,10 @@ namespace mbts.spark { IDisposable connect_common_selected_params(OrderParamsVM vm) => Disposable.Create( - _selected_params_mon.subscribe_security().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval), - _selected_params_mon.subscribe_price().Subscribe(vm.on_common_price), - _selected_params_mon.subscribe_size().Subscribe(vm.on_common_size), - _selected_params_mon.subscribe_account().Subscribe(newval => vm.selected_account = newval)); + _selected_params_mon.subscribe_security().OnDispatcher().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval), + _selected_params_mon.subscribe_price().OnDispatcher().Subscribe(vm.on_common_price), + _selected_params_mon.subscribe_size().OnDispatcher().Subscribe(vm.on_common_size), + _selected_params_mon.subscribe_account().OnDispatcher().Subscribe(newval => vm.selected_account = newval)); } private void _row_collection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { From 1bcb209961c4e1148846bc2c96dcf906f09d4f4c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 11:42:47 -0500 Subject: [PATCH 035/198] remove unused delegate type, and worthless commented line --- src/client/spark/Daemons/ErrorReporter.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index d454c7aae..915db202c 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -50,8 +50,6 @@ namespace bts.spark } } - delegate bool TryGetAPIResult(T value, out string error_msg, out TResult result); - static class ErrorReporterExtensions { public static bool handle_error(this ErrorReporter error_reporter, Result result, string template, TError error, bool error_ok) => handle_error(error_reporter, result, template, error, error_ok, false, true); From fbe9b570a30edcb96913b3add2cbfc3321e23b52 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 12:43:48 -0500 Subject: [PATCH 036/198] (forgot to run 'git add' again) --- src/client/spark/Daemons/ErrorReporter.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index 915db202c..fa8ccc6ad 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -83,7 +83,6 @@ namespace bts.spark } } - //public static async Task> public static async Task<(T value, bool success)> safe_execute(this ErrorReporter error_reporter, Func>> execute, Func get_success, Func get_error_msg, string desc) { try { var result = await execute(); From 3252cab4bb44cc2f8f0b83751789fdaca316b049 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 13:22:02 -0500 Subject: [PATCH 037/198] SP-80 / SP-88 Login dialog should not expose user names (because they are private) --- .../spark/view/Shell/Login/LoginModel.cs | 5 ++++ .../spark/view/Shell/Login/LoginView.xaml | 9 +++++++- .../spark/view/Shell/Login/LoginViewModel.cs | 23 ++++++++++--------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 8ffec03cf..f8e06bef8 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -80,6 +80,11 @@ namespace mbts.ui.shell { public bool HasFatalError { get; set; } public User[] Users { get; private set; } + public bool try_get_user(string name, out User user) => + Users.TryGetFirst(u => u.name == name, out user); + + public bool user_exists(string name) => + Users.Any(u => u.name == name); // The final username public (string, uint, AuthTokenImmutable) get_user() { diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index 4778ea279..61ab1e961 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -6,6 +6,7 @@ xmlns:ui="clr-namespace:mbts.ui" xmlns:uicore="clr-namespace:mbts.ui" xmlns:converters="clr-namespace:mbts.ui.converters" + xmlns:autocomplete="clr-namespace:WPFTextBoxAutoComplete;assembly=WPFTextBoxAutoComplete" mc:Ignorable="d" MouseDown="Window_MouseDown" Width="500" Height="309" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" ui:StateManager.VisualState="{Binding VisualState}"> @@ -82,7 +83,13 @@ - + diff --git a/src/client/spark/view/Shell/Login/LoginViewModel.cs b/src/client/spark/view/Shell/Login/LoginViewModel.cs index b9994863d..c892c7f6a 100644 --- a/src/client/spark/view/Shell/Login/LoginViewModel.cs +++ b/src/client/spark/view/Shell/Login/LoginViewModel.cs @@ -18,7 +18,7 @@ namespace mbts.ui.shell _dispatcher = disp; _model = model; Workspaces = new ObservableCollection(); - LoginCommand = new DelegateCommand(OnLogin, _ => UserNames.Count > 0 && SelectedWorkspace != null); + LoginCommand = new DelegateCommand(OnLogin, _ => !string.IsNullOrEmpty(_name) && SelectedWorkspace != null); CancelCommand = new DelegateCommand(OnCancel); EmailCommand = new DelegateCommand(OnSendMail); if (_model.HasFatalError) { @@ -42,9 +42,10 @@ namespace mbts.ui.shell void _model_Ready() { _dispatcher.BeginInvoke(() => { if (!_model.HasFatalError) { - this.UserNames.AddRange(_model.Users.Select(u => u.name)); this.VisualState = "LoginState"; load_username(); + if (!string.IsNullOrEmpty(_name)) + KnownUsers.Add(_name); LoginCommand.RaiseCanExecuteChanged(); } else { @@ -57,8 +58,7 @@ namespace mbts.ui.shell private string _vstate = "Normal"; public string VisualState { get { return _vstate; } set { _vstate = value; RaisePropertyChanged("VisualState"); } } - private ObservableCollection _user_names = new ObservableCollection(); - public ObservableCollection UserNames { get { return _user_names; } } + public ObservableCollection KnownUsers { get; } = new ObservableCollection(); private string _name; public string Name { get { return _name; } @@ -82,12 +82,13 @@ namespace mbts.ui.shell private async void update_workspaces(string name) { Workspaces.Clear(); Workspaces.Add("New workspace..."); - var user = _model.Users.First(u => u.name == name); - var to_add = await _model.workspaces_for(user); - this.SelectedWorkspace = Workspaces.First(); - if (to_add != null && name == _name && Workspaces.Count == 1) { - Workspaces.AddRange(to_add); - load_last_workspace(name); + SelectedWorkspace = Workspaces.First(); + if (_model.try_get_user(name, out var user)) { + var to_add = await _model.workspaces_for(user); + if (to_add != null && name == _name && Workspaces.Count == 1) { + Workspaces.AddRange(to_add); + load_last_workspace(name); + } } RaisePropertyChanged("SelectedWorkspace"); LoginCommand.RaiseCanExecuteChanged(); @@ -111,7 +112,7 @@ namespace mbts.ui.shell var value = key.GetValue("login"); if (value != null) { var n = value.ToString(); - if (UserNames.Contains(n)) { + if (_model.user_exists(n)) { Name = n; } } From 87433aa7c3d9ff7e4085c54ec55236b3d91c6100 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 13:41:37 -0500 Subject: [PATCH 038/198] add comment for 'KnownUsers' prop --- src/client/spark/view/Shell/Login/LoginViewModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/view/Shell/Login/LoginViewModel.cs b/src/client/spark/view/Shell/Login/LoginViewModel.cs index c892c7f6a..15e8dc229 100644 --- a/src/client/spark/view/Shell/Login/LoginViewModel.cs +++ b/src/client/spark/view/Shell/Login/LoginViewModel.cs @@ -58,6 +58,7 @@ namespace mbts.ui.shell private string _vstate = "Normal"; public string VisualState { get { return _vstate; } set { _vstate = value; RaisePropertyChanged("VisualState"); } } + /// should only contain the user-name of the last login (if none exists, it should be empty). public ObservableCollection KnownUsers { get; } = new ObservableCollection(); private string _name; public string Name { From 62baa6aa31b790309e3010bcde494a75c77c4b52 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 14:19:49 -0500 Subject: [PATCH 039/198] MEFExport UserTuple does not need a contract name --- src/client/spark/Admin/AdminModel.cs | 2 +- src/client/spark/view/Shell/Login/LoginModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 1f9083152..9e8508b22 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -24,7 +24,7 @@ namespace mbts.spark { IDisposable _dispose; [ImportingConstructor] - AdminModel(AdminService service, [Import(LoginContainer.Exports.UserTuple)]UserTuple user) { + AdminModel(AdminService service, [Import]UserTuple user) { this.user = user; _dispose = service.subscribei_admin_data().Select(update => { _wrapper_subject.OnNext(new AdminModelWrapper(update.all.TryFirst(), user.name)); diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index f8e06bef8..35f666503 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -34,7 +34,7 @@ namespace mbts.ui.shell { [Export(Exports.UserID)] public uint UserId { get; private set; } - [Export(Exports.UserTuple)] + [Export] public UserTuple UserTuple => new UserTuple(UserId, UserName); [Export] From b5ea399e7e11c88d95ce14625caa3c814b97d43d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 26 Jun 2019 15:22:14 -0500 Subject: [PATCH 040/198] WorkspacesDialogView - remove 'Is Shared' checkbox --- .../spark/view/Shell/Workspaces/WorkspacesDialogView.xaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/client/spark/view/Shell/Workspaces/WorkspacesDialogView.xaml b/src/client/spark/view/Shell/Workspaces/WorkspacesDialogView.xaml index d573ac3dd..38f388d91 100644 --- a/src/client/spark/view/Shell/Workspaces/WorkspacesDialogView.xaml +++ b/src/client/spark/view/Shell/Workspaces/WorkspacesDialogView.xaml @@ -45,12 +45,7 @@ - - - - - Shared From 8b4c64e8f4063bac1c31842b88b655cdefcdd568 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 26 Jun 2019 19:34:46 -0400 Subject: [PATCH 041/198] PositionServiceServer not indixes the state based on account_id istead of names --- .../position/PositionServicePNLHelper.cpp | 41 ++++++++----- .../position/PositionServicePNLHelper.h | 2 + .../sparkd/position/PositionServiceServer.cpp | 60 ++++++++++--------- .../sparkd/position/PositionServiceServer.h | 11 ++-- 4 files changed, 67 insertions(+), 47 deletions(-) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 75393ff0c..8c7a15184 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -125,7 +125,8 @@ struct PositionServicePNLHelper::PImpl { void PositionServicePNLHelper::compute_pnl( const std::vector& in_pos, - std::vector& out_pnl, + const std::map& account_map, + std::vector& out_pnl, std::vector& out_account_pnl){ out_account_pnl.clear(); for (const PositionUnit* pu_ptr : in_pos) { @@ -144,29 +145,39 @@ void PositionServicePNLHelper::compute_pnl( pnlu.set_settlement_price(settle); out_pnl.push_back(pnlu); } - _aggregate_account_pnl(out_pnl,out_account_pnl); + _aggregate_account_pnl(out_pnl,account_map,out_account_pnl); } void PositionServicePNLHelper::_aggregate_account_pnl( const std::vector& in_pnl, + const std::map& account_map, std::vector& out_account_pnl){ out_account_pnl.clear(); + if (account_map.size() == 0) + return; std::map acc_pnl; for (const auto& pnlu : in_pnl){ uint32_t acct_id = pnlu.pos().account_id(); - if(acct_id > 0){ - //valid account - auto it=acc_pnl.find(acct_id); - if(it==acc_pnl.end()){ - AccountPNL new_acc; - new_acc.set_account_id(acct_id); - new_acc.set_day_pnl(0.0); - acc_pnl[acct_id]=new_acc; - it=acc_pnl.find(acct_id); - } - AccountPNL& acc_pnl = it->second; - double pnl_dollars = _compute_day_pnl(pnlu); - acc_pnl.set_day_pnl(acc_pnl.day_pnl()+pnl_dollars); + auto it=acc_pnl.find(acct_id); + if(it==acc_pnl.end()){ + AccountPNL new_acc; + new_acc.set_account_id(acct_id); + new_acc.set_day_pnl(0.0); + acc_pnl[acct_id]=new_acc; + it=acc_pnl.find(acct_id); + } + AccountPNL& acc_pnl = it->second; + double pnl_dollars = _compute_day_pnl(pnlu); + acc_pnl.set_day_pnl(acc_pnl.day_pnl()+pnl_dollars); + } + // for accounts with no positions add 0 + for (const auto& p : account_map){ + uint32_t acct_id = p.second; + if(acc_pnl.find(acct_id) == acc_pnl.end()){ + AccountPNL new_acc; + new_acc.set_account_id(acct_id); + new_acc.set_day_pnl(0.0); + acc_pnl[acct_id]=new_acc; } } for(auto& u : acc_pnl) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.h b/src/server/sparkd/position/PositionServicePNLHelper.h index 1e2bf82c0..32190d471 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.h +++ b/src/server/sparkd/position/PositionServicePNLHelper.h @@ -21,11 +21,13 @@ private: // aggregates [sec, account]->pnl tp [account]->pnl void _aggregate_account_pnl( const std::vector& in_pnl, + const std::map& account_map, std::vector& out_account_pnl); public: PositionServicePNLHelper(md::MDClient& client); ~PositionServicePNLHelper(); void compute_pnl(const std::vector& in_pos, + const std::map& account_map, std::vector& out_pnl, std::vector& out_account_pnl); }; diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 09e027718..a2a55c34b 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -33,7 +33,7 @@ struct PositionServiceServer::PImpl { PositionServiceBase::Pnl_account_dataStatefulPublisher pnl_account_publisher; bts::api::orderman::OrderService order_service; bts::api::admin::AdminService admin_service; - std::map> state; + std::map> state; std::map manual_fills; int id; PositionServicePNLHelper pnl_helper; @@ -42,7 +42,8 @@ struct PositionServiceServer::PImpl { std::unique_ptr manual_fills_store ; PositionServiceBase::Manual_fillsStatefulPublisher manual_fills_publisher; api::admin::AdminData admin_data; - + std::map account_map; + PImpl(bts::api::ServiceContext& context, const PositionServiceBase::Position_dataStatefulPublisher& publisher, const PositionServiceBase::Pnl_dataStatefulPublisher& pnl_publisher, @@ -62,7 +63,8 @@ struct PositionServiceServer::PImpl { poll_period_ms(300), manual_fills_store(std::make_unique ("manual_fills")), manual_fills_publisher(manual_fills_publisher), - admin_data() + admin_data(), + account_map() { } }; @@ -81,14 +83,17 @@ me(new PImpl(context, me->order_service.subscribe_fills() | rxcpp::operators::subscribe( [this](auto const& update) { - for (const auto& f : update.removed()) - me->publisher.add_or_update(_on_fill(*f,false)); + if(_valid_account_id(*f)) + me->publisher.add_or_update(_on_fill(*f,false)); for (const auto& f : update.added()) - me->publisher.add_or_update(_on_fill(*f,true)); + if(_valid_account_id(*f)) + me->publisher.add_or_update(_on_fill(*f,true)); for (const auto& f : update.changed()) { - me->publisher.add_or_update(_on_fill(*f.previous(),false)); - me->publisher.add_or_update(_on_fill(*f.current(),true)); + if(_valid_account_id(*f.previous()) && _valid_account_id(*f.current())){ + me->publisher.add_or_update(_on_fill(*f.previous(),false)); + me->publisher.add_or_update(_on_fill(*f.current(),true)); + } } me->publisher.flush(); _compute_pnl_and_publish(); @@ -98,9 +103,9 @@ me(new PImpl(context, rxcpp::operators::subscribe( [this](auto const& update) { for (const auto& r : update.added()) - {me->admin_data = *r;} + {_set_admin_data(*r);} for (const auto& r : update.changed()) - {me->admin_data = *r.current();} + {_set_admin_data(*r.current());} }); me->context.post([this](){_periodic_poll();},me->poll_period_ms); @@ -139,9 +144,7 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - std::string fill_account=_fill_account(f); - PositionUnit& pu=_get_or_add(fill_account,f.internal_account_id(), - f.security_key()); + PositionUnit& pu=_get_or_add(f); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -182,22 +185,17 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, - uint32_t account_id, - uint32_t seckey){ - auto &pu = me->state[acct][seckey]; +PositionUnit& PositionServiceServer::_get_or_add (const Fill& f){ + uint32_t account_id = f.internal_account_id(); + uint32_t seckey = f.security_key(); + auto &pu = me->state[account_id][seckey]; if (pu.record_id() == 0) { // new PU - pu.set_record_id(++me->id); - pu.set_account(acct); - pu.set_security_id(seckey); + pu.set_record_id(++me->id); + pu.set_security_id(seckey); + pu.set_account_id(account_id); + pu.set_account(f.account()); } - // TODO: this is getting uglier. The reason - // for if is that SOD records dont have an - // account id, so if there is no day trades - // this will never be populated - if(pu.account_id()==0) - pu.set_account_id(account_id); return pu; } @@ -237,6 +235,14 @@ void PositionServiceServer::_avg_price_qty(double base_p, std::string PositionServiceServer::_fill_account(const Fill& fill){ return boost::trim_right_copy(fill.account()); } +bool PositionServiceServer::_valid_account_id (const Fill& fill){ + return fill.internal_account_id() != 0; +} +void PositionServiceServer::_set_admin_data(const api::admin::AdminData& admin_data){ + me->admin_data = admin_data; + for (const auto& a : admin_data.accounts()) + me->account_map[a.name()] = a.id(); +} PositionServiceServer::~PositionServiceServer(){ } @@ -345,7 +351,7 @@ void PositionServiceServer::_compute_pnl_and_publish(){ } std::vector pnl; std::vector account_pnl; - me->pnl_helper.compute_pnl(in_pos,pnl,account_pnl); + me->pnl_helper.compute_pnl(in_pos,me->account_map,pnl,account_pnl); for (const auto& u : pnl) me->pnl_publisher.add_or_update(u); for (const auto& u : account_pnl) diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index 4390d6694..dac6f2996 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -7,7 +7,8 @@ namespace bts { namespace md { class MDClient;} namespace api { class ServiceContext; } -namespace api { namespace orderman { class Fill;}} +namespace api { namespace orderman { class Fill;}} +namespace api { namespace admin { class AdminData;}} namespace position { @@ -26,16 +27,16 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { _on_fill(const bts::api::orderman::Fill &fill, bool is_add); // given an account and key, finds (or adds if absent) // the PositionUnit entry - bts::api::position::PositionUnit &_get_or_add(const std::string &acct, - uint32_t account_id, - uint32_t sec_id); + bts::api::position::PositionUnit &_get_or_add(const bts::api::orderman::Fill& fill); void _periodic_poll(); void _compute_pnl_and_publish(); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, double &tot_qty); - static std::string _fill_account(const bts::api::orderman::Fill &fill); + static std::string _fill_account(const bts::api::orderman::Fill &fill); + static bool _valid_account_id (const bts::api::orderman::Fill& fill); + void _set_admin_data (const api::admin::AdminData& admin_data); public: PositionServiceServer(bts::api::ServiceContext &context, From 60e933fca9b1f7f51d68a55a3415ec3bd6b0575d Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 27 Jun 2019 15:20:12 -0400 Subject: [PATCH 042/198] SOD also indexes its data on account_id, Cleaned up Limiter's account_data (there was an overlap, after introducing Loss limit related PNL data) --- src/lib/orderman/actors/SODPosition.cpp | 23 ++++++++++++++++------- src/lib/orderman/actors/SODPosition.h | 3 +-- src/lib/orderman/limiter/LimitStore.cpp | 6 +++--- src/lib/orderman/limiter/LimitStore.h | 20 ++++++++++++-------- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index 18f6d83c4..0612e881f 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -1,6 +1,7 @@ #include "lib/orderman/actors/SODPosition.h" #include "lib/config/config.h" #include "lib/config/protos/orders_fills_cleanup.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/config/protos/toggles.pb.h" #include "lib/logging/logging.h" #include "lib/utils/PBUtils.h" @@ -131,6 +132,7 @@ void SODPosition::_merge_pos(Fill &pos, const Fill &fill) { void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.set_security_key(fill.security_key()); pos.set_account(fill.account()); + pos.set_internal_account_id(fill.internal_account_id()); pos.set_side(side); pos.mutable_timestamp()->set_seconds(_sod_time.tv_sec); pos.mutable_timestamp()->set_nanos(0); @@ -140,14 +142,20 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { pos.set_last_shares(0); } -bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { +bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { - uint32_t seckey = fill.security_key(); - const std::string &acct = fill.account(); - auto acct_it = _sod_map.find(acct); + if (!bts::admin::AdminServiceUtils::has_id(fill.internal_account_id())){ + LOG(persist, Error, "SODPosition::add_fill_to_sod_pos Could not find " + "account_id for fill:{} account:{}", + fill.fill_key(), fill.account()); + return false; + } + uint32_t seckey = fill.security_key(), + account_id = fill.internal_account_id(); + auto acct_it = _sod_map.find(account_id); if (acct_it == _sod_map.end()) - _sod_map[acct] = SecPosMap(); - acct_it = _sod_map.find(fill.account()); + _sod_map[account_id] = SecPosMap(); + acct_it = _sod_map.find(account_id); bts_assert(acct_it != _sod_map.end()); SecPosMap &sec_map = acct_it->second; auto sec_it = sec_map.find(seckey); @@ -165,7 +173,8 @@ bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { else _merge_pos(pos.second, fill); return true; - } else + } + else return false; } diff --git a/src/lib/orderman/actors/SODPosition.h b/src/lib/orderman/actors/SODPosition.h index 860e0cf2d..fd31b8b3d 100644 --- a/src/lib/orderman/actors/SODPosition.h +++ b/src/lib/orderman/actors/SODPosition.h @@ -16,8 +16,7 @@ SecPosMap; class SODPosition{ private: - std::map _sod_map; - std::map _sec_ptr_map; + std::map _sod_map; const bool _enabled; const timeval _sod_time; private: diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 3fbd2d1df..285273139 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -5,10 +5,10 @@ namespace orderman { LimitStore::LimitStore(const bts::api::admin::AdminData &admin_data, const std::map &sec_map) - : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)), - _account_map(bts::admin::AdminServiceUtils::accounts_map(_admin_data)) { + : _admin_data(bts::admin::AdminServiceUtils::sort_limits(admin_data)) { for (const auto& acct : _admin_data.accounts()) - _account_data_map[acct.id()] = AccountData{&acct,os::nan()}; + _account_data_map.insert(std::pair( + acct.id(),AccountData(acct))); for (auto it = sec_map.begin(); it != sec_map.end(); it++) { const api::Security &security = *(it->second); _add_product_entry(security, _admin_data); diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index b79dfeeab..75c1840ce 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -37,12 +37,15 @@ private: class AccountData{ public: - const bts::api::admin::BTSAccount* account; + const bts::api::admin::BTSAccount& account; double curr_day_pnl; + AccountData (const bts::api::admin::BTSAccount& account) + : + account(account), + curr_day_pnl (os::nan()) + {} }; const bts::api::admin::AdminData _admin_data; - // just an easy way to find accounts - const std::map _account_map; // easy account access (uses for loss limit) std::map _account_data_map; // map of user id's vs the user pointer and acccounts @@ -61,8 +64,10 @@ public: // accessors /////////////// //////////////////////////// - bool has_account (AccountID account_id) const - {return _account_map.find(account_id.value()) != _account_map.end();} + bool has_account (AccountID account_id) const{ + return _account_data_map.find(account_id.value()) != + _account_data_map.end(); + } bool has_security (uint32_t sec_id) const {return _sec_map.find(sec_id) != _sec_map.end();} const bts::api::admin::AdminData& admin_data () const {return _admin_data;} @@ -215,10 +220,9 @@ private: Limiter::LimiterQueryResult& rv) const{ rv.result = Limiter::LimiterErrorCode::OK; const auto acct_it = _account_data_map.find(account_id.value()); - if(acct_it != _account_data_map.end() && - acct_it->second.account != nullptr){ + if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - const auto& account = *(account_data.account); + const auto& account = account_data.account; if (account.has_account_loss_limit() && account.account_loss_limit().enforce()){ double pnl = account_data.curr_day_pnl; From ccca85d1c504fb3abd952bc85ee051652c30dbf4 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 27 Jun 2019 15:46:44 -0400 Subject: [PATCH 043/198] loss limit manual test updated --- testing/manual/admin/loss_limit.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/testing/manual/admin/loss_limit.txt b/testing/manual/admin/loss_limit.txt index a9e211c9f..c0531a5c2 100644 --- a/testing/manual/admin/loss_limit.txt +++ b/testing/manual/admin/loss_limit.txt @@ -8,13 +8,15 @@ ex_sim_orders) Pick a future and 2 accounts (lets call them A and B). In the risk admin -a. make sure the clip limits and position limits are high enough for the 2 accounts -b. make sure the loss limit is unchecked for both accounts +a. make sure the clip limits and position limits are high enough for the 2 accounts so they +dont interfare and stop orders +b. for the loss limit enter 1000 for B. 1. Bring up 2 ladders for the contract you selected, each set to one of the accounts above. Bring up the PNL window and set it to Mid. Now from account A enter a 100 lot bid and 100 lot ask (so now we have markets). -2. From Account B cross the sell with a 1 lot buy. Now you should see a negative PNL for B, and a positive for A. +2. From Account B cross the sell with a 1 lot buy. Now you should see a negative PNL for B, and a positive for A +(because we bought at higher than the mid in B, and sold for higher than the mid in A) 3. Go to the risk admin and enter a loss limit for account B (~4 times the PNL for B) @@ -23,5 +25,5 @@ the loss limits, orders should be rejected with a message saying exactly why. 5. Increase the loss limit, and hit it again with a few loser trades. -6. For bonus points, move the markets and try to get B's PNL within the loss limit range. Now enter loser trades -in B and make it hit the limit again. +6. Move the market mid (by moving the 100 lots orders in 1) and try to get B's PNL within the loss limit range. +Now enter more loser trades in B and make it hit the limit again. From 0700e9e80d06a6e9c7c4531950582b6c17554f39 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 29 Jun 2019 16:10:34 -0500 Subject: [PATCH 044/198] SP-89 Port Offset order to new api --- .../orderman/order_factory/OrderFactory.cpp | 4 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 160 ++++++++++++++++++ .../orders/algo/algo_orders/OffsetAlgo.h | 33 ++++ 3 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 461ea669c..0a4922f54 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -19,8 +19,8 @@ #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" -#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" #include "lib/orderman/orders/CompositeOrder.h" @@ -183,7 +183,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, new orderman::AlgoWrapperOrder(std::make_unique())); break; case CustomOrderDefinition::kOffset: - order_ptr.reset(new orderman::OffsetOrder()); + order_ptr.reset(new orderman::AlgoWrapperOrder(std::make_unique())); break; case CustomOrderDefinition::kQueueHolder: order_ptr.reset(new orderman::QueueHolderOrder()); diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp new file mode 100644 index 000000000..f8fb5cdfa --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -0,0 +1,160 @@ +#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using namespace api::orderman; +using namespace std; + +enum class OffsetAlgo::Status { WAITING_FOR_MD, DEPLOYED }; + +struct OffsetAlgo::PImpl { + IAlgoServices *algo; + Status status = Status::WAITING_FOR_MD; + OrderKey child_key = null_order_key(); + ChildTemplate *child_template = nullptr; + Book last_book; + uint32_t tick_offset_on_deploy; +}; + +OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} +OffsetAlgo::~OffsetAlgo() {} +IAlgoServices &OffsetAlgo::algo() const { return *me->algo; } + +OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { + auto &def = serv.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_offset()); + // Validate the offset part of the definition + auto &offset = def.custom_def().offset(); + if (!offset.has_child() && + OrderKey(def.attach_target_order_key()) == null_order_key()) { + return OrderOpResult{ + ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Offset order must have either a child order definition or an " + "order to attach to"}; + } + + me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); + + if (!serv.is_attaching()) { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); + } + + return {}; +} + +void OffsetAlgo::do_launch(IAlgoServices &algo) { + me->algo = &algo; + bts_assert(me->child_template); + me->child_key = + algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + algo.subscribe_book(SecurityKey(algo.security().id())); +} + +void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, + ChildState st) { + me->algo = &algo; + me->child_key = k; + algo.subscribe_book(SecurityKey(algo.security().id())); + on_child_change(k, st); +} + +void OffsetAlgo::do_update(api::orderman::Update const &update) { + LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + // validate update + if (update.has_custom() && !update.custom().has_offset()) { + algo().terminate_error("Invalid update"); + return; + } + // apply update + switch (me->status) { + case Status::WAITING_FOR_MD: + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); + break; + case Status::DEPLOYED: + // only update quantity (tick offset is irrelevant once deployed) + Update child_update; + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + break; + } +} + +void OffsetAlgo::on_book(SecurityKey, Book const &b) { + me->last_book = b; + // log top of book + LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", + algo().order_key().value(), b.side(api::SIDE_BUY)[0].size(), + b.side(api::SIDE_BUY)[0].price(), b.side(api::SIDE_SELL)[0].size(), + b.side(api::SIDE_SELL)[0].price()); + // attempt deploy + if (me->status == Status::WAITING_FOR_MD) + try_deploy(); +} + +void OffsetAlgo::try_deploy() { + bts_assert(me->status == Status::WAITING_FOR_MD); + auto side = algo().definition().side(); + auto &top_psz = me->last_book.side(side)[0]; + if (top_psz.size()) { + // determine/set price + Update child_update; + const double &offset = securities::tick_size(algo().security()).value() * + me->tick_offset_on_deploy; + if (side == bts::api::SIDE_BUY) { + child_update.set_price(top_psz.price() - offset); + } else { + // assume that side == SIDE_SELL (bc the book returned a valid size for + // whatever side this is). + child_update.set_price(top_psz.price() + offset); + } + // set quantity + child_update.set_quantity(algo().quantity().value()); + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} {} ticks " + "away.", + algo().order_key().value(), algo().definition().side(), + algo().quantity().value(), algo().price().value(), + me->tick_offset_on_deploy); + // deploy + algo().update_child(me->child_key, child_update); + algo().set_ladder_visibility(false); + me->status = Status::DEPLOYED; + } else { + // log state (still waiting for md) + LOG(OrderMan, Diag, + "OffsetAlgo order {} still waiting for md. Order: {} {}@ {} ticks " + "away.", + algo().order_key().value(), algo().definition().side(), + algo().quantity().value(), me->tick_offset_on_deploy); + } +} + +void OffsetAlgo::on_child_change(OrderKey, ChildState const &st) { + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) { + case ChildStatus::WORKING: + return; + case ChildStatus::COMPLETED: + algo().complete(); + return; + case ChildStatus::CANCELED: + algo().cancel("Unexpected child cancel"); + return; + } +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h new file mode 100644 index 000000000..14097f638 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +// Offset sends a child-order/algo N ticks away from the top of the book. +// If necessary, it will wait for the market to arrive before shooting the +// child. + +class OffsetAlgo : public IAlgoOrder { + public: + OffsetAlgo(); + ~OffsetAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_book(SecurityKey, Book const &) override; + void on_child_change(OrderKey, ChildState const &) override; + + private: + enum class Status; + struct PImpl; + std::unique_ptr me; + IAlgoServices &algo() const; + void try_deploy(); +}; + +} // namespace orderman +} // namespace bts \ No newline at end of file From 7de7f6e496351238ad3b252f14d6e234934ec8fc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 30 Jun 2019 12:47:05 -0500 Subject: [PATCH 045/198] remove old OffsetOrder.cpp/h, replace with new OffsetAlgo in CMakeDeps --- src/lib/CMakeDeps.cmake | 2 +- .../orders/book_algos/OffsetOrder.cpp | 102 ------------------ .../orderman/orders/book_algos/OffsetOrder.h | 29 ----- 3 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 src/lib/orderman/orders/book_algos/OffsetOrder.cpp delete mode 100644 src/lib/orderman/orders/book_algos/OffsetOrder.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..8d136b5e4 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp deleted file mode 100644 index 6a1a6972d..000000000 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include "OffsetOrder.h" - -#include "lib/orderman/actors/order_manager/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" -#include - -namespace bts { -namespace orderman { - -using namespace api::orderman; - -struct OffsetOrder::PImpl -{ - PImpl() {} - - uint32_t tick_offset_on_deploy; -}; - - -OffsetOrder::OffsetOrder() : me(new PImpl()) {} - -OffsetOrder::~OffsetOrder() {} - -void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ - initial_state.mutable_offset(); - auto const &offset_def = this_def.custom_def().offset(); - *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); -} - - -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { - case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - detach(); - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } - break; - - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - break; - - case ORDER_STATUS_INACTIVE: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } -} - -} -} - diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.h b/src/lib/orderman/orders/book_algos/OffsetOrder.h deleted file mode 100644 index 7b9ad70fb..000000000 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "lib/orderman/orders/book_algos/BookAlgo.h" - -namespace bts { -namespace orderman { - -class OrderStateUpdateEvent; -class BookUpdateEvent; - -//OffsetOrder deploys N ticks away from the initial same-side inside market it's mainly for composition / fat finger - -class OffsetOrder : public BookAlgo -{ -public: - OffsetOrder(); - virtual ~OffsetOrder(); - -protected: - void setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState&, api::orderman::OrderDefinition*) override; - void on_book_update(const bts::orderman::BookUpdateEvent&) override; - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} From 4ada322c5699080ab9bdc565c1ff6a05e4ef9d71 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 30 Jun 2019 12:56:59 -0500 Subject: [PATCH 046/198] bring back OffsetOrder gui in ladder/ticket --- src/client/spark/Orders/OrderDataHelper.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 511dc6711..2abb71e8e 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -605,7 +605,8 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Offset }, // The following spreader types are not yet ready for production use: // CustomOrderDefinition.CustomOneofCase.Dynamic, From 02769479ea6a3604a3676ad111a25fab2b13fe79 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 30 Jun 2019 22:45:29 -0400 Subject: [PATCH 047/198] SP-74 bundled into this (it was a small change) --- src/lib/orderman/limiter/LimitStore.h | 72 ++++++++++++-------- src/lib/orderman/limiter/SecurityLimitNode.h | 11 +-- src/lib/orderman/limiter/SecurityLimitTree.h | 10 +-- 3 files changed, 56 insertions(+), 37 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 75c1840ce..b586617c2 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -149,14 +149,15 @@ public: Limiter::LimiterQueryResult can_send_new_order(AccountID account_id, const api::Security& security, api::Side side, - Quantity quantity) const{ + Quantity quantity, + bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; _loss_limit(account_id, rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); bts_assert(sec_tree != nullptr); - rv = sec_tree->can_send_new_order(account_id, side, quantity); + rv = sec_tree->can_send_new_order(account_id, side, quantity, enforce_clip); if (rv.ok() && security.has_spread()){ // if its rejected we dont need to validate further, // however if its ok and its a spread we need to check @@ -164,7 +165,12 @@ public: for (const api::ContractLeg& leg : security.spread().legs()){ api::Side effective_leg_side = side == api::Side::SIDE_BUY ? leg.side() : LimiterUtils::invert_side(leg.side()); Quantity effective_leg_qty = Quantity (quantity.value() * std::abs(leg.quantity())); - rv = can_send_new_order (account_id, leg.security(), effective_leg_side, effective_leg_qty); + // in the case of a spread with future legs the clip limits + // for the legs are not checked. if the legs are are spreads + // themselves then they are checked (eventually it will recuse + // down to a non spread) + rv = can_send_new_order (account_id, leg.security(), effective_leg_side, effective_leg_qty, + leg.security().has_spread()); if (!rv.ok()) return rv; } @@ -174,22 +180,26 @@ public: Limiter::LimiterQueryResult can_update_order(AccountID account_id, const api::Security& security, api::Side side, - Quantity from, Quantity to) const{ + Quantity from, Quantity to, + bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; + // in case of order modifications, loss limits are only checked + // for size increases if (to.value() > from.value()) _loss_limit(account_id, rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); bts_assert(sec_tree != nullptr); - rv = sec_tree->can_update_order(account_id, side, from, to); + rv = sec_tree->can_update_order(account_id, side, from, to, enforce_clip); // same logic for the spread legs as above if (rv.ok() && security.has_spread()){ for (const api::ContractLeg& leg : security.spread().legs()){ api::Side effective_leg_side = side == api::Side::SIDE_BUY ? leg.side() : LimiterUtils::invert_side(leg.side()); Quantity effective_leg_from_qty = Quantity (from.value() * std::abs(leg.quantity())); Quantity effective_leg_to_qty = Quantity (to.value() * std::abs(leg.quantity())); - rv = can_update_order (account_id, leg.security(), effective_leg_side, effective_leg_from_qty, effective_leg_to_qty); + rv = can_update_order (account_id, leg.security(), effective_leg_side, effective_leg_from_qty, effective_leg_to_qty, + leg.security().has_spread()); if (!rv.ok()) return rv; } @@ -217,33 +227,37 @@ private: const bts::api::admin::AdminData& admin_data); void _set_user_data(); void _loss_limit(AccountID account_id, - Limiter::LimiterQueryResult& rv) const{ - rv.result = Limiter::LimiterErrorCode::OK; + Limiter::LimiterQueryResult& out_res) const{ + // the usual flow should not alter out_res. + // its set to an error state iff : + // i. account is not found + // ii. limit check is enabled but pnl is nan + // iii. limit check is enable and it actually fails const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ - const auto& account_data = acct_it->second; - const auto& account = account_data.account; - if (account.has_account_loss_limit() && - account.account_loss_limit().enforce()){ - double pnl = account_data.curr_day_pnl; - if(os::is_nan(pnl)){ - rv.result = Limiter::LimiterErrorCode::LOSS_LIMIT_BREACHED; - rv.error_msg = "Could not find account PNL"; - } - else{ - double loss_limit = -1.0 * static_cast( - account.account_loss_limit().total_loss_limit()); - if(pnlsecond; + const auto& account = account_data.account; + if (account.has_account_loss_limit() && + account.account_loss_limit().enforce()){ + double pnl = account_data.curr_day_pnl; + if(os::is_nan(pnl)){ + out_res.result = Limiter::LimiterErrorCode::LOSS_LIMIT_BREACHED; + out_res.error_msg = "Could not find account PNL"; + } + else{ + double loss_limit = -1.0 * static_cast( + account.account_loss_limit().total_loss_limit()); + if(pnl _clip_size){ + if (enforce_clip && quantity.value() > _clip_size){ result.result = Limiter::CLIP_SIZE_BREACHED; result.error_msg = fmt::format("Security Clip Size (Max {} Qty {})", _clip_size, quantity.value()); return result; @@ -78,9 +80,10 @@ public: result = _product_node.can_send_new_order(side, quantity); return result; } - Limiter::LimiterQueryResult can_update_order(api::Side side, Quantity from, Quantity to) const{ + Limiter::LimiterQueryResult can_update_order(api::Side side, Quantity from, Quantity to, + bool enforce_clip = true) const{ Limiter::LimiterQueryResult result;result.result=Limiter::OK; - if (to.value() > _clip_size){ + if (enforce_clip && to.value() > _clip_size){ result.result = Limiter::CLIP_SIZE_BREACHED; result.error_msg = fmt::format("Security Clip Size (Max {} Qty {})", _clip_size, to.value()); return result; diff --git a/src/lib/orderman/limiter/SecurityLimitTree.h b/src/lib/orderman/limiter/SecurityLimitTree.h index 61115ad2f..37eba73f5 100644 --- a/src/lib/orderman/limiter/SecurityLimitTree.h +++ b/src/lib/orderman/limiter/SecurityLimitTree.h @@ -50,17 +50,19 @@ public: //////////////////// Limiter::LimiterQueryResult can_send_new_order(AccountID account_id, api::Side side, - Quantity quantity) const{ + Quantity quantity, + bool enforce_clip = true) const{ const SecurityLimitNode* node_ptr = _find_account(account_id.value()); bts_assert(node_ptr!=nullptr); - return node_ptr->can_send_new_order(side, quantity); + return node_ptr->can_send_new_order(side, quantity, enforce_clip); } Limiter::LimiterQueryResult can_update_order(AccountID account_id, api::Side side, - Quantity from, Quantity to) const{ + Quantity from, Quantity to, + bool enforce_clip = true) const{ const SecurityLimitNode* node_ptr = _find_account(account_id.value()); bts_assert(node_ptr!=nullptr); - return node_ptr->can_update_order(side, from, to); + return node_ptr->can_update_order(side, from, to, enforce_clip); } // accessors //////////// From 92f08b89cc9f618ae9b5c7b3de6b7021d96753ba Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 1 Jul 2019 09:01:46 -0400 Subject: [PATCH 048/198] Added a sub test to the clip limits test to verify that spread clip limits are independent of futures --- testing/manual/admin/clip_limits.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/manual/admin/clip_limits.txt b/testing/manual/admin/clip_limits.txt index 97883bd46..98d0751ca 100644 --- a/testing/manual/admin/clip_limits.txt +++ b/testing/manual/admin/clip_limits.txt @@ -19,3 +19,8 @@ Enter a Clip Size of 10. Make sure orders > 10 are rejected and < 10 are allowed 7. Delete the BZ spread clip limits row 8. Verify you can no longer enter BZ spread trades, but you can still enter BZ future trades + +9. Delete all rows for clip limits. Make sure you can not enter a future or spread order. Now +enter a row for Spreads (All) with clip limit 100. Make sure that works correctly, ie allows +spreads <= 100 but does not allow futures. Now enter a row for Futures (All) with clip limit 50. +Verify that this works correctly too. \ No newline at end of file From 94d66a8e994f10324878f5cd7f99e4e567bdf075 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 12:40:16 -0400 Subject: [PATCH 049/198] Add Margin tab to Spark Admin --- src/web/ui/src/Access.fs | 26 +++++++++++++ src/web/ui/src/Accounts/State.fs | 30 ++++++++++++--- src/web/ui/src/Accounts/Types.fs | 14 +++++++ src/web/ui/src/Accounts/View.fs | 62 ++++++++++++++++++++++++++++++- src/web/ui/src/Controls/Fields.fs | 7 +++- 5 files changed, 130 insertions(+), 9 deletions(-) diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 3de9afcff..1c715c97b 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -1,6 +1,7 @@ [] module Access open bts.api.admin +open bts.api.position open bts.api open Elmish open bts.api.orderman @@ -20,6 +21,12 @@ let getAccountOrdersData (admin:IAdminService) (success) (fail) = success (fun e -> fail e.Message) +let getMarginData (span:IMarginService) (account_name: string) (success) (fail) = + Cmd.ofPromise + span.get_excess_liquidity_report + { account = account_name } + success + (fun e -> fail e.Message) module Lens = // type Setter<'a,'b> = { @@ -108,6 +115,25 @@ module Accounts = } } + let emptyMargin : ExcessLiquidityReport = { + account = "ERROR NO DATA" + marginResult = { + account = "ERROR NO DATA" + status = bts.api.position.MarginResult.ResultStatus.Error + portfolioId = "" + settleIndicator = "" + settleQualifier = "" + asOfTime = "" + calculationId = "" + optValue = 0.0 + nonoptValue = 0.0 + maintMargin = 0.0 + initialMargin = 0.0 + } + leverageFactor = 0.0 + cashBalance = 0.0 + excessLiquidity = 0.0 + } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index fcbaac147..d13f9a5b4 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -8,6 +8,7 @@ open Fable.Import open bts.co2 open Fable open Fable.PowerPack +open bts.api.position let isNewAccount (account:BTSAccount) = account.id = 0u && account.isPresent @@ -17,8 +18,12 @@ let currentAccountIsDefault (account:BTSAccount) = (account.id = 0u) let init (context:ServiceContext.ServiceContext) = let admin = AdminService.Create context "" let mdr = MarketDataRelay.Create context "" + let span = MarginService.Create context "" { tab = General admin = admin + marginService = span + marginData = emptyMargin + marginScratch = emptyMargin adminData = None ordersData = [] SelectedOrders = [] @@ -75,7 +80,9 @@ let applySIMUpdate (data:SIMAccountData) = function let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.update_account { completeData = account } - if result.isSuccess then + 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 } + if result.isSuccess && result2.success && result3.success then let! data = admin.get_filtered_admin_data () return UpdateAdminData data else @@ -194,7 +201,18 @@ let update msg (model:Model) : Model * Cmd = | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> - { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.Empty + { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.ofMsg <| GetMarginData + | GetMarginData -> + { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) + | UpdateMarginData newData -> + match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name) with + | true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false -> {model with marginData = newData}, Cmd.Empty + + | SetMarginCashBalance newBalance -> + { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty + | SetMarginCashFactor newFactor -> + { model with marginScratch = { model.marginScratch with leverageFactor = newFactor}},Cmd.Empty | DeleteAccount account -> let mdl = { model with OptionsMenuOpen = ""} match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with @@ -217,6 +235,8 @@ let update msg (model:Model) : Model * Cmd = match tab with | OrdersTab -> { (clearSelection model) with tab = tab }, Cmd.ofMsg GetOrdersData + | MarginTab -> + { (clearSelection model) with tab = tab }, Cmd.ofMsg GetMarginData | _ -> { (clearSelection model) with tab = tab }, Cmd.Empty | Update field -> @@ -227,8 +247,8 @@ let update msg (model:Model) : Model * Cmd = { 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 |] ] + | 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) -> @@ -320,7 +340,7 @@ let update msg (model:Model) : Model * Cmd = | RequestExpirationNames -> model, Cmd.ofExistingPromise (requestExpNames model.mdRelay) id (box>>ErrorOccured) | UpdateExpirationNames (data:ExpirationNameList[]) -> - { model with mdRelayExpNameData = data }, Cmd.Empty + { model with mdRelayExpNameData = data }, Cmd.ofMsg GetMarginData | OpenOptionsMenu acc -> {model with OptionsMenuOpen = acc}, Cmd.Empty | OpenConfirmModal (title, okMessage) -> diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index f249085bf..be4e54e8c 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -5,6 +5,7 @@ open bts.api open bts.api.orderman open JSMap open bts.co2 +open bts.api.position type Tab = | General @@ -13,6 +14,7 @@ type Tab = | ExchangeSettingsTab | ConnectionsTab | OrdersTab + | MarginTab let venues = [| Venue.GLBX; Venue.SIM |] @@ -50,10 +52,19 @@ type Msg = | UpdateOrdersData of OrdersSummary | SelectOrder of bool * OrdersSummaryUnit list | CancelOrders of OrdersSummaryUnit list + // Margin / Span + | GetMarginData + | UpdateMarginData of ExcessLiquidityReport + | SetMarginCashBalance of double + | SetMarginCashFactor of double + | SelectAccount of BTSAccount | DeleteAccount of BTSAccount | AddAccount + | SaveLeverageFactor + | SaveCashBalance | SaveScratch + | ErrorOccured of obj // Tabs | SelectTab of Tab @@ -91,6 +102,9 @@ type Msg = type Model = { tab : Tab admin : IAdminService + marginService: IMarginService + marginData: ExcessLiquidityReport + marginScratch: ExcessLiquidityReport adminData : AdminData option ordersData : OrdersSummaryUnit list SelectedOrders: OrdersSummaryUnit list diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 0b66c54cb..65c0f7925 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -23,9 +23,12 @@ let selectedAccount model = | None -> None let isDirty model = + let marginDirty = model.marginData.cashBalance <> model.marginScratch.cashBalance || + model.marginData.leverageFactor <> model.marginScratch.leverageFactor match selectedAccount model with | Some account -> - account <> model.scratch + account <> model.scratch || + marginDirty | None -> false let saveButton model dispatch = @@ -80,6 +83,58 @@ let generalView model dispatch = accountControls model dispatch ] +let marginView model dispatch = + + let headerRow:TableControl.row = + { + cells = + [ + //TableControl.Cell (str "Account") + TableControl.Cell (str "As Of Time") + //TableControl.Cell (str "Cash Balance") + TableControl.Cell (str "Excess Liquidity") + TableControl.Cell (str "Initial Margin") + //TableControl.Cell (str "Leverage Factor") + TableControl.Cell (str "Maint Margin") + // TableControl.Cell (str "nonoptValue") + // TableControl.Cell (str "optValue") + // TableControl.Cell (str "portfolioId") + // TableControl.Cell (str "settleIndicator") + // TableControl.Cell (str "settleQualifier") + ] + className = "" + header = None + } + + let rws:TableControl.row = + { + cells = + [ + //TableControl.Cell (str model.marginScratch.account) + TableControl.Cell (str model.marginScratch.marginResult.asOfTime) + //TableControl.Cell (str (sprintf "%f" model.marginScratch.cashBalance)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.excessLiquidity)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.initialMargin)) + //TableControl.Cell (str (sprintf "%f" model.marginScratch.leverageFactor)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.maintMargin)) + // TableControl.Cell (str (sprintf "%f" margin.nonoptValue)) + // TableControl.Cell (str (sprintf "%f" margin.optValue)) + // TableControl.Cell (str margin.portfolioId) + // TableControl.Cell (str margin.settleIndicator) + // TableControl.Cell (str margin.settleQualifier) + ] + className = "" + header = None + } + + div [][ + TableControl.createDataTable (Some headerRow) [rws] (span [][]) + Fields.double "Cash Factor:" model.marginScratch.leverageFactor [] (SetMarginCashFactor >> dispatch) + Fields.double "Cash Balance:" model.marginScratch.cashBalance [] (SetMarginCashBalance >> dispatch) + accountControls model dispatch + ] + + let GetSymbolArray (model:Model) = Array.map (fun a -> a.symbol ) model.mdRelayProductData |> Array.distinct @@ -771,7 +826,8 @@ let tabContent model dispatch = | ConnectionsTab, _ -> ConnectionsView model dispatch | CreditLimitsTab, _ -> creditLimitsView model dispatch | ExchangeSettingsTab, _ -> exchangeSettings model dispatch - | OrdersTab, _ -> ordersView model dispatch) + | OrdersTab, _ -> ordersView model dispatch + | marginTab, _ -> marginView model dispatch) ] let isActive account = function @@ -905,6 +961,7 @@ let tabName = function | ConnectionsTab -> "Connections" | ExchangeSettingsTab -> "Exchange Settings" | OrdersTab -> "Orders" + | MarginTab -> "Margin" | other -> string other let tabHeader tab currentTab dispatch = @@ -939,6 +996,7 @@ let root (model:Model) dispatch = // tabHeader CreditLimits model.tab dispatch (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model.tab dispatch) else span [][] ) (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model.tab dispatch) else span [][] ) + (if (Array.length data.accounts > 0) then (tabHeader MarginTab model.tab dispatch) else span [][] ) ] ] tabContent model dispatch diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 2fbd6cd2f..719e7705d 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -134,6 +134,9 @@ let password (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = let number (lbl:string) (dv:int) (attrs:IHTMLProp list) onchange = text lbl (string dv) attrs (int>>onchange) +let double (lbl:string) (dv:double) (attrs:IHTMLProp list) onchange = + text lbl (string dv) attrs (double>>onchange) + let enumSelect<'a> (lbl:string) (dv:'a) (values:'a[]) (attrs:IHTMLProp list) (onchange:'a->unit) = let vals = match (Array.tryFindIndex (fun elm -> unbox elm = unbox dv) values) with | None -> Array.concat [[| dv |]; values] @@ -194,7 +197,7 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = - let dis = + let dis = match is_disabled with | None -> false | Some a -> a @@ -214,7 +217,7 @@ let mapSelectEx (lbl:string) (options:Map) (defaultText:string op Label lbl div [ ClassName "control" ] [ - div [ ClassName "select"] + div [ ClassName "select"] [ select [ Value dv From ab255c8777759c3b9e80bece91579d91e312ce31 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 12:51:17 -0400 Subject: [PATCH 050/198] update ui.fsproj --- src/web/ui/src/ui.fsproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index 7538454d3..cf28db353 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -28,6 +28,7 @@ + From bc3418734fc4a73722ffbec8a51b53049af509e1 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 13:22:27 -0400 Subject: [PATCH 051/198] Span Columns and Formatting --- src/web/ui/src/Accounts/View.fs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 65c0f7925..4b0d9d240 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -91,13 +91,13 @@ let marginView model dispatch = [ //TableControl.Cell (str "Account") TableControl.Cell (str "As Of Time") - //TableControl.Cell (str "Cash Balance") - TableControl.Cell (str "Excess Liquidity") + TableControl.Cell (str "Leverage Factor") + TableControl.Cell (str "Cash Balance") + TableControl.Cell (str "Non Opt Value") + TableControl.Cell (str "Opt Value") TableControl.Cell (str "Initial Margin") - //TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Maint Margin") - // TableControl.Cell (str "nonoptValue") - // TableControl.Cell (str "optValue") + TableControl.Cell (str "Excess Liquidity") // TableControl.Cell (str "portfolioId") // TableControl.Cell (str "settleIndicator") // TableControl.Cell (str "settleQualifier") @@ -111,14 +111,14 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str model.marginScratch.account) - TableControl.Cell (str model.marginScratch.marginResult.asOfTime) - //TableControl.Cell (str (sprintf "%f" model.marginScratch.cashBalance)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.excessLiquidity)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.initialMargin)) - //TableControl.Cell (str (sprintf "%f" model.marginScratch.leverageFactor)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.maintMargin)) - // TableControl.Cell (str (sprintf "%f" margin.nonoptValue)) - // TableControl.Cell (str (sprintf "%f" margin.optValue)) + TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) // TableControl.Cell (str margin.settleQualifier) @@ -129,8 +129,8 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.double "Cash Factor:" model.marginScratch.leverageFactor [] (SetMarginCashFactor >> dispatch) - Fields.double "Cash Balance:" model.marginScratch.cashBalance [] (SetMarginCashBalance >> dispatch) + Fields.number "Leverage Factor:" (int model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) + Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] From beff060a4f242251974fe69414f1279f03b945c6 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 14:27:44 -0400 Subject: [PATCH 052/198] Update unchanged margin values --- src/web/ui/src/Accounts/State.fs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index d13f9a5b4..e8a66f431 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -201,13 +201,18 @@ let update msg (model:Model) : Model * Cmd = | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> - { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.ofMsg <| GetMarginData + { (clearSelection model) with previousScratch = model.scratch; scratch = account; marginScratch = emptyMargin }, Cmd.ofMsg <| GetMarginData | GetMarginData -> { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) | UpdateMarginData newData -> - match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name) with - | true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false -> {model with marginData = newData}, Cmd.Empty + match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), + (model.marginData.leverageFactor = model.marginScratch.leverageFactor), + (model.marginData.cashBalance = model.marginScratch.cashBalance) with + | true, _, _ -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false, true, true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, Cmd.Empty + | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, Cmd.Empty + | false, false, false -> {model with marginData = newData}, Cmd.Empty | SetMarginCashBalance newBalance -> { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty From 90fd5bd382b64e4ac198a7aa0e811c9fc9e49737 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 14:52:40 -0400 Subject: [PATCH 053/198] Handle save errors better --- src/web/ui/src/Accounts/State.fs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e8a66f431..426db2899 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -82,11 +82,16 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promi 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 } - if result.isSuccess && result2.success && result3.success then + + if (result.isSuccess && result2.success && result3.success) then let! data = admin.get_filtered_admin_data () return UpdateAdminData data + elif (not result.isSuccess) then + return (ErrorOccured (sprintf "Error saving account: %s" result.errorText)) + elif (not result2.success) then + return ErrorOccured (sprintf "Error saving leverage factor: %s" result2.errorMessage) else - return ErrorOccured (sprintf "Error saving account: %s" result.errorText) + return ErrorOccured (sprintf "Error saving cash balence: %s" result3.errorMessage) } let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { From 7ce8f1ed97712fe4d992c7533b93528d3c04c8bf Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 1 Jul 2019 14:57:00 -0400 Subject: [PATCH 054/198] Updated release notes --- doc/user/content/release_notes/_index.md | 3 +++ src/server/sparkd/CMakeDeps.cmake | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f9a04d11e..88eeeb4e6 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,9 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.5.0 +### User Visible Changes + - Added loss limit risk check ## 2.4.0 ### User Visible Settings - In the ladder, changed the last trade column to accumulate successive trades at the same price diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 440b764f3..ff12df496 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1,5 +1 @@ -<<<<<<< HEAD -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) -======= -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) ->>>>>>> master +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file From 3950e5b63495abdd2dcbb51a020b77b3fa714dd7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 1 Jul 2019 15:27:29 -0400 Subject: [PATCH 055/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f9a04d11e..f01abe696 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,10 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.5.0 +### User Visible Settings + - Made algos, synthetics and user names private so that multiple users can share a single system privately. + ## 2.4.0 ### User Visible Settings - In the ladder, changed the last trade column to accumulate successive trades at the same price From aea233d537e09a0aef29972e75aa3569027ca1dc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 1 Jul 2019 15:35:07 -0400 Subject: [PATCH 056/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f01abe696..82bce6188 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,7 +7,8 @@ insert_anchor_links = "right" ## 2.5.0 ### User Visible Settings - Made algos, synthetics and user names private so that multiple users can share a single system privately. - + - Allowed the mini order book defaults for column widths to be changed from the mini order book + - Allowed the mini order book to shrink to the minimum size that will be needed to display the selected columns ## 2.4.0 ### User Visible Settings - In the ladder, changed the last trade column to accumulate successive trades at the same price From a6ad70fc05f8a4060c23cb493e7649aac14d66c7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:46:03 -0400 Subject: [PATCH 057/198] SP-28 Algo unit test utils --- src/lib/md/relay/RelayRecorder.cpp | 51 ++- src/lib/md/relay/RelayRecorder.h | 5 +- .../orders/algo/IBeforeLaunchAlgoServices.cpp | 7 + .../orders/algo/IBeforeLaunchAlgoServices.h | 3 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 374 ++++++++++++++++++ .../algo/algo_orders/tests/AlgoTestDriver.h | 140 +++++++ src/lib/utils/ValueWrapper.h | 1 + 7 files changed, 570 insertions(+), 11 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index d2a094b52..a15652138 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -11,6 +11,7 @@ #include "lib/md/protos/co2.pb.h" #include "lib/md/SecurityIDRecorder.h" #include "lib/config/protos/system.pb.h" +#include "lib/config/protos/MarketData.pb.h" #include "lib/utils/bts_chrono.h" #include @@ -173,7 +174,7 @@ void replay_file(const std::string& filename, IRelayWriter& writer, int32_t nagg } while (loop); } -void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { +bool replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop) { // split up url parts size_t http_len = BTS_ARRAYSIZE("http://") - 1; auto after_host = url.find('/', http_len); @@ -184,21 +185,53 @@ void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) filename = os::sparkdata_path("data/replay/") + filename; utils::download_file_if_newer(host, path, filename); if (boost::filesystem::exists(filename)) { - replay_file(filename, writer, naggle_ms, true); + replay_file(filename, writer, naggle_ms, loop); + return true; + } + return false; +} + +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop) { + if (!replay_url(url, writer, naggle_ms, loop)) { + const auto fallback = config::get().fallback(); + if (boost::filesystem::exists(fallback)) { + replay_file(fallback, writer, naggle_ms, loop); + } } } -void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { - // loops forever - replay_url(url, writer, naggle_ms); - // If it returns it means it failed to download or play cached - const auto fallback = config::get().fallback(); - if (boost::filesystem::exists(fallback)) { - replay_file(fallback, writer, naggle_ms); +struct SecurityExtractorDone : public std::bad_exception {}; +struct SecurityExtractor : public IRelayWriter { + size_t _count; + std::function _cb; + std::set _keys; + SecurityExtractor(std::function& cb, size_t count) + : _count(count), _cb(cb), _keys() { } + ~SecurityExtractor() override {}; + void write(const co2::MDReply& data, bool*) { + for (auto const &ch : data.channels()) { + for (auto const &cr : ch.updates()) { + if (cr.has_security() && _keys.find(cr.security().id()) == _keys.end()) { + _keys.insert(cr.security().id()); + _cb(cr.security()); + } + } + } + if (_keys.size() >= _count) { + throw SecurityExtractorDone(); + } } +}; +void get_securities_from_replay(std::function cb) { + SecurityExtractor extractor(cb, 100); + auto url = config::get().url(); + try { + replay_url_with_fallback(url, extractor, 0, false); + } catch(const SecurityExtractorDone&) { } } + shared_ptr mkrelayproducer(bool shared); /*this is the public one*/ diff --git a/src/lib/md/relay/RelayRecorder.h b/src/lib/md/relay/RelayRecorder.h index d70dd4757..da6286340 100644 --- a/src/lib/md/relay/RelayRecorder.h +++ b/src/lib/md/relay/RelayRecorder.h @@ -29,9 +29,10 @@ void print_recording(const std::string&); void unprint_recording(const std::string& src, const std::string& dest); void trace_recording(const std::string& file, security_key key); void replay_recording(const std::string&, int32_t delay_ms, const std::string fallback=""); -void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); -void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); +bool replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop=true); +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop=true); void replay_file(const std::string& filename, IRelayWriter& writer, int32_t naggle_ms, bool loop=false); +void get_securities_from_replay(std::function); }}//namespace diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp index 87f753e91..426290ef4 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp +++ b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp @@ -1 +1,8 @@ #include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +namespace bts { +namespace orderman { + +TimeStamp IBeforeLaunchAlgoServices::get_time() const { return Timer::now(); } + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h index 733f60d7c..3756971db 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h +++ b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h @@ -3,6 +3,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/utils/bts_chrono.h" namespace bts { namespace orderman { @@ -42,6 +43,8 @@ class IBeforeLaunchAlgoServices { virtual ChildTemplate & make_child_template(api::orderman::OrderDefinition const &child_def, size_t reserve = 1) = 0; + + virtual TimeStamp get_time() const; }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp new file mode 100644 index 000000000..2791ac953 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -0,0 +1,374 @@ +#include "AlgoTestDriver.h" +#include "lib/md/relay/RelayRecorder.h" +#include "catch/catch.hpp" +#include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/logging/logging.h" + +#include +#include + +namespace bts { +namespace orderman { +namespace test { +using namespace api::orderman; + +constexpr bool has_flag(ATDFlags prop, ATDFlags flag) { + return ((uint32_t)prop & (uint32_t)flag) == (uint32_t)flag; +} + +const std::map& get_some_securities() { + static std::map results; + if (results.empty()) { + md::get_securities_from_replay([&](const api::Security& s) { + results.insert(std::make_pair(SecurityKey(s.id()), s)); + }); + } + return results; +} + + +struct RecursionCounter { + size_t depth = 0; + virtual void flush() = 0; +}; +struct RecursionGuard { + RecursionGuard(RecursionCounter& c) : counter(c) { + counter.depth += 1; + REQUIRE(counter.depth < 100); + } + ~RecursionGuard() { + counter.depth -= 1; + if (counter.depth == 0) { counter.flush(); } + } +private: + RecursionCounter& counter; +}; + +struct AlgoTestDriverBase::Impl : public RecursionCounter { + IAlgoOrder& algo; + api::orderman::OrderDefinition definition; + Price price; + Quantity size; + ATDFlags flags; + TimeStamp now; + api::Security security; + OrderKey order_key, parent_key; + + AlgoState state; + std::vector orders; + + std::map books; + std::map book_subs; + bool sub_timer = false; + + // Callbacks + std::vector> on_child_launching; + std::vector> on_child_changing; + std::vector> on_child_changed; + + Impl(IAlgoOrder& o) : algo(o) {} + + OrderKey next_order() { + _next_order.value() += 1; + return _next_order; + } + RecursionGuard recusion_guard() { return {*this}; } + + void flush() override; + bool flushing = false; + // child changes must be asyncronous + std::vector> deferred; + void defer_child_change(OrderKey k, ChildState cs) { deferred.push_back(std::make_tuple(k,cs)); } + +private: + OrderKey _next_order = OrderKey(99); +}; + +void AlgoTestDriverBase::Impl::flush() { + if(flushing) return; + flushing = true; + for (const auto& update : deferred) { + algo.on_child_change(std::get(update), std::get(update)); + } + deferred.clear(); + flushing = false; +} + +AlgoTestDriverBase::AlgoTestDriverBase( + IAlgoOrder& algo, + const api::orderman::OrderDefinition& def, + Price price, Quantity size, + ATDFlags flags) + : me(new Impl(algo)) { + + me->definition = def; + me->price = price; + me->size = size; + me->flags = flags; + me->now = Timer::now(); + me->state = AlgoState::CREATED; + + auto securities = get_some_securities(); + REQUIRE(securities.size() > 0); + me->security = securities.begin()->second; + + me->order_key = me->next_order(); + if (has_flag(flags, ATDFlags::HAS_PARENT)) { + me->parent_key = me->next_order(); + } +} + +AlgoTestDriverBase::~AlgoTestDriverBase() {} + +OrderOpResult AlgoTestDriverBase::before_launch() { + REQUIRE(me->state == AlgoState::CREATED); + me->state = AlgoState::READY; + return me->algo.do_before_launch(*this); +} + +void AlgoTestDriverBase::launch() { + REQUIRE(me->state == AlgoState::READY); + me->algo.do_launch(*this); + me->state = AlgoState::RUNNING; +} + +void AlgoTestDriverBase::launch_attached(OrderKey key, ChildState state) { + REQUIRE(me->state == AlgoState::READY); + me->algo.do_launch_attached(*this, key, state); + me->state = AlgoState::RUNNING; +} +void AlgoTestDriverBase::do_update(const api::orderman::Update& update) { + auto guard = me->recusion_guard(); + REQUIRE(me->state == AlgoState::RUNNING); + me->algo.do_update(update); +} + +void AlgoTestDriverBase::update_book(const Book& book) { + auto key = book.security_key(); + me->books[key] = book; + auto iter = me->book_subs.find(key); + if (iter != me->book_subs.end()) { + me->algo.on_book(key, book); + } +} +void AlgoTestDriverBase::advance_time(Duration d) { + me->now += d; + if (me->sub_timer) { + me->algo.on_timer(); + } +} + +const std::vector& AlgoTestDriverBase::child_orders() const { + return me->orders; +} + +AlgoState AlgoTestDriverBase::state() const { + return me->state; +} + +void AlgoTestDriverBase::fill(OrderKey k, Price price, Quantity qty) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == k) { + REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); + for (const auto& cb : me->on_child_changing) cb(child); + auto old = child; + + auto total_price = child.cstate.avg_price.value() * child.cstate.total_fills.value(); + total_price += price.value() * qty.value(); + + child.cstate.last_fills = qty; + child.cstate.total_fills.value() += qty.value(); + child.cstate.last_price = price; + child.cstate.avg_price = Price { total_price / child.cstate.total_fills.value() }; + + if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { + child.cstate.status = ChildStatus::COMPLETED; + } + + for (const auto& cb : me->on_child_changed) cb(old, child); + // No defer because this is called from outside + if (child.subscribed) me->algo.on_child_change(k, child.cstate); + break; + } + } +} + +const ChildOrder* largest_order(const std::vector& orders) { + uint32_t sz = 0; + const ChildOrder* result = nullptr; + for (const auto& order : orders) { + auto available = + order.cstate.quantity.value() - order.cstate.total_fills.value(); + if (order.cstate.status == ChildStatus::WORKING && + available > sz) { + sz = available; + result = ℴ + } + } + return result; +} +void AlgoTestDriverBase::fill(Price p, Quantity q) { + auto to_fill = q.value(); + while(to_fill > 0) { + auto order = largest_order(this->child_orders()); + REQUIRE(order); + auto available = (order->cstate.quantity.value() - order->cstate.total_fills.value()); + if (available >= to_fill) { + this->fill(order->key, p, Quantity {to_fill}); + return; + } + else { + this->fill(order->key, p, Quantity {available}); + to_fill -= available; + } + } +} + +void AlgoTestDriverBase::on_child_launching(std::function&& cb) { + me->on_child_launching.push_back(cb); +} +void AlgoTestDriverBase::on_child_changing(std::function&& cb) { + me->on_child_changing.push_back(cb); +} +void AlgoTestDriverBase::on_child_changed(std::function&& cb) { + me->on_child_changed.push_back(cb); +} + +// +// Utility + +ChildOrder mkchild(OrderKey key, Price price, Quantity qty, bool sub) { + ChildOrder result = {}; + result.key = key; + result.cstate.price = price; + result.cstate.quantity = qty; + result.subscribed = sub; + return result; +} + +// +// IBeforeLaunch + +const api::orderman::OrderDefinition& AlgoTestDriverBase::definition() const { return me->definition; } +const api::Security& AlgoTestDriverBase::security() const { return me->security; } +OrderKey AlgoTestDriverBase::order_key() const { return me->order_key; } +OrderKey AlgoTestDriverBase::parent_order_key() const { return me->parent_key; } +const api::Security* AlgoTestDriverBase::lookup_security(SecurityKey key) const { + auto s = get_some_securities(); + auto iter = s.find(key); + if (iter != s.end()) { + return &iter->second; + } + return nullptr; +} +bool AlgoTestDriverBase::is_attaching() const { return has_flag(me->flags, ATDFlags::IS_ATTACHING); } +ChildTemplate& AlgoTestDriverBase::make_child_template(const api::orderman::OrderDefinition&, size_t) { + ChildTemplate* t = nullptr; + return *t; +} +TimeStamp AlgoTestDriverBase::get_time() const { return me->now; } + +// +// IAlgoServices + +Price AlgoTestDriverBase::price() const { return me->price; } +Quantity AlgoTestDriverBase::quantity() const { return me->size; } +Quantity AlgoTestDriverBase::total_fills() const { return Quantity(0); } + +void AlgoTestDriverBase::subscribe_book(SecurityKey key){ + me->book_subs[key] = true; + auto iter = me->books.find(key); + if (iter != me->books.end()) { + me->algo.on_book(key, iter->second); + } +} +void AlgoTestDriverBase::unsubscribe_book(SecurityKey key) { + me->book_subs.erase(key); +} +void AlgoTestDriverBase::subscribe_child_change(OrderKey k) { + for (auto& child : me->orders) { + if (child.key == k) { + child.subscribed = true; + } + } +} +void AlgoTestDriverBase::unsubscribe_child_change(OrderKey k) { + for (auto& child : me->orders) { + if (child.key == k) { + child.subscribed = false; + } + } +} +void AlgoTestDriverBase::subscribe_timer() { me->sub_timer = true; } +void AlgoTestDriverBase::unsubscribe_timer() { me->sub_timer = false; } + +OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity qty, bool sub) { + OrderKey key = me->next_order(); + me->orders.push_back( + mkchild(key, price, qty, sub)); + for(const auto& cb : me->on_child_launching) cb(key); + return key; +} +OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & od, Price price, Quantity qty, bool sub) { + return launch_child(make_child_template(od), price, qty, sub); +} +void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const & update) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == key) { + for (const auto& cb : me->on_child_changing) cb(child); + auto old = child; + if (update.price() != 0) { + child.cstate.price = Price(update.price()); + } + if (update.quantity() != 0) { + child.cstate.quantity = Quantity(update.quantity()); + } + if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { + child.cstate.status = ChildStatus::COMPLETED; + } + for (const auto& cb : me->on_child_changed) cb(old, child); + + if (child.subscribed) { + me->defer_child_change(key, child.cstate); + } + } + } +} +void AlgoTestDriverBase::cancel_child(OrderKey key) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == key) { + REQUIRE(child.cstate.status != ChildStatus::CANCELED); + for (const auto& cb : me->on_child_changing) cb(child); + auto before = child; + child.cstate.status = ChildStatus::CANCELED; + for (const auto& cb : me->on_child_changed) cb(before, child); + if(child.subscribed) { + me->defer_child_change(key, child.cstate); + } + break; + } + } +} +void AlgoTestDriverBase::detach_child(OrderKey key) { + std::remove_if(me->orders.begin(), me->orders.end(), [key](const auto& order) { return order.key == key; }); +} +void AlgoTestDriverBase::detach_all_children() { + me->orders.clear(); +} +void AlgoTestDriverBase::cancel(std::string const &) { + me->state = AlgoState::CANCELED; +} +void AlgoTestDriverBase::terminate_error(std::string const &) { + me->state = AlgoState::TERMINATED; +} +void AlgoTestDriverBase::complete() { + me->state = AlgoState::COMPLETED; +} +void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } +void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } + +}}}//namespace \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h new file mode 100644 index 000000000..b475e8941 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -0,0 +1,140 @@ +#pragma once +#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/md/IntPrice.h" +#include +#include +#include + +namespace bts { +namespace orderman { +namespace test { + +const std::map& get_some_securities(); + +enum class ATDFlags { + NONE = 0, + IS_ATTACHING = 1, + HAS_PARENT = 2, +}; + +enum class AlgoState { + CREATED, + // before_lauh() -> + READY, + // launch() -> + RUNNING, + CANCELED, + TERMINATED, + COMPLETED +}; + +struct ChildOrder { + OrderKey key; + bool subscribed; + ChildState cstate; + uint32_t active_qty() const { + return cstate.status == ChildStatus::WORKING ? + cstate.quantity.value() - cstate.total_fills.value() : 0; + } +}; + +class AlgoTestDriverBase : private IAlgoServices { + struct Impl; + std::unique_ptr me; + + public: + AlgoTestDriverBase( + IAlgoOrder& algo, + const api::orderman::OrderDefinition& def, + Price price, Quantity size, + ATDFlags flags=ATDFlags::NONE); + ~AlgoTestDriverBase(); + + // + // Expose some things from IAlgoServices + const api::Security& security() const override; + Price price() const override; + Quantity quantity() const override; + Quantity total_fills() const override; + + // + // Change state + + OrderOpResult before_launch(); + void launch(); + void launch_attached(OrderKey, ChildState); + void do_update(const api::orderman::Update&); + + void update_book(const Book&); + void advance_time(Duration); + + // + // Inspection methods + const std::vector& child_orders() const; + AlgoState state() const; + + // Fills for this specific order + void fill(OrderKey, Price, Quantity); + // Fill this quantity, start with the largest child order + void fill(Price, Quantity); + + void on_child_launching(std::function&&); + void on_child_changing(std::function&&); + void on_child_changed(std::function&&); + + + +private: + + // + // IBeforeLaunchAlgoServices + const api::orderman::OrderDefinition& definition() const override; + // const api::Security& security() const override; + OrderKey order_key() const override; + OrderKey parent_order_key() const override; + const api::Security* lookup_security(SecurityKey) const override; + bool is_attaching() const override; + ChildTemplate& make_child_template(const api::orderman::OrderDefinition& child_def, size_t reserve = 1) override; + TimeStamp get_time() const override; + + // + // IAlgoServices + void subscribe_book(SecurityKey)override; + void unsubscribe_book(SecurityKey) override; + void subscribe_child_change(OrderKey) override; + void unsubscribe_child_change(OrderKey) override; + void subscribe_timer() override; + void unsubscribe_timer() override; + + OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) override; + OrderKey launch_child(api::orderman::OrderDefinition const &, Price, + Quantity, bool) override; + void update_child(OrderKey , api::orderman::Update const &) override; + void cancel_child(OrderKey) override; + void detach_child(OrderKey) override; + void detach_all_children() override; + + void cancel(std::string const &) override; + void terminate_error(std::string const &) override; + void complete() override; + void set_ladder_visibility(bool) override; + void update_fill_state(Quantity , Price) override; + +}; + +template +struct AlgoTestDriver : public AlgoTestDriverBase +{ + // Avoids mutual ownership problem + Algo _algo; + AlgoTestDriver( + const api::orderman::OrderDefinition& def, + const md::IntPrice& price, Quantity size, + ATDFlags flags=ATDFlags::NONE) + : AlgoTestDriverBase(_algo, def, Price {price.price()}, size, flags), _algo() + { } + const Algo& algo() const { return _algo; } +}; + +}}}//namespace \ No newline at end of file diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 6c8b8692b..5df5e2ace 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -24,6 +24,7 @@ public: bool operator==(ValueWrapper const&v) const {return _v == v._v;} bool operator!=(ValueWrapper const&v) const {return _v != v._v;} bool operator<(ValueWrapper const&v) const {return _v < v._v;} + bool operator>(ValueWrapper const&v) const {return _v > v._v;} ValueT const& value() const {return _v;} ValueT & value() {return _v;} private: From 226fcc279bc9ddbdbc76607692c32f40720ffcb3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:46:20 -0400 Subject: [PATCH 058/198] Utils for manipulating dynamic algos --- .../orderman_utils/orderman_utils.cpp | 63 +++++++++++++++++++ .../orderman/orderman_utils/orderman_utils.h | 61 ++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 8099a0b5a..cd26ab515 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -49,5 +49,68 @@ bool should_forward_attachment( } } +api::orderman::DynamicOrderParam dynamic_parameter(int32_t v) { + api::orderman::DynamicOrderParam res; + res.set_as_int32(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(uint32_t v) { + api::orderman::DynamicOrderParam res; + res.set_as_uint32(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(double v) { + api::orderman::DynamicOrderParam res; + res.set_as_double(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(std::string v) { + api::orderman::DynamicOrderParam res; + res.set_as_string(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(bool v) { + api::orderman::DynamicOrderParam res; + res.set_as_bool(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::CustomOrderDefinition& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_order_def()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderArray& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_array()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderStruct& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_struct()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderEnumerated& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_enumerated()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_array(const std::vector& v) { + api::orderman::DynamicOrderArray a; + for (const auto& item : v) { + a.add_element()->CopyFrom(item); + } + return dynamic_parameter(a); +} +api::orderman::DynamicOrderParam dynamic_map( + const std::vector>& v) { + DynamicOrderStruct res; + auto& map = *res.mutable_field(); + for (const auto& tup : v) { + map[std::get(tup)] = std::get<1>(tup); + } + return dynamic_parameter(res); +} + + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib/orderman/orderman_utils/orderman_utils.h index 50b97ce43..435c5bbb1 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib/orderman/orderman_utils/orderman_utils.h @@ -1,4 +1,6 @@ #include "lib/api/services/OrderService.pb.h" +#include +#include namespace bts { namespace orderman { @@ -30,5 +32,64 @@ inline bool is_parent_order(const bts::api::orderman::OrderRecord &ord) { bool should_forward_attachment(const api::orderman::CustomOrderDefinition &def); bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase) ; + +api::orderman::DynamicOrderParam dynamic_parameter(int32_t); +api::orderman::DynamicOrderParam dynamic_parameter(uint32_t); +api::orderman::DynamicOrderParam dynamic_parameter(double); +api::orderman::DynamicOrderParam dynamic_parameter(std::string); +api::orderman::DynamicOrderParam dynamic_parameter(bool); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::CustomOrderDefinition&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderArray&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderStruct&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderEnumerated&); +api::orderman::DynamicOrderParam dynamic_array(const std::vector&); +api::orderman::DynamicOrderParam dynamic_map( const std::vector>&); + +template +std::optional get_if(const api::orderman::DynamicOrderParam&) { return nullptr; } + +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsInt32 ? std::optional{p.as_int32()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsUint32 ? std::optional{p.as_uint32()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsDouble ? std::optional{p.as_double()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsBool ? std::optional{p.as_bool()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsOrderDef ? std::optional{p.as_order_def()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsArray ? std::optional{p.as_array()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsStruct ? std::optional{p.as_struct()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsEnumerated ? std::optional{p.as_enumerated()} : std::nullopt; +} + + +template +std::optional get_if(const google::protobuf::Map& map, const std::string& key) { + auto c = map.find(key); + if (c != map.end()) { + return get_if(c->second); + } + return std::nullopt; +} + } // namespace orderman } // namespace bts From 0dcdbd540ecf65dbcca807b968de7205a8149f58 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:47:56 -0400 Subject: [PATCH 059/198] SP-87 Splitter algo --- .gitignore | 1 + src/lib/api/services/OrderService.proto | 11 +- src/lib/md/IntPrice.h | 6 +- src/lib/md/PriceSize.h | 2 +- .../orderman/events/OrderStateUpdateEvent.h | 3 + .../orderman/order_factory/OrderFactory.cpp | 5 + .../orders/algo/algo_orders/SplitterAlgo.cpp | 219 ++++++++ .../orders/algo/algo_orders/SplitterAlgo.h | 32 ++ .../algo/algo_orders/tests/splitter_tests.cpp | 526 ++++++++++++++++++ 9 files changed, 800 insertions(+), 5 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp diff --git a/.gitignore b/.gitignore index 7c976336d..98475e215 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 1908ff7bf..f0cb044fb 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -101,6 +101,7 @@ message CustomOrderDefinition OCOOrderDefinition oco = 25; PricerOrderDefinition pricer = 26; CompositeOrderDefinition composite = 27; + SplitterOrderDefinition splitter = 29; DynamicOrderDefinition dynamic = 1000; } @@ -204,6 +205,12 @@ message CompositeOrderDefinition { uint32 algo_template_key = 1; CustomOrderDefinition definition = 2; } +message SplitterOrderDefinition { + uint32 max_order_qty = 1; + uint32 exposed_qty = 2; + // uint32 target_qty = 3; + CustomOrderDefinition child = 10; +} message DynamicOrderDefinition { string dynamic_order_type = 1; map order_params = 2; @@ -253,9 +260,10 @@ message OrderState { TriggerOrderState trigger = 21; CoverOrderState cover = 22; OffsetOrderState offset = 24; - QueueHolderState queue_holder = 30; OCOOrderState oco = 25; PricerOrderState pricer = 26; + QueueHolderState queue_holder = 30; + SplitterOrderState splitter = 31; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } @@ -334,6 +342,7 @@ message OCOOrderState {} message PricerOrderState {} message DynamicOrderState {} message QueueHolderState {} +message SplitterOrderState {} enum OrderStatus { diff --git a/src/lib/md/IntPrice.h b/src/lib/md/IntPrice.h index dfca4e73f..22822745b 100644 --- a/src/lib/md/IntPrice.h +++ b/src/lib/md/IntPrice.h @@ -34,9 +34,9 @@ class IntPrice { #endif public: - IntPrice() : _mantissa(0), _exponent(127) {/*nan*/} - IntPrice(int64_t mantissa, int8_t exponent) : _mantissa(mantissa), _exponent(exponent) {} - IntPrice(const IntPrice& other) : _mantissa(other._mantissa), _exponent(other._exponent) {} + constexpr IntPrice() : _mantissa(0), _exponent(127) {/*nan*/} + constexpr IntPrice(int64_t mantissa, int8_t exponent) : _mantissa(mantissa), _exponent(exponent) {} + constexpr IntPrice(const IntPrice& other) : _mantissa(other._mantissa), _exponent(other._exponent) {} bool operator==(const IntPrice& other) const { if(_exponent == other._exponent) { diff --git a/src/lib/md/PriceSize.h b/src/lib/md/PriceSize.h index e10a90365..3a72de6b1 100644 --- a/src/lib/md/PriceSize.h +++ b/src/lib/md/PriceSize.h @@ -77,7 +77,7 @@ public: extern PriceSize NO_MARKET; static_assert(sizeof(PriceSize) == 16, "PriceSize should be small"); -template +template PriceSize PriceSize_from_double(double price, Size size) { if (size == 0 || os::is_nan(price)) return NO_MARKET; return { IntPrice_from_double(price), size }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index b639c4549..9aeb47d81 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -153,6 +153,9 @@ class OrderStateUpdateEvent : public mercury::Event { case api::orderman::OrderState::kDynamic: result.mutable_dynamic(); break; + case api::orderman::OrderState::kSplitter: + result.mutable_splitter(); + break; case api::orderman::OrderState::CUSTOM_NOT_SET: break; } diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 461ea669c..2f80825fe 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -19,6 +19,7 @@ #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/SplitterAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" @@ -208,6 +209,10 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kComposite: order_ptr.reset(new orderman::CompositeOrder()); break; + case CustomOrderDefinition::kSplitter: + order_ptr.reset( + new orderman::AlgoWrapperOrder(std::make_unique())); + break; case CustomOrderDefinition::CUSTOM_NOT_SET: bts_assert(false); break; diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp new file mode 100644 index 000000000..f7a2e6f2e --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -0,0 +1,219 @@ +#include "SplitterAlgo.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +// #include "google/btree/btree_map.h" + +#include +#include + +namespace bts { +namespace orderman { +namespace splitter { + +using namespace api::orderman; + +struct ChildOrderState { + OrderKey key; + ChildState state; + uint32_t remaining() const { return state.quantity.value() - state.total_fills.value(); } + uint32_t min_qty() const { return state.total_fills.value(); } +}; + +struct SplitterAlgo::Impl { + IAlgoServices* algo = nullptr; + ChildTemplate* child_template = nullptr; + + uint32_t clip = 0; + uint32_t exposed_qty = 0; + uint32_t target_qty = 0; + + bool is_terminated = false; + + std::vector orders; +}; + +SplitterAlgo::SplitterAlgo() : me(new Impl()) { } +SplitterAlgo::~SplitterAlgo() {} + +OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { + // Validate and store parameters + + auto& def = ibl.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_splitter()); + auto& splitter = def.custom_def().splitter(); + + me->clip = splitter.max_order_qty(); + me->exposed_qty = splitter.exposed_qty(); + if (me->clip <= 0 || me->exposed_qty <= 0) { + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, + "max order quantity and exposed quantity must be greater than 0"}; + } + + // Create child template + auto child_def = def; + *child_def.mutable_custom_def() = splitter.child(); + me->child_template = &ibl.make_child_template(child_def); + + me->orders.reserve(me->exposed_qty / me->clip + 1); + + return {}; +} + +void SplitterAlgo::do_launch(IAlgoServices& ias) { + me->algo = &ias; + me->target_qty = ias.quantity().value(); + // launches initial child orders + sync_orders(); +} +void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { + //todo +} +void SplitterAlgo::do_update(const api::orderman::Update& update) { + // Update # child orders + if (update.has_custom() && update.custom().has_splitter()) { + auto& splitter = update.custom().splitter(); + if (splitter.max_order_qty() > 0) { + me->clip = splitter.max_order_qty(); + } + me->exposed_qty = splitter.exposed_qty(); + } + me->target_qty = update.quantity(); + + sync_orders(); +} +void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { + for (auto& child : me->orders) { + if (child.key == key) { + child.state = state; + break; + } + } + + sync_orders(); +} + +struct MinMax { + uint32_t min, max; +}; + +// TEST case: +// total = 300, clip = 100 +// constraints: 50,50,50,50 +void compute_desired_sizes(uint32_t total, uint32_t clip, const std::vector& constraints, std::vector* results) { + bts_assert(results); + results->clear(); + + uint32_t irreducible = 0; + for (const auto& mm : constraints) irreducible += mm.min; + + auto citer = constraints.begin(); + while(total > 0) { + auto current = std::min(total, clip); + // fit to constraint + if (citer != constraints.end()) { + irreducible -= citer->min; + if (current > citer->max) current = citer->max; + if (current < citer->min) current = citer->min; + + // I can't be higher than (total - irreducible) + if (current > (total - irreducible)) current = (total-irreducible); + citer++; + } + results->push_back(Quantity{current}); + total -= current; + } +} + +void get_constraints(const std::vector& orders, std::vector* constraints) { + bts_assert(constraints); + for (const auto& order : orders) { + //Note: to maintain queue position set max to current quantity. This will cause more orders to be added to the end if size increases + constraints->push_back(MinMax { + order.state.total_fills.value(), + order.state.status == ChildStatus::WORKING ? + std::numeric_limits::max() : order.state.total_fills.value() + }); + } +} + +bool SplitterAlgo::is_complete() const { + uint32_t fills = 0; + for (const auto& o : me->orders) { fills += o.state.total_fills.value(); } + return fills >= me->target_qty; +} + +void SplitterAlgo::terminate() const { + algo().complete(); + //?? Do we need to clean up children? + for (const auto& o : me->orders) { + if (o.state.status == ChildStatus::WORKING) { + algo().cancel_child(o.key); + } + } + me->is_terminated = true; +} + +void SplitterAlgo::sync_orders() { + if (me->is_terminated) return; + if (is_complete()) { + terminate(); + return; + } + + std::sort(me->orders.begin(), me->orders.end(), [](auto& a, auto b) { return b.min_qty() < a.min_qty(); }); + std::vector constraints; + get_constraints(me->orders, &constraints); + + std::vector desired; + compute_desired_sizes(me->exposed_qty, me->clip, constraints, &desired); + + auto oiter = me->orders.begin(); + // iterate to the current number of orders, don't consider orders that we're adding + auto order_count = me->orders.size(); + auto price = algo().price(); + for (const auto& qty : desired) { + if (order_count == 0) { + // Ran out of existing orders, time to add more + auto key = algo().launch_child(*me->child_template, price, qty); + // Assume the order begins successfully. Hopefully we get back some sort of NACK otherwise + me->orders.push_back({ key, {} }); + me->orders.back().state.price = price; + me->orders.back().state.quantity = Quantity { qty }; + me->orders.back().state.status = ChildStatus::WORKING; + } + else { + // Check the current order's quantity and modify it to match desired qty + if (oiter->state.status == ChildStatus::WORKING) { + if (oiter->state.price != price || + oiter->state.quantity != qty) { + Update update; + update.set_quantity(qty.value()); + update.set_price(price.value()); + algo().update_child(oiter->key, update); + } + } + oiter++; + order_count -= 1; + } + } + // cancel any orders past desired + if (desired.size() < me->orders.size()) { + for (size_t x = desired.size(); x < me->orders.size(); ++x) { + auto& order= me->orders[x]; + if (order.state.status == ChildStatus::WORKING) { + order.state.status = ChildStatus::CANCELED; + algo().cancel_child(order.key); + } + } + } + +} + +IAlgoServices& SplitterAlgo::algo() const { bts_assert(me->algo); return *me->algo; } + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h new file mode 100644 index 000000000..ff2d86598 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -0,0 +1,32 @@ +#pragma once +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { +namespace splitter { + +class SplitterAlgo : public IAlgoOrder +{ + struct Impl; + std::unique_ptr me; + +public: + SplitterAlgo(); + ~SplitterAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_child_change(OrderKey, ChildState const &) override; + +private: + IAlgoServices& algo() const; + + void sync_orders(); + bool is_complete() const; + void terminate() const; +}; + + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp new file mode 100644 index 000000000..adb06283b --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -0,0 +1,526 @@ + +#include "catch/catch.hpp" +#include "../SplitterAlgo.h" +#include "AlgoTestDriver.h" +#include "lib/orderman/orderman_utils/Book.h" +#include +#include +#include + +using namespace std; +using namespace bts::orderman::splitter; +using namespace bts::api::orderman; + +namespace bts { +namespace orderman { +namespace test { + +/* + +- max/exposed, assert correct # of orders on the market +- completes on target_qty reached +- completes on target_qty exceeded +- send fills, check order state +- send fills, then change target_qty + + */ + +constexpr auto some_price = md::IntPrice { 128000, -3 }; + +using ExpectedCount = utils::ValueWrapper; +struct SimpleCase { + ExpectedCount expected_orders; + Quantity target; + SplitterOrderDefinition sod; +}; + +SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, uint32_t target) { + SimpleCase result; + result.expected_orders = expected; + result.target = Quantity {target}; + result.sod.set_max_order_qty(max_size); + result.sod.set_exposed_qty(exposed); + return result; +} + + +TEST_CASE("initial orders", "[algo][splitter]") { + std::vector cases; + cases.push_back(mkSimple(ExpectedCount {10},10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + + for (const auto& tcase : cases) { + auto expected = tcase.expected_orders.value(); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = tcase.sod; + AlgoTestDriver state(def, some_price, tcase.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.child_orders().size() == expected); + REQUIRE(state.state() == AlgoState::RUNNING); + } +} + +TEST_CASE("completes on target", "[algo][splitter]") { + std::vector cases; + cases.push_back(mkSimple(ExpectedCount {3}, 30, 90, 50)); + cases.push_back(mkSimple(ExpectedCount {10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount {4}, 13, 50, 150)); + cases.push_back(mkSimple(ExpectedCount {12}, 13, 150, 50)); + + for (const auto& tcase : cases) { + auto expected = tcase.expected_orders.value(); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = tcase.sod; + AlgoTestDriver state(def, some_price, tcase.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.child_orders().size() == expected); + REQUIRE(state.state() == AlgoState::RUNNING); + + SECTION("Fill completely") { + auto orders = state.child_orders(); + // Fill the order + size_t filled = 0; + size_t iterations = 0; + while(state.state() == AlgoState::RUNNING) { + // loop to allow more orders to be added + ++iterations; + REQUIRE(iterations < 999); + for (const auto& order : orders) { + state.fill(order.key, Price (some_price.price()), order.cstate.quantity); + filled += order.cstate.quantity.value(); + if (filled >= tcase.target.value()) { + REQUIRE(state.state() == AlgoState::COMPLETED); + break; + } + else { + REQUIRE(state.state() == AlgoState::RUNNING); + } + } + } + } + SECTION("fill one by one") { + const auto& orders = state.child_orders(); + // Fill 1 per iteration. + // Algo should add more orders if not enough are visible initially + size_t filled = 0; + size_t iterations = 0; + while(state.state() == AlgoState::RUNNING) { + ++iterations; + REQUIRE(iterations < 999);//not making progress + for (const auto& order : orders) { + if (order.cstate.status == ChildStatus::WORKING) { + auto price = Price {some_price.price()}; + state.fill(order.key, price, Quantity {1}); + filled += 1; + // Fills should never cause new orders to get added + REQUIRE(state.child_orders().size() == expected); + if (filled >= tcase.target.value()) { + REQUIRE(state.state() == AlgoState::COMPLETED); + break; + } + else { + REQUIRE(state.state() == AlgoState::RUNNING); + } + } + } + } + } + } +} + +TEST_CASE("updates", "[algo][splitter]") { + // Start in state 0, update to state 1 + std::vector, SimpleCase>> cases; + + // reduce max order size, increase # orders + cases.push_back({ + mkSimple(ExpectedCount {10} /*order count*/, 10 /*max*/, 100 /*exposed*/, 50 /*target*/), + {}, + mkSimple(ExpectedCount {20}, 5, 100, 50) + }); + /// reduce max order size, keep # orders constant + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {}, + mkSimple(ExpectedCount {10}, 5, 50, 50) + }); + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {5,5}, + mkSimple(ExpectedCount {8}, 5, 50, 40) + }); + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {5,5}, + mkSimple(ExpectedCount {18}, 5, 100, 50) + }); + + + for (const auto& tcase : cases) { + auto case_init = std::get<0>(tcase); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = case_init.sod; + AlgoTestDriver state(def, some_price, case_init.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == case_init.expected_orders.value()); + for (const auto& o : state.child_orders()) { + if (o.cstate.status == ChildStatus::WORKING) { + REQUIRE(o.cstate.quantity.value() <= case_init.sod.exposed_qty()); + } + } + + for(auto q : std::get<1>(tcase)) { + state.fill({}, Quantity {q}); + } + + Update update; + auto case_next = std::get<2>(tcase); + update.set_price(some_price.price()); + update.set_quantity(case_next.target.value()); + *def.mutable_custom_def()->mutable_splitter() = case_next.sod; + *update.mutable_custom() = def.custom_def(); + + state.do_update(update); + REQUIRE(state.state() == AlgoState::RUNNING); + size_t working = 0; + for (const auto& c : state.child_orders()) if (c.cstate.status == ChildStatus::WORKING) working += 1; + REQUIRE(working == case_next.expected_orders.value()); + for (const auto& o : state.child_orders()) { + if (o.cstate.status == ChildStatus::WORKING) { + REQUIRE(o.cstate.quantity.value() <= case_next.sod.exposed_qty()); + } + } + } +} +TEST_CASE("Reduction with fills", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/50, 100/50, 100/50, 100/50 + // Change expose to 300 + // naive: 100, 100, 100 but we *can't* reduce the last to 0 + // expected: 100, 100, 50, 50 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + for (const auto& order : state.child_orders()) { + state.fill(order.key, {}, Quantity {50}); + } + + // Reduce exposed quantity + Update update; + update.set_quantity(300); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(300); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 300); + + // need this to be 100,100,50,50 not 100,100,100 + std::set actual, expected {100,100,50,50}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("Reduction with fills 2", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/35, 100/45, 100/55, 100/65 + // Change expose to 300 + // naive: 100, 100, 100 but we *can't* reduce the last to 0 + // expected: 100, 100, 65, 35 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity {35}); + state.fill({}, Quantity {45}); + state.fill({}, Quantity {55}); + state.fill({}, Quantity {65}); + + // Reduce exposed quantity + Update update; + update.set_quantity(300); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(300); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 300); + + // need this to be 100,100,50,50 not 100,100,100 + std::set actual, expected {100,100,65,35}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("Reduction with fills 3", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/35, 100/45, 100/55, 100/65 + // Change expose to 201 + // naive: 100, 100, 1 but we *can't* reduce the last to 0 + // expected: 66, 55, 45, 35 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity {35}); + state.fill({}, Quantity {45}); + state.fill({}, Quantity {55}); + state.fill({}, Quantity {65}); + + // Reduce exposed quantity + Update update; + update.set_quantity(201); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(201); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 201); + + std::set actual, expected {66,55,45,35}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("reduce to completion", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/100, 100/100, 100/0, 100/00 + // Change expose to 200 + // expected: algo transitions to copmleted state canceling 2 orders + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity{100}); + state.fill({}, Quantity{100}); + + // Reduce exposed quantity + Update update; + update.set_quantity(200); + def.mutable_custom_def()->mutable_splitter()->set_exposed_qty(200); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::COMPLETED); + size_t total = 0; + for (const auto& order : state.child_orders()) { + if (order.cstate.status == ChildStatus::WORKING) { + total += order.cstate.quantity.value(); + } + else { + total += order.cstate.total_fills.value(); + } + } + REQUIRE(total == 200); +} + +TEST_CASE("reduce to completion 2", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/100, 100/100, 100/0, 100/00 + // Change expose to 200 + // expected: algo transitions to copmleted state canceling 2 orders + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity{100}); + state.fill({}, Quantity{50}); + state.fill({}, Quantity{50}); + + // Reduce exposed quantity + Update update; + update.set_quantity(200); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::COMPLETED); +} + +TEST_CASE("Async Fills", "[algo][splitter]") { + // OK, NOW it gets tricky because we're going to test the asyncronous stuff + + // Start with 4 orders size 20 outstanding (80 total exposed) + // Change exposure to 64 so one of the four will be reduced to 5 + // Before the change is confirmed fill the one that is reducing by 7 + // which would constitute an overfill + // Algo must reduce a second order to compensate + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(20); + splitter->set_exposed_qty(80); + AlgoTestDriver state(def, some_price, Quantity {80}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 20); } + + // Set up some instant fills + bool applied_fills = false; + state.on_child_changing([&](const auto&) { + if (applied_fills) return; + applied_fills = true; + // 7 fills on the last order which is has a size reduction in flight + state.fill(state.child_orders().rbegin()->key, {}, Quantity {7}); + }); + + Update update; + update.set_price(state.price().value()); + update.set_quantity(state.quantity().value()); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(65); + // This should trigger 1 order to be reduced to size 5 from 20 + // in the meantime we'll trigger fills of size 7 + // This results in an overfill for the 5 lot order + // And the + state.do_update(update); + + // expected result: + // 7 fills, exposed_qty 65 = 58 active + uint32_t active = 0; + for (const auto& o : state.child_orders()) active += o.active_qty(); + REQUIRE(active == 58); +} + +TEST_CASE("Increase then decrease", "[algo][splitter]") { + // Start with 3 orders of size 100 + // Increase the size to 400 so we launch a 4th order + // Then instantly send another update to 350 + + // NOTE: this test is not very good due to limitations in the test driver + // I'm leaving it in because it passes but if it starts failing in the future + // it's probably OK to disable it + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(300); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 3); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + Update update; + update.set_price(state.price().value()); + update.set_quantity(state.quantity().value()); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(400); + + // Set up some instant fills + bool applied_second_update = false; + state.on_child_launching([&,update](const auto&) mutable { + if (!applied_second_update) { + applied_second_update = true; + update.mutable_custom()->mutable_splitter()->set_exposed_qty(350); + state.do_update(update); + } + }); + + state.do_update(update); + + // expected result: + // 350 exposed, NOT 450 + uint32_t quantity = 0; + for (const auto& o : state.child_orders()) quantity += o.active_qty(); + REQUIRE(quantity == 350); +} + + +}}}//namespace \ No newline at end of file From 8bd63f11b110311d9697987a0a4198f6556f78f9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 1 Jul 2019 16:03:13 -0400 Subject: [PATCH 060/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 82bce6188..fc6f48243 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - Made algos, synthetics and user names private so that multiple users can share a single system privately. - Allowed the mini order book defaults for column widths to be changed from the mini order book - Allowed the mini order book to shrink to the minimum size that will be needed to display the selected columns + - Improved accuracy of the directional arrow when displaying last trades in the volumn column ## 2.4.0 ### User Visible Settings - In the ladder, changed the last trade column to accumulate successive trades at the same price From b8a9116ea6bedd4cc19b9d79b8c5b9ab7df86d97 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 16:08:28 -0400 Subject: [PATCH 061/198] SP-30 Dorman part 1 --- .../orders/algo/algo_orders/DormanAlgo.cpp | 382 ++++++++++++++++++ .../orders/algo/algo_orders/DormanAlgo.h | 82 ++++ .../algo/algo_orders/tests/dorman_tests.cpp | 353 ++++++++++++++++ 3 files changed, 817 insertions(+) create mode 100644 src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp new file mode 100644 index 000000000..b1f31c717 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -0,0 +1,382 @@ +#include "DormanAlgo.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/utils/PBUtils.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" + + +namespace bts { +namespace orderman { +namespace dorman { + +using namespace api::orderman; + + +// Class which will send out multiple orders but act like one order +struct ChildOrderState { + Quantity size; + Quantity filled; +}; + +class MultiOrder { + IAlgoServices* _algo = nullptr; + uint32_t _clip = 0; + ChildTemplate* _template = nullptr; + + Quantity _qty = {}; + std::map _orders; + + public: + MultiOrder() {} + ~MultiOrder() { + if (_algo) { + for (const auto& pair : _orders) { + _algo->cancel_child(pair.first); + } + } + } + void do_before_launch(IBeforeLaunchAlgoServices& algo, uint32_t clip) { + _clip = clip == 0 ? std::numeric_limits::max() : clip; + auto def = algo.definition(); + + CustomOrderDefinition default_order; + default_order.mutable_limit(); + + *def.mutable_custom_def() = + get_if(def.custom_def().dynamic().order_params(), "Child") + .value_or(default_order); + _template = &algo.make_child_template(def); + } + + void set_algo_services(IAlgoServices& a) { _algo = &a; } + + void update(Price p, Quantity q) { + bts_assert(_algo != nullptr); + // This class does not handle delayed size changes + if (q < _qty) { + // cancel some orders + auto excess = _qty.value() - q.value(); + while(excess > 0) { + // cancel some orders + auto iter = _orders.begin(); + auto lsize = iter->second.size.value() - iter->second.filled.value(); + if (lsize > excess) { + // Reduce order size + Update update; + update.set_quantity(lsize - excess); + _algo->update_child(iter->first, update); + iter->second.size.value() -= excess; + excess = 0; + } + else { + excess -= lsize; + _algo->cancel_child(iter->first); + _orders.erase(iter); + } + } + _qty = q; + } + else if (q > _qty) { + // add more orders + auto shortfall = q.value() - _qty.value(); + while(shortfall > 0) { + auto order_size = Quantity { std::min(shortfall, _clip) }; + auto child_id = _algo->launch_child(*_template, p, order_size, true); + _orders.insert(std::make_pair(child_id, ChildOrderState { order_size, Quantity {0} })); + shortfall -= order_size.value(); + } + _qty = q; + } + } + + Quantity quantity() const { return _qty; } +}; + + +// +// Algo State +// + +// +// Algo Impl +// +struct FutureQty { + Quantity size; + TimeStamp when; +}; + +struct DormanAlgo::Impl { + IAlgoServices *algo = nullptr; + AlgoParams params; + api::Side side; + + std::optional next_size; + MultiOrder child; +}; + +DormanAlgo::DormanAlgo() : + me(new Impl()) +{ } +DormanAlgo::~DormanAlgo() { } + +// Not latency sensitive. Do expensive initialization here +OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& iblas) { + const auto& def = iblas.definition(); + // Validation + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_dynamic()); + auto params = to_dorman_params(def.custom_def().dynamic()); + if (auto r = std::get_if(¶ms)) { + return *r; + } + me->params = std::get(params); + me->side = def.side(); + if (me->side != api::Side::SIDE_BUY && me->side != api::Side::SIDE_SELL) { + return OrderOpResult { ORDER_ERROR_INVALID_ORDER_DEFINITON, "Invalid side" }; + } + me->child.do_before_launch(iblas, me->params.clip_limit); + + return {/*ok*/}; +} + +void DormanAlgo::do_launch(IAlgoServices& algo) { + me->algo = &algo; + me->child.set_algo_services(algo); + + algo.subscribe_book(SecurityKey(algo.security().id())); + algo.subscribe_timer(); +} + +void DormanAlgo::do_launch_attached(IAlgoServices& algo, OrderKey k, ChildState state) { + me->algo = &algo; + (void)k; + (void)state; +} +void DormanAlgo::do_update(const api::orderman::Update& update) { + LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + (void)update; +} + +void DormanAlgo::on_child_change(OrderKey k, const ChildState& st) { + (void)k; + (void)st; +} +void DormanAlgo::on_book(SecurityKey key, const Book& book) { + if (key.value() != me->algo->security().id()) { return; } + auto price = me->algo->price(); + auto tick = me->algo->security().contract_spec().low_tick(); + + // Determine available size on the market + auto& side = book.side(me->side); + uint32_t available = 0; + for (const auto& level : side) { + if (securities::test_price_equality(level.price(), price.value(), tick)) { + available = level.size(); + break; + } + } + + // Check the step_table + auto target = Quantity {0}; + if (available > 0) { + for (const auto& entry : me->params.steps.step_table) { + target = Quantity { std::get<1>(entry) }; + if (std::get<0>(entry) > available) { + break; + } + } + } + target = Quantity { std::min(target.value(), me->params.steps.maximum) }; + + // First on_book + if (me->child.quantity() == Quantity {0}) { + me->child.update(price, target); + } + // See if we need to adjust + else { + if (target < me->child.quantity()) { + // If target < size reduce immidiately + me->child.update(price, target); + me->next_size = std::nullopt; + } + else if (target > me->child.quantity()) { + // if target > size schedule increase + if (me->next_size) { + // already planning to increase + me->next_size.value().size = target; + } + else { + // no scheduled increase + me->next_size = { FutureQty { target, me->algo->get_time() + std::chrono::seconds(me->params.steps.trail_seconds) } }; + } + } + } +} +void DormanAlgo::on_timer() { + // Check for pending size changes + if (me->next_size && + me->algo->get_time() >= me->next_size.value().when) { + auto size = me->next_size.value().size; + me->child.update(me->algo->price(), size); + me->next_size = std::nullopt; + } +} + +IAlgoServices& DormanAlgo::algo() const { return *me->algo; } + +// +// Visibility for testing +// + +Quantity DormanAlgo::desired_size() const { return me->child.quantity(); } + +// +// +// Parameter parsing and validation +// +// + +Result bad_definition(const char* msg) { return {OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, msg}}; } + +Result to_dorman_params(const api::orderman::DynamicOrderDefinition& def) { + const auto& params = def.order_params(); + AlgoParams res; + + // + // Step Table + auto step_table = get_if(params, "Step Table"); + if (!step_table) return bad_definition("Missing 'Step Table'"); + for (const auto& element : step_table.value().element()) { + auto row = get_if(element); + if (!row) return bad_definition("Invalid row type in step table."); + auto mk = get_if(row.value().field(), "Market Quantity"); + if (!mk) return bad_definition("Step table row missing 'Market Quantity'"); + auto ok = get_if(row.value().field(), "Order Quantity"); + if (!ok) return bad_definition("Step table row missing 'Order Quantity'"); + res.steps.step_table.push_back({mk.value(), ok.value()}); + } + res.steps.maximum = get_if(params, "Max Size").value_or(-1); + res.steps.trail_seconds = get_if(params, "Trail Seconds").value_or(0); + + // + // Clip limit + res.clip_limit = get_if(params, "Clip Size").value_or(0); + + // + // scratch + auto enable_scratch = get_if(params, "Enable Scratch"); + if (enable_scratch && enable_scratch.value()) { + auto overfill = get_if(params, "Max Overfill"); + if (!overfill) return bad_definition("Missing 'Max Overfill'"); + res.scratch = { overfill.value() }; + } + + // + // profit orders + auto enable_profit_orders = get_if(params, "Profit Orders"); + if (enable_profit_orders && enable_profit_orders.value()) { + auto ticks = get_if(params, "Ticks Away"); + if (!ticks) return bad_definition("Missing 'Ticks Away'"); + res.profit_orders = { ticks.value() }; + } + + // + // trade accumulation + auto trade_acc = get_if(params, "Trade Accumulation"); + if (trade_acc) { + auto ta = trade_acc.value(); + TradeAccumulationParams tap; + + auto contracts = get_if(ta.field(), "Contracts"); + if (!contracts) return bad_definition("Missing 'Trade Accumulation # Contracts'"); + tap.contracts = contracts.value(); + + auto interval = get_if(ta.field(), "Interval (seconds)"); + if (!interval) return bad_definition("Missing 'Trade Accumulation Interval'"); + tap.seconds = interval.value(); + + auto sleep = get_if(ta.field(), "Sleep (seconds)"); + if (!sleep) return bad_definition("Missing 'Trade Accumulation Sleep'"); + tap.sleep_seconds = sleep.value(); + + res.trade_accumulation = {tap}; + } + + return {res}; +} + +api::orderman::DynamicOrderDefinition to_dynamic_order_params(const AlgoParams& input) { + api::orderman::DynamicOrderDefinition result; + result.set_dynamic_order_type("Dorman"); + auto& map = *result.mutable_order_params(); + // step table + + // array of maps + // rows are "de-normalized" maps with column headers as keys + // + // example: + // map["Step Table"] = + // dynamic_array({ + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(500)}, + // {"Order Quantity", dynamic_parameter(250)} + // }), + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(1000)}, + // {"Order Quantity", dynamic_parameter(400)} + // }), + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(1000)}, + // {"Order Quantity", dynamic_parameter(1000)} + // }) + // }); + std::vector table; + std::transform( + input.steps.step_table.begin(), + input.steps.step_table.end(), + std::back_inserter(table), + [](const auto& item) { + return dynamic_map({ + { "Market Quantity", dynamic_parameter(std::get<0>(item)) }, + { "Order Quantity", dynamic_parameter(std::get<1>(item)) } + }); + }); + map["Step Table"] = dynamic_array(table); + map["Max Size"] = dynamic_parameter(input.steps.maximum); + map["Trail Seconds"] = dynamic_parameter(input.steps.trail_seconds); + map["Clip Size"] = dynamic_parameter(input.clip_limit); + + // scratch + map["Enable Scratch"] = dynamic_parameter((bool)(input.scratch)); + if (input.scratch) { + map["Max Overfill"] = dynamic_parameter(input.scratch.value().max_overfill); + } + // + // profit orders + map["Profit Orders"] = dynamic_parameter((bool)input.profit_orders); + if (input.profit_orders) { + map["Ticks Away"] = dynamic_parameter(input.profit_orders.value().ticks_away); + } + + // + // trade accumulator + if (input.trade_accumulation) { + auto& tap = input.trade_accumulation.value(); + map["Trade Accumulation"] = + dynamic_map({ + { "Contracts", dynamic_parameter(tap.contracts) }, + { "Interval (seconds)", dynamic_parameter(tap.seconds) }, + { "Sleep (seconds)", dynamic_parameter(tap.sleep_seconds) } + }); + } + + return result; +} + + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h new file mode 100644 index 000000000..9d0628b76 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -0,0 +1,82 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include +#include +#include +#include + +namespace bts { +namespace orderman { +namespace dorman { + +// +// Algo parameters +// + +// This defines the market quantity vs the order quantity +struct StepParams { + std::vector> step_table; + // This is the cap on the maximum quantity, + // even though the step table can allow for higher quantities (depending on the + // clip size this could be divided across multiple exchange orders) + uint32_t maximum; + // If the market increases don't follow until it has stayed high for trail_seconds; + uint32_t trail_seconds; +}; + +// If the number of accumulated fills (net of profit orders) touches or goes beyond +// this, the fills will be scratched by entering opposite orders at the fill price +struct ScratchParams { + uint32_t max_overfill; +}; +// If this is enabled, then as fills accumulate, profit GTC orders are +// immediately sent N ticks away on the opposite side. +struct ProfitOrderParams { + uint32_t ticks_away; +}; +// If N contracts trade in T seconds, then the algo is paused (ie child exchange order +// is/are cancelled) for X seconds. Once the condition clears order is reentered. +struct TradeAccumulationParams { + uint32_t contracts; + uint32_t seconds; + uint32_t sleep_seconds; +}; +struct AlgoParams { + StepParams steps; + uint32_t clip_limit; + std::optional scratch; + std::optional profit_orders; + std::optional trade_accumulation; +}; + + +class DormanAlgo : public IAlgoOrder { + struct Impl; + std::unique_ptr me; + IAlgoServices& algo() const; + +public: + DormanAlgo(); + ~DormanAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_child_change(OrderKey, ChildState const &) override; + void on_book(SecurityKey, const Book&) override; + void on_timer() override; + + Quantity desired_size() const; + +}; + +template +using Result = std::variant; + +Result to_dorman_params(const api::orderman::DynamicOrderDefinition&); +// std::optional to_dorman_params(const api::orderman::DynamicOrderDefinition&); +api::orderman::DynamicOrderDefinition to_dynamic_order_params(const AlgoParams&); + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp new file mode 100644 index 000000000..55a8ad308 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -0,0 +1,353 @@ +#include "catch/catch.hpp" +#include "../DormanAlgo.h" +#include "AlgoTestDriver.h" +#include "lib/orderman/orderman_utils/Book.h" +#include +#include + +using namespace std; +using namespace bts::orderman::dorman; + +namespace bts { +namespace orderman { +namespace test { + +/* STATE + +struct OrderState { + Price desired_price; + Quantity desired_size; +} + +*/ + +/* TEST ASPECTS + +order_qty vs market quantity +order_qty reduce when market changes +order_qty increase (w/ delay) when market changes +order_qty maximum + +overfill [under/over] max with auto-scratch [on/off] +Profit orders + - test that orders are sent + - test that away order are at the right price + +Trade Accumulation + - accumulator goes [on/off] + - Dorman goes to sleep when it goes 'on' and wakes up when it goes 'off' + +Market Moves + - Available size increases + - Available size decreases + +clip size pseudo-order + - change clip size + - immidiate effect? + - don't have to cancel if clip size goes down? + - change order size [up/down] + - suspend/resume + - cancels all + + + */ + +void check_round_trip(const AlgoParams& input) { + auto d1 = to_dynamic_order_params(input); + auto ap1 = to_dorman_params(d1); + if (std::holds_alternative(ap1)) { + std::cout << std::get(ap1).error_msg; + } + REQUIRE(std::holds_alternative(ap1)); + auto d2 = to_dynamic_order_params(std::get(ap1)); + + REQUIRE(d2.DebugString() == d1.DebugString()); +} + +TEST_CASE("dorman_round_trip_params", "[algo][dorman]") { + + SECTION("a") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} }, + 1024, 5 + }; + check_round_trip(input); + } + + SECTION("b") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} + }, + 1024, 5 + }; + input.scratch = { 500 }; + input.profit_orders = { 42 }; + input.clip_limit = 220; + check_round_trip(input); + } + + SECTION("c") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} + }, + 1024, 5 + }; + input.profit_orders = { 42 }; + input.trade_accumulation = { + 100, 200, 300 + }; + check_round_trip(input); + } + +} + +struct ExpectedSize { + uint32_t input; + uint32_t expected; +}; +constexpr auto some_price = md::IntPrice { 128000, -3 }; + +size_t count_child_size(const std::vector& child_orders) { + return std::accumulate( + child_orders.begin(), + child_orders.end(), 0, + [](uint32_t acc, const auto& child) { + if (child.cstate.status != ChildStatus::CANCELED) { + // count working+completed + return acc + child.cstate.quantity.value(); + } + else return acc; + }); +} + + +TEST_CASE("dorman_order_size", "[algo][dorman]") { + // Repeate the test for a variety of clip sizes + for (auto clip : { 100, 20, 900, 1 }) { + + // create a table of various sizes + // send market state to the algo + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 400}, + {2000, 600}, + {3500, 750}, + {10000, 999} + }; + input.steps.maximum = 800; + input.steps.trail_seconds = 5; + input.clip_limit = clip; + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + + + SECTION("initial size vs market") { + std::vector test_sizes { + { 10, 250 }, + { 200, 250 }, + { 250, 250 }, + { 500, 400 }, + { 999, 400 }, + { 2500, 750 }, + { 9999, 800 } + }; + + for (auto& s : test_sizes) + { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + + // order size is driven by the available market size + book.bid()[0] = { some_price, s.input }; + state.update_book(book); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size().value() == s.expected); + REQUIRE( + s.expected == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + } + SECTION("Reduce qty on market shrink (immidiate)") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(400)); + + // Check that orders were created + REQUIRE( + 400 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + + // Reduce market + book.bid()[0] = { some_price, 405 }; + state.update_book(book); + REQUIRE(state.algo().desired_size() == Quantity(250)); + REQUIRE( + 250 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + + SECTION("Increase qty w/ delay when market grows") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(400)); + + // Check that orders were created + REQUIRE( + 400 == count_child_size(state.child_orders())); + + // INCREASE market + book.bid()[0] = { some_price, 1001 }; + state.update_book(book); + // NOTE: that the orders do not follow the market instantly + // so this is still 400 + REQUIRE( + 400 == count_child_size(state.child_orders())); + + // Still 400 after the timer ticks but not enough time has passed + state.advance_time(std::chrono::seconds()); + REQUIRE( + 400 == count_child_size(state.child_orders())); + + state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); + REQUIRE( + 600 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + + } + SECTION("Respect maximum") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 10505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + + REQUIRE(state.algo().desired_size() == Quantity(input.steps.maximum)); + + // Check that orders were created + REQUIRE( + input.steps.maximum == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + } +} + +TEST_CASE("Dorman fills", "[algo][dorman]") { + + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + SECTION("complete when filled") { + // Send out some orders + // Fill them + // Expect order state to become finished + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 501 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(450)); + + for (const auto& order : state.child_orders()) { + state.fill(order.key, price, order.cstate.quantity); + } + + REQUIRE(state.state() == AlgoState::COMPLETED); + } + + // Test cases for transitions w/ fills + // + + // target = 500 + // send 5 orders of size 100 + // market move, new target = 450 + // reduce order #5 to 50 + // Before we confirm the move + // - fill #4 for 80 + // :: algo needs to shed another 30 Quantity + + // ^ same but fill #2 for 80 + + + /* + NOTES: + vector = f(fills, target, clip) + => feed into diff + */ +} + +TEST_CASE("Dorman overfill", "[algo][dorman]") { + SECTION("auto-scratch OFF") { + } + SECTION("auto-scratch ON") { + } +} + +TEST_CASE("Dorman profit-orders", "[algo][dorman]") { + SECTION("profit-orders OFF") { + // Profit orders are not sent + } + SECTION("profit-orders ON") { + // profit orders are sent at the right price + } +} + +TEST_CASE("Dorman trade accumulation", "[algo][dorman]") { + SECTION("exceed limit") { + // Profit orders are not sent + } + SECTION("return to normal") { + // profit orders are sent at the right price + } +} + + +}}}//namespace + From 5cbe00beab84f7094a6b5f353549b9d20e9d552b Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 1 Jul 2019 16:33:56 -0400 Subject: [PATCH 062/198] Spread PNL is not counted towards the Account PNL --- .../position/PositionServicePNLHelper.cpp | 51 +++++++++++++++---- .../sparkd/position/PositionServiceServer.cpp | 2 +- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 8c7a15184..c2c50b4f0 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -26,6 +26,11 @@ using namespace bts::md; class HandleIndex { public: + enum PNLType{ + UNRESOLVED = 0, + SPREAD, + OUTRIGHT + }; bts::md::MDClient& _client; int _sub; std::optional _consumer; @@ -50,7 +55,18 @@ public: }); return handle; } - + PNLType get_pnl_type (SecurityKey key) const{ + auto h = _get_handle(key); + if (h.is_initialized()){ + const auto& sec = h.get_normalized_security(); + if (sec.has_future() || sec.has_option()) + return PNLType::OUTRIGHT; + else + return PNLType::SPREAD; + } + else + return PNLType::UNRESOLVED; + } std::string get_symbol (SecurityKey key) const{ auto handle = _get_handle(key); return handle.get_usersymbol().symbol(); @@ -187,16 +203,31 @@ void PositionServicePNLHelper::_aggregate_account_pnl( double PositionServicePNLHelper::_compute_day_pnl ( const bts::api::position::PNLUnit& u){ // long - double md = (u.bid_price() + u.ask_price())*0.5; - md = bts::os::is_nan(md) ? u.bid_price() : md; - md = bts::os::is_nan(md) ? u.ask_price() : md; - md = bts::os::is_nan(md) ? u.settlement_price() : md; + double pnl; + auto pnl_type = me->handle_index.get_pnl_type( + SecurityKey(u.pos().security_id())); + switch(pnl_type){ + case HandleIndex::OUTRIGHT:{ + double md = (u.bid_price() + u.ask_price())*0.5; + md = bts::os::is_nan(md) ? u.bid_price() : md; + md = bts::os::is_nan(md) ? u.ask_price() : md; + md = bts::os::is_nan(md) ? u.settlement_price() : md; - double long_pnl = std::abs(u.pos().day_long_pos()) * u.cash_value() * - (md - u.pos().day_long_avg_price()), - short_pnl = std::abs(u.pos().day_short_pos()) * u.cash_value() * - (u.pos().day_short_avg_price() - md); - return long_pnl + short_pnl; + double long_pnl = std::abs(u.pos().day_long_pos()) * u.cash_value() * + (md - u.pos().day_long_avg_price()), + short_pnl = std::abs(u.pos().day_short_pos()) * u.cash_value() * + (u.pos().day_short_avg_price() - md); + pnl = long_pnl + short_pnl; + break; + } + case HandleIndex::SPREAD: + pnl = 0.0; + break; + case HandleIndex::UNRESOLVED: + pnl = os::nan(); + break; + } + return pnl; } double PositionServicePNLHelper::_get_cpp(uint32_t sec_key){ auto it = me->sec_cpp_map.find(sec_key); diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index a2a55c34b..f73a0178f 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -60,7 +60,7 @@ struct PositionServiceServer::PImpl { state(), id(0), pnl_helper(md_client), - poll_period_ms(300), + poll_period_ms(500), manual_fills_store(std::make_unique ("manual_fills")), manual_fills_publisher(manual_fills_publisher), admin_data(), From 0067e52155ec271d489bf2197f5d5d399f40b9a0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 1 Jul 2019 23:58:03 -0500 Subject: [PATCH 063/198] SP-89 (pr edit) - wait 4 mkt 2 launch; attach impl --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 4 +- src/client/spark/Orders/OrderDataHelper.cs | 3 +- src/lib/config/protos/UI.proto | 5 ++ .../orderman_utils/orderman_utils.cpp | 5 ++ .../orders/algo/algo_orders/OffsetAlgo.cpp | 68 +++++++++++-------- 5 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 77ecffeb4..19f8cb495 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -994,11 +994,13 @@ namespace mbts.spark { var join = config.Configuration.get(); var lean = config.Configuration.get(); var top = config.Configuration.get(); + var offset = config.Configuration.get(); _algo_type_conf = new Dictionary { { CustomOrderDefinition.CustomOneofCase.Cover, (cover.show_price, cover.show_quantity) }, { CustomOrderDefinition.CustomOneofCase.Join, (join.show_price, join.show_quantity) }, { CustomOrderDefinition.CustomOneofCase.Lean, (lean.show_price, lean.show_quantity) }, - { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) } + { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) }, + { CustomOrderDefinition.CustomOneofCase.Offset, (offset.show_price, offset.show_quantity) } }; } diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 2abb71e8e..ba6699cdf 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -623,7 +623,8 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/config/protos/UI.proto b/src/lib/config/protos/UI.proto index 5731f5170..6d51c635d 100644 --- a/src/lib/config/protos/UI.proto +++ b/src/lib/config/protos/UI.proto @@ -141,6 +141,11 @@ message TopAttachUIOptions { optional bool show_quantity = 2 [default = false]; } +message OffsetAttachUIOptions { + optional bool show_price = 1 [default = false]; + optional bool show_quantity = 2 [default = false]; +} + message ManualFillsOptions { optional bool modal_transactions = 1 [default = true]; } \ No newline at end of file diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 8099a0b5a..a2fbae1ba 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,6 +14,7 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: + case CustomOrderDefinition::kOffset: return true; default: return false; @@ -44,6 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); + case CustomOrderDefinition::kOffset: + return + cdef.offset().has_child() && + can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index f8fb5cdfa..47b179671 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -56,8 +56,6 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; bts_assert(me->child_template); - me->child_key = - algo.launch_child(*me->child_template, algo.price(), algo.quantity()); algo.subscribe_book(SecurityKey(algo.security().id())); } @@ -84,9 +82,14 @@ void OffsetAlgo::do_update(api::orderman::Update const &update) { update.custom().offset().tick_offset_on_deploy(); break; case Status::DEPLOYED: - // only update quantity (tick offset is irrelevant once deployed) + // don't update price - tick offset only determines the deploy price; + // it is irrelevant after that. Update child_update; child_update.set_quantity(algo().quantity().value()); + if (update.has_custom()) { + auto &offset_update = update.custom().offset(); + *child_update.mutable_custom() = offset_update.child(); + } algo().update_child(me->child_key, child_update); break; } @@ -108,38 +111,45 @@ void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; - if (top_psz.size()) { - // determine/set price - Update child_update; - const double &offset = securities::tick_size(algo().security()).value() * - me->tick_offset_on_deploy; - if (side == bts::api::SIDE_BUY) { - child_update.set_price(top_psz.price() - offset); - } else { - // assume that side == SIDE_SELL (bc the book returned a valid size for - // whatever side this is). - child_update.set_price(top_psz.price() + offset); - } - // set quantity - child_update.set_quantity(algo().quantity().value()); - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} {} ticks " - "away.", - algo().order_key().value(), algo().definition().side(), - algo().quantity().value(), algo().price().value(), - me->tick_offset_on_deploy); - // deploy - algo().update_child(me->child_key, child_update); - algo().set_ladder_visibility(false); - me->status = Status::DEPLOYED; - } else { + if (!top_psz.size()) { // log state (still waiting for md) LOG(OrderMan, Diag, "OffsetAlgo order {} still waiting for md. Order: {} {}@ {} ticks " "away.", algo().order_key().value(), algo().definition().side(), algo().quantity().value(), me->tick_offset_on_deploy); + + } else { + const double &offset = securities::tick_size(algo().security()).value() * + me->tick_offset_on_deploy; + const auto &price = + securities::worsen_price(side, Price(top_psz.price()), Price(offset)); + if (algo().is_attaching()) { + // log imminent update + LOG(OrderMan, Diag, + "OffsetAlgo order {} updating attached-child. Order: {} {}@ {} " + "({} ticks " + "away).", + algo().order_key().value(), side, algo().quantity().value(), + price.value(), me->tick_offset_on_deploy); + // update + Update child_update; + child_update.set_price(price.value()); + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + } else { + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, algo().quantity().value(), + price.value(), me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, price, algo().quantity()); + } + algo().set_ladder_visibility(false); + me->status = Status::DEPLOYED; } } From 1104f4db1d5293c04bd83ece42a7178fe8f970eb Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 09:52:24 -0400 Subject: [PATCH 064/198] SP-87 Reject attach in before_launch --- src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index f7a2e6f2e..786e2ad2d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -61,6 +61,11 @@ OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { me->orders.reserve(me->exposed_qty / me->clip + 1); + if (ibl.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Splitter does not support attach."}; + } + return {}; } @@ -71,7 +76,8 @@ void SplitterAlgo::do_launch(IAlgoServices& ias) { sync_orders(); } void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { - //todo + // rejected in before_launch + bts_assert(false); } void SplitterAlgo::do_update(const api::orderman::Update& update) { // Update # child orders From 049381908cd8087146d485780de8b3ec331f8cc7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 10:34:28 -0400 Subject: [PATCH 065/198] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7c976336d..cf4c7c358 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide/* From 2d56eedf3e3663c0ffe4e4ad75ef5568d20c8e2e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 10:37:47 -0400 Subject: [PATCH 066/198] Bugfix in synthetic_book_merge_tests --- src/lib/md/test/synthetic_book_merge_tests.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index 25d97cfab..e53b8414e 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -111,7 +111,7 @@ tuple,vector> make_securities(c l->mutable_security()->mutable_contract_spec()->set_low_tick(tick_size); l->mutable_security()->mutable_contract_spec()->set_high_tick(tick_size); l->set_quantity(quantity); - l->set_price_multiplier(quantity * (side == api::SIDE_BUY ? 1.0 : -1)); + l->set_price_multiplier(mult); l->set_side(side); synthetic->legs.push_back(instr.consumer()); legs.push_back(instr); @@ -126,7 +126,8 @@ tuple,vector> make_securities(c double quantity, tick_size; api::Side side; std::tie(quantity, tick_size, side) = t; - legs.push_back({ quantity, quantity, tick_size, side }); + double mult = quantity * (side == api::SIDE_BUY ? 1.0 : -1); + legs.push_back({ quantity, mult, tick_size, side }); } return make_securities(legs); } From ac90a2131483454575f12654ecf928dc8fe0c782 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Jul 2019 11:43:36 -0400 Subject: [PATCH 067/198] Clang build fixes. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/md/relay/RelayRecorder.cpp | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..cad2d5f8e 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index a15652138..f443c0926 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -208,7 +208,7 @@ struct SecurityExtractor : public IRelayWriter { SecurityExtractor(std::function& cb, size_t count) : _count(count), _cb(cb), _keys() { } ~SecurityExtractor() override {}; - void write(const co2::MDReply& data, bool*) { + void write(const co2::MDReply& data, bool*) override { for (auto const &ch : data.channels()) { for (auto const &cr : ch.updates()) { if (cr.has_security() && _keys.find(cr.security().id()) == _keys.end()) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 2791ac953..c2997c288 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -31,6 +31,7 @@ const std::map& get_some_securities() { struct RecursionCounter { size_t depth = 0; virtual void flush() = 0; + virtual ~RecursionCounter() {} }; struct RecursionGuard { RecursionGuard(RecursionCounter& c) : counter(c) { @@ -371,4 +372,4 @@ void AlgoTestDriverBase::complete() { void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } -}}}//namespace \ No newline at end of file +}}}//namespace From ce104479e1ce88315b35ccf6ecb2b32ea4eca74b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:51:06 -0500 Subject: [PATCH 068/198] removing last_side; incrementing shm_version --- src/lib/md/Shm/MDStructure.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib/md/Shm/MDStructure.h index dd5dbb6b5..3553b71d8 100644 --- a/src/lib/md/Shm/MDStructure.h +++ b/src/lib/md/Shm/MDStructure.h @@ -26,7 +26,7 @@ namespace md { using utils::TimeStamp; -const uint32_t shm_version = 101; +const uint32_t shm_version = 102; struct ALIGNED_(CACHE_LINE) HotHeader { size_t count; @@ -214,7 +214,6 @@ struct ColdEntry { last_trade(), total_volume(0), last_trade_time(), - last_side(co2::AggressorSide::AGGRESSOR_SIDE_NONE), misc(), deleted(false) { @@ -230,7 +229,6 @@ struct ColdEntry { AtomicPriceSize last_trade; size_t total_volume; datetime::LLDateTime last_trade_time; - co2::AggressorSide last_side; MiscData misc; From b9dcad95496f8e4444fcfcacb8ab0b9acad1ae90 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:52:21 -0500 Subject: [PATCH 069/198] don't reset last trade size when aggressor changes --- src/lib/md/MDProducerHandle.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index 471fd53e1..d11579e82 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -104,12 +104,11 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { // Add this trade to the last trade if price/side match auto current = std::get(cdata().last_trade.load()); - if (current.int_price() == price.int_price() && agside == cdata().last_side) { + if (current.int_price() == price.int_price()) { cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time); } else { cdata().last_trade.store(price,time); - cdata().last_side = agside; } cdata().last_trade_time = tradetime; cdata().total_volume = volume; From db2de3e8c45aa5b942d3698ddd2fca371180b1d0 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:53:11 -0500 Subject: [PATCH 070/198] remove last_side; change StructLayout Size accordingly --- src/client/spark_api/Co2/MDConsumerHandle.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/client/spark_api/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs index d13ef5b08..7b03bdaee 100644 --- a/src/client/spark_api/Co2/MDConsumerHandle.cs +++ b/src/client/spark_api/Co2/MDConsumerHandle.cs @@ -253,14 +253,13 @@ namespace mbts.co2 { } } - [StructLayout(LayoutKind.Sequential, Size = 712)] + [StructLayout(LayoutKind.Sequential, Size = 704)] internal struct ColdEntry { public int exchange_status; // Last trade public AtomicPriceSize last_trade; public ulong total_volume; public utils.LLDateTime last_trade_time; - private AggressorSide last_side; //// Settlement public UInt64 misc_timestamp; From 5a256d4634ed60ca0a5605baee1ab31f1fa40fd3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 11:55:55 -0400 Subject: [PATCH 071/198] SP-104 PEBKAC buy with negative mult is nonsense --- .../md/test/synthetic_book_merge_tests.cpp | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index e53b8414e..63d1914c9 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -458,6 +458,113 @@ TEST_CASE("Synthetic_net_change", "[md][synthetic]") { } } +TEST_CASE("HCL_SP_104", "[md][synthetic]") { + shared_ptr synthetic; + vector test_instr; + tie(synthetic, test_instr) = make_securities({ + // (quantity, multiplier, tick_size, side) + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, -1.0, 0.01, api::SIDE_SELL}, + {1.0, -1.0, 0.01, api::SIDE_SELL } + }); + auto leg1 = test_instr[0]; // CLQ9-CLU9 + auto leg2 = test_instr[1]; // HCLQ9-CLQ9 + auto leg3 = test_instr[2]; // HCLQ9-HCLU9 + auto leg4 = test_instr[3]; // HCLU9-CLU9 + + setup_market(leg1.producer(), + { + { -0.10, 3299 }, + { -0.11, 2885 }, + { -0.12, 2558 }, + { -0.13, 2447 }, + { -0.14, 1540 }, + { -0.15, 2334 }, + { -0.16, 1396 }, + { -0.17, 1190 }, + { -0.18, 1221 }, + { -0.19, 812 } + }, + { + { -0.09, 1318 }, + { -0.08, 2174 }, + { -0.07, 3057 }, + { -0.06, 2331 }, + { -0.05, 2543 }, + { -0.04, 2638 }, + { -0.03, 2232 }, + { -0.02, 3221 }, + { -0.01, 2863 }, + { 0.00, 3327 } + }); + + setup_market(leg2.producer(), + { + { 4.06, 1 }, + { 4.05, 2 }, + { 4.04, 3 }, + { 4.03, 12 }, + { 4.02, 6 }, + { 4.01, 1 } + }, + { + { 4.07, 1 }, + { 4.08, 2 }, + { 4.10, 8 }, + { 4.11, 10 }, + { 4.12, 2 }, + { 4.14, 1 } + }); + + setup_market(leg3.producer(), + { + { 0.20, 2 }, + { 0.19, 6 }, + { 0.18, 5 }, + { 0.17, 18 }, + { 0.16, 2 }, + { 0.15, 3 }, + { 0.14, 2 } + }, + { + { 0.22, 2 }, + { 0.23, 4 }, + { 0.24, 9 }, + { 0.25, 17}, + { 0.26, 5 }, + { 0.27, 5 }, + { 0.28, 4 }, + { 0.29, 2 }, + { 0.30, 2 } + }); + + setup_market(leg4.producer(), + { + { 3.75, 1 }, + { 3.74, 3 }, + { 3.73, 4 }, + { 3.72, 12 }, + { 3.71, 1 }, + { 3.70, 3 } + }, + { + { 3.78, 1 }, + { 3.79, 2 }, + { 3.80, 6 }, + { 3.81, 1 }, + { 3.82, 10 }, + { 3.83, 1 } + }); + + MDConsumerHandle synthetic_handle(synthetic); + // dump_market(synthetic_handle); + expect_market(synthetic_handle, + { { -0.04,1 },{ -0.06,1 },{ -0.07,1 },{ -0.09,3 },{ -0.11,3 },{ -0.12,1 },{ -0.13,5 },{ -0.14,3 },{ -0.15,2 },{ -0.16,1 } }, + { { 0.03,1 },{ 0.05,1 },{ 0.06,1 },{ 0.08,1 },{ 0.09,4 },{ 0.11,3 },{ 0.12,2 },{ 0.13,7 },{ 0.14,1 },{ 0.16,2 } } + ); +} + // // Benchmarks From 5b75b8718a010baca3a0dbeb0456cb4895a20537 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 11:14:01 -0500 Subject: [PATCH 072/198] updating comment to reflect change --- src/lib/md/MDProducerHandle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index d11579e82..a52292972 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -102,7 +102,7 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { } void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { - // Add this trade to the last trade if price/side match + // Add this trade to the last trade if price match auto current = std::get(cdata().last_trade.load()); if (current.int_price() == price.int_price()) { cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time); From cb31269a70b4b422d24b611e5e6400cfabf610b8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 13:14:46 -0400 Subject: [PATCH 073/198] added pnl impact to margin --- src/lib/api/services/MarginService.proto | 3 +- src/lib/api/services/PositionService.proto | 1 + .../sparkd/position/MarginServiceServer.cpp | 66 +++++++++++-------- .../sparkd/position/MarginServiceServer.h | 7 +- .../sparkd/position/PositionAggregator.cpp | 27 ++++++++ .../sparkd/position/PositionAggregator.h | 3 +- .../position/PositionServicePNLHelper.cpp | 4 ++ 7 files changed, 81 insertions(+), 30 deletions(-) diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index 502602749..c6479c66e 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -3,6 +3,7 @@ package bts.api.position; option csharp_namespace="bts.api.position"; import "lib/api/apioptions.proto"; import "lib/api/apicore.proto"; +import "lib/api/services/PositionService.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } @@ -26,7 +27,7 @@ message ExcessLiquidityReport { double leverage_factor = 20; double cash_balance = 30; MarginResult margin_result = 40; - + AccountPNL account_pnl = 50; double excess_liquidity = 100; } diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index c7879cc5d..b8aceea6c 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -32,6 +32,7 @@ message PNLUnit{ message AccountPNL{ uint32 account_id = 1 [(bts.api.key)=true]; + string account_name = 10; double day_pnl = 20; } diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 26bc54e56..a216ffa77 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -13,6 +13,7 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/Dispatcher.h" +#include "lib/os/os.h" #include #include @@ -70,15 +71,16 @@ void MarginServiceServer::publish_all() auto it = _last_update.find(acct); if(it != _last_update.end()) since = it->second; - std::vector pos; - if(_position->query_positions(acct, pos, &since) && pos.size()) + std::vector pos; AccountPNL pnl; + if(_position->query_positions(acct, pos, pnl, &since) && pos.size()) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); auto aname = orderman::to(acct); - _margin->compute_margin(aname, pos, [this, since, acct](const MarginResult& m) + _margin->compute_margin(aname, pos, [this, since, acct, pnl](const MarginResult& m) { std::scoped_lock l(_lock); - publish_margin(m); + publish_margin(m); + publish_excess_liquidity_report(m, pnl); _last_update[acct] = since; }); } @@ -101,8 +103,8 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request { orderman::AccountName acct; orderman::str_to(request.account(), &acct); - std::vector pos; - _position->query_positions(request.account(), pos); + std::vector pos; AccountPNL pnl; + _position->query_positions(request.account(), pos, pnl); _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); @@ -128,38 +130,50 @@ void MarginServiceServer::publish_margin(const api::position::MarginResult& resu { std::scoped_lock l(_lock); _publisher.add_or_update(result); - _publisher.flush(); - - publish_excess_liquidity_report(result); + _publisher.flush(); } -void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result) +void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result, const api::position::AccountPNL& pnl) { std::scoped_lock l(_lock); ExcessLiquidityReport report; report.set_account(result.account()); + report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); - auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); - double netliq = 0.0; - if(acct && acct->has_margin_limit()) - { - report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); - netliq = report.leverage_factor() * report.cash_balance(); - } - netliq -= result.maint_margin(); + update_report_with_account(report, result.account()); + + double netliq = report.leverage_factor() * report.cash_balance(); + if(!bts::os::is_nan(result.maint_margin())) + netliq -= result.maint_margin(); + if(!bts::os::is_nan(pnl.day_pnl())) + netliq += pnl.day_pnl(); report.set_excess_liquidity(netliq); _last_report[result.account()] = report; _report_publisher.add_or_update(report); _report_publisher.flush(); } -void MarginServiceServer::update_report(const std::string& account) +void MarginServiceServer::update_report_with_account(const std::string& account) { - MarginResult res; - auto acct = orderman::to(account); - if(_margin->get_last_valid_result(acct, res)) - publish_excess_liquidity_report(res); + auto it = _last_report.find(account); + if(it != _last_report.end()) + { + api::position::ExcessLiquidityReport report = it->second; + update_report_with_account(report, account); + _report_publisher.add_or_update(report); + _report_publisher.flush(); + } +} + +void MarginServiceServer::update_report_with_account(api::position::ExcessLiquidityReport& report, + const std::string& account) +{ + auto acct = AdminServiceUtils::find_account(_admin_data, account, false); + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + } } void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, @@ -188,7 +202,7 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report(request.account()); + update_report_with_account(request.account()); }); } } @@ -219,7 +233,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report(request.account()); + update_report_with_account(request.account()); }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index b99836099..27ff1e3f6 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -7,6 +7,8 @@ #include "lib/api/services/MarginService.server.pb.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" #include "lib/utils/datetime.h" #include @@ -41,8 +43,9 @@ public: private: void publish_margin(const api::position::MarginResult&); - void publish_excess_liquidity_report(const api::position::MarginResult&); - void update_report(const std::string&); + void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); + void update_report_with_account(const std::string&); + void update_report_with_account(api::position::ExcessLiquidityReport&, const std::string&); void publish_all(); private: diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 74f0131e5..0bcaeb329 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -22,6 +22,7 @@ namespace position { PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) : _position_service(std::move(pos)), _position_map(), + _pnl_map(), _accounts(), _oracle(mdclient), _lock() @@ -49,6 +50,28 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: _accounts[o->account()] = bts::datetime::ll_now(); } }); + _position_service.subscribe_pnl_account_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + std::scoped_lock l(_lock); + for (const auto& o : update.removed()) + { + const auto& it = _pnl_map.find(o->account_name()); + if(it != _pnl_map.end()) + _pnl_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _pnl_map[o->account_name()] = *o; + } + for (const auto& o : update.added()) + { + _pnl_map[o->account_name()] = *o; + } + }); + } PositionAggregator::~PositionAggregator() {} @@ -62,6 +85,7 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) } bool PositionAggregator::query_positions(const std::string& account, std::vector& result, + api::position::AccountPNL& pnl, datetime::LLDateTime* since) { auto last_update = _accounts[account]; @@ -88,6 +112,9 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; + auto pit = _pnl_map.find(account); + if(pit != _pnl_map.end()) + pnl = pit->second; return true; } return false; diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index db9ec5ad5..6b46e5429 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -21,12 +21,13 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - bool query_positions(const std::string& account, std::vector& result, + bool query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since = nullptr); private: api::position::PositionService _position_service; std::map _position_map; + std::map _pnl_map; std::map _accounts; md::SecurityOracle _oracle; std::recursive_mutex _lock; diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index c2c50b4f0..e7687c87b 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -174,10 +174,12 @@ void PositionServicePNLHelper::_aggregate_account_pnl( std::map acc_pnl; for (const auto& pnlu : in_pnl){ uint32_t acct_id = pnlu.pos().account_id(); + const std::string& acct_name = pnlu.pos().account(); auto it=acc_pnl.find(acct_id); if(it==acc_pnl.end()){ AccountPNL new_acc; new_acc.set_account_id(acct_id); + new_acc.set_account_name(acct_name); new_acc.set_day_pnl(0.0); acc_pnl[acct_id]=new_acc; it=acc_pnl.find(acct_id); @@ -188,10 +190,12 @@ void PositionServicePNLHelper::_aggregate_account_pnl( } // for accounts with no positions add 0 for (const auto& p : account_map){ + const std::string& acct_name = p.first; uint32_t acct_id = p.second; if(acc_pnl.find(acct_id) == acc_pnl.end()){ AccountPNL new_acc; new_acc.set_account_id(acct_id); + new_acc.set_account_name(acct_name); new_acc.set_day_pnl(0.0); acc_pnl[acct_id]=new_acc; } From 8248bd7db8c242b51518f7015e2ac9b1fb3d86a9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 13:26:11 -0400 Subject: [PATCH 074/198] Add descriptive comment to splitteralgo --- .../orders/algo/algo_orders/SplitterAlgo.h | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index ff2d86598..ca293856c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -5,6 +5,28 @@ namespace bts { namespace orderman { namespace splitter { +/* + SplitterAlgo + + Parameters: + max_order_qty + -- Clip size. No single order can exceed this quantity. + exposed_qty + -- The total quantity we want visible on the exchange. + -- This will typically be higher than the quantity which helps capture fills in pro-rata algorithms + price, quantity + -- Common to all orders. + -- Splitter is filled when it reaches (or exceeds) quantity not exposed_qty + + SplitterAlgo acts as a single order to its parent but actually divides the total exposure + by the clip size and working several orders at once. + - It completes when the quantity is matched or exceeded. + - It tries to maximize the size of the orders and it may sacrifice queue position to do that. + - It reacts to fills and parameter changes and adjusts it's children appropriately. + - See splitter_tests.cpp for examples + - Future work: By constraining maximum size we can force this algorithm to maintain queue position. + +*/ class SplitterAlgo : public IAlgoOrder { struct Impl; From cdabf3b0233dd53e9d0698b604acf099c1ab9151 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 13:34:30 -0400 Subject: [PATCH 075/198] SP-87 - Report fills to parent --- .../orderman/orders/algo/algo_orders/SplitterAlgo.cpp | 9 ++++++++- .../orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 9 ++++++--- .../orders/algo/algo_orders/tests/splitter_tests.cpp | 8 ++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 786e2ad2d..761604888 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -5,7 +5,6 @@ #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/algo/IAlgoServices.h" -// #include "google/btree/btree_map.h" #include #include @@ -32,6 +31,8 @@ struct SplitterAlgo::Impl { uint32_t target_qty = 0; bool is_terminated = false; + Quantity total_fills = {}; + Price last_fill_price = {}; std::vector orders; }; @@ -95,6 +96,12 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { for (auto& child : me->orders) { if (child.key == key) { + auto delta = state.total_fills.value() - child.state.total_fills.value(); + if (delta != 0) { + me->total_fills = Quantity { me->total_fills.value() + delta }; + me->last_fill_price = state.last_price; + algo().update_fill_state(me->total_fills, me->last_fill_price); + } child.state = state; break; } diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index c2997c288..bee71af2f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -55,6 +55,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { TimeStamp now; api::Security security; OrderKey order_key, parent_key; + std::tuple fill_state; AlgoState state; std::vector orders; @@ -276,7 +277,9 @@ TimeStamp AlgoTestDriverBase::get_time() const { return me->now; } Price AlgoTestDriverBase::price() const { return me->price; } Quantity AlgoTestDriverBase::quantity() const { return me->size; } -Quantity AlgoTestDriverBase::total_fills() const { return Quantity(0); } +Quantity AlgoTestDriverBase::total_fills() const { + return std::get(me->fill_state); +} void AlgoTestDriverBase::subscribe_book(SecurityKey key){ me->book_subs[key] = true; @@ -370,6 +373,6 @@ void AlgoTestDriverBase::complete() { me->state = AlgoState::COMPLETED; } void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } -void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } +void AlgoTestDriverBase::update_fill_state(Quantity q, Price p) { me->fill_state = { q, p }; } -}}}//namespace +}}}//namespace \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index adb06283b..46cce7292 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -99,6 +99,7 @@ TEST_CASE("completes on target", "[algo][splitter]") { for (const auto& order : orders) { state.fill(order.key, Price (some_price.price()), order.cstate.quantity); filled += order.cstate.quantity.value(); + REQUIRE(filled == state.total_fills().value()); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; @@ -123,6 +124,7 @@ TEST_CASE("completes on target", "[algo][splitter]") { auto price = Price {some_price.price()}; state.fill(order.key, price, Quantity {1}); filled += 1; + REQUIRE(filled == state.total_fills().value()); // Fills should never cause new orders to get added REQUIRE(state.child_orders().size() == expected); if (filled >= tcase.target.value()) { @@ -184,10 +186,14 @@ TEST_CASE("updates", "[algo][splitter]") { } } + uint32_t fills = 0; for(auto q : std::get<1>(tcase)) { state.fill({}, Quantity {q}); + fills += q; } + REQUIRE(state.total_fills().value() == fills); + Update update; auto case_next = std::get<2>(tcase); update.set_price(some_price.price()); @@ -251,6 +257,8 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { std::set actual, expected {100,100,50,50}; for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } REQUIRE(actual == expected); + + REQUIRE(state.total_fills().value() == 200); } TEST_CASE("Reduction with fills 2", "[algo][splitter]") { From 23f10eac70ec0937a75e5d89cd9d6b804f44a475 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 2 Jul 2019 14:10:27 -0400 Subject: [PATCH 076/198] Add accountPnl to emptyMargin --- src/web/ui/src/Access.fs | 7 ++++++- src/web/ui/src/ui.fsproj | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 5b44bfb20..33a6d1453 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -113,7 +113,7 @@ module Accounts = riskLimitEnforcement = { productLimitInNetTerms = true } - accountLossLimit = + accountLossLimit = { enforce = false totalLossLimit = 0u @@ -137,6 +137,11 @@ module Accounts = } leverageFactor = 0.0 cashBalance = 0.0 + accountPnl = { + accountId = 0u + accountName = "" + dayPnl = 0.0 + } excessLiquidity = 0.0 } diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index cf28db353..fc520834a 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -28,6 +28,7 @@ + From b2c3488c5e78594e2101c21e1b77bd2c8e14bc81 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 14:01:07 -0500 Subject: [PATCH 077/198] draw volume numbers when bars not present --- src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 8f0168332..f91867329 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -215,7 +215,7 @@ namespace mbts.spark { Brush total_brush = null; if (settings.total.bars.result.HasValue) { total_brush = new SolidColorBrush(settings.total.bars.result.Value); - } else if (components.Count == 0) { + } else if (components.Count == 0 && !settings.show_ltq) { _clear_visual(dv); return; } From 8f22a326ab15973a7ff8e9a68c3daeb233ac3e92 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 14:01:50 -0500 Subject: [PATCH 078/198] last on volume foreground text is now white --- src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index f91867329..d12c79a6c 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -221,10 +221,10 @@ namespace mbts.spark { } // inflate the max so that the graph never fills the available space double max = data.Max(v => v.Volume) * 1.1; - Brush text_brush = settings.general.foreground.rgb_brush(); _render_cells(dv, row_height, data.Select(d => (d.Price, d)), settings.general, prices, spec, render_cell); /// local methods void render_cell(DrawingContext dc, int r, VolumeAtPriceLevelImmutable vap) { + Brush text_brush = settings.general.foreground.rgb_brush(); double y = row_height * r; var last_trade_here = r == last_index; @@ -259,6 +259,7 @@ namespace mbts.spark { if (settings.show_ltq && last_trade_here) { numbers_text.Clear(); numbers_text.Add(last_size_and_direction); + text_brush = BTSCoreColors.white; } if (numbers_text.Count > 0) { string str = string.Join("/", numbers_text); From b5d7d98098c06d949cbbca670aa74286fc6686d4 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 2 Jul 2019 15:04:55 -0400 Subject: [PATCH 079/198] Add DayPnL to SA Margin tab --- src/web/ui/src/Accounts/View.fs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 4be9094d5..c6eedaa7b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -90,17 +90,16 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str "Account") - TableControl.Cell (str "As Of Time") + TableControl.Cell (div [Style [MinWidth "3em"]][str "As Of"]) + TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Cash Balance") TableControl.Cell (str "Non Opt Value") TableControl.Cell (str "Opt Value") TableControl.Cell (str "Initial Margin") - TableControl.Cell (str "Maint Margin") + TableControl.Cell (str "Maint. Margin") + TableControl.Cell (str "Day PnL") TableControl.Cell (str "Excess Liquidity") - // TableControl.Cell (str "portfolioId") - // TableControl.Cell (str "settleIndicator") - // TableControl.Cell (str "settleQualifier") ] className = "" header = None @@ -110,14 +109,15 @@ let marginView model dispatch = { cells = [ - //TableControl.Cell (str model.marginScratch.account) TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) + TableControl.Cell (str model.marginScratch.account) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.accountPnl.dayPnl))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) From 6997aed9bd45d30d5df4335d301504a4f347f926 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 15:05:23 -0400 Subject: [PATCH 080/198] fixed SPARK-2524, allowing admin logins to not require a keycode session --- src/lib/utils/AuthSessionManager.cpp | 5 +++ src/lib/utils/AuthToken.cpp | 40 ++++++++++++++++++- src/server/sparkd/user/AdminServiceServer.cpp | 2 +- testing/manual/keycodes/keycode.txt | 16 +++++++- 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 11d620282..6170fdb40 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -105,13 +105,18 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t if(it != _map.end()) { _map[tok.id()] = Session{tok}; + LOG(Gen, Warn, "KEYCODE: Replacing session {} ", tok.id()); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; + LOG(Gen, Warn, "KEYCODE: Creating session {} ", tok.id()); return true; } + if(msg) + *msg = "KEYCODES: Not Enough Logins available for session"; + LOG(Gen, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); return false; } diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index e1292b595..ebd753957 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -51,6 +51,42 @@ AuthSessionManager& session_manager() return mgr; } +bool requires_auth_session(const admin::BTSUser& user) +{ + bool needs_session = false; + //if the user can trade in any account or see market data, it needs a session + if(user.has_user_data() && + user.user_data().has_account_permissions() && + user.user_data().account_permissions().account_permissions_size()) + { + for(const auto& i: user.user_data().account_permissions().account_permissions()) + { + if(i.second.has_trading_permission() && i.second.trading_permission().has_permissions()) + { + needs_session = true; + break; + } + } + } + + if(user.has_user_data() && + user.user_data().has_exchange_user_data()) + { + if(user.user_data().exchange_user_data().has_cme_data()) + { + for(const auto& i: user.user_data().exchange_user_data().cme_data().md_permissions()) + { + if(i.enabled()) + { + needs_session = true; + break; + } + } + } + } + return needs_session; +} + AuthToken generate_token(const admin::BTSUser& user, std::string* msg) { api::user::TokenPayload payload; @@ -58,7 +94,9 @@ AuthToken generate_token(const admin::BTSUser& user, std::string* msg) payload.set_id(user.id()); if(user.name() == "bts") payload.set_wheel(true); - session_manager().add_or_replace_session(payload, msg); + + if(requires_auth_session(user)) + session_manager().add_or_replace_session(payload, msg); auto token = encrypt(payload.SerializeAsString()); bts_assert_d(token.size() < 255-8); AuthToken result; diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 9e317e7fc..b795c7f39 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -155,7 +155,7 @@ void AdminServiceServer::get_filtered_admin_data( const api::Response& reply) { bts::api::user::TokenPayload toke; - if(bts::api::auth::decode_token(token, &toke)) + bts::api::auth::decode_token(token, &toke); { if(toke.wheel()) reply(_state); diff --git a/testing/manual/keycodes/keycode.txt b/testing/manual/keycodes/keycode.txt index ffd573a26..ed9535602 100644 --- a/testing/manual/keycodes/keycode.txt +++ b/testing/manual/keycodes/keycode.txt @@ -15,7 +15,7 @@ This will test our ability to generate and enforce keycodes. You should see keycode details printed to screen -4) Now test concurrent logins. Start a sparkd. +4) Now test concurrent logins. Start a sparkd. Make sure bts_2 and bts_3 have market data permission a) Start a spark -multiple login as bts and go to where you would see some market data b) Start another spark -multiple but log in as bts_2 and display some data c) Start a third spark -multiple, log in as bts_2 and display some data. @@ -37,5 +37,19 @@ You should see keycode details printed to screen d) remove the expired keycode you just generated by: rm ~/sparkdata/conf/keycode.conf e) restart sparkd, you should see data as normal in bts_2 + +6) Test admin vs trading logins +Note that an admin login is one that does not have trading permission in any account +AND does not have the ability to see any market data + + a) start sparkd again. make sure bts_2 and bts_3 have market data and trading permissions in webui + b) Start a spark -multiple login as bts_2 and go to where you would see some market data. You should see data + c) Start a webui and log in as bts_3, you should see data + d) close your shell and log out of web ui, now log in bts_3 into the webui and log in bts_2 in a shell ( + this is the reverse of the previous order), you should see a message in the shell about keycodes, but it will let you log in, just not see market data + e) from the webui, de-permission bts_3 from trading AND market data, + f) exit shell, log out of webui and kill sparkd, restart sparkd + + g)now try d again-- you should not get the same shell error From 7973b927a2e0251201d2c13b18cd7817d47314d2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 15:22:54 -0500 Subject: [PATCH 081/198] SP-89 (pr edit) - fwd price updates to child; cache update qty --- src/client/spark/Orders/OrderDataHelper.cs | 2 +- .../orderman_utils/orderman_utils.cpp | 8 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 83 +++++++++---------- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index ba6699cdf..9b8113547 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -624,7 +624,7 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top, - CustomOrderDefinition.CustomOneofCase.Offset + //CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index a2fbae1ba..24af902e3 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -45,10 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); - case CustomOrderDefinition::kOffset: - return - cdef.offset().has_child() && - can_consume_attachment(cdef.offset().child().custom_case()); + // case CustomOrderDefinition::kOffset: + // return + // cdef.offset().has_child() && + // can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index 47b179671..4ca18e87a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -20,6 +20,7 @@ struct OffsetAlgo::PImpl { ChildTemplate *child_template = nullptr; Book last_book; uint32_t tick_offset_on_deploy; + uint32_t quantity; }; OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} @@ -30,6 +31,10 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { auto &def = serv.definition(); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_offset()); + if (serv.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Attaching to offset algo is not supported"}; + } // Validate the offset part of the definition auto &offset = def.custom_def().offset(); if (!offset.has_child() && @@ -39,53 +44,54 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { "Offset order must have either a child order definition or an " "order to attach to"}; } - me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); - - if (!serv.is_attaching()) { - // if we are not attaching create a child template so we can - // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().offset().child(); - me->child_template = &(serv.make_child_template(child_def)); - } - + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); return {}; } void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; + me->quantity = algo.quantity().value(); bts_assert(me->child_template); algo.subscribe_book(SecurityKey(algo.security().id())); } -void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, - ChildState st) { - me->algo = &algo; - me->child_key = k; - algo.subscribe_book(SecurityKey(algo.security().id())); - on_child_change(k, st); +void OffsetAlgo::do_launch_attached(IAlgoServices &, OrderKey, + ChildState) { + bts_assert(false); } void OffsetAlgo::do_update(api::orderman::Update const &update) { LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); + bts_assert(!algo().is_attaching()); // validate update if (update.has_custom() && !update.custom().has_offset()) { algo().terminate_error("Invalid update"); return; } + me->quantity = update.quantity(); // apply update switch (me->status) { case Status::WAITING_FOR_MD: - me->tick_offset_on_deploy = - update.custom().offset().tick_offset_on_deploy(); + if (update.has_custom()) { + // already asserted that the child is Offset + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); + auto &def = algo().definition(); + auto child_def = def; + *child_def.mutable_custom_def() = update.custom().offset().child(); + me->child_template = &(algo().make_child_template(child_def)); + } break; case Status::DEPLOYED: - // don't update price - tick offset only determines the deploy price; - // it is irrelevant after that. Update child_update; - child_update.set_quantity(algo().quantity().value()); + child_update.set_quantity(me->quantity); + child_update.set_price(algo().price().value()); if (update.has_custom()) { auto &offset_update = update.custom().offset(); *child_update.mutable_custom() = offset_update.child(); @@ -96,6 +102,7 @@ void OffsetAlgo::do_update(api::orderman::Update const &update) { } void OffsetAlgo::on_book(SecurityKey, Book const &b) { + bts_assert(!algo().is_attaching()); me->last_book = b; // log top of book LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", @@ -109,6 +116,7 @@ void OffsetAlgo::on_book(SecurityKey, Book const &b) { void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); + bts_assert(!algo().is_attaching()); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; if (!top_psz.size()) { @@ -124,30 +132,15 @@ void OffsetAlgo::try_deploy() { me->tick_offset_on_deploy; const auto &price = securities::worsen_price(side, Price(top_psz.price()), Price(offset)); - if (algo().is_attaching()) { - // log imminent update - LOG(OrderMan, Diag, - "OffsetAlgo order {} updating attached-child. Order: {} {}@ {} " - "({} ticks " - "away).", - algo().order_key().value(), side, algo().quantity().value(), - price.value(), me->tick_offset_on_deploy); - // update - Update child_update; - child_update.set_price(price.value()); - child_update.set_quantity(algo().quantity().value()); - algo().update_child(me->child_key, child_update); - } else { - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " - "away).", - algo().order_key().value(), side, algo().quantity().value(), - price.value(), me->tick_offset_on_deploy); - // deploy - me->child_key = - algo().launch_child(*me->child_template, price, algo().quantity()); - } + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, me->quantity, + price.value(), me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, Price(price), Quantity(me->quantity)); algo().set_ladder_visibility(false); me->status = Status::DEPLOYED; } From 8d34279ab0e8bb6cfc6d7d8dea6144fd2dd45df7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 16:26:34 -0400 Subject: [PATCH 082/198] SP-68 Fix crash on exit by not touching queue on windows. insert_or_replace() is a no-op on windows anyway. --- src/lib/md/SecurityCache.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/md/SecurityCache.cpp b/src/lib/md/SecurityCache.cpp index 160633145..63a181a5d 100644 --- a/src/lib/md/SecurityCache.cpp +++ b/src/lib/md/SecurityCache.cpp @@ -22,6 +22,7 @@ void SecurityCacheImpl::enqueue_update_db(const SecurityPtr& security) { } void SecurityCacheImpl::flush() { + #ifndef _WIN32 if (!update_queue.empty()) { std::vector work; SecurityPtr temp; @@ -33,6 +34,7 @@ void SecurityCacheImpl::flush() { } } } + #endif } ////////////////// From 4b76e9175730b640a29aa3a24eb77677fcf00aaf Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 15:48:24 -0500 Subject: [PATCH 083/198] SP-89 (pr edit) - 'can_consume_attachment()' returns false for 'Offset' --- src/lib/orderman/orderman_utils/orderman_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 24af902e3..cb18aea6c 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,8 +14,8 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kOffset: - return true; + // case CustomOrderDefinition::kOffset: + // return true; default: return false; } From cc579034b22edf8e710510f632301eea3ec4b7f9 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:05:22 -0400 Subject: [PATCH 084/198] fix bug in margin service --- src/server/sparkd/position/MarginServiceServer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index a216ffa77..6f7d42b96 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -44,7 +44,12 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: { LOG(Gen, Info, "MarginServiceServer: service started"); - _admin_data = *_admin_service.get_admin_data(api::VoidMessage()).value(); + _admin_service.get_admin_data(api::VoidMessage(), + [=] (const bts::api::Result<::bts::api::admin::AdminData> r) + { + if(r.value()) + _admin_data = *r.value(); + }); _admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) From fdb462eda4f635ab12e0cac4ac660623c2355a89 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:34:46 -0400 Subject: [PATCH 085/198] simplify margin server states --- .../sparkd/position/MarginServiceServer.cpp | 35 +++++-------------- .../sparkd/position/MarginServiceServer.h | 2 -- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 6f7d42b96..9557b8a1a 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -33,7 +33,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _publisher(make_margin_data_stateful_publisher()), _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), - _timer(_dispatcher, 60000, [=]() { publish_all();} ), + _timer(_dispatcher, 20000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), //state below @@ -145,7 +145,12 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M report.set_account(result.account()); report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); - update_report_with_account(report, result.account()); + auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + } double netliq = report.leverage_factor() * report.cash_balance(); if(!bts::os::is_nan(result.maint_margin())) @@ -158,28 +163,6 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M _report_publisher.flush(); } -void MarginServiceServer::update_report_with_account(const std::string& account) -{ - auto it = _last_report.find(account); - if(it != _last_report.end()) - { - api::position::ExcessLiquidityReport report = it->second; - update_report_with_account(report, account); - _report_publisher.add_or_update(report); - _report_publisher.flush(); - } -} - -void MarginServiceServer::update_report_with_account(api::position::ExcessLiquidityReport& report, - const std::string& account) -{ - auto acct = AdminServiceUtils::find_account(_admin_data, account, false); - if(acct && acct->has_margin_limit()) - { - report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); - } -} void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -207,7 +190,7 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report_with_account(request.account()); + _last_update[request.account()] = 0; }); } } @@ -238,7 +221,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report_with_account(request.account()); + _last_update[request.account()] = 0; }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 27ff1e3f6..760d1f459 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -44,8 +44,6 @@ public: private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); - void update_report_with_account(const std::string&); - void update_report_with_account(api::position::ExcessLiquidityReport&, const std::string&); void publish_all(); private: From 6bc293a58e30873c22548e1e855c3d00c6b32ec0 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:35:29 -0400 Subject: [PATCH 086/198] add mic for DME --- src/web/ui/src/Users/Types.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 869e2f2b9..51b83e88a 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -70,4 +70,5 @@ let CMEMicMap:Map = Map.empty .Add("XCME", bts.api.CMEMics.CME) .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) - .Add("XCEC", bts.api.CMEMics.COMEX) \ No newline at end of file + .Add("XCEC", bts.api.CMEMics.COMEX) + .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file From f2f06d76dedffb4430a8767423b34f938287a817 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:43:28 -0400 Subject: [PATCH 087/198] PR feedback --- src/lib/utils/AuthSessionManager.cpp | 8 ++++---- src/lib/utils/AuthToken.cpp | 13 +++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 6170fdb40..dddb415fd 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -86,7 +86,7 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t return true; if(datetime::ll_diff_in_us(datetime::ll_now(), _expiration) < 0) { - LOG(Gen,Error, "Your BTS Keycode is expired!"); + LOG(User,Error, "Your BTS Keycode is expired!"); if(msg) *msg = "Your BTS Keycode is EXPIRED! Please contact sales@bluetradesys.com"; return false; @@ -105,18 +105,18 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t if(it != _map.end()) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Replacing session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Replacing session {} ", tok.id()); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Creating session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Creating session {} ", tok.id()); return true; } if(msg) *msg = "KEYCODES: Not Enough Logins available for session"; - LOG(Gen, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); + LOG(User, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); return false; } diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index ebd753957..2423638a8 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -53,7 +53,6 @@ AuthSessionManager& session_manager() bool requires_auth_session(const admin::BTSUser& user) { - bool needs_session = false; //if the user can trade in any account or see market data, it needs a session if(user.has_user_data() && user.user_data().has_account_permissions() && @@ -62,10 +61,7 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().account_permissions().account_permissions()) { if(i.second.has_trading_permission() && i.second.trading_permission().has_permissions()) - { - needs_session = true; - break; - } + return true; } } @@ -77,14 +73,11 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().exchange_user_data().cme_data().md_permissions()) { if(i.enabled()) - { - needs_session = true; - break; - } + return true; } } } - return needs_session; + return false; } AuthToken generate_token(const admin::BTSUser& user, std::string* msg) From 4654cd47391801bb961ab812fb2218c0eb396f4a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 18:29:10 -0400 Subject: [PATCH 088/198] changes in margin workflow for webui --- .../sparkd/position/MarginServiceServer.cpp | 56 +++++++++++++++---- .../sparkd/position/MarginServiceServer.h | 2 + .../sparkd/position/PositionAggregator.cpp | 15 ++++- .../sparkd/position/PositionAggregator.h | 2 + 4 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 9557b8a1a..8a2551595 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -40,16 +40,18 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _lock(), _last_update(), _admin_data(), - _last_report() + _last_report(), + _first_time(true) { LOG(Gen, Info, "MarginServiceServer: service started"); - _admin_service.get_admin_data(api::VoidMessage(), - [=] (const bts::api::Result<::bts::api::admin::AdminData> r) - { - if(r.value()) - _admin_data = *r.value(); - }); + // _admin_service.get_admin_data(api::VoidMessage(), + // [=] (const bts::api::Result<::bts::api::admin::AdminData> r) + // { + // if(r.value()) + // _admin_data = *r.value(); + // }); + _admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) @@ -57,9 +59,20 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: std::scoped_lock l(_lock); bts_assert(update.all().size() == 1); _admin_data = *update.all()[0]; - }); + + if(_first_time) + { + auto accts = AdminServiceUtils::accounts(_admin_data, false); + for(const auto& i : accts) + { + MarginResult margin; margin.Clear(); margin.set_account(i->name()); + AccountPNL pnl; pnl.Clear(); pnl.set_account_name(i->name()); + publish_excess_liquidity_report(margin, pnl); + } + _first_time = false; + } + }); - publish_all(); _timer.start(); } @@ -190,10 +203,31 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - _last_update[request.account()] = 0; + incremental_update_report(request.account()); }); } } + +//so the admin ui knows what to do +void MarginServiceServer::incremental_update_report(const std::string& account) +{ + std::scoped_lock l(_lock); + + MarginResult margin; + if(!_margin->get_last_valid_result(orderman::to(account), margin)) + { + margin.Clear(); + margin.set_account(account); + } + AccountPNL pnl; + if(!_position->query_pnl(account, pnl)) + { + pnl.Clear(); + pnl.set_account_name(account); + } + publish_excess_liquidity_report(margin, pnl); + _last_update[account] = 0; +} void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -221,7 +255,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - _last_update[request.account()] = 0; + incremental_update_report(request.account()); }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 760d1f459..d7b49d928 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -45,6 +45,7 @@ private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); void publish_all(); + void incremental_update_report(const std::string& account); private: api::admin::AdminService _admin_service; @@ -61,6 +62,7 @@ private: std::map _last_update; bts::api::admin::AdminData _admin_data; std::map _last_report; + bool _first_time; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 0bcaeb329..45a83dd07 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -84,6 +84,17 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) mainStr.erase(pos, toErase.length()); } +bool PositionAggregator::query_pnl(const std::string& account, api::position::AccountPNL& pnl) +{ + auto pit = _pnl_map.find(account); + if(pit != _pnl_map.end()) + { + pnl = pit->second; + return true; + } + return false; +} + bool PositionAggregator::query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since) @@ -112,9 +123,7 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; - auto pit = _pnl_map.find(account); - if(pit != _pnl_map.end()) - pnl = pit->second; + query_pnl(account, pnl); return true; } return false; diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 6b46e5429..3553b17d5 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -23,6 +23,8 @@ public: bool query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since = nullptr); + + bool query_pnl(const std::string& account, api::position::AccountPNL& pnl); private: api::position::PositionService _position_service; From 092e63e300016010bb1f68b4420c6c19663adc79 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 16:54:40 -0500 Subject: [PATCH 089/198] OffsetAlgo attach impl (take 2) --- src/client/spark/Orders/OrderDataHelper.cs | 2 +- .../orderman_utils/orderman_utils.cpp | 12 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 127 +++++++++++------- .../orders/algo/algo_orders/OffsetAlgo.h | 7 +- 4 files changed, 90 insertions(+), 58 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 9b8113547..ba6699cdf 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -624,7 +624,7 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top, - //CustomOrderDefinition.CustomOneofCase.Offset + CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index cb18aea6c..a2fbae1ba 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,8 +14,8 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: - // case CustomOrderDefinition::kOffset: - // return true; + case CustomOrderDefinition::kOffset: + return true; default: return false; } @@ -45,10 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); - // case CustomOrderDefinition::kOffset: - // return - // cdef.offset().has_child() && - // can_consume_attachment(cdef.offset().child().custom_case()); + case CustomOrderDefinition::kOffset: + return + cdef.offset().has_child() && + can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index 4ca18e87a..3b09525cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -1,6 +1,6 @@ +#include "lib/orderman/orders/algo/IAlgoServices.h" #include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/utils/PBUtils.h" @@ -20,7 +20,7 @@ struct OffsetAlgo::PImpl { ChildTemplate *child_template = nullptr; Book last_book; uint32_t tick_offset_on_deploy; - uint32_t quantity; + double child_price = os::nan(); }; OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} @@ -31,10 +31,6 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { auto &def = serv.definition(); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_offset()); - if (serv.is_attaching()) { - return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, - "Attaching to offset algo is not supported"}; - } // Validate the offset part of the definition auto &offset = def.custom_def().offset(); if (!offset.has_child() && @@ -45,64 +41,64 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { "order to attach to"}; } me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); - // if we are not attaching create a child template so we can - // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().offset().child(); - me->child_template = &(serv.make_child_template(child_def)); + if (!serv.is_attaching()) { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); + } return {}; } void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; - me->quantity = algo.quantity().value(); bts_assert(me->child_template); algo.subscribe_book(SecurityKey(algo.security().id())); } -void OffsetAlgo::do_launch_attached(IAlgoServices &, OrderKey, - ChildState) { - bts_assert(false); +void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, + ChildState st) { + me->algo = &algo; + me->child_key = k; + me->child_price = st.price.value(); + algo.subscribe_book(SecurityKey(algo.security().id())); } void OffsetAlgo::do_update(api::orderman::Update const &update) { LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - bts_assert(!algo().is_attaching()); - // validate update - if (update.has_custom() && !update.custom().has_offset()) { - algo().terminate_error("Invalid update"); - return; + if (update.has_custom()) { + if (!update.custom().has_offset()) { + algo().terminate_error("Invalid update"); + return; + } + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); } - me->quantity = update.quantity(); - // apply update switch (me->status) { case Status::WAITING_FOR_MD: if (update.has_custom()) { - // already asserted that the child is Offset - me->tick_offset_on_deploy = - update.custom().offset().tick_offset_on_deploy(); - auto &def = algo().definition(); - auto child_def = def; - *child_def.mutable_custom_def() = update.custom().offset().child(); - me->child_template = &(algo().make_child_template(child_def)); + if (algo().is_attaching()) { + // don't change the child's price + // (need md to determine initial deploy price) + bts_assert(!os::is_nan(me->child_price)); + algo().update_child(me->child_key, mk_child_update(update, me->child_price)); + } else { + auto &def = algo().definition(); + auto child_def = def; + *child_def.mutable_custom_def() = update.custom().offset().child(); + me->child_template = &(algo().make_child_template(child_def)); + } } break; case Status::DEPLOYED: - Update child_update; - child_update.set_quantity(me->quantity); - child_update.set_price(algo().price().value()); - if (update.has_custom()) { - auto &offset_update = update.custom().offset(); - *child_update.mutable_custom() = offset_update.child(); - } - algo().update_child(me->child_key, child_update); + algo().update_child(me->child_key, mk_child_update(update)); break; } } void OffsetAlgo::on_book(SecurityKey, Book const &b) { - bts_assert(!algo().is_attaching()); me->last_book = b; // log top of book LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", @@ -114,9 +110,22 @@ void OffsetAlgo::on_book(SecurityKey, Book const &b) { try_deploy(); } +Update OffsetAlgo::mk_child_update(const Update &source, const double &price_override) { + Update target; + if (source.has_custom()) { + bts_assert(source.custom().has_offset()); + *target.mutable_custom() = source.custom().offset().child(); + } + if (!os::is_nan(price_override)) + target.set_price(price_override); + else + target.set_price(source.price()); + target.set_quantity(source.quantity()); + return target; +} + void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); - bts_assert(!algo().is_attaching()); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; if (!top_psz.size()) { @@ -130,23 +139,41 @@ void OffsetAlgo::try_deploy() { } else { const double &offset = securities::tick_size(algo().security()).value() * me->tick_offset_on_deploy; - const auto &price = - securities::worsen_price(side, Price(top_psz.price()), Price(offset)); - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " - "away).", - algo().order_key().value(), side, me->quantity, - price.value(), me->tick_offset_on_deploy); - // deploy - me->child_key = - algo().launch_child(*me->child_template, Price(price), Quantity(me->quantity)); + me->child_price = + securities::worsen_price(side, Price(top_psz.price()), Price(offset)).value(); + if (algo().is_attaching()) { + // log imminent update + LOG(OrderMan, Diag, + "OffsetAlgo order {} attaching child {}. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), + me->child_key.value(), side, + algo().quantity().value(), + me->child_price, me->tick_offset_on_deploy); + // update + Update child_update; + child_update.set_quantity(algo().quantity().value()); + child_update.set_price(me->child_price); + algo().update_child(me->child_key, child_update); + } else { + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, + algo().quantity().value(), + me->child_price, me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, Price(me->child_price), algo().quantity()); + } algo().set_ladder_visibility(false); me->status = Status::DEPLOYED; } } void OffsetAlgo::on_child_change(OrderKey, ChildState const &st) { + me->child_price = st.price.value(); algo().update_fill_state(st.total_fills, st.last_price); switch (st.status) { case ChildStatus::WORKING: diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h index 14097f638..4e73e2f23 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h @@ -2,6 +2,8 @@ #include "lib/orderman/orders/algo/IAlgoOrder.h" +using Update = bts::api::orderman::Update; + namespace bts { namespace orderman { @@ -17,7 +19,7 @@ class OffsetAlgo : public IAlgoOrder { OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; void do_launch(IAlgoServices &) override; void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; - void do_update(api::orderman::Update const &) override; + void do_update(Update const &) override; void on_book(SecurityKey, Book const &) override; void on_child_change(OrderKey, ChildState const &) override; @@ -25,6 +27,9 @@ class OffsetAlgo : public IAlgoOrder { enum class Status; struct PImpl; std::unique_ptr me; + + static Update mk_child_update(const Update& source_update, const double& price_override = os::nan()); + IAlgoServices &algo() const; void try_deploy(); }; From 9d924fa4ba2c7c5479c2caafae1c427149977751 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 10:14:01 -0400 Subject: [PATCH 090/198] Margin table formatting --- src/web/ui/src/Accounts/View.fs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index c6eedaa7b..a0cb5baf9 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -109,16 +109,16 @@ let marginView model dispatch = { cells = [ - TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) - TableControl.Cell (str model.marginScratch.account) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.accountPnl.dayPnl))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) + TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) + TableControl.Cell (str model.marginData.account) + TableControl.Cell (str (System.String.Format("{0:f2}", model.marginData.leverageFactor))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.cashBalance))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.nonoptValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.optValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.initialMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.accountPnl.dayPnl))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) // TableControl.Cell (str margin.settleQualifier) @@ -129,7 +129,7 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.number "Leverage Factor:" (int model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) + Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] From 4e6e97d90b9d74ab136ed75a229da73f81ff8b39 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 3 Jul 2019 13:40:41 -0400 Subject: [PATCH 091/198] Added unit test for splitter compute_desired_sizes. --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 4 - .../orders/algo/algo_orders/SplitterAlgo.h | 4 + .../algo/algo_orders/tests/splitter_tests.cpp | 306 +++++++++++------- 3 files changed, 190 insertions(+), 124 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 786e2ad2d..f9d79c2db 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -103,10 +103,6 @@ void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { sync_orders(); } -struct MinMax { - uint32_t min, max; -}; - // TEST case: // total = 300, clip = 100 // constraints: 50,50,50,50 diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index ff2d86598..927bd87f3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -28,5 +28,9 @@ private: void terminate() const; }; +// exposed for unit testing purposes. +struct MinMax {uint32_t min, max;}; +void compute_desired_sizes(uint32_t , uint32_t , + const std::vector& , std::vector* ); }}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index adb06283b..5139d971a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -1,11 +1,13 @@ -#include "catch/catch.hpp" #include "../SplitterAlgo.h" #include "AlgoTestDriver.h" +#include "catch/catch.hpp" #include "lib/orderman/orderman_utils/Book.h" +#include #include -#include #include +#include +#include "lib/utils/bts_chrono.h" using namespace std; using namespace bts::orderman::splitter; @@ -25,33 +27,75 @@ namespace test { */ -constexpr auto some_price = md::IntPrice { 128000, -3 }; +constexpr auto some_price = md::IntPrice{128000, -3}; -using ExpectedCount = utils::ValueWrapper; +using ExpectedCount = utils::ValueWrapper; struct SimpleCase { ExpectedCount expected_orders; Quantity target; SplitterOrderDefinition sod; }; -SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, uint32_t target) { +SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, + uint32_t target) { SimpleCase result; result.expected_orders = expected; - result.target = Quantity {target}; + result.target = Quantity{target}; result.sod.set_max_order_qty(max_size); result.sod.set_exposed_qty(exposed); return result; } +TEST_CASE("compute_desired_sizes fuzzing", "[algo][splitter]") { + srand((unsigned)time(0)); + + auto start = Timer::now(); + + while (sec_diff(Timer::now(),start) < 5) { + uint32_t total = rand() % 100 + 1; + uint32_t clip = rand() % 4 + 1; + std::vector constraints(rand() % 10); + std::vector result; + + uint32_t all_fills = 0; + for (auto &mm : constraints) { + uint32_t order_working = rand() % 2; + uint32_t fills = rand() % 2 * clip; + all_fills += fills; + mm = {fills, order_working ? fills + rand() % clip + 1 : fills}; + } + if (all_fills < total) { + compute_desired_sizes(total, clip, constraints, &result); + uint32_t exposed_qty = 0; + for (auto q : result) + exposed_qty += q.value(); + + bool clip_size_honored = true; + for (auto q : result) + clip_size_honored = clip_size_honored && (q.value() <= clip); + + if (exposed_qty != total || !clip_size_honored) { + std::cout << "total: " << total << "\n" + << "clip: " << clip << "\n{ "; + + for (auto mm : constraints) + std::cout << "{" << mm.min << "," << mm.max << "},"; + std::cout << " }\n"; + } + REQUIRE(clip_size_honored); + REQUIRE(exposed_qty == total); + } + } +} TEST_CASE("initial orders", "[algo][splitter]") { std::vector cases; - cases.push_back(mkSimple(ExpectedCount {10},10, 100, 50)); - cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount{11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 150)); - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto expected = tcase.expected_orders.value(); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -67,15 +111,15 @@ TEST_CASE("initial orders", "[algo][splitter]") { TEST_CASE("completes on target", "[algo][splitter]") { std::vector cases; - cases.push_back(mkSimple(ExpectedCount {3}, 30, 90, 50)); - cases.push_back(mkSimple(ExpectedCount {10}, 10, 100, 50)); - cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); - cases.push_back(mkSimple(ExpectedCount {4}, 13, 50, 150)); - cases.push_back(mkSimple(ExpectedCount {12}, 13, 150, 50)); + cases.push_back(mkSimple(ExpectedCount{3}, 30, 90, 50)); + cases.push_back(mkSimple(ExpectedCount{10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount{11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{4}, 13, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{12}, 13, 150, 50)); - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto expected = tcase.expected_orders.value(); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -88,48 +132,47 @@ TEST_CASE("completes on target", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); SECTION("Fill completely") { - auto orders = state.child_orders(); + auto orders = state.child_orders(); // Fill the order size_t filled = 0; size_t iterations = 0; - while(state.state() == AlgoState::RUNNING) { + while (state.state() == AlgoState::RUNNING) { // loop to allow more orders to be added ++iterations; REQUIRE(iterations < 999); - for (const auto& order : orders) { - state.fill(order.key, Price (some_price.price()), order.cstate.quantity); + for (const auto &order : orders) { + state.fill(order.key, Price(some_price.price()), + order.cstate.quantity); filled += order.cstate.quantity.value(); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; - } - else { + } else { REQUIRE(state.state() == AlgoState::RUNNING); } } } } SECTION("fill one by one") { - const auto& orders = state.child_orders(); + const auto &orders = state.child_orders(); // Fill 1 per iteration. // Algo should add more orders if not enough are visible initially size_t filled = 0; size_t iterations = 0; - while(state.state() == AlgoState::RUNNING) { + while (state.state() == AlgoState::RUNNING) { ++iterations; - REQUIRE(iterations < 999);//not making progress - for (const auto& order : orders) { + REQUIRE(iterations < 999); // not making progress + for (const auto &order : orders) { if (order.cstate.status == ChildStatus::WORKING) { - auto price = Price {some_price.price()}; - state.fill(order.key, price, Quantity {1}); + auto price = Price{some_price.price()}; + state.fill(order.key, price, Quantity{1}); filled += 1; // Fills should never cause new orders to get added REQUIRE(state.child_orders().size() == expected); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; - } - else { + } else { REQUIRE(state.state() == AlgoState::RUNNING); } } @@ -144,30 +187,22 @@ TEST_CASE("updates", "[algo][splitter]") { std::vector, SimpleCase>> cases; // reduce max order size, increase # orders - cases.push_back({ - mkSimple(ExpectedCount {10} /*order count*/, 10 /*max*/, 100 /*exposed*/, 50 /*target*/), - {}, - mkSimple(ExpectedCount {20}, 5, 100, 50) - }); + cases.push_back({mkSimple(ExpectedCount{10} /*order count*/, 10 /*max*/, + 100 /*exposed*/, 50 /*target*/), + {}, + mkSimple(ExpectedCount{20}, 5, 100, 50)}); /// reduce max order size, keep # orders constant - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {}, - mkSimple(ExpectedCount {10}, 5, 50, 50) - }); - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {5,5}, - mkSimple(ExpectedCount {8}, 5, 50, 40) - }); - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {5,5}, - mkSimple(ExpectedCount {18}, 5, 100, 50) - }); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {}, + mkSimple(ExpectedCount{10}, 5, 50, 50)}); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {5, 5}, + mkSimple(ExpectedCount{8}, 5, 50, 40)}); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {5, 5}, + mkSimple(ExpectedCount{18}, 5, 100, 50)}); - - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto case_init = std::get<0>(tcase); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -178,14 +213,14 @@ TEST_CASE("updates", "[algo][splitter]") { state.launch(); REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == case_init.expected_orders.value()); - for (const auto& o : state.child_orders()) { + for (const auto &o : state.child_orders()) { if (o.cstate.status == ChildStatus::WORKING) { REQUIRE(o.cstate.quantity.value() <= case_init.sod.exposed_qty()); } } - for(auto q : std::get<1>(tcase)) { - state.fill({}, Quantity {q}); + for (auto q : std::get<1>(tcase)) { + state.fill({}, Quantity{q}); } Update update; @@ -198,9 +233,11 @@ TEST_CASE("updates", "[algo][splitter]") { state.do_update(update); REQUIRE(state.state() == AlgoState::RUNNING); size_t working = 0; - for (const auto& c : state.child_orders()) if (c.cstate.status == ChildStatus::WORKING) working += 1; + for (const auto &c : state.child_orders()) + if (c.cstate.status == ChildStatus::WORKING) + working += 1; REQUIRE(working == case_next.expected_orders.value()); - for (const auto& o : state.child_orders()) { + for (const auto &o : state.child_orders()) { if (o.cstate.status == ChildStatus::WORKING) { REQUIRE(o.cstate.quantity.value() <= case_next.sod.exposed_qty()); } @@ -218,21 +255,23 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { // expected: 100, 100, 50, 50 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - for (const auto& order : state.child_orders()) { - state.fill(order.key, {}, Quantity {50}); + for (const auto &order : state.child_orders()) { + state.fill(order.key, {}, Quantity{50}); } // Reduce exposed quantity @@ -244,12 +283,16 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 300); - + // need this to be 100,100,50,50 not 100,100,100 - std::set actual, expected {100,100,50,50}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + std::set actual, expected{100, 100, 50, 50}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -264,23 +307,25 @@ TEST_CASE("Reduction with fills 2", "[algo][splitter]") { // expected: 100, 100, 65, 35 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - state.fill({}, Quantity {35}); - state.fill({}, Quantity {45}); - state.fill({}, Quantity {55}); - state.fill({}, Quantity {65}); + state.fill({}, Quantity{35}); + state.fill({}, Quantity{45}); + state.fill({}, Quantity{55}); + state.fill({}, Quantity{65}); // Reduce exposed quantity Update update; @@ -291,12 +336,16 @@ TEST_CASE("Reduction with fills 2", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 300); - + // need this to be 100,100,50,50 not 100,100,100 - std::set actual, expected {100,100,65,35}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + std::set actual, expected{100, 100, 65, 35}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -311,23 +360,25 @@ TEST_CASE("Reduction with fills 3", "[algo][splitter]") { // expected: 66, 55, 45, 35 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - state.fill({}, Quantity {35}); - state.fill({}, Quantity {45}); - state.fill({}, Quantity {55}); - state.fill({}, Quantity {65}); + state.fill({}, Quantity{35}); + state.fill({}, Quantity{45}); + state.fill({}, Quantity{55}); + state.fill({}, Quantity{65}); // Reduce exposed quantity Update update; @@ -338,11 +389,15 @@ TEST_CASE("Reduction with fills 3", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 201); - - std::set actual, expected {66,55,45,35}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + + std::set actual, expected{66, 55, 45, 35}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -356,17 +411,19 @@ TEST_CASE("reduce to completion", "[algo][splitter]") { // expected: algo transitions to copmleted state canceling 2 orders api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills state.fill({}, Quantity{100}); @@ -380,11 +437,10 @@ TEST_CASE("reduce to completion", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::COMPLETED); size_t total = 0; - for (const auto& order : state.child_orders()) { + for (const auto &order : state.child_orders()) { if (order.cstate.status == ChildStatus::WORKING) { total += order.cstate.quantity.value(); - } - else { + } else { total += order.cstate.total_fills.value(); } } @@ -401,17 +457,19 @@ TEST_CASE("reduce to completion 2", "[algo][splitter]") { // expected: algo transitions to copmleted state canceling 2 orders api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills state.fill({}, Quantity{100}); @@ -437,25 +495,28 @@ TEST_CASE("Async Fills", "[algo][splitter]") { api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(20); splitter->set_exposed_qty(80); - AlgoTestDriver state(def, some_price, Quantity {80}); - + AlgoTestDriver state(def, some_price, Quantity{80}); + REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 20); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 20); + } // Set up some instant fills bool applied_fills = false; - state.on_child_changing([&](const auto&) { - if (applied_fills) return; + state.on_child_changing([&](const auto &) { + if (applied_fills) + return; applied_fills = true; // 7 fills on the last order which is has a size reduction in flight - state.fill(state.child_orders().rbegin()->key, {}, Quantity {7}); + state.fill(state.child_orders().rbegin()->key, {}, Quantity{7}); }); Update update; @@ -465,13 +526,14 @@ TEST_CASE("Async Fills", "[algo][splitter]") { // This should trigger 1 order to be reduced to size 5 from 20 // in the meantime we'll trigger fills of size 7 // This results in an overfill for the 5 lot order - // And the + // And the state.do_update(update); - // expected result: + // expected result: // 7 fills, exposed_qty 65 = 58 active uint32_t active = 0; - for (const auto& o : state.child_orders()) active += o.active_qty(); + for (const auto &o : state.child_orders()) + active += o.active_qty(); REQUIRE(active == 58); } @@ -480,23 +542,25 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { // Increase the size to 400 so we launch a 4th order // Then instantly send another update to 350 - // NOTE: this test is not very good due to limitations in the test driver + // NOTE: this test is not very good due to limitations in the test driver // I'm leaving it in because it passes but if it starts failing in the future // it's probably OK to disable it api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(300); - AlgoTestDriver state(def, some_price, Quantity {300}); - + AlgoTestDriver state(def, some_price, Quantity{300}); + REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 3); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } Update update; update.set_price(state.price().value()); @@ -505,7 +569,7 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { // Set up some instant fills bool applied_second_update = false; - state.on_child_launching([&,update](const auto&) mutable { + state.on_child_launching([&, update](const auto &) mutable { if (!applied_second_update) { applied_second_update = true; update.mutable_custom()->mutable_splitter()->set_exposed_qty(350); @@ -515,12 +579,14 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { state.do_update(update); - // expected result: + // expected result: // 350 exposed, NOT 450 uint32_t quantity = 0; - for (const auto& o : state.child_orders()) quantity += o.active_qty(); + for (const auto &o : state.child_orders()) + quantity += o.active_qty(); REQUIRE(quantity == 350); } - -}}}//namespace \ No newline at end of file +} // namespace test +} // namespace orderman +} // namespace bts From 08c27625009f7735b75d82a1e88263a1af25d0da Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 3 Jul 2019 13:41:07 -0400 Subject: [PATCH 092/198] SP-87 PR feedback 1/2 --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 30 +++++++++++++++---- .../orders/algo/algo_orders/SplitterAlgo.h | 2 ++ .../algo/algo_orders/tests/splitter_tests.cpp | 2 +- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 8e3a54b85..9afc50d9f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -18,7 +18,6 @@ using namespace api::orderman; struct ChildOrderState { OrderKey key; ChildState state; - uint32_t remaining() const { return state.quantity.value() - state.total_fills.value(); } uint32_t min_qty() const { return state.total_fills.value(); } }; @@ -55,10 +54,12 @@ OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { "max order quantity and exposed quantity must be greater than 0"}; } - // Create child template - auto child_def = def; - *child_def.mutable_custom_def() = splitter.child(); - me->child_template = &ibl.make_child_template(child_def); + if (me->exposed_qty < me->target_qty) { + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Exposed quantity must be greater than or equal to target quantity"}; + } + + update_child_template(ibl); me->orders.reserve(me->exposed_qty / me->clip + 1); @@ -88,9 +89,16 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { me->clip = splitter.max_order_qty(); } me->exposed_qty = splitter.exposed_qty(); + update_child_template(algo()); } me->target_qty = update.quantity(); + if (me->exposed_qty < me->target_qty) { + algo().cancel("Exposed quantity must be greater than or equal to target quantity"); + return; + } + + //todo: forward update.custom() to sync_orders sync_orders(); } void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { @@ -120,6 +128,8 @@ void compute_desired_sizes(uint32_t total, uint32_t clip, const std::vector overfills ? + auto citer = constraints.begin(); while(total > 0) { auto current = std::min(total, clip); @@ -166,6 +176,16 @@ void SplitterAlgo::terminate() const { } me->is_terminated = true; } + +void SplitterAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl) { + // Create child template + auto child_def = ibl.definition(); + bts_assert(child_def.has_custom_def()); + bts_assert(child_def.custom_def().has_splitter()); + auto& splitter = child_def.custom_def().splitter(); + *child_def.mutable_custom_def() = splitter.child(); + me->child_template = &ibl.make_child_template(child_def); +} void SplitterAlgo::sync_orders() { if (me->is_terminated) return; diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index 04258dafd..07eb15e41 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -48,6 +48,8 @@ private: void sync_orders(); bool is_complete() const; void terminate() const; + + void update_child_template(IBeforeLaunchAlgoServices&); }; // exposed for unit testing purposes. diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index 923c39fcb..03f52ef09 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -529,7 +529,7 @@ TEST_CASE("Async Fills", "[algo][splitter]") { Update update; update.set_price(state.price().value()); - update.set_quantity(state.quantity().value()); + update.set_quantity(65); update.mutable_custom()->mutable_splitter()->set_exposed_qty(65); // This should trigger 1 order to be reduced to size 5 from 20 // in the meantime we'll trigger fills of size 7 From 7f2988ec57471346036ffdd327eca1fa58867920 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 3 Jul 2019 14:07:43 -0400 Subject: [PATCH 093/198] SP-87 PR feedback 2/2 --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 19 +++++++++++++------ .../orders/algo/algo_orders/SplitterAlgo.h | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 9afc50d9f..78d257102 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -82,14 +82,18 @@ void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { bts_assert(false); } void SplitterAlgo::do_update(const api::orderman::Update& update) { - // Update # child orders + const CustomOrderDefinition* new_child_def = nullptr; if (update.has_custom() && update.custom().has_splitter()) { auto& splitter = update.custom().splitter(); if (splitter.max_order_qty() > 0) { me->clip = splitter.max_order_qty(); } me->exposed_qty = splitter.exposed_qty(); - update_child_template(algo()); + + if (splitter.has_child()) { + update_child_template(algo()); + new_child_def = &splitter.child(); + } } me->target_qty = update.quantity(); @@ -98,8 +102,7 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { return; } - //todo: forward update.custom() to sync_orders - sync_orders(); + sync_orders(new_child_def); } void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { for (auto& child : me->orders) { @@ -187,7 +190,7 @@ void SplitterAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl) { me->child_template = &ibl.make_child_template(child_def); } -void SplitterAlgo::sync_orders() { +void SplitterAlgo::sync_orders(const api::orderman::CustomOrderDefinition* new_child_def) { if (me->is_terminated) return; if (is_complete()) { terminate(); @@ -219,10 +222,14 @@ void SplitterAlgo::sync_orders() { // Check the current order's quantity and modify it to match desired qty if (oiter->state.status == ChildStatus::WORKING) { if (oiter->state.price != price || - oiter->state.quantity != qty) { + oiter->state.quantity != qty || + new_child_def != nullptr) { Update update; update.set_quantity(qty.value()); update.set_price(price.value()); + if (new_child_def != nullptr) { + *update.mutable_custom() = *new_child_def; + } algo().update_child(oiter->key, update); } } diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index 07eb15e41..92850aa7d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -45,7 +45,7 @@ public: private: IAlgoServices& algo() const; - void sync_orders(); + void sync_orders(const api::orderman::CustomOrderDefinition* new_child_def = nullptr); bool is_complete() const; void terminate() const; From 500e5b5fe4a40a7ad49bbcc955ac2720d2319e0c Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 14:19:51 -0400 Subject: [PATCH 094/198] Polling and commas --- src/web/ui/src/Accounts/State.fs | 11 ++++++----- src/web/ui/src/Accounts/View.fs | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e38c29882..5976740c3 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -210,14 +210,15 @@ let update msg (model:Model) : Model * Cmd = | GetMarginData -> { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) | UpdateMarginData newData -> + let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), (model.marginData.leverageFactor = model.marginScratch.leverageFactor), (model.marginData.cashBalance = model.marginScratch.cashBalance) with - | true, _, _ -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false, true, true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, Cmd.Empty - | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, Cmd.Empty - | false, false, false -> {model with marginData = newData}, Cmd.Empty + | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd + | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd + | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd + | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd + | false, false, false -> {model with marginData = newData}, cmd | SetMarginCashBalance newBalance -> { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index a0cb5baf9..13efe0ae0 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -11,10 +11,14 @@ open Fable open System open bts.co2 open Elmish.React.Common - +open Fable.Core.JsInterop +open Fable.Core let accountIsSelected (initialState:BTSAccount) (scratch:BTSAccount) = scratch <> initialState +[] +let withCommas (n:float) : string = jsNative + let selectedAccount model = match model.adminData with | Some data -> @@ -90,7 +94,7 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str "Account") - TableControl.Cell (div [Style [MinWidth "3em"]][str "As Of"]) + TableControl.Cell (div [Style [MinWidth "3em"]][str "Time"]) TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Cash Balance") @@ -111,17 +115,14 @@ let marginView model dispatch = [ TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) TableControl.Cell (str model.marginData.account) - TableControl.Cell (str (System.String.Format("{0:f2}", model.marginData.leverageFactor))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.cashBalance))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.nonoptValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.optValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.initialMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.maintMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.accountPnl.dayPnl))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.excessLiquidity))) - // TableControl.Cell (str margin.portfolioId) - // TableControl.Cell (str margin.settleIndicator) - // TableControl.Cell (str margin.settleQualifier) + TableControl.Cell (str (withCommas model.marginData.leverageFactor)) + TableControl.Cell (str (withCommas model.marginData.cashBalance)) + TableControl.Cell (str (withCommas model.marginData.marginResult.nonoptValue)) + TableControl.Cell (str (withCommas model.marginData.marginResult.optValue)) + TableControl.Cell (str (withCommas model.marginData.marginResult.initialMargin)) + TableControl.Cell (str (withCommas model.marginData.marginResult.maintMargin)) + TableControl.Cell (str (withCommas model.marginData.accountPnl.dayPnl)) + TableControl.Cell (str (withCommas model.marginData.excessLiquidity)) ] className = "" header = None From 4f7fcc563465c2ef6bde35d1876af46dbfb1e8ec Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 14:54:40 -0400 Subject: [PATCH 095/198] Move loss limits to the top of the limits page --- src/web/ui/src/Accounts/View.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 13efe0ae0..6e49e415b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -737,9 +737,10 @@ let securityLimitsView model dispatch = let LimitsView model dispatch = div [ Class "limits-container"] [ + lossLimitView model dispatch + br [] lazyClipLimitsView model dispatch lazyProductLimitsView model dispatch - lossLimitView model dispatch //securityLimitsView model dispatch accountControls model dispatch From ebad5b389f2d9748fa80ecac08c81d1ed6da1615 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 16:01:50 -0400 Subject: [PATCH 096/198] Fix Save button --- src/web/ui/src/Accounts/State.fs | 7 ++++--- src/web/ui/src/Accounts/View.fs | 17 ++++++++++------- src/web/ui/src/Global.fs | 4 +++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 5976740c3..717c2d43d 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -2,6 +2,7 @@ module Accounts.State open Accounts.Types open bts.api.admin +open Global open Elmish open Fable.PowerPack.PromiseImpl open Fable.Import @@ -212,8 +213,8 @@ let update msg (model:Model) : Model * Cmd = | UpdateMarginData newData -> let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), - (model.marginData.leverageFactor = model.marginScratch.leverageFactor), - (model.marginData.cashBalance = model.marginScratch.cashBalance) with + (compareDouble model.marginData.leverageFactor model.marginScratch.leverageFactor 10000u), + (compareDouble model.marginData.cashBalance model.marginScratch.cashBalance 10000u) with | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd @@ -237,7 +238,7 @@ let update msg (model:Model) : Model * Cmd = | SaveScratch -> match isNewAccount model.scratch with | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch model ) id (box>>ErrorOccured) - | false -> model, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model ) id (box>>ErrorOccured) + | false -> { model with marginScratch = model.marginData }, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model ) id (box>>ErrorOccured) | ErrorOccured msg -> Global.alert Global.Error (string msg) Browser.console.log msg diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 6e49e415b..f077e2ac2 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -16,9 +16,12 @@ open Fable.Core let accountIsSelected (initialState:BTSAccount) (scratch:BTSAccount) = scratch <> initialState -[] +[] let withCommas (n:float) : string = jsNative +[] +let withCommasAndTwoDigits (n:float) : string = jsNative + let selectedAccount model = match model.adminData with | Some data -> @@ -117,12 +120,12 @@ let marginView model dispatch = TableControl.Cell (str model.marginData.account) TableControl.Cell (str (withCommas model.marginData.leverageFactor)) TableControl.Cell (str (withCommas model.marginData.cashBalance)) - TableControl.Cell (str (withCommas model.marginData.marginResult.nonoptValue)) - TableControl.Cell (str (withCommas model.marginData.marginResult.optValue)) - TableControl.Cell (str (withCommas model.marginData.marginResult.initialMargin)) - TableControl.Cell (str (withCommas model.marginData.marginResult.maintMargin)) - TableControl.Cell (str (withCommas model.marginData.accountPnl.dayPnl)) - TableControl.Cell (str (withCommas model.marginData.excessLiquidity)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.nonoptValue)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.optValue)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.initialMargin)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.maintMargin)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.accountPnl.dayPnl)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.excessLiquidity)) ] className = "" header = None diff --git a/src/web/ui/src/Global.fs b/src/web/ui/src/Global.fs index 4b6dfe9df..41c76cca2 100644 --- a/src/web/ui/src/Global.fs +++ b/src/web/ui/src/Global.fs @@ -11,6 +11,8 @@ type AlertLevel = [] let alert (_:AlertLevel) (_:string) = Fable.Core.Exceptions.jsNative +let compareDouble (d1:double) (d2:double) (precision: uint32) = (int (d1 * (double precision))) = (int (d2 * (double precision))) + module Reflection = open Fable.Core.JsInterop @@ -21,7 +23,7 @@ module Reflection = [] let values<'a> x : 'a[] = jsNative - let iterate<'a> x : (string*'a)[] = + let iterate<'a> x : (string*'a)[] = Array.zip (keys x) (values x) let spread<'a> (a:'a) (b:obj) : 'a = Imports.DynamicService.merge (a,b) From cd68b95a3e32b8f74aff2efcf367da83a2e42a5f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 5 Jul 2019 08:19:05 -0500 Subject: [PATCH 097/198] add a mechanism for ignoring InlineUserProperty's force_override property --- .../spark/Orders/OrderPropertiesEditorVM.cs | 15 ++++++++++++--- src/client/spark/core/Utility/ViewModelBase.cs | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index bcf276bec..122ac1589 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -105,7 +105,7 @@ namespace mbts.spark { var inline_account_src = order_properties.AggregateLatest( model.factory.subscribe_accounts(), (last, change, cache) => convert_inline_account(change.New.account, cache), - (last, props, change) => convert_inline_account(props.account, change.New), + (last, props, change) => convert_inline_account(props.account, change.New, false), () => new InlineUserProperty(), new InlineOrderProperties(), DictionaryHelper.empty()); @@ -263,9 +263,18 @@ namespace mbts.spark { break; } } - InlineUserProperty convert_inline_account(InlineUserProperty account_id, IReadOnlyDictionary account_map) => + // + // Regarding the 3rd parameter, force_override_from_inline_property: + // When using an InlineUserProperty, in the context of assigning a default vs selected item, + // there is somewhat of a conflict between the IObserver> and the + // IObserver> OnNext methods. This 3rd paramter provides yet another override + // to say if the force_override should come from the inline property or if the force_override should + // be disbled, by way of the immediate return in ViewModelBase._try_auto_select when force_override + // is false. Our intent is then accomplished because we are no longer attempting to set a default/ + // selected item when the account_tuples potentially changes + InlineUserProperty convert_inline_account(InlineUserProperty account_id, IReadOnlyDictionary account_map, bool force_override_from_inline_property = true) => account_id.has_value && account_map.TryGetValue(account_id.value, out string name) ? - new InlineUserProperty(new AccountTuple(account_id.value, name), account_id.force_override) : + new InlineUserProperty(new AccountTuple(account_id.value, name), force_override_from_inline_property ? account_id.force_override : false) : new InlineUserProperty(); } diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 3800e98bf..8fa702aaf 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -820,6 +820,11 @@ namespace mbts.ui.shell { void _try_auto_select() { if (_is_user_selected_item) { + // if we have a user-selected item and the _desired_item for which we might want to set as the selected item + // isn't force_override, then no change + if (!_desired_item.force_override) { + return; + } if (desired_item_valid() && _desired_item.force_override && _try_match_item(_desired_item.value, out TValue match)) { _set_selected_item(match, SelectionReason.SettingsMandatedSelection); return; From e447096733263c4936927a3929e9ca80ddef4f92 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Jul 2019 11:00:42 -0400 Subject: [PATCH 098/198] Routed excess liquidity to OrderManager. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/MarginService.proto | 3 ++- src/lib/orderman/actors/ServiceBridge.cpp | 25 ++++++++++++++++--- src/lib/orderman/actors/ServiceBridge.h | 3 +++ .../actors/order_manager/OrderManager.cpp | 20 ++++++++++++--- .../actors/order_manager/OrderManager.h | 2 ++ .../events/ExcessLiquidityUpdateEvent.h | 25 +++++++++++++++++++ src/lib/orderman/limiter/Limiter.cpp | 1 + src/lib/orderman/limiter/Limiter.h | 3 ++- .../orderman/server/OrderServiceServer.cpp | 17 ++++++++++--- src/server/sparkd/CMakeDeps.cmake | 2 +- src/web/CMakeDeps.cmake | 2 +- src/web/ui/src/Access.fs | 1 + 13 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 src/lib/orderman/events/ExcessLiquidityUpdateEvent.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..1bf4e1c6f 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index c6479c66e..007e874e8 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -19,11 +19,12 @@ message MarginResult { double opt_value = 100; double nonopt_value = 110; double maint_margin = 120; - double initial_margin = 130; + double initial_margin = 130; } message ExcessLiquidityReport { string account = 10 [(bts.api.key)=true]; + uint32 account_id = 11; double leverage_factor = 20; double cash_balance = 30; MarginResult margin_result = 40; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 227d86c84..c85e3bfbd 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,12 +1,14 @@ #include "ServiceBridge.h" #include "lib/api/public/ServiceContext.h" +#include "lib/api/services/OrderService.pb.h" #include "lib/api/services/PositionService.pb.h" #include "lib/mercury/broker/BrokerProxy.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" +#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" @@ -15,13 +17,11 @@ #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" - -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" #include namespace bts { @@ -53,6 +53,7 @@ struct ServiceBridge::PImpl { mercury::Stream detach_order_pub; mercury::Stream new_admin_data_pub; mercury::Stream account_pnl_pub; + mercury::Stream excess_liquidity_pub; std::unordered_set known_orders; std::vector> admin_data_updates; mercury::BrokerProxy &service_call_marshaller; @@ -85,6 +86,7 @@ void ServiceBridge::init() { me->detach_order_pub = make_stream(); me->new_admin_data_pub = make_stream(); me->account_pnl_pub = make_stream(); + me->excess_liquidity_pub = make_stream(); me->ready.set_value(); } @@ -236,6 +238,21 @@ void ServiceBridge::update_account_pnl( }); } +void ServiceBridge::update_excess_liquidity_report( + api::position::Excess_liquidity_reportUpdate const &elr) { + me->service_call_marshaller.schedule_action([this, elr]() { + for (auto const &elr : elr.added()) { + publish(me->excess_liquidity_pub, AccountID(elr->account_id()), + elr->excess_liquidity()); + } + for (auto const &elr : elr.changed()) { + publish(me->excess_liquidity_pub, + AccountID(elr.current()->account_id()), + elr.current()->excess_liquidity()); + } + }); +} + bool ServiceBridge::is_ready() const { return me->have_orders && me->order_manager_ready; } diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 621aaf256..ab68bf1ed 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/api/services/MarginService.client.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/config/protos/jetfix.pb.h" #include "lib/md/SecurityOracle.h" @@ -77,6 +78,8 @@ class ServiceBridge : public mercury::Actor { void update_admin_data(std::shared_ptr const &admin); void update_account_pnl(api::position::Pnl_account_dataUpdate const &); + void update_excess_liquidity_report( + api::position::Excess_liquidity_reportUpdate const &); private: struct PImpl; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 737bee203..76bcabfb4 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -5,6 +5,7 @@ #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" +#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" @@ -55,6 +56,9 @@ void OrderManager::init() { [this](auto const &admin_update) { this->on_admin_data(admin_update); }); subscribe( [this](auto const &pnl_update) { this->on_pnl_update(pnl_update); }); + subscribe([this](auto const &liq_update) { + this->on_excess_liquidity_update(liq_update); + }); } void OrderManager::on_admin_data(const mercury::Update &m) { @@ -77,10 +81,18 @@ void OrderManager::on_admin_data(const mercury::Update &m) { } } -void OrderManager::on_pnl_update(const mercury::Update &u) { - if (u.events) - for (auto ev : *u.events) - me->services_data.limiter.set_day_pnl(ev.account_id,ev.day_pnl); +void OrderManager::on_pnl_update( + const mercury::Update &u) { + if (u.events) + for (auto ev : *u.events) + me->services_data.limiter.set_day_pnl(ev.account_id, ev.day_pnl); +} + +void OrderManager::on_excess_liquidity_update( + const mercury::Update &u) { + if (u.events) + for (auto ev : *u.events) + me->services_data.limiter.set_excess_liquidity(ev.account_id, ev.excess_liquidity); } void OrderManager::on_securities( diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index c97980372..218704ad2 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -35,6 +35,7 @@ class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; class AccountPnLUpdateEvent; +class ExcessLiquidityUpdateEvent; struct SessionServicesData; class DynamicOrderRegistry; } // namespace orderman @@ -85,6 +86,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); void on_pnl_update(const mercury::Update &); + void on_excess_liquidity_update(const mercury::Update &); void on_poll(trace::PerfLog& log) override; // end external events diff --git a/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h b/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h new file mode 100644 index 000000000..3174c787a --- /dev/null +++ b/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h @@ -0,0 +1,25 @@ +#pragma once + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/MergeByKey.h" + +#include + +namespace bts { +namespace orderman { + +class ExcessLiquidityUpdateEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::MergeByKey; + AccountID key() const { return account_id; } + + ExcessLiquidityUpdateEvent(AccountID id, double excess_liquidity) + : account_id(id), excess_liquidity(excess_liquidity) {} + + AccountID account_id; + double excess_liquidity; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 1df9a4c99..572d533a1 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -78,6 +78,7 @@ void Limiter::set_day_pnl (AccountID account_id, double pnl){ _add_account_and_reset(account_id); me->limit_store->set_pnl(account_id, pnl); } +void Limiter::set_excess_liquidity (AccountID , double ) {} Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index 1b7df944e..5dba06d8d 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -34,7 +34,8 @@ class Limiter { void remove(api::Security const &, std::string const & /* account_name */, api::Side, Quantity, bool recurse); void set_day_pnl (AccountID account_id, double pnl); - + void set_excess_liquidity(AccountID account_id, double excesss_liquidity); + enum LimiterErrorCode { OK, NO_SUCH_SECURITY, diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index a777b7ccb..381673dac 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -1,6 +1,7 @@ #include "OrderServiceServer.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/MarginService.client.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" @@ -98,6 +99,7 @@ struct OrderServiceServer::PImpl { publish_orders(), publish_fills(), admin_service(ctx.locate()), position_service(ctx.locate()), + margin_service(ctx.locate()), md_consumer(mdc.current_consumer()), stats(stats), dyn_order_registry(d), log(log), in_flight_order_ops(), current_req_op_id(0) {} @@ -114,6 +116,7 @@ struct OrderServiceServer::PImpl { OrderServiceServer::FillsPublisher publish_fills; api::admin::AdminService admin_service; api::position::PositionService position_service; + api::position::MarginService margin_service; bts::md::MDConsumer &md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; @@ -240,10 +243,16 @@ OrderServiceServer::OrderServiceServer(bts::api::ServiceContext &ctx, // subscribe to position updates and foward them to the service bridge me->position_service.subscribe_pnl_account_data() | - rxcpp::operators::subscribe( - [this](auto const &update) { - me->service_bridge->update_account_pnl(update); - }); + rxcpp::operators::subscribe( + [this](auto const &update) { + me->service_bridge->update_account_pnl(update); + }); + + me->margin_service.subscribe_excess_liquidity_report() | + rxcpp::operators::subscribe( + [this](auto const &update) { + me->service_bridge->update_excess_liquidity_report(update); + }); } OrderServiceServer::~OrderServiceServer() { diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index ff12df496..d570ae6a8 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..bc74cb4cf 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 33a6d1453..74bc1c4af 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -122,6 +122,7 @@ module Accounts = let emptyMargin : ExcessLiquidityReport = { account = "ERROR NO DATA" + accountId = 0u marginResult = { account = "ERROR NO DATA" status = bts.api.position.MarginResult.ResultStatus.Error From 2d4e94a636c235c865e7c2785e505ee3ddb304fd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 15:39:35 +0000 Subject: [PATCH 099/198] Types.fs edited online with Bitbucket --- src/web/ui/src/Users/Types.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 51b83e88a..6de2e5df3 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -71,4 +71,4 @@ let CMEMicMap:Map = Map.empty .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) .Add("XCEC", bts.api.CMEMics.COMEX) - .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file + .Add("DUMX", bts.api.CMEMics.DME) \ No newline at end of file From 850386c1d4e0bd5b3f13814d93a445567c73dce8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 5 Jul 2019 12:05:16 -0400 Subject: [PATCH 100/198] Margin enforced in the limiter --- src/lib/orderman/limiter/LimitStore.cpp | 6 +++++ src/lib/orderman/limiter/LimitStore.h | 36 ++++++++++++++++++++++++- src/lib/orderman/limiter/Limiter.cpp | 10 ++++++- src/lib/orderman/limiter/Limiter.h | 3 ++- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 285273139..2fae93f93 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -44,6 +44,12 @@ void LimitStore::set_pnl (AccountID account_id, double pnl){ bts_assert(it != _account_data_map.end()); it->second.curr_day_pnl = pnl; } +void LimitStore::set_excess_liquidity (AccountID account_id, + double excess_liquidity){ + auto it = _account_data_map.find(account_id.value()); + bts_assert(it != _account_data_map.end()); + it->second.excess_liquidity = excess_liquidity; +} void LimitStore::_add_product_entry( const api::Security &security, const bts::api::admin::AdminData &admin_data) { diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index b586617c2..e49382324 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -39,10 +39,12 @@ private: public: const bts::api::admin::BTSAccount& account; double curr_day_pnl; + double excess_liquidity; AccountData (const bts::api::admin::BTSAccount& account) : account(account), - curr_day_pnl (os::nan()) + curr_day_pnl (os::nan()), + excess_liquidity (os::nan()) {} }; const bts::api::admin::AdminData _admin_data; @@ -107,6 +109,7 @@ public: } } void set_pnl (AccountID account_id, double pnl); + void set_excess_liquidity (AccountID account_id, double excess_liquidity); // risk limit checks //////////////////// // checks to see if the user is allowed to trade @@ -153,6 +156,9 @@ public: bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; _loss_limit(account_id, rv); + if(!rv.ok()) + return rv; + _margin_limit(account_id,rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -260,5 +266,33 @@ private: out_res.error_msg = "Could not find account"; } } + void _margin_limit(AccountID account_id, + Limiter::LimiterQueryResult& out_res) const{ + // similiar flow as the loss_limit above + const auto acct_it = _account_data_map.find(account_id.value()); + if(acct_it != _account_data_map.end()){ + const auto& account_data = acct_it->second; + const auto& account = account_data.account; + if (account.has_margin_limit() && + account.margin_limit().enforce_margin()){ + double ex_liq = account_data.excess_liquidity; + if(os::is_nan(ex_liq)){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = "Could not find account Excess Liquidity"; + } + else{ + if(ex_liq < 0){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", + ex_liq); + } + } + } + } + else{ + out_res.result = Limiter::LimiterErrorCode::NO_SUCH_ACCOUNT; + out_res.error_msg = "Could not find account"; + } + } }; }} diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 572d533a1..cd1cfc9e5 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -78,7 +78,15 @@ void Limiter::set_day_pnl (AccountID account_id, double pnl){ _add_account_and_reset(account_id); me->limit_store->set_pnl(account_id, pnl); } -void Limiter::set_excess_liquidity (AccountID , double ) {} +void Limiter::set_excess_liquidity (AccountID account_id, + double excess_liquidity) { + LOG(OrderMan, Info, + "Limiter::set_excess_liquidity account:{} excess_liquidity: {}", + account_id, excess_liquidity); + if (!me->limit_store->has_account(account_id)) + _add_account_and_reset(account_id); + me->limit_store->set_excess_liquidity(account_id, excess_liquidity); +} Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index 5dba06d8d..8ad1f0929 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -48,7 +48,8 @@ class Limiter { NO_SUCH_ACCOUNT, USER_DEACTIVATED, NO_SUCH_USER, - LOSS_LIMIT_BREACHED + LOSS_LIMIT_BREACHED, + MARGIN_LIMIT_BREACHED }; struct LimiterQueryResult { From ae4a8bbf46510b2a2b8db31018475f5dbc68c57f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 12:28:58 -0400 Subject: [PATCH 101/198] more span --- .gitignore | 1 + src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/services/MarginService.proto | 11 +- src/lib/config/defaults/span.conf | 9 ++ src/lib/config/defaults/toggles.conf | 6 -- src/lib/config/protos/span.proto | 10 ++ src/lib/config/protos/toggles.proto | 4 - .../sparkd/position/MarginServiceCore.cpp | 8 ++ .../sparkd/position/MarginServiceServer.cpp | 101 ++++++++++++------ .../sparkd/position/MarginServiceServer.h | 6 +- .../sparkd/position/PositionAggregator.cpp | 3 +- src/web/ui/src/Access.fs | 1 + 12 files changed, 112 insertions(+), 50 deletions(-) create mode 100644 src/lib/config/defaults/span.conf create mode 100644 src/lib/config/protos/span.proto diff --git a/.gitignore b/.gitignore index 7c976336d..c7a63b0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide/ diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index 2222ef991..b98ed6d8b 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index 007e874e8..abe7a343b 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -29,7 +29,8 @@ message ExcessLiquidityReport { double cash_balance = 30; MarginResult margin_result = 40; AccountPNL account_pnl = 50; - double excess_liquidity = 100; + bool should_enforce_margin = 60; + double excess_liquidity = 100; } @@ -47,14 +48,20 @@ message CashBalanceUpdate { double cash_balance = 20; } +message EnforceUpdate { + string account = 10; + bool should_enforce_margin = 20; +} + service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; rpc get_margin(MarginRequest) returns (MarginResult); rpc get_excess_liquidity_report(MarginRequest) returns (ExcessLiquidityReport); + rpc set_should_enforce_margin(EnforceUpdate) returns (bts.api.ResultMessage); rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage); rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage); - + rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); rpc excess_liquidity_report(bts.api.VoidMessage) returns (stream ExcessLiquidityReport); } \ No newline at end of file diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf new file mode 100644 index 000000000..7f86bfab3 --- /dev/null +++ b/src/lib/config/defaults/span.conf @@ -0,0 +1,9 @@ + +SpanMargin { + value { + enabled: true + login: 'api_bts1' + password: 'Summer123' + url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' + } +} diff --git a/src/lib/config/defaults/toggles.conf b/src/lib/config/defaults/toggles.conf index eb250ba1e..52b63f712 100644 --- a/src/lib/config/defaults/toggles.conf +++ b/src/lib/config/defaults/toggles.conf @@ -9,9 +9,3 @@ OrdersSoftCleanup { enabled: true } } - -SpanMargin { - value { - enabled: true - } -} \ No newline at end of file diff --git a/src/lib/config/protos/span.proto b/src/lib/config/protos/span.proto new file mode 100644 index 000000000..6d207757f --- /dev/null +++ b/src/lib/config/protos/span.proto @@ -0,0 +1,10 @@ +syntax='proto2'; +package bts.config; + +message SpanMargin +{ + optional bool enabled = 10; + optional string login = 20; + optional string password = 30; + optional string url = 40; +} diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 100eb9124..af0232f0b 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -54,7 +54,3 @@ message EnsureOnScreenWithWorkAreaRect { // Should verify that the code works with every monitor arrangement before enabling by default. optional bool enabled = 1 [default = false]; } - -message SpanMargin { - optional bool enabled = 1 [default = false]; -} \ No newline at end of file diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 3e221b9e5..cca8fa8c2 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -10,6 +10,7 @@ #include "lib/logging/logging.h" #include "lib/utils/helper_macros.h" #include "lib/utils/datetime.h" +#include "lib/config/protos/span.pb.h" #include "curl/curl.h" @@ -45,6 +46,13 @@ struct MarginServiceCore::PImpl verbose(false), throttle(30000) { + if(config::get().login() != "") + core_user = config::get().login(); + if(config::get().password() != "") + core_password = config::get().password(); + if(config::get().url() != "") + url_base = config::get().url(); + auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) { diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 8a2551595..bdc286cac 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -7,7 +7,7 @@ #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/persistence/SqliteStore.h" #include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" +#include "lib/config/protos/span.pb.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" @@ -33,7 +33,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _publisher(make_margin_data_stateful_publisher()), _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), - _timer(_dispatcher, 20000, [=]() { publish_all();} ), + _timer(_dispatcher, 30000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), //state below @@ -65,9 +65,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: auto accts = AdminServiceUtils::accounts(_admin_data, false); for(const auto& i : accts) { - MarginResult margin; margin.Clear(); margin.set_account(i->name()); - AccountPNL pnl; pnl.Clear(); pnl.set_account_name(i->name()); - publish_excess_liquidity_report(margin, pnl); + incremental_update_report(i->name(), i->id()); } _first_time = false; } @@ -78,7 +76,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: void MarginServiceServer::publish_all() { - if(config::get().enabled()) + if(config::get().enabled()) { std::scoped_lock l(_lock); auto accts = AdminServiceUtils::accounts(_admin_data, false); @@ -92,7 +90,7 @@ void MarginServiceServer::publish_all() std::vector pos; AccountPNL pnl; if(_position->query_positions(acct, pos, pnl, &since) && pos.size()) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); + LOG(Gen, Info, "MarginServiceServer: requesting margin for {} ", acct); auto aname = orderman::to(acct); _margin->compute_margin(aname, pos, [this, since, acct, pnl](const MarginResult& m) { @@ -111,7 +109,7 @@ MarginServiceServer::~MarginServiceServer() {} void MarginServiceServer::get_margin(const api::position::MarginRequest& request, const api::Response& reply) { - if(!config::get().enabled()) + if(!config::get().enabled()) { MarginResult res; res.set_account(request.account()); @@ -156,13 +154,15 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M std::scoped_lock l(_lock); ExcessLiquidityReport report; report.set_account(result.account()); + report.set_account_id(pnl.account_id()); report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); if(acct && acct->has_margin_limit()) { report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); + report.set_cash_balance(acct->margin_limit().cash_balance()); + report.set_should_enforce_margin(acct->margin_limit().enforce_margin()); } double netliq = report.leverage_factor() * report.cash_balance(); @@ -176,6 +176,28 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M _report_publisher.flush(); } +//so the admin ui knows what to do +void MarginServiceServer::incremental_update_report(const std::string& account, uint32_t account_id) +{ + std::scoped_lock l(_lock); + + MarginResult margin; + if(!_margin->get_last_valid_result(orderman::to(account), margin)) + { + margin.Clear(); + margin.set_account(account); + } + AccountPNL pnl; + if(!_position->query_pnl(account, pnl)) + { + pnl.Clear(); + pnl.set_account_name(account); + pnl.set_account_id(account_id); + } + publish_excess_liquidity_report(margin, pnl); + _last_update[account] = 0; +} + void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -197,37 +219,16 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor update.mutable_complete_data()->CopyFrom(*acct); _admin_service.update_account(update, - [this, request, reply](const api::Result& admin_result) + [this, request, reply, update](const api::Result& admin_result) { api::ResultMessage resp; resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - incremental_update_report(request.account()); + incremental_update_report(request.account(), update.complete_data().id()); }); } } - -//so the admin ui knows what to do -void MarginServiceServer::incremental_update_report(const std::string& account) -{ - std::scoped_lock l(_lock); - - MarginResult margin; - if(!_margin->get_last_valid_result(orderman::to(account), margin)) - { - margin.Clear(); - margin.set_account(account); - } - AccountPNL pnl; - if(!_position->query_pnl(account, pnl)) - { - pnl.Clear(); - pnl.set_account_name(account); - } - publish_excess_liquidity_report(margin, pnl); - _last_update[account] = 0; -} void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -249,16 +250,48 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan update.mutable_complete_data()->CopyFrom(*acct); _admin_service.update_account(update, - [this, request, reply](const api::Result& admin_result) + [this, request, reply, update](const api::Result& admin_result) { api::ResultMessage resp; resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - incremental_update_report(request.account()); + incremental_update_report(request.account(), update.complete_data().id()); }); } } +void MarginServiceServer::set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_enforce_margin(request.should_enforce_margin()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply, update](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + incremental_update_report(request.account(), update.complete_data().id()); + }); + } +} + + }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index d7b49d928..aa0c5cd01 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -40,12 +40,16 @@ public: void set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; + + void set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; + private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); void publish_all(); - void incremental_update_report(const std::string& account); + void incremental_update_report(const std::string& account, uint32_t account_id); private: api::admin::AdminService _admin_service; diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 45a83dd07..4d42ed6cd 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -123,8 +123,7 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; - query_pnl(account, pnl); - return true; + return query_pnl(account, pnl); } return false; } diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 74bc1c4af..935e66560 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -136,6 +136,7 @@ module Accounts = maintMargin = 0.0 initialMargin = 0.0 } + shouldEnforceMargin = false leverageFactor = 0.0 cashBalance = 0.0 accountPnl = { From 213567bcdb841c6d56957d37e0b53ed23eebdbc9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 5 Jul 2019 11:49:34 -0500 Subject: [PATCH 102/198] display tooltip again when re-entering same cell where tooltip was previouly closed --- src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index 2a2af3223..b78519f62 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -694,12 +694,14 @@ namespace mbts.spark { // At any rate, we need this part hiding the tooltip so that we don't leave random tooltips around // and we have to reset to old row so that when we go back to what could be our preivous row, the tooltip gets drawn again //System.Diagnostics.Debug.WriteLine(" Tooltip - Volume is 0"); + _old_tooltip_row = int.MaxValue; _hide_tool_tip(); //_old_tooltip_row = Int32.MaxValue; } } } else { //System.Diagnostics.Debug.WriteLine(" Tooltip - not over Volume column"); + _old_tooltip_row = int.MaxValue; _hide_tool_tip(); } } From d871ffca6dd76e20ce698baf28ee2c29d013fb24 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 12:59:41 -0400 Subject: [PATCH 103/198] temporarily tie span enforcement to config while michael works --- src/lib/orderman/limiter/LimitStore.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index e49382324..7efcf76ab 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -10,6 +10,9 @@ #include "ProductLimitTree.h" #include "SecurityLimitTree.h" #include "lib/os/os.h" +#include "lib/config/config.h" +#include "lib/config/protos/span.pb.h" + namespace bts { namespace orderman { @@ -272,9 +275,10 @@ private: const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - const auto& account = account_data.account; - if (account.has_margin_limit() && - account.margin_limit().enforce_margin()){ + //const auto& account = account_data.account; + if(config::get().enabled()) { + // if (account.has_margin_limit() && + // account.margin_limit().enforce_margin()){ double ex_liq = account_data.excess_liquidity; if(os::is_nan(ex_liq)){ out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; From 25b69e4f7d683f16bb406888ada3fd880d792857 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 13:29:22 -0400 Subject: [PATCH 104/198] fix small bug and add manual test --- src/lib/orderman/limiter/LimitStore.cpp | 6 +++-- testing/manual/span/span.txt | 29 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 testing/manual/span/span.txt diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 2fae93f93..3f71be12b 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -32,11 +32,13 @@ void LimitStore::copy_data_from(LimitStore &source) { if (source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } - // copy pnl's + // copy pnl's and liqs for (auto it=_account_data_map.begin();it!=_account_data_map.end();it++){ auto source_it = source._account_data_map.find(it->first); - if(source_it != source._account_data_map.end()) + if(source_it != source._account_data_map.end()) { it->second.curr_day_pnl = source_it->second.curr_day_pnl; + it->second.excess_liquidity = source_it->second.excess_liquidity; + } } } void LimitStore::set_pnl (AccountID account_id, double pnl){ diff --git a/testing/manual/span/span.txt b/testing/manual/span/span.txt new file mode 100644 index 000000000..22a815661 --- /dev/null +++ b/testing/manual/span/span.txt @@ -0,0 +1,29 @@ +Test Author: Kevin +If it breaks: Kevin + +This will test our ability to compute and enforce span margin at CME + +1) Make sure span.conf looks like: + +SpanMargin { + value { + enabled: true + login: 'api_bts1' + password: 'Summer123' + url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' + } +} + +2) Fire up a shell and trade 1 ES into ACC A + +3) Open a webui, look at Margin Tab in ACC A + +You should see a value of around 6300 in maintenance margin after a minute or two + +4) If not already zero, set your cash balance to zero. + +5) Try to trade an ES in ACC A, you should be blocked by a limit breach + +6) Increase your cash balance to 10,000 and set leverage factor to 1.0 + +7) Try to trade again, you should be able to. \ No newline at end of file From 96fc54ff0f33fe614b0b7458fa469db391cd3307 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Jul 2019 14:35:18 -0400 Subject: [PATCH 105/198] Added ticks_off to top algo server side. --- src/lib/api/services/OrderService.proto | 2 +- .../orders/algo/algo_orders/TopAlgo.cpp | 31 ++++++++++++++++--- .../orders/algo/algo_orders/TopAlgo.h | 2 +- src/web/CMakeDeps.cmake | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 1908ff7bf..42d7f2531 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -160,8 +160,8 @@ message JoinOrderDefinition { CustomOrderDefinition child = 6; } message TopOrderDefinition { - uint32 watch_level_tick_offset = 1; spark.QuantityMeasure top_threshold = 2; + uint32 ticks_off = 3; CustomOrderDefinition child = 6; } message TriggerOrderDefinition { diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp index e16aaa5d8..b7fac256e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -16,6 +16,7 @@ using namespace api::orderman; struct TopAlgo::PImpl { IAlgoServices *algo; spark::QuantityMeasure top_threshold_measure; + uint32_t ticks_off = 0; OrderKey child_key = null_order_key(); ChildTemplate *child_template = nullptr; Book last_book; @@ -41,7 +42,7 @@ OrderOpResult TopAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { } me->top_threshold_measure = top.top_threshold(); - + me->ticks_off = top.ticks_off(); if (!serv.is_attaching()) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. @@ -93,7 +94,7 @@ void TopAlgo::do_update(api::orderman::Update const &update) { void TopAlgo::on_book(SecurityKey, Book const &b) { me->last_book = b; - ensure_min_quantity(); + ensure_order_meets_constraints(); } void TopAlgo::on_child_change(OrderKey, ChildState const &st) { @@ -111,14 +112,14 @@ void TopAlgo::on_child_change(OrderKey, ChildState const &st) { } } -bool TopAlgo::ensure_min_quantity() { +bool TopAlgo::ensure_order_meets_constraints() { LOG(OrderMan, Diag, "Top order {} received book update. Current top of book: {}@{}", algo().order_key().value(), top_of_book_quantity().value(), top_of_book_price().value()); if (better_than_top()) { - LOG(OrderMan, Diag, + LOG(OrderMan, Info, "Top order {} became better than the top of the book, canceling", algo().order_key().value()); algo().cancel("Order would become BBO"); @@ -135,7 +136,7 @@ bool TopAlgo::ensure_min_quantity() { algo().order_key().value(), total_min_quantity, top_of_book_quantity().value()); if (top_of_book_quantity() < Quantity(total_min_quantity)) { - LOG(OrderMan, Diag, + LOG(OrderMan, Info, "Top order {} is canceling because min quantiy is not met", algo().order_key().value()); algo().cancel("Top of book is below threshold"); @@ -147,6 +148,26 @@ bool TopAlgo::ensure_min_quantity() { algo().order_key().value(), algo().price().value(), top_of_book_price().value()); + if (me->ticks_off > 0) { + auto tick_diff = securities::price_diff_to_ticks( + algo().price().value(), top_of_book_price().value(), + securities::tick_size(algo().security()).value()); + if (std::abs(tick_diff) <= (int)me->ticks_off) { + LOG(OrderMan, Info, + "Top order {} price {} is less than {} ticks away from top ({}). " + "Canceling", + algo().order_key().value(), algo().price().value(), + me->ticks_off + 1, top_of_book_price().value()); + algo().cancel("Order is too close to top of the book"); + return false; + } else + LOG(OrderMan, Diag, + "Top order {} price {} is {} ticks away from top. Top: {} Ticks " + "off: {}", + algo().order_key().value(), algo().price().value(), + std::abs(tick_diff), top_of_book_price().value(), me->ticks_off); + } + return true; } diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h index 3648dc50c..857f12f88 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h @@ -27,7 +27,7 @@ class TopAlgo : public IAlgoOrder { bool at_top_of_book() const; bool better_than_top() const; Quantity min_quantity_at_top() const; - bool ensure_min_quantity(); + bool ensure_order_meets_constraints(); bool has_running_child() const; Price top_of_book_price() const; Quantity top_of_book_quantity() const; diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..1843aaacb 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 7e1463683f1642cfbe3307b917025c00ca98e2b7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 5 Jul 2019 11:55:02 -0400 Subject: [PATCH 106/198] SP-30 base Dorman algo atop SplitterAlgo --- .vscode/launch.json | 2 +- .../orders/algo/algo_orders/DormanAlgo.cpp | 230 +++++++++--------- .../orders/algo/algo_orders/DormanAlgo.h | 11 +- .../algo/algo_orders/tests/AlgoTestDriver.cpp | 15 +- .../algo/algo_orders/tests/AlgoTestDriver.h | 1 + .../algo/algo_orders/tests/dorman_tests.cpp | 224 ++++++++--------- 6 files changed, 247 insertions(+), 236 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index fac8a7668..cda1e31c2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -249,7 +249,7 @@ "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ "test", - "SingleWriterConcurrentVector" + "[dorman]" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index b1f31c717..ef5692f45 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -15,87 +15,8 @@ namespace dorman { using namespace api::orderman; - -// Class which will send out multiple orders but act like one order -struct ChildOrderState { - Quantity size; - Quantity filled; -}; - -class MultiOrder { - IAlgoServices* _algo = nullptr; - uint32_t _clip = 0; - ChildTemplate* _template = nullptr; - - Quantity _qty = {}; - std::map _orders; - - public: - MultiOrder() {} - ~MultiOrder() { - if (_algo) { - for (const auto& pair : _orders) { - _algo->cancel_child(pair.first); - } - } - } - void do_before_launch(IBeforeLaunchAlgoServices& algo, uint32_t clip) { - _clip = clip == 0 ? std::numeric_limits::max() : clip; - auto def = algo.definition(); - - CustomOrderDefinition default_order; - default_order.mutable_limit(); - - *def.mutable_custom_def() = - get_if(def.custom_def().dynamic().order_params(), "Child") - .value_or(default_order); - _template = &algo.make_child_template(def); - } - - void set_algo_services(IAlgoServices& a) { _algo = &a; } - - void update(Price p, Quantity q) { - bts_assert(_algo != nullptr); - // This class does not handle delayed size changes - if (q < _qty) { - // cancel some orders - auto excess = _qty.value() - q.value(); - while(excess > 0) { - // cancel some orders - auto iter = _orders.begin(); - auto lsize = iter->second.size.value() - iter->second.filled.value(); - if (lsize > excess) { - // Reduce order size - Update update; - update.set_quantity(lsize - excess); - _algo->update_child(iter->first, update); - iter->second.size.value() -= excess; - excess = 0; - } - else { - excess -= lsize; - _algo->cancel_child(iter->first); - _orders.erase(iter); - } - } - _qty = q; - } - else if (q > _qty) { - // add more orders - auto shortfall = q.value() - _qty.value(); - while(shortfall > 0) { - auto order_size = Quantity { std::min(shortfall, _clip) }; - auto child_id = _algo->launch_child(*_template, p, order_size, true); - _orders.insert(std::make_pair(child_id, ChildOrderState { order_size, Quantity {0} })); - shortfall -= order_size.value(); - } - _qty = q; - } - } - - Quantity quantity() const { return _qty; } -}; - +#define REQUIRE(condition, message) \ + if (!(condition)) { algo().cancel(message); return; } // // Algo State @@ -113,9 +34,14 @@ struct DormanAlgo::Impl { IAlgoServices *algo = nullptr; AlgoParams params; api::Side side; - + Quantity exposed_qty = {}; std::optional next_size; - MultiOrder child; + + OrderDefinition splitter_definition; + OrderKey child_id; + ChildState child_state; + + uint32_t fills ={}; }; DormanAlgo::DormanAlgo() : @@ -123,49 +49,90 @@ DormanAlgo::DormanAlgo() : { } DormanAlgo::~DormanAlgo() { } -// Not latency sensitive. Do expensive initialization here -OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& iblas) { - const auto& def = iblas.definition(); +OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { + const auto& def = ibl.definition(); // Validation bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_dynamic()); + auto params = to_dorman_params(def.custom_def().dynamic()); - if (auto r = std::get_if(¶ms)) { - return *r; + if (auto error = std::get_if(¶ms)) { + return *error; } me->params = std::get(params); me->side = def.side(); if (me->side != api::Side::SIDE_BUY && me->side != api::Side::SIDE_SELL) { return OrderOpResult { ORDER_ERROR_INVALID_ORDER_DEFINITON, "Invalid side" }; } - me->child.do_before_launch(iblas, me->params.clip_limit); + + CustomOrderDefinition default_order; + default_order.mutable_limit(); + auto child_def = + get_if(def.custom_def().dynamic().order_params(), "Child") + .value_or(default_order); + + update_child_template(ibl, child_def); + + if (ibl.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Splitter does not support attach."}; + } return {/*ok*/}; } + void DormanAlgo::do_launch(IAlgoServices& algo) { me->algo = &algo; - me->child.set_algo_services(algo); - algo.subscribe_book(SecurityKey(algo.security().id())); algo.subscribe_timer(); } -void DormanAlgo::do_launch_attached(IAlgoServices& algo, OrderKey k, ChildState state) { - me->algo = &algo; - (void)k; - (void)state; +void DormanAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { + bts_assert(false); } void DormanAlgo::do_update(const api::orderman::Update& update) { LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - (void)update; + + if (me->fills >= update.quantity()) { + algo().complete(); + } + + if (update.has_custom()) { + REQUIRE(update.custom().has_dynamic(), "Update cannot change order type"); + auto params = to_dorman_params(update.custom().dynamic()); + + if (auto error = std::get_if(¶ms)) { + algo().cancel(error->error_msg); + } + + me->params = std::get(params); + + // Check for child + auto child = get_if(update.custom().dynamic().order_params(), "Child"); + if (child) { + update_child_template(algo(), child.value()); + } + } } -void DormanAlgo::on_child_change(OrderKey k, const ChildState& st) { - (void)k; - (void)st; +void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { + REQUIRE(k == me->child_id, "Unexpected update from illigitimate child"); + REQUIRE(state.total_fills.value() >= me->child_state.total_fills.value(), "Unexpected fill decrease."); + + auto delta = state.total_fills.value() - me->child_state.total_fills.value(); + if (delta != 0) { + me->fills += delta; + algo().update_fill_state(Quantity {me->fills}, state.last_price); + } + me->child_state = state; + + if (me->fills >= algo().quantity().value()) { + algo().complete(); + } } + void DormanAlgo::on_book(SecurityKey key, const Book& book) { if (key.value() != me->algo->security().id()) { return; } auto price = me->algo->price(); @@ -194,24 +161,24 @@ void DormanAlgo::on_book(SecurityKey key, const Book& book) { target = Quantity { std::min(target.value(), me->params.steps.maximum) }; // First on_book - if (me->child.quantity() == Quantity {0}) { - me->child.update(price, target); + if (!child_active()) { + update_child(target); } // See if we need to adjust else { - if (target < me->child.quantity()) { - // If target < size reduce immidiately - me->child.update(price, target); + // If target < size reduce immidiately + if (target < me->exposed_qty) { + update_child(target); me->next_size = std::nullopt; } - else if (target > me->child.quantity()) { - // if target > size schedule increase + // if target > size schedule increase + else if (target > me->exposed_qty) { if (me->next_size) { - // already planning to increase + // already planning to increase, update the target me->next_size.value().size = target; } else { - // no scheduled increase + // no existing scheduled increase, create one now me->next_size = { FutureQty { target, me->algo->get_time() + std::chrono::seconds(me->params.steps.trail_seconds) } }; } } @@ -222,7 +189,7 @@ void DormanAlgo::on_timer() { if (me->next_size && me->algo->get_time() >= me->next_size.value().when) { auto size = me->next_size.value().size; - me->child.update(me->algo->price(), size); + update_child(size); me->next_size = std::nullopt; } } @@ -230,10 +197,49 @@ void DormanAlgo::on_timer() { IAlgoServices& DormanAlgo::algo() const { return *me->algo; } // -// Visibility for testing -// +// private -Quantity DormanAlgo::desired_size() const { return me->child.quantity(); } +void DormanAlgo::update_child(Quantity exposed) { + auto& splitter = *me->splitter_definition.mutable_custom_def()->mutable_splitter(); + splitter.set_max_order_qty(me->params.clip_limit); + splitter.set_exposed_qty(exposed.value()); + me->exposed_qty = exposed; + if (!child_active()) { + // launch child + me->child_id = algo().launch_child(me->splitter_definition, algo().price(), algo().quantity()); + } + else { + Update update; + update.set_price(algo().price().value()); + update.set_quantity(algo().quantity().value()); + *update.mutable_custom()->mutable_splitter() = splitter; + algo().update_child(me->child_id, update); + } +} + +void DormanAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl, const CustomOrderDefinition& child) { + auto child_def = ibl.definition(); + // Insert a spliter between this and the configured child definition. + api::orderman::SplitterOrderDefinition& splitter_def = *child_def.mutable_custom_def()->mutable_splitter(); + *splitter_def.mutable_child() = child; + me->splitter_definition = child_def; +} + +Quantity DormanAlgo::exposed_qty() const { return me->exposed_qty; } + +bool DormanAlgo::child_active() const { return me->child_id.value() != 0; } + +void DormanAlgo::pause_until(TimeStamp) { + // cancel child + algo().cancel_child(me->child_id); + + // retain me->child_id for updates + + // set paused flag + // set paused_time flag + // ignore child_update if paused + // check paused_time in on_timer +} // // diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 9d0628b76..01f997068 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -68,7 +68,16 @@ public: void on_book(SecurityKey, const Book&) override; void on_timer() override; - Quantity desired_size() const; + Quantity exposed_qty() const; + +private: + // + // Child management + void update_child_template(IBeforeLaunchAlgoServices&, const api::orderman::CustomOrderDefinition&); + void launch_child(); + void update_child(Quantity exposed); + bool child_active() const; + void pause_until(TimeStamp); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index bee71af2f..14a9439ad 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -315,8 +315,13 @@ OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity for(const auto& cb : me->on_child_launching) cb(key); return key; } -OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & od, Price price, Quantity qty, bool sub) { - return launch_child(make_child_template(od), price, qty, sub); +OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & def, Price price, Quantity qty, bool sub) { + OrderKey key = me->next_order(); + me->orders.push_back( + mkchild(key, price, qty, sub)); + me->orders.back().def = {def}; + for(const auto& cb : me->on_child_launching) cb(key); + return key; } void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const & update) { auto guard = me->recusion_guard(); @@ -333,6 +338,12 @@ void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { child.cstate.status = ChildStatus::COMPLETED; } + if (update.has_custom()) { + if (!child.def) { + child.def = {api::orderman::OrderDefinition()}; + } + *child.def.value().mutable_custom_def() = update.custom(); + } for (const auto& cb : me->on_child_changed) cb(old, child); if (child.subscribed) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index b475e8941..c39f7f2db 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -33,6 +33,7 @@ struct ChildOrder { OrderKey key; bool subscribed; ChildState cstate; + std::optional def; uint32_t active_qty() const { return cstate.status == ChildStatus::WORKING ? cstate.quantity.value() - cstate.total_fills.value() : 0; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index 55a8ad308..e3d5c6f83 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -16,7 +16,7 @@ namespace test { struct OrderState { Price desired_price; - Quantity desired_size; + Quantity exposed_qty; } */ @@ -113,14 +113,17 @@ struct ExpectedSize { }; constexpr auto some_price = md::IntPrice { 128000, -3 }; -size_t count_child_size(const std::vector& child_orders) { +size_t child_exposed(const std::vector& child_orders) { return std::accumulate( child_orders.begin(), child_orders.end(), 0, [](uint32_t acc, const auto& child) { if (child.cstate.status != ChildStatus::CANCELED) { - // count working+completed - return acc + child.cstate.quantity.value(); + REQUIRE(child.def); + return + acc + + child.def.value().custom_def().splitter().exposed_qty() + + child.cstate.total_fills.value(); } else return acc; }); @@ -128,140 +131,121 @@ size_t count_child_size(const std::vector& child_orders) { TEST_CASE("dorman_order_size", "[algo][dorman]") { - // Repeate the test for a variety of clip sizes - for (auto clip : { 100, 20, 900, 1 }) { + // create a table of various sizes + // send market state to the algo + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 400}, + {2000, 600}, + {3500, 750}, + {10000, 999} + }; + input.steps.maximum = 800; + input.steps.trail_seconds = 5; + input.clip_limit = 100; - // create a table of various sizes - // send market state to the algo - AlgoParams input; - input.steps.step_table = { - {500, 250}, - {1000, 400}, - {2000, 600}, - {3500, 750}, - {10000, 999} + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + + SECTION("initial size vs market") { + std::vector test_sizes { + { 10, 250 }, + { 200, 250 }, + { 250, 250 }, + { 500, 400 }, + { 999, 400 }, + { 2500, 750 }, + { 9999, 800 } }; - input.steps.maximum = 800; - input.steps.trail_seconds = 5; - input.clip_limit = clip; - api::orderman::OrderDefinition def; - def.set_side(api::SIDE_BUY); - def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); - - - SECTION("initial size vs market") { - std::vector test_sizes { - { 10, 250 }, - { 200, 250 }, - { 250, 250 }, - { 500, 400 }, - { 999, 400 }, - { 2500, 750 }, - { 9999, 800 } - }; - - for (auto& s : test_sizes) - { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - - // order size is driven by the available market size - book.bid()[0] = { some_price, s.input }; - state.update_book(book); - - REQUIRE(state.before_launch().ok()); - state.launch(); - REQUIRE(state.algo().desired_size().value() == s.expected); - REQUIRE( - s.expected == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - } - } - SECTION("Reduce qty on market shrink (immidiate)") { + for (auto& s : test_sizes) + { AlgoTestDriver state(def, some_price, Quantity {10}); auto secid = SecurityKey(state.security().id()); Book book(secid); - book.bid()[0] = { some_price, 505 }; + + // order size is driven by the available market size + book.bid()[0] = { some_price, s.input }; state.update_book(book); + REQUIRE(state.before_launch().ok()); state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(400)); + REQUIRE(state.algo().exposed_qty().value() == s.expected); + REQUIRE(s.expected == child_exposed(state.child_orders())); + } + } + SECTION("Reduce qty on market shrink (immidiate)") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(400)); - // Check that orders were created - REQUIRE( - 400 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - - // Reduce market - book.bid()[0] = { some_price, 405 }; - state.update_book(book); - REQUIRE(state.algo().desired_size() == Quantity(250)); - REQUIRE( - 250 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } + // Check that orders were created + REQUIRE(400 == child_exposed(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity == state.quantity()); } - SECTION("Increase qty w/ delay when market grows") { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - book.bid()[0] = { some_price, 505 }; - state.update_book(book); - REQUIRE(state.before_launch().ok()); - state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(400)); + // Reduce market + book.bid()[0] = { some_price, 405 }; + state.update_book(book); + REQUIRE(state.algo().exposed_qty() == Quantity(250)); + REQUIRE( + 250 == child_exposed(state.child_orders())); + } - // Check that orders were created - REQUIRE( - 400 == count_child_size(state.child_orders())); + SECTION("Increase qty w/ delay when market grows") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(400)); - // INCREASE market - book.bid()[0] = { some_price, 1001 }; - state.update_book(book); - // NOTE: that the orders do not follow the market instantly - // so this is still 400 - REQUIRE( - 400 == count_child_size(state.child_orders())); + // Check that orders were created + REQUIRE( + 400 == child_exposed(state.child_orders())); - // Still 400 after the timer ticks but not enough time has passed - state.advance_time(std::chrono::seconds()); - REQUIRE( - 400 == count_child_size(state.child_orders())); + // INCREASE market + book.bid()[0] = { some_price, 1001 }; + state.update_book(book); + // NOTE: that the orders do not follow the market instantly + // so this is still 400 + REQUIRE( + 400 == child_exposed(state.child_orders())); - state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); - REQUIRE( - 600 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } + // Still 400 after the timer ticks but not enough time has passed + state.advance_time(std::chrono::seconds()); + REQUIRE( + 400 == child_exposed(state.child_orders())); - } - SECTION("Respect maximum") { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - book.bid()[0] = { some_price, 10505 }; - state.update_book(book); - REQUIRE(state.before_launch().ok()); - state.launch(); + state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); + REQUIRE( + 600 == child_exposed(state.child_orders())); - REQUIRE(state.algo().desired_size() == Quantity(input.steps.maximum)); + } + SECTION("Respect maximum") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 10505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); - // Check that orders were created - REQUIRE( - input.steps.maximum == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - } + REQUIRE(state.algo().exposed_qty() == Quantity(input.steps.maximum)); + + // Check that orders were created + REQUIRE( + input.steps.maximum == child_exposed(state.child_orders())); } } @@ -293,7 +277,7 @@ TEST_CASE("Dorman fills", "[algo][dorman]") { state.update_book(book); REQUIRE(state.before_launch().ok()); state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(450)); + REQUIRE(state.algo().exposed_qty() == Quantity(450)); for (const auto& order : state.child_orders()) { state.fill(order.key, price, order.cstate.quantity); From f5bbc4245f7e09b8cd85a2c99e9f156e1a5b06f7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 5 Jul 2019 16:12:32 -0500 Subject: [PATCH 107/198] SP-111 / SP-113 Add ticks off parameter to top algo UI --- src/client/spark/Orders/OrderDataHelper.cs | 4 ++-- src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs | 3 +++ .../view/Controls/Order/AlgoContentTemplateSelector.xaml | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 81e342b38..e3a8179b1 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -715,7 +715,7 @@ namespace mbts.spark.utilities { !b.HasChild); public static bool top_equals(TopOrderDefinitionImmutable a, TopOrderDefinitionImmutable b) => - a.WatchLevelTickOffset == b.WatchLevelTickOffset && + a.TicksOff == b.TicksOff && (a.HasTopThreshold ? b.HasTopThreshold && quantity_measure_equals(a.TopThreshold, b.TopThreshold) : !b.HasTopThreshold) && @@ -906,7 +906,7 @@ namespace mbts.spark.utilities { add_component(_get_hash(_get_tick_child(tick))); break; case CustomOrderDefinition.CustomOneofCase.Top: - add_component(def.Top.WatchLevelTickOffset.GetHashCode()); + add_component(def.Top.TicksOff.GetHashCode()); add_component(def.Top.HasTopThreshold ? def.Top.TopThreshold.GetHashCode() : 0); add_component(_get_top_child(def.Top).GetHashCode()); break; diff --git a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs index 984303599..8f41cbbaf 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs @@ -5,13 +5,16 @@ using TopDefi = bts.api.orderman.TopOrderDefinitionImmutable; namespace mbts.spark { static partial class OrderTypeVMFactory { class TopOrderVM : OrderTypeVMBase { + readonly Property _ticks_off; readonly Property _top_threshold; public TopOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { + _ticks_off = add_nullable_property(nameof(ticks_off), TopDef.TicksOffFieldNumber); _top_threshold = add_property(nameof(top_threshold), TopDef.TopThresholdFieldNumber, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 })); } + public uint? ticks_off { get => _ticks_off.Value; set => _ticks_off.set(value); } public QuantityMeasureImmutable? top_threshold { get => _top_threshold.Value; set => _top_threshold.set(value); } } } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index c64d29f52..a3b82fee1 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -489,6 +489,8 @@ + + @@ -503,9 +505,11 @@ + Ticks Off + Date: Mon, 8 Jul 2019 10:15:14 -0400 Subject: [PATCH 108/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f2ba4c36e..b06ee5496 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,9 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.6.0 +### User Visible Changes + - In the ladder made last trade more distinctive when overlayed on the volumn column ## 2.5.0 ### User Visible Changes - Added loss limit risk check From e079acf91f4bdf56e84a850ccfc2b31b7dea4681 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 10:28:18 -0400 Subject: [PATCH 109/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index b06ee5496..873055005 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,7 @@ insert_anchor_links = "right" ## 2.6.0 ### User Visible Changes - In the ladder made last trade more distinctive when overlayed on the volumn column + - In the ladder, corrected display of volume tool tip ## 2.5.0 ### User Visible Changes - Added loss limit risk check From 4ecbfe5f5b2a18f978ea1cd4bb69898815324e47 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 5 Jul 2019 17:08:42 -0400 Subject: [PATCH 110/198] SP-31 Dorman auto-scratch --- .../orders/algo/algo_orders/DormanAlgo.cpp | 34 ++++- .../orders/algo/algo_orders/DormanAlgo.h | 2 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 21 ++- .../algo/algo_orders/tests/AlgoTestDriver.h | 6 +- .../algo/algo_orders/tests/dorman_tests.cpp | 131 +++++++++++++----- 5 files changed, 148 insertions(+), 46 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index ef5692f45..ce8d33ce4 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -75,7 +75,7 @@ OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { if (ibl.is_attaching()) { return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, - "Splitter does not support attach."}; + "This algo does not support attach."}; } return {/*ok*/}; @@ -95,10 +95,6 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - if (me->fills >= update.quantity()) { - algo().complete(); - } - if (update.has_custom()) { REQUIRE(update.custom().has_dynamic(), "Update cannot change order type"); auto params = to_dorman_params(update.custom().dynamic()); @@ -115,10 +111,14 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { update_child_template(algo(), child.value()); } } + + if (me->fills >= update.quantity()) { + algo().complete(); + } } -void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { - REQUIRE(k == me->child_id, "Unexpected update from illigitimate child"); +void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { + REQUIRE(key == me->child_id, "Unexpected update from illigitimate child"); REQUIRE(state.total_fills.value() >= me->child_state.total_fills.value(), "Unexpected fill decrease."); auto delta = state.total_fills.value() - me->child_state.total_fills.value(); @@ -128,6 +128,11 @@ void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { } me->child_state = state; + if (me->params.scratch && + me->fills >= me->params.scratch.value().max_overfill) { + do_scratch(); + } + if (me->fills >= algo().quantity().value()) { algo().complete(); } @@ -241,6 +246,21 @@ void DormanAlgo::pause_until(TimeStamp) { // check paused_time in on_timer } +void DormanAlgo::do_scratch() { + // When the # of fills exceeds the max overfill quantity + // We enter fills opposite fills at the fill price and terminate + + OrderDefinition def = me->splitter_definition; + def.set_side(securities::other_side(me->side)); + def.mutable_custom_def()->mutable_splitter()->set_exposed_qty(me->fills); + + auto price = me->child_state.last_price; + auto scratch_id = algo().launch_child(def, price, Quantity { me->fills }, false); + + algo().detach_child(scratch_id); + algo().complete(); +} + // // // Parameter parsing and validation diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 01f997068..6f262d8cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -79,6 +79,8 @@ private: bool child_active() const; void pause_until(TimeStamp); + void do_scratch(); + }; template diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 14a9439ad..abd9f1cf3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -59,6 +59,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { AlgoState state; std::vector orders; + std::vector detached_orders; std::map books; std::map book_subs; @@ -68,6 +69,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { std::vector> on_child_launching; std::vector> on_child_changing; std::vector> on_child_changed; + bool allow_overfill = false; Impl(IAlgoOrder& o) : algo(o) {} @@ -165,6 +167,10 @@ const std::vector& AlgoTestDriverBase::child_orders() const { return me->orders; } +const std::vector& AlgoTestDriverBase::detached_orders() const { + return me->detached_orders; +} + AlgoState AlgoTestDriverBase::state() const { return me->state; } @@ -173,7 +179,7 @@ void AlgoTestDriverBase::fill(OrderKey k, Price price, Quantity qty) { auto guard = me->recusion_guard(); for (auto& child : me->orders) { if (child.key == k) { - REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); + if (!me->allow_overfill) REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); for (const auto& cb : me->on_child_changing) cb(child); auto old = child; @@ -237,6 +243,9 @@ void AlgoTestDriverBase::on_child_changing(std::function&& cb) { me->on_child_changed.push_back(cb); } + +bool AlgoTestDriverBase::allow_overfill() const { return me->allow_overfill; } +void AlgoTestDriverBase::allow_overfill(bool value) { me->allow_overfill = value; } // // Utility @@ -369,9 +378,17 @@ void AlgoTestDriverBase::cancel_child(OrderKey key) { } } void AlgoTestDriverBase::detach_child(OrderKey key) { - std::remove_if(me->orders.begin(), me->orders.end(), [key](const auto& order) { return order.key == key; }); + for (auto iter = me->orders.begin(); iter != me->orders.end(); ++iter) { + auto order = *iter; + if (order.key == key) { + me->detached_orders.push_back(order); + me->orders.erase(iter); + break; + } + } } void AlgoTestDriverBase::detach_all_children() { + for (const auto& order : me->orders) me->detached_orders.push_back(order); me->orders.clear(); } void AlgoTestDriverBase::cancel(std::string const &) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index c39f7f2db..50ac02acd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -73,6 +73,7 @@ class AlgoTestDriverBase : private IAlgoServices { // // Inspection methods const std::vector& child_orders() const; + const std::vector& detached_orders() const; AlgoState state() const; // Fills for this specific order @@ -84,7 +85,10 @@ class AlgoTestDriverBase : private IAlgoServices { void on_child_changing(std::function&&); void on_child_changed(std::function&&); - + // + // Tweak internal REQUIRE + bool allow_overfill() const; + void allow_overfill(bool=true); private: diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index e3d5c6f83..b38121daf 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -7,6 +7,7 @@ using namespace std; using namespace bts::orderman::dorman; +using namespace bts::api::orderman; namespace bts { namespace orderman { @@ -113,22 +114,31 @@ struct ExpectedSize { }; constexpr auto some_price = md::IntPrice { 128000, -3 }; -size_t child_exposed(const std::vector& child_orders) { + +template +size_t count_x(const std::vector& child_orders, CB fn) { return std::accumulate( child_orders.begin(), child_orders.end(), 0, - [](uint32_t acc, const auto& child) { - if (child.cstate.status != ChildStatus::CANCELED) { - REQUIRE(child.def); - return - acc + - child.def.value().custom_def().splitter().exposed_qty() - + child.cstate.total_fills.value(); - } - else return acc; + [&](uint32_t acc, const auto& child) { + return acc + fn(child); }); } +size_t count_exposed(const std::vector& child_orders) { + return count_x(child_orders, [](const ChildOrder& child) { + REQUIRE(child.def); + if (child.cstate.status == ChildStatus::CANCELED) return 0u; + else return child.def.value().custom_def().splitter().exposed_qty() + child.cstate.total_fills.value(); + }); +} + +size_t count_fills(const std::vector& child_orders) { + return count_x(child_orders, [](const ChildOrder& child) { + return child.def.value().custom_def().splitter().exposed_qty() + child.cstate.total_fills.value(); + }); +} + TEST_CASE("dorman_order_size", "[algo][dorman]") { // create a table of various sizes @@ -173,7 +183,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { REQUIRE(state.before_launch().ok()); state.launch(); REQUIRE(state.algo().exposed_qty().value() == s.expected); - REQUIRE(s.expected == child_exposed(state.child_orders())); + REQUIRE(s.expected == count_exposed(state.child_orders())); } } SECTION("Reduce qty on market shrink (immidiate)") { @@ -187,7 +197,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { REQUIRE(state.algo().exposed_qty() == Quantity(400)); // Check that orders were created - REQUIRE(400 == child_exposed(state.child_orders())); + REQUIRE(400 == count_exposed(state.child_orders())); for(const auto& ch : state.child_orders()) { REQUIRE(ch.cstate.quantity == state.quantity()); } @@ -197,7 +207,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { state.update_book(book); REQUIRE(state.algo().exposed_qty() == Quantity(250)); REQUIRE( - 250 == child_exposed(state.child_orders())); + 250 == count_exposed(state.child_orders())); } SECTION("Increase qty w/ delay when market grows") { @@ -212,7 +222,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // Check that orders were created REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); // INCREASE market book.bid()[0] = { some_price, 1001 }; @@ -220,16 +230,16 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // NOTE: that the orders do not follow the market instantly // so this is still 400 REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); // Still 400 after the timer ticks but not enough time has passed state.advance_time(std::chrono::seconds()); REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); REQUIRE( - 600 == child_exposed(state.child_orders())); + 600 == count_exposed(state.child_orders())); } SECTION("Respect maximum") { @@ -245,12 +255,11 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // Check that orders were created REQUIRE( - input.steps.maximum == child_exposed(state.child_orders())); + input.steps.maximum == count_exposed(state.child_orders())); } } TEST_CASE("Dorman fills", "[algo][dorman]") { - AlgoParams input; input.steps.step_table = { {500, 250}, @@ -289,29 +298,79 @@ TEST_CASE("Dorman fills", "[algo][dorman]") { // Test cases for transitions w/ fills // - // target = 500 - // send 5 orders of size 100 - // market move, new target = 450 - // reduce order #5 to 50 - // Before we confirm the move - // - fill #4 for 80 - // :: algo needs to shed another 30 Quantity + SECTION("Complete by update") { + // target = 500, exposed = 650 + // Fill 400 + // Change target to 350 + // expect completion + AlgoTestDriver state(def, some_price, Quantity {500}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {500}); - // ^ same but fill #2 for 80 - - - /* - NOTES: - vector = f(fills, target, clip) - => feed into diff - */ + // Fill 400 + state.fill(price, Quantity { 400 }); + Update update; + update.set_quantity(350); + state.do_update(update); + REQUIRE(state.state() == AlgoState::COMPLETED); + } } TEST_CASE("Dorman overfill", "[algo][dorman]") { - SECTION("auto-scratch OFF") { - } + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + SECTION("auto-scratch ON") { + input.scratch = {{ 500 }}; } + SECTION("auto-scratch OFF") { + // both sections will run + input.scratch = std::nullopt; + } + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + AlgoTestDriver state(def, some_price, Quantity {100}); + state.allow_overfill(); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {100}); + REQUIRE(state.child_orders().size() == 1); + + state.fill(state.child_orders().begin()->key, price, Quantity {500}); + REQUIRE(state.state() == AlgoState::COMPLETED); + + if (input.scratch) { + // check that we scratched + REQUIRE(state.detached_orders().size() > 0); + } + else { + // check that we *did not* scratch + REQUIRE(state.detached_orders().size() == 0); + } + } TEST_CASE("Dorman profit-orders", "[algo][dorman]") { From fa163216915d8b110c4d4d9fabce89e2ab6927b5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 10:45:56 -0400 Subject: [PATCH 111/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + src/web/CMakeDeps.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 873055005..5933e4fd3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -8,6 +8,7 @@ insert_anchor_links = "right" ### User Visible Changes - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip + - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes ## 2.5.0 ### User Visible Changes - Added loss limit risk check diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..1843aaacb 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 4f997505f3808edbda24ef1d0e50b010aacb1844 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 8 Jul 2019 11:12:55 -0400 Subject: [PATCH 112/198] Enforce Margin Limit in Spark Admin --- src/web/ui/src/Accounts/State.fs | 24 +++++++++++++++++------- src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 14 ++++++++------ src/web/ui/src/Controls/Fields.fs | 5 +++++ 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 717c2d43d..dabaa22ca 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -83,14 +83,17 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promi 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 } - if (result.isSuccess && result2.success && result3.success) then + if (result.isSuccess && result2.success && result3.success && result4.success) then let! data = admin.get_filtered_admin_data () return UpdateAdminData data elif (not result.isSuccess) then return (ErrorOccured (sprintf "Error saving account: %s" result.errorText)) elif (not result2.success) then return ErrorOccured (sprintf "Error saving leverage factor: %s" result2.errorMessage) + elif (not result4.success) then + return ErrorOccured (sprintf "Error saving Enfrce Margin: %s" result4.errorMessage) else return ErrorOccured (sprintf "Error saving cash balence: %s" result3.errorMessage) } @@ -214,17 +217,24 @@ let update msg (model:Model) : Model * Cmd = let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) 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) with - | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd - | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd - | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd - | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd - | false, false, false -> {model with marginData = newData}, cmd + (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 | DeleteAccount account -> let mdl = { model with OptionsMenuOpen = ""} match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 69960b809..5536dae53 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -57,6 +57,7 @@ type Msg = | UpdateMarginData of ExcessLiquidityReport | SetMarginCashBalance of double | SetMarginCashFactor of double + | SetEnforceMargin of bool | SelectAccount of BTSAccount | DeleteAccount of BTSAccount diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index f077e2ac2..b61f2c50d 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -31,7 +31,8 @@ let selectedAccount model = let isDirty model = let marginDirty = model.marginData.cashBalance <> model.marginScratch.cashBalance || - model.marginData.leverageFactor <> model.marginScratch.leverageFactor + model.marginData.leverageFactor <> model.marginScratch.leverageFactor || + model.marginData.shouldEnforceMargin <> model.marginScratch.shouldEnforceMargin match selectedAccount model with | Some account -> account <> model.scratch || @@ -91,12 +92,12 @@ let generalView model dispatch = ] let marginView model dispatch = + let disabled = not model.marginScratch.shouldEnforceMargin let headerRow:TableControl.row = { cells = [ - //TableControl.Cell (str "Account") TableControl.Cell (div [Style [MinWidth "3em"]][str "Time"]) TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") @@ -118,8 +119,8 @@ let marginView model dispatch = [ TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) TableControl.Cell (str model.marginData.account) - TableControl.Cell (str (withCommas model.marginData.leverageFactor)) - TableControl.Cell (str (withCommas model.marginData.cashBalance)) + TableControl.Cell (Fields.disabledSpan (withCommas model.marginData.leverageFactor) disabled) + TableControl.Cell (Fields.disabledSpan (withCommas model.marginData.cashBalance) disabled) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.nonoptValue)) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.optValue)) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.initialMargin)) @@ -133,8 +134,9 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) - Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) + Fields.checkbox "Enforce Margin Limit" "" (model.marginScratch.shouldEnforceMargin) [] (SetEnforceMargin >> dispatch) + Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [Disabled disabled] (double >> SetMarginCashFactor >> dispatch) + Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [Disabled disabled] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index d26e93e12..e359a4eef 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -16,6 +16,11 @@ let Label (lbl:string) = label [ ClassName "label" ] [ str lbl ] +let disabledSpan (text:string) (disabled: bool) = + match disabled with + | true -> span [Class "disabled-label"] [str text] + | false -> span [] [str text] + let text (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = div [ ClassName "field" ] From e7a941212464b97603895e236e01998fe55d73c4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 12:21:39 -0400 Subject: [PATCH 113/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 5933e4fd3..71aa59b71 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + ## 2.5.0 ### User Visible Changes - Added loss limit risk check From f4395ef8336e616545616292e4c10ba0c22b6661 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 12:26:27 -0400 Subject: [PATCH 114/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71aa59b71..ffb88aee2 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,7 +9,9 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes - +### Internal Changes + - Ensure that admin logins are always allowed to login, regardless of keycode status. + ## 2.5.0 ### User Visible Changes - Added loss limit risk check From 33f533af9b19eb778174c81dce3ddbc8d058da9b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 13:08:18 -0400 Subject: [PATCH 115/198] set span to default off, hook up admin boolean to enforce span behind config key --- src/lib/config/defaults/span.conf | 2 +- src/lib/orderman/limiter/LimitStore.h | 24 +++++++++---------- .../sparkd/position/MarginServiceServer.cpp | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf index 7f86bfab3..96ea56a5a 100644 --- a/src/lib/config/defaults/span.conf +++ b/src/lib/config/defaults/span.conf @@ -1,7 +1,7 @@ SpanMargin { value { - enabled: true + enabled: false login: 'api_bts1' password: 'Summer123' url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 7efcf76ab..2f2f527d4 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -275,20 +275,20 @@ private: const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - //const auto& account = account_data.account; + const auto& account = account_data.account; if(config::get().enabled()) { - // if (account.has_margin_limit() && - // account.margin_limit().enforce_margin()){ - double ex_liq = account_data.excess_liquidity; - if(os::is_nan(ex_liq)){ - out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = "Could not find account Excess Liquidity"; - } - else{ - if(ex_liq < 0){ + if (account.has_margin_limit() && account.margin_limit().enforce_margin()){ + double ex_liq = account_data.excess_liquidity; + if(os::is_nan(ex_liq)){ out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", - ex_liq); + out_res.error_msg = "Could not find account Excess Liquidity"; + } + else{ + if(ex_liq < 0){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", + ex_liq); + } } } } diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index bdc286cac..2b3c790b0 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -162,7 +162,8 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M { report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); report.set_cash_balance(acct->margin_limit().cash_balance()); - report.set_should_enforce_margin(acct->margin_limit().enforce_margin()); + report.set_should_enforce_margin(acct->margin_limit().enforce_margin() && + config::get().enabled()); } double netliq = report.leverage_factor() * report.cash_balance(); From fb08533488f5df0114854a08e8001340ba410d2e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 13:51:54 -0400 Subject: [PATCH 116/198] SP-32 profit orders --- .../orders/algo/algo_orders/DormanAlgo.cpp | 42 ++++++- .../orders/algo/algo_orders/DormanAlgo.h | 3 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 12 +- .../algo/algo_orders/tests/AlgoTestDriver.h | 1 + .../algo/algo_orders/tests/dorman_tests.cpp | 115 +++++++++++++++++- 5 files changed, 166 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index ce8d33ce4..eec8210f0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -42,6 +42,8 @@ struct DormanAlgo::Impl { ChildState child_state; uint32_t fills ={}; + + std::vector profit_orders; }; DormanAlgo::DormanAlgo() : @@ -113,7 +115,7 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { } if (me->fills >= update.quantity()) { - algo().complete(); + complete(); } } @@ -125,6 +127,7 @@ void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { if (delta != 0) { me->fills += delta; algo().update_fill_state(Quantity {me->fills}, state.last_price); + send_profit_order(state.last_price, Quantity {delta}); } me->child_state = state; @@ -134,7 +137,7 @@ void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { } if (me->fills >= algo().quantity().value()) { - algo().complete(); + complete(); } } @@ -199,6 +202,14 @@ void DormanAlgo::on_timer() { } } +IAlgoOrder::OnCancelResponse DormanAlgo::on_cancel() { + // detach any remaining profit orders so they keep running + for(const auto& key : me->profit_orders) { + algo().detach_child(key); + } + return OnCancelResponse::HONOR; +} + IAlgoServices& DormanAlgo::algo() const { return *me->algo; } // @@ -258,6 +269,33 @@ void DormanAlgo::do_scratch() { auto scratch_id = algo().launch_child(def, price, Quantity { me->fills }, false); algo().detach_child(scratch_id); + complete(); +} + +void DormanAlgo::send_profit_order(Price p, Quantity q) { + if (me->params.profit_orders) { + auto side = securities::other_side(me->side); + Price offset = + Price { algo().security().contract_spec().low_tick() * me->params.profit_orders.value().ticks_away }; + auto price = + securities::worsen_price(side, p, offset); + + OrderDefinition def = me->splitter_definition; + def.set_time_in_force(TimeInForce::TIME_IN_FORCE_GTC); + def.set_side(side); + def.mutable_custom_def()->limit(); + me->profit_orders.push_back( + algo().launch_child(def, price, q, false)); + } +} + +void DormanAlgo::complete() { + // Allow profit orders to keep running + if (me->params.profit_orders) { + for(const auto& key : me->profit_orders) { + algo().detach_child(key); + } + } algo().complete(); } diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 6f262d8cb..4be257975 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -67,6 +67,7 @@ public: void on_child_change(OrderKey, ChildState const &) override; void on_book(SecurityKey, const Book&) override; void on_timer() override; + IAlgoOrder::OnCancelResponse on_cancel() override; Quantity exposed_qty() const; @@ -80,6 +81,8 @@ private: void pause_until(TimeStamp); void do_scratch(); + void send_profit_order(Price, Quantity); + void complete(); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index abd9f1cf3..12861b54e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -162,6 +162,16 @@ void AlgoTestDriverBase::advance_time(Duration d) { me->algo.on_timer(); } } +IAlgoOrder::OnCancelResponse AlgoTestDriverBase::cancel() { + auto r = me->algo.on_cancel(); + if (r == IAlgoOrder::OnCancelResponse::HONOR) { + me->state = AlgoState::CANCELED; + for (auto& o : me->orders) { + o.cstate.status = ChildStatus::CANCELED; + } + } + return r; +} const std::vector& AlgoTestDriverBase::child_orders() const { return me->orders; @@ -392,7 +402,7 @@ void AlgoTestDriverBase::detach_all_children() { me->orders.clear(); } void AlgoTestDriverBase::cancel(std::string const &) { - me->state = AlgoState::CANCELED; + cancel(); } void AlgoTestDriverBase::terminate_error(std::string const &) { me->state = AlgoState::TERMINATED; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index 50ac02acd..1d8acc5d6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -69,6 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void update_book(const Book&); void advance_time(Duration); + IAlgoOrder::OnCancelResponse cancel(); // // Inspection methods diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index b38121daf..5613de3d1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -2,6 +2,7 @@ #include "../DormanAlgo.h" #include "AlgoTestDriver.h" #include "lib/orderman/orderman_utils/Book.h" +#include "lib/domain_model/Security.h" #include #include @@ -374,14 +375,120 @@ TEST_CASE("Dorman overfill", "[algo][dorman]") { } TEST_CASE("Dorman profit-orders", "[algo][dorman]") { - SECTION("profit-orders OFF") { - // Profit orders are not sent + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + + bool test_cancel = true; + + SECTION("Profit Orders ON - Cancel") { + // Send profit orders 3 ticks away + input.profit_orders = {{ 3 }}; } - SECTION("profit-orders ON") { - // profit orders are sent at the right price + SECTION("Profit Orders ON - Complete") { + // Send profit orders 3 ticks away + input.profit_orders = {{ 3 }}; + test_cancel = false; + } + SECTION("Profit Orders OFF") { + input.profit_orders = std::nullopt; + } + SECTION("Profit Orders OFF - complete") { + input.profit_orders = std::nullopt; + test_cancel = false; + } + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + AlgoTestDriver state(def, some_price, Quantity {100}); + auto secid = SecurityKey(state.security().id()); + auto tick = state.security().contract_spec().low_tick(); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {100}); + REQUIRE(state.child_orders().size() == 1); + + state.fill(state.child_orders().begin()->key, price, Quantity {20}); + + if (input.profit_orders) { + // We're testing the bid side so we expect 3 ticks up + auto expected_price = Price { + price.value() + (tick * input.profit_orders.value().ticks_away) }; + REQUIRE(state.child_orders().size() > 1); + REQUIRE(state.detached_orders().empty()); + size_t profit_order_count = 0; + for (const auto& order : state.child_orders()) { + if (order.def.value().side() == api::SIDE_SELL) { + profit_order_count += 1; + REQUIRE(order.cstate.quantity.value() == 20); + REQUIRE(securities::is_same(order.cstate.price, expected_price)); + } + } + REQUIRE(profit_order_count == 1); + } + else { + REQUIRE(state.child_orders().size() == 1); + REQUIRE(state.detached_orders().empty()); + } + + state.fill(state.child_orders().begin()->key, price, Quantity {42}); + + if (input.profit_orders) { + auto expected_price = Price { + price.value() + (tick * input.profit_orders.value().ticks_away) }; + REQUIRE(state.child_orders().size() > 1); + REQUIRE(state.detached_orders().empty()); + bool got_20 = false; + bool got_42 = false; + for (const auto& order : state.child_orders()) { + if (order.def.value().side() == api::SIDE_SELL) { + if (order.cstate.quantity.value() == 20) got_20 = true; + if (order.cstate.quantity.value() == 42) got_42 = true; + REQUIRE(securities::is_same(order.cstate.price, expected_price)); + } + } + REQUIRE(got_42); + REQUIRE(got_20); + } + else { + REQUIRE(state.child_orders().size() == 1); + REQUIRE(state.detached_orders().empty()); + } + + if (test_cancel) { + // Profit orders should detach on cancel + state.cancel(); + REQUIRE(state.state() == AlgoState::CANCELED); + if (input.profit_orders) { + REQUIRE(state.detached_orders().size() > 0); + } + } + else { + state.fill(state.child_orders().begin()->key, price, Quantity {38}); + REQUIRE(state.state() == AlgoState::COMPLETED); + if (input.profit_orders) { + REQUIRE(state.detached_orders().size() > 0); + } } } +// TEST_CASE("Dorman detaches profit orders when completed by scratch", "[algo][dorman][!hide]") { +// } + TEST_CASE("Dorman trade accumulation", "[algo][dorman]") { SECTION("exceed limit") { // Profit orders are not sent From 37dacff74dfed7cd11a34ff0f3d4a28e9e0e03a1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 14:09:37 -0400 Subject: [PATCH 117/198] Fixed a bug in top update --- doc/user/content/release_notes/_index.md | 1 + src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index ffb88aee2..0bf2094a9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + - Added an option for the Top Algo to delete itself if within N ticks from top of book ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp index b7fac256e..acb3f3f29 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -88,6 +88,7 @@ void TopAlgo::do_update(api::orderman::Update const &update) { auto &top_update = update.custom().top(); *child_update.mutable_custom() = top_update.child(); me->top_threshold_measure = top_update.top_threshold(); + me->ticks_off = top_update.ticks_off(); } algo().update_child(me->child_key, child_update); } From 369fb55e9061a4b989341ad8645234f2150daf0c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 14:20:14 -0400 Subject: [PATCH 118/198] fix auth tests to respect difference betwen admin and trader login --- src/lib/utils/tests/AuthTokenTests.cpp | 35 ++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 51de507f7..6bcbe52d8 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -5,19 +5,34 @@ namespace bts { namespace test { TEST_CASE("AuthToken", "[security]") { - api::admin::BTSUser user; - user.set_id(42); - user.set_name("user1"); + api::admin::BTSUser admin_user; + admin_user.set_id(42); + admin_user.set_name("user1"); + + api::admin::BTSUser trader_user; + trader_user.set_id(43); + trader_user.set_name("trader1"); + trader_user.mutable_user_data()->mutable_exchange_user_data()->mutable_cme_data()->add_md_permissions()->set_enabled(true); - SECTION("round trip") { - auto token = api::auth::generate_token(user); + SECTION("round trip admin") { + auto token = api::auth::generate_token(admin_user); + // We use 1 byte for api header size + REQUIRE(token.ByteSize() <= 240); + api::user::TokenPayload payload; + REQUIRE(!api::auth::decode_token(token, &payload)); + REQUIRE(payload.id() == admin_user.id()); + REQUIRE(payload.wheel() == false); + } + + SECTION("round trip trader") { + auto token = api::auth::generate_token(trader_user); // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == trader_user.id()); REQUIRE(payload.wheel() == false); - } + } SECTION("empty token") { api::user::TokenPayload payload; @@ -28,11 +43,11 @@ TEST_CASE("AuthToken", "[security]") { } SECTION("bts is the big wheel") { - user.set_name("bts"); - auto token = api::auth::generate_token(user); + admin_user.set_name("bts"); + auto token = api::auth::generate_token(admin_user); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == admin_user.id()); REQUIRE(payload.wheel()); } } From 8206f457b5e71cae85836a4d104bb15ac3b7e09a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 14:27:37 -0400 Subject: [PATCH 119/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index ffb88aee2..1c9a618eb 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + - Address a rare issue that could lead to an error report on UI exit ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From 72a6689cd4010e0714f3eca392350206c873a9a8 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 14:41:07 -0400 Subject: [PATCH 120/198] SP-117 Expose ticker to IAlgoOrder --- src/lib/orderman/events/TickerUpdateEvent.h | 1 + .../orderman/orders/algo/AlgoWrapperOrder.cpp | 16 ++++++++++++++++ src/lib/orderman/orders/algo/AlgoWrapperOrder.h | 2 ++ src/lib/orderman/orders/algo/IAlgoOrder.h | 4 ++++ src/lib/orderman/orders/algo/IAlgoServices.h | 4 ++++ .../algo/algo_orders/tests/AlgoTestDriver.cpp | 16 ++++++++++++++++ .../algo/algo_orders/tests/AlgoTestDriver.h | 4 ++++ src/server/sparkd/cmds/QuickTest.cpp | 2 ++ 8 files changed, 49 insertions(+) diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index d34522d48..c8082d169 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -6,6 +6,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_chrono.h" #include "lib/md/protos/co2.pb.h" +#include "boost/container/small_vector.hpp" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index c3a483969..2520fdc62 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -49,6 +49,7 @@ struct AlgoWrapperOrder::PImpl { OrderState const &state() const { return _state; } Map book_subs; + Map ticker_subs; Map children; bool has_timer_sub = false; @@ -364,6 +365,21 @@ void AlgoWrapperOrder::unsubscribe_book(SecurityKey k) { me->services->unsubscribe_from_book(it->second); } +void AlgoWrapperOrder::subscribe_ticker(SecurityKey k) { + if (!is_working()) return; + bts_assert(me->ticker_subs.find(k) == me->ticker_subs.end()); + + me->ticker_subs[k] = me->services->subscribe_to_ticker( + k, [this,k](const auto& ev) { me->algo->on_ticker(k, ev.trades); }); +} + +void AlgoWrapperOrder::unsubscribe_ticker(SecurityKey k) { + if (!is_working()) return; + bts_assert(me->ticker_subs.find(k) != me->ticker_subs.end()); + if (auto it = me->ticker_subs.find(k); it != me->ticker_subs.end()) + me->services->unsubscribe_from_ticker(it->second); +} + void AlgoWrapperOrder::subscribe_child_change(OrderKey k) { if (!is_working()) return; diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h index f11a84a23..472d9c2c0 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h @@ -46,6 +46,8 @@ class AlgoWrapperOrder : public Order, void unsubscribe_child_change(OrderKey) override; void subscribe_timer() override; void unsubscribe_timer() override; + void subscribe_ticker(SecurityKey) override; + void unsubscribe_ticker(SecurityKey) override; OrderKey launch_child(ChildTemplate &, Price, Quantity, bool subscribe = true) override; OrderKey launch_child(api::orderman::OrderDefinition const &, Price, diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 3b882b49d..6fc25a893 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orders/Order.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include namespace bts { @@ -36,6 +37,9 @@ class IAlgoOrder { // The book for the specified security has changed virtual void on_book(SecurityKey, Book const &) {} + // Trades stream for the specified security + virtual void on_ticker(SecurityKey, const boost::container::small_vector&) {}; + // A period timer has run out virtual void on_timer() {} diff --git a/src/lib/orderman/orders/algo/IAlgoServices.h b/src/lib/orderman/orders/algo/IAlgoServices.h index 4d9cd2f2f..5fb5acd28 100644 --- a/src/lib/orderman/orders/algo/IAlgoServices.h +++ b/src/lib/orderman/orders/algo/IAlgoServices.h @@ -38,6 +38,10 @@ class IAlgoServices : public IBeforeLaunchAlgoServices { virtual void subscribe_timer() = 0; virtual void unsubscribe_timer() = 0; + // Subscribe to trade ticker + virtual void subscribe_ticker(SecurityKey) = 0; + virtual void unsubscribe_ticker(SecurityKey) = 0; + // -------------------------------------------------------------- // Child management // -------------------------------------------------------------- diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 12861b54e..4343d9a68 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -63,6 +63,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { std::map books; std::map book_subs; + std::map ticker_subs; bool sub_timer = false; // Callbacks @@ -156,6 +157,12 @@ void AlgoTestDriverBase::update_book(const Book& book) { me->algo.on_book(key, book); } } +void AlgoTestDriverBase::update_ticker(SecurityKey key, boost::container::small_vector& data) { + auto iter = me->ticker_subs.find(key); + if (iter != me->ticker_subs.end() && iter->second) { + me->algo.on_ticker(key, data); + } +} void AlgoTestDriverBase::advance_time(Duration d) { me->now += d; if (me->sub_timer) { @@ -310,6 +317,14 @@ void AlgoTestDriverBase::subscribe_book(SecurityKey key){ void AlgoTestDriverBase::unsubscribe_book(SecurityKey key) { me->book_subs.erase(key); } + +void AlgoTestDriverBase::subscribe_ticker(SecurityKey key) { + me->ticker_subs[key] = true; +} +void AlgoTestDriverBase::unsubscribe_ticker(SecurityKey key) { + me->ticker_subs.erase(key); +} + void AlgoTestDriverBase::subscribe_child_change(OrderKey k) { for (auto& child : me->orders) { if (child.key == k) { @@ -327,6 +342,7 @@ void AlgoTestDriverBase::unsubscribe_child_change(OrderKey k) { void AlgoTestDriverBase::subscribe_timer() { me->sub_timer = true; } void AlgoTestDriverBase::unsubscribe_timer() { me->sub_timer = false; } + OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity qty, bool sub) { OrderKey key = me->next_order(); me->orders.push_back( diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index 1d8acc5d6..ffa0060e6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/md/IntPrice.h" #include #include @@ -68,6 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void do_update(const api::orderman::Update&); void update_book(const Book&); + void update_ticker(SecurityKey, boost::container::small_vector&); void advance_time(Duration); IAlgoOrder::OnCancelResponse cancel(); @@ -112,6 +114,8 @@ private: void unsubscribe_child_change(OrderKey) override; void subscribe_timer() override; void unsubscribe_timer() override; + void subscribe_ticker(SecurityKey) override; + void unsubscribe_ticker(SecurityKey) override; OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) override; OrderKey launch_child(api::orderman::OrderDefinition const &, Price, diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index f6f86be5a..37f087650 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -33,6 +33,8 @@ struct Proxy : public IAlgoServices { void unsubscribe_child_change(OrderKey) {} void subscribe_timer() {} void unsubscribe_timer() {} + void subscribe_ticker(SecurityKey) override {} + void unsubscribe_ticker(SecurityKey) override {} OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) { return {}; } OrderKey launch_child(api::orderman::OrderDefinition const &, Price, Quantity, bool) { From 74a91a7d2e2212ef7f31c4f681ba1e2ee7a21ac7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 14:49:44 -0400 Subject: [PATCH 121/198] SP-117 typedef TradeVector type --- src/lib/orderman/events/TickerUpdateEvent.h | 3 ++- src/lib/orderman/orders/algo/IAlgoOrder.h | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index c8082d169..029d0fc04 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -28,9 +28,10 @@ class TickerUpdateEvent : public mercury::Event { co2::AggressorSide aggressor_side; }; - boost::container::small_vector trades; + boost::container::small_vector trades; TickerUpdateEvent(SecurityKey key) : _key(key), trades() {} }; +typedef boost::container::small_vector TradeVector; } } diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 6fc25a893..15cf711d5 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -38,7 +38,7 @@ class IAlgoOrder { virtual void on_book(SecurityKey, Book const &) {} // Trades stream for the specified security - virtual void on_ticker(SecurityKey, const boost::container::small_vector&) {}; + virtual void on_ticker(SecurityKey, const TradeVector&) {}; // A period timer has run out virtual void on_timer() {} diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 4343d9a68..777553d29 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -157,7 +157,7 @@ void AlgoTestDriverBase::update_book(const Book& book) { me->algo.on_book(key, book); } } -void AlgoTestDriverBase::update_ticker(SecurityKey key, boost::container::small_vector& data) { +void AlgoTestDriverBase::update_ticker(SecurityKey key, TradeVector& data) { auto iter = me->ticker_subs.find(key); if (iter != me->ticker_subs.end() && iter->second) { me->algo.on_ticker(key, data); diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index ffa0060e6..917c36bdd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -69,7 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void do_update(const api::orderman::Update&); void update_book(const Book&); - void update_ticker(SecurityKey, boost::container::small_vector&); + void update_ticker(SecurityKey, TradeVector&); void advance_time(Duration); IAlgoOrder::OnCancelResponse cancel(); From 10476c6662354ed9946678f41ce9246ac0f03c1f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 14:22:55 -0500 Subject: [PATCH 122/198] null ref check on LadderSettings.mini_ob.value --- .../spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index ea67bad1d..82e95beb8 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -363,7 +363,9 @@ namespace mbts.spark { } else { clone = SparkUtils.clone_proto(_current); #pragma warning disable CS0612 // Type or member is obsolete - clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion)); + clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ? + mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) : + mini_ob.create()); #pragma warning restore CS0612 // Type or member is obsolete } clone.badge_style = badge_style; From dbdc915ff24852bc4f53f8ea787cf87171b92c14 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 14:24:36 -0500 Subject: [PATCH 123/198] populating mini_ob (LadderMiniOrderBookSettings) in LadderSettings.Default --- src/client/spark/Modules/Trading/Ladder/LadderSettings.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index 7fbb2fb55..636d901c4 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -339,6 +339,7 @@ namespace mbts.spark { zoom_slider_visible = false, zoom_factor = _default_zoom_factor, net_change = NetChangeTerms.None, + mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general), }; rv.row_height = LadderRender.measure_row_height(rv); return rv; From f12217d76ced7fd91c200e53ac3818b54f0f3fc6 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 20:12:47 +0000 Subject: [PATCH 124/198] Remove mapping of DME mic per Pedro --- src/web/ui/src/Users/Types.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 6de2e5df3..51b83e88a 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -71,4 +71,4 @@ let CMEMicMap:Map = Map.empty .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) .Add("XCEC", bts.api.CMEMics.COMEX) - .Add("DUMX", bts.api.CMEMics.DME) \ No newline at end of file + .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file From d5fdcc67961a05595f0bbac00362d59ccb433f12 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 15:37:38 -0500 Subject: [PATCH 125/198] don't revert to default selected setter when server reboots --- .../spark/core/Utility/ViewModelBase.cs | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 8fa702aaf..9f047adff 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -792,14 +792,20 @@ namespace mbts.ui.shell { void IObserver>.OnNext(IEnumerable value) { _is_items_source_changing = true; if (_is_user_selected_item) { - var curr_selected_item = selected_item; - _items.sync_with(value); - if (_try_match_item(curr_selected_item, out TValue match)) { - _is_user_selected_item = true; - _set_selected_item(match, SelectionReason.CurrentValueWasRestored); - } else { - _is_user_selected_item = false; - _try_auto_select(); + // Becauase we wish to preserve the status of _is_user_selected_item + // on server reboots, I don't want that main else to fire if value.Any() is false, + // so that is why I'm not && here; the sync_with() down there will clear out + // _is_user_selected_item when the server reboots + if (value.Any()) { + var curr_selected_item = selected_item; + _items.sync_with(value); + if (_try_match_item(curr_selected_item, out TValue match)) { + _is_user_selected_item = true; + _set_selected_item(match, SelectionReason.CurrentValueWasRestored); + } else { + _is_user_selected_item = false; + _try_auto_select(); + } } } else { _items.sync_with(value); From 3422a44c87338e34413eed06c79d7f11b2088bd6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 16:49:32 -0400 Subject: [PATCH 126/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + src/lib/CMakeDeps.cmake | 2 +- src/web/CMakeDeps.cmake | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 0286a8dcf..71033b6a2 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -11,6 +11,7 @@ insert_anchor_links = "right" - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit + - Added margin risk limits ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1bf4e1c6f..5effdb441 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 1843aaacb..bc74cb4cf 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 5e04abe5731f7e9a7dd1573974ad696579721fa1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 8 Jul 2019 16:50:07 -0400 Subject: [PATCH 127/198] Combining the account lookup for loss_limitm and span --- src/lib/orderman/limiter/LimitStore.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 2f2f527d4..f46ca7f0c 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -158,10 +158,13 @@ public: Quantity quantity, bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; - _loss_limit(account_id, rv); + const auto acct_it = _account_data_map.find(account_id.value()); + AccountData const* account_ptr = (acct_it == _account_data_map.end()) ? + nullptr : &(acct_it->second); + _loss_limit(account_ptr, rv); if(!rv.ok()) return rv; - _margin_limit(account_id,rv); + _margin_limit(account_ptr,rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -192,10 +195,13 @@ public: Quantity from, Quantity to, bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; + const auto acct_it = _account_data_map.find(account_id.value()); + AccountData const* account_ptr = (acct_it == _account_data_map.end()) ? + nullptr : &(acct_it->second); // in case of order modifications, loss limits are only checked // for size increases if (to.value() > from.value()) - _loss_limit(account_id, rv); + _loss_limit(account_ptr, rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -235,16 +241,15 @@ private: void _add_product_entry(const api::Security& security, const bts::api::admin::AdminData& admin_data); void _set_user_data(); - void _loss_limit(AccountID account_id, + void _loss_limit(AccountData const* account_ptr, Limiter::LimiterQueryResult& out_res) const{ // the usual flow should not alter out_res. // its set to an error state iff : // i. account is not found // ii. limit check is enabled but pnl is nan // iii. limit check is enable and it actually fails - const auto acct_it = _account_data_map.find(account_id.value()); - if(acct_it != _account_data_map.end()){ - const auto& account_data = acct_it->second; + if(account_ptr != nullptr){ + const auto& account_data = *account_ptr; const auto& account = account_data.account; if (account.has_account_loss_limit() && account.account_loss_limit().enforce()){ @@ -269,12 +274,11 @@ private: out_res.error_msg = "Could not find account"; } } - void _margin_limit(AccountID account_id, + void _margin_limit(AccountData const* account_ptr, Limiter::LimiterQueryResult& out_res) const{ // similiar flow as the loss_limit above - const auto acct_it = _account_data_map.find(account_id.value()); - if(acct_it != _account_data_map.end()){ - const auto& account_data = acct_it->second; + if(account_ptr != nullptr){ + const auto& account_data = *account_ptr; const auto& account = account_data.account; if(config::get().enabled()) { if (account.has_margin_limit() && account.margin_limit().enforce_margin()){ From 087b0015105878a5b77a3452cd2bca3ac43a47ba Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 17:03:56 -0400 Subject: [PATCH 128/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71033b6a2..27e67d72a 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,6 +12,7 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits + - Added support for the Dubai Mercantile Exchange (DME) MIC ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From cd744963ff306035b756aae6fad90c2b46081021 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 16:21:46 -0500 Subject: [PATCH 129/198] Revert "don't revert to default selected setter when server reboots" This reverts commit d5fdcc67961a05595f0bbac00362d59ccb433f12. --- .../spark/core/Utility/ViewModelBase.cs | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 9f047adff..8fa702aaf 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -792,20 +792,14 @@ namespace mbts.ui.shell { void IObserver>.OnNext(IEnumerable value) { _is_items_source_changing = true; if (_is_user_selected_item) { - // Becauase we wish to preserve the status of _is_user_selected_item - // on server reboots, I don't want that main else to fire if value.Any() is false, - // so that is why I'm not && here; the sync_with() down there will clear out - // _is_user_selected_item when the server reboots - if (value.Any()) { - var curr_selected_item = selected_item; - _items.sync_with(value); - if (_try_match_item(curr_selected_item, out TValue match)) { - _is_user_selected_item = true; - _set_selected_item(match, SelectionReason.CurrentValueWasRestored); - } else { - _is_user_selected_item = false; - _try_auto_select(); - } + var curr_selected_item = selected_item; + _items.sync_with(value); + if (_try_match_item(curr_selected_item, out TValue match)) { + _is_user_selected_item = true; + _set_selected_item(match, SelectionReason.CurrentValueWasRestored); + } else { + _is_user_selected_item = false; + _try_auto_select(); } } else { _items.sync_with(value); From 0e4fe1b47e6faec0f324abb7f7e94d0b124eda32 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 16:29:19 -0500 Subject: [PATCH 130/198] filter the SelectorProperty source for updates that actually have items; this keeps the currently selected account through server restarts --- src/client/spark/Orders/OrderPropertiesEditorVM.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 122ac1589..81354eae0 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -109,9 +109,14 @@ namespace mbts.spark { () => new InlineUserProperty(), new InlineOrderProperties(), DictionaryHelper.empty()); + // Note that with the .Where on the account_tuples, we will ignore any + // updates for which all accounts have been removed. + // This was a safer change than changing SelectorProperty's IEnumberable.OnNext + // so that it would not reset the selected item on server reboots; i.e. this + // change only affects this IObservable. _accounts = backing( nameof(selected_account), - model.factory.subscribe_account_tuples(), + model.factory.subscribe_account_tuples().Where(items => items.Any()), inline_account_src, a => new AccountTuple?(a), () => accounts.Cast().FirstOrDefault(), From 93824786c77966111ff1108547cea9d44fe7549d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 17:32:33 -0400 Subject: [PATCH 131/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71033b6a2..fea4413e9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,6 +12,7 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits + - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book. ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From 2940601f4bca0c6c481b0fb196f4229655312ed8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 18:15:31 -0400 Subject: [PATCH 132/198] Updated release notes --- doc/user/content/release_notes/_index.md | 3 ++- src/lib/CMakeDeps.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index fea4413e9..471ae1b0c 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,7 +12,8 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits - - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book. + - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book + - Avoided switching the current account and order type on open ladders when limits are changed ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 5effdb441..9a5e0590d 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file From 6b799bf93b1a1920a844c3aa98fe7ced018ee941 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 8 Jul 2019 15:37:35 -0500 Subject: [PATCH 133/198] [non-functional] normalize spacing/tabs in LoginView.xaml --- .../spark/view/Shell/Login/LoginView.xaml | 293 ++++++++++-------- 1 file changed, 157 insertions(+), 136 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index 61ab1e961..e11a66b2f 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -1,143 +1,164 @@ - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml.cs b/src/client/spark/view/Shell/Login/LoginView.xaml.cs index e9edcd73c..974f3c5ba 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml.cs +++ b/src/client/spark/view/Shell/Login/LoginView.xaml.cs @@ -1,21 +1,42 @@ -using System; +using bts; +using mbts.ui.converters; +using mbts.ui.native; +using mbts.utils; +using System; using System.Linq; using System.Windows; +using System.Windows.Data; using System.Windows.Input; using System.Windows.Interop; using System.Windows.Media.Imaging; -using mbts.ui.native; -using bts; -using System.Windows.Data; -using mbts.ui.converters; namespace mbts.ui.shell { public partial class LoginView : Window { - public static IValueConverter ResumeWorkspaceVisualStateConverter => + public enum LoginStatus { + Initializing, + Ready, + Error, + Rejected, + LoggingIn + } + + public static IValueConverter WorkspaceVisualStateConverter => ValueConverter.create(workspace => !string.IsNullOrEmpty(workspace) && workspace != LoginViewModel.NEW_WORKSPACE_NAME ? - VisualStateNames.ResumeWorkspace.Active : - VisualStateNames.ResumeWorkspace.Inactive); + VisualStateNames.Workspace.Active : + VisualStateNames.Workspace.Inactive); + + public static IValueConverter LoginStatusVisualStateConverter => + ValueConverter.create(status => { + switch (status) { + case LoginStatus.Initializing: return VisualStateNames.LoginStatus.Initializing; + case LoginStatus.Ready: return VisualStateNames.LoginStatus.Ready; + case LoginStatus.LoggingIn: return VisualStateNames.LoginStatus.Loading; + case LoginStatus.Rejected: return VisualStateNames.LoginStatus.Rejected; + case LoginStatus.Error: return VisualStateNames.LoginStatus.Error; + default: throw ExceptionBuilder.Argument.unexpected_case(status, nameof(status)); + } + }); public LoginView(LoginViewModel model) { this.DataContext = model; @@ -73,8 +94,18 @@ namespace mbts.ui.shell { } public static class VisualStateNames { - public static class ResumeWorkspace { - public const string GroupName = nameof(ResumeWorkspace); + public static class LoginStatus { + public const string GroupName = nameof(LoginStatus); + public static readonly string + Initializing = $"{GroupName}{nameof(Initializing)}", + Ready = $"{GroupName}{nameof(Ready)}", + Loading = $"{GroupName}{nameof(Loading)}", + Rejected = $"{GroupName}{nameof(Rejected)}", + Error = $"{GroupName}{nameof(Error)}"; + } + + public static class Workspace { + public const string GroupName = nameof(Workspace); public static readonly string Active = $"{GroupName}{VisualStates.Active}", diff --git a/src/client/spark/view/Shell/Login/LoginViewModel.cs b/src/client/spark/view/Shell/Login/LoginViewModel.cs index 41b2c7b8d..608b79009 100644 --- a/src/client/spark/view/Shell/Login/LoginViewModel.cs +++ b/src/client/spark/view/Shell/Login/LoginViewModel.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Input; using System.Windows.Threading; +using LoginStatus = mbts.ui.shell.LoginView.LoginStatus; -namespace mbts.ui.shell -{ +namespace mbts.ui.shell { public class LoginViewModel : ViewModelBase, IRequestViewClose { public const string NEW_WORKSPACE_NAME = "New workspace..."; @@ -43,7 +41,7 @@ namespace mbts.ui.shell void _model_Ready() { _dispatcher.BeginInvoke(() => { if (!_model.HasFatalError) { - this.VisualState = "LoginState"; + login_status = LoginStatus.Ready; load_username(); if (!string.IsNullOrEmpty(_name)) KnownUsers.Add(_name); @@ -51,13 +49,13 @@ namespace mbts.ui.shell } else { ErrorMessage = _model.ErrorMessage; - VisualState = "ErrorState"; + login_status = LoginStatus.Error; } }); } - private string _vstate = "Normal"; - public string VisualState { get { return _vstate; } set { _vstate = value; RaisePropertyChanged("VisualState"); } } + LoginStatus _login_status; + public LoginStatus login_status { get => _login_status; private set => Set(ref _login_status, value); } /// should only contain the user-name of the last login (if none exists, it should be empty). public ObservableCollection KnownUsers { get; } = new ObservableCollection(); @@ -145,10 +143,10 @@ namespace mbts.ui.shell string selected_workspace = _resume_workspace && SelectedWorkspace != NEW_WORKSPACE_NAME ? SelectedWorkspace : null; var result = await _model.do_login(Name, selected_workspace, Password); - if (result.success) { VisualState = "Loading"; } + if (result.success) { login_status = LoginStatus.LoggingIn; } if (!result.success && !string.IsNullOrEmpty(result.reason)) { WarningMessage = result.reason; - VisualState = "BadPassword"; + login_status = LoginStatus.Rejected; } else if (!string.IsNullOrEmpty(result.reason)) { // Login was successful but we have a message for the user From 901988ec2bb8b965507195117bc239ff6976eecc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 23 Jul 2019 13:46:06 -0500 Subject: [PATCH 189/198] center-align loginview's reject message --- src/client/spark/view/Shell/Login/LoginView.xaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index eb1c48b7a..cf775b558 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -192,8 +192,7 @@ Date: Tue, 23 Jul 2019 13:53:45 -0500 Subject: [PATCH 190/198] flip 'login/cancel' buttons to follow ok/cancel pattern --- src/client/spark/view/Shell/Login/LoginView.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index cf775b558..741efc3fb 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -251,12 +251,12 @@ - + From 5536f5f58533785a9b5815f940c59448f7dd14fb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 23 Jul 2019 14:17:25 -0400 Subject: [PATCH 191/198] Cover should always detach from hedges when completing. --- .../orders/algo/algo_orders/CoverAlgo.cpp | 38 ++++++++++++------- .../orders/algo/algo_orders/CoverAlgo.h | 4 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 6b112a9cb..80f85d7d1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -127,12 +127,12 @@ void CoverAlgo::on_covered_change(ChildState const &st) { algo().order_key().value()); algo().set_ladder_visibility(false); me->status = Status::WAITING_FOR_HEDGES; - check_terminate(); + terminate_if_hedges_complete(); break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", + LOG(OrderMan, Info, "CoverAlgo {}. Child was unexpectadly canceled, terminating", algo().order_key().value()); - me->status = Status::DONE; + on_done(); algo().terminate_error("Unexpected child cancel"); break; } @@ -145,7 +145,7 @@ void CoverAlgo::on_covered_change(ChildState const &st) { case ChildStatus::COMPLETED: LOG(OrderMan, Info, "CoverAlgo {}. Shutdown complete", algo().order_key().value()); - me->status = Status::DONE; + on_done(); algo().cancel(); break; } @@ -170,7 +170,7 @@ void CoverAlgo::on_hedge_change(OrderKey k, ChildState const &st) { if (me->cancel_on_external_hedge_cancel) { LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", algo().order_key().value()); - me->status = Status::DONE; + on_done(); algo().terminate_error("Unexpected child cancel"); return; } else @@ -180,14 +180,14 @@ void CoverAlgo::on_hedge_change(OrderKey k, ChildState const &st) { } // Now if we are waiting for hedges to complete, bail - check_terminate(); + terminate_if_hedges_complete(); } void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { if (k == me->child_key) on_covered_change(st); else - on_hedge_change(k,st); + on_hedge_change(k, st); } void CoverAlgo::do_update(api::orderman::Update const &update) { @@ -244,7 +244,7 @@ void CoverAlgo::update_definition( cover.cancel_on_external_hedge_cancel(); } -void CoverAlgo::check_terminate() { +void CoverAlgo::terminate_if_hedges_complete() { LOG(OrderMan, Diag, "CoverAlgo {} check_terminate. State: {} Hedge count: {}", algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, @@ -253,6 +253,7 @@ void CoverAlgo::check_terminate() { if (me->status == Status::WAITING_FOR_HEDGES && me->hedges.empty()) { LOG(OrderMan, Info, "CoverAlgo {}. Last hedge completed, terminating", algo().order_key().value()); + on_done(); algo().complete(); } } @@ -260,13 +261,10 @@ void CoverAlgo::check_terminate() { IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { switch (me->status) { case Status::WORKING: { - if (!me->cancel_hedges_on_cancel) - for (auto &k : me->hedges) - algo().detach_child(k); algo().cancel_child(me->child_key); - LOG(OrderMan, Info, - "CoverAlgo {} received cancel. Canceling child and waiting for an ack", + "CoverAlgo {} received cancel. Canceling child and waiting for an " + "ack", algo().order_key()); me->status = Status::CANCELING; return IAlgoOrder::OnCancelResponse::IGNORE; @@ -274,6 +272,7 @@ IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { case Status::CANCELING: return IAlgoOrder::OnCancelResponse::IGNORE; case Status::WAITING_FOR_HEDGES: + maybe_detach_hedges(); return IAlgoOrder::OnCancelResponse::HONOR; case Status::DONE: bts_assert(false); @@ -284,6 +283,19 @@ IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { return IAlgoOrder::OnCancelResponse::HONOR; } +void CoverAlgo::on_done() +{ + me->status = Status::DONE; + maybe_detach_hedges(); +} + + +void CoverAlgo::maybe_detach_hedges() { + if (!me->cancel_hedges_on_cancel) + for (auto &k : me->hedges) + algo().detach_child(k); +} + const char *CoverAlgo::status_name(Status st) { switch (st) { case Status::WORKING: diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 86904a2fc..7514ae5cd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -30,11 +30,13 @@ private: api::orderman::CoverOrderDefinition const &); void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); - void check_terminate(); + void terminate_if_hedges_complete(); void on_hedge_change(OrderKey hedge, ChildState const&) ; void on_covered_change(ChildState const&); const char *status_name(Status st); + void maybe_detach_hedges(); + void on_done(); }; } // namespace orderman From d8b8a5d7106ecce54a64a4367af15a617d2a34ee Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 23 Jul 2019 15:44:49 -0400 Subject: [PATCH 192/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f5760c5f0..9e307916f 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,11 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.7.1 +### User Visible Changes + - Fixed some issues with the Cover algo, where in some circumstances + it would erroneously cancel launched hedges on completion. + ## 2.7.0 ### User Visible Changes - Allowed algos to process "in-flight" fills while shutting down @@ -330,7 +335,7 @@ insert_anchor_links = "right" - The zoom slider can be enabled from Ladder Form -> Settings button -> Left Pane tab -> check Zoom Slider checkbox - The zoom functionality can also be performed via hotkey and mouse wheel combinations - Zoom In = CTRL + Mouse wheel up - - Zoom Out = CTRL + Mouse wheel down + - Zoom Out = CTRL + Mouse wheel down - Reset zoom = CTRL + Mouse wheel click or double click on the zoom slider ### Exchange simulator - Improved the exchange simulator to track real market data more closely From 6756ba44eb33c8063f740d7054b2e8b0ff281ad7 Mon Sep 17 00:00:00 2001 From: Karl Ellefsen Date: Thu, 25 Jul 2019 17:58:20 +0000 Subject: [PATCH 193/198] Top_cover_TEST.txt edited online with Bitbucket --- .../manual/algo_operations/Top_cover_TEST.txt | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/testing/manual/algo_operations/Top_cover_TEST.txt b/testing/manual/algo_operations/Top_cover_TEST.txt index 57f6f2afa..a603a2c3f 100644 --- a/testing/manual/algo_operations/Top_cover_TEST.txt +++ b/testing/manual/algo_operations/Top_cover_TEST.txt @@ -1,3 +1,14 @@ +This needs sim market data **not** to be merged with replay (or +cert), so we can create our own markets. Use the following key to set +market data up: + +ExchangeSim { + value { + merge_with_md: false + forward_implied: false + } +} + Algo Studio lets you combine algos together and save it as an order type: To test this, we will create a common algo combination and test to make sure it's working as desired. @@ -6,42 +17,32 @@ To test this, we will create a common algo combination and test to make sure it' Let's start by creating the Algo: Launch Algo Studio -Click on top right icon to "add algo" +Click on top left icon to "add algo" Give it a name, call it T_C and give the abbrev a title of T_C as well. Create a Top with Cover, so the very top algos with be a "top" (top thresh 10) and it's child will be a cover (Hedge Ticks 2) Leave both Hedge and Child as limits of the child -Use a very liquid market with recorded data to test, I suggest something like ES or CL. - On the ladder, go to settings, then algo favorites and click add and choose your T_C algo. This will display it on the ladder for quick deployment -click on algo, then enter an order on the best bid +1.) Create a 20 lot bid/ask market 1 tick apart. +2.) Place a 5 lot T_C (top cover algo) buy order on the best bid market. +3.) Place another 5 lot buy limit order on the best bid +4.) Place a 25 lot sell limit order on the best bid, filling the orders placed in 1 and 2 +5.) Verify that the cover order was deployed. -wait until it fills, once fills, it should submit the cover order 2 ticks above the price you got filled at. - -try this with a sell order following the same procedure. +Repeat steps 1 through 5 with a sell order. Additionally, we will add a "lean" into the mix as the child of the cover. -go back to your algo studio, and change the hedge of the cover to be that of lean. - -What will happen is once the cover order is submitted, it will include the lean logic on that cover order. Meaning, it'll lean into the market and cross once the cross thresh is reach. - -Set the parameters to a cross thresh of 10, max chase ticks 0 and on toward no change - -save the algo, and send an order and wait for it to be filled. - -Once filled, it will remain working until the market flips, which means it ticks up a level. Once it flips and there is 1 remaining, the order should cross. - - - - - - +Go back to your algo studio, and change the hedge of the cover to be that of lean. +What will happen is once the cover order is submitted, it will include the lean logic on that cover order. +Set the parameters to a cross thresh of 10, max chase ticks 0 and on toward no change. +Save the algo, and repeat steps 1 through 5 again. +This time the hedge should get filled immediately, as it will lean into the market that we just reduced below it's threshold size. \ No newline at end of file From c670d0012bbe5d9e75cc07a8cfbc01bbbb130b9d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 26 Jul 2019 11:06:29 -0400 Subject: [PATCH 194/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 9e307916f..a1bda15e2 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,10 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.7.2 +### User Visible Changes + - Changed the login dialog to avoid leaking workspace names from other users. + ## 2.7.1 ### User Visible Changes - Fixed some issues with the Cover algo, where in some circumstances From a6b803b4c3568087d1534de48e4f134d865bfa19 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 26 Jul 2019 14:43:30 -0400 Subject: [PATCH 195/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index ae480724c..8b6e9c0c9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,7 +7,13 @@ insert_anchor_links = "right" ## 2.7.2 ### User Visible Changes - Changed the login dialog to avoid leaking workspace names from other users. - + - Added new Splitter algo. From the manual: The splitter is useful + for pro-rata markets where you want to vary your exposure + independent of the order quantity that you want to fill. The + splitter will complete when the number of fills reaches or exceeds + the order quantity but it will put exposed_qty total size on the + market. Splitter favors order size over queue position. + ## 2.7.1 ### User Visible Changes - Fixed some issues with the Cover algo, where in some circumstances From 4b1afd914e885b286ae224e4e3f20c91987c585c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 26 Jul 2019 15:12:36 -0400 Subject: [PATCH 196/198] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 8b6e9c0c9..8b5adec5b 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -13,7 +13,9 @@ insert_anchor_links = "right" splitter will complete when the number of fills reaches or exceeds the order quantity but it will put exposed_qty total size on the market. Splitter favors order size over queue position. - +### Internal Changes + - Made spark more resilient to lack of connectivity to the CME web site for downloading of templates. + ## 2.7.1 ### User Visible Changes - Fixed some issues with the Cover algo, where in some circumstances From a327ffe7e76882cd2bc58361f190c2920b4d9022 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 26 Jul 2019 17:15:00 -0400 Subject: [PATCH 197/198] Delay for limit removal --- src/client/spark_test/System/LimitsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs index 53465d4d6..158e4af5f 100644 --- a/src/client/spark_test/System/LimitsTests.cs +++ b/src/client/spark_test/System/LimitsTests.cs @@ -169,7 +169,7 @@ namespace bts.tests var second_short_order_def = create_order_def(second_sec.Id, Side.Sell, test_account, test_user); uint short_no_limit_order_key; - + await Task.Delay(10000); Result short_no_limit_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 7); short_no_limit_order_key = short_no_limit_order_result.value.OrderKey; From 45ba5746a6b7cda1aa0e9ce37e99e9f9a1155a16 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 26 Jul 2019 17:15:23 -0400 Subject: [PATCH 198/198] Added tool tip for ticks off Top algo parameter. --- .../view/Controls/Order/AlgoContentTemplateSelector.xaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index fe2113479..eba06c5bb 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -505,8 +505,11 @@ - Ticks Off - + + Ticks Off + + +