From 33eaf6f86d95cb0c3a5da9b60671ce822dd37442 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 26 Mar 2019 18:38:05 -0400 Subject: [PATCH 001/225] beginnings of ICE exec and SIMICE --- .../api/service_helpers/AdminServiceUtils.cpp | 143 ++++++++++++++++-- .../api/service_helpers/AdminServiceUtils.h | 12 +- src/lib/api/services/AdminService.proto | 52 ++++--- src/lib/api/services/OrderService.proto | 3 + src/lib/config/defaults/Ports.conf | 3 +- src/lib/config/defaults/jetfix.conf | 39 ++++- src/lib/config/protos/Ports.proto | 3 +- src/lib/config/protos/jetfix.proto | 10 +- src/lib/domain_model/Security.proto | 12 +- src/lib/jetfix/codec/FieldDefinitions.h | 1 + src/lib/jetfix/gateway/Session.cpp | 2 + src/lib/orderman/actors/ExecutionGateway.cpp | 2 + src/lib/orderman/actors/ExecutionGateway.h | 2 + .../actors/order_manager/OrderManager.cpp | 17 ++- src/server/sparkd/cmds/RunSim.cpp | 2 +- .../sparkd/exchange_sim/ExchangeSim.cpp | 22 ++- src/server/sparkd/exchange_sim/ExchangeSim.h | 3 +- src/server/sparkd/md/run_md.cpp | 4 +- src/server/sparkd/user/AdminServiceServer.cpp | 6 +- src/web/ui/src/Access.fs | 11 +- src/web/ui/src/Users/State.fs | 27 ++-- src/web/ui/src/Users/View.fs | 6 +- 22 files changed, 290 insertions(+), 92 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ca30f9f61..43303243f 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -41,6 +41,7 @@ bool AdminServiceUtils::has_exchange(const ExchangeConnection& conn, break; case api::Venue::VENUE_UNSET: case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: rv = conn.has_sim_connection(); break; case api::Venue::VENUE_BTS: @@ -83,6 +84,23 @@ AdminServiceUtils::resolve_cme_connection(const bts::api::admin::AdminData& data return nullptr; } +const bts::api::admin::ExchangeConnection* +AdminServiceUtils::resolve_ice_connection(const bts::api::admin::AdminData& data, + const bts::api::admin::BTSAccount& account, + const bts::api::Security&) +{ + if(account.has_connections()) + { + for (const std::string& conn_name : account.connections().exchange_connection_names()) + { + const bts::api::admin::ExchangeConnection* conn = find_connection(data, conn_name); + if (conn!=nullptr && conn->has_ice_connection()) + return conn; + } + } + return nullptr; +} + const bts::api::admin::ExchangeConnection* AdminServiceUtils::resolve_sim_connection(const bts::api::admin::AdminData& data, const bts::api::admin::BTSAccount& account, @@ -111,14 +129,22 @@ AdminServiceUtils::resolve_connection(const bts::api::admin::AdminData& data, rv = resolve_sim_connection(data, account, sec); break; } + case api::Venue::VENUE_ICE: + { + rv = resolve_ice_connection(data, account, sec); + auto deployment_type = boost::to_lower_copy(config::get().type()); + if (rv == nullptr && (deployment_type == "dev" || deployment_type == "demo")) + rv = resolve_sim_connection(data, account, sec); + break; + } case api::Venue::VENUE_UNSET: case api::Venue::VENUE_BTS: case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: rv = resolve_sim_connection(data, account, sec); break; case api::Venue::VENUE_CBOE: case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: rv = nullptr; @@ -155,9 +181,15 @@ void AdminServiceUtils::fill_connections_from_config(bts::api::admin::AdminData& case config::JetFIX::Connection::CBOE: break; case config::JetFIX::Connection::SIM: + case config::JetFIX::Connection::SIMICE: connection.mutable_sim_connection(); add_connection(admin_data,connection); break; + case config::JetFIX::Connection::ICE: + connection.mutable_ice_connection(); + add_connection(admin_data,connection); + break; + } } for(int i=0;iclearing_account(); break; } - case api::Venue::VENUE_SIM: { + case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: + { auto sim_account_data = get_account_sim_data(account, data); if (sim_account_data != nullptr) rv = sim_account_data->clearing_account(); @@ -384,6 +430,57 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt return rv; } switch (sec.exchange()) { + case api::Venue::VENUE_ICE: + { + const bts::api::admin::ICEUserData* ice_user_data = get_user_ice_data(*user_ptr, data); + if(ice_user_data==nullptr) + { + out_result.set_is_success(false); + out_result.set_error_text("Could not find ICE data for user"); + return rv; + } + const bts::api::admin::ICEAccountData* ice_account_data = get_account_ice_data(*account_ptr, data); + if(ice_account_data==nullptr) + { + out_result.set_is_success(false); + out_result.set_error_text("Could not find ICE data for account"); + return rv; + } + // check for data corectness + if (ice_user_data->operator_id().length() == 0) + { + out_result.set_is_success(false); + out_result.set_error_text("Operator ID is not set"); + return rv; + } + if (ice_user_data->location().length() == 0) + { + out_result.set_is_success(false); + out_result.set_error_text("Location is not set"); + return rv; + } + if (ice_account_data->clearing_account().length() == 0) + { + out_result.set_is_success(false); + out_result.set_error_text("Clearing Account is not set"); + return rv; + } + if (ice_account_data->cti()==bts::api::orderman::CTICode::CTI_CODE_UNDEFINED) + { + out_result.set_is_success(false); + out_result.set_error_text("CTI Code is not set"); + return rv; + } + rv.set_session(conn_ptr->name()); + rv.set_operator_id(ice_user_data->operator_id()); + rv.set_location(ice_user_data->location()); + rv.set_account(ice_account_data->clearing_account()); + rv.set_cti_code(ice_account_data->cti()); + rv.set_customer_or_firm(ice_account_data->origin()); + rv.set_order_server_id(ice_user_data->order_server_id()); + rv.set_trader_id(ice_user_data->authorized_trader()); + return rv; + } case bts::api::Venue::VENUE_GLBX: { const bts::api::admin::CMEUserData* cme_user_data = get_user_cme_data(*user_ptr, data); if(cme_user_data==nullptr){ @@ -434,7 +531,9 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt rv.set_customer_or_firm(cme_account_data->origin()); return rv; } - case api::Venue::VENUE_SIM: { + case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: + { const bts::api::admin::SIMUserData* sim_user_data = get_user_sim_data(*user_ptr, data); if(sim_user_data==nullptr){ out_result.set_is_success(false); @@ -480,8 +579,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt case api::Venue::VENUE_UNSET: case api::Venue::VENUE_BTS: case api::Venue::VENUE_CBOE: - case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: + case api::Venue::VENUE_CBOECFE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: out_result.set_is_success(false); @@ -628,6 +726,18 @@ const bts::api::admin::CMEUserData* AdminServiceUtils::get_group_cme_data(const return nullptr; } +const bts::api::admin::ICEUserData* AdminServiceUtils::get_group_ice_data(const bts::api::admin::BTSUserGroup& group, + const bts::api::admin::AdminData& data){ + if (group.has_user_data() && group.user_data().has_exchange_user_data() && group.user_data().exchange_user_data().has_ice_data()) + return &(group.user_data().exchange_user_data().ice_data()); + else if (has_id(group.parent_group_id())){ + const bts::api::admin::BTSUserGroup* parent_group = find_group(data, group.parent_group_id()); + if (parent_group != nullptr) + return get_group_ice_data(*parent_group, data); + } + return nullptr; +} + const bts::api::admin::SIMUserData* AdminServiceUtils::get_group_sim_data(const bts::api::admin::BTSUserGroup& group, const bts::api::admin::AdminData& data){ if (group.has_user_data() && group.user_data().has_exchange_user_data() && group.user_data().exchange_user_data().has_sim_data()) @@ -758,6 +868,18 @@ const bts::api::admin::CMEUserData* AdminServiceUtils::get_user_cme_data(const b return nullptr; } +const bts::api::admin::ICEUserData* AdminServiceUtils::get_user_ice_data(const bts::api::admin::BTSUser& user, + const bts::api::admin::AdminData& data){ + if (user.has_user_data() && user.user_data().has_exchange_user_data() && user.user_data().exchange_user_data().has_ice_data()) + return &(user.user_data().exchange_user_data().ice_data()); + else{ + const bts::api::admin::BTSUserGroup* parent_group = find_group(data, user.parent_group_id()); + if (parent_group != nullptr) + return get_group_ice_data(*parent_group, data); + } + return nullptr; +} + const bts::api::admin::SIMUserData* AdminServiceUtils::get_user_sim_data(const bts::api::admin::BTSUser& user, const bts::api::admin::AdminData& data){ if (user.has_user_data() && user.user_data().has_exchange_user_data() && user.user_data().exchange_user_data().has_sim_data()) @@ -785,7 +907,9 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm rv = cme_user_data->operator_id(); break; } - case api::Venue::VENUE_SIM: { + case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: + { auto sim_user_data = get_user_sim_data(user, data); if (sim_user_data != nullptr) rv = sim_user_data->operator_id(); @@ -1040,13 +1164,6 @@ void AdminServiceUtils::set_user_exchange_data(bts::api::admin::BTSUser* user, if (!user->user_data().has_exchange_user_data()) user->mutable_user_data()->mutable_exchange_user_data()->CopyFrom(exchange_user_data); } -void AdminServiceUtils::set_user_md_entitlement_data(bts::api::admin::BTSUser* user, - const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){ - if (!user->has_user_data()) - user->mutable_user_data(); - if (!user->user_data().has_exchange_md_entitlement_data()) - user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data); -} void AdminServiceUtils::clear_user_accounts (bts::api::admin::BTSUser* user){ if(user->has_user_data() && user->user_data().has_account_permissions()) user->mutable_user_data()->clear_account_permissions(); diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 781a82362..a1ccfbee5 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -35,6 +35,10 @@ public: const AdminData& data, const BTSAccount& account, const api::Security& sec); + static const ExchangeConnection* resolve_ice_connection( + const AdminData& data, + const BTSAccount& account, + const api::Security& sec); static const ExchangeConnection* resolve_sim_connection( const AdminData& data, const BTSAccount& account, @@ -85,6 +89,8 @@ public: // if needed) static const CMEAccountData* get_account_cme_data(const BTSAccount& account, const AdminData& data); + static const ICEAccountData* get_account_ice_data(const BTSAccount& account, + const AdminData& data); static const SIMAccountData* get_account_sim_data(const BTSAccount& account, const AdminData& data); // returns true if an account has a connection @@ -156,6 +162,8 @@ public: // travels up the group tree until it finds a populated cme data static const CMEUserData* get_group_cme_data(const BTSUserGroup& group, const AdminData& data); + static const ICEUserData* get_group_ice_data(const BTSUserGroup& group, + const AdminData& data); static const SIMUserData* get_group_sim_data(const BTSUserGroup& group, const AdminData& data); static const UserAccountPermissions* const get_group_user_permissions ( @@ -190,6 +198,8 @@ public: static uint32_t find_max_user_id (const AdminData& data); static const CMEUserData* get_user_cme_data(const BTSUser& user, const AdminData& data); + static const ICEUserData* get_user_ice_data(const BTSUser& user, + const AdminData& data); static const SIMUserData* get_user_sim_data(const BTSUser& user, const AdminData& data); // finds the "exchange user" (ex: "operator_id" at CME or "authorized_trader" @@ -264,8 +274,6 @@ public: static void set_user_exchange_data( BTSUser* user, const ExchangeUserData& exchange_user_data); - static void set_user_md_entitlement_data(BTSUser* user, - const ExchangeUserMarketDataEntitlementData&); static void clear_user_accounts (BTSUser* user); static void set_user_accounts (BTSUser* user, const UserAccountPermissions& user_account_permissions); diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 23ae7337a..f901a8138 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -76,7 +76,8 @@ message BTSUserDerivableData{ // b. else its overridden at the user level UserAccountPermissions account_permissions = 70; ExchangeUserData exchange_user_data = 80; - ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; + //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; + reserved 90; reserved "exchange_md_entitlement_data"; } message LicenseData{ @@ -201,19 +202,18 @@ message CMEMicData{ } message ICEMicData{ - api.CMEMics mic=10; + api.ICEMics mic=10; bool enabled=20; } -message ExchangeUserMarketDataEntitlementData{ - CMEUserMarketDataEntitlementData cme_data = 10; - ICEUserMarketDataEntitlementData ice_data = 20; -} message ExchangeUserData{ CMEUserData cme_data = 10; ICEUserData ice_data = 20; SIMUserData sim_data = 30; + + enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + AdminDisplay admin_display_flag = 120; } message ExchangeAccountData{ @@ -222,9 +222,6 @@ message ExchangeAccountData{ SIMAccountData sim_account_data = 30; } -message MarketDataEntitlement{ - bool can_view = 10; -} message ExchangeConnection{ uint32 id = 10; @@ -314,8 +311,9 @@ message CMEUserData{ ProfessionalDesignation pro_nonpro = 100; DisplayDesignation display_nondisplay = 110; - enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } - AdminDisplay admin_display_flag = 120; + //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + //AdminDisplay admin_display_flag = 120; + reserved 120; reserved "admin_display_flag"; repeated CMEMicData md_permissions = 1000; } @@ -324,15 +322,6 @@ message SIMUserData { string location = 90; } -message CMEUserMarketDataEntitlementData{ - MarketDataEntitlement cbot_entitlement = 10; - MarketDataEntitlement cme_entitlement = 20; - MarketDataEntitlement nymex_entitlement = 30; - MarketDataEntitlement bmandf_entitlement = 40; - MarketDataEntitlement comex_entitlement = 50; - MarketDataEntitlement cme_europe_entitlement = 60; -} - /********************************ICE Data*********************************/ message ICEConnection{ @@ -349,9 +338,14 @@ message ICEConnection{ } message ICEAccountData{ + api.orderman.CTICode cti = 3; + api.orderman.CustomerOrFirm origin = 5; + string nybit_house = 10; int32 wce_house = 20; - string clearing_account_override = 30; + //string clearing_account_override = 30; + reserved 30; reserved "clearing_account_override"; + string clearing_account = 35; bool direct_electronic_access = 40; string trading_capacity = 50; bool liquidity_provision = 60; @@ -360,16 +354,24 @@ message ICEAccountData{ string execution_decision_id = 90; string client_id = 100; string mfid_id = 110; + + map misc_tags = 120; } message ICEUserData{ - string authorized_trader = 10; + string order_server_id = 3; //tag 553 initial logon + string operator_id = 5; //tag 50 + string authorized_trader = 10; //tag 553 trader logon string memo_field = 20; string text_b = 30; uint32 max_order_rate = 40; -} - -message ICEUserMarketDataEntitlementData{ + + map misc_tags = 60; + string location = 90; + ProfessionalDesignation pro_nonpro = 100; + DisplayDesignation display_nondisplay = 110; + + repeated ICEMicData md_permissions = 1000; } /////////////////////////////////////////////////////////// diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index d20877f52..3af6dd16e 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -260,6 +260,9 @@ message RoutingRecord { string smp_id = 6 ; SelfMatchPreventionInstruction smp_instruction = 7; string location = 8; + + string order_server_id = 30; + string trader_id = 31; } message NativeOrderState { diff --git a/src/lib/config/defaults/Ports.conf b/src/lib/config/defaults/Ports.conf index 266c65c9e..a8059b4f7 100644 --- a/src/lib/config/defaults/Ports.conf +++ b/src/lib/config/defaults/Ports.conf @@ -3,7 +3,8 @@ Ports { value { config_port: 8000 qbus_port: 8001 - exchange_sim_fix_port: 8002 + glbx_sim_fix_port: 8002 + ice_sim_fix_port: 8003 replicator_port: 8080 } } \ No newline at end of file diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 786f3f8fe..0e37bbc68 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -5,7 +5,7 @@ JetFIXSimConnection { name: "sim" platform: SIM socket_connect_host_ip: "127.0.0.1" - socket_connect_port: @Ports.exchange_sim_fix_port + socket_connect_port: @Ports.glbx_sim_fix_port sender_compid: "SPARK" # this is the FIX session name sender_subid: "BTS" target_compid: "BTS" @@ -17,10 +17,47 @@ JetFIXSimConnection { use_cme_secure_logon: false seconds_to_pause : 1 } + sim_ice { + name: "sim_ice" + platform: SIMICE + socket_connect_host_ip: "127.0.0.1" + socket_connect_port: @Ports.ice_sim_fix_port + sender_compid: "SPARK" # this is the FIX session name + sender_subid: "BTS" + target_compid: "BTS" + target_subid: "BTS" + cme_market_segment_id: 0 + end_time: "07:48:00" + start_time: "07:52:00" + raw_data: "1JE9X" + use_cme_secure_logon: false + seconds_to_pause : 1 + } } } JetFIX { + rule: "CannedCertSession.name='ice_cert'" + value { + connection: @JetFIXSimConnection.sim + connection { + name: "ice_cert" + platform: ICE + use_cme_secure_logon: false + + socket_connect_host_ip: "63.247.113.154" + socket_connect_port: 443 #80 + sender_compid: "51239" + target_compid: "ICE" + + start_time: "00:30:00" + end_time: "23:30:00" + sender_subid: "BTS" + user_id: "bluetrd-os" + raw_data: "Starts123" + auto_fix_seq_num: true + } + } rule: "CannedCertSession.name='mc7'" value { connection: @JetFIXSimConnection.sim diff --git a/src/lib/config/protos/Ports.proto b/src/lib/config/protos/Ports.proto index 11ce66eae..2176315c1 100644 --- a/src/lib/config/protos/Ports.proto +++ b/src/lib/config/protos/Ports.proto @@ -5,6 +5,7 @@ message Ports { // see ports.conf for actual defaults optional int32 config_port = 1 ; optional int32 qbus_port = 2 ; - optional int32 exchange_sim_fix_port = 3 ; + optional int32 glbx_sim_fix_port = 3 ; + optional int32 ice_sim_fix_port = 5 ; optional int32 replicator_port = 4 ; } diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index 4744002e2..0fc44cda2 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -7,9 +7,11 @@ message JetFIX { required string name = 10; enum JetFIXPlatform { - GLBX = 1; - CBOE = 6; - SIM = 2; + GLBX = 1; + CBOE = 6; + SIM = 2; + ICE = 3; + SIMICE = 4; } optional JetFIXPlatform platform = 15 [default = GLBX]; @@ -47,6 +49,7 @@ message JetFIX { optional string target_subid = 130 [default = ""]; optional string sender_locationid = 135 [default = "US,NC"]; optional string raw_data = 136 [default =""]; + optional string user_id = 138 [default =""]; optional string self_match_prevention_id = 140 [default=""]; optional string cti_code = 145 [default="1"]; optional int32 customer_or_firm = 147 [default=1]; @@ -91,6 +94,7 @@ message JetFIX { message JetFIXSimConnection { required JetFIX.Connection sim = 10; + required JetFIX.Connection sim_ice = 20; } message CannedCertSession { diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 9e16fd9b4..ddfa20a34 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -12,6 +12,7 @@ enum Venue { VENUE_CBOECFE = 207; VENUE_GLBX = 301; VENUE_ICE = 306; + VENUE_SIMICE = 3; } enum SecurityType { @@ -54,11 +55,12 @@ enum CMEMics { } enum ICEMics{ - ICE_UNSET=0; - ICE_US = 1; - ICE_EU = 2; - ICE_LIFFE = 3; - ICE_CA = 4; + IF_UNSET = 0; + IFUS = 1; + IFEU = 2; + IFLL = 3; + IFCA = 4; + IFEN = 5; } enum Side { diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index 3bcfd393f..cbf0d3f9a 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -97,6 +97,7 @@ typedef StringField<7928> SelfMatchPreventionID; typedef StringField<8> BeginString; typedef StringField<9324> OrderOptionalData; typedef StringField<96> RawData; +typedef StringField<553> UserID; typedef StringField<9717> CorrelationClOrdID; typedef StringField<9771> MMAccount; typedef TimeField<122> OrigSendingTime; diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 4cc176620..1a0fc4998 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -819,6 +819,8 @@ OutFIXPtr make_logon(uint32_t seq_num, uint32_t last_seq_num_processed, } else { buffer.add(session_cfg.raw_data().size()); buffer.add(session_cfg.raw_data()); + if(session_cfg.user_id() != "") + buffer.add(session_cfg.user_id()); } stream.close(); diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index b3c1ca888..659c3ad31 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -50,6 +50,8 @@ ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, } ExecutionGateway::~ExecutionGateway() {} +void ExecutionGateway::on_admin_data(const mercury::Update &) {} + void ExecutionGateway::on_securities( const mercury::Update &update) { if (update.events) { diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index b94d56afa..4c5b04495 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -12,6 +12,7 @@ namespace bts { namespace trace {struct CorID;class PerfLog;} namespace orderman { class NewSecuritiesEvent; +class NewAdminDataEvent; class ExecutionReport; using OnExeReport = @@ -28,6 +29,7 @@ class ExecutionGateway { void start(); void dispatch_incoming_fix_messages(); void on_securities(const mercury::Update &); + void on_admin_data(const mercury::Update &); void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); OnExeReport& on_exe_report(); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 37f03c800..12c51fbc7 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -53,14 +53,17 @@ void OrderManager::init() { } void OrderManager::on_admin_data(const mercury::Update &m) { - if (m.events) { - - if (me->state == State::WAIT_ADMIN) { - LOG(OrderMan, Info, - "Order manager received admin data. Subscribing " - "to security list now "); + if (m.events) + { + if (me->state == State::WAIT_ADMIN) + { + LOG(OrderMan, Info, "Order manager received admin data. Subscribing to security list now "); + for (auto &osd : me->services_data.sessions) + osd->gw.on_admin_data(m); + me->state = State::WAIT_SEC; - subscribe([this](auto const &sec_update) { + subscribe([this](auto const &sec_update) + { this->on_securities(sec_update); }); } diff --git a/src/server/sparkd/cmds/RunSim.cpp b/src/server/sparkd/cmds/RunSim.cpp index 92fe0d226..5baab0dbe 100644 --- a/src/server/sparkd/cmds/RunSim.cpp +++ b/src/server/sparkd/cmds/RunSim.cpp @@ -6,7 +6,7 @@ namespace cmd { int RunSim::execute(std::vector const &) { - sim::start_exchange_sim(); + sim::start_exchange_sim(api::Venue::VENUE_SIM); return 0; } diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index d457d53d5..f8a23a16d 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -10,6 +10,7 @@ #include #include "lib/os/os.h" +#include "lib/domain_model/Security.pb.h" #include "lib/config/protos/Ports.pb.h" #include "lib/config/protos/ExchangeSimCfg.pb.h" #include "lib/config/config.h" @@ -121,15 +122,26 @@ struct MDPlayer : md::IRelayWriter }; -int start_exchange_sim() +int start_exchange_sim(bts::api::Venue venue) { try { auto str_settings = std::string(cfg); - boost::replace_all(str_settings,"$BTS_DATA_PATH", os::bts_data_path()); - boost::replace_all(str_settings,"$EXCHANGE_SIM_FIX_PORT", - std::to_string( - config::get().exchange_sim_fix_port())); + auto venue_string = api::Venue_Name(venue); + boost::replace_all(str_settings,"$BTS_DATA_PATH", os::bts_data_path() + "_" + venue_string); + std::string port_string; + switch(venue) + { + case api::VENUE_SIM: + port_string = std::to_string(config::get().glbx_sim_fix_port()); + break; + case api::VENUE_SIMICE: + port_string = std::to_string(config::get().ice_sim_fix_port()); + break; + default: + bts_assert_msg(false, "Not a valid sim venue"); + } + boost::replace_all(str_settings,"$EXCHANGE_SIM_FIX_PORT", port_string); std::istringstream str{str_settings}; FIX::SessionSettings settings( str ); diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.h b/src/server/sparkd/exchange_sim/ExchangeSim.h index 0ded39e25..d6df31373 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.h +++ b/src/server/sparkd/exchange_sim/ExchangeSim.h @@ -1,10 +1,11 @@ #pragma once #include +#include "lib/domain_model/Security.pb.h" namespace bts { namespace sim { -int start_exchange_sim(); +int start_exchange_sim(bts::api::Venue); }} diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 89994f057..c3a4d96ce 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -152,8 +152,8 @@ void run_market_datapublishers() { }); if (config::get().use_sim()) { - threading::make_thread("ExchangeSim", []() { sim::start_exchange_sim(); }) - .detach(); + threading::make_thread("ExchangeSimGLBX", []() { sim::start_exchange_sim(api::Venue::VENUE_SIM); }).detach(); + threading::make_thread("ExchangeSimICE", []() { sim::start_exchange_sim(api::Venue::VENUE_SIMICE); }).detach(); } boot_sleep(); } diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 09b33068d..ab31cfdb7 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -190,10 +190,10 @@ void AdminServiceServer::get_filtered_admin_data( newuser->CopyFrom(*acctuser); if(!unit.admin_permission().has_md_permissions()) newuser->mutable_user_data()->mutable_exchange_user_data()-> - mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_Routing); + set_admin_display_flag(bts::api::admin::ExchangeUserData_AdminDisplay::ExchangeUserData_AdminDisplay_Routing); else newuser->mutable_user_data()->mutable_exchange_user_data()-> - mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_All); + set_admin_display_flag(bts::api::admin::ExchangeUserData_AdminDisplay::ExchangeUserData_AdminDisplay_All); } } } @@ -208,7 +208,7 @@ void AdminServiceServer::get_filtered_admin_data( const auto newuser = filtered.add_users(); newuser->CopyFrom(*acctuser); newuser->mutable_user_data()->mutable_exchange_user_data()-> - mutable_cme_data()->set_admin_display_flag(bts::api::admin::CMEUserData_AdminDisplay::CMEUserData_AdminDisplay_MD); + set_admin_display_flag(bts::api::admin::ExchangeUserData_AdminDisplay::ExchangeUserData_AdminDisplay_MD); } } } diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 3de9afcff..5ea0a7b1c 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -86,9 +86,12 @@ module Accounts = miscTags = JSMap.empty } iceAccountData = - { nybitHouse="" + { + cti = CTICode.CtiCodeUndefined + origin = CustomerOrFirm.CustomerOrFirmCustomer + nybitHouse="" wceHouse=0 - clearingAccountOverride="" + clearingAccount="" directElectronicAccess=false tradingCapacity="" liquidityProvision=false @@ -96,7 +99,9 @@ module Accounts = investmentDecisionId="" executionDecisionId="" clientId="" - mfidId="" } + mfidId="" + miscTags = JSMap.empty + } simAccountData = { cti = CTICode.CtiCodeUndefined origin = CustomerOrFirm.CustomerOrFirmCustomer diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index d59dd43a1..4a3249d40 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -53,8 +53,8 @@ let defaultScratchUser = { accountPermissions = { accountPermissions = JSMap.empty } exchangeUserData = { - cmeData = { - adminDisplayFlag = bts.api.admin.CMEUserData.AdminDisplay.None + adminDisplayFlag = bts.api.admin.ExchangeUserData.AdminDisplay.None + cmeData = { operatorId = "" atsOperatorId = "" smpId = "" @@ -73,25 +73,19 @@ let defaultScratchUser = { location = "" } iceData = { + orderServerId = "" + operatorId = "" authorizedTrader = "" memoField = "" textB = "" maxOrderRate = 0ul + miscTags = JSMap.empty + location = "" + proNonpro = ProfessionalDesignation.PRO + displayNondisplay = DisplayDesignation.DISPLAY + mdPermissions = [||] } } - exchangeMdEntitlementData = - { - cmeData = - { - cbotEntitlement = { canView = false } - cmeEntitlement = { canView = false } - nymexEntitlement = { canView = false } - bmandfEntitlement = { canView = false } - comexEntitlement = { canView = false } - cmeEuropeEntitlement = { canView = false } - } - iceData = () - } } } @@ -182,9 +176,10 @@ let createUser (admin:IAdminService) (user:BTSUser) (model:Model)= promise { return ErrorOccured (sprintf "Error creating user: %s" result.errorText) } -let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}} +//let updateExchangeMdEntitlementDataCMEData user dta :BTSUser = { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = dta}}} let updateCMEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = dta }}} let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with simData = dta }}} +let updateICEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with iceData = dta }}} let default_user_account = { tradingPermission = diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index ba2c57828..c9fe80b93 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -435,10 +435,10 @@ let root (model:Model) (dispatch:Msg->Unit) = | _, _ -> () ) *) - let adminDisplay = model.scratchUser.userData.exchangeUserData.cmeData.adminDisplayFlag + let adminDisplay = model.scratchUser.userData.exchangeUserData.adminDisplayFlag let is_bts = model.this_username = Access.superuser - let display_md = if is_bts then true else (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.MD) - let display_risk = if is_bts then true else (adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.All || adminDisplay = bts.api.admin.CMEUserData.AdminDisplay.Routing) + let display_md = if is_bts then true else (adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.All || adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.MD) + let display_risk = if is_bts then true else (adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.All || adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.Routing) let modal = match (fst model.ConfirmModal) with | "" -> span [] [] From e27a8be5263251796b09a09db50a18488be8a824 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 27 Mar 2019 17:01:07 -0400 Subject: [PATCH 002/225] ICEExecutionGateway --- src/lib/orderman/actors/ExecutionGateway.h | 39 +-- .../orderman/actors/ICEExecutionGateway.cpp | 309 ++++++++++++++++++ src/lib/orderman/actors/ICEExecutionGateway.h | 39 +++ src/lib/orderman/actors/IExecutionGateway.cpp | 20 ++ src/lib/orderman/actors/IExecutionGateway.h | 49 +++ .../actors/order_manager/OrderServicesData.h | 7 +- 6 files changed, 435 insertions(+), 28 deletions(-) create mode 100644 src/lib/orderman/actors/ICEExecutionGateway.cpp create mode 100644 src/lib/orderman/actors/ICEExecutionGateway.h create mode 100644 src/lib/orderman/actors/IExecutionGateway.cpp create mode 100644 src/lib/orderman/actors/IExecutionGateway.h diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/ExecutionGateway.h index 4c5b04495..ff5f3cc92 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/ExecutionGateway.h @@ -1,42 +1,29 @@ #pragma once -#include "lib/config/protos/jetfix.pb.h" -#include "lib/jetfix/codec/MessageDefinitions.h" -#include "lib/jetfix/common/OutFIXPtr.h" -#include "lib/mercury/events/Update.h" -#include "lib/orderman/orderman_utils/orderman_common.h" - -#include +#include "IExecutionGateway.h" namespace bts { -namespace trace {struct CorID;class PerfLog;} namespace orderman { -class NewSecuritiesEvent; -class NewAdminDataEvent; -class ExecutionReport; -using OnExeReport = - std::function; -using OnGwStatusChange = std::function; -using OnCancelReject = std::function; // fix execution gateway for a single FIX session -class ExecutionGateway { - public: +class ExecutionGateway : public IExecutionGateway { + public: ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); - ~ExecutionGateway(); + virtual ~ExecutionGateway(); - void start(); - void dispatch_incoming_fix_messages(); - void on_securities(const mercury::Update &); - void on_admin_data(const mercury::Update &); - void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace); + void start() override; + void dispatch_incoming_fix_messages() override; + void on_securities(const mercury::Update &) override; + void on_admin_data(const mercury::Update &) override; + void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) override; - OnExeReport& on_exe_report(); - OnGwStatusChange& on_gw_status_change(); - OnCancelReject &on_cancel_reject(); + OnExeReport& on_exe_report() override; + OnGwStatusChange& on_gw_status_change() override; + OnCancelReject &on_cancel_reject() override; private: + BTS_NO_COPY(ExecutionGateway); enum class State { WAITING_FOR_SECURITIES, READY }; struct PImpl; std::unique_ptr me; diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp new file mode 100644 index 000000000..e4e2f724d --- /dev/null +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -0,0 +1,309 @@ +#include "ICEExecutionGateway.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/common/OutFIX.h" +#include "lib/jetfix/gateway/JetFIXGateway.h" +#include "lib/logging/logging.h" +#include "lib/orderman/events/CancelRejectEvent.h" +#include "lib/orderman/events/GatewayStatusChangeEvent.h" +#include "lib/orderman/events/NewExecutionReportEvent.h" +#include "lib/orderman/events/NewSecuritiesEvent.h" +#include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "lib/tracing/bts_trace.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/bts_chrono.h" + +#include + +namespace bts { +namespace orderman { + +using namespace jetfix; + +using JFGw = + JetFIXGateway; + +struct ICEExecutionGateway::PImpl { + PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) + : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), + securities(), securities_by_descriptor(), gw_name(cfg.name()), + cfg(cfg), perf_log(l) {} + + JFGw gw; + boost::object_pool exe_report_pool; + State state; + std::unordered_map securities; + std::unordered_map + securities_by_descriptor; + GatewayName gw_name; + config::JetFIX::Connection cfg; + OnExeReport on_exe_report; + OnGwStatusChange on_gw_status_change; + OnCancelReject on_cancel_reject; + trace::PerfLog &perf_log; +}; + +ICEExecutionGateway::ICEExecutionGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) + : IExecutionGateway(), me(new PImpl(cfg, log)) +{ + me->state = State::WAITING_FOR_SECURITIES; +} +ICEExecutionGateway::~ICEExecutionGateway() {} + +void ICEExecutionGateway::on_admin_data(const mercury::Update &) {} + +void ICEExecutionGateway::on_securities( + const mercury::Update &update) { + if (update.events) { + + for (auto const &ev : *(update.events)) { + auto sec_ptr = ev.security; + me->securities[sec_ptr->id()] = sec_ptr; + me->securities_by_descriptor[securities::descriptor(*sec_ptr)] = + sec_ptr; + } + + if (me->state == State::WAITING_FOR_SECURITIES) { + LOG(OrderMan, Warn, + "Received first set of {} securities. Proceeding " + "with initialization of execution gateway {}", + update.events->size(), me->gw_name.value()); + + // got our security synopsis, ready to start the GW + me->state = State::READY; + + // subscribe to gateway events + me->gw.on() = [this](auto const &msg) { + this->on_exe_report(msg); + }; + me->gw.on() = [this](auto const &msg) { + this->on_cancel_reject(msg); + }; + me->gw.on_ready() = [this]() { + this->on_connection_status_change(true); + }; + me->gw.on_disconnect() = [this]() { + this->on_connection_status_change(false); + }; + me->gw.on() = [this](auto const &m) { + this->on_business_reject(m); + }; + me->gw.on() = [this](auto const &m) { + this->on_session_reject(m); + }; + } + } +} + +void ICEExecutionGateway::start() { me->gw.start(); } + +OnExeReport &ICEExecutionGateway::on_exe_report() { return me->on_exe_report; } + +OnGwStatusChange &ICEExecutionGateway::on_gw_status_change() { + return me->on_gw_status_change; +} + +OnCancelReject &ICEExecutionGateway::on_cancel_reject() { + return me->on_cancel_reject; +} + +void ICEExecutionGateway::on_exe_report( + const jetfix::fix::ExecutionReportMsg &msg) { + OrderKey ok; + SecurityKey sk; + decode_clorid(msg.get(), &ok, &sk); + + auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); + + LOG(Latency, Info, "Started handling of execution report for order {}", + ok.value()); + auto sec = me->securities[sk.value()]; + + if (!sec) + LOG(OrderMan, Error, + "Received execution report for an unknown security {}. Will not be " + " able to process this report. This is likely a bug that could lead " + "to" + " lost fills. Please investigate.", + sk.value()); + else { + // Ignore trade correction messages. CME does not included the full + // id of the trade being corrected and we have no way of + // resolving it here. We could still parse the correction and + // push the resolution problem downstream but that would make + // downstream code CME specific and generate a fair amout of + // complexity for a rare and moderately benign event (the only + // thing that can be corrected is the fill price). We might come + // back to this when the system is more mature. + if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + auto new_price = securities::decode_exchange_price( + *sec, Price(msg.get())); + auto ref_exec_id = msg.get(); + LOG(OrderMan, Error, + "Received unsupported trade correction msg. " + "This correction will not be forwarded. The trader should be " + "alerted. " + "Order: {} SecKey: {} Partial original fill id: {}. New price: {}", + ok.value(), sk.value(), ref_exec_id, new_price.value()); + return; + } + + // Ignore unsupported trade cancelation messages. + if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CANCEL) { + LOG(OrderMan, Error, + "Received unsupported trade cancel msg. " + "This correction will not be forwarded. The trader should be " + "alerted. " + "Order: {} SecKey: {} ", + ok.value(), sk.value()); + return; + } + + api::Security const *leg_security = nullptr; + if (msg.has() && + msg.get() == 2) { + auto it = + me->securities_by_descriptor.find(msg.get()); + if (it == me->securities_by_descriptor.end()) { + LOG(OrderMan, Error, + "Received execution report for an unknown spread leg" + "security {}. Will not be " + " able to process this report. This is likely a " + "bug that could lead to" + " lost leg fills. Please investigate. Spread sec_key: {} leg " + "exchange " + "desc: {}", + sk.value(), msg.get()); + return; + } + leg_security = it->second; + } + + std::string text_msg; + if (msg.has()) + text_msg = msg.get(); + + // allocate from our pool + auto data = me->exe_report_pool.construct(); + + data->exec_type = api::orderman::ExecType(msg.get()); + data->msg_seq_num = msg.get(); + + // copy data from fix msg to our structure + if (msg.has()) + str_to(msg.get(), &data->account_name); + if (msg.has()) + str_to(msg.get(), &data->operator_id); + + data->order_key = ok; + data->security = sec; + data->leg_security = leg_security; + data->side = api::Side(msg.get()); + if (msg.has()) + data->time_in_force = + api::orderman::TimeInForce(msg.get()); + else + data->time_in_force = api::orderman::TIME_IN_FORCE_UNDEFINED; + + data->order_type = + api::orderman::NativeOrderType(msg.get()); + data->order_status = + api::orderman::NativeOrderStatus(msg.get()); + data->manual_order_indicator = + msg.get() + ? api::orderman::MANUAL_ORDER_INDICATOR_YES + : api::orderman::MANUAL_ORDER_INDICATOR_YES; + str_to(msg.get(), &data->exchange_order_id); + + if (msg.has()) + data->price = securities::decode_exchange_price( + *sec, Price(msg.get())); + else + data->price = Price(os::nan()); + + if (msg.has()) + data->stop_price = securities::decode_exchange_price( + *sec, Price(msg.get())); + else + data->stop_price = Price(os::nan()); + + if (msg.has()) + data->quantity = Quantity(msg.get()); + else + data->quantity = Quantity(0); + + data->filled_quantity = Quantity(msg.get()); + data->last_shares = msg.has() + ? Quantity(msg.get()) + : Quantity(0); + auto last_px_sec = data->leg_security ? data->leg_security : sec; + data->last_price = msg.has() + ? securities::decode_exchange_price( + *last_px_sec, Price(msg.get())) + : Price(0); + data->avg_price = msg.has() + ? securities::decode_exchange_price( + *last_px_sec, Price(msg.get())) + : Price(0); + if (msg.has()) + str_to(msg.get(), &data->exchange_fill_id); + str_to(msg.get(), &data->transact_time); + data->cfg = &me->cfg; + data->msg = text_msg; + me->on_exe_report(*data, msg.trace()); + } +} + +void ICEExecutionGateway::on_cancel_reject( + const jetfix::fix::CancelRejectMsg &msg) { + OrderKey ok; + SecurityKey sk; + decode_clorid(msg.get(), &ok, &sk); + + std::string reject_msg; + if (msg.has()) + reject_msg = msg.get(); + else if (msg.has()) + reject_msg = fmt::format("Order cancel was rejected with error code {}", + msg.get()); + me->on_cancel_reject(ok, reject_msg); +} + +void ICEExecutionGateway::on_connection_status_change(bool is_connected) { + LOG(OrderMan, Info, "Connection state of {} changed to {}", + me->gw_name.value(), + is_connected ? std::string("connected") : std::string("disconnected")); + + me->on_gw_status_change(is_connected); +} + +void ICEExecutionGateway::on_business_reject( + jetfix::fix::BusinessMessageRejectMsg const &m) { + LOG(OrderMan, Error, + "Unexpected business reject in {} gateway . Reason: " + "{}. This should be investigated", + me->gw_name.value(), + m.has() ? m.get() : std::string("Unknown")); +} + +void ICEExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { + LOG(OrderMan, Error, + "Unexpected reject message in {} gateway . Reason: {}. " + "This should be investigated", + me->gw_name.value(), + m.has() ? m.get() : std::string("Unknown")); +} + +void ICEExecutionGateway::dispatch_incoming_fix_messages() { + me->gw.dispatch_events(); +} + +void ICEExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, + trace::CorID trace) { + auto scoped_log = trace::log_scope(me->perf_log,trace,"ExecutionGateway::send_fix"); + me->gw.send(fix,trace); + me->gw.dispatch_events(); +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h new file mode 100644 index 000000000..7eb1ab6e8 --- /dev/null +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -0,0 +1,39 @@ +#pragma once + +#include "IExecutionGateway.h" + +namespace bts { +namespace orderman { + +// fix execution gateway for a single FIX session +class ICEExecutionGateway : public IExecutionGateway { + public: + ICEExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); + virtual ~ICEExecutionGateway(); + + void start() override; + void dispatch_incoming_fix_messages() override; + void on_securities(const mercury::Update &) override; + void on_admin_data(const mercury::Update &) override; + void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) override; + + OnExeReport& on_exe_report() override; + OnGwStatusChange& on_gw_status_change() override; + OnCancelReject &on_cancel_reject() override; + + private: + BTS_NO_COPY(ICEExecutionGateway); + enum class State { WAITING_FOR_SECURITIES, READY }; + struct PImpl; + std::unique_ptr me; + + // fix gateway events + void on_exe_report(jetfix::fix::ExecutionReportMsg const &); + void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); + void on_connection_status_change(bool connected); + void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); + void on_session_reject(jetfix::fix::RejectMsg const &); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/IExecutionGateway.cpp b/src/lib/orderman/actors/IExecutionGateway.cpp new file mode 100644 index 000000000..f70fd9260 --- /dev/null +++ b/src/lib/orderman/actors/IExecutionGateway.cpp @@ -0,0 +1,20 @@ + +#include "IExecutionGateway.h" +#include "ICEExecutionGateway.h" +#include "ExecutionGateway.h" + +namespace bts { +namespace orderman { + +std::unique_ptr +ExecutionGatewayFactory::create_gateway(const config::JetFIX::Connection& conn, trace::PerfLog& pl) +{ + if(conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || + conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) + return std::make_unique(conn, pl); + else + return std::make_unique(conn, pl); +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/actors/IExecutionGateway.h new file mode 100644 index 000000000..76d9e8fff --- /dev/null +++ b/src/lib/orderman/actors/IExecutionGateway.h @@ -0,0 +1,49 @@ +#pragma once + +#include "lib/config/protos/jetfix.pb.h" +#include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/mercury/events/Update.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/utils/bts_no_copy.h" + +#include + +namespace bts { +namespace trace {struct CorID;class PerfLog;} +namespace orderman { +class NewSecuritiesEvent; +class NewAdminDataEvent; +class ExecutionReport; + +using OnExeReport = + std::function; +using OnGwStatusChange = std::function; +using OnCancelReject = std::function; + +// fix execution gateway for a single FIX session +class IExecutionGateway { + public: + IExecutionGateway() = default; + virtual ~IExecutionGateway() {} + + virtual void start() = 0; + virtual void dispatch_incoming_fix_messages() = 0; + virtual void on_securities(const mercury::Update &) = 0; + virtual void on_admin_data(const mercury::Update &) = 0; + virtual void send_fix(const jetfix::OutFIXPtr&, trace::CorID) = 0; + + virtual OnExeReport& on_exe_report() = 0; + virtual OnGwStatusChange& on_gw_status_change() = 0; + virtual OnCancelReject &on_cancel_reject() = 0; +}; + +class ExecutionGatewayFactory +{ +public: + static std::unique_ptr create_gateway(const config::JetFIX::Connection&, trace::PerfLog&); + +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 21afdbc4d..be4474c81 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -48,7 +48,10 @@ struct SessionServicesData { SessionServicesData(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : session(cfg.name()), gw_connected(false), cfg(cfg), governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), - gw(cfg, log) {} + gw(ExecutionGatewayFactory::create_gateway(cfg, log)) + { + + } std::string session; std::vector free_buffers; @@ -65,7 +68,7 @@ struct SessionServicesData { Governor governor; jetfix::OutFIXPtr current_buffer; trace::CorID current_trace; - ExecutionGateway gw; + std::unique_ptr gw; mercury::Stream exe_report_pub; mercury::Stream gw_status_change_pub; mercury::Stream cancel_reject_pub; From e0f7bdfc13b8adf6a3e84e641b7f3c92d75c7fda Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 27 Mar 2019 17:42:23 -0400 Subject: [PATCH 003/225] fix conf --- src/lib/config/defaults/jetfix.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 0e37bbc68..aeb3e06f5 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -57,7 +57,10 @@ JetFIX { raw_data: "Starts123" auto_fix_seq_num: true } - } + } +} + +JetFIX { rule: "CannedCertSession.name='mc7'" value { connection: @JetFIXSimConnection.sim From 8e41a42ced519ce19836e58fe6b442167355ef88 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 28 Mar 2019 16:18:10 -0400 Subject: [PATCH 004/225] more ice --- .../orderman/actors/ICEExecutionGateway.cpp | 139 +- src/lib/orderman/actors/ICEExecutionGateway.h | 2 +- src/lib/orderman/actors/IExecutionGateway.h | 5 +- .../orderman/order_factory/OrderFactory.cpp | 23 +- src/lib/orderman/order_factory/OrderFactory.h | 3 + .../orderman/orderman_utils/ExecutionReport.h | 1 + .../{NativeOrder.cpp => GLBXNativeOrder.cpp} | 86 +- src/lib/orderman/orders/GLBXNativeOrder.h | 73 + src/lib/orderman/orders/ICENativeOrder.cpp | 1245 +++++++++++++++++ src/lib/orderman/orders/ICENativeOrder.h | 72 + src/lib/orderman/orders/NativeOrder.h | 61 +- 11 files changed, 1546 insertions(+), 164 deletions(-) rename src/lib/orderman/orders/{NativeOrder.cpp => GLBXNativeOrder.cpp} (94%) create mode 100644 src/lib/orderman/orders/GLBXNativeOrder.h create mode 100644 src/lib/orderman/orders/ICENativeOrder.cpp create mode 100644 src/lib/orderman/orders/ICENativeOrder.h diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index e4e2f724d..9e9f962fd 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -8,6 +8,8 @@ #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "lib/api/services/AdminService.pb.h" +#include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_chrono.h" @@ -19,15 +21,15 @@ namespace orderman { using namespace jetfix; -using JFGw = - JetFIXGateway; +using JFGw = JetFIXGateway; -struct ICEExecutionGateway::PImpl { +struct ICEExecutionGateway::PImpl +{ PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_descriptor(), gw_name(cfg.name()), - cfg(cfg), perf_log(l) {} + cfg(cfg), perf_log(l), admin_data() + {} JFGw gw; boost::object_pool exe_report_pool; @@ -41,54 +43,73 @@ struct ICEExecutionGateway::PImpl { OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; trace::PerfLog &perf_log; + api::admin::AdminData admin_data; }; ICEExecutionGateway::ICEExecutionGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : IExecutionGateway(), me(new PImpl(cfg, log)) { - me->state = State::WAITING_FOR_SECURITIES; + me->state = State::WAITING_FOR_ADMIN; } ICEExecutionGateway::~ICEExecutionGateway() {} -void ICEExecutionGateway::on_admin_data(const mercury::Update &) {} +void ICEExecutionGateway::on_admin_data(const mercury::Update& update) +{ + if (update.events) + { + for (auto const &ev : *(update.events)) + me->admin_data.CopyFrom(*ev.admin_data); -void ICEExecutionGateway::on_securities( - const mercury::Update &update) { - if (update.events) { + if (me->state == State::WAITING_FOR_ADMIN) + { + LOG(OrderMan, Warn, "Received admin data. Waiting for securities"); + me->state = State::WAITING_FOR_SECURITIES; + } + } +} - for (auto const &ev : *(update.events)) { +void ICEExecutionGateway::on_securities(const mercury::Update &update) +{ + if (update.events) + { + for (auto const &ev : *(update.events)) + { auto sec_ptr = ev.security; me->securities[sec_ptr->id()] = sec_ptr; - me->securities_by_descriptor[securities::descriptor(*sec_ptr)] = - sec_ptr; + me->securities_by_descriptor[securities::descriptor(*sec_ptr)] = sec_ptr; } - if (me->state == State::WAITING_FOR_SECURITIES) { - LOG(OrderMan, Warn, - "Received first set of {} securities. Proceeding " - "with initialization of execution gateway {}", + if (me->state == State::WAITING_FOR_SECURITIES) + { + LOG(OrderMan, Warn, "Received first set of {} securities. Proceeding with initialization of execution gateway {}", update.events->size(), me->gw_name.value()); // got our security synopsis, ready to start the GW me->state = State::READY; // subscribe to gateway events - me->gw.on() = [this](auto const &msg) { + me->gw.on() = [this](auto const &msg) + { this->on_exe_report(msg); }; - me->gw.on() = [this](auto const &msg) { + me->gw.on() = [this](auto const &msg) + { this->on_cancel_reject(msg); }; - me->gw.on_ready() = [this]() { + me->gw.on_ready() = [this]() + { this->on_connection_status_change(true); }; - me->gw.on_disconnect() = [this]() { + me->gw.on_disconnect() = [this]() + { this->on_connection_status_change(false); }; - me->gw.on() = [this](auto const &m) { + me->gw.on() = [this](auto const &m) + { this->on_business_reject(m); }; - me->gw.on() = [this](auto const &m) { + me->gw.on() = [this](auto const &m) + { this->on_session_reject(m); }; } @@ -99,16 +120,18 @@ void ICEExecutionGateway::start() { me->gw.start(); } OnExeReport &ICEExecutionGateway::on_exe_report() { return me->on_exe_report; } -OnGwStatusChange &ICEExecutionGateway::on_gw_status_change() { +OnGwStatusChange &ICEExecutionGateway::on_gw_status_change() +{ return me->on_gw_status_change; } -OnCancelReject &ICEExecutionGateway::on_cancel_reject() { +OnCancelReject &ICEExecutionGateway::on_cancel_reject() +{ return me->on_cancel_reject; } -void ICEExecutionGateway::on_exe_report( - const jetfix::fix::ExecutionReportMsg &msg) { +void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) +{ OrderKey ok; SecurityKey sk; decode_clorid(msg.get(), &ok, &sk); @@ -126,7 +149,8 @@ void ICEExecutionGateway::on_exe_report( "to" " lost fills. Please investigate.", sk.value()); - else { + else + { // Ignore trade correction messages. CME does not included the full // id of the trade being corrected and we have no way of // resolving it here. We could still parse the correction and @@ -135,7 +159,8 @@ void ICEExecutionGateway::on_exe_report( // complexity for a rare and moderately benign event (the only // thing that can be corrected is the fill price). We might come // back to this when the system is more mature. - if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) + { auto new_price = securities::decode_exchange_price( *sec, Price(msg.get())); auto ref_exec_id = msg.get(); @@ -149,7 +174,8 @@ void ICEExecutionGateway::on_exe_report( } // Ignore unsupported trade cancelation messages. - if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CANCEL) { + if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CANCEL) + { LOG(OrderMan, Error, "Received unsupported trade cancel msg. " "This correction will not be forwarded. The trader should be " @@ -160,11 +186,11 @@ void ICEExecutionGateway::on_exe_report( } api::Security const *leg_security = nullptr; - if (msg.has() && - msg.get() == 2) { - auto it = - me->securities_by_descriptor.find(msg.get()); - if (it == me->securities_by_descriptor.end()) { + if (msg.has() && msg.get() == 2) + { + auto it = me->securities_by_descriptor.find(msg.get()); + if (it == me->securities_by_descriptor.end()) + { LOG(OrderMan, Error, "Received execution report for an unknown spread leg" "security {}. Will not be " @@ -200,15 +226,12 @@ void ICEExecutionGateway::on_exe_report( data->leg_security = leg_security; data->side = api::Side(msg.get()); if (msg.has()) - data->time_in_force = - api::orderman::TimeInForce(msg.get()); + data->time_in_force = api::orderman::TimeInForce(msg.get()); else data->time_in_force = api::orderman::TIME_IN_FORCE_UNDEFINED; - data->order_type = - api::orderman::NativeOrderType(msg.get()); - data->order_status = - api::orderman::NativeOrderStatus(msg.get()); + data->order_type = api::orderman::NativeOrderType(msg.get()); + data->order_status = api::orderman::NativeOrderStatus(msg.get()); data->manual_order_indicator = msg.get() ? api::orderman::MANUAL_ORDER_INDICATOR_YES @@ -216,14 +239,12 @@ void ICEExecutionGateway::on_exe_report( str_to(msg.get(), &data->exchange_order_id); if (msg.has()) - data->price = securities::decode_exchange_price( - *sec, Price(msg.get())); + data->price = securities::decode_exchange_price(*sec, Price(msg.get())); else data->price = Price(os::nan()); if (msg.has()) - data->stop_price = securities::decode_exchange_price( - *sec, Price(msg.get())); + data->stop_price = securities::decode_exchange_price(*sec, Price(msg.get())); else data->stop_price = Price(os::nan()); @@ -238,24 +259,23 @@ void ICEExecutionGateway::on_exe_report( : Quantity(0); auto last_px_sec = data->leg_security ? data->leg_security : sec; data->last_price = msg.has() - ? securities::decode_exchange_price( - *last_px_sec, Price(msg.get())) + ? securities::decode_exchange_price(*last_px_sec, Price(msg.get())) : Price(0); data->avg_price = msg.has() - ? securities::decode_exchange_price( - *last_px_sec, Price(msg.get())) + ? securities::decode_exchange_price(*last_px_sec, Price(msg.get())) : Price(0); if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; + data->exchange = api::Venue::VENUE_ICE; me->on_exe_report(*data, msg.trace()); } } -void ICEExecutionGateway::on_cancel_reject( - const jetfix::fix::CancelRejectMsg &msg) { +void ICEExecutionGateway::on_cancel_reject(const jetfix::fix::CancelRejectMsg &msg) +{ OrderKey ok; SecurityKey sk; decode_clorid(msg.get(), &ok, &sk); @@ -269,7 +289,8 @@ void ICEExecutionGateway::on_cancel_reject( me->on_cancel_reject(ok, reject_msg); } -void ICEExecutionGateway::on_connection_status_change(bool is_connected) { +void ICEExecutionGateway::on_connection_status_change(bool is_connected) +{ LOG(OrderMan, Info, "Connection state of {} changed to {}", me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); @@ -277,8 +298,8 @@ void ICEExecutionGateway::on_connection_status_change(bool is_connected) { me->on_gw_status_change(is_connected); } -void ICEExecutionGateway::on_business_reject( - jetfix::fix::BusinessMessageRejectMsg const &m) { +void ICEExecutionGateway::on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &m) +{ LOG(OrderMan, Error, "Unexpected business reject in {} gateway . Reason: " "{}. This should be investigated", @@ -286,7 +307,8 @@ void ICEExecutionGateway::on_business_reject( m.has() ? m.get() : std::string("Unknown")); } -void ICEExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { +void ICEExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) +{ LOG(OrderMan, Error, "Unexpected reject message in {} gateway . Reason: {}. " "This should be investigated", @@ -294,12 +316,13 @@ void ICEExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ICEExecutionGateway::dispatch_incoming_fix_messages() { +void ICEExecutionGateway::dispatch_incoming_fix_messages() +{ me->gw.dispatch_events(); } -void ICEExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, - trace::CorID trace) { +void ICEExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) +{ auto scoped_log = trace::log_scope(me->perf_log,trace,"ExecutionGateway::send_fix"); me->gw.send(fix,trace); me->gw.dispatch_events(); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index 7eb1ab6e8..718518476 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -23,7 +23,7 @@ class ICEExecutionGateway : public IExecutionGateway { private: BTS_NO_COPY(ICEExecutionGateway); - enum class State { WAITING_FOR_SECURITIES, READY }; + enum class State { WAITING_FOR_ADMIN, WAITING_FOR_SECURITIES, CONNECTED_PENDING_TRADER_LOGON, READY }; struct PImpl; std::unique_ptr me; diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/actors/IExecutionGateway.h index 76d9e8fff..9ca0b8c7e 100644 --- a/src/lib/orderman/actors/IExecutionGateway.h +++ b/src/lib/orderman/actors/IExecutionGateway.h @@ -16,8 +16,7 @@ class NewSecuritiesEvent; class NewAdminDataEvent; class ExecutionReport; -using OnExeReport = - std::function; +using OnExeReport = std::function; using OnGwStatusChange = std::function; using OnCancelReject = std::function; @@ -36,6 +35,8 @@ class IExecutionGateway { virtual OnExeReport& on_exe_report() = 0; virtual OnGwStatusChange& on_gw_status_change() = 0; virtual OnCancelReject &on_cancel_reject() = 0; +private: + BTS_NO_COPY(IExecutionGateway); }; class ExecutionGatewayFactory diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a376bb5ff..323746783 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -11,7 +11,8 @@ #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orders/DynamicOrder.h" #include "lib/orderman/orders/IcebergOrder2.h" -#include "lib/orderman/orders/NativeOrder.h" +#include "lib/orderman/orders/GLBXNativeOrder.h" +#include "lib/orderman/orders/ICENativeOrder.h" #include "lib/orderman/orders/TimeBoxOrder.h" #include "lib/orderman/orders/TriggerOrder.h" #include "lib/orderman/orders/book_algos/CoverOrder.h" @@ -107,6 +108,21 @@ Order &OrderFactory::recover(api::orderman::OrderRecord const &rec) { return order; } +NativeOrder* OrderFactory::make_order(const api::Venue exchange) +{ + if(exchange == api::Venue::VENUE_ICE || exchange == api::Venue::VENUE_SIMICE) + return new ICENativeOrder(); + else + return new GLBXNativeOrder(); +} + +NativeOrder* OrderFactory::make_order(const api::orderman::OrderDefinition& def) +{ + auto secptr = me->sec_db.resolve( SecurityKey(def.security_key()) ); + bts_assert_msg(secptr, "can't resolve security_id in order factory"); + return make_order(secptr->exchange()); +} + Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { using namespace api::orderman; @@ -115,7 +131,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { case NATIVE_ORDER_TYPE_LIMIT: case NATIVE_ORDER_TYPE_STOP: case NATIVE_ORDER_TYPE_STOP_LIMIT: { - auto native_order = std::make_unique(); + std::unique_ptr native_order(make_order(r.exchange)); native_order->_key = r.order_key; native_order->_parent_key = null_order_key(); auto def = native_order->on_init_from_exe_report( @@ -132,6 +148,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { } } + Order &OrderFactory::allocate(OrderKey k, OrderKey pk, api::orderman::OrderDefinition const &def) { using namespace bts::api::orderman; @@ -144,7 +161,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kLimit: case CustomOrderDefinition::kStop: case CustomOrderDefinition::kStopLimit: - order_ptr.reset(new NativeOrder()); + order_ptr.reset(make_order(def)); break; case CustomOrderDefinition::kIceberg: order_ptr.reset(new IcebergOrder2 ()); diff --git a/src/lib/orderman/order_factory/OrderFactory.h b/src/lib/orderman/order_factory/OrderFactory.h index a7395413c..5cb9152aa 100644 --- a/src/lib/orderman/order_factory/OrderFactory.h +++ b/src/lib/orderman/order_factory/OrderFactory.h @@ -11,6 +11,7 @@ class ISecurityDB; } namespace orderman { class Order; +class NativeOrder; class DynamicOrderRegistry; } // namespace orderman namespace orderman { @@ -45,6 +46,8 @@ class OrderFactory : public IOrderFactory { private: Order &allocate(OrderKey k, OrderKey pk, api::orderman::OrderDefinition const &); + NativeOrder* make_order(const api::Venue exchange); + NativeOrder* make_order(const api::orderman::OrderDefinition& def); struct PImpl; std::unique_ptr me; diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index d59ae607f..f49e85535 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -34,6 +34,7 @@ public: mercury::TimeStampStr transact_time; config::JetFIX::Connection const *cfg; std::string msg; + api::Venue exchange; }; }} diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/GLBXNativeOrder.cpp similarity index 94% rename from src/lib/orderman/orders/NativeOrder.cpp rename to src/lib/orderman/orders/GLBXNativeOrder.cpp index 73932a128..03cd8dcaf 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/GLBXNativeOrder.cpp @@ -1,4 +1,4 @@ -#include "NativeOrder.h" +#include "GLBXNativeOrder.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" @@ -26,7 +26,7 @@ using namespace api::orderman; OrderStatus map_external_status(NativeOrderStatus); -struct NativeOrder::PImpl { +struct GLBXNativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), @@ -65,14 +65,14 @@ struct NativeOrder::PImpl { OrderServices::CancelRejectSubID cancel_reject_sid; }; -NativeOrder::NativeOrder() : me(new PImpl()) {} +GLBXNativeOrder::GLBXNativeOrder() : me(new PImpl()) {} -OrderDefinition const &NativeOrder::definition() const { +OrderDefinition const &GLBXNativeOrder::definition() const { return me->definition; } -void NativeOrder::on_init_new(OrderDefinition const &def, - const PreActivationOrderServices &serv) { +void GLBXNativeOrder::on_init_new(OrderDefinition const &def, + const PreActivationOrderServices &serv) { // order was just created. me->definition = def; @@ -117,8 +117,8 @@ void NativeOrder::on_init_new(OrderDefinition const &def, } } -void NativeOrder::on_init_recovered(OrderRecord const &rec, - const PreActivationOrderServices &serv) { +void GLBXNativeOrder::on_init_recovered(OrderRecord const &rec, + const PreActivationOrderServices &serv) { // order was recovered from our orders database or from an execution report auto const &def = rec.def(); @@ -186,8 +186,8 @@ void NativeOrder::on_init_recovered(OrderRecord const &rec, } api::orderman::OrderDefinition -NativeOrder::on_init_from_exe_report(ExecutionReport const &er, - const PreActivationOrderServices &os) { +GLBXNativeOrder::on_init_from_exe_report(ExecutionReport const &er, + const PreActivationOrderServices &os) { auto k = er.order_key; OrderRecord orecord; @@ -279,10 +279,10 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, return orecord.def(); } -NativeOrder::~NativeOrder() {} +GLBXNativeOrder::~GLBXNativeOrder() {} -void NativeOrder::warm_up_activate(OrderServicesData &data, - OrderServices &services) { +void GLBXNativeOrder::warm_up_activate(OrderServicesData &data, + OrderServices &services) { bts_assert(!me->services); me->services = &services; @@ -307,9 +307,9 @@ void NativeOrder::warm_up_activate(OrderServicesData &data, } OrderOpResult -NativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, - Price p, Quantity q, - bts::orderman::OrderServices &services) { +GLBXNativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, + Price p, Quantity q, + bts::orderman::OrderServices &services) { me->state.set_price(p.value()); me->state.set_quantity(q.value()); me->state.set_filled_quantity(0); @@ -415,8 +415,8 @@ NativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, return OrderOpResult{}; } -OrderOpResult NativeOrder::on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services) { +OrderOpResult GLBXNativeOrder::on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services) { bts_assert(!me->services); me->services = &services; auto result = OrderOpResult{}; @@ -424,7 +424,7 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_INACTIVE: { auto scoped_log = - services.log_scope("NativeOrder::on_activate", key().value()); + services.log_scope("GLBXNativeOrder::on_activate", key().value()); // this is a brand new order result = _on_activate(Warn, Info, p, q, services); @@ -517,9 +517,9 @@ OrderOpResult NativeOrder::on_activate(Price p, Quantity q, return result; } -OrderOpResult NativeOrder::on_update(Price p, Quantity q) { +OrderOpResult GLBXNativeOrder::on_update(Price p, Quantity q) { auto scoped_log = - me->services->log_scope("NativeOrder::on_update", key().value()); + me->services->log_scope("GLBXNativeOrder::on_update", key().value()); auto result = OrderOpResult{}; switch (me->state.status()) { @@ -628,14 +628,14 @@ OrderOpResult NativeOrder::on_update(Price p, Quantity q) { return result; } -OrderOpResult NativeOrder::on_update(api::orderman::Update const &update) +OrderOpResult GLBXNativeOrder::on_update(api::orderman::Update const &update) { return on_update(Price(update.price()),Quantity(update.quantity())); } -OrderOpResult NativeOrder::on_detach() { return OrderOpResult{}; } +OrderOpResult GLBXNativeOrder::on_detach() { return OrderOpResult{}; } -void NativeOrder::on_attached( +void GLBXNativeOrder::on_attached( api::orderman::OrderDefinition const &new_parent) { switch (me->state.status()) { @@ -690,9 +690,9 @@ void NativeOrder::on_attached( } } -OrderOpResult NativeOrder::on_cancel() { +OrderOpResult GLBXNativeOrder::on_cancel() { auto scoped_log = - me->services->log_scope("NativeOrder::on_cancel", key().value()); + me->services->log_scope("GLBXNativeOrder::on_cancel", key().value()); auto result = OrderOpResult{}; switch (me->state.status()) { @@ -743,7 +743,7 @@ OrderOpResult NativeOrder::on_cancel() { return result; } -bool NativeOrder::is_old_exe_report( +bool GLBXNativeOrder::is_old_exe_report( api::orderman::NativeOrderState &native_state, const NewExecutionReportEvent &er) const { if (native_state.last_transact_time().size() != @@ -765,9 +765,9 @@ bool NativeOrder::is_old_exe_report( return true; } -void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { +void GLBXNativeOrder::on_exe_report(const NewExecutionReportEvent &er) { auto scoped_log = - me->services->log_scope("NativeOrder::on_exe_report", key().value()); + me->services->log_scope("GLBXNativeOrder::on_exe_report", key().value()); auto &state = me->state; auto &native_state = get_native_state(state); @@ -873,7 +873,7 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { } } -void NativeOrder::on_cancel_reject(const orderman::CancelRejectEvent &cr) { +void GLBXNativeOrder::on_cancel_reject(const orderman::CancelRejectEvent &cr) { auto &state = me->state; state.set_last_msg(cr.reject_msg); LOG(OrderMan, Warn, "Cancel reject received for order {}", key().value()); @@ -898,7 +898,7 @@ void NativeOrder::on_cancel_reject(const orderman::CancelRejectEvent &cr) { report_state(); } -void NativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) { +void GLBXNativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) { if (ev.is_connected) { switch (me->state.status()) { case ORDER_STATUS_COMPLETED: @@ -941,7 +941,7 @@ void NativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) { report_state(); } -void NativeOrder::update_working_position() { +void GLBXNativeOrder::update_working_position() { if (me->sec) { auto current_position = position_contribution(); auto previous_position = me->previous_position_contribution; @@ -964,12 +964,12 @@ void NativeOrder::update_working_position() { key().value(), me->definition.security_key()); } -void NativeOrder::report_state() { +void GLBXNativeOrder::report_state() { update_working_position(); me->services->report_state(me->state); } -void NativeOrder::init_fix() { +void GLBXNativeOrder::init_fix() { bts_assert(me->sec); using namespace jetfix; @@ -1116,7 +1116,7 @@ void NativeOrder::init_fix() { } } -void NativeOrder::add_exchange_order_id_to_fix() { +void GLBXNativeOrder::add_exchange_order_id_to_fix() { bts_assert(has_exchange_order_id()); me->update_encoding.add(me->exchange_order_id); me->cancel_encoding.add(me->exchange_order_id); @@ -1159,16 +1159,16 @@ OrderStatus map_external_status(NativeOrderStatus status) { return ORDER_STATUS_ERROR; } -bool NativeOrder::has_exchange_order_id() { +bool GLBXNativeOrder::has_exchange_order_id() { return me->exchange_order_id.size(); } -void NativeOrder::transition(api::orderman::OrderStatus new_status, +void GLBXNativeOrder::transition(api::orderman::OrderStatus new_status, std::string const &msg) { transition(Info, new_status, msg); } -void NativeOrder::transition(log::Level level, +void GLBXNativeOrder::transition(log::Level level, api::orderman::OrderStatus new_status, std::string const &msg) { auto const &from = OrderStatus_Name(me->state.status()); @@ -1180,7 +1180,7 @@ void NativeOrder::transition(log::Level level, me->state.set_last_msg(msg); } -void NativeOrder::transition(api::orderman::OrderStatus new_status) { +void GLBXNativeOrder::transition(api::orderman::OrderStatus new_status) { auto const &from = OrderStatus_Name(me->state.status()); auto const &to = OrderStatus_Name(new_status); if (from != to) @@ -1193,7 +1193,7 @@ void NativeOrder::transition(api::orderman::OrderStatus new_status) { me->state.set_status(new_status); } -void NativeOrder::transition_to_error( +void GLBXNativeOrder::transition_to_error( api::orderman::NativeOrderState::SubError sub_error, std::string const &msg) { me->state.mutable_limit()->mutable_native_state()->set_sub_error_code( @@ -1201,7 +1201,7 @@ void NativeOrder::transition_to_error( transition(ORDER_STATUS_ERROR, msg); } -Quantity NativeOrder::position_contribution() { +Quantity GLBXNativeOrder::position_contribution() { switch (me->state.status()) { case ORDER_STATUS_WORKING: @@ -1226,7 +1226,7 @@ Quantity NativeOrder::position_contribution() { return Quantity(0); } -bool NativeOrder::terminal_state(api::orderman::OrderStatus status) const { +bool GLBXNativeOrder::terminal_state(api::orderman::OrderStatus status) const { switch (status) { case ORDER_STATUS_COMPLETED: @@ -1252,7 +1252,7 @@ bool NativeOrder::terminal_state(api::orderman::OrderStatus status) const { } api::orderman::NativeOrderState & -NativeOrder::get_native_state(api::orderman::OrderState &st) { +GLBXNativeOrder::get_native_state(api::orderman::OrderState &st) { switch (st.custom_case()) { case OrderState::kMarket: return *st.mutable_market()->mutable_native_state(); diff --git a/src/lib/orderman/orders/GLBXNativeOrder.h b/src/lib/orderman/orders/GLBXNativeOrder.h new file mode 100644 index 000000000..b00611097 --- /dev/null +++ b/src/lib/orderman/orders/GLBXNativeOrder.h @@ -0,0 +1,73 @@ +#pragma once + +#include "lib/orderman/orders/NativeOrder.h" +#include "lib/tracing/PerfLog.h" +#include + +namespace bts { +namespace orderman { +struct RoutingRecord; +class NewExecutionReportEvent; +class CancelRejectEvent; +class GatewayStatusChangeEvent; +class ExecutionReport; + +class GLBXNativeOrder : public NativeOrder { + public: + GLBXNativeOrder(); + ~GLBXNativeOrder() override; + + api::orderman::OrderDefinition const &definition() const; + void on_init_new(api::orderman::OrderDefinition const &, + const PreActivationOrderServices &) override; + void on_init_recovered(api::orderman::OrderRecord const &, + const PreActivationOrderServices &) override; + + OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_update(Price, Quantity) override; + OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_detach() override; + OrderOpResult on_cancel() override; + void on_attached(api::orderman::OrderDefinition const &new_parent) override; + + api::orderman::OrderDefinition + on_init_from_exe_report(ExecutionReport const &, + const PreActivationOrderServices &) override; + + protected: + void warm_up_activate(OrderServicesData &, OrderServices &) override; + + private: + struct PImpl; + std::unique_ptr me; + void on_exe_report(const NewExecutionReportEvent &); + void on_cancel_reject(const CancelRejectEvent &); + void on_gateway_status(const GatewayStatusChangeEvent &); + void report_state(); + OrderOpResult _on_activate(log::Level reject_level, + log::Level transition_level, Price p, Quantity q, + bts::orderman::OrderServices &services); + void init_fix(); + void add_exchange_order_id_to_fix(); + + void transition(log::Level, + api::orderman::OrderStatus new_state, + std::string const &msg); + void transition(api::orderman::OrderStatus new_state, + std::string const &msg); + void transition(api::orderman::OrderStatus new_state); + void transition_to_error(api::orderman::NativeOrderState::SubError sub_error, + std::string const &msg); + + void update_working_position(); + bool has_exchange_order_id(); + Quantity position_contribution(); + bool is_old_exe_report(api::orderman::NativeOrderState &, + const NewExecutionReportEvent &) const; + bool terminal_state(api::orderman::OrderStatus status) const; + api::orderman::NativeOrderState & + get_native_state(api::orderman::OrderState &); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp new file mode 100644 index 000000000..592783068 --- /dev/null +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -0,0 +1,1245 @@ +#include "ICENativeOrder.h" + +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/jetfix/codec/FIXFragment.h" +#include "lib/jetfix/codec/FieldDefinitions.h" +#include "lib/logging/logging.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/orderman_utils/ExecutionReport.h" +#include "lib/orderman/orderman_utils/fix_order_codec.h" +#include "lib/orderman/orders/PreActivationOrderServices.h" +#include "lib/orderman/securities/ISecurityDB.h" +#include "lib/utils/PBUtils.h" +#include "lib/utils/bts_chrono.h" + +#include "lib/orderman/actors/order_manager/OrderServices.h" + +#include +#include + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +OrderStatus map_external_status(NativeOrderStatus); //in GLBXNativeOrder.cpp + +struct ICENativeOrder::PImpl +{ + PImpl() + : services(nullptr), session_services(), sec(nullptr), + previous_position_contribution(0), definition(), state(), + price_encoding_precision(7), exchange_order_id() { + exchange_order_id.reserve(100); + } + + OrderServices *services; + SessionServices *session_services; + + const api::Security *sec; + Quantity previous_position_contribution; + + OrderDefinition definition; + OrderState state; + int price_encoding_precision; + std::string exchange_order_id; + + jetfix::FIXFragment update_encoding; + jetfix::FIXFragment::Bookmark update_price_bm; + jetfix::FIXFragment::Bookmark update_quantity_bm; + jetfix::FIXFragment::Bookmark update_transact_time_bm; + + jetfix::FIXFragment create_encoding; + jetfix::FIXFragment::Bookmark create_price_bm; + jetfix::FIXFragment::Bookmark create_quantity_bm; + jetfix::FIXFragment::Bookmark create_transact_time_bm; + + jetfix::FIXFragment cancel_encoding; + jetfix::FIXFragment::Bookmark cancel_transact_time_bm; + + OrderServices::ExeReportSubID exe_report_sid; + OrderServices::CancelRejectSubID cancel_reject_sid; +}; + +ICENativeOrder::ICENativeOrder() : me(new PImpl()) {} + +const OrderDefinition& ICENativeOrder::definition() const +{ + return me->definition; +} + +void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivationOrderServices& serv) +{ + // order was just created. + me->definition = def; + + switch (def.custom_def().custom_case()) { + case CustomOrderDefinition::kMarket: + me->state.mutable_market(); + break; + case CustomOrderDefinition::kLimit: + me->state.mutable_limit(); + break; + case CustomOrderDefinition::kStop: + me->state.mutable_stop(); + break; + case CustomOrderDefinition::kStopLimit: + me->state.mutable_stop_limit(); + break; + default: + bts_assert(false); + break; + } + + me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); + + if (!me->sec) + { + auto msg = fmt::format("Unknown security: {}", def.security_key()); + me->state.set_last_msg(msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + } + else + { + auto rq = serv.order_router.get_routing_record(UserID(def.user_id()), AccountID(def.account_id()), *me->sec); + if (rq.has_route) + { + transition(ORDER_STATUS_INACTIVE); + auto &native_state = get_native_state(me->state); + *native_state.mutable_routing_record() = rq.routing_record; + init_fix(); + } + else + { + auto msg = fmt::format("Could not route order: {}", rq.error_msg); + LOG(OrderMan, Error, "{}", msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + } + } +} + +void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivationOrderServices& serv) +{ + // order was recovered from our orders database or from an execution report + auto const &def = rec.def(); + + me->definition = def; + me->state = rec.state(); + me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); + me->previous_position_contribution = Quantity(rec.state().filled_quantity()); + + auto const &native_state = get_native_state(me->state); + switch (me->state.status()) + { + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + { + // bail if we can't find the security for the order + if (!me->sec) + { + LOG(OrderMan, Error, + "Unknown security {} referenced by recovered " + "order {}. This is a serious " + "problem which has to be corrected manually. ", + def.security_key(), rec.key()); + transition_to_error( + NativeOrderState::SUB_ERROR_UNKNOWN_SECURITY, + fmt::format("Unknown security: {}", def.security_key())); + return; + } + + // bail if the session we used for the order is no longer valid + auto const &session = native_state.routing_record().session(); + if (!serv.order_router.is_valid_session(session)) + { + LOG(OrderMan, Error, + "Unknown JetFIX session {} referenced by recovered " + "order {}. This is a serious " + "problem which has to be corrected manually. ", + session, rec.key()); + transition_to_error(NativeOrderState::SUB_ERROR_UNKNOWN_FIX_SESSION, + fmt::format("Unknown FIX session: {}", session)); + return; + } + + // if we made it this far we are good. + init_fix(); + if (me->state.status() != ORDER_STATUS_PENDING_WORKING) + { + me->exchange_order_id = native_state.exchange_order_id(); + add_exchange_order_id_to_fix(); + } + return; + } + + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + // terminal states, nothing to do + return; + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + return; + } +} + +api::orderman::OrderDefinition +ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActivationOrderServices& os) +{ + auto k = er.order_key; + + OrderRecord orecord; + orecord.set_key(k.value()); + orecord.set_parent_key(null_order_key().value()); + + auto &def = *orecord.mutable_def(); + def.set_security_key(er.security->id()); + def.set_side(er.side); + + auto sec = os.sec_db.resolve(SecurityKey(def.security_key())); + auto rev_rec = os.order_router.get_reverse_routing_record( + er.cfg->name(), to_trim_str(er.operator_id), + to_trim_str(er.account_name), sec); + + if (rev_rec.ok) + { + def.set_user(rev_rec.user); + def.set_user_id(rev_rec.user_id.value()); + def.set_account(rev_rec.account); + def.set_account_id(rev_rec.account_id.value()); + } + else + { + LOG(OrderMan, Error, + "Could not recover account and user information from order {}" + ". The following information is available: {}. ", + k.value(), rev_rec.error_msg); + def.set_user(""); + def.set_user_id(0); + def.set_account(""); + def.set_account_id(0); + } + + def.set_time_in_force(er.time_in_force); + def.set_manual_order_indicator(er.manual_order_indicator); + def.set_cti_code(CTICode(er.cfg->cti_code()[0])); + def.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); + + auto &state = *orecord.mutable_state(); + state.set_status(map_external_status(er.order_status)); + state.set_price(er.price.value()); + state.set_quantity(er.quantity.value()); + state.set_filled_quantity(er.filled_quantity.value()); + state.set_last_price(er.last_price.value()); + state.set_avg_price(er.last_price.value()); + state.set_last_msg(er.msg); + *state.mutable_last_change() = utils::pb::pb_now(); + + switch (er.order_type) + { + case NATIVE_ORDER_TYPE_MARKET: + def.mutable_custom_def()->mutable_market(); + state.mutable_market(); + break; + case NATIVE_ORDER_TYPE_LIMIT: + def.mutable_custom_def()->mutable_limit(); + state.mutable_market(); + break; + case NATIVE_ORDER_TYPE_STOP: + { + auto &stop_def = *def.mutable_custom_def()->mutable_stop(); + stop_def.set_stop_price(er.stop_price.value()); + state.mutable_stop(); + break; + } + case NATIVE_ORDER_TYPE_STOP_LIMIT: + { + auto &stop_limit_def = *def.mutable_custom_def()->mutable_stop_limit(); + stop_limit_def.set_stop_price(er.stop_price.value()); + state.mutable_stop_limit(); + break; + } + case NATIVE_ORDER_TYPE_MARKET_LIMIT: + case NATIVE_ORDER_TYPE_UNDEFINED: + case NativeOrderType_INT_MIN_SENTINEL_DO_NOT_USE_: + case NativeOrderType_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + + auto &native_state = get_native_state(state); + native_state.set_exchange_order_id(to_trim_str(er.exchange_order_id)); + native_state.set_last_msg_seq_num(er.msg_seq_num); + native_state.set_native_type(er.order_type); + + auto &rr = *native_state.mutable_routing_record(); + rr.set_session(er.cfg->name()); + rr.set_account(to_trim_str(er.account_name)); + rr.set_operator_id(to_trim_str(er.operator_id)); + rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); + rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); + rr.set_location(er.cfg->sender_locationid()); + on_init_recovered(orecord, os); + return orecord.def(); +} + +ICENativeOrder::~ICENativeOrder() {} + +void ICENativeOrder::warm_up_activate(OrderServicesData &data, OrderServices &services) +{ + bts_assert(!me->services); + me->services = &services; + + init_order_services(data, services); + + // save these so we can re-instate them after we are done with the warmup + auto before_state = me->state.status(); + auto before_msg = me->state.last_msg(); + + _on_activate(NoLog, NoLog, Price(0), Quantity(0), services); + + // undo warm up side effects + me->state.set_status(before_state); + me->state.set_last_msg(before_msg); + + me->services->unsubscribe_from_exe_report(*me->session_services, + me->exe_report_sid); + me->services->unsubscribe_from_cancel_reject(*me->session_services, + me->cancel_reject_sid); + me->services->unsubscribe_from_gateway_status(*me->session_services); + me->services = nullptr; +} + +OrderOpResult +ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_level, + Price p, Quantity q, bts::orderman::OrderServices &services) +{ + me->state.set_price(p.value()); + me->state.set_quantity(q.value()); + me->state.set_filled_quantity(0); + me->state.set_last_price(0); + me->state.set_avg_price(0); + + me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); + me->price_encoding_precision = me->services->price_encoding_precision(*me->session_services); + + // is our gateway connected? + if (!me->services->is_gateway_connected(*me->session_services)) + { + LOG(OrderMan, reject_level, + "Attempt to send order to a disconnected gateway. " + "Dropping order {}", + key().value()); + auto msg = "Exchange gateway is down"; + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_GATEWAY_NOT_READY, msg}; + } + + // can we trade? + auto lqr = me->services->limiter().can_trade( UserID(me->definition.user_id()), AccountID(me->definition.account_id()) ); + if (!lqr.ok) + { + LOG(OrderMan, reject_level, + "Unauthorized order attempted. User: {} on " + "Account: {}. Msg: {} Order: {}. Dropping order", + me->definition.user(), me->definition.account(), lqr.error_msg, + key().value()); + + auto msg = fmt::format("Unauthorized order: {}", lqr.error_msg); + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_UNAUTHORIZED, msg}; + } + + // can we trade this security, with this size? + lqr = me->services->limiter().can_send_new_order( + AccountID(me->definition.account_id()), *me->sec, me->definition.side(), q); + + if (!lqr.ok) + { + LOG(OrderMan, reject_level, + "New order would breach limit. User: {} Account: " + "{} Msg: {} Order: {}. Dropping order", + me->definition.user(), me->definition.account(), lqr.error_msg, + key().value()); + + auto msg = fmt::format("Order would breach limit: {}", lqr.error_msg); + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult{ORDER_ERROR_LIMIT_BREACH, msg}; + } + + // are we under the messaging threshold? + if (!me->services->governor(*me->session_services).can_send()) + { + LOG(OrderMan, reject_level, + "New order would cause breach of messaging " + "limits. Dropping order {}", + key().value()); + auto msg = "Messaging threshold breached"; + transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); + return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH, msg); + } + + // if we are here we are good. + // subscribe to usefull events + me->exe_report_sid = me->services->subscribe_to_exe_report(*me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->cancel_reject_sid = me->services->subscribe_to_cancel_reject(*me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status(*me->session_services, + [this](auto const &gw) { this->on_gateway_status(gw); }); + + // send out order + auto &encoding = me->create_encoding; + + switch (me->definition.custom_def().custom_case()) + { + case CustomOrderDefinition::kLimit: + case CustomOrderDefinition::kStopLimit: + { + me->create_price_bm = encoding.overwrite(me->create_price_bm, + securities::encode_exchange_price(*me->sec, p).value(), + me->price_encoding_precision, price_sz()); + break; + } + case CustomOrderDefinition::kStop: + case CustomOrderDefinition::kMarket: + break; + default: + bts_assert(false); + break; + } + + me->create_quantity_bm = + encoding.overwrite(me->create_quantity_bm, q.value(), quantity_sz()); + auto const &ts = services.get_time_str(); + me->create_transact_time_bm = encoding.overwrite( + me->create_transact_time_bm, &ts.value()[0], ts.value().size()); + return OrderOpResult{}; +} + +OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, + bts::orderman::OrderServices &services) +{ + bts_assert(!me->services); + me->services = &services; + auto result = OrderOpResult{}; + switch (me->state.status()) + { + + case ORDER_STATUS_INACTIVE: + { + auto scoped_log = services.log_scope("ICENativeOrder::on_activate", key().value()); + // this is a brand new order + + result = _on_activate(Warn, Info, p, q, services); + if (result.ok()) + { + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::NewOrderSingle, + me->create_encoding); + + me->services->governor(*me->session_services).record_sent(); + me->state.set_status(ORDER_STATUS_PENDING_WORKING); + + LOG(OrderMan, Info, "Sent new order with key {} to gateway", key().value()); + // Early return so we skip the expensive report_state() + // call. It is OK to spkip it because we are bound to report + // our state once the excange aknowledges the order. + return OrderOpResult{}; + } + + // When the order fails its limits checks we fall through the + // switch to report the error state at the end of this function + break; + } + + // all cases below are for orders recovered from disk + case ORDER_STATUS_WORKING: + me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); + me->services->subscribe_to_exe_report(*me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject(*me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status(*me->session_services, + [this](auto const &gw) { this->on_gateway_status(gw); }); + + if (!me->services->is_gateway_connected(*me->session_services)) + { + result.error = ORDER_ERROR_GATEWAY_NOT_READY; + result.error_msg = "Gateway is disconnected"; + transition(ORDER_STATUS_DISCONNECTED); + } + break; + + case ORDER_STATUS_DISCONNECTED: + me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); + me->services->subscribe_to_exe_report(*me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject(*me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status(*me->session_services, + [this](auto const &gw) { this->on_gateway_status(gw); }); + + if (me->services->is_gateway_connected(*me->session_services)) + transition(ORDER_STATUS_WORKING); + break; + + case ORDER_STATUS_PENDING_WORKING: + me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); + me->services->subscribe_to_exe_report(*me->session_services, key(), + [this](auto const &r) { this->on_exe_report(r); }); + me->services->subscribe_to_cancel_reject(*me->session_services, key(), + [this](auto const &cr) { this->on_cancel_reject(cr); }); + me->services->subscribe_to_gateway_status(*me->session_services, + [this](auto const &gw) { this->on_gateway_status(gw); }); + break; + + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + break; + + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); + return result; +} + +OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) +{ + auto scoped_log = me->services->log_scope("ICENativeOrder::on_update", key().value()); + auto result = OrderOpResult{}; + + switch (me->state.status()) + { + case ORDER_STATUS_WORKING: + { + auto previous_working_qty = 0; + if (me->state.quantity() > me->state.filled_quantity()) + previous_working_qty = me->state.quantity() - me->state.filled_quantity(); + + auto current_working_qty = 0; + if (q.value() > me->state.filled_quantity()) + current_working_qty = q.value() - me->state.filled_quantity(); + + auto lqr = me->services->limiter().can_update_order( AccountID(me->definition.account_id()), *me->sec, + me->definition.side(), Quantity(previous_working_qty), + Quantity(current_working_qty)); + + // are we under the position limits? + if (!lqr.ok) { + auto msg = fmt::format("Cannot update order due to limit breach: {}", lqr.error_msg); + LOG(OrderMan, Error, + "Order update failed due to limit breach. Order: {} Msg: {}", + key().value(), lqr.error_msg); + + // if we are not being driven by an algo we just signal the + // error but keep running. otherwise we stop. + if (parent_key() == null_order_key()) + transition(me->state.status(), msg); + else + { + me->state.set_last_msg(msg); + on_cancel(); + } + result.error = api::orderman::ORDER_ERROR_LIMIT_BREACH; + result.error_msg = lqr.error_msg; + break; + } + + // are we under the messaging threshold? + if (!me->services->governor(*me->session_services).can_send()) + { + LOG(OrderMan, Warn, + "Cannot update order {} because of messaging limits. ", + key().value()); + auto msg = "Messaging threshold breached"; + + // if we are not being driven by an algo we just signal the + // error but keep running. otherwise we stop. + if (parent_key() == null_order_key()) + transition(me->state.status(), msg); + else + { + me->state.set_last_msg(msg); + on_cancel(); + } + result.error = api::orderman::ORDER_ERROR_MESSAGING_LIMIT_BREACH; + result.error_msg = msg; + break; + } + + // all good + auto &encoding = me->update_encoding; + me->update_price_bm = encoding.overwrite(me->update_price_bm, securities::encode_exchange_price(*me->sec, p).value(), + me->price_encoding_precision, price_sz()); + me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); + + auto const &ts = me->services->get_time_str(); + me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); + + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::CancelReplace, + me->update_encoding); + + me->services->governor(*me->session_services).record_sent(); + update_working_position(); + if (me->state.last_msg().size()) + me->state.set_last_msg(""); + + // early return so we skip report_state (for speed) + return OrderOpResult{}; + } + + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + transition(me->state.status(), "Cannot update order"); + break; + + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + break; + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); + return result; +} + +OrderOpResult ICENativeOrder::on_update(api::orderman::Update const &update) +{ + return on_update(Price(update.price()),Quantity(update.quantity())); +} + +OrderOpResult ICENativeOrder::on_detach() { return OrderOpResult{}; } + +void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_parent) +{ + switch (me->state.status()) + { + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_WORKING: { + LOG(OrderMan, Info, "Native order {} has been attached to by {}", + key().value(), utils::pb::to_string(new_parent)); + + // Update FIX tags to reflect new parent's information + auto rq = me->services->route_order(UserID(new_parent.user_id()), + AccountID(new_parent.account_id()), + *me->sec); + + if (!rq.has_route) + { + auto msg = fmt::format("Cannot update order routing information: {}", rq.error_msg); + transition(me->state.status(), msg); + report_state(); + return; + } + + auto &native_state = get_native_state(me->state); + *native_state.mutable_routing_record() = rq.routing_record; + init_fix(); + if (has_exchange_order_id()) + add_exchange_order_id_to_fix(); + + // Update user, account and manual order indicator based on new parent + me->definition.set_manual_order_indicator(api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO); + me->definition.set_user(new_parent.user()); + me->definition.set_user_id(new_parent.user_id()); + me->definition.set_account(new_parent.account()); + me->definition.set_account_id(new_parent.account_id()); + me->services->report_definition(me->definition); + report_state(); + break; + } + + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_ERROR: + break; + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } +} + +OrderOpResult ICENativeOrder::on_cancel() +{ + auto scoped_log = me->services->log_scope("ICENativeOrder::on_cancel", key().value()); + auto result = OrderOpResult{}; + + switch (me->state.status()) + { + case ORDER_STATUS_WORKING: + { + auto &encoding = me->cancel_encoding; + auto const &ts = me->services->get_time_str(); + me->cancel_transact_time_bm = encoding.overwrite( me->cancel_transact_time_bm, &ts.value()[0], ts.value().size() ); + + me->services->queue_fix(*me->session_services, + jetfix::MessageTypes::Cancel, + me->cancel_encoding); + break; + } + + case ORDER_STATUS_CANCELED: + break; + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_ERROR: + result.error = ORDER_ERROR_INVALID_OP; + result.error_msg = "Order is already terminated"; + break; + + case ORDER_STATUS_DISCONNECTED: + { + auto msg = "Cannot cancel order"; + result.error = ORDER_ERROR_GATEWAY_NOT_READY; + result.error_msg = msg; + transition(me->state.status(), msg); + break; + } + case ORDER_STATUS_PENDING_WORKING: + { + auto msg = "Cannot cancel order"; + result.error = ORDER_ERROR_ORDER_NOT_ACK; + result.error_msg = msg; + transition(me->state.status(), msg); + break; + } + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); + return result; +} + +bool ICENativeOrder::is_old_exe_report(api::orderman::NativeOrderState &native_state, const NewExecutionReportEvent &er) const +{ + if (native_state.last_transact_time().size() != sizeof(mercury::TimeStampStr)) + return false; + + if (std::lexicographical_compare(native_state.last_transact_time().begin(), + native_state.last_transact_time().end(), + er.data->transact_time.value().begin(), + er.data->transact_time.value().end())) + return false; + + if (std::equal(native_state.last_transact_time().begin(), + native_state.last_transact_time().end(), + er.data->transact_time.value().begin(), + er.data->transact_time.value().end())) + return native_state.last_msg_seq_num() >= er.data->msg_seq_num; + + return true; +} + +void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) +{ + auto scoped_log = me->services->log_scope("ICENativeOrder::on_exe_report", key().value()); + + auto &state = me->state; + auto &native_state = get_native_state(state); + + // if we have a previous state we want to ensure this execution + // report was not already considered. + if (is_old_exe_report(native_state, er)) + { + LOG(OrderMan, Info, + "Ignoring already seen execution report {} in order {}", + er.data->msg_seq_num, key().value()); + return; + } + + // we do not care about spread leg fills for purposes of order + // state maintenance + if (er.data->leg_security) + { + LOG(OrderMan, Diag, "Ignoring leg execution report for order {}", + key().value()); + return; + } + + native_state.set_last_msg_seq_num(er.data->msg_seq_num); + native_state.set_last_transact_time(to_str(er.data->transact_time)); + + auto external_status = map_external_status(er.data->order_status); + + // filled quantity is reset back to 0 when the order is canceled + if (external_status != ORDER_STATUS_CANCELED) + { + if (er.data->exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || + er.data->exec_type == api::orderman::EXEC_TYPE_FILL) + { + + bts_assert(er.data->last_shares.value()); + auto previous_avg = state.avg_price(); + auto previous_sz = state.filled_quantity(); + auto fill_price = er.data->last_price.value(); + auto fill_sz = er.data->last_shares.value(); + + auto new_avg = + ((previous_avg * previous_sz) + (fill_price * fill_sz)) / + (previous_sz + fill_sz); + + state.set_avg_price(new_avg); + } + state.set_filled_quantity(er.data->filled_quantity.value()); + state.set_last_price(er.data->last_price.value()); + } + + state.set_last_msg(er.data->msg); + + native_state.set_native_status(er.data->order_status); + native_state.set_native_type(er.data->order_type); + bool got_first_exchange_order_id = !has_exchange_order_id(); + if (got_first_exchange_order_id) + { + me->exchange_order_id = to_trim_str(er.data->exchange_order_id); + native_state.set_exchange_order_id(me->exchange_order_id); + add_exchange_order_id_to_fix(); + } + + if (!terminal_state(me->state.status())) + { + state.set_price(er.data->price.value()); + state.set_quantity(er.data->quantity.value()); + } + + switch (me->state.status()) + { + // terminal states, nothing can change them + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + break; + + // receiving an execution report does does not mean + // we are connected + case ORDER_STATUS_DISCONNECTED: + break; + + case ORDER_STATUS_PENDING_WORKING: + if (external_status == ORDER_STATUS_WORKING && + !me->services->is_gateway_connected(*me->session_services)) + transition(ORDER_STATUS_DISCONNECTED); + else + transition(external_status); + break; + + case ORDER_STATUS_WORKING: + transition(external_status); + break; + + case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); + + // we only need the exhange order id and the routing record + // reported once, since they are both immutable, so we clear them + // after their first report to make subsquent state updates faster + if (got_first_exchange_order_id) + { + native_state.clear_exchange_order_id(); + native_state.mutable_routing_record()->Clear(); + } +} + +void ICENativeOrder::on_cancel_reject(const orderman::CancelRejectEvent &cr) +{ + auto &state = me->state; + state.set_last_msg(cr.reject_msg); + LOG(OrderMan, Warn, "Cancel reject received for order {}", key().value()); + + switch (me->state.status()) + { + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_WORKING: + break; + + case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + report_state(); +} + +void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) +{ + if (ev.is_connected) + { + switch (me->state.status()) + { + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_WORKING: + break; + case ORDER_STATUS_DISCONNECTED: + { + auto const &native_state = get_native_state(me->state); + transition(map_external_status(native_state.native_status())); + break; + } + case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_REJECTED_BY_SPARK: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + } + else + { + switch (me->state.status()) + { + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + break; + case ORDER_STATUS_WORKING: + transition(ORDER_STATUS_DISCONNECTED); + break; + case ORDER_STATUS_INACTIVE: + case ORDER_STATUS_REJECTED_BY_SPARK: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + break; + } + } + report_state(); +} + +void ICENativeOrder::update_working_position() +{ + if (me->sec) + { + auto current_position = position_contribution(); + auto previous_position = me->previous_position_contribution; + me->previous_position_contribution = current_position; + + if (current_position.value() > previous_position.value()) + me->services->limiter().add( *me->sec, AccountID(me->definition.account_id()), + me->definition.side(), Quantity(current_position.value() - previous_position.value())); + else if (previous_position.value() > current_position.value()) + me->services->limiter().remove( *me->sec, AccountID(me->definition.account_id()), + me->definition.side(), Quantity(previous_position.value() - current_position.value())); + } + else + LOG(OrderMan, Error, + "Order {} ignored for purposes of limit enforcing " + "because it references unknown security {} ", + key().value(), me->definition.security_key()); +} + +void ICENativeOrder::report_state() +{ + update_working_position(); + me->services->report_state(me->state); +} + +void ICENativeOrder::init_fix() +{ + bts_assert(me->sec); + + using namespace jetfix; + me->create_encoding = FIXFragment{}; + me->update_encoding = FIXFragment{}; + me->cancel_encoding = FIXFragment{}; + + auto const &def = me->definition; + auto const &sec = *me->sec; + auto const &rr = get_native_state(me->state).routing_record(); + + std::string clordid(clordid_sz(), ' '); + encode_clorid(key(), SecurityKey(sec.id()), &clordid); + + // initialize create FIX + auto &create_encoding = me->create_encoding; + create_encoding.add(rr.operator_id()); + create_encoding.add(rr.location()); + create_encoding.add(rr.account()); + create_encoding.add(def.side()); + create_encoding.add(def.time_in_force()); + create_encoding.add(def.manual_order_indicator()); + create_encoding.add(rr.customer_or_firm()); + create_encoding.add(rr.cti_code()); + create_encoding.add(sec.glbx().security_desc()); + create_encoding.add(clordid); + if (rr.smp_id().size()) + { + create_encoding.add(rr.smp_id()); + if (rr.smp_instruction() != SELF_MATCH_PREVENTION_INSTRUCTION_UNDEFINED) + create_encoding.add( + rr.smp_instruction()); + } + + me->create_transact_time_bm = create_encoding.add(datetime::FIX_timestamp(datetime::now())); + me->create_quantity_bm = create_encoding.add(0, quantity_sz()); + // initialize update FIX + auto &update_encoding = me->update_encoding; + update_encoding.add(rr.operator_id()); + update_encoding.add(rr.location()); + update_encoding.add(rr.account()); + update_encoding.add(def.side()); + update_encoding.add(def.time_in_force()); + update_encoding.add(def.manual_order_indicator()); + update_encoding.add(rr.cti_code()); + update_encoding.add(rr.customer_or_firm()); + update_encoding.add(sec.glbx().security_desc()); + update_encoding.add(clordid); + update_encoding.add(clordid); + update_encoding.add(clordid); + update_encoding.add(true); + // Self Match Protection + if (rr.smp_id().size()) + { + update_encoding.add(rr.smp_id()); + if (rr.smp_instruction() != SELF_MATCH_PREVENTION_INSTRUCTION_UNDEFINED) + update_encoding.add(rr.smp_instruction()); + } + me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); + me->update_quantity_bm = update_encoding.add(0, quantity_sz()); + + // initialize cancel FIX + auto &cancel_encoding = me->cancel_encoding; + cancel_encoding.add(rr.operator_id()); + cancel_encoding.add(rr.location()); + cancel_encoding.add(rr.account()); + cancel_encoding.add(def.side()); + cancel_encoding.add(def.time_in_force()); + cancel_encoding.add(def.manual_order_indicator()); + cancel_encoding.add(sec.glbx().security_desc()); + cancel_encoding.add(clordid); + cancel_encoding.add(clordid); + cancel_encoding.add(clordid); + me->cancel_transact_time_bm = cancel_encoding.add(datetime::FIX_timestamp(datetime::now())); + + // special tags + switch (def.custom_def().custom_case()) + { + case CustomOrderDefinition::kMarket: + // type + create_encoding.add(NATIVE_ORDER_TYPE_MARKET); + update_encoding.add(NATIVE_ORDER_TYPE_MARKET); + cancel_encoding.add(NATIVE_ORDER_TYPE_MARKET); + break; + + case CustomOrderDefinition::kLimit: + // type + create_encoding.add(NATIVE_ORDER_TYPE_LIMIT); + update_encoding.add(NATIVE_ORDER_TYPE_LIMIT); + cancel_encoding.add(NATIVE_ORDER_TYPE_LIMIT); + + // price + me->create_price_bm = create_encoding.add(0, me->price_encoding_precision, price_sz()); + me->update_price_bm = update_encoding.add(0, me->price_encoding_precision, price_sz()); + break; + + case CustomOrderDefinition::kStop: + { + // type + create_encoding.add(NATIVE_ORDER_TYPE_STOP); + update_encoding.add(NATIVE_ORDER_TYPE_STOP); + cancel_encoding.add(NATIVE_ORDER_TYPE_STOP); + + // stop px + auto stop_px = def.custom_def().stop().stop_price(); + auto encoded_stop_px = + securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); + create_encoding.add(encoded_stop_px, + me->price_encoding_precision, -1); + update_encoding.add(encoded_stop_px, + me->price_encoding_precision, -1); + break; + } + + case CustomOrderDefinition::kStopLimit: + { + // type + create_encoding.add(NATIVE_ORDER_TYPE_STOP_LIMIT); + update_encoding.add(NATIVE_ORDER_TYPE_STOP_LIMIT); + cancel_encoding.add(NATIVE_ORDER_TYPE_STOP_LIMIT); + + // stop px + auto stop_px = def.custom_def().stop_limit().stop_price(); + auto encoded_stop_px = + securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); + create_encoding.add(encoded_stop_px, + me->price_encoding_precision, -1); + update_encoding.add(encoded_stop_px, + me->price_encoding_precision, -1); + + // price + me->create_price_bm = create_encoding.add( + 0, me->price_encoding_precision, price_sz()); + me->update_price_bm = update_encoding.add( + 0, me->price_encoding_precision, price_sz()); + break; + } + default: + bts_assert(false); + break; + } +} + +void ICENativeOrder::add_exchange_order_id_to_fix() +{ + bts_assert(has_exchange_order_id()); + me->update_encoding.add(me->exchange_order_id); + me->cancel_encoding.add(me->exchange_order_id); +} + +bool ICENativeOrder::has_exchange_order_id() +{ + return me->exchange_order_id.size(); +} + +void ICENativeOrder::transition(api::orderman::OrderStatus new_status, std::string const &msg) +{ + transition(Info, new_status, msg); +} + +void ICENativeOrder::transition(log::Level level, api::orderman::OrderStatus new_status, std::string const &msg) +{ + auto const &from = OrderStatus_Name(me->state.status()); + auto const &to = OrderStatus_Name(new_status); + if (from != to) + LOG(OrderMan, level, "Transitioning order {} from {} to {}. Msg: {}", key().value(), from, to, msg); + me->state.set_status(new_status); + me->state.set_last_msg(msg); +} + +void ICENativeOrder::transition(api::orderman::OrderStatus new_status) +{ + auto const &from = OrderStatus_Name(me->state.status()); + auto const &to = OrderStatus_Name(new_status); + if (from != to) + LOG(OrderMan, Info, "Transitioning order {} from {} to {}", key().value(), from, to); + else + LOG(OrderMan, Diag, "Transitioning order {} from {} to {}", key().value(), from, to); + + me->state.set_status(new_status); +} + +void ICENativeOrder::transition_to_error(api::orderman::NativeOrderState::SubError sub_error, std::string const &msg) +{ + me->state.mutable_limit()->mutable_native_state()->set_sub_error_code(sub_error); + transition(ORDER_STATUS_ERROR, msg); +} + +Quantity ICENativeOrder::position_contribution() +{ + switch (me->state.status()) + { + + case ORDER_STATUS_WORKING: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_DISCONNECTED: + return Quantity(std::max(me->state.quantity(), me->state.filled_quantity())); + + case ORDER_STATUS_REJECTED_BY_SPARK: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + return Quantity(me->state.filled_quantity()); + + case ORDER_STATUS_INACTIVE: + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + bts_assert(false); + return Quantity(0); + } + bts_assert(false); + return Quantity(0); +} + +bool ICENativeOrder::terminal_state(api::orderman::OrderStatus status) const +{ + switch (status) + { + + case ORDER_STATUS_COMPLETED: + case ORDER_STATUS_CANCELED: + case ORDER_STATUS_ERROR: + case ORDER_STATUS_REJECTED_BY_SPARK: + return true; + + case ORDER_STATUS_DISCONNECTED: + case ORDER_STATUS_PENDING_WORKING: + case ORDER_STATUS_WORKING: + return false; + + case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: + case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: + case ORDER_STATUS_INACTIVE: + bts_assert(false); + return false; + break; + } + bts_assert(false); + return false; +} + +api::orderman::NativeOrderState& ICENativeOrder::get_native_state(api::orderman::OrderState &st) +{ + switch (st.custom_case()) + { + case OrderState::kMarket: + return *st.mutable_market()->mutable_native_state(); + case OrderState::kLimit: + return *st.mutable_limit()->mutable_native_state(); + case OrderState::kStop: + return *st.mutable_stop()->mutable_native_state(); + case OrderState::kStopLimit: + return *st.mutable_stop_limit()->mutable_native_state(); + default: + break; + } + + // just to appease compiler + bts_assert(false); + return *st.mutable_stop_limit()->mutable_native_state(); +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h new file mode 100644 index 000000000..1156c0b00 --- /dev/null +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -0,0 +1,72 @@ +#pragma once + +#include "lib/orderman/orders/NativeOrder.h" +#include "lib/tracing/PerfLog.h" +#include + +namespace bts { +namespace orderman { +struct RoutingRecord; +class NewExecutionReportEvent; +class CancelRejectEvent; +class GatewayStatusChangeEvent; +class ExecutionReport; + +class ICENativeOrder : public NativeOrder { + public: + ICENativeOrder(); + ~ICENativeOrder() override; + + api::orderman::OrderDefinition const &definition() const; + void on_init_new(api::orderman::OrderDefinition const &, + const PreActivationOrderServices &) override; + void on_init_recovered(api::orderman::OrderRecord const &, + const PreActivationOrderServices &) override; + + OrderOpResult on_activate(Price, Quantity, OrderServices &) override; + OrderOpResult on_update(Price, Quantity) override; + OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_detach() override; + OrderOpResult on_cancel() override; + void on_attached(api::orderman::OrderDefinition const &new_parent) override; + + api::orderman::OrderDefinition + on_init_from_exe_report(ExecutionReport const &, const PreActivationOrderServices &) override; + + protected: + void warm_up_activate(OrderServicesData &, OrderServices &) override; + + private: + struct PImpl; + std::unique_ptr me; + void on_exe_report(const NewExecutionReportEvent &); + void on_cancel_reject(const CancelRejectEvent &); + void on_gateway_status(const GatewayStatusChangeEvent &); + void report_state(); + OrderOpResult _on_activate(log::Level reject_level, + log::Level transition_level, Price p, Quantity q, + bts::orderman::OrderServices &services); + void init_fix(); + void add_exchange_order_id_to_fix(); + + void transition(log::Level, + api::orderman::OrderStatus new_state, + std::string const &msg); + void transition(api::orderman::OrderStatus new_state, + std::string const &msg); + void transition(api::orderman::OrderStatus new_state); + void transition_to_error(api::orderman::NativeOrderState::SubError sub_error, + std::string const &msg); + + void update_working_position(); + bool has_exchange_order_id(); + Quantity position_contribution(); + bool is_old_exe_report(api::orderman::NativeOrderState &, + const NewExecutionReportEvent &) const; + bool terminal_state(api::orderman::OrderStatus status) const; + api::orderman::NativeOrderState & + get_native_state(api::orderman::OrderState &); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index 8f6f0fbc0..cbc7f5582 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -2,72 +2,19 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orders/Order.h" -#include "lib/tracing/PerfLog.h" -#include namespace bts { namespace orderman { -struct RoutingRecord; -class NewExecutionReportEvent; -class CancelRejectEvent; -class GatewayStatusChangeEvent; class ExecutionReport; class NativeOrder : public Order { public: - NativeOrder(); - ~NativeOrder() override; - - api::orderman::OrderDefinition const &definition() const; - void on_init_new(api::orderman::OrderDefinition const &, - const PreActivationOrderServices &) override; - void on_init_recovered(api::orderman::OrderRecord const &, - const PreActivationOrderServices &) override; - - OrderOpResult on_activate(Price, Quantity, OrderServices &) override; - OrderOpResult on_update(Price, Quantity) override; - OrderOpResult on_update(api::orderman::Update const &) override; - OrderOpResult on_detach() override; - OrderOpResult on_cancel() override; - void on_attached(api::orderman::OrderDefinition const &new_parent) override; + NativeOrder() = default; + ~NativeOrder() override {}; + virtual api::orderman::OrderDefinition const &definition() const = 0; api::orderman::OrderDefinition - on_init_from_exe_report(ExecutionReport const &, - const PreActivationOrderServices &); - - protected: - void warm_up_activate(OrderServicesData &, OrderServices &) override; - - private: - struct PImpl; - std::unique_ptr me; - void on_exe_report(const NewExecutionReportEvent &); - void on_cancel_reject(const CancelRejectEvent &); - void on_gateway_status(const GatewayStatusChangeEvent &); - void report_state(); - OrderOpResult _on_activate(log::Level reject_level, - log::Level transition_level, Price p, Quantity q, - bts::orderman::OrderServices &services); - void init_fix(); - void add_exchange_order_id_to_fix(); - - void transition(log::Level, - api::orderman::OrderStatus new_state, - std::string const &msg); - void transition(api::orderman::OrderStatus new_state, - std::string const &msg); - void transition(api::orderman::OrderStatus new_state); - void transition_to_error(api::orderman::NativeOrderState::SubError sub_error, - std::string const &msg); - - void update_working_position(); - bool has_exchange_order_id(); - Quantity position_contribution(); - bool is_old_exe_report(api::orderman::NativeOrderState &, - const NewExecutionReportEvent &) const; - bool terminal_state(api::orderman::OrderStatus status) const; - api::orderman::NativeOrderState & - get_native_state(api::orderman::OrderState &); + virtual on_init_from_exe_report(ExecutionReport const &, const PreActivationOrderServices &) = 0; }; } // namespace orderman From a22b7b718983c32ebf0c991b579942435b9a992c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 29 Mar 2019 16:52:50 -0400 Subject: [PATCH 005/225] more ice --- .../api/service_helpers/AdminServiceUtils.cpp | 11 +- src/lib/api/services/AdminService.proto | 156 +++++++++--------- src/lib/config/defaults/jetfix.conf | 2 +- src/lib/config/protos/jetfix.proto | 2 +- src/lib/jetfix/codec/FieldDefinitions.h | 7 +- src/lib/jetfix/codec/MessageDefinitions.h | 12 ++ src/lib/jetfix/codec/MessageTypes.h | 7 +- src/lib/jetfix/gateway/Session.cpp | 20 ++- .../orderman/actors/ICEExecutionGateway.cpp | 126 ++++++++++---- src/lib/orderman/actors/ICEExecutionGateway.h | 5 +- src/lib/orderman/orders/ICENativeOrder.cpp | 16 +- src/web/ui/src/Access.fs | 23 +-- src/web/ui/src/Accounts/State.fs | 5 - src/web/ui/src/Users/State.fs | 21 +-- 14 files changed, 237 insertions(+), 176 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 542bca222..932ab3c1e 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -454,12 +454,6 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt out_result.set_error_text("Operator ID is not set"); return rv; } - if (ice_user_data->location().length() == 0) - { - out_result.set_is_success(false); - out_result.set_error_text("Location is not set"); - return rv; - } if (ice_account_data->clearing_account().length() == 0) { out_result.set_is_success(false); @@ -474,12 +468,10 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt } rv.set_session(conn_ptr->name()); rv.set_operator_id(ice_user_data->operator_id()); - rv.set_location(ice_user_data->location()); rv.set_account(ice_account_data->clearing_account()); rv.set_cti_code(ice_account_data->cti()); rv.set_customer_or_firm(ice_account_data->origin()); - rv.set_order_server_id(ice_user_data->order_server_id()); - rv.set_trader_id(ice_user_data->authorized_trader()); + rv.set_trader_id(ice_user_data->user_name()); return rv; } case bts::api::Venue::VENUE_GLBX: { @@ -1424,7 +1416,6 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ auto user_3 = create_user(data, def_group->id(), std::string("bts_3"), std::string("bts_3"), empty, empty, false, license_data, license_entitlements, user_result); user_3->set_is_active(true); //associate users bts::api::admin::UserAccountPermissionUnit permission_unit; - permission_unit.mutable_trading_permission()->set_submit_market_orders(true); permission_unit.mutable_trading_permission()->set_has_permissions(true); permission_unit.mutable_admin_permission()->set_has_permissions(true); bts::api::admin::UserAccountPermissions account_permissions; diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f901a8138..b5848a539 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -33,7 +33,7 @@ message AdminData{ repeated BTSUserGroup user_groups = 10; repeated BTSUser users = 20; repeated BTSAccount accounts = 30; - repeated ExchangeConnection connections = 40; + repeated ExchangeConnection connections = 40; } /************************************************************************/ @@ -58,8 +58,9 @@ message BTSUser{ string company = 44; bool is_active = 50; bool can_create = 55; - LicenseData license_data = 60; //unused - LicenseEntitlements license_entitlements = 70; //unused + LicenseData license_data = 60; + LicenseEntitlements license_entitlements = 70; + BTSUserDerivableData user_data = 80; } @@ -76,8 +77,7 @@ message BTSUserDerivableData{ // b. else its overridden at the user level UserAccountPermissions account_permissions = 70; ExchangeUserData exchange_user_data = 80; - //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; - reserved 90; reserved "exchange_md_entitlement_data"; + reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; } message LicenseData{ @@ -92,17 +92,18 @@ message LicenseEntitlements{ bool spreader = 30; } -message AlgoTradingPermissionsUnit{ - bool submit_iceberg_orders = 10; //unused - bool submit_time_box_orders = 20; //unused - bool submit_spreader_orders = 30; //unused -} +// message AlgoTradingPermissionsUnit{ +// bool submit_iceberg_orders = 10; //unused +// bool submit_time_box_orders = 20; //unused +// bool submit_spreader_orders = 30; //unused +// } message TradingPermissionUnit{ + reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused + reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused + reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused + bool has_permissions = 5; - bool submit_market_orders = 10; //unused - bool submit_gtc_orders = 20; //unused - AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused } message AdminPermissionUnit{ @@ -123,12 +124,12 @@ message UserAccountPermissions{ map account_permissions = 10; } -// unused now -message UserSecurityTradingLimit{ - SecurityScope security = 10; - uint32 clip_size = 20; - bool can_trade = 30; -} +// // unused now +// message UserSecurityTradingLimit{ +// SecurityScope security = 10; +// uint32 clip_size = 20; +// bool can_trade = 30; +// } /************************************************************************/ /********************************BTS Account*****************************/ @@ -264,19 +265,19 @@ message CMEMSGWConnection{ uint32 market_segment_id = 60; } -message CMEAccountData{ - // should perhaps be an enum +message CMEAccountData { + reserved 30; reserved "takeup_member_code"; //string takeup_member_code = 30; + reserved 50; reserved "direct_electronic_access"; //string direct_electronic_access = 50; + reserved 60; reserved "trading_capacity"; //string trading_capacity = 60; + reserved 70; reserved "liquidity_provision"; //string liquidity_provision = 70; + reserved 80; reserved "commodity_derivative_indicator"; //string commodity_derivative_indicator = 80; + reserved 90; reserved "investment_decision_id"; //string investment_decision_id = 90; + reserved 100; reserved "execution_decision_id"; //string execution_decision_id = 100; + reserved 110; reserved "client_id"; //string client_id = 110; + api.orderman.CTICode cti = 10; - api.orderman.CustomerOrFirm origin = 20; - string takeup_member_code = 30; + api.orderman.CustomerOrFirm origin = 20; string clearing_account = 40; - string direct_electronic_access = 50; - string trading_capacity = 60; - string liquidity_provision = 70; - string commodity_derivative_indicator = 80; - string investment_decision_id = 90; - string execution_decision_id = 100; - string client_id = 110; map misc_tags = 120; } @@ -299,22 +300,22 @@ enum DisplayDesignation } message CMEUserData{ - string operator_id = 10; - string ats_operator_id = 20; + reserved 20; reserved "ats_operator_id"; //string ats_operator_id = 20; + reserved 40; reserved "text_a"; //string text_a = 40; + reserved 50; reserved "text_b"; //string text_b = 50; + reserved 80; reserved "max_order_rate_per_connection"; //string max_order_rate_per_connection = 80; + //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120; + repeated CMEMicData md_permissions = 1000; + + string operator_id = 10; string smp_id = 30; - string text_a = 40; - string text_b = 50; map misc_tags = 60; string smp_instruction = 70; - string max_order_rate_per_connection = 80; + string location = 90; ProfessionalDesignation pro_nonpro = 100; - DisplayDesignation display_nondisplay = 110; - - //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } - //AdminDisplay admin_display_flag = 120; - reserved 120; reserved "admin_display_flag"; - repeated CMEMicData md_permissions = 1000; + DisplayDesignation display_nondisplay = 110; } message SIMUserData { @@ -325,49 +326,52 @@ message SIMUserData { /********************************ICE Data*********************************/ message ICEConnection{ - string authorized_member_id = 10; - string sender_company_id = 20; - string sender_sub_id = 30; - string session_id = 40; - string session_password = 50; - string host_ip = 60; - string port = 70; - string default_routing_trader = 80; - string routing_trader_password = 90; - int32 max_order_rate = 100; + // string authorized_member_id = 10; + // string sender_company_id = 20; + // string sender_sub_id = 30; + // string session_id = 40; + // string session_password = 50; + // string host_ip = 60; + // string port = 70; + // string default_routing_trader = 80; + // string routing_trader_password = 90; + // int32 max_order_rate = 100; } -message ICEAccountData{ +message ICEAccountData { + reserved 10; reserved "nybit_house"; //string nybit_house = 10; + reserved 20; reserved "wce_house"; //int32 wce_house = 20; + reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30; + reserved 40; reserved "direct_electronic_access"; //bool direct_electronic_access = 40; + reserved 50; reserved "trading_capacity"; //string trading_capacity = 50; + reserved 60; reserved "liquidity_provision"; //bool liquidity_provision = 60; + reserved 70; reserved "commodity_derivative_indicator"; //bool commodity_derivative_indicator = 70; + reserved 80; reserved "investment_decision_id"; //string investment_decision_id = 80; + reserved 90; reserved "execution_decision_id"; //string execution_decision_id = 90; + reserved 100; reserved "client_id"; //string client_id = 100; + reserved 110; reserved "mfid_id"; //string mfid_id = 110; + api.orderman.CTICode cti = 3; api.orderman.CustomerOrFirm origin = 5; - - string nybit_house = 10; - int32 wce_house = 20; - //string clearing_account_override = 30; - reserved 30; reserved "clearing_account_override"; - string clearing_account = 35; - bool direct_electronic_access = 40; - string trading_capacity = 50; - bool liquidity_provision = 60; - bool commodity_derivative_indicator = 70; - string investment_decision_id = 80; - string execution_decision_id = 90; - string client_id = 100; - string mfid_id = 110; - - map misc_tags = 120; + string clearing_firm = 200; + string clearing_account = 210; + string customer_account_ref_id = 220; + string account_code = 230; + map misc_tags = 500; } -message ICEUserData{ - string order_server_id = 3; //tag 553 initial logon - string operator_id = 5; //tag 50 - string authorized_trader = 10; //tag 553 trader logon - string memo_field = 20; - string text_b = 30; - uint32 max_order_rate = 40; +message ICEUserData { + reserved 10; reserved "authorized_trader"; //string authorized_trader = 10; + reserved 20; reserved "memo_field"; //string memo_field = 20; + reserved 30; reserved "text_b"; //string text_b = 30; + reserved 40; reserved "max_order_rate"; //uint32 max_order_rate = 40; + + int32 company_id = 3; //tag 553 user_name in order server contexts + string operator_id = 5; //tag 50 + string user_name = 11; //tag 553 user_name + string password = 21; //tag 96 raw data map misc_tags = 60; - string location = 90; ProfessionalDesignation pro_nonpro = 100; DisplayDesignation display_nondisplay = 110; diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index aeb3e06f5..5c5143c99 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -53,7 +53,7 @@ JetFIX { start_time: "00:30:00" end_time: "23:30:00" sender_subid: "BTS" - user_id: "bluetrd-os" + user_name: "bluetrd-os" raw_data: "Starts123" auto_fix_seq_num: true } diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index a4f431c94..1f13597f7 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -49,7 +49,7 @@ message JetFIX { optional string target_subid = 130 [default = ""]; optional string sender_locationid = 135 [default = "US,NC"]; optional string raw_data = 136 [default =""]; - optional string user_id = 138 [default =""]; + optional string user_name = 138 [default =""]; optional string self_match_prevention_id = 140 [default=""]; optional string cti_code = 145 [default="1"]; optional int32 customer_or_firm = 147 [default=1]; diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index cbf0d3f9a..6590287aa 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -57,9 +57,11 @@ typedef IntField<98> EncryptMethod; typedef IntField<9> BodyLength; typedef StringField<107> SecurityDesc; typedef StringField<109> ClientID; +typedef IntField<109> CompanyID; //ICE typedef StringField<112> TestReqId; typedef StringField<117> QuoteID; typedef StringField<11> ClOrdID; +typedef IntField<11> Int_ClOrdID; //ICE typedef StringField<132> BidPxStr; typedef StringField<133> OfferPxStr; typedef StringField<134> BidSizeStr; @@ -69,6 +71,9 @@ typedef StringField<143> TargetLocationID; typedef StringField<1603> ApplicationSystemName; typedef StringField<1604> ApplicationSystemVersion; typedef StringField<1605> ApplicationSystemVendor; +typedef StringField<9450> ICEApplicationSystemName; +typedef StringField<9451> ICEApplicationSystemVersion; +typedef StringField<9452> ICEApplicationSystemVendor; typedef StringField<167> SecurityType; typedef StringField<17> ExecID; typedef StringField<19> ExecRefID; @@ -97,7 +102,7 @@ typedef StringField<7928> SelfMatchPreventionID; typedef StringField<8> BeginString; typedef StringField<9324> OrderOptionalData; typedef StringField<96> RawData; -typedef StringField<553> UserID; +typedef StringField<553> UserName; typedef StringField<9717> CorrelationClOrdID; typedef StringField<9771> MMAccount; typedef TimeField<122> OrigSendingTime; diff --git a/src/lib/jetfix/codec/MessageDefinitions.h b/src/lib/jetfix/codec/MessageDefinitions.h index 1117d3c1b..e571bd3cb 100644 --- a/src/lib/jetfix/codec/MessageDefinitions.h +++ b/src/lib/jetfix/codec/MessageDefinitions.h @@ -65,5 +65,17 @@ typedef FIXMsg CancelRejectMsg; +typedef FIXMsg +TraderLogonResponseMsg; + +typedef FIXMsg +TraderLogoutResponseMsg; + }}} diff --git a/src/lib/jetfix/codec/MessageTypes.h b/src/lib/jetfix/codec/MessageTypes.h index 39dfd7b34..d5407d69f 100644 --- a/src/lib/jetfix/codec/MessageTypes.h +++ b/src/lib/jetfix/codec/MessageTypes.h @@ -48,7 +48,12 @@ enum class MessageTypes SettlementInstructions = 'T', TestRequest = '1', TradingSessionStatus = 'h', - TradingSessionStatusRequest = 'g' + TradingSessionStatusRequest = 'g', + TraderLogon = '+', //CG or UCG + TraderLogonResponse = '=', //CI or UCI + TraderLogout = '-', //CH or UCH + TraderLogoutResponse = '_' //CJ or UCJ + }; }} diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 1a0fc4998..04fd3d7c7 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -783,9 +783,19 @@ OutFIXPtr make_logon(uint32_t seq_num, uint32_t last_seq_num_processed, const char *application = "O2"; #endif - buffer.add(application); - buffer.add("1.0"); - buffer.add("BTS"); + if(session_cfg.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || + session_cfg.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) + { + buffer.add(application); + buffer.add("1.0"); + buffer.add("BTS"); + } + else + { + buffer.add(application); + buffer.add("1.0"); + buffer.add("BTS"); + } if (session_cfg.has_trading_session_id()) { buffer.add(1); @@ -819,8 +829,8 @@ OutFIXPtr make_logon(uint32_t seq_num, uint32_t last_seq_num_processed, } else { buffer.add(session_cfg.raw_data().size()); buffer.add(session_cfg.raw_data()); - if(session_cfg.user_id() != "") - buffer.add(session_cfg.user_id()); + if(session_cfg.user_name() != "") + buffer.add(session_cfg.user_name()); } stream.close(); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 9e9f962fd..6af708dbb 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -12,6 +12,8 @@ #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/TimeStamp.h" +#include "lib/utils/helper_macros.h" +#include "lib/utils/Dispatcher.h" #include "lib/utils/bts_chrono.h" #include @@ -21,7 +23,8 @@ namespace orderman { using namespace jetfix; -using JFGw = JetFIXGateway; +using JFGw = JetFIXGateway; struct ICEExecutionGateway::PImpl { @@ -51,6 +54,7 @@ ICEExecutionGateway::ICEExecutionGateway(config::JetFIX::Connection const &cfg, { me->state = State::WAITING_FOR_ADMIN; } + ICEExecutionGateway::~ICEExecutionGateway() {} void ICEExecutionGateway::on_admin_data(const mercury::Update& update) @@ -62,7 +66,7 @@ void ICEExecutionGateway::on_admin_data(const mercury::Update if (me->state == State::WAITING_FOR_ADMIN) { - LOG(OrderMan, Warn, "Received admin data. Waiting for securities"); + LOG(OrderMan, Warn, "Received admin data. Waiting for securities {}", me->gw_name.value()); me->state = State::WAITING_FOR_SECURITIES; } } @@ -81,41 +85,103 @@ void ICEExecutionGateway::on_securities(const mercury::Updatestate == State::WAITING_FOR_SECURITIES) { - LOG(OrderMan, Warn, "Received first set of {} securities. Proceeding with initialization of execution gateway {}", + LOG(OrderMan, Warn, "Received first set of {} securities. Beginning wait 2s for trader logon {}", update.events->size(), me->gw_name.value()); // got our security synopsis, ready to start the GW - me->state = State::READY; - - // subscribe to gateway events - me->gw.on() = [this](auto const &msg) - { - this->on_exe_report(msg); - }; - me->gw.on() = [this](auto const &msg) - { - this->on_cancel_reject(msg); - }; - me->gw.on_ready() = [this]() - { - this->on_connection_status_change(true); - }; - me->gw.on_disconnect() = [this]() - { - this->on_connection_status_change(false); - }; - me->gw.on() = [this](auto const &m) - { - this->on_business_reject(m); - }; - me->gw.on() = [this](auto const &m) - { - this->on_session_reject(m); - }; + me->state = State::WAITING_FOR_LOGONTIMEOUT; + bts::utils::Dispatcher::background().post([this]() + { + this->on_trader_logon_timeout_expired(); + }, 2000); } } } +void ICEExecutionGateway::on_trader_logon_timeout_expired() +{ + if (me->state == State::WAITING_FOR_LOGONTIMEOUT) + { + LOG(OrderMan, Warn, "Done waiting for logon timeout, logging on traders {}", me->gw_name.value()); + + // got our security synopsis, ready to start the GW + me->state = State::CONNECTED_PENDING_TRADER_LOGON; + int nusers = -1; + for(const auto& u : me->admin_data.users()) + { + if(u.has_user_data() && u.user_data().has_exchange_user_data() && u.user_data().exchange_user_data().has_ice_data()) + { + if(nusers == -1) + nusers = 0; + nusers++; + const auto& ice = u.user_data().exchange_user_data().ice_data(); + auto result = std::make_shared(me->cfg); + auto &stream = result->fix.back(); + auto &buffer = stream.new_msg(MessageTypes::TraderLogon); + + buffer.add(ice.company_id()); + buffer.add(ice.user_name()); + buffer.add(ice.password()); + //TODO MIFID Defaults + } + } + LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", nusers, me->gw_name.value()); + + me->gw.on() = [&](const fix::TraderLogonResponseMsg&) + { + if(--nusers == 0) + this->on_logon(); + }; + + me->gw.on() = [&](const fix::TraderLogoutResponseMsg& lmsg) + { + std::string u = lmsg.get(); + std::string m; + if(lmsg.has()) + m = lmsg.get(); + + LOG(OrderMan, Error, "Error logging trader {} into ICE {} {}", u, m, me->gw_name.value()); + if(--nusers == 0) + this->on_logon(); + }; + } +} + +void ICEExecutionGateway::on_logon() +{ + if (me->state == State::CONNECTED_PENDING_TRADER_LOGON) + { + LOG(OrderMan, Warn, "Successful logon traders {}", me->gw_name.value()); + + me->state = State::READY; + // subscribe to gateway events + me->gw.on() = [this](auto const &msg) + { + this->on_exe_report(msg); + }; + me->gw.on() = [this](auto const &msg) + { + this->on_cancel_reject(msg); + }; + me->gw.on_ready() = [this]() + { + this->on_connection_status_change(true); + }; + me->gw.on_disconnect() = [this]() + { + this->on_connection_status_change(false); + }; + me->gw.on() = [this](auto const &m) + { + this->on_business_reject(m); + }; + me->gw.on() = [this](auto const &m) + { + this->on_session_reject(m); + }; + } +} + void ICEExecutionGateway::start() { me->gw.start(); } OnExeReport &ICEExecutionGateway::on_exe_report() { return me->on_exe_report; } diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index 718518476..3fcf43c87 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -23,9 +23,12 @@ class ICEExecutionGateway : public IExecutionGateway { private: BTS_NO_COPY(ICEExecutionGateway); - enum class State { WAITING_FOR_ADMIN, WAITING_FOR_SECURITIES, CONNECTED_PENDING_TRADER_LOGON, READY }; + enum class State { WAITING_FOR_ADMIN, WAITING_FOR_SECURITIES, WAITING_FOR_LOGONTIMEOUT, CONNECTED_PENDING_TRADER_LOGON, READY }; struct PImpl; std::unique_ptr me; + + void on_trader_logon_timeout_expired(); + void on_logon(); // fix gateway events void on_exe_report(jetfix::fix::ExecutionReportMsg const &); diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 592783068..fe84015e9 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -959,11 +959,15 @@ void ICENativeOrder::update_working_position() me->previous_position_contribution = current_position; if (current_position.value() > previous_position.value()) + { me->services->limiter().add( *me->sec, AccountID(me->definition.account_id()), me->definition.side(), Quantity(current_position.value() - previous_position.value())); + } else if (previous_position.value() > current_position.value()) + { me->services->limiter().remove( *me->sec, AccountID(me->definition.account_id()), me->definition.side(), Quantity(previous_position.value() - current_position.value())); + } } else LOG(OrderMan, Error, @@ -1087,10 +1091,8 @@ void ICENativeOrder::init_fix() auto stop_px = def.custom_def().stop().stop_price(); auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); - create_encoding.add(encoded_stop_px, - me->price_encoding_precision, -1); - update_encoding.add(encoded_stop_px, - me->price_encoding_precision, -1); + create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); + update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); break; } @@ -1111,10 +1113,8 @@ void ICENativeOrder::init_fix() me->price_encoding_precision, -1); // price - me->create_price_bm = create_encoding.add( - 0, me->price_encoding_precision, price_sz()); - me->update_price_bm = update_encoding.add( - 0, me->price_encoding_precision, price_sz()); + me->create_price_bm = create_encoding.add(0, me->price_encoding_precision, price_sz()); + me->update_price_bm = update_encoding.add(0, me->price_encoding_precision, price_sz()); break; } default: diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 5ea0a7b1c..a54bb0c46 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -74,32 +74,17 @@ module Accounts = { cmeAccountData = { cti = CTICode.CtiCodeUndefined origin = CustomerOrFirm.CustomerOrFirmCustomer - takeupMemberCode = "" clearingAccount = "" - directElectronicAccess = "" - tradingCapacity = "" - liquidityProvision = "" - commodityDerivativeIndicator = "" - investmentDecisionId = "" - executionDecisionId = "" - clientId = "" miscTags = JSMap.empty } iceAccountData = { cti = CTICode.CtiCodeUndefined origin = CustomerOrFirm.CustomerOrFirmCustomer - nybitHouse="" - wceHouse=0 - clearingAccount="" - directElectronicAccess=false - tradingCapacity="" - liquidityProvision=false - commodityDerivativeIndicator=false - investmentDecisionId="" - executionDecisionId="" - clientId="" - mfidId="" + clearingAccount = "" + clearingFirm = "" + customerAccountRefId = "" + accountCode = "" miscTags = JSMap.empty } simAccountData = diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index fcbaac147..41717007e 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -60,12 +60,7 @@ let applyUpdate (account:BTSAccount) = function let applyCMEUpdate (data:CMEAccountData) = function | CMEExchangeField.CTI v -> { data with cti = v } | CMEExchangeField.Origin v -> { data with origin = v } - | CMEExchangeField.TakeupMember v -> { data with takeupMemberCode = v } | CMEExchangeField.ClearingAccount v -> { data with clearingAccount = v } - | CMEExchangeField.DirectElectronicAccess v -> { data with directElectronicAccess = v } - | CMEExchangeField.TradingCapacity v -> { data with tradingCapacity = v } - | CMEExchangeField.LiquidityProvision v -> { data with liquidityProvision = v } - | CMEExchangeField.CommodityDerivativeIndicator v -> { data with commodityDerivativeIndicator = v } | CMEExchangeField.MiscTagMapping mp -> { data with miscTags = mp } let applySIMUpdate (data:SIMAccountData) = function diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 4a3249d40..faa7092c6 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -56,13 +56,9 @@ let defaultScratchUser = { adminDisplayFlag = bts.api.admin.ExchangeUserData.AdminDisplay.None cmeData = { operatorId = "" - atsOperatorId = "" smpId = "" - textA = "" - textB = "" miscTags = JSMap.empty smpInstruction = "" - maxOrderRatePerConnection = "" location = "" proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY @@ -73,14 +69,11 @@ let defaultScratchUser = { location = "" } iceData = { - orderServerId = "" + companyId = 0 operatorId = "" - authorizedTrader = "" - memoField = "" - textB = "" - maxOrderRate = 0ul + userName = "" + password = "" miscTags = JSMap.empty - location = "" proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY mdPermissions = [||] @@ -184,12 +177,6 @@ let updateICEExchangeUserData (user:BTSUser) dta = { user with userData = { user let default_user_account = { tradingPermission = { hasPermissions = false - submitMarketOrders = false - submitGtcOrders = false - algoTradingPermission = - { submitIcebergOrders = false - submitTimeBoxOrders = false - submitSpreaderOrders = false } } adminPermission = { hasPermissions = false @@ -206,7 +193,6 @@ let applyUpdate (field:UserField) (user:BTSUser) = | IsActive ia -> { user with isActive = ia } | CanCreate cr -> { user with canCreate = cr } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } - | CMEATSOperatorID atsoid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with atsOperatorId = atsoid } | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } @@ -214,7 +200,6 @@ let applyUpdate (field:UserField) (user:BTSUser) = | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc } | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with location = loc } | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpInstruction = smpi } - | MaxOrderRatePerConnection morpc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with maxOrderRatePerConnection = morpc } | MiscTags map -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with miscTags = map } | CMEMic mic -> let micArr = From 556132c2ddc9c6cd5b6158cc25d4a92349e2b17c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 1 Apr 2019 18:11:48 -0400 Subject: [PATCH 006/225] ice exec moving along --- src/lib/domain_model/Security.cpp | 3 +- src/lib/domain_model/Security.h | 20 ++++ src/lib/jetfix/codec/FieldDefinitions.h | 6 + src/lib/jetfix/codec/MessageDefinitions.h | 40 +++++++ .../orderman/actors/ICEExecutionGateway.cpp | 105 ++++++++---------- src/lib/orderman/actors/ICEExecutionGateway.h | 12 +- src/lib/orderman/actors/IExecutionGateway.h | 3 +- .../orderman/orderman_utils/fix_order_codec.h | 28 +++++ 8 files changed, 151 insertions(+), 66 deletions(-) diff --git a/src/lib/domain_model/Security.cpp b/src/lib/domain_model/Security.cpp index 6f51a5d9d..c1016b28f 100644 --- a/src/lib/domain_model/Security.cpp +++ b/src/lib/domain_model/Security.cpp @@ -27,7 +27,8 @@ std::string descriptor(api::Security const&sec) else if (sec.has_ice()) return sec.ice().security_desc(); else - return "No descriptor for non glbx exchange"; + return "No descriptor for non glbx / ice exchange"; } + }} diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 9116ea4bc..0daf8c270 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -137,4 +137,24 @@ inline bool test_price_equality (double price_1, double price_2, double tick_siz inline bool gr_than_eq(double p1, double p2, double tick_size){ return test_price_equality(p1,p2,tick_size) || p1>=p2; } + +template +T exchange_id(const api::Security &sec) +{ + if (sec.has_glbx()) + return sec.glbx().exchange_id(); + else if (sec.has_ice()) + return sec.ice().exchange_id(); + else if (sec.has_cfe()) + return sec.cfe().exchange_id(); + else if (sec.has_cboe()) + return sec.cboe().exchange_id(); + else + { + bts_assert_msg(false, "No exchange_id for unfamiliar exchange"); + return T(); + } +} + + }} diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index 6590287aa..8c585909f 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -86,13 +86,16 @@ typedef StringField<307> UnderlyingSecurityDesc; typedef StringField<336> TradingSessionID; typedef StringField<35> MsgType; typedef StringField<37> OrderID; +typedef IntField<37> Int_OrderID; //ICE typedef StringField<41> OrigClOrdID; +typedef IntField<41> Int_OrigClOrdID; //ICE typedef StringField<440> ClearingAccount; typedef StringField<48> SecurityID; typedef StringField<49> SenderCompID; typedef StringField<50> SenderSubID ; typedef StringField<527> SecondaryExecID; typedef StringField<55> Symbol; +typedef IntField<55> Int_Symbol; //ICE typedef StringField<56> TargetCompId; typedef StringField<57> TargetSubID; typedef StringField<58> Text; @@ -109,6 +112,9 @@ typedef TimeField<122> OrigSendingTime; typedef TimeField<52> SendingTime; typedef TimeField<5979> RequestTime; typedef TimeField<60> TransactTime; +typedef StringField<9121> Memo; +typedef IntField<103> OrdRejReason; +typedef IntField<285> DeleteReason; typedef Group TraderLogoutResponseMsg; +typedef FIXMsg +ICEExecutionReportMsg; + +typedef FIXMsg +ICECancelRejectMsg; + }}} diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 6af708dbb..eb82cd77d 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -1,5 +1,6 @@ #include "ICEExecutionGateway.h" #include "lib/jetfix/codec/MessageDefinitions.h" +#include "lib/jetfix/codec/i32_toa.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/gateway/JetFIXGateway.h" #include "lib/logging/logging.h" @@ -16,6 +17,7 @@ #include "lib/utils/Dispatcher.h" #include "lib/utils/bts_chrono.h" + #include namespace bts { @@ -23,14 +25,16 @@ namespace orderman { using namespace jetfix; -using JFGw = JetFIXGateway; +using JFGw = JetFIXGateway; + + struct ICEExecutionGateway::PImpl { - PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) + PImpl(const config::JetFIX::Connection &cfg, trace::PerfLog &l) : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), - securities(), securities_by_descriptor(), gw_name(cfg.name()), + securities(), securities_by_exchange_id(), gw_name(cfg.name()), cfg(cfg), perf_log(l), admin_data() {} @@ -38,8 +42,7 @@ struct ICEExecutionGateway::PImpl boost::object_pool exe_report_pool; State state; std::unordered_map securities; - std::unordered_map - securities_by_descriptor; + std::unordered_map securities_by_exchange_id; GatewayName gw_name; config::JetFIX::Connection cfg; OnExeReport on_exe_report; @@ -49,7 +52,7 @@ struct ICEExecutionGateway::PImpl api::admin::AdminData admin_data; }; -ICEExecutionGateway::ICEExecutionGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) +ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log) : IExecutionGateway(), me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_ADMIN; @@ -80,7 +83,7 @@ void ICEExecutionGateway::on_securities(const mercury::Updatesecurities[sec_ptr->id()] = sec_ptr; - me->securities_by_descriptor[securities::descriptor(*sec_ptr)] = sec_ptr; + me->securities_by_exchange_id[securities::exchange_id(*sec_ptr)] = sec_ptr; } if (me->state == State::WAITING_FOR_SECURITIES) @@ -155,11 +158,11 @@ void ICEExecutionGateway::on_logon() me->state = State::READY; // subscribe to gateway events - me->gw.on() = [this](auto const &msg) + me->gw.on() = [this](auto const &msg) { this->on_exe_report(msg); }; - me->gw.on() = [this](auto const &msg) + me->gw.on() = [this](auto const &msg) { this->on_cancel_reject(msg); }; @@ -196,39 +199,29 @@ OnCancelReject &ICEExecutionGateway::on_cancel_reject() return me->on_cancel_reject; } -void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &msg) +void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg &msg) { - OrderKey ok; + OrderKey ok(msg.get()); SecurityKey sk; - decode_clorid(msg.get(), &ok, &sk); + decode_memo(msg.get(), &sk); auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); - LOG(Latency, Info, "Started handling of execution report for order {}", - ok.value()); + LOG(Latency, Info, "Started handling of execution report for order {}", ok.value()); auto sec = me->securities[sk.value()]; if (!sec) LOG(OrderMan, Error, "Received execution report for an unknown security {}. Will not be " " able to process this report. This is likely a bug that could lead " - "to" - " lost fills. Please investigate.", + "to lost fills. Please investigate.", sk.value()); else { - // Ignore trade correction messages. CME does not included the full - // id of the trade being corrected and we have no way of - // resolving it here. We could still parse the correction and - // push the resolution problem downstream but that would make - // downstream code CME specific and generate a fair amout of - // complexity for a rare and moderately benign event (the only - // thing that can be corrected is the fill price). We might come - // back to this when the system is more mature. + // Ignore trade correction messages. if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) { - auto new_price = securities::decode_exchange_price( - *sec, Price(msg.get())); + auto new_price = securities::decode_exchange_price(*sec, Price(msg.get())); auto ref_exec_id = msg.get(); LOG(OrderMan, Error, "Received unsupported trade correction msg. " @@ -244,8 +237,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m { LOG(OrderMan, Error, "Received unsupported trade cancel msg. " - "This correction will not be forwarded. The trader should be " - "alerted. " + "This correction will not be forwarded. The trader should be alerted. " "Order: {} SecKey: {} ", ok.value(), sk.value()); return; @@ -254,18 +246,16 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m api::Security const *leg_security = nullptr; if (msg.has() && msg.get() == 2) { - auto it = me->securities_by_descriptor.find(msg.get()); - if (it == me->securities_by_descriptor.end()) + auto it = me->securities_by_exchange_id.find(msg.get()); + if (it == me->securities_by_exchange_id.end()) { LOG(OrderMan, Error, "Received execution report for an unknown spread leg" - "security {}. Will not be " - " able to process this report. This is likely a " - "bug that could lead to" - " lost leg fills. Please investigate. Spread sec_key: {} leg " - "exchange " - "desc: {}", - sk.value(), msg.get()); + "security {}. Will not be able to process this report. " + "This is likely a bug that could lead to " + "lost leg fills. Please investigate. Spread sec_key: {} leg " + "exchange id: {}", + sk.value(), msg.get()); return; } leg_security = it->second; @@ -274,6 +264,10 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m std::string text_msg; if (msg.has()) text_msg = msg.get(); + if (msg.has()) + text_msg += " OrdRejReason: " + msg.get(); + if (msg.has()) + text_msg += " DeleteReason: " + msg.get(); // allocate from our pool auto data = me->exe_report_pool.construct(); @@ -282,8 +276,8 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m data->msg_seq_num = msg.get(); // copy data from fix msg to our structure - if (msg.has()) - str_to(msg.get(), &data->account_name); + if (msg.has()) + str_to(msg.get(), &data->account_name); if (msg.has()) str_to(msg.get(), &data->operator_id); @@ -298,12 +292,11 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m data->order_type = api::orderman::NativeOrderType(msg.get()); data->order_status = api::orderman::NativeOrderStatus(msg.get()); - data->manual_order_indicator = - msg.get() - ? api::orderman::MANUAL_ORDER_INDICATOR_YES - : api::orderman::MANUAL_ORDER_INDICATOR_YES; - str_to(msg.get(), &data->exchange_order_id); - + data->manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; + + std::string oid_string = get_ice_order_id_string(msg); + str_to(oid_string, &data->exchange_order_id); + if (msg.has()) data->price = securities::decode_exchange_price(*sec, Price(msg.get())); else @@ -340,11 +333,9 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ExecutionReportMsg &m } } -void ICEExecutionGateway::on_cancel_reject(const jetfix::fix::CancelRejectMsg &msg) +void ICEExecutionGateway::on_cancel_reject(const jetfix::fix::ICECancelRejectMsg &msg) { - OrderKey ok; - SecurityKey sk; - decode_clorid(msg.get(), &ok, &sk); + OrderKey ok(msg.get()); std::string reject_msg; if (msg.has()) @@ -364,20 +355,18 @@ void ICEExecutionGateway::on_connection_status_change(bool is_connected) me->on_gw_status_change(is_connected); } -void ICEExecutionGateway::on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &m) +void ICEExecutionGateway::on_business_reject(const jetfix::fix::BusinessMessageRejectMsg& m) { LOG(OrderMan, Error, - "Unexpected business reject in {} gateway . Reason: " - "{}. This should be investigated", + "Unexpected business reject in {} gateway . Reason: {}. This should be investigated", me->gw_name.value(), m.has() ? m.get() : std::string("Unknown")); } -void ICEExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) +void ICEExecutionGateway::on_session_reject(const jetfix::fix::RejectMsg& m) { LOG(OrderMan, Error, - "Unexpected reject message in {} gateway . Reason: {}. " - "This should be investigated", + "Unexpected reject message in {} gateway . Reason: {}. This should be investigated", me->gw_name.value(), m.has() ? m.get() : std::string("Unknown")); } @@ -387,9 +376,9 @@ void ICEExecutionGateway::dispatch_incoming_fix_messages() me->gw.dispatch_events(); } -void ICEExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) +void ICEExecutionGateway::send_fix(const jetfix::OutFIXPtr& fix, trace::CorID trace) { - auto scoped_log = trace::log_scope(me->perf_log,trace,"ExecutionGateway::send_fix"); + auto scoped_log = trace::log_scope(me->perf_log,trace,"ICEExecutionGateway::send_fix"); me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index 3fcf43c87..2ad916ed7 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -8,14 +8,14 @@ namespace orderman { // fix execution gateway for a single FIX session class ICEExecutionGateway : public IExecutionGateway { public: - ICEExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); + ICEExecutionGateway(const config::JetFIX::Connection&, trace::PerfLog &); virtual ~ICEExecutionGateway(); void start() override; void dispatch_incoming_fix_messages() override; void on_securities(const mercury::Update &) override; void on_admin_data(const mercury::Update &) override; - void send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) override; + void send_fix(const jetfix::OutFIXPtr& fix, trace::CorID trace) override; OnExeReport& on_exe_report() override; OnGwStatusChange& on_gw_status_change() override; @@ -31,11 +31,11 @@ class ICEExecutionGateway : public IExecutionGateway { void on_logon(); // fix gateway events - void on_exe_report(jetfix::fix::ExecutionReportMsg const &); - void on_cancel_reject(jetfix::fix::CancelRejectMsg const &); + void on_exe_report(const jetfix::fix::ICEExecutionReportMsg&); + void on_cancel_reject(const jetfix::fix::ICECancelRejectMsg&); void on_connection_status_change(bool connected); - void on_business_reject(jetfix::fix::BusinessMessageRejectMsg const &); - void on_session_reject(jetfix::fix::RejectMsg const &); + void on_business_reject(const jetfix::fix::BusinessMessageRejectMsg&); + void on_session_reject(const jetfix::fix::RejectMsg&); }; } // namespace orderman diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/actors/IExecutionGateway.h index 9ca0b8c7e..4d486b964 100644 --- a/src/lib/orderman/actors/IExecutionGateway.h +++ b/src/lib/orderman/actors/IExecutionGateway.h @@ -16,8 +16,9 @@ class NewSecuritiesEvent; class NewAdminDataEvent; class ExecutionReport; -using OnExeReport = std::function; + using OnGwStatusChange = std::function; +using OnExeReport = std::function; using OnCancelReject = std::function; // fix execution gateway for a single FIX session diff --git a/src/lib/orderman/orderman_utils/fix_order_codec.h b/src/lib/orderman/orderman_utils/fix_order_codec.h index 9c14d5687..004a2c911 100644 --- a/src/lib/orderman/orderman_utils/fix_order_codec.h +++ b/src/lib/orderman/orderman_utils/fix_order_codec.h @@ -16,6 +16,8 @@ namespace orderman { constexpr int clordid_sz() {return 20;} constexpr int price_sz() {return 17;} constexpr int quantity_sz() {return 6;} +constexpr int memo_sz() {return 12;} +constexpr int ice_orderid_sz() {return 12;} inline void encode_clorid(OrderKey ok, SecurityKey sk,std::string *out) { u32_toa(sk.value(),&((*out)[0]),clordid_sz()/2); @@ -46,4 +48,30 @@ OrderKey get_order_key(MSG const &msg) return result; } +inline void encode_memo(SecurityKey sk, std::string *out) +{ + u32_toa(sk.value(),&((*out)[0]),memo_sz()); +} + +inline void decode_memo(const std::string& in, SecurityKey* sk) +{ + bts_assert(in.size() == memo_sz()); + char buffer[memo_sz()+1]; + buffer[memo_sz()] = 0; + + std::memcpy(buffer,&in[0],memo_sz()); + *sk = SecurityKey(std::atoi(buffer)); +} + +template +std::string get_ice_order_id_string(const MSG& msg) +{ + bts_assert(msg.template has()); + std::string oid_string(ice_orderid_sz(), ' '); + + int id = msg.template get(); + u32_toa((uint32_t)id, &(oid_string[0]), ice_orderid_sz() ); + return oid_string; +} + }} From 96265ea187c8b54a5a545ed7fb95e8911ac532f1 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 17:34:54 -0400 Subject: [PATCH 007/225] Merge branch 'SPARK-1944-attach/detach/update' of bitbucket.org:bluetradesys/spark into ice_exec3 --- .../Trading/OrderBook/OrderBookWindow.cs | 6 +- src/lib/config/defaults/Symbols.conf | 97 +++++++++++++------ src/lib/md/ice/ICEUtils.cpp | 4 +- .../orders/book_algos/BookOrderBase.cpp | 71 ++++++++++++-- .../orders/book_algos/BookOrderBase.h | 5 + .../orderman/orders/book_algos/JoinOrder2.cpp | 87 ++++++++--------- .../orderman/orders/book_algos/JoinOrder2.h | 1 + .../orderman/orders/book_algos/LeanOrder2.cpp | 26 ++--- .../orderman/orders/book_algos/LeanOrder2.h | 11 +-- .../orderman/orders/book_algos/TopOrder2.cpp | 2 + src/server/sparkd/md/platforms/IMDPlatform.h | 3 +- .../md/platforms/ice_onixs/ICEListener.cpp | 36 ++----- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 1 - 13 files changed, 210 insertions(+), 140 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 761e9e6d7..a4819f624 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -81,7 +81,7 @@ namespace mbts.spark { wbids => wbids.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working buy orders?", + "Are you sure you want to cancel all BUY orders?", "Cancel Buy Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); @@ -94,7 +94,7 @@ namespace mbts.spark { wasks => wasks.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working sell orders?", + "Are you sure you want to cancel all SELL orders?", "Cancel Sell Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); @@ -107,7 +107,7 @@ namespace mbts.spark { worders => worders.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working orders?", + "Are you sure you want to cancel ALL orders?", "Cancel All Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 147e5c917..8494cc578 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -1,11 +1,71 @@ -SymbolLists -{ - value + +SymbolList { + value { + # This key is here for backwards compatability ONLY. + # If you need to update symbols you should update SymbolLists (plural) + symbol: "6B" + symbol: "6E" + symbol: "6J" + symbol: "6P" + symbol: "ARE" + symbol: "BK" + symbol: "BOB" + symbol: "BUB" + symbol: "BZ" + symbol: "CL" + symbol: "EH" + symbol: "ES" + symbol: "FYT" + symbol: "FOB" + symbol: "GC" + symbol: "GE" + symbol: "GLI" + symbol: "HE" + symbol: "HG" + symbol: "HO" + symbol: "KE" + symbol: "LE" + symbol: "NB" + symbol: "NBY" + symbol: "NOB" + symbol: "NON" + symbol: "NG" + symbol: "NQ" + symbol: "NUB" + symbol: "RB" + symbol: "SI" + symbol: "SOM" + symbol: "SR1" + symbol: "SR3" + symbol: "TN" + symbol: "TUF" + symbol: "TUT" + symbol: "UB" + symbol: "XC" + symbol: "XK" + symbol: "YM" + symbol: "ZB" + symbol: "ZC" + symbol: "ZCW" + symbol: "ZF" + symbol: "ZL" + symbol: "ZM" + symbol: "ZN" + symbol: "ZO" + symbol: "ZQ" + symbol: "ZR" + symbol: "ZS" + symbol: "ZT" + symbol: "ZW" + } +} +SymbolLists +{ + value { list { key: "ICE" - # symbol: "BRN" # symbol: "WBS" # symbol: "OJ" @@ -13,31 +73,8 @@ SymbolLists list { key: "GLBX" - - symbol: "HE" - symbol: "LE" - symbol: "CL" - symbol: "RB" - symbol: "HO" - symbol: "BZ" - symbol: "NG" - symbol: "GC" - symbol: "SI" - symbol: "HG" - symbol: "ZW" - symbol: "ZC" - symbol: "ZS" - symbol: "ZM" - symbol: "ZL" - symbol: "ZO" - symbol: "ZR" - symbol: "ZB" - symbol: "ZN" - symbol: "ZF" - symbol: "ZT" - symbol: "UB" - symbol: "GE" - } + symbol: @SymbolList.symbol + } } } @@ -74,6 +111,6 @@ Symbols { ice { future: @SymbolLists.list[ICE].symbol spread: @SymbolLists.list[ICE].symbol - } + } } } diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index d25fb696a..1533964a0 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -26,7 +26,7 @@ std::string ICEChannel::to_string() const { std::string mt = name; for(const auto& x : market_types) - mt += " " + x; + mt += " " + std::to_string(x); return mt; } @@ -123,4 +123,4 @@ const std::vector get_configured_ice_channels() { }}} //namespace -#endif \ No newline at end of file +#endif diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp index 052daf16f..58c4259ac 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp @@ -1,4 +1,5 @@ #include "BookOrderBase.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -16,6 +17,7 @@ enum class BookOrderBase::InternalStatus { PENDING_ATTACH, WAITING_FOR_MD, WORKING, + INERT, COMPLETED }; @@ -117,6 +119,7 @@ OrderOpResult BookOrderBase::on_activate(Price p, Quantity q, case InternalStatus::WORKING: case InternalStatus::WAITING_FOR_MD: + case InternalStatus::INERT: bts_assert(false); break; } @@ -137,6 +140,7 @@ OrderOpResult BookOrderBase::on_update(Update const &update) { return OrderOpResult(ORDER_ERROR_INVALID_OP, "Order is already completed"); + case InternalStatus::INERT: case InternalStatus::WORKING: { auto r = do_on_update(update); if (r.ok()) { @@ -172,6 +176,7 @@ orderman::OrderOpResult BookOrderBase::on_detach() { case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::WORKING: + case InternalStatus::INERT: me->child = ChildOrder{}; terminate(ORDER_STATUS_CANCELED); break; @@ -191,6 +196,7 @@ orderman::OrderOpResult BookOrderBase::on_cancel() { case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::WORKING: + case InternalStatus::INERT: terminate(ORDER_STATUS_CANCELED); return report_and_return(); @@ -235,6 +241,7 @@ void BookOrderBase::on_book_update(const BookUpdateEvent &ev) { case InternalStatus::PENDING_ATTACH: case InternalStatus::COMPLETED: + case InternalStatus::INERT: return; case InternalStatus::INACTIVE: @@ -284,6 +291,7 @@ void BookOrderBase::on_attach_complete(OrderOpResult r, ChildOrder const &child, case InternalStatus::INACTIVE: case InternalStatus::WAITING_FOR_MD: case InternalStatus::WORKING: + case InternalStatus::INERT: bts_assert(false); break; } @@ -297,6 +305,7 @@ void BookOrderBase::on_child_order_update(OrderStateUpdateEvent const &ev) { void BookOrderBase::on_child_order_update( api::orderman::OrderState const &child_state) { switch (me->internal_status) { + case InternalStatus::INERT: case InternalStatus::WORKING: switch (child_state.status()) { @@ -330,7 +339,7 @@ void BookOrderBase::on_child_order_update( case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); return; - } // End JOINED internal state + } return; case InternalStatus::COMPLETED: break; @@ -365,9 +374,8 @@ void BookOrderBase::on_child_update_completed(OrderOpResult r) { on_detach(); return; + case InternalStatus::INERT: case InternalStatus::COMPLETED: - return; - case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::INACTIVE: @@ -517,6 +525,26 @@ void BookOrderBase::transition(InternalStatus new_state) { _transition(new_state); return; } + + // To INERT + if (new_state == InternalStatus::INERT) { + me->pending_update.reset(); + unsubscribe_from_book(); + _transition(new_state); + return; + } + } + + // From INERT + if (me->internal_status == InternalStatus::INERT) { + if (new_state == InternalStatus::COMPLETED) { + if (!me->child.empty()) { + me->child.cancel(); + me->child = ChildOrder{}; + } + _transition(new_state); + return; + } } // Everything else is verbotten @@ -556,6 +584,14 @@ void BookOrderBase::check_invariants() { bts_assert(!never_saw_md()); break; + case InternalStatus::INERT: + bts_assert(!me->child.empty()); + bts_assert(me->external_status() == ORDER_STATUS_WORKING); + bts_assert(!never_saw_md()); + bts_assert(me->book_sid.empty()); + bts_assert(!me->pending_update); + break; + case InternalStatus::COMPLETED: bts_assert(me->child.empty()); bts_assert(me->external_status() == ORDER_STATUS_CANCELED || @@ -563,7 +599,6 @@ void BookOrderBase::check_invariants() { me->external_status() == ORDER_STATUS_ERROR || me->external_status() == ORDER_STATUS_REJECTED_BY_SPARK); bts_assert(me->book_sid.empty()); - bts_assert(me->book_sid.empty()); bts_assert(!me->pending_update); break; } @@ -601,8 +636,16 @@ void BookOrderBase::cancel(std::string const &msg) { void BookOrderBase::detach(std::string const &msg) { bts_assert(me->internal_status == InternalStatus::WORKING); - me->child = {}; - terminate(ORDER_STATUS_CANCELED, msg); + bts_assert(!me->child.empty()); + + if (parent_key() == null_order_key()) { + if (msg.size()) + me->state.set_last_msg(msg); + me->child = ChildOrder{}; + terminate(ORDER_STATUS_CANCELED); + } else + transition(InternalStatus::INERT); + report_and_return(); } @@ -617,6 +660,20 @@ Price BookOrderBase::tick_size() const { return Price(me->security->contract_spec().low_tick()); } +md::PriceSize BookOrderBase::other_side_top_of_book() const { + return last_book().side(other_side())[0]; +} + +md::PriceSize BookOrderBase::my_side_top_of_book() const { + return last_book().side(my_side())[0]; +} + +api::Side BookOrderBase::my_side() const { return definition().side(); } + +api::Side BookOrderBase::other_side() const { + return securities::other_side(my_side()); +} + void BookOrderBase::launch_child( api::orderman::OrderDefinition const &child_def) { bts_assert(me->internal_status == InternalStatus::WORKING); @@ -637,6 +694,8 @@ log::CharPtrWrapper BookOrderBase::state_name(InternalStatus st) { return {"INACTIVE"}; case InternalStatus::WORKING: return {"WORKING"}; + case InternalStatus::INERT: + return {"INERT"}; } bts_assert(false); return {""}; diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.h b/src/lib/orderman/orders/book_algos/BookOrderBase.h index 3f73d35e0..92275ca6a 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.h +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.h @@ -3,6 +3,7 @@ #include "lib/api/services/OrderService.server.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/orders/Order.h" +#include "lib/md/PriceSize.h" #include @@ -47,6 +48,10 @@ class BookOrderBase : public Order { Book const&last_book() const; Book const&book_at_inception() const; Price tick_size() const; + api::Side my_side() const; + api::Side other_side() const; + md::PriceSize other_side_top_of_book() const; + md::PriceSize my_side_top_of_book() const; private: enum class InternalStatus; diff --git a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp index 3bec00d16..ccc381364 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "JoinOrder2.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/orderman_utils.h" @@ -8,7 +10,7 @@ namespace orderman { using namespace api::orderman; -enum class JoinOrder2::Status { WAITING_TO_JOIN, JOINED, DONE }; +enum class JoinOrder2::Status { WAITING_TO_JOIN, JOINED }; struct JoinOrder2::PImpl { Quantity min_quantity_to_join; @@ -46,7 +48,7 @@ void JoinOrder2::do_on_ready(bool is_attached) { Quantity(state().quantity())); if (!is_attached) { - auto const&def = definition(); + auto const &def = definition(); api::orderman::OrderDefinition child_def = def; *child_def.mutable_custom_def() = definition().custom_def().join().child(); @@ -81,59 +83,56 @@ void JoinOrder2::try_to_join() { child_update.set_quantity(state().quantity()); update_child(child_update); - // We no longer need market data updates - unsubscribe_from_book(); - - me->status = Status::JOINED; - LOG(OrderMan, Info, "JoinOrder2 order {} joined the market {}@{}", - key().value(), state().quantity(), my_side_psz.price()); + done(); + } } OrderOpResult JoinOrder2::do_on_update(api::orderman::Update const &update) { - switch (me->status) { - case Status::WAITING_TO_JOIN: - case Status::JOINED: { - if (update.has_custom() && !update.custom().has_join()) - return {ORDER_ERROR_INVALID_OP, - "Update is not valid for this order type"}; + if (update.has_custom() && !update.custom().has_join()) + return {ORDER_ERROR_INVALID_OP, + "Update is not valid for this order type"}; - // copy new price, size to our state - state().set_price(update.price()); - state().set_quantity(update.quantity()); + // copy new price, size to our state + state().set_price(update.price()); + state().set_quantity(update.quantity()); - // Build child update - Update child_update; - child_update.set_price(update.price()); - child_update.set_quantity(update.quantity()); + // Build child update + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); - if (update.has_custom()) { - // process custom part of the udpate if any - auto &join_update = update.custom().join(); - *child_update.mutable_custom() = join_update.child(); + if (update.has_custom()) { + // process custom part of the udpate if any + auto &join_update = update.custom().join(); + *child_update.mutable_custom() = join_update.child(); - // Update quantity threshold - me->min_quantity_to_join = SpreaderUtils::_quantity_threshold( - definition().custom_def().join().join_threshold(), - Quantity(update.quantity())); - } - - update_child(child_update); - - // If we were not yet joined it is possible we now can, since we - // could have changed the min_quantity_to_join - if (me->status == Status::WAITING_TO_JOIN) - try_to_join(); - return OrderOpResult(); - } - case Status::DONE: - bts_assert(false); - break; + // Update quantity threshold + me->min_quantity_to_join = SpreaderUtils::_quantity_threshold( + definition().custom_def().join().join_threshold(), + Quantity(update.quantity())); } - bts_assert(false); - return OrderOpResult{}; + update_child(child_update); + + // If we were not yet joined it is possible we now can, since we + // could have changed the min_quantity_to_join + if (me->status == Status::WAITING_TO_JOIN) + try_to_join(); + return OrderOpResult(); } +void JoinOrder2::done() +{ + bts_assert(me->status == Status::WAITING_TO_JOIN); + auto my_side = definition().side(); + auto &my_side_psz = last_book().side(my_side)[0]; + + me->status = Status::JOINED; + LOG(OrderMan, Diag, "JoinOrder2 order {} joined the market {}@{}", + key().value(), state().quantity(), my_side_psz.price()); + detach("Joined successfully"); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder2.h b/src/lib/orderman/orders/book_algos/JoinOrder2.h index 89089e107..717fa6afc 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder2.h +++ b/src/lib/orderman/orders/book_algos/JoinOrder2.h @@ -11,6 +11,7 @@ class JoinOrder2 : public BookOrderBase { ~JoinOrder2(); private: + void done(); OrderOpResult do_on_init_new() override; void do_on_book(Book const &) override; void do_on_ready(bool is_attached) override; diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp index 8e169f3e5..83839fc45 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "LeanOrder2.h" #include "lib/domain_model/Security.h" @@ -117,7 +119,7 @@ void LeanOrder2::on_toward_me_move() { LOG(OrderMan, Diag, "LeanOrder2 {} is done because opposite moved towards order", key().value()); - done(); + done("Opposite market moved towards"); break; case LeanOrderDefinition_OnToward_REPRICE: me->target_price = Price(other_side_top_of_book().price()); @@ -160,7 +162,7 @@ void LeanOrder2::payup() { "Could not find opposite market to set new target price in " "LeanOrder2, order: {} is done.", key().value()); - done(); + done("Could not find new opposite market"); return; } @@ -175,7 +177,7 @@ void LeanOrder2::payup() { LOG(OrderMan, Diag, "Reached limit of jumps in LeanOrder2 {}. Order is done.", key().value()); - done(); + done("Max number of jumps reached"); return; } } @@ -206,23 +208,17 @@ OrderOpResult LeanOrder2::do_on_update(api::orderman::Update const &update) { update_child(child_update); if (me->status == Status::WORKING) { - // re-eval given that our parameters might hace changed + // re-eval given that our parameters might have changed try_jump(); } return OrderOpResult(); } -void LeanOrder2::done() +void LeanOrder2::done(std::string const&msg) { bts_assert(me->status == Status::WORKING); me->status = Status::DONE; - - if (parent_key() == null_order_key()) - detach(); -} - -md::PriceSize LeanOrder2::other_side_top_of_book() const { - return last_book().side(other_side())[0]; + detach(msg); } bool LeanOrder2::book_moved_toward_me() const { @@ -237,12 +233,6 @@ bool LeanOrder2::book_moved_away_from_me() const { other_side_price); } -api::Side LeanOrder2::my_side() const { return definition().side(); } - -api::Side LeanOrder2::other_side() const { - return securities::other_side(my_side()); -} - uint32_t LeanOrder2::max_jumps() const { return definition().custom_def().lean().max_chase_ticks(); } diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.h b/src/lib/orderman/orders/book_algos/LeanOrder2.h index 103ac7b5e..6a445dcd6 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.h +++ b/src/lib/orderman/orders/book_algos/LeanOrder2.h @@ -1,7 +1,6 @@ #pragma once #include "lib/orderman/orders/book_algos/BookOrderBase.h" -#include "lib/md/PriceSize.h" namespace bts { namespace orderman { @@ -19,21 +18,15 @@ private: struct PImpl; enum class Status; - api::Side my_side() const; - api::Side other_side() const; - md::PriceSize other_side_top_of_book() const; spark::QuantityMeasure jump_threshold() const; uint32_t max_jumps() const ; api::orderman::LeanOrderDefinition::OnToward on_toward_behaviour() const; - bool book_moved_toward_me() const; bool book_moved_away_from_me() const; - - void try_jump(); void on_toward_me_move(); + void try_jump(); void payup(); - - void done(); + void done(std::string const&msg); std::unique_ptr me; }; diff --git a/src/lib/orderman/orders/book_algos/TopOrder2.cpp b/src/lib/orderman/orders/book_algos/TopOrder2.cpp index 6340b5f44..daf844d08 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "TopOrder2.h" #include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" diff --git a/src/server/sparkd/md/platforms/IMDPlatform.h b/src/server/sparkd/md/platforms/IMDPlatform.h index df4840f30..fb36c9168 100644 --- a/src/server/sparkd/md/platforms/IMDPlatform.h +++ b/src/server/sparkd/md/platforms/IMDPlatform.h @@ -7,6 +7,7 @@ class IMDPlatform { public: virtual void send_heartbeats(); + virtual ~IMDPlatform() {} }; -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index df13de9bb..7c85642ad 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -56,17 +56,14 @@ void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , cons void ICEListener::onError(const onixs_ice::Error& error) { std::string error_desc(error.description()); - tracepoint (bts_trace,trace_order,(char*) "onError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Error: {} - {}", error.toString(), error_desc ); } void ICEListener::onFeedError(onixs_ice::FeedId feedid, onixs_ice::ErrorCode code, const std::string& desc) { - tracepoint (bts_trace,trace_order,(char*) "onFeedError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, code); } void ICEListener::onWarning(const onixs_ice::Warning& warning) { - tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Warn: {} - {}", warning.toString(), std::string(warning.description()) ); } @@ -74,31 +71,27 @@ void ICEListener::onWarning(const onixs_ice::Warning& warning) // Security discovery void ICEListener::onFuturesProductDefinition(const onixs_ice::FuturesProductDefinition& msg, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesProductDefinition", 0, (uint16_t) 0, 0); if(msg.isSpread) on_future_strip(msg, is_interested); else on_future(msg, is_interested); } -void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onNewExpiry", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); on_future(msg, is_interested); } void ICEListener::onFuturesStrategyDefinition(const onixs_ice::FuturesStrategyDefinition& def, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", 0, (uint16_t) 0, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(def, is_interested); UNUSED(def); UNUSED(is_interested); } //This is only for UDS -void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(msg, is_interested); UNUSED(msg); @@ -152,7 +145,7 @@ void ICEListener::onMarketSnapshotPriceLevel(const onixs_ice::MarketSnapshotPric // Book void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, const onixs_ice::MessageInfo& msg_info) { - tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); + //tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto data = _index.get_security(onixs_book.marketId()); if (data == nullptr) @@ -214,9 +207,8 @@ void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, on data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); } -void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onTrade", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != NULL) { @@ -230,9 +222,8 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI // // RFQ -void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onRfq", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -267,9 +258,8 @@ void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& // // Misc -void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -287,9 +277,8 @@ void ICEListener::onOpenInterest(const onixs_ice::OpenInterest &msg, const onixs UNUSED(msg_info); } -void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onOpenPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -301,9 +290,8 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: } } -void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onClosePrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -315,9 +303,8 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice } } -void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfDayMarketSummary", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -333,18 +320,15 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary // // Feed -void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& ) { UNUSED(feedId); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockBegin", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); } void ICEListener::onMulticastMessageBlockEnd(onixs_ice::FeedId feedId, const onixs_ice::MarketIds& marketIds) { UNUSED(feedId); UNUSED(marketIds); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.begin", 0, (uint16_t) 0, 0); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.end", 0, (uint16_t) 0, 0); } void ICEListener::onFeedStarted(onixs_ice::FeedId, const onixs_ice::MarketIds&) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index c44ad0d3a..f36be139d 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -217,7 +217,6 @@ unique_ptr ICEMain::prepare_listener(onixs_ice::Handler& handler, c producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); } - const auto& options = channel_settings_for(channel); unique_ptr listener(new ICEListener(_index, _producer, /*_settlement_recorder,*/ producer_channels)); for (auto& symbol : channel.symbols) listener->add_filter_symbol(symbol.symbol()); From 5969568dee03212b1d8f6efd778cf56dcfec2a4b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 17:36:12 -0400 Subject: [PATCH 008/225] ice native order --- src/lib/orderman/orders/ICENativeOrder.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index fe84015e9..d527364e6 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -141,13 +141,11 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati if (!me->sec) { LOG(OrderMan, Error, - "Unknown security {} referenced by recovered " - "order {}. This is a serious " + "Unknown security {} referenced by recovered order {}. This is a serious " "problem which has to be corrected manually. ", def.security_key(), rec.key()); - transition_to_error( - NativeOrderState::SUB_ERROR_UNKNOWN_SECURITY, - fmt::format("Unknown security: {}", def.security_key())); + transition_to_error(NativeOrderState::SUB_ERROR_UNKNOWN_SECURITY, + fmt::format("Unknown security: {}", def.security_key())); return; } @@ -156,8 +154,7 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati if (!serv.order_router.is_valid_session(session)) { LOG(OrderMan, Error, - "Unknown JetFIX session {} referenced by recovered " - "order {}. This is a serious " + "Unknown JetFIX session {} referenced by recovered order {}. This is a serious " "problem which has to be corrected manually. ", session, rec.key()); transition_to_error(NativeOrderState::SUB_ERROR_UNKNOWN_FIX_SESSION, @@ -218,8 +215,7 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi else { LOG(OrderMan, Error, - "Could not recover account and user information from order {}" - ". The following information is available: {}. ", + "Could not recover account and user information from order {}. The following information is available: {}. ", k.value(), rev_rec.error_msg); def.set_user(""); def.set_user_id(0); From 36442a037eda4653a1b723f1225255d3f9d564cc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 3 Apr 2019 17:12:52 -0400 Subject: [PATCH 009/225] more ice --- .../api/service_helpers/AdminServiceUtils.cpp | 3 +- src/lib/api/services/OrderService.proto | 3 +- src/lib/config/defaults/jetfix.conf | 2 +- .../orderman/actors/ICEExecutionGateway.cpp | 1 + .../actors/order_manager/SessionServices.h | 8 ++--- src/lib/orderman/orders/ICENativeOrder.cpp | 23 +++++++++------ src/lib/utils/base62.h | 29 +++++++++++++++++++ 7 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 src/lib/utils/base62.h diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 932ab3c1e..d91d9ae75 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -471,7 +471,8 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt rv.set_account(ice_account_data->clearing_account()); rv.set_cti_code(ice_account_data->cti()); rv.set_customer_or_firm(ice_account_data->origin()); - rv.set_trader_id(ice_user_data->user_name()); + rv.set_user_name(ice_user_data->user_name()); + rv.set_company_id(ice_user_data->company_id()); return rv; } case bts::api::Venue::VENUE_GLBX: { diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 3fd6494aa..ed3b5359b 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -283,7 +283,8 @@ message RoutingRecord { string location = 8; string order_server_id = 30; - string trader_id = 31; + int company_id = 35; + string user_name = 40; } message NativeOrderState { diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 5c5143c99..4de28229b 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -22,7 +22,7 @@ JetFIXSimConnection { platform: SIMICE socket_connect_host_ip: "127.0.0.1" socket_connect_port: @Ports.ice_sim_fix_port - sender_compid: "SPARK" # this is the FIX session name + sender_compid: "51239" # this is the FIX session name sender_subid: "BTS" target_compid: "BTS" target_subid: "BTS" diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index eb82cd77d..fa9201054 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -18,6 +18,7 @@ #include "lib/utils/bts_chrono.h" + #include namespace bts { diff --git a/src/lib/orderman/actors/order_manager/SessionServices.h b/src/lib/orderman/actors/order_manager/SessionServices.h index eab64257e..5ace9ced5 100644 --- a/src/lib/orderman/actors/order_manager/SessionServices.h +++ b/src/lib/orderman/actors/order_manager/SessionServices.h @@ -57,14 +57,14 @@ class SessionServices { _gateway_status_sub = src._gateway_status_sub; return *this; } + + config::JetFIX::Connection const &session_cfg() const { + return _session_data->cfg; + } protected: std::string const &session_name() const { return _session_data->session; } - config::JetFIX::Connection const &session_cfg() const { - return _session_data->cfg; - } - void queue_fix(jetfix::MessageTypes mt, jetfix::FIXFragment const &f, trace::CorID const &corid) { auto &stream = _session_data->current_buffer->first_stream(); diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index d527364e6..34e127a1b 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -45,6 +45,7 @@ struct ICENativeOrder::PImpl OrderState state; int price_encoding_precision; std::string exchange_order_id; + std::string sender_comp_id; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -325,6 +326,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); me->price_encoding_precision = me->services->price_encoding_precision(*me->session_services); + me->sender_comp_id = me->session_services->session_cfg().sender_compid(); // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) @@ -991,11 +993,16 @@ void ICENativeOrder::init_fix() auto const &sec = *me->sec; auto const &rr = get_native_state(me->state).routing_record(); - std::string clordid(clordid_sz(), ' '); - encode_clorid(key(), SecurityKey(sec.id()), &clordid); - + std::string memo(memo_sz(), ' '); + encode_memo(SecurityKey(sec.id()), &memo); + int sclen = me->sender_comp_id.size(); + auto clordid = std::to_string(key().value()); // order id + // initialize create FIX auto &create_encoding = me->create_encoding; + create_encoding.add(clordid); + create_encoding.add(rr.company_id()); + create_encoding.add(rr.operator_id()); create_encoding.add(rr.location()); create_encoding.add(rr.account()); @@ -1004,8 +1011,8 @@ void ICENativeOrder::init_fix() create_encoding.add(def.manual_order_indicator()); create_encoding.add(rr.customer_or_firm()); create_encoding.add(rr.cti_code()); - create_encoding.add(sec.glbx().security_desc()); - create_encoding.add(clordid); + create_encoding.add(memo); + if (rr.smp_id().size()) { create_encoding.add(rr.smp_id()); @@ -1103,10 +1110,8 @@ void ICENativeOrder::init_fix() auto stop_px = def.custom_def().stop_limit().stop_price(); auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); - create_encoding.add(encoded_stop_px, - me->price_encoding_precision, -1); - update_encoding.add(encoded_stop_px, - me->price_encoding_precision, -1); + create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); + update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); // price me->create_price_bm = create_encoding.add(0, me->price_encoding_precision, price_sz()); diff --git a/src/lib/utils/base62.h b/src/lib/utils/base62.h new file mode 100644 index 000000000..b407ef0ad --- /dev/null +++ b/src/lib/utils/base62.h @@ -0,0 +1,29 @@ +#pragma once + +#include +#include + +namespace bts { +namespace utils { + +static char base_62_alphabet [] = +{ + '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f', + 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v', + 'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L', + 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z' +}; + +std::string to_base_62 (uint32_t src) +{ + std::string out (6, ' '); + for (int i=5; i >= 0; i--) + { + int r = src % 62; + out[i] = base_62_alphabet[r]; + src = src / 62; + } + return out; +} + +}} From f88ab57fa03e471f136259f4af40c9663b25e5dd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Apr 2019 15:49:37 -0400 Subject: [PATCH 010/225] got the basic structure down, still waiting on ICE for a few things --- .../api/service_helpers/AdminServiceUtils.cpp | 11 +- src/lib/api/services/AdminService.proto | 8 +- src/lib/api/services/OrderService.proto | 10 +- src/lib/config/defaults/jetfix.conf | 2 +- src/lib/jetfix/codec/FieldDefinitions.h | 22 ++- .../orderman/actors/ICEExecutionGateway.cpp | 6 +- .../orderman/orderman_utils/fix_order_codec.h | 25 +-- src/lib/orderman/orders/ICENativeOrder.cpp | 164 +++++++++--------- src/lib/utils/base62.h | 19 +- src/web/ui/src/Accounts/Types.fs | 5 - src/web/ui/src/Users/State.fs | 3 +- 11 files changed, 156 insertions(+), 119 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index d91d9ae75..729887b49 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -467,12 +467,17 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt return rv; } rv.set_session(conn_ptr->name()); - rv.set_operator_id(ice_user_data->operator_id()); rv.set_account(ice_account_data->clearing_account()); + rv.set_operator_id(ice_user_data->operator_id()); rv.set_cti_code(ice_account_data->cti()); rv.set_customer_or_firm(ice_account_data->origin()); - rv.set_user_name(ice_user_data->user_name()); - rv.set_company_id(ice_user_data->company_id()); + rv.set_clearing_firm(ice_account_data->clearing_firm()); + rv.set_customer_account_ref_id(ice_account_data->customer_account_ref_id()); + rv.set_account_code(ice_account_data->account_code()); + rv.set_company_id(std::to_string(ice_user_data->company_id())); + rv.set_authorized_trader(ice_user_data->authorized_trader()); + rv.set_authorized_group(ice_user_data->authorized_group()); + return rv; } case bts::api::Venue::VENUE_GLBX: { diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index b5848a539..655086708 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -360,15 +360,15 @@ message ICEAccountData { map misc_tags = 500; } -message ICEUserData { - reserved 10; reserved "authorized_trader"; //string authorized_trader = 10; +message ICEUserData { reserved 20; reserved "memo_field"; //string memo_field = 20; reserved 30; reserved "text_b"; //string text_b = 30; reserved 40; reserved "max_order_rate"; //uint32 max_order_rate = 40; - int32 company_id = 3; //tag 553 user_name in order server contexts + int32 company_id = 3; //tag 109 clientid string operator_id = 5; //tag 50 - string user_name = 11; //tag 553 user_name + string authorized_trader = 10; //tag 553 user_name + string authorized_group = 15; //tag 553 user_name string password = 21; //tag 96 raw data map misc_tags = 60; diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index ed3b5359b..b5937dc8a 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -282,9 +282,13 @@ message RoutingRecord { SelfMatchPreventionInstruction smp_instruction = 7; string location = 8; - string order_server_id = 30; - int company_id = 35; - string user_name = 40; + string clearing_firm = 20; + string customer_account_ref_id = 25; + string account_code = 30; + string company_id = 45; + string authorized_trader = 50; + string authorized_group = 60; + string order_server_id = 200; } message NativeOrderState { diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 4de28229b..11161f6df 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -53,7 +53,7 @@ JetFIX { start_time: "00:30:00" end_time: "23:30:00" sender_subid: "BTS" - user_name: "bluetrd-os" + user_name: "bluetrd-os" #this is the order_server_id raw_data: "Starts123" auto_fix_seq_num: true } diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index 8c585909f..b35277dac 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -57,11 +57,9 @@ typedef IntField<98> EncryptMethod; typedef IntField<9> BodyLength; typedef StringField<107> SecurityDesc; typedef StringField<109> ClientID; -typedef IntField<109> CompanyID; //ICE typedef StringField<112> TestReqId; typedef StringField<117> QuoteID; typedef StringField<11> ClOrdID; -typedef IntField<11> Int_ClOrdID; //ICE typedef StringField<132> BidPxStr; typedef StringField<133> OfferPxStr; typedef StringField<134> BidSizeStr; @@ -86,16 +84,13 @@ typedef StringField<307> UnderlyingSecurityDesc; typedef StringField<336> TradingSessionID; typedef StringField<35> MsgType; typedef StringField<37> OrderID; -typedef IntField<37> Int_OrderID; //ICE typedef StringField<41> OrigClOrdID; -typedef IntField<41> Int_OrigClOrdID; //ICE typedef StringField<440> ClearingAccount; typedef StringField<48> SecurityID; typedef StringField<49> SenderCompID; typedef StringField<50> SenderSubID ; typedef StringField<527> SecondaryExecID; typedef StringField<55> Symbol; -typedef IntField<55> Int_Symbol; //ICE typedef StringField<56> TargetCompId; typedef StringField<57> TargetSubID; typedef StringField<58> Text; @@ -112,9 +107,26 @@ typedef TimeField<122> OrigSendingTime; typedef TimeField<52> SendingTime; typedef TimeField<5979> RequestTime; typedef TimeField<60> TransactTime; + +//ICE +typedef IntField<9208> Int_CtiCode; +typedef IntField<11> Int_ClOrdID; +typedef IntField<37> Int_OrderID; +typedef IntField<41> Int_OrigClOrdID; +typedef IntField<109> CompanyID; +typedef IntField<55> Int_Symbol; +typedef IntField<439> Int_ClearingFirm; typedef StringField<9121> Memo; typedef IntField<103> OrdRejReason; typedef IntField<285> DeleteReason; +typedef CharField<9195> AccountCode; +typedef StringField<9207> CustomerAccountRefId; +typedef StringField<115> OnBehalfOfCompID; +typedef StringField<116> OnBehalfOfSubID; +typedef StringField<144> OnBehalfOfLocationID; +typedef StringField<9139> OriginatorUserID; +typedef CharField<18> ExecInst; +typedef IntField<210> MaxShow; typedef Group(ice.company_id()); - buffer.add(ice.user_name()); + buffer.add(ice.authorized_trader()); buffer.add(ice.password()); //TODO MIFID Defaults } @@ -202,9 +202,9 @@ OnCancelReject &ICEExecutionGateway::on_cancel_reject() void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg &msg) { - OrderKey ok(msg.get()); + OrderKey ok; SecurityKey sk; - decode_memo(msg.get(), &sk); + decode_memo(msg.get(), &ok, &sk); auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); diff --git a/src/lib/orderman/orderman_utils/fix_order_codec.h b/src/lib/orderman/orderman_utils/fix_order_codec.h index 004a2c911..5a8d364df 100644 --- a/src/lib/orderman/orderman_utils/fix_order_codec.h +++ b/src/lib/orderman/orderman_utils/fix_order_codec.h @@ -7,6 +7,7 @@ #include "lib/jetfix/codec/i32_toa.h" #include "lib/jetfix/codec/MessageDefinitions.h" #include "lib/utils/bts_assert.h" +#include "lib/utils/base62.h" namespace bts { namespace api {class Security;} @@ -39,8 +40,7 @@ inline void decode_clorid(std::string const&in, OrderKey *ok, SecurityKey *sk) template OrderKey get_order_key(MSG const &msg) -{ - +{ bts_assert(msg.template has ()); OrderKey result; SecurityKey dummy; @@ -48,19 +48,24 @@ OrderKey get_order_key(MSG const &msg) return result; } -inline void encode_memo(SecurityKey sk, std::string *out) +inline void encode_memo(OrderKey ok, SecurityKey sk, std::string *out) { - u32_toa(sk.value(),&((*out)[0]),memo_sz()); + auto ok_string = utils::to_base_62(ok.value()); + auto sk_string = utils::to_base_62(sk.value()); + bts_assert_msg(ok_string.size() == 6 && sk_string.size() == 6, "base62 encoding didn't work"); + *out = ok_string + sk_string; } -inline void decode_memo(const std::string& in, SecurityKey* sk) +inline void decode_memo(const std::string& in, OrderKey* ok, SecurityKey* sk) { - bts_assert(in.size() == memo_sz()); - char buffer[memo_sz()+1]; - buffer[memo_sz()] = 0; + bts_assert(in.size() == memo_sz()); + char buffer[memo_sz()/2+1]; + buffer[memo_sz()/2] = 0; + std::memcpy(buffer,&in[0],memo_sz()/2); + *ok = OrderKey( utils::from_base_62(std::string(buffer)) ); - std::memcpy(buffer,&in[0],memo_sz()); - *sk = SecurityKey(std::atoi(buffer)); + std::memcpy(buffer,&in[memo_sz()/2],memo_sz()/2); + *sk = SecurityKey( utils::from_base_62(std::string(buffer)) ); } template diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 34e127a1b..bd5835327 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -58,7 +58,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment::Bookmark create_transact_time_bm; jetfix::FIXFragment cancel_encoding; - jetfix::FIXFragment::Bookmark cancel_transact_time_bm; + //jetfix::FIXFragment::Bookmark cancel_transact_time_bm; OrderServices::ExeReportSubID exe_report_sid; OrderServices::CancelRejectSubID cancel_reject_sid; @@ -202,9 +202,8 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi def.set_side(er.side); auto sec = os.sec_db.resolve(SecurityKey(def.security_key())); - auto rev_rec = os.order_router.get_reverse_routing_record( - er.cfg->name(), to_trim_str(er.operator_id), - to_trim_str(er.account_name), sec); + auto rev_rec = os.order_router.get_reverse_routing_record(er.cfg->name(), to_trim_str(er.operator_id), + to_trim_str(er.account_name), sec); if (rev_rec.ok) { @@ -215,8 +214,7 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi } else { - LOG(OrderMan, Error, - "Could not recover account and user information from order {}. The following information is available: {}. ", + LOG(OrderMan, Error,"Could not recover account and user information from order {}. The following information is available: {}. ", k.value(), rev_rec.error_msg); def.set_user(""); def.set_user_id(0); @@ -377,8 +375,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve { LOG(OrderMan, reject_level, "New order would cause breach of messaging " - "limits. Dropping order {}", - key().value()); + "limits. Dropping order {}", key().value()); auto msg = "Messaging threshold breached"; transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH, msg); @@ -402,8 +399,8 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve case CustomOrderDefinition::kStopLimit: { me->create_price_bm = encoding.overwrite(me->create_price_bm, - securities::encode_exchange_price(*me->sec, p).value(), - me->price_encoding_precision, price_sz()); + securities::encode_exchange_price(*me->sec, p).value(), + me->price_encoding_precision, price_sz()); break; } case CustomOrderDefinition::kStop: @@ -414,11 +411,9 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve break; } - me->create_quantity_bm = - encoding.overwrite(me->create_quantity_bm, q.value(), quantity_sz()); + me->create_quantity_bm = encoding.overwrite(me->create_quantity_bm, q.value(), quantity_sz()); auto const &ts = services.get_time_str(); - me->create_transact_time_bm = encoding.overwrite( - me->create_transact_time_bm, &ts.value()[0], ts.value().size()); + me->create_transact_time_bm = encoding.overwrite(me->create_transact_time_bm, &ts.value()[0], ts.value().size()); return OrderOpResult{}; } @@ -536,7 +531,8 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) Quantity(current_working_qty)); // are we under the position limits? - if (!lqr.ok) { + if (!lqr.ok) + { auto msg = fmt::format("Cannot update order due to limit breach: {}", lqr.error_msg); LOG(OrderMan, Error, "Order update failed due to limit breach. Order: {} Msg: {}", @@ -559,9 +555,7 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) // are we under the messaging threshold? if (!me->services->governor(*me->session_services).can_send()) { - LOG(OrderMan, Warn, - "Cannot update order {} because of messaging limits. ", - key().value()); + LOG(OrderMan, Warn, "Cannot update order {} because of messaging limits. ", key().value()); auto msg = "Messaging threshold breached"; // if we are not being driven by an algo we just signal the @@ -691,9 +685,9 @@ OrderOpResult ICENativeOrder::on_cancel() { case ORDER_STATUS_WORKING: { - auto &encoding = me->cancel_encoding; - auto const &ts = me->services->get_time_str(); - me->cancel_transact_time_bm = encoding.overwrite( me->cancel_transact_time_bm, &ts.value()[0], ts.value().size() ); + //auto &encoding = me->cancel_encoding; + //auto const &ts = me->services->get_time_str(); + //me->cancel_transact_time_bm = encoding.overwrite( me->cancel_transact_time_bm, &ts.value()[0], ts.value().size() ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel, @@ -767,9 +761,7 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) // report was not already considered. if (is_old_exe_report(native_state, er)) { - LOG(OrderMan, Info, - "Ignoring already seen execution report {} in order {}", - er.data->msg_seq_num, key().value()); + LOG(OrderMan, Info, "Ignoring already seen execution report {} in order {}", er.data->msg_seq_num, key().value()); return; } @@ -777,8 +769,7 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) // state maintenance if (er.data->leg_security) { - LOG(OrderMan, Diag, "Ignoring leg execution report for order {}", - key().value()); + LOG(OrderMan, Diag, "Ignoring leg execution report for order {}", key().value()); return; } @@ -786,9 +777,8 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) native_state.set_last_transact_time(to_str(er.data->transact_time)); auto external_status = map_external_status(er.data->order_status); - // filled quantity is reset back to 0 when the order is canceled - if (external_status != ORDER_STATUS_CANCELED) + if (external_status != ORDER_STATUS_CANCELED) //TODO { if (er.data->exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || er.data->exec_type == api::orderman::EXEC_TYPE_FILL) @@ -991,76 +981,86 @@ void ICENativeOrder::init_fix() auto const &def = me->definition; auto const &sec = *me->sec; + bts_assert(sec.has_ice()); auto const &rr = get_native_state(me->state).routing_record(); std::string memo(memo_sz(), ' '); - encode_memo(SecurityKey(sec.id()), &memo); - int sclen = me->sender_comp_id.size(); - auto clordid = std::to_string(key().value()); // order id + encode_memo(key(), SecurityKey(sec.id()), &memo); + + std::string orderid(ice_orderid_sz(), ' '); + u32_toa(key().value(), &orderid[0]); // order id + int totalsz = me->sender_comp_id.size() + orderid.size(); + if(totalsz < 9) //9 is min size + orderid = std::string(9-totalsz, '0').append(orderid); + else if(totalsz > 12) //12 is max + orderid = orderid.substr(totalsz-12, orderid.size() - (totalsz-12)); + std::string combined_clorid = me->sender_comp_id + orderid; // initialize create FIX auto &create_encoding = me->create_encoding; - create_encoding.add(clordid); - create_encoding.add(rr.company_id()); - create_encoding.add(rr.operator_id()); - create_encoding.add(rr.location()); - create_encoding.add(rr.account()); - create_encoding.add(def.side()); - create_encoding.add(def.time_in_force()); - create_encoding.add(def.manual_order_indicator()); - create_encoding.add(rr.customer_or_firm()); - create_encoding.add(rr.cti_code()); create_encoding.add(memo); - - if (rr.smp_id().size()) - { - create_encoding.add(rr.smp_id()); - if (rr.smp_instruction() != SELF_MATCH_PREVENTION_INSTRUCTION_UNDEFINED) - create_encoding.add( - rr.smp_instruction()); - } - + create_encoding.add(std::atoi(combined_clorid.c_str())); + create_encoding.add(std::atoi(rr.company_id().c_str())); + //create_encoding.add(""); //optional, unclear if we need + create_encoding.add(rr.operator_id()); + create_encoding.add(rr.operator_id() + "|" + rr.authorized_trader()); + create_encoding.add("ISV-BTS|" + rr.authorized_group()); + create_encoding.add(rr.authorized_trader()); + create_encoding.add('1'); + create_encoding.add(sec.ice().exchange_id()); + create_encoding.add(def.side()); me->create_transact_time_bm = create_encoding.add(datetime::FIX_timestamp(datetime::now())); me->create_quantity_bm = create_encoding.add(0, quantity_sz()); + create_encoding.add(def.time_in_force()); + if(rr.account() != "") + create_encoding.add(rr.account()); + if(rr.clearing_firm() != "") + create_encoding.add(std::atoi(rr.clearing_firm().c_str())); + if(rr.account_code() != "") + create_encoding.add(rr.account_code()[0]); + if(rr.cti_code() != api::orderman::CTICode::CTI_CODE_UNDEFINED) + create_encoding.add( rr.cti_code() - '0' ); + if(rr.customer_account_ref_id() != "") + create_encoding.add(rr.customer_account_ref_id()); + // initialize update FIX auto &update_encoding = me->update_encoding; - update_encoding.add(rr.operator_id()); - update_encoding.add(rr.location()); - update_encoding.add(rr.account()); + update_encoding.add(std::atoi(combined_clorid.c_str())); + update_encoding.add(std::atoi(combined_clorid.c_str())); + update_encoding.add(std::atoi(rr.company_id().c_str())); + //update_encoding.add(""); //optional, unclear if we need + update_encoding.add(rr.operator_id()); + update_encoding.add(rr.operator_id() + "|" + rr.authorized_trader()); + update_encoding.add("ISV-BTS|" + rr.authorized_group()); + update_encoding.add(rr.authorized_trader()); + update_encoding.add('1'); + update_encoding.add(sec.ice().exchange_id()); update_encoding.add(def.side()); - update_encoding.add(def.time_in_force()); - update_encoding.add(def.manual_order_indicator()); - update_encoding.add(rr.cti_code()); - update_encoding.add(rr.customer_or_firm()); - update_encoding.add(sec.glbx().security_desc()); - update_encoding.add(clordid); - update_encoding.add(clordid); - update_encoding.add(clordid); - update_encoding.add(true); - // Self Match Protection - if (rr.smp_id().size()) - { - update_encoding.add(rr.smp_id()); - if (rr.smp_instruction() != SELF_MATCH_PREVENTION_INSTRUCTION_UNDEFINED) - update_encoding.add(rr.smp_instruction()); - } me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); + update_encoding.add(def.time_in_force()); + if(rr.account() != "") + update_encoding.add(rr.account()); + if(rr.clearing_firm() != "") + update_encoding.add(std::atoi(rr.clearing_firm().c_str())); + if(rr.account_code() != "") + update_encoding.add(rr.account_code()[0]); + if(rr.cti_code() != api::orderman::CTICode::CTI_CODE_UNDEFINED) + update_encoding.add( rr.cti_code() - '0' ); + if(rr.customer_account_ref_id() != "") + update_encoding.add(rr.customer_account_ref_id()); + // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; - cancel_encoding.add(rr.operator_id()); - cancel_encoding.add(rr.location()); - cancel_encoding.add(rr.account()); + cancel_encoding.add(std::atoi(combined_clorid.c_str())); + cancel_encoding.add(std::atoi(combined_clorid.c_str())); + cancel_encoding.add(std::atoi(rr.company_id().c_str())); + cancel_encoding.add(rr.authorized_trader()); + cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - cancel_encoding.add(def.time_in_force()); - cancel_encoding.add(def.manual_order_indicator()); - cancel_encoding.add(sec.glbx().security_desc()); - cancel_encoding.add(clordid); - cancel_encoding.add(clordid); - cancel_encoding.add(clordid); - me->cancel_transact_time_bm = cancel_encoding.add(datetime::FIX_timestamp(datetime::now())); + //me->cancel_transact_time_bm = cancel_encoding.add(datetime::FIX_timestamp(datetime::now())); // special tags switch (def.custom_def().custom_case()) @@ -1092,8 +1092,7 @@ void ICENativeOrder::init_fix() // stop px auto stop_px = def.custom_def().stop().stop_price(); - auto encoded_stop_px = - securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); + auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); break; @@ -1108,8 +1107,7 @@ void ICENativeOrder::init_fix() // stop px auto stop_px = def.custom_def().stop_limit().stop_price(); - auto encoded_stop_px = - securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); + auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); diff --git a/src/lib/utils/base62.h b/src/lib/utils/base62.h index b407ef0ad..22b01252c 100644 --- a/src/lib/utils/base62.h +++ b/src/lib/utils/base62.h @@ -2,6 +2,10 @@ #include #include +#include +#include + +#include "lib/utils/bts_assert.h" namespace bts { namespace utils { @@ -14,7 +18,7 @@ static char base_62_alphabet [] = 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z' }; -std::string to_base_62 (uint32_t src) +inline std::string to_base_62 (uint32_t src) { std::string out (6, ' '); for (int i=5; i >= 0; i--) @@ -26,4 +30,17 @@ std::string to_base_62 (uint32_t src) return out; } +inline uint32_t from_base_62 (const std::string& src) +{ + bts_assert_msg(src.size() == 6, "bad base62 hash"); + uint32_t out = 0; + for (int i=5; i >= 0; i--) + { + uint32_t idx = std::distance(&base_62_alphabet[0], std::find(&base_62_alphabet[0], &base_62_alphabet[61], src[i])); + out += idx * pow(62, 5-i); + } + return out; +} + + }} diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index f249085bf..1b649a145 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -29,12 +29,7 @@ type AccountField = type CMEExchangeField = | CTI of CTICode | Origin of CustomerOrFirm - | TakeupMember of string | ClearingAccount of string - | DirectElectronicAccess of string - | TradingCapacity of string - | LiquidityProvision of string - | CommodityDerivativeIndicator of string | MiscTagMapping of JSMap type SIMExchangeField = diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index faa7092c6..4d1278aac 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -71,7 +71,8 @@ let defaultScratchUser = { iceData = { companyId = 0 operatorId = "" - userName = "" + authorizedTrader = "" + authorizedGroup = "" password = "" miscTags = JSMap.empty proNonpro = ProfessionalDesignation.PRO From d0029e7f881bd556351b4bcfd957c7ea36a263e3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Apr 2019 17:39:04 -0400 Subject: [PATCH 011/225] sim doesn't crash, but doesn't give exec reports either --- src/lib/config/ConfigurationState.cpp | 1 + src/lib/config/defaults/Symbols.conf | 9 ++-- src/lib/md/Shm/MDStructure.h | 2 +- .../sparkd/exchange_sim/ExchangeSim.cpp | 2 +- .../exchange_sim/ExchangeSimApplication.cpp | 44 ++++++++++++------- .../exchange_sim/ExchangeSimApplication.h | 3 +- tools/spark_vm_shell.sh | 2 +- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp index 3d115b5a0..bd821e192 100755 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib/config/ConfigurationState.cpp @@ -906,3 +906,4 @@ std::string get_fallback(const proto::Message& message) } }}}//end namespaces + diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 8494cc578..5ca194bbc 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -19,7 +19,6 @@ SymbolList { symbol: "FOB" symbol: "GC" symbol: "GE" - symbol: "GLI" symbol: "HE" symbol: "HG" symbol: "HO" @@ -66,9 +65,9 @@ SymbolLists list { key: "ICE" - # symbol: "BRN" - # symbol: "WBS" - # symbol: "OJ" + symbol: "BRN" + symbol: "WBS" + symbol: "OJ" } list { @@ -107,6 +106,8 @@ Symbols { sim { future: @SymbolLists.list[GLBX].symbol spread: @SymbolLists.list[GLBX].symbol + future: @SymbolLists.list[ICE].symbol + spread: @SymbolLists.list[ICE].symbol } ice { future: @SymbolLists.list[ICE].symbol diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib/md/Shm/MDStructure.h index 67b88b7ea..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; diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index e2d210184..e5c15d71f 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -149,7 +149,7 @@ int start_exchange_sim(bts::api::Venue venue) std::istringstream str{str_settings}; FIX::SessionSettings settings( str ); - ex_sim::ExchangeSimApplication application; + ex_sim::ExchangeSimApplication application( venue ); FIX::FileStoreFactory storeFactory( settings ); FIX::FileLogFactory logFactory( settings ); FIX::SocketAcceptor acceptor( application, storeFactory, settings, logFactory ); diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index 9be135a9a..a41517b94 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -100,15 +100,17 @@ struct ExchangeSimApplication::MDConsumerRec { }; struct ExchangeSimApplication::PImpl { - PImpl() - : producer(co2::PLATFORM_SIM), + PImpl(bts::api::Venue venue) + : venue(venue), + producer(co2::PLATFORM_SIM), md_sn(1), timer(utils::Dispatcher::background(), 200, [=]() { producer.heartbeat(); }), do_merge_with_md(config::get().merge_with_md()), - store(new persistence::SqliteStore("ex_sim_orders")) {} + store(new persistence::SqliteStore("ex_sim_orders_" + api::Venue_Name(venue))) {} IDGenerator m_generator; + bts::api::Venue venue; md::MDProducer producer; std::map md_consumer_recs; std::map md_producer_handles; @@ -120,7 +122,7 @@ struct ExchangeSimApplication::PImpl { std::mutex lock; }; -ExchangeSimApplication::ExchangeSimApplication() : me(new PImpl()) { +ExchangeSimApplication::ExchangeSimApplication(bts::api::Venue venue) : me(new PImpl(venue)) { auto previous_book = me->store->retrieve_all(); auto all = me->store->retrieve_all()["books"]; @@ -509,7 +511,7 @@ void ExchangeSimApplication::update_md(std::string const &sec_desc) { } std::string get_sim_sec_desc(api::Security const &src_sec) { - return std::string("SIM:") + src_sec.glbx().security_desc(); + return std::string("SIM:") + securities::descriptor(src_sec); } void negate_id(api::Security *sec) { @@ -533,18 +535,29 @@ void ExchangeSimApplication::persist_book(OrderBook const &b) { void ExchangeSimApplication::on_new_security(api::Security const &s) { std::lock_guard l(me->lock); if (!s.has_synthetic()) { - md::with_security_like(s, [this, s](auto &fs) { - auto s2 = s; - *s2.mutable_glbx()->mutable_security_desc() = get_sim_sec_desc(s); - s2.set_exchange(api::VENUE_SIM); + md::with_security_like(s, [this, s](auto &fs) + { + auto s2 = s; + if(s.exchange() == api::VENUE_GLBX && me->venue == api::VENUE_SIM) + { + *s2.mutable_glbx()->mutable_security_desc() = get_sim_sec_desc(s); + s2.set_exchange(api::VENUE_SIM); + } + else if(me->venue == api::VENUE_ICE && me->venue == api::VENUE_SIMICE) + { + *s2.mutable_ice()->mutable_security_desc() = get_sim_sec_desc(s); + s2.set_exchange(api::VENUE_SIMICE); + } + else + return; + s2.set_exchange(me->venue); negate_id(&s2); md::convert_security(s2, fs, true); md::MDProducerHandle handle = me->producer.add_security(fs); auto sec_desc = securities::descriptor(s2); me->md_producer_handles.insert(make_pair(sec_desc, handle)); - me->md_consumer_recs.insert( - make_pair(s.glbx().security_desc(), - MDConsumerRec{s2, utils::TimeStamp::now()})); + me->md_consumer_recs.insert(make_pair(securities::descriptor(s), + MDConsumerRec{s2, utils::TimeStamp::now()})); }); } } @@ -609,8 +622,9 @@ void ExchangeSimApplication::on_depth( if (!me->do_merge_with_md) return; - auto it = me->md_consumer_recs.find(sec.glbx().security_desc()); - bts_assert(it != me->md_consumer_recs.end()); + auto it = me->md_consumer_recs.find(securities::descriptor(sec)); + if(it == me->md_consumer_recs.end()) + return; auto &matcher = me->matchers[get_sim_sec_desc(sec)]; Book previous_md_book = matcher.get_book(); @@ -630,7 +644,7 @@ void ExchangeSimApplication::on_depth( // from the differences between current_md_book and previous_md_book // we generate a set of orders that we apply to our order book - merge_with_order_book(it->second.security.glbx().security_desc(), + merge_with_order_book(securities::descriptor(it->second.security), previous_md_book, current_md_book); // pass on implied market unchanged diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.h b/src/server/sparkd/exchange_sim/ExchangeSimApplication.h index 5261df51f..b283aebc2 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.h +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.h @@ -40,6 +40,7 @@ GCC_DIAG_OFF("-Wignored-qualifiers") #include #include #include "server/sparkd/exchange_sim/IMDPlayerObserver.h" +#include "lib/domain_model/Security.pb.h" namespace bts { namespace api {class Security;} @@ -55,7 +56,7 @@ class ExchangeSimApplication public FIX::MessageCracker { public: - ExchangeSimApplication(); + ExchangeSimApplication(bts::api::Venue venue); ~ExchangeSimApplication(); void merge_with_md_book(); diff --git a/tools/spark_vm_shell.sh b/tools/spark_vm_shell.sh index b2bd64634..dbc0c8ab1 100755 --- a/tools/spark_vm_shell.sh +++ b/tools/spark_vm_shell.sh @@ -8,7 +8,7 @@ docker run \ -p 8001:8001 \ -p 8080:8080 \ --net host \ - --shm-size=1024m \ + --shm-size=2048m \ -v /etc/passwd:/etc/passwd \ -v /etc/group:/etc/group \ -v /etc/shadow:/etc/shadow \ From 11425a898f63acde58b1f1a179dee76ff4579bbd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Apr 2019 17:58:28 -0400 Subject: [PATCH 012/225] honing in on simice --- src/lib/config/defaults/Symbols.conf | 6 +- src/lib/config/protos/Symbols.proto | 1 + src/lib/md/PlatformLoader.cpp | 57 ++++++++++++------- .../exchange_sim/ExchangeSimApplication.cpp | 1 - 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 5ca194bbc..78528d078 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -106,12 +106,14 @@ Symbols { sim { future: @SymbolLists.list[GLBX].symbol spread: @SymbolLists.list[GLBX].symbol - future: @SymbolLists.list[ICE].symbol - spread: @SymbolLists.list[ICE].symbol } ice { future: @SymbolLists.list[ICE].symbol spread: @SymbolLists.list[ICE].symbol } + simice { + future: @SymbolLists.list[ICE].symbol + spread: @SymbolLists.list[ICE].symbol + } } } diff --git a/src/lib/config/protos/Symbols.proto b/src/lib/config/protos/Symbols.proto index 6d859c13f..0d71ab37f 100644 --- a/src/lib/config/protos/Symbols.proto +++ b/src/lib/config/protos/Symbols.proto @@ -20,4 +20,5 @@ message Symbols { optional SecurityExchangeList glbx = 10; optional SecurityExchangeList sim = 20; optional SecurityExchangeList ice = 30; + optional SecurityExchangeList simice = 40; } \ No newline at end of file diff --git a/src/lib/md/PlatformLoader.cpp b/src/lib/md/PlatformLoader.cpp index 4188210f5..0de76bdcf 100644 --- a/src/lib/md/PlatformLoader.cpp +++ b/src/lib/md/PlatformLoader.cpp @@ -90,7 +90,7 @@ void add_symbols_to_result( size_t get_system_md_symbols(api::Venue exchange, SecurityType type, std::set &result) { - bts_assert(config::system_symbols::Symbols::descriptor()->field_count() == 3); + bts_assert(config::system_symbols::Symbols::descriptor()->field_count() == 4); { auto const &e = config::get().glbx(); if (exchange == api::VENUE_UNSET || exchange == api::VENUE_GLBX) { @@ -146,34 +146,47 @@ size_t get_system_md_symbols(api::Venue exchange, SecurityType type, { auto const &e = config::get().sim(); - if (exchange == api::VENUE_UNSET || exchange == api::VENUE_SIM) { - if (type == api::SECURITYTYPE_FUTURE || - type == api::SECURITYTYPE_UNSET) { - add_symbols_to_result(e.future(), api::VENUE_SIM, - api::SECURITYTYPE_FUTURE, &result); - } - if (type == api::SECURITYTYPE_OPTION || - type == api::SECURITYTYPE_UNSET) { - add_symbols_to_result(e.option(), api::VENUE_SIM, - api::SECURITYTYPE_OPTION, &result); - } - if (type == api::SECURITYTYPE_SPREAD || - type == api::SECURITYTYPE_UNSET) { - add_symbols_to_result(e.spread(), api::VENUE_SIM, - api::SECURITYTYPE_SPREAD, &result); - } + if (exchange == api::VENUE_UNSET || exchange == api::VENUE_SIM) + { + if (type == api::SECURITYTYPE_FUTURE || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.future(), api::VENUE_SIM, api::SECURITYTYPE_FUTURE, &result); + if (type == api::SECURITYTYPE_OPTION || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.option(), api::VENUE_SIM, api::SECURITYTYPE_OPTION, &result); + if (type == api::SECURITYTYPE_SPREAD || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.spread(), api::VENUE_SIM, api::SECURITYTYPE_SPREAD, &result); } - if (exchange == api::VENUE_BTS || exchange == api::VENUE_UNSET) { + if (exchange == api::VENUE_BTS || exchange == api::VENUE_UNSET) + { std::set all_symbols; all_symbols.insert(e.future().begin(), e.future().end()); all_symbols.insert(e.option().begin(), e.option().end()); all_symbols.insert(e.spread().begin(), e.spread().end()); - for (const auto &symbol : all_symbols) { - result.insert(UserSymbol(symbol, api::VENUE_BTS, - api::SECURITYTYPE_SYNTHETIC)); - } + for (const auto &symbol : all_symbols) + result.insert(UserSymbol(symbol, api::VENUE_BTS, api::SECURITYTYPE_SYNTHETIC)); } } + + { + auto const &e = config::get().simice(); + if (exchange == api::VENUE_UNSET || exchange == api::VENUE_SIMICE) + { + if (type == api::SECURITYTYPE_FUTURE || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.future(), api::VENUE_SIMICE, api::SECURITYTYPE_FUTURE, &result); + if (type == api::SECURITYTYPE_OPTION || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.option(), api::VENUE_SIMICE, api::SECURITYTYPE_OPTION, &result); + if (type == api::SECURITYTYPE_SPREAD || type == api::SECURITYTYPE_UNSET) + add_symbols_to_result(e.spread(), api::VENUE_SIMICE, api::SECURITYTYPE_SPREAD, &result); + } + if (exchange == api::VENUE_BTS || exchange == api::VENUE_UNSET) + { + std::set all_symbols; + all_symbols.insert(e.future().begin(), e.future().end()); + all_symbols.insert(e.option().begin(), e.option().end()); + all_symbols.insert(e.spread().begin(), e.spread().end()); + for (const auto &symbol : all_symbols) + result.insert(UserSymbol(symbol, api::VENUE_BTS, api::SECURITYTYPE_SYNTHETIC)); + } + } return result.size(); } diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index a41517b94..a37d9ee90 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -550,7 +550,6 @@ void ExchangeSimApplication::on_new_security(api::Security const &s) { } else return; - s2.set_exchange(me->venue); negate_id(&s2); md::convert_security(s2, fs, true); md::MDProducerHandle handle = me->producer.add_security(fs); From 17e9f1ea964f69b0e612864998bda4c90f84df20 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 13:43:20 -0400 Subject: [PATCH 013/225] Ran clang-format. --- src/lib/jetfix/codec/FIXEncodingStream.h | 216 ++++++++++------------- 1 file changed, 95 insertions(+), 121 deletions(-) diff --git a/src/lib/jetfix/codec/FIXEncodingStream.h b/src/lib/jetfix/codec/FIXEncodingStream.h index 541e426b6..d138c5ea6 100644 --- a/src/lib/jetfix/codec/FIXEncodingStream.h +++ b/src/lib/jetfix/codec/FIXEncodingStream.h @@ -1,11 +1,11 @@ #pragma once -#include #include "lib/jetfix/codec/FIXBuffer.h" -#include "lib/jetfix/codec/MessageTypes.h" #include "lib/jetfix/codec/FIXFragment.h" -#include "lib/jetfix/codec/Fields.h" #include "lib/jetfix/codec/FieldDefinitions.h" +#include "lib/jetfix/codec/Fields.h" +#include "lib/jetfix/codec/MessageTypes.h" +#include #include "lib/config/protos/jetfix.pb.h" @@ -14,95 +14,72 @@ namespace jetfix { // Helper to batch the encoding of multiple FIX messages all sharing // the same FIX headers. -class FIXEncodingStream -{ -public: +class FIXEncodingStream { + public: FIXEncodingStream(config::JetFIX::Connection const &cfg, - uint32_t initial_capacity = 1024*10) - : - _msg_header_template (), - _header_template_size (), - _header_template_checksum (), - _buffer (initial_capacity), - _message_map (), - _current_msg (_buffer), - _state (State::OPEN), - _body_length_bm (), - _msg_type_bm (), - _seq_num_bm (), - _last_seq_num_bm (), - _sending_time_bm () - { - _message_map.reserve (10*1024); + uint32_t initial_capacity = 1024 * 10) + : _msg_header_template(), _header_template_size(), + _header_template_checksum(), _buffer(initial_capacity), _message_map(), + _current_msg(_buffer), _state(State::OPEN), _body_length_bm(), + _msg_type_bm(), _seq_num_bm(), _last_seq_num_bm(), _sending_time_bm() { + _message_map.reserve(10 * 1024); - FIXBuffer header_buffer (&_msg_header_template[0],_msg_header_template.size ()); - FIXFragment header (header_buffer); + FIXBuffer header_buffer(&_msg_header_template[0], + _msg_header_template.size()); + FIXFragment header(header_buffer); header.add("FIX.4.2"); - _body_length_bm = header.add(0,6); - _msg_type_bm = header.add(" ",1); - _seq_num_bm = header.add(0,9); - _last_seq_num_bm = header.add(0,9); + _body_length_bm = header.add(0, 6); + _msg_type_bm = header.add(" ", 1); + _seq_num_bm = header.add(0, 9); + _last_seq_num_bm = header.add(0, 9); _sending_time_bm = header.add( - "20150427-19:05:18.923",sizeof("20150427-19:05:18.923")-1); + "20150427-19:05:18.923", sizeof("20150427-19:05:18.923") - 1); - header.add(cfg.sender_compid ()); - header.add(cfg.target_compid ()); - header.add(cfg.target_subid ()); - _header_template_size = header.size (); - _header_template_checksum = header.checksum (); + header.add(cfg.sender_compid()); + header.add(cfg.target_compid()); + header.add(cfg.target_subid()); + _header_template_size = header.size(); + _header_template_checksum = header.checksum(); } - inline FIXFragment &new_msg (MessageTypes type) - { - bts_assert (_state == State::OPEN); - tidy_last_msg (); - - auto msg_offset = _buffer.size (); - _message_map.emplace_back (msg_offset,0u,0u,0u,FIXFragment::Bookmark>()); - _current_msg = FIXFragment (_buffer); - _current_msg.append (&_msg_header_template[0], - _header_template_size, - _header_template_checksum); - char msg_type_str[1] = {(char) type}; - _current_msg.overwrite (_msg_type_bm.shift (msg_offset),msg_type_str,1); + inline FIXFragment &new_msg(MessageTypes type) { + bts_assert(_state == State::OPEN); + tidy_last_msg(); + + auto msg_offset = _buffer.size(); + _message_map.emplace_back(msg_offset, 0u, 0u, 0u, + FIXFragment::Bookmark>()); + _current_msg = FIXFragment(_buffer); + _current_msg.append(&_msg_header_template[0], _header_template_size, + _header_template_checksum); + char msg_type_str[1] = {(char)type}; + _current_msg.overwrite(_msg_type_bm.shift(msg_offset), msg_type_str, 1); return _current_msg; } - - inline void close () - { - bts_assert (_state == State::OPEN); - tidy_last_msg (); + + inline void close() { + bts_assert(_state == State::OPEN); + tidy_last_msg(); _state = State::CLOSED; } - inline void reopen_empty () - { - bts_assert (_state == State::CLOSED); - bts_assert (_message_map.empty ()); + inline void reopen_empty() { + bts_assert(_state == State::CLOSED); + bts_assert(_message_map.empty()); _state = State::OPEN; } - - inline uint32_t size () const - {return _buffer.size ();} - inline const char* data () const - {return _buffer.data ();} + inline uint32_t size() const { return _buffer.size(); } - struct MessageDesc - { - MessageDesc (uint32_t offset, - uint32_t size, - uint32_t checksum, - uint32_t seq_num, - FIXFragment::Bookmark checksum_bm) - : offset (offset), - size (size), - checksum (checksum), - seq_num (seq_num), - checksum_bm (checksum_bm) - {} - + inline const char *data() const { return _buffer.data(); } + + struct MessageDesc { + MessageDesc(uint32_t offset, uint32_t size, uint32_t checksum, + uint32_t seq_num, + FIXFragment::Bookmark checksum_bm) + : offset(offset), size(size), checksum(checksum), seq_num(seq_num), + checksum_bm(checksum_bm) {} uint32_t offset; uint32_t size; @@ -110,68 +87,65 @@ public: uint32_t seq_num; FIXFragment::Bookmark checksum_bm; }; - - std::string to_str () const - { + + std::string to_str() const { std::string result; - - if (size ()) { + + if (size()) { // return std::string(data(),size() is simpler but valgrind // reports a warning in that call - result.resize (size ()); - std::copy (data (), data ()+size(),result.begin ()); + result.resize(size()); + std::copy(data(), data() + size(), result.begin()); } return result; } - std::string to_human_str () const - { - auto s = to_str (); - std::replace( s.begin(), s.end(), '\001', '|' ); + std::string to_human_str() const { + auto s = to_str(); + std::replace(s.begin(), s.end(), '\001', '|'); return s; } - - inline uint32_t stamp (uint32_t seq_num,uint32_t last_processed, std::string const&time_str) - { - bts_assert (_state == State::CLOSED); + + inline uint32_t stamp(uint32_t seq_num, uint32_t last_processed, + std::string const &time_str) { + bts_assert(_state == State::CLOSED); _state = State::STAMPED; for (auto &m : _message_map) { ++seq_num; m.seq_num = seq_num; - FIXFragment frag (_buffer,m.checksum); - frag.overwrite (_seq_num_bm.shift (m.offset),m.seq_num,9); - frag.overwrite (_last_seq_num_bm.shift (m.offset),last_processed,9); - frag.overwrite (_sending_time_bm.shift (m.offset),time_str); - frag.overwrite_checksum (m.checksum_bm,frag.checksum () % 256); + FIXFragment frag(_buffer, m.checksum); + frag.overwrite(_seq_num_bm.shift(m.offset), m.seq_num, 9); + frag.overwrite(_last_seq_num_bm.shift(m.offset), last_processed, 9); + frag.overwrite(_sending_time_bm.shift(m.offset), time_str); + frag.overwrite_checksum(m.checksum_bm, frag.checksum() % 256); } return seq_num; } - inline void reset () - { - _buffer.reset (); - _message_map.clear (); + inline void reset() { + _buffer.reset(); + _message_map.clear(); _state = State::OPEN; } - inline bool is_closed () const - {return _state == State::CLOSED;} + inline bool is_closed() const { return _state == State::CLOSED; } - size_t n_msgs () const {return _message_map.size ();} - - std::vector const &msg_map () const {return _message_map;} -private: - std::array _msg_header_template; + size_t n_msgs() const { return _message_map.size(); } + + std::vector const &msg_map() const { return _message_map; } + + private: + std::array _msg_header_template; uint32_t _header_template_size; uint32_t _header_template_checksum; FIXBuffer _buffer; std::vector _message_map; FIXFragment _current_msg; - enum class State { OPEN,CLOSED,STAMPED}; + enum class State { OPEN, CLOSED, STAMPED }; State _state; - + FIXFragment::Bookmark _body_length_bm; FIXFragment::Bookmark _msg_type_bm; FIXFragment::Bookmark _seq_num_bm; @@ -179,20 +153,20 @@ private: typedef StringField SendingTimeStr; FIXFragment::Bookmark _sending_time_bm; - inline void tidy_last_msg () - { - if (_message_map.size ()) { - auto &this_msg_map = _message_map.back (); - auto start = - this_msg_map.offset + _msg_type_bm.offset - fix::MsgType::tag_sz-1; - auto end = _buffer.size (); - _current_msg.overwrite (_body_length_bm.shift (this_msg_map.offset), - end-start,6); - this_msg_map.checksum = _current_msg.checksum (); - this_msg_map.checksum_bm = _current_msg.add_checksum (0); - this_msg_map.size = _buffer.size () - this_msg_map.offset; + inline void tidy_last_msg() { + if (_message_map.size()) { + auto &this_msg_map = _message_map.back(); + auto start = this_msg_map.offset + _msg_type_bm.offset - + fix::MsgType::tag_sz - 1; + auto end = _buffer.size(); + _current_msg.overwrite(_body_length_bm.shift(this_msg_map.offset), + end - start, 6); + this_msg_map.checksum = _current_msg.checksum(); + this_msg_map.checksum_bm = _current_msg.add_checksum(0); + this_msg_map.size = _buffer.size() - this_msg_map.offset; } } }; -}} +} // namespace jetfix +} // namespace bts From 84b9ca30969d9e6a85666881b253a3d034c7bee5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Apr 2019 17:07:40 -0400 Subject: [PATCH 014/225] Added jetfix suppport for multi char message types. --- src/lib/jetfix/codec/FIXEncodingStream.h | 67 +++++++++++++++++------- src/lib/jetfix/codec/MessageTypes.h | 5 +- 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/src/lib/jetfix/codec/FIXEncodingStream.h b/src/lib/jetfix/codec/FIXEncodingStream.h index d138c5ea6..502c3786c 100644 --- a/src/lib/jetfix/codec/FIXEncodingStream.h +++ b/src/lib/jetfix/codec/FIXEncodingStream.h @@ -20,17 +20,19 @@ class FIXEncodingStream { uint32_t initial_capacity = 1024 * 10) : _msg_header_template(), _header_template_size(), _header_template_checksum(), _buffer(initial_capacity), _message_map(), - _current_msg(_buffer), _state(State::OPEN), _body_length_bm(), - _msg_type_bm(), _seq_num_bm(), _last_seq_num_bm(), _sending_time_bm() { + _current_msg(_buffer), _state(State::OPEN), _seq_num_bm(), + _last_seq_num_bm(), _sending_time_bm() { _message_map.reserve(10 * 1024); FIXBuffer header_buffer(&_msg_header_template[0], _msg_header_template.size()); FIXFragment header(header_buffer); - header.add("FIX.4.2"); - _body_length_bm = header.add(0, 6); - _msg_type_bm = header.add(" ", 1); + // We cannot include body lenght and msg type in the header + // because message type is not fixed lenght, and therefore its + // not possible to have bookmarks to fields after it, ahead of + // knowing the message type value. The rest of the header is + // fixed lenght so we form it here. _seq_num_bm = header.add(0, 9); _last_seq_num_bm = header.add(0, 9); _sending_time_bm = header.add( @@ -48,13 +50,21 @@ class FIXEncodingStream { tidy_last_msg(); auto msg_offset = _buffer.size(); - _message_map.emplace_back(msg_offset, 0u, 0u, 0u, - FIXFragment::Bookmark>()); + _current_msg = FIXFragment(_buffer); + _begin_string_bm = _current_msg.add("FIX.4.2"); + _body_length_bm = _current_msg.add(0, 6); + + char mt_encoding[4]; + auto start = encode_message_type(type, mt_encoding); + _msg_type_bm = _current_msg.add( + mt_encoding + start, sizeof(mt_encoding) - start); + + auto header_offset = _buffer.size(); + _message_map.emplace_back(msg_offset, header_offset, 0u, 0u, 0u, + FIXFragment::Bookmark>()); _current_msg.append(&_msg_header_template[0], _header_template_size, _header_template_checksum); - char msg_type_str[1] = {(char)type}; - _current_msg.overwrite(_msg_type_bm.shift(msg_offset), msg_type_str, 1); return _current_msg; } @@ -75,13 +85,14 @@ class FIXEncodingStream { inline const char *data() const { return _buffer.data(); } struct MessageDesc { - MessageDesc(uint32_t offset, uint32_t size, uint32_t checksum, - uint32_t seq_num, + MessageDesc(uint32_t offset, uint32_t header_offset, uint32_t size, + uint32_t checksum, uint32_t seq_num, FIXFragment::Bookmark checksum_bm) - : offset(offset), size(size), checksum(checksum), seq_num(seq_num), - checksum_bm(checksum_bm) {} + : offset(offset), header_offset(header_offset), size(size), + checksum(checksum), seq_num(seq_num), checksum_bm(checksum_bm) {} uint32_t offset; + uint32_t header_offset; uint32_t size; uint32_t checksum; uint32_t seq_num; @@ -116,9 +127,10 @@ class FIXEncodingStream { m.seq_num = seq_num; FIXFragment frag(_buffer, m.checksum); - frag.overwrite(_seq_num_bm.shift(m.offset), m.seq_num, 9); - frag.overwrite(_last_seq_num_bm.shift(m.offset), last_processed, 9); - frag.overwrite(_sending_time_bm.shift(m.offset), time_str); + frag.overwrite(_seq_num_bm.shift(m.header_offset), m.seq_num, 9); + frag.overwrite(_last_seq_num_bm.shift(m.header_offset), last_processed, + 9); + frag.overwrite(_sending_time_bm.shift(m.header_offset), time_str); frag.overwrite_checksum(m.checksum_bm, frag.checksum() % 256); } return seq_num; @@ -146,8 +158,13 @@ class FIXEncodingStream { enum class State { OPEN, CLOSED, STAMPED }; State _state; + // These bookmarks point to the current msg (not the header) + FIXFragment::Bookmark _begin_string_bm; FIXFragment::Bookmark _body_length_bm; FIXFragment::Bookmark _msg_type_bm; + + // These bookmarks point to the header and thus have to be shifted + // by the offset of the end of the message type. FIXFragment::Bookmark _seq_num_bm; FIXFragment::Bookmark _last_seq_num_bm; typedef StringField SendingTimeStr; @@ -156,16 +173,26 @@ class FIXEncodingStream { inline void tidy_last_msg() { if (_message_map.size()) { auto &this_msg_map = _message_map.back(); - auto start = this_msg_map.offset + _msg_type_bm.offset - - fix::MsgType::tag_sz - 1; + auto start = _msg_type_bm.offset - fix::MsgType::tag_sz - 1; auto end = _buffer.size(); - _current_msg.overwrite(_body_length_bm.shift(this_msg_map.offset), - end - start, 6); + _current_msg.overwrite(_body_length_bm, end - start, 6); this_msg_map.checksum = _current_msg.checksum(); this_msg_map.checksum_bm = _current_msg.add_checksum(0); this_msg_map.size = _buffer.size() - this_msg_map.offset; } } + + uint32_t encode_message_type(MessageTypes m, char out[4]) { + auto mt = (uint32_t)m; + for (int i = 0; i < 4; i++) { + out[i] = mt >> (8 * (3 - i)); + mt &= ((1 << (8 * (3 - i))) - 1); + } + for (int i = 0; i < 4; i++) + if (out[i]) + return i; + return 0; + } }; } // namespace jetfix diff --git a/src/lib/jetfix/codec/MessageTypes.h b/src/lib/jetfix/codec/MessageTypes.h index 39dfd7b34..d0b2b4ba9 100644 --- a/src/lib/jetfix/codec/MessageTypes.h +++ b/src/lib/jetfix/codec/MessageTypes.h @@ -5,7 +5,7 @@ namespace bts { namespace jetfix { -enum class MessageTypes +enum class MessageTypes : uint32_t { Advertisement = '7', Allocation = 'J', @@ -48,7 +48,8 @@ enum class MessageTypes SettlementInstructions = 'T', TestRequest = '1', TradingSessionStatus = 'h', - TradingSessionStatusRequest = 'g' + TradingSessionStatusRequest = 'g', + ICETraderLogin = ('U' << 16) + ('C' << 8) + 'G', }; }} From 5591c8316d718a0bf9c2df40b265755758628e6f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 16 Apr 2019 13:18:39 -0400 Subject: [PATCH 015/225] about to send a login message --- src/lib/config/defaults/jetfix.conf | 6 ++- ...onGateway.cpp => GLBXExecutionGateway.cpp} | 38 +++++++-------- ...cutionGateway.h => GLBXExecutionGateway.h} | 8 ++-- .../orderman/actors/ICEExecutionGateway.cpp | 3 ++ src/lib/orderman/actors/IExecutionGateway.cpp | 4 +- .../actors/order_manager/OrderServicesData.h | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 48 +++++++++++-------- src/lib/orderman/orders/ICENativeOrder.h | 2 + 8 files changed, 64 insertions(+), 47 deletions(-) rename src/lib/orderman/actors/{ExecutionGateway.cpp => GLBXExecutionGateway.cpp} (90%) rename src/lib/orderman/actors/{ExecutionGateway.h => GLBXExecutionGateway.h} (84%) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 11161f6df..d32188082 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -45,8 +45,10 @@ JetFIX { platform: ICE use_cme_secure_logon: false - socket_connect_host_ip: "63.247.113.154" - socket_connect_port: 443 #80 + #socket_connect_host_ip: "63.247.113.154" + #socket_connect_port: 443 #80 + socket_connect_host_ip: "127.0.0.1" + socket_connect_port: 800 sender_compid: "51239" target_compid: "ICE" diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/GLBXExecutionGateway.cpp similarity index 90% rename from src/lib/orderman/actors/ExecutionGateway.cpp rename to src/lib/orderman/actors/GLBXExecutionGateway.cpp index 659c3ad31..3903c8488 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/GLBXExecutionGateway.cpp @@ -1,4 +1,4 @@ -#include "ExecutionGateway.h" +#include "GLBXExecutionGateway.h" #include "lib/jetfix/codec/MessageDefinitions.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/jetfix/gateway/JetFIXGateway.h" @@ -23,7 +23,7 @@ using JFGw = JetFIXGateway; -struct ExecutionGateway::PImpl { +struct GLBXExecutionGateway::PImpl { PImpl(config::JetFIX::Connection const &cfg, trace::PerfLog &l) : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_descriptor(), gw_name(cfg.name()), @@ -43,16 +43,16 @@ struct ExecutionGateway::PImpl { trace::PerfLog &perf_log; }; -ExecutionGateway::ExecutionGateway(config::JetFIX::Connection const &cfg, +GLBXExecutionGateway::GLBXExecutionGateway(config::JetFIX::Connection const &cfg, trace::PerfLog &log) : me(new PImpl(cfg, log)) { me->state = State::WAITING_FOR_SECURITIES; } -ExecutionGateway::~ExecutionGateway() {} +GLBXExecutionGateway::~GLBXExecutionGateway() {} -void ExecutionGateway::on_admin_data(const mercury::Update &) {} +void GLBXExecutionGateway::on_admin_data(const mercury::Update &) {} -void ExecutionGateway::on_securities( +void GLBXExecutionGateway::on_securities( const mercury::Update &update) { if (update.events) { @@ -95,25 +95,25 @@ void ExecutionGateway::on_securities( } } -void ExecutionGateway::start() { me->gw.start(); } +void GLBXExecutionGateway::start() { me->gw.start(); } -OnExeReport &ExecutionGateway::on_exe_report() { return me->on_exe_report; } +OnExeReport &GLBXExecutionGateway::on_exe_report() { return me->on_exe_report; } -OnGwStatusChange &ExecutionGateway::on_gw_status_change() { +OnGwStatusChange &GLBXExecutionGateway::on_gw_status_change() { return me->on_gw_status_change; } -OnCancelReject &ExecutionGateway::on_cancel_reject() { +OnCancelReject &GLBXExecutionGateway::on_cancel_reject() { return me->on_cancel_reject; } -void ExecutionGateway::on_exe_report( +void GLBXExecutionGateway::on_exe_report( const jetfix::fix::ExecutionReportMsg &msg) { OrderKey ok; SecurityKey sk; decode_clorid(msg.get(), &ok, &sk); - auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ExecutionGateway::on_exe_report", ok.value()); + auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "GLBXExecutionGateway::on_exe_report", ok.value()); LOG(Latency, Info, "Started handling of execution report for order {}", ok.value()); @@ -254,7 +254,7 @@ void ExecutionGateway::on_exe_report( } } -void ExecutionGateway::on_cancel_reject( +void GLBXExecutionGateway::on_cancel_reject( const jetfix::fix::CancelRejectMsg &msg) { OrderKey ok; SecurityKey sk; @@ -269,7 +269,7 @@ void ExecutionGateway::on_cancel_reject( me->on_cancel_reject(ok, reject_msg); } -void ExecutionGateway::on_connection_status_change(bool is_connected) { +void GLBXExecutionGateway::on_connection_status_change(bool is_connected) { LOG(OrderMan, Info, "Connection state of {} changed to {}", me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); @@ -277,7 +277,7 @@ void ExecutionGateway::on_connection_status_change(bool is_connected) { me->on_gw_status_change(is_connected); } -void ExecutionGateway::on_business_reject( +void GLBXExecutionGateway::on_business_reject( jetfix::fix::BusinessMessageRejectMsg const &m) { LOG(OrderMan, Error, "Unexpected business reject in {} gateway . Reason: " @@ -286,7 +286,7 @@ void ExecutionGateway::on_business_reject( m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { +void GLBXExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { LOG(OrderMan, Error, "Unexpected reject message in {} gateway . Reason: {}. " "This should be investigated", @@ -294,13 +294,13 @@ void ExecutionGateway::on_session_reject(jetfix::fix::RejectMsg const &m) { m.has() ? m.get() : std::string("Unknown")); } -void ExecutionGateway::dispatch_incoming_fix_messages() { +void GLBXExecutionGateway::dispatch_incoming_fix_messages() { me->gw.dispatch_events(); } -void ExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, +void GLBXExecutionGateway::send_fix(jetfix::OutFIXPtr const &fix, trace::CorID trace) { - auto scoped_log = trace::log_scope(me->perf_log,trace,"ExecutionGateway::send_fix"); + auto scoped_log = trace::log_scope(me->perf_log,trace,"GLBXExecutionGateway::send_fix"); me->gw.send(fix,trace); me->gw.dispatch_events(); } diff --git a/src/lib/orderman/actors/ExecutionGateway.h b/src/lib/orderman/actors/GLBXExecutionGateway.h similarity index 84% rename from src/lib/orderman/actors/ExecutionGateway.h rename to src/lib/orderman/actors/GLBXExecutionGateway.h index ff5f3cc92..1e318d580 100644 --- a/src/lib/orderman/actors/ExecutionGateway.h +++ b/src/lib/orderman/actors/GLBXExecutionGateway.h @@ -7,10 +7,10 @@ namespace orderman { // fix execution gateway for a single FIX session -class ExecutionGateway : public IExecutionGateway { +class GLBXExecutionGateway : public IExecutionGateway { public: - ExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); - virtual ~ExecutionGateway(); + GLBXExecutionGateway(config::JetFIX::Connection const &, trace::PerfLog &); + virtual ~GLBXExecutionGateway(); void start() override; void dispatch_incoming_fix_messages() override; @@ -23,7 +23,7 @@ class ExecutionGateway : public IExecutionGateway { OnCancelReject &on_cancel_reject() override; private: - BTS_NO_COPY(ExecutionGateway); + BTS_NO_COPY(GLBXExecutionGateway); enum class State { WAITING_FOR_SECURITIES, READY }; struct PImpl; std::unique_ptr me; diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index c2fa23a9b..71d9257db 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -127,6 +127,9 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() buffer.add(ice.authorized_trader()); buffer.add(ice.password()); //TODO MIFID Defaults + + trace::CorID trace; + send_fix(result, trace); } } LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", nusers, me->gw_name.value()); diff --git a/src/lib/orderman/actors/IExecutionGateway.cpp b/src/lib/orderman/actors/IExecutionGateway.cpp index f70fd9260..7bfe8efec 100644 --- a/src/lib/orderman/actors/IExecutionGateway.cpp +++ b/src/lib/orderman/actors/IExecutionGateway.cpp @@ -1,7 +1,7 @@ #include "IExecutionGateway.h" #include "ICEExecutionGateway.h" -#include "ExecutionGateway.h" +#include "GLBXExecutionGateway.h" namespace bts { namespace orderman { @@ -13,7 +13,7 @@ ExecutionGatewayFactory::create_gateway(const config::JetFIX::Connection& conn, conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) return std::make_unique(conn, pl); else - return std::make_unique(conn, pl); + return std::make_unique(conn, pl); } } // namespace orderman diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 2e6cf1288..d3e0e9c4a 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -9,7 +9,7 @@ #include "lib/mercury/events/TimerEvent.h" #include "lib/md/SecurityOracle.h" -#include "lib/orderman/actors/ExecutionGateway.h" +#include "lib/orderman/actors/IExecutionGateway.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/BookUpdateEvent.h" #include "lib/orderman/events/TickerUpdateEvent.h" diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index bd5835327..3e68d3e51 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -51,6 +51,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; jetfix::FIXFragment::Bookmark update_transact_time_bm; + jetfix::FIXFragment::Bookmark update_clordid_bm; jetfix::FIXFragment create_encoding; jetfix::FIXFragment::Bookmark create_price_bm; @@ -58,7 +59,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment::Bookmark create_transact_time_bm; jetfix::FIXFragment cancel_encoding; - //jetfix::FIXFragment::Bookmark cancel_transact_time_bm; + jetfix::FIXFragment::Bookmark cancel_clordid_bm; OrderServices::ExeReportSubID exe_report_sid; OrderServices::CancelRejectSubID cancel_reject_sid; @@ -580,6 +581,9 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); + + static uint32_t update_id = 10000; //TODO Pedro please look + me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, get_clordid(update_id++), ice_orderid_sz() ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, @@ -685,10 +689,10 @@ OrderOpResult ICENativeOrder::on_cancel() { case ORDER_STATUS_WORKING: { - //auto &encoding = me->cancel_encoding; - //auto const &ts = me->services->get_time_str(); - //me->cancel_transact_time_bm = encoding.overwrite( me->cancel_transact_time_bm, &ts.value()[0], ts.value().size() ); - + auto &encoding = me->cancel_encoding; + static uint32_t cancel_id = 0; //TODO Pedro please look + me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, get_clordid(cancel_id++), ice_orderid_sz() ); + me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel, me->cancel_encoding); @@ -970,6 +974,20 @@ void ICENativeOrder::report_state() me->services->report_state(me->state); } +int ICENativeOrder::get_clordid(uint32_t bts_id) +{ + std::string orderid(ice_orderid_sz(), ' '); + u32_toa(bts_id, &orderid[0]); // order id + int totalsz = me->sender_comp_id.size() + orderid.size(); + if(totalsz < 9) //9 is min size + orderid = std::string(9-totalsz, '0').append(orderid); + else if(totalsz > 12) //12 is max + orderid = orderid.substr(totalsz-12, orderid.size() - (totalsz-12)); + std::string combined_clorid = me->sender_comp_id + orderid; + int id = std::atoi(combined_clorid.c_str()); + return id; +} + void ICENativeOrder::init_fix() { bts_assert(me->sec); @@ -987,20 +1005,12 @@ void ICENativeOrder::init_fix() std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - std::string orderid(ice_orderid_sz(), ' '); - u32_toa(key().value(), &orderid[0]); // order id - int totalsz = me->sender_comp_id.size() + orderid.size(); - if(totalsz < 9) //9 is min size - orderid = std::string(9-totalsz, '0').append(orderid); - else if(totalsz > 12) //12 is max - orderid = orderid.substr(totalsz-12, orderid.size() - (totalsz-12)); - std::string combined_clorid = me->sender_comp_id + orderid; - + int combined_clorid = get_clordid(key().value()); // initialize create FIX auto &create_encoding = me->create_encoding; create_encoding.add(memo); - create_encoding.add(std::atoi(combined_clorid.c_str())); + create_encoding.add(combined_clorid); create_encoding.add(std::atoi(rr.company_id().c_str())); //create_encoding.add(""); //optional, unclear if we need create_encoding.add(rr.operator_id()); @@ -1026,8 +1036,8 @@ void ICENativeOrder::init_fix() // initialize update FIX auto &update_encoding = me->update_encoding; - update_encoding.add(std::atoi(combined_clorid.c_str())); - update_encoding.add(std::atoi(combined_clorid.c_str())); + update_encoding.add(combined_clorid); + update_encoding.add(combined_clorid); update_encoding.add(std::atoi(rr.company_id().c_str())); //update_encoding.add(""); //optional, unclear if we need update_encoding.add(rr.operator_id()); @@ -1054,8 +1064,8 @@ void ICENativeOrder::init_fix() // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; - cancel_encoding.add(std::atoi(combined_clorid.c_str())); - cancel_encoding.add(std::atoi(combined_clorid.c_str())); + cancel_encoding.add(combined_clorid); + cancel_encoding.add(combined_clorid); cancel_encoding.add(std::atoi(rr.company_id().c_str())); cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index 1156c0b00..093c4468c 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -66,6 +66,8 @@ class ICENativeOrder : public NativeOrder { bool terminal_state(api::orderman::OrderStatus status) const; api::orderman::NativeOrderState & get_native_state(api::orderman::OrderState &); + + int get_clordid(uint32_t); }; } // namespace orderman From 973654138523df5c2379023049fc08b518d28d00 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 16 Apr 2019 15:59:45 -0400 Subject: [PATCH 016/225] logon rejected; we're going places --- src/lib/config/defaults/jetfix.conf | 10 +- src/lib/jetfix/codec/FieldDefinitions.h | 2 + src/lib/jetfix/gateway/Session.cpp | 75 +++++++----- .../orderman/actors/ICEExecutionGateway.cpp | 115 +++++++++++------- src/lib/orderman/actors/ICEExecutionGateway.h | 2 +- 5 files changed, 118 insertions(+), 86 deletions(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index d32188082..c98aabeb2 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -39,16 +39,14 @@ JetFIXSimConnection { JetFIX { rule: "CannedCertSession.name='ice_cert'" value { - connection: @JetFIXSimConnection.sim + #connection: @JetFIXSimConnection.sim_ice connection { name: "ice_cert" platform: ICE use_cme_secure_logon: false - - #socket_connect_host_ip: "63.247.113.154" - #socket_connect_port: 443 #80 - socket_connect_host_ip: "127.0.0.1" - socket_connect_port: 800 + log_fix_stream: true + socket_connect_host_ip: "63.247.113.154" + socket_connect_port: 80 sender_compid: "51239" target_compid: "ICE" diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index b35277dac..74aa67760 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -127,6 +127,8 @@ typedef StringField<144> OnBehalfOfLocationID; typedef StringField<9139> OriginatorUserID; typedef CharField<18> ExecInst; typedef IntField<210> MaxShow; +typedef IntField<9006> ICEStrategyPreference; +typedef IntField<9007> ICETimeStampPreference; typedef Group(application); buffer.add("1.0"); buffer.add("BTS"); + + buffer.add(session_cfg.user_name()); + buffer.add(session_cfg.raw_data().size()); + buffer.add(session_cfg.raw_data()); + buffer.add(0); + buffer.add(1); + buffer.add(0); } else { buffer.add(application); buffer.add("1.0"); buffer.add("BTS"); - } - if (session_cfg.has_trading_session_id()) { - buffer.add(1); - buffer.add(session_cfg.trading_session_id()); - } - if (session_cfg.has_udf_support_indicator()) - buffer.add(session_cfg.udf_support_indicator()); + if (session_cfg.has_trading_session_id()) { + buffer.add(1); + buffer.add(session_cfg.trading_session_id()); + } + if (session_cfg.has_udf_support_indicator()) + buffer.add(session_cfg.udf_support_indicator()); - if (session_cfg.use_cme_secure_logon()) { - bts_assert(session_cfg.sender_compid().size() >= 3); - auto session_id = session_cfg.sender_compid().substr(0, 3); - std::string seq_num_str(9, ' '); - i32_toa(seq_num, &seq_num_str[0], 9); + if (session_cfg.use_cme_secure_logon()) { + bts_assert(session_cfg.sender_compid().size() >= 3); + auto session_id = session_cfg.sender_compid().substr(0, 3); + std::string seq_num_str(9, ' '); + i32_toa(seq_num, &seq_num_str[0], 9); - std::string last_seq_num_str(9, ' '); - i32_toa(last_seq_num_processed, &last_seq_num_str[0], 9); - auto ld = glbx::calculate_hmac( - session_id, seq_num_str, session_cfg.sender_compid(), - session_cfg.sender_subid(), time_str, session_cfg.target_subid(), - std::to_string(session_cfg.seconds_between_hbs()), - session_cfg.sender_locationid(), last_seq_num_str, application, "1.0", - "BTS"); -#ifndef BTS_EDGE - LOG(Jetfix, Info, "Canonical string for secure logon: {}", ld.canonical); -#endif - buffer.add(ld.access_key.size()); - buffer.add(ld.access_key); - buffer.add("CME-1-SHA-256"); - buffer.add(ld.signature.size()); - buffer.add(ld.signature); - } else { - buffer.add(session_cfg.raw_data().size()); - buffer.add(session_cfg.raw_data()); - if(session_cfg.user_name() != "") - buffer.add(session_cfg.user_name()); + std::string last_seq_num_str(9, ' '); + i32_toa(last_seq_num_processed, &last_seq_num_str[0], 9); + auto ld = glbx::calculate_hmac( + session_id, seq_num_str, session_cfg.sender_compid(), + session_cfg.sender_subid(), time_str, session_cfg.target_subid(), + std::to_string(session_cfg.seconds_between_hbs()), + session_cfg.sender_locationid(), last_seq_num_str, application, "1.0", + "BTS"); + #ifndef BTS_EDGE + LOG(Jetfix, Info, "Canonical string for secure logon: {}", ld.canonical); + #endif + buffer.add(ld.access_key.size()); + buffer.add(ld.access_key); + buffer.add("CME-1-SHA-256"); + buffer.add(ld.signature.size()); + buffer.add(ld.signature); + } + else + { + buffer.add(session_cfg.raw_data().size()); + buffer.add(session_cfg.raw_data()); + if(session_cfg.user_name() != "") + buffer.add(session_cfg.user_name()); + } } stream.close(); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 71d9257db..868cd61e9 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -90,26 +90,70 @@ void ICEExecutionGateway::on_securities(const mercury::Updatestate == State::WAITING_FOR_SECURITIES) { LOG(OrderMan, Warn, "Received first set of {} securities. Beginning wait 2s for trader login {}", - update.events->size(), me->gw_name.value()); - + update.events->size(), me->gw_name.value()); // got our security synopsis, ready to start the GW - me->state = State::WAITING_FOR_LOGINTIMEOUT; - bts::utils::Dispatcher::background().post([this]() - { - this->on_trader_login_timeout_expired(); - }, 2000); + me->state = State::READY_TO_START_GW; + + // subscribe to gateway events + me->gw.on() = [this](auto const &msg) + { + this->on_exe_report(msg); + }; + me->gw.on() = [this](auto const &msg) + { + this->on_cancel_reject(msg); + }; + me->gw.on_ready() = [this]() + { + this->on_connection_status_change(true); + }; + me->gw.on_disconnect() = [this]() + { + this->on_connection_status_change(false); + }; + me->gw.on() = [this](auto const &m) + { + this->on_business_reject(m); + }; + me->gw.on() = [this](auto const &m) + { + this->on_session_reject(m); + }; } } } +void ICEExecutionGateway::start() +{ + me->gw.start(); + bts_assert_msg(me->state == State::READY_TO_START_GW, "ICEExecutionGateway statemachine failure"); +} + +void ICEExecutionGateway::on_connection_status_change(bool is_connected) +{ + LOG(OrderMan, Info, "Connection state of {} changed to {}", + me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); + me->on_gw_status_change(is_connected); + + if(is_connected && me->state == State::READY_TO_START_GW) + { + me->state = State::TRADER_LOGIN_TIMEOUT; + bts::utils::Dispatcher::background().post([this]() + { + this->on_trader_login_timeout_expired(); + }, 2000); + } +} + + void ICEExecutionGateway::on_trader_login_timeout_expired() { - if (me->state == State::WAITING_FOR_LOGINTIMEOUT) + if (me->state == State::TRADER_LOGIN_TIMEOUT) { LOG(OrderMan, Warn, "Done waiting for login timeout, logging on traders {}", me->gw_name.value()); // got our security synopsis, ready to start the GW - me->state = State::CONNECTED_PENDING_TRADER_LOGIN; + me->state = State::LOGIN_TIMEOUT_COMPLETE; int nusers = -1; for(const auto& u : me->admin_data.users()) { @@ -133,6 +177,19 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() } } LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", nusers, me->gw_name.value()); + if(nusers == -1) //TODO hardcode a user + { + auto result = std::make_shared(me->cfg); + auto &stream = result->fix.back(); + auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); + + //buffer.add(ice.company_id()); + buffer.add("bluetrd-fx"); + buffer.add("Starts123"); + nusers = 1; + trace::CorID trace; + send_fix(result, trace); + } me->gw.on() = [&](const fix::ICETraderLoginResponseMsg&) { @@ -156,40 +213,14 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() void ICEExecutionGateway::on_login() { - if (me->state == State::CONNECTED_PENDING_TRADER_LOGIN) + if (me->state == State::LOGIN_TIMEOUT_COMPLETE) { LOG(OrderMan, Warn, "Successful login traders {}", me->gw_name.value()); - - me->state = State::READY; - // subscribe to gateway events - me->gw.on() = [this](auto const &msg) - { - this->on_exe_report(msg); - }; - me->gw.on() = [this](auto const &msg) - { - this->on_cancel_reject(msg); - }; - me->gw.on_ready() = [this]() - { - this->on_connection_status_change(true); - }; - me->gw.on_disconnect() = [this]() - { - this->on_connection_status_change(false); - }; - me->gw.on() = [this](auto const &m) - { - this->on_business_reject(m); - }; - me->gw.on() = [this](auto const &m) - { - this->on_session_reject(m); - }; + me->state = State::READY; } } -void ICEExecutionGateway::start() { me->gw.start(); } + OnExeReport &ICEExecutionGateway::on_exe_report() { return me->on_exe_report; } @@ -350,14 +381,6 @@ void ICEExecutionGateway::on_cancel_reject(const jetfix::fix::ICECancelRejectMsg me->on_cancel_reject(ok, reject_msg); } -void ICEExecutionGateway::on_connection_status_change(bool is_connected) -{ - LOG(OrderMan, Info, "Connection state of {} changed to {}", - me->gw_name.value(), - is_connected ? std::string("connected") : std::string("disconnected")); - - me->on_gw_status_change(is_connected); -} void ICEExecutionGateway::on_business_reject(const jetfix::fix::BusinessMessageRejectMsg& m) { diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index aef0e264e..b7cb5dd72 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -23,7 +23,7 @@ class ICEExecutionGateway : public IExecutionGateway { private: BTS_NO_COPY(ICEExecutionGateway); - enum class State { WAITING_FOR_ADMIN, WAITING_FOR_SECURITIES, WAITING_FOR_LOGINTIMEOUT, CONNECTED_PENDING_TRADER_LOGIN, READY }; + enum class State { WAITING_FOR_ADMIN, WAITING_FOR_SECURITIES, READY_TO_START_GW, TRADER_LOGIN_TIMEOUT, LOGIN_TIMEOUT_COMPLETE, READY }; struct PImpl; std::unique_ptr me; From d5bf15cc3623fd3077183d0c58a7766c99d4be04 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 17 Apr 2019 17:12:25 -0400 Subject: [PATCH 017/225] ice secondary login --- src/lib/config/defaults/jetfix.conf | 2 +- .../orderman/actors/ICEExecutionGateway.cpp | 87 ++++++++++--------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index c98aabeb2..9cd8e9866 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -47,7 +47,7 @@ JetFIX { log_fix_stream: true socket_connect_host_ip: "63.247.113.154" socket_connect_port: 80 - sender_compid: "51239" + sender_compid: "51251" target_compid: "ICE" start_time: "00:30:00" diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 868cd61e9..cb75eefe7 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -17,9 +17,8 @@ #include "lib/utils/Dispatcher.h" #include "lib/utils/bts_chrono.h" - - #include +#include namespace bts { namespace orderman { @@ -36,7 +35,7 @@ struct ICEExecutionGateway::PImpl PImpl(const config::JetFIX::Connection &cfg, trace::PerfLog &l) : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_exchange_id(), gw_name(cfg.name()), - cfg(cfg), perf_log(l), admin_data() + cfg(cfg), perf_log(l), admin_data(), nusers(-1) {} JFGw gw; @@ -51,6 +50,7 @@ struct ICEExecutionGateway::PImpl OnCancelReject on_cancel_reject; trace::PerfLog &perf_log; api::admin::AdminData admin_data; + std::atomic nusers; }; ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log) @@ -154,46 +154,9 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() // got our security synopsis, ready to start the GW me->state = State::LOGIN_TIMEOUT_COMPLETE; - int nusers = -1; - for(const auto& u : me->admin_data.users()) - { - if(u.has_user_data() && u.user_data().has_exchange_user_data() && u.user_data().exchange_user_data().has_ice_data()) - { - if(nusers == -1) - nusers = 0; - nusers++; - const auto& ice = u.user_data().exchange_user_data().ice_data(); - auto result = std::make_shared(me->cfg); - auto &stream = result->fix.back(); - auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); - - buffer.add(ice.company_id()); - buffer.add(ice.authorized_trader()); - buffer.add(ice.password()); - //TODO MIFID Defaults - - trace::CorID trace; - send_fix(result, trace); - } - } - LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", nusers, me->gw_name.value()); - if(nusers == -1) //TODO hardcode a user - { - auto result = std::make_shared(me->cfg); - auto &stream = result->fix.back(); - auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); - - //buffer.add(ice.company_id()); - buffer.add("bluetrd-fx"); - buffer.add("Starts123"); - nusers = 1; - trace::CorID trace; - send_fix(result, trace); - } - me->gw.on() = [&](const fix::ICETraderLoginResponseMsg&) { - if(--nusers == 0) + if(--me->nusers == 0) this->on_login(); }; @@ -205,9 +168,47 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() m = lmsg.get(); LOG(OrderMan, Error, "Error logging trader {} into ICE {} {}", u, m, me->gw_name.value()); - if(--nusers == 0) + if(--me->nusers == 0) this->on_login(); - }; + }; + + for(const auto& u : me->admin_data.users()) + { + if(u.has_user_data() && u.user_data().has_exchange_user_data() && u.user_data().exchange_user_data().has_ice_data()) + { + if(me->nusers == -1) + me->nusers = 0; + me->nusers++; + const auto& ice = u.user_data().exchange_user_data().ice_data(); + auto result = std::make_shared(me->cfg); + auto &stream = result->fix.back(); + auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); + + buffer.add(ice.company_id()); + buffer.add(ice.authorized_trader()); + buffer.add(ice.password()); + //TODO MIFID Defaults + + trace::CorID trace; + stream.close(); + send_fix(result, trace); + } + } + LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", me->nusers.load(), me->gw_name.value()); + if(me->nusers == -1) //TODO hardcode a user + { + auto result = std::make_shared(me->cfg); + auto &stream = result->fix.back(); + auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); + + //buffer.add(ice.company_id()); + buffer.add("bluetrd-fx"); + buffer.add("Starts123"); + stream.close(); + me->nusers = 1; + trace::CorID trace; + send_fix(result, trace); + } } } From 4f584527719b3f3a85cf976641f93021dccf4c53 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 17 Apr 2019 18:14:00 -0400 Subject: [PATCH 018/225] stop using legacy spread --- .../files/onixs_ice/ConnectivityConfiguration.APITest.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml b/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml index 334c3c48f..e4d4d7acc 100644 --- a/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml +++ b/src/data_files/files/onixs_ice/ConnectivityConfiguration.APITest.xml @@ -11,7 +11,6 @@ --> - 63.247.113.163 @@ -19,7 +18,7 @@ bluetrd-ps Starts123 N - Legacy + New @@ -28,7 +27,7 @@ Value from ICE Support Value from ICE Support N - Legacy + New @@ -37,7 +36,7 @@ bluetrdl-ps Starts123 N - Legacy + New From 7ceb170c5f5ce08f7e05172442e9b3fae83de77f Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 22 Apr 2019 10:36:21 -0400 Subject: [PATCH 019/225] SPARK-2289: Add ICE User data to Spark Admin --- src/web/ui/src/Users/State.fs | 22 +++- src/web/ui/src/Users/Types.fs | 14 ++- src/web/ui/src/Users/View.fs | 215 +++++++++++++++++++--------------- 3 files changed, 154 insertions(+), 97 deletions(-) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 4d1278aac..a7ce76376 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -54,7 +54,7 @@ let defaultScratchUser = { exchangeUserData = { adminDisplayFlag = bts.api.admin.ExchangeUserData.AdminDisplay.None - cmeData = { + cmeData = { operatorId = "" smpId = "" miscTags = JSMap.empty @@ -77,7 +77,7 @@ let defaultScratchUser = { miscTags = JSMap.empty proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY - mdPermissions = [||] + mdPermissions = [||] } } } @@ -176,10 +176,10 @@ let updateSIMExchangeUserData (user:BTSUser) dta = { user with userData = { user let updateICEExchangeUserData (user:BTSUser) dta = { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with iceData = dta }}} let default_user_account = { - tradingPermission = + tradingPermission = { hasPermissions = false } - adminPermission = + adminPermission = { hasPermissions = false hasMdPermissions = false } } @@ -194,11 +194,14 @@ let applyUpdate (field:UserField) (user:BTSUser) = | IsActive ia -> { user with isActive = ia } | CanCreate cr -> { user with canCreate = cr } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } + | ICEOperatorID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with operatorId = oid } | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } | CMEProNonPro loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with proNonpro = loc } | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc } + | ICEProNonPro loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with proNonpro = loc } + | ICEDisplayNonDisplay loc -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with displayNondisplay = loc } | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with location = loc } | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpInstruction = smpi } | MiscTags map -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with miscTags = map } @@ -213,6 +216,17 @@ let applyUpdate (field:UserField) (user:BTSUser) = mdperm | None -> Array.concat [[|mic|]; mdperm] updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with mdPermissions = micArr } + | ICEMic (mic:ICEMicData) -> + let micArr = + let mdperm = user.userData.exchangeUserData.iceData.mdPermissions + let found = Array.tryFind (fun (elm:ICEMicData) -> elm.mic = mic.mic) mdperm + match found with + | Some elm -> + let ndx = Array.findIndex (fun (e:ICEMicData) -> e.mic = elm.mic) mdperm + Array.set mdperm ndx mic + mdperm + | None -> Array.concat [[|mic|]; mdperm] + updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mdPermissions = micArr } | TradingPerm (id:string, can_trade:bool) -> let find = JSMap.tryFind id user.userData.accountPermissions.accountPermissions let current = if find.IsNone then default_user_account else find.Value diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 869e2f2b9..a32395418 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -18,6 +18,7 @@ type UserField = | CanCreate of bool | CMEOperatorID of string | CMEATSOperatorID of string +| ICEOperatorID of string | SimOperatorID of string | SMPID of string | CMELocation of string @@ -32,6 +33,9 @@ type UserField = | CMEMic of CMEMicData | CMEProNonPro of ProfessionalDesignation | CMEDisplayNonDisplay of DisplayDesignation +| ICEMic of ICEMicData +| ICEProNonPro of ProfessionalDesignation +| ICEDisplayNonDisplay of DisplayDesignation type Msg = @@ -70,4 +74,12 @@ 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) + +let ICEMicMap:Map = Map.empty + .Add("IFCA", bts.api.ICEMics.IFCA) + .Add("IFEN", bts.api.ICEMics.IFEN) + .Add("IFEU", bts.api.ICEMics.IFEU) + .Add("IFLL", bts.api.ICEMics.IFLL) + .Add("IFUnset", bts.api.ICEMics.IfUnset) + .Add("IFUS", bts.api.ICEMics.IFUS) diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index c9fe80b93..7397a563d 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -39,13 +39,13 @@ let saveButton (model:Users.Types.Model) dispatch = let enabled = if dirty then Button.Enabled else Button.Disabled let flavor = if dirty then "is-success" else "" Button.button buttonText flavor "" enabled (fun _ -> dispatch SaveUser) - + let accountIDLookup (accountsList:BTSAccount list) (id:string) = match (List.tryFind (fun a -> a.id.ToString() = id) accountsList) with | Some acnt -> acnt.id.ToString() | None -> "" - + let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= let accMap = @@ -53,43 +53,43 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= |> List.filter (fun a -> a.isPresent) |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList - - let hasPermission (acctid) = + + let hasPermission (acctid) = let found = JSMap.tryFind (acctid.ToString()) model.scratchUser.userData.accountPermissions.accountPermissions - match found with + match found with | None -> false | Some a -> a.tradingPermission.hasPermissions - - let acctlist = model.accountsList |> List.filter (fun a -> a.isPresent) - - let hasOnePermission = - let found = + + let acctlist = model.accountsList |> List.filter (fun a -> a.isPresent) + + let hasOnePermission = + let found = [ for entry in acctlist do yield JSMap.tryFind (entry.id.ToString()) model.scratchUser.userData.accountPermissions.accountPermissions ] |> List.choose id - - let trues = - List.choose (fun x -> - match x.tradingPermission.hasPermissions with + + let trues = + List.choose (fun x -> + match x.tradingPermission.hasPermissions with | true -> Some x | false -> None ) found - + match List.length (trues) with | 0 -> false - | _ -> true - - - let checkboxes = - [ - for acc in acctlist do - yield span [] [ - Fields.checkbox acc.name "" (hasPermission acc.id) [] ( fun x-> (acc.id.ToString(), x) |> TradingPerm |> UpdateField |> dispatch ) - ] - ] + | _ -> true - let can_create = model.can_create || (model.this_username = Access.superuser) + + let checkboxes = + [ + for acc in acctlist do + yield span [] [ + Fields.checkbox acc.name "" (hasPermission acc.id) [] ( fun x-> (acc.id.ToString(), x) |> TradingPerm |> UpdateField |> dispatch ) + ] + ] + + let can_create = model.can_create || (model.this_username = Access.superuser) let can_login_disabled = readonly || (model.this_username = model.scratchUser.name) let modal = Modal.showCreate "Create User" @@ -100,12 +100,12 @@ let generalTabView (model:Model) (dispatch:Msg->Unit) (readonly: bool)= Fields.text "Company" model.scratchUser.company [] (Company >> UpdateField >> dispatch) Fields.checkbox "Can Login?" "Unchecking this stops the user from logging in" model.scratchUser.isActive [] (IsActive >> UpdateField >> dispatch) Fields.checkbox "Can Create?" "Checking this allows the user to create other users and accounts" model.scratchUser.canCreate [Disabled (not can_create)] (CanCreate >> UpdateField >> dispatch) - + p [ Style [FontWeight "Bold"] ] [ str ("Trading Account")] - div [ Style [Padding " .5em 1em"]] checkboxes - //Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) + div [ Style [Padding " .5em 1em"]] checkboxes + //Fields.mapSelect "Trading Account" accMap (Some "Add Accounts") None ( fun x-> (x,true) |> TradingPerm |> UpdateField |> dispatch ) ]) - (fun _ -> + (fun _ -> match hasOnePermission with | false -> dispatch (ErrorOccured "New Users must have at least one trading account") | true -> dispatch SaveUser) @@ -140,7 +140,7 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = |> List.filter (fun a -> a.isPresent) |> List.map (fun a -> a.id.ToString(), a.name) |> Map.ofList - + let realAccList = model.accountsList |> List.filter (fun a -> a.isPresent) let headerRow:TableControl.row = @@ -155,11 +155,11 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = className = "" header = None } - + let rows:TableControl.row list = - [for acc in realAccList do + [for acc in realAccList do let string_id = acc.id.ToString() - let perm = JSMap.tryFind string_id accountPermissions + let perm = JSMap.tryFind string_id accountPermissions let is_bts = model.scratchUser.name = Access.superuser let hasTradeAdmin = (if perm.IsNone then false else perm.Value.tradingPermission.hasPermissions) let hasRiskAdmin = is_bts || (if perm.IsNone then false else perm.Value.adminPermission.hasPermissions) @@ -168,7 +168,7 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = yield { cells = [ TableControl.Cell(str acc.name) - { content = Fields.checkbox "" "" hasTradeAdmin [Disabled readonly] (update TradingPerm hasTradeAdmin) + { content = Fields.checkbox "" "" hasTradeAdmin [Disabled readonly] (update TradingPerm hasTradeAdmin) className = ""; isHeader = false; colSpan = 0 @@ -196,69 +196,100 @@ let accountsTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let MarketDataTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let cmeData = model.scratchUser.userData.exchangeUserData.cmeData + let iceData = model.scratchUser.userData.exchangeUserData.iceData - let findCheckedValue (value:bts.api.CMEMics) = + let findCMECheckedValue (value:bts.api.CMEMics) = let checkedValue = cmeData.mdPermissions |> Array.tryFind (fun mic -> mic.mic = value && mic.enabled) match checkedValue with | Some t -> true | None -> false - - let micList = [ - for micPair in CMEMicMap do - yield ( - Fields.checkbox + + let findICECheckedValue (value:bts.api.ICEMics) = + let checkedValue = iceData.mdPermissions |> Array.tryFind (fun mic -> mic.mic = value && mic.enabled) + match checkedValue with + | Some t -> true + | None -> false + + let cmeMicList = [ + for micPair in CMEMicMap do + yield ( + Fields.checkbox (sprintf "%O" micPair.Key) - "" - (findCheckedValue micPair.Value) - [Disabled readonly] - (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) - ) + "" + (findCMECheckedValue micPair.Value) + [Disabled readonly] + (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + ) ] - + + let iceMicList = [ + for micPair in ICEMicMap do + yield ( + Fields.checkbox + (sprintf "%O" micPair.Key) + "" + (findICECheckedValue micPair.Value) + [Disabled readonly] + (fun chk -> (({enabled = chk; mic = micPair.Value}:ICEMicData) |> (ICEMic >> UpdateField >> dispatch))) + ) + ] + let send = UpdateField>>dispatch div [] [ h2 [Class "is-size-3"] [ str "CME" ] h3 [Class "is-size-4"] [ str "Entitlements" ] - div [Style [Padding " .5em 1em"]] micList + div [Style [Padding " .5em 1em"]] cmeMicList + + h3 [Class "is-size-4"] [ str "Designations" ] + //Fields.enumSelect "Pro / Non-Pro" (toHuman false ProfessionalDesignation.values cmeData.proNonpro) (allToHuman false ProfessionalDesignation.values) [Disabled readonly] (fromHuman ProfessionalDesignation.values>>UserField.CMEProNonPro>>send) + Fields.enumSelect "Display / Non-Display" (toHuman false DisplayDesignation.values cmeData.displayNondisplay) (allToHuman false DisplayDesignation.values) [Disabled readonly] (fromHuman DisplayDesignation.values>>UserField.CMEDisplayNonDisplay>>send) + + br [] + h2 [Class "is-size-3"] [ str "ICE" ] + h3 [Class "is-size-4"] [ str "Entitlements" ] + div [Style [Padding " .5em 1em"]] iceMicList h3 [Class "is-size-4"] [ str "Designations" ] //Pico recommends we hide this for the ICE //Fields.enumSelect "Pro / Non-Pro" (toHuman false ProfessionalDesignation.values cmeData.proNonpro) (allToHuman false ProfessionalDesignation.values) [Disabled readonly] (fromHuman ProfessionalDesignation.values>>UserField.CMEProNonPro>>send) - Fields.enumSelect "Display / Non-Display" (toHuman false DisplayDesignation.values cmeData.displayNondisplay) (allToHuman false DisplayDesignation.values) [Disabled readonly] (fromHuman DisplayDesignation.values>>UserField.CMEDisplayNonDisplay>>send) - ] + Fields.enumSelect "Display / Non-Display" (toHuman false DisplayDesignation.values iceData.displayNondisplay) (allToHuman false DisplayDesignation.values) [Disabled readonly] (fromHuman DisplayDesignation.values>>UserField.ICEDisplayNonDisplay>>send) + ] -let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = +let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = let cmeData = model.scratchUser.userData.exchangeUserData.cmeData - let simData = model.scratchUser.userData.exchangeUserData.simData + let simData = model.scratchUser.userData.exchangeUserData.simData + let iceData = model.scratchUser.userData.exchangeUserData.iceData div [] [ - h2 [Class "is-size-3"] [ str "CME" ] - div [] - [ - Fields.text "Operator ID" cmeData.operatorId [ MaxLength 18.0 ; Disabled readonly ] (CMEOperatorID >> UpdateField >> dispatch) - //Fields.text "ATS Operator ID" cmeData.atsOperatorId [] (ATSOperatorID >> UpdateField >> dispatch) - Fields.text "SMP ID" cmeData.smpId [Disabled readonly] (SMPID >> UpdateField >> dispatch) - Fields.mapSelectEx "SMP Instruction" State.SMPInstructionMap None (Some cmeData.smpInstruction) (SMPInstruction >> UpdateField >> dispatch) (Some readonly) - Fields.text "Location" cmeData.location [Disabled readonly] (CMELocation >> UpdateField >> dispatch) - //Fields.text "Max Order Rate Per Connection" cmeData.maxOrderRatePerConnection [] (MaxOrderRatePerConnection >> UpdateField >> dispatch) - //Fields.map "Misc Tag Mapping" cmeData.miscTags [] (MiscTags >> UpdateField >> dispatch) - ] - br [] - h2 [Class "is-size-3"] [ str "Sim" ] - div [] - [ - Fields.text "Operator ID" simData.operatorId [ MaxLength 18.0 ; Disabled readonly] (SimOperatorID >> UpdateField >> dispatch) - Fields.text "Location" simData.location [Disabled readonly] (SimLocation >> UpdateField >> dispatch) + h2 [Class "is-size-3"] [ str "CME" ] + div [] [ + Fields.text "Operator ID" cmeData.operatorId [ MaxLength 18.0 ; Disabled readonly ] (CMEOperatorID >> UpdateField >> dispatch) + //Fields.text "ATS Operator ID" cmeData.atsOperatorId [] (ATSOperatorID >> UpdateField >> dispatch) + Fields.text "SMP ID" cmeData.smpId [Disabled readonly] (SMPID >> UpdateField >> dispatch) + Fields.mapSelectEx "SMP Instruction" State.SMPInstructionMap None (Some cmeData.smpInstruction) (SMPInstruction >> UpdateField >> dispatch) (Some readonly) + Fields.text "Location" cmeData.location [Disabled readonly] (CMELocation >> UpdateField >> dispatch) + //Fields.text "Max Order Rate Per Connection" cmeData.maxOrderRatePerConnection [] (MaxOrderRatePerConnection >> UpdateField >> dispatch) + //Fields.map "Misc Tag Mapping" cmeData.miscTags [] (MiscTags >> UpdateField >> dispatch) + ] + br [] + h2 [Class "is-size-3"] [ str "ICE" ] + div [] [ + Fields.text "Operator ID" iceData.operatorId [ MaxLength 18.0 ; Disabled readonly ] (ICEOperatorID >> UpdateField >> dispatch) + ] + br [] + h2 [Class "is-size-3"] [ str "Sim" ] + div [] [ + Fields.text "Operator ID" simData.operatorId [ MaxLength 18.0 ; Disabled readonly] (SimOperatorID >> UpdateField >> dispatch) + Fields.text "Location" simData.location [Disabled readonly] (SimLocation >> UpdateField >> dispatch) + ] + ] + - ] - ] - - let userControls (model:Model) (dispatch:Msg->Unit) = let currentUser = State.getCurrentUser model @@ -273,9 +304,9 @@ let userControls (model:Model) (dispatch:Msg->Unit) = let tabContent (model:Model) (dispatch:Msg->Unit) display_md display_risk = let mod1 = { - model with currentTab = (if (not display_risk && display_md) then Tab.MarketData else model.currentTab) + model with currentTab = (if (not display_risk && display_md) then Tab.MarketData else model.currentTab) } - + div [Key (string model.scratchUser.id); ClassName "is-tab-content"] [ (match mod1.currentTab, ( State.userIsSelected model.scratchUser State.defaultScratchUser) with | _, false -> p [Style [ Color "Red" ]] [ str "You are not authorized to view this data" ] @@ -401,16 +432,16 @@ let NavRoot (usersList:BTSUser list) (currentUser:BTSUser) model (dispatch:Msg-> div [ Class "column is-narrow is-sidebar-menu" ] [ aside [ Class "menu" ] - [ p [ Class "menu-label" ] [ + [ p [ Class "menu-label" ] [ span [Class "is-size-4"] [str "Users"] - span [ Class "is-pulled-right circle-icon" ] + span [ Class "is-pulled-right circle-icon" ] (if model.can_create then - [ Button.fabutton + [ Button.fabutton "Add User" "plus-circle" - "" - Button.Enabled - (fun _ -> dispatch AddUser) + "" + Button.Enabled + (fun _ -> dispatch AddUser) ] else []) ] @@ -435,11 +466,11 @@ let root (model:Model) (dispatch:Msg->Unit) = | _, _ -> () ) *) - let adminDisplay = model.scratchUser.userData.exchangeUserData.adminDisplayFlag + let adminDisplay = model.scratchUser.userData.exchangeUserData.adminDisplayFlag let is_bts = model.this_username = Access.superuser let display_md = if is_bts then true else (adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.All || adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.MD) - let display_risk = if is_bts then true else (adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.All || adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.Routing) - + let display_risk = if is_bts then true else (adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.All || adminDisplay = bts.api.admin.ExchangeUserData.AdminDisplay.Routing) + let modal = match (fst model.ConfirmModal) with | "" -> span [] [] | _ -> Modal.showConfirm (fst model.ConfirmModal) (fun () -> (snd model.ConfirmModal) |> dispatch) (fun _ -> OpenConfirmModal ("", Msg.SwitchTab model.currentTab ) |> dispatch) @@ -460,30 +491,30 @@ let root (model:Model) (dispatch:Msg->Unit) = div [ ClassName "tabs is-boxed" ] [ ul [ ] [ - (if display_risk then + (if display_risk then li [ ClassName (isActiveTab Tab.General model.currentTab) ] [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.General)) ] [ str "General" ] ] else span [] []) - (if display_risk then + (if display_risk then li [ ClassName (isActiveTab Tab.Accounts model.currentTab) ] [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.Accounts)) ] [ str "Account Permissions" ] ] else - span [] []) - (if display_md then + span [] []) + (if display_md then li [ ClassName (isActiveTab Tab.MarketData model.currentTab) ] [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.MarketData)) ] [ str "Market Data" ] ] else - span [] [] ) - (if display_risk then + span [] [] ) + (if display_risk then li [ ClassName (isActiveTab Tab.OrderRouting model.currentTab) ] - [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.OrderRouting)) ] + [ a [ OnClick (fun _ -> dispatch (SwitchTab Tab.OrderRouting)) ] [ str "Order Routing" ] ] else - span [] [] ) + span [] [] ) ] ] tabContent model dispatch display_md display_risk From 6bac75d7aba683e06b5000d33070f7319ed7f23e Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 22 Apr 2019 10:58:26 -0400 Subject: [PATCH 020/225] SPARK-2289: Add ICE to Accounts in Spark Admin --- src/web/ui/src/Accounts/State.fs | 10 ++++++++++ src/web/ui/src/Accounts/Types.fs | 9 ++++++++- src/web/ui/src/Accounts/View.fs | 26 +++++++++++++++++--------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 41717007e..1d1f4c691 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -63,6 +63,12 @@ let applyCMEUpdate (data:CMEAccountData) = function | CMEExchangeField.ClearingAccount v -> { data with clearingAccount = v } | CMEExchangeField.MiscTagMapping mp -> { data with miscTags = mp } +let applyICEUpdate (data:ICEAccountData) = function + | ICEExchangeField.CTI v -> { data with cti = v } + | ICEExchangeField.Origin v -> { data with origin = v } + | ICEExchangeField.ClearingAccount v -> { data with clearingAccount = v } + | ICEExchangeField.MiscTagMapping mp -> { data with miscTags = mp } + let applySIMUpdate (data:SIMAccountData) = function | CTI v -> { data with cti = v } | Origin v -> { data with origin = v } @@ -304,6 +310,10 @@ let update msg (model:Model) : Model * Cmd = let newCme = applyCMEUpdate model.scratch.exchangeAccountData.cmeAccountData field let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = newCme; iceAccountData = model.scratch.exchangeAccountData.iceAccountData; simAccountData = model.scratch.exchangeAccountData.simAccountData } } { model with scratch = scratch }, Cmd.Empty + | UpdateICE (field:ICEExchangeField) -> + let newICE = applyICEUpdate model.scratch.exchangeAccountData.iceAccountData field + let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = model.scratch.exchangeAccountData.cmeAccountData; iceAccountData = newICE; simAccountData = model.scratch.exchangeAccountData.simAccountData } } + { model with scratch = scratch }, Cmd.Empty | UpdateSIM field -> let newSim = applySIMUpdate model.scratch.exchangeAccountData.simAccountData field let scratch = { model.scratch with exchangeAccountData = { cmeAccountData = model.scratch.exchangeAccountData.cmeAccountData ; iceAccountData = model.scratch.exchangeAccountData.iceAccountData; simAccountData = newSim } } diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 1b649a145..587a3473b 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -14,7 +14,7 @@ type Tab = | ConnectionsTab | OrdersTab -let venues = [| Venue.GLBX; Venue.SIM |] +let venues = [| Venue.GLBX; Venue.ICE; Venue.SIM |] let securityTypes = [| SecurityType.FUTURE; SecurityType.SPREAD |] @@ -32,6 +32,12 @@ type CMEExchangeField = | ClearingAccount of string | MiscTagMapping of JSMap +type ICEExchangeField = + | CTI of CTICode + | Origin of CustomerOrFirm + | ClearingAccount of string + | MiscTagMapping of JSMap + type SIMExchangeField = | CTI of CTICode | Origin of CustomerOrFirm @@ -72,6 +78,7 @@ type Msg = | DeleteSecurityLimit of int // ExchangeData | UpdateCME of CMEExchangeField + | UpdateICE of ICEExchangeField | UpdateSIM of SIMExchangeField | RequestProducts | UpdateProducts of Product[] diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 547808baf..2060114e1 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -724,19 +724,27 @@ let creditLimitsView model dispatch = div [] [str "lorem ipsum"] let exchangeSettings model dispatch = let cme = model.scratch.exchangeAccountData.cmeAccountData + let ice = model.scratch.exchangeAccountData.iceAccountData let sim = model.scratch.exchangeAccountData.simAccountData - let send = UpdateCME>>dispatch + let sendCME = UpdateCME>>dispatch + let sendICE = UpdateICE>>dispatch let sendSim = UpdateSIM>>dispatch div [] [ h2 [Class "is-size-3"] [ str "CME" ] - Fields.enumSelect "CTI" (toHuman false CTICode.values cme.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>CMEExchangeField.CTI>>send) - Fields.enumSelect "Origin" (toHuman false CustomerOrFirm.values cme.origin) (allToHuman false CustomerOrFirm.values) [] (fromHuman CustomerOrFirm.values>>CMEExchangeField.Origin>>send) + Fields.enumSelect "CTI" (toHuman false CTICode.values cme.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>CMEExchangeField.CTI>>sendCME) + Fields.enumSelect "Origin" (toHuman false CustomerOrFirm.values cme.origin) (allToHuman false CustomerOrFirm.values) [] (fromHuman CustomerOrFirm.values>>CMEExchangeField.Origin>>sendCME) //Fields.text "Takeup Member Code" cme.takeupMemberCode [] (TakeupMember>>send) - Fields.text "Clearing Account" cme.clearingAccount [MaxLength 12.0] (CMEExchangeField.ClearingAccount>>send) + Fields.text "Clearing Account" cme.clearingAccount [MaxLength 12.0] (CMEExchangeField.ClearingAccount>>sendCME) //Fields.text "Direct Electronic Access" cme.directElectronicAccess [] (DirectElectronicAccess>>send) //Fields.text "Trading Capacity" cme.tradingCapacity [] (TradingCapacity>>send) //Fields.text "Liquidity Provision" cme.liquidityProvision [] (LiquidityProvision>>send) //Fields.map "Misc Tag Mapping" cme.miscTags [] (MiscTagMapping>>send) + + h2 [Class "is-size-3"] [ str "ICE" ] + Fields.enumSelect "CTI" (toHuman false CTICode.values ice.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>ICEExchangeField.CTI>>sendICE) + Fields.enumSelect "Origin" (toHuman false CustomerOrFirm.values ice.origin) (allToHuman false CustomerOrFirm.values) [] (fromHuman CustomerOrFirm.values>>ICEExchangeField.Origin>>sendICE) + Fields.text "Clearing Account" ice.clearingAccount [MaxLength 12.0] (ICEExchangeField.ClearingAccount>>sendICE) + h2 [Class "is-size-3"] [ str "SIM" ] Fields.enumSelect "CTI" (toHuman false CTICode.values sim.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>SIMExchangeField.CTI>>sendSim) Fields.enumSelect "Origin" (toHuman false CustomerOrFirm.values sim.origin) (allToHuman false CustomerOrFirm.values) [] (fromHuman CustomerOrFirm.values>>SIMExchangeField.Origin>>sendSim) @@ -749,7 +757,7 @@ let tabContent model dispatch = div [Key (string model.scratch.id); ClassName "is-tab-content"] [ // (match model.tab with (match model.tab, (accountIsSelected model.scratch Access.Accounts.empty) with - | _ , false -> p [Style [ Color "Red" ]] [ str "You are not authorized to view this data" ] + | _ , false -> p [Style [ Color "Red" ]] [ str "You are not authorized to view this data" ] | General, _ -> generalView model dispatch | LimitsTab, _ -> LimitsView model dispatch | ConnectionsTab, _ -> ConnectionsView model dispatch @@ -856,7 +864,7 @@ let menuItem account selectedAccount model dispatch = ] ] ] - else span[][]) + else span[][]) ] let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch = @@ -866,10 +874,10 @@ let NavRoot (accounts:BTSAccount[]) selectedAccount model dispatch = span [Class "is-size-4"] [str "Accounts"] span [ Class "is-pulled-right circle-icon" ] (if model.can_create then - [ Button.fabutton + [ Button.fabutton "Add Account" "plus-circle" - "" + "" Button.Enabled (fun _ -> dispatch AddAccount) ] else []) @@ -914,7 +922,7 @@ let root (model:Model) dispatch = [ NavRoot data.accounts (selectedAccount model) model dispatch div [ Class "column is-main-content" ] [ - + div [ ClassName "tabs is-boxed" ] [ ul [] [ (if (Array.length data.accounts > 0) then (tabHeader General model.tab dispatch) else span [][] ) From 43e043b04473e9e5b69e52723da34565dd49488c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 22 Apr 2019 14:41:39 -0400 Subject: [PATCH 021/225] more ice --- .../api/service_helpers/AdminServiceUtils.cpp | 50 ++++++++++- src/lib/api/services/AdminService.proto | 13 +-- src/lib/api/services/OrderService.proto | 1 + src/lib/jetfix/gateway/Session.cpp | 14 +-- .../orderman/actors/ICEExecutionGateway.cpp | 88 +++++++++++-------- src/lib/orderman/orders/ICENativeOrder.cpp | 9 +- .../md/platforms/ice_onixs/ICEListener.cpp | 10 +-- 7 files changed, 114 insertions(+), 71 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 729887b49..6cacbe7e8 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -44,11 +44,13 @@ bool AdminServiceUtils::has_exchange(const ExchangeConnection& conn, case api::Venue::VENUE_SIM: case api::Venue::VENUE_SIMICE: rv = conn.has_sim_connection(); + break; + case api::Venue::VENUE_ICE: + rv = conn.has_ice_connection(); break; case api::Venue::VENUE_BTS: case api::Venue::VENUE_CBOE: case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: rv = false; @@ -187,7 +189,7 @@ void AdminServiceUtils::fill_connections_from_config(bts::api::admin::AdminData& add_connection(admin_data,connection); break; case config::JetFIX::Connection::ICE: - connection.mutable_ice_connection(); + connection.mutable_ice_connection()->set_sender_comp_id(c.sender_compid()); add_connection(admin_data,connection); break; @@ -467,6 +469,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt return rv; } rv.set_session(conn_ptr->name()); + rv.set_sender_compid(conn_ptr->ice_connection().sender_comp_id()); rv.set_account(ice_account_data->clearing_account()); rv.set_operator_id(ice_user_data->operator_id()); rv.set_cti_code(ice_account_data->cti()); @@ -1411,6 +1414,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ auto account_1 = create_account(data, parent_account->id(), std::string("ACC A1"), std::string("description"), true, account_result); account_1->set_is_active(true); auto account_2 = create_account(data, parent_account->id(), std::string("ACC A2"), std::string("description"), true, account_result); account_2->set_is_active(true); auto account_3 = create_account(data, parent_account->id(), std::string("ACC A3"), std::string("description"), true, account_result); account_3->set_is_active(true); + auto account_4 = create_account(data, parent_account->id(), std::string("BLUETEST"), std::string("description"), true, account_result); account_4->set_is_active(true); create_account(data, parent_account->id(), std::string("ACC A4"), std::string("description"), true, account_result); // add group auto def_group = create_group(data, 0, std::string("default"), result); @@ -1429,6 +1433,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_1->id(), permission_unit)); account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_2->id(), permission_unit)); account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_3->id(), permission_unit)); + account_permissions.mutable_account_permissions()->insert(google::protobuf::MapPair(account_4->id(), permission_unit)); set_user_accounts(user_1, account_permissions); set_user_accounts(user_2, account_permissions); set_user_accounts(user_3, account_permissions); @@ -1438,6 +1443,12 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_account_data.mutable_cme_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); exchange_account_data.mutable_cme_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); exchange_account_data.mutable_cme_account_data()->set_clearing_account(parent_account->name()); + + exchange_account_data.mutable_ice_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); + exchange_account_data.mutable_ice_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); + exchange_account_data.mutable_ice_account_data()->set_clearing_account(parent_account->name()); + exchange_account_data.mutable_ice_account_data()->set_clearing_firm("649"); + exchange_account_data.mutable_sim_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); exchange_account_data.mutable_sim_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); exchange_account_data.mutable_sim_account_data()->set_clearing_account(parent_account->name()); @@ -1445,33 +1456,61 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_1->name()); + exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_1->name()); exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_1->name()); set_account_exchange_data(account_1, exchange_account_data); exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_2->name()); + exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_2->name()); exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_2->name()); set_account_exchange_data(account_2, exchange_account_data); exchange_account_data.mutable_cme_account_data()->set_clearing_account(account_3->name()); + exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_3->name()); exchange_account_data.mutable_sim_account_data()->set_clearing_account(account_3->name()); set_account_exchange_data(account_3, exchange_account_data); + exchange_account_data.mutable_ice_account_data()->set_clearing_account(account_4->name()); + set_account_exchange_data(account_4, exchange_account_data); + + // add cme and sim user data bts::api::admin::ExchangeUserData exchange_user_data; exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_1->name()); exchange_user_data.mutable_cme_data()->set_location("us,nc"); + + exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_1->name()); + exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); + exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); + exchange_user_data.mutable_ice_data()->set_password("Starts123"); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_1->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); set_user_exchange_data(user_1, exchange_user_data); exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_2->name()); exchange_user_data.mutable_cme_data()->set_location("us,nc"); + + exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_2->name()); + exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); + exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); + exchange_user_data.mutable_ice_data()->set_password("Starts123"); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_2->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); set_user_exchange_data(user_2, exchange_user_data); exchange_user_data.mutable_cme_data()->set_operator_id("op_id_" + user_3->name()); exchange_user_data.mutable_cme_data()->set_location("us,nc"); + + exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_3->name()); + exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); + exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); + exchange_user_data.mutable_ice_data()->set_password("Starts123"); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_3->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); set_user_exchange_data(user_3, exchange_user_data); @@ -1513,6 +1552,13 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_GLBX, api::SecurityType::SECURITYTYPE_SPREAD,100); add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_SIM, api::SecurityType::SECURITYTYPE_FUTURE,100); add_security_clip_sizes_to_account(account_1, api::Venue::VENUE_SIM, api::SecurityType::SECURITYTYPE_SPREAD,100); + + //ICE limits + add_product_position_limits(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_FUTURE,50000); + add_product_position_limits(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_SPREAD,50000); + add_security_clip_sizes_to_account(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_FUTURE,50); + add_security_clip_sizes_to_account(account_4, api::Venue::VENUE_ICE, api::SecurityType::SECURITYTYPE_SPREAD,50); + } bool AdminServiceUtils::has_id (uint32_t id){return id>0;} bool AdminServiceUtils::is_symbol_set (const std::string& symbol){ diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 655086708..b6faec1da 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -325,17 +325,8 @@ message SIMUserData { /********************************ICE Data*********************************/ -message ICEConnection{ - // string authorized_member_id = 10; - // string sender_company_id = 20; - // string sender_sub_id = 30; - // string session_id = 40; - // string session_password = 50; - // string host_ip = 60; - // string port = 70; - // string default_routing_trader = 80; - // string routing_trader_password = 90; - // int32 max_order_rate = 100; +message ICEConnection { + string sender_comp_id = 10; } message ICEAccountData { diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index b0014c0dd..a3fd5b78f 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -275,6 +275,7 @@ message RoutingRecord { SelfMatchPreventionInstruction smp_instruction = 7; string location = 8; + string sender_compid = 15; string clearing_firm = 20; string customer_account_ref_id = 25; string account_code = 30; diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 4728eff75..5b669766c 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -786,22 +786,22 @@ OutFIXPtr make_logon(uint32_t seq_num, uint32_t last_seq_num_processed, if(session_cfg.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || session_cfg.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) { - buffer.add(application); - buffer.add("1.0"); - buffer.add("BTS"); + buffer.add(application); + buffer.add("1.0"); + buffer.add("BTS"); buffer.add(session_cfg.user_name()); buffer.add(session_cfg.raw_data().size()); buffer.add(session_cfg.raw_data()); buffer.add(0); buffer.add(1); - buffer.add(0); + buffer.add(1); } else { - buffer.add(application); - buffer.add("1.0"); - buffer.add("BTS"); + buffer.add(application); + buffer.add("1.0"); + buffer.add("BTS"); if (session_cfg.has_trading_session_id()) { buffer.add(1); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index cb75eefe7..c0c1b0faa 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -19,6 +19,7 @@ #include #include +#include namespace bts { namespace orderman { @@ -171,44 +172,48 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() if(--me->nusers == 0) this->on_login(); }; - + + std::set auth_traders; for(const auto& u : me->admin_data.users()) - { + { if(u.has_user_data() && u.user_data().has_exchange_user_data() && u.user_data().exchange_user_data().has_ice_data()) { if(me->nusers == -1) me->nusers = 0; me->nusers++; const auto& ice = u.user_data().exchange_user_data().ice_data(); - auto result = std::make_shared(me->cfg); - auto &stream = result->fix.back(); - auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); - - buffer.add(ice.company_id()); - buffer.add(ice.authorized_trader()); - buffer.add(ice.password()); - //TODO MIFID Defaults - - trace::CorID trace; - stream.close(); - send_fix(result, trace); - } + if(auth_traders.find(ice.authorized_trader()) == auth_traders.end()) + { + auto result = std::make_shared(me->cfg); + auto &stream = result->fix.back(); + auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); + buffer.add(ice.company_id()); + buffer.add(ice.authorized_trader()); + buffer.add(ice.password()); + stream.close(); + //TODO MIFID Defaults + + trace::CorID trace; + send_fix(result, trace); + auth_traders.insert(ice.authorized_trader()); + } + } } LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", me->nusers.load(), me->gw_name.value()); - if(me->nusers == -1) //TODO hardcode a user - { - auto result = std::make_shared(me->cfg); - auto &stream = result->fix.back(); - auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); + // if(me->nusers == -1) //TODO hardcode a user + // { + // auto result = std::make_shared(me->cfg); + // auto &stream = result->fix.back(); + // auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); - //buffer.add(ice.company_id()); - buffer.add("bluetrd-fx"); - buffer.add("Starts123"); - stream.close(); - me->nusers = 1; - trace::CorID trace; - send_fix(result, trace); - } + // //buffer.add(ice.company_id()); + // buffer.add("bluetrd-fx"); + // buffer.add("Starts123"); + // stream.close(); + // me->nusers = 1; + // trace::CorID trace; + // send_fix(result, trace); + // } } } @@ -248,8 +253,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg if (!sec) LOG(OrderMan, Error, - "Received execution report for an unknown security {}. Will not be " - " able to process this report. This is likely a bug that could lead " + "Received execution report for an unknown security {}. Will not be able to process this report. This is likely a bug that could lead " "to lost fills. Please investigate.", sk.value()); else @@ -257,12 +261,14 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg // Ignore trade correction messages. if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) { - auto new_price = securities::decode_exchange_price(*sec, Price(msg.get())); - auto ref_exec_id = msg.get(); + auto new_price = Price(0); + if(msg.has()) + new_price = securities::decode_exchange_price(*sec, Price(msg.get())); + std::string ref_exec_id = ""; + if(msg.has()) + ref_exec_id = msg.get(); LOG(OrderMan, Error, - "Received unsupported trade correction msg. " - "This correction will not be forwarded. The trader should be " - "alerted. " + "Received unsupported trade correction msg. This correction will not be forwarded. The trader should be alerted. " "Order: {} SecKey: {} Partial original fill id: {}. New price: {}", ok.value(), sk.value(), ref_exec_id, new_price.value()); return; @@ -272,8 +278,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CANCEL) { LOG(OrderMan, Error, - "Received unsupported trade cancel msg. " - "This correction will not be forwarded. The trader should be alerted. " + "Received unsupported trade cancel msg. This correction will not be forwarded. The trader should be alerted. " "Order: {} SecKey: {} ", ok.value(), sk.value()); return; @@ -326,7 +331,11 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg else data->time_in_force = api::orderman::TIME_IN_FORCE_UNDEFINED; - data->order_type = api::orderman::NativeOrderType(msg.get()); + if (msg.has()) + data->order_type = api::orderman::NativeOrderType(msg.get()); + else + data->order_type = api::orderman::NATIVE_ORDER_TYPE_UNDEFINED; + data->order_status = api::orderman::NativeOrderStatus(msg.get()); data->manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; @@ -361,7 +370,8 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg : Price(0); if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); - str_to(msg.get(), &data->transact_time); + if (msg.has()) + str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; data->exchange = api::Venue::VENUE_ICE; diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 3e68d3e51..8f15175d3 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -111,6 +111,7 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation transition(ORDER_STATUS_INACTIVE); auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; + me->sender_comp_id = rq.routing_record.sender_compid(); init_fix(); } else @@ -130,9 +131,10 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati me->definition = def; me->state = rec.state(); me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); - me->previous_position_contribution = Quantity(rec.state().filled_quantity()); + me->previous_position_contribution = Quantity(rec.state().filled_quantity()); auto const &native_state = get_native_state(me->state); + me->sender_comp_id = native_state.routing_record().sender_compid(); switch (me->state.status()) { case ORDER_STATUS_WORKING: @@ -325,7 +327,6 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); me->price_encoding_precision = me->services->price_encoding_precision(*me->session_services); - me->sender_comp_id = me->session_services->session_cfg().sender_compid(); // is our gateway connected? if (!me->services->is_gateway_connected(*me->session_services)) @@ -651,6 +652,7 @@ void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_paren auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; + me->sender_comp_id = rq.routing_record.sender_compid(); init_fix(); if (has_exchange_order_id()) add_exchange_order_id_to_fix(); @@ -976,8 +978,7 @@ void ICENativeOrder::report_state() int ICENativeOrder::get_clordid(uint32_t bts_id) { - std::string orderid(ice_orderid_sz(), ' '); - u32_toa(bts_id, &orderid[0]); // order id + std::string orderid = std::to_string(bts_id); int totalsz = me->sender_comp_id.size() + orderid.size(); if(totalsz < 9) //9 is min size orderid = std::string(9-totalsz, '0').append(orderid); diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 7c85642ad..afff7e1d3 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -84,18 +84,12 @@ void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interest void ICEListener::onFuturesStrategyDefinition(const onixs_ice::FuturesStrategyDefinition& def, bool& is_interested) { - //TODO need to find out how to produce data for testing - //on_uds_future_spread(def, is_interested); - UNUSED(def); - UNUSED(is_interested); + on_uds_future_spread(def, is_interested); } //This is only for UDS void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - //TODO need to find out how to produce data for testing - //on_uds_future_spread(msg, is_interested); - UNUSED(msg); - UNUSED(is_interested); + on_uds_future_spread(msg, is_interested); } void ICEListener::onOptionsProductDefinition(const onixs_ice::OptionsProductDefinition& msg, bool& is_interested) From a6ee36f4bccb0300e3a4199835c1912345862b24 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 22 Apr 2019 15:16:12 -0400 Subject: [PATCH 022/225] typo --- src/lib/api/service_helpers/AdminServiceUtils.cpp | 4 ++-- src/lib/api/services/AdminService.proto | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 6cacbe7e8..bd7570cab 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -189,7 +189,7 @@ void AdminServiceUtils::fill_connections_from_config(bts::api::admin::AdminData& add_connection(admin_data,connection); break; case config::JetFIX::Connection::ICE: - connection.mutable_ice_connection()->set_sender_comp_id(c.sender_compid()); + connection.mutable_ice_connection()->set_sender_compid(c.sender_compid()); add_connection(admin_data,connection); break; @@ -469,7 +469,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt return rv; } rv.set_session(conn_ptr->name()); - rv.set_sender_compid(conn_ptr->ice_connection().sender_comp_id()); + rv.set_sender_compid(conn_ptr->ice_connection().sender_compid()); rv.set_account(ice_account_data->clearing_account()); rv.set_operator_id(ice_user_data->operator_id()); rv.set_cti_code(ice_account_data->cti()); diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index b6faec1da..39d9cfc0b 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -326,7 +326,7 @@ message SIMUserData { /********************************ICE Data*********************************/ message ICEConnection { - string sender_comp_id = 10; + string sender_compid = 10; } message ICEAccountData { diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 8f15175d3..3981eb75c 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -45,7 +45,7 @@ struct ICENativeOrder::PImpl OrderState state; int price_encoding_precision; std::string exchange_order_id; - std::string sender_comp_id; + std::string sender_compid; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -111,7 +111,7 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation transition(ORDER_STATUS_INACTIVE); auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; - me->sender_comp_id = rq.routing_record.sender_compid(); + me->sender_compid = rq.routing_record.sender_compid(); init_fix(); } else @@ -134,7 +134,7 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati me->previous_position_contribution = Quantity(rec.state().filled_quantity()); auto const &native_state = get_native_state(me->state); - me->sender_comp_id = native_state.routing_record().sender_compid(); + me->sender_compid = native_state.routing_record().sender_compid(); switch (me->state.status()) { case ORDER_STATUS_WORKING: @@ -652,7 +652,7 @@ void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_paren auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; - me->sender_comp_id = rq.routing_record.sender_compid(); + me->sender_compid = rq.routing_record.sender_compid(); init_fix(); if (has_exchange_order_id()) add_exchange_order_id_to_fix(); @@ -979,12 +979,12 @@ void ICENativeOrder::report_state() int ICENativeOrder::get_clordid(uint32_t bts_id) { std::string orderid = std::to_string(bts_id); - int totalsz = me->sender_comp_id.size() + orderid.size(); + int totalsz = me->sender_compid.size() + orderid.size(); if(totalsz < 9) //9 is min size orderid = std::string(9-totalsz, '0').append(orderid); else if(totalsz > 12) //12 is max orderid = orderid.substr(totalsz-12, orderid.size() - (totalsz-12)); - std::string combined_clorid = me->sender_comp_id + orderid; + std::string combined_clorid = me->sender_compid+ orderid; int id = std::atoi(combined_clorid.c_str()); return id; } From 3cd74f33f1cba5c6283a936f797c806f41d5cff3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 22 Apr 2019 16:51:28 -0400 Subject: [PATCH 023/225] changed trader login per Pedro --- .../orderman/actors/ICEExecutionGateway.cpp | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index c0c1b0faa..4e366bcf4 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -36,7 +36,7 @@ struct ICEExecutionGateway::PImpl PImpl(const config::JetFIX::Connection &cfg, trace::PerfLog &l) : gw(cfg, l), exe_report_pool(), state(State::WAITING_FOR_SECURITIES), securities(), securities_by_exchange_id(), gw_name(cfg.name()), - cfg(cfg), perf_log(l), admin_data(), nusers(-1) + cfg(cfg), perf_log(l), admin_data(), nusers(-1), connection_time() {} JFGw gw; @@ -52,6 +52,7 @@ struct ICEExecutionGateway::PImpl trace::PerfLog &perf_log; api::admin::AdminData admin_data; std::atomic nusers; + TimeStamp connection_time; }; ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log) @@ -139,10 +140,7 @@ void ICEExecutionGateway::on_connection_status_change(bool is_connected) if(is_connected && me->state == State::READY_TO_START_GW) { me->state = State::TRADER_LOGIN_TIMEOUT; - bts::utils::Dispatcher::background().post([this]() - { - this->on_trader_login_timeout_expired(); - }, 2000); + me->connection_time = Timer::now(); } } @@ -155,8 +153,13 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() // got our security synopsis, ready to start the GW me->state = State::LOGIN_TIMEOUT_COMPLETE; - me->gw.on() = [&](const fix::ICETraderLoginResponseMsg&) + me->gw.on() = [&](const fix::ICETraderLoginResponseMsg& lmsg) { + std::string u = lmsg.get(); + std::string m; + if(lmsg.has()) + m = lmsg.get(); + LOG(OrderMan, Error, "Succesffully logging trader {} into ICE {} {}", u, m, me->gw_name.value()); if(--me->nusers == 0) this->on_login(); }; @@ -199,21 +202,7 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() } } } - LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", me->nusers.load(), me->gw_name.value()); - // if(me->nusers == -1) //TODO hardcode a user - // { - // auto result = std::make_shared(me->cfg); - // auto &stream = result->fix.back(); - // auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); - - // //buffer.add(ice.company_id()); - // buffer.add("bluetrd-fx"); - // buffer.add("Starts123"); - // stream.close(); - // me->nusers = 1; - // trace::CorID trace; - // send_fix(result, trace); - // } + LOG(OrderMan, Warn, "{} traders identified as ICE traders {}", auth_traders.size(), me->gw_name.value()); } } @@ -412,6 +401,11 @@ void ICEExecutionGateway::on_session_reject(const jetfix::fix::RejectMsg& m) void ICEExecutionGateway::dispatch_incoming_fix_messages() { me->gw.dispatch_events(); + + if(me->state == State::TRADER_LOGIN_TIMEOUT && ms_diff(Timer::now(), me->connection_time) >= 2000) + { + on_trader_login_timeout_expired(); + } } void ICEExecutionGateway::send_fix(const jetfix::OutFIXPtr& fix, trace::CorID trace) From 2c0b314428b6292c2f0805bdd84cef5459bf4dc7 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 23 Apr 2019 10:03:12 -0400 Subject: [PATCH 024/225] SPARK-2289: Additional ICE fields --- src/web/ui/src/Accounts/State.fs | 3 +++ src/web/ui/src/Accounts/Types.fs | 3 +++ src/web/ui/src/Accounts/View.fs | 3 +++ src/web/ui/src/Users/State.fs | 4 ++++ src/web/ui/src/Users/Types.fs | 4 ++++ src/web/ui/src/Users/View.fs | 6 +++++- 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 1d1f4c691..6efe5f43f 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -66,8 +66,11 @@ let applyCMEUpdate (data:CMEAccountData) = function let applyICEUpdate (data:ICEAccountData) = function | ICEExchangeField.CTI v -> { data with cti = v } | ICEExchangeField.Origin v -> { data with origin = v } + | ICEExchangeField.ClearingFirm v -> { data with clearingFirm = v } | ICEExchangeField.ClearingAccount v -> { data with clearingAccount = v } | ICEExchangeField.MiscTagMapping mp -> { data with miscTags = mp } + | ICEExchangeField.CustomerAccountRefId v -> { data with customerAccountRefId = v } + | ICEExchangeField.AccountCode v -> { data with accountCode = v } let applySIMUpdate (data:SIMAccountData) = function | CTI v -> { data with cti = v } diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 587a3473b..73b4c4316 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -36,6 +36,9 @@ type ICEExchangeField = | CTI of CTICode | Origin of CustomerOrFirm | ClearingAccount of string + | ClearingFirm of string + | CustomerAccountRefId of string + | AccountCode of string | MiscTagMapping of JSMap type SIMExchangeField = diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 2060114e1..18cd7fb53 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -743,7 +743,10 @@ let exchangeSettings model dispatch = h2 [Class "is-size-3"] [ str "ICE" ] Fields.enumSelect "CTI" (toHuman false CTICode.values ice.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>ICEExchangeField.CTI>>sendICE) Fields.enumSelect "Origin" (toHuman false CustomerOrFirm.values ice.origin) (allToHuman false CustomerOrFirm.values) [] (fromHuman CustomerOrFirm.values>>ICEExchangeField.Origin>>sendICE) + Fields.text "Clearing Firm" ice.clearingFirm [] (ICEExchangeField.ClearingFirm>>sendICE) Fields.text "Clearing Account" ice.clearingAccount [MaxLength 12.0] (ICEExchangeField.ClearingAccount>>sendICE) + Fields.text "Customer Account Ref ID" ice.customerAccountRefId [] (ICEExchangeField.CustomerAccountRefId>>sendICE) + Fields.text "Account Code" ice.accountCode [] (ICEExchangeField.AccountCode>>sendICE) h2 [Class "is-size-3"] [ str "SIM" ] Fields.enumSelect "CTI" (toHuman false CTICode.values sim.cti) (allToHuman false CTICode.values) [] (fromHuman CTICode.values>>SIMExchangeField.CTI>>sendSim) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index a7ce76376..284920482 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -194,7 +194,11 @@ let applyUpdate (field:UserField) (user:BTSUser) = | IsActive ia -> { user with isActive = ia } | CanCreate cr -> { user with canCreate = cr } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } + | ICECompanyID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with companyId = oid } | ICEOperatorID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with operatorId = oid } + | ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid } + | ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid } + | ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid } | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index a32395418..f7ce240f2 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -19,6 +19,10 @@ type UserField = | CMEOperatorID of string | CMEATSOperatorID of string | ICEOperatorID of string +| ICECompanyID of int +| ICEAuthorizedTrader of string +| ICEAuthorizedGroup of string +| ICEPassword of string | SimOperatorID of string | SMPID of string | CMELocation of string diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 7397a563d..d6974cff7 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -278,7 +278,11 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = br [] h2 [Class "is-size-3"] [ str "ICE" ] div [] [ - Fields.text "Operator ID" iceData.operatorId [ MaxLength 18.0 ; Disabled readonly ] (ICEOperatorID >> UpdateField >> dispatch) + Fields.number "Company ID" iceData.companyId [ MaxLength 18.0 ] (ICECompanyID >> UpdateField >> dispatch) + Fields.text "Operator ID" iceData.operatorId [ MaxLength 18.0 ] (ICEOperatorID >> UpdateField >> dispatch) + Fields.text "Authorized Trader" iceData.authorizedTrader [ MaxLength 18.0 ] (ICEAuthorizedTrader >> UpdateField >> dispatch) + Fields.text "Authorized Group" iceData.authorizedGroup [ MaxLength 18.0 ] (ICEAuthorizedGroup >> UpdateField >> dispatch) + Fields.text "Password" iceData.password [ MaxLength 18.0 ] (ICEPassword >> UpdateField >> dispatch) ] br [] h2 [Class "is-size-3"] [ str "Sim" ] From f0105867be3f876c1010d672b99e4a498e82f409 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 23 Apr 2019 10:03:58 -0400 Subject: [PATCH 025/225] SPARK-2289: Implement Eric's Map suggestion --- src/web/ui/src/Users/Types.fs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index f7ce240f2..25adcb201 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -74,16 +74,18 @@ type Model = { } -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) +let CMEMicMap:Map = [ + ("XCME", bts.api.CMEMics.CME); + ("XNYM", bts.api.CMEMics.NYMEX); + ("XCBT", bts.api.CMEMics.CBT); + ("XCEC", bts.api.CMEMics.COMEX) + ] |> Map.ofList -let ICEMicMap:Map = Map.empty - .Add("IFCA", bts.api.ICEMics.IFCA) - .Add("IFEN", bts.api.ICEMics.IFEN) - .Add("IFEU", bts.api.ICEMics.IFEU) - .Add("IFLL", bts.api.ICEMics.IFLL) - .Add("IFUnset", bts.api.ICEMics.IfUnset) - .Add("IFUS", bts.api.ICEMics.IFUS) +let ICEMicMap:Map = [ + ("IFCA", bts.api.ICEMics.IFCA); + ("IFEN", bts.api.ICEMics.IFEN); + ("IFEU", bts.api.ICEMics.IFEU); + ("IFLL", bts.api.ICEMics.IFLL); + ("IFUnset", bts.api.ICEMics.IfUnset); + ("IFUS", bts.api.ICEMics.IFUS) + ] |> Map.ofList From db5f16985c0c59edd9be89f50ebaa77c74049e27 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 23 Apr 2019 11:00:38 -0400 Subject: [PATCH 026/225] SPARK-2289: Remove IFUnset from ICEMics --- src/web/ui/src/Users/Types.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 25adcb201..effec5395 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -86,6 +86,5 @@ let ICEMicMap:Map = [ ("IFEN", bts.api.ICEMics.IFEN); ("IFEU", bts.api.ICEMics.IFEU); ("IFLL", bts.api.ICEMics.IFLL); - ("IFUnset", bts.api.ICEMics.IfUnset); ("IFUS", bts.api.ICEMics.IFUS) ] |> Map.ofList From f0f5988abfa1b4651413b15fc2d79639cf623343 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 23 Apr 2019 13:27:50 -0400 Subject: [PATCH 027/225] almost sending orders --- .../api/service_helpers/AdminServiceUtils.cpp | 34 +++++++++++-- src/lib/api/services/AdminService.proto | 10 ++++ src/lib/domain_model/Security.proto | 5 +- src/lib/jetfix/codec/FieldDefinitions.h | 9 ++++ src/lib/md/Shm/FixedSecurity.cpp | 15 +++--- src/lib/md/Shm/FixedSecurity.h | 5 +- .../orderman/actors/ICEExecutionGateway.cpp | 29 ++++++++--- .../md/platforms/ice_onixs/ICEListener.cpp | 48 +++++++++++-------- .../md/platforms/ice_onixs/ICEListener.h | 22 +++++---- .../platforms/ice_onixs/ICEListenerHelpers.h | 12 ++--- src/web/ui/src/Users/State.fs | 8 ++++ 11 files changed, 143 insertions(+), 54 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index bd7570cab..b1ad0cedd 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1480,11 +1480,19 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_cme_data()->set_location("us,nc"); exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_1->name()); - exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_company_id(51251); exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); exchange_user_data.mutable_ice_data()->set_password("Starts123"); - + exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1); + exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1); + exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1); + exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_1->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); set_user_exchange_data(user_1, exchange_user_data); @@ -1493,10 +1501,19 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_cme_data()->set_location("us,nc"); exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_2->name()); - exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_company_id(51251); exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); exchange_user_data.mutable_ice_data()->set_password("Starts123"); + exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1); + exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1); + exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1); + exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_2->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); @@ -1506,10 +1523,19 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_cme_data()->set_location("us,nc"); exchange_user_data.mutable_ice_data()->set_operator_id("op_id_" + user_3->name()); - exchange_user_data.mutable_ice_data()->set_company_id(649); + exchange_user_data.mutable_ice_data()->set_company_id(51251); exchange_user_data.mutable_ice_data()->set_authorized_trader("bluetrd-fx"); exchange_user_data.mutable_ice_data()->set_authorized_group("Group"); exchange_user_data.mutable_ice_data()->set_password("Starts123"); + exchange_user_data.mutable_ice_data()->set_mifid_direct_electronic_access(-1); + exchange_user_data.mutable_ice_data()->set_mifid_trading_capacity(-1); + exchange_user_data.mutable_ice_data()->set_mifid_liquidity_provision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_commodity_deriv_indicator(-1); + exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); + exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_3->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 39d9cfc0b..9fea911db 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -362,6 +362,16 @@ message ICEUserData { string authorized_group = 15; //tag 553 user_name string password = 21; //tag 96 raw data + //mifid + int32 mifid_direct_electronic_access = 500; + int32 mifid_trading_capacity = 510; + int32 mifid_liquidity_provision = 520; + int32 mifid_commodity_deriv_indicator = 530; + int32 mifid_investment_decision = 540; + int32 mifid_execution_decision = 550; + int32 mifid_client_id_code = 560; + int32 mifid_id = 570; + map misc_tags = 60; ProfessionalDesignation pro_nonpro = 100; DisplayDesignation display_nondisplay = 110; diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index ddfa20a34..fa2b9fb0b 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -105,8 +105,9 @@ message CBOECFEExchangeData { message ICEExchangeData { int64 exchange_id = 10; string security_desc = 15; //contractSymbol - int32 deal_display_factor = 20; - int32 settle_display_factor = 30; + int32 price_denominator = 17; + int32 deal_denominator = 20; + int32 settle_denominator = 30; string market_description = 100; string cleared_alias = 110; diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index 74aa67760..ec098b290 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -130,6 +130,15 @@ typedef IntField<210> MaxShow; typedef IntField<9006> ICEStrategyPreference; typedef IntField<9007> ICETimeStampPreference; +typedef IntField<9700> MifidDirectElectronicAccess; +typedef IntField<9701> MifidTradingCapacity; +typedef IntField<9702> MifidLiquidityProvision; +typedef IntField<9703> MifidCommodityDerivIndicator; +typedef IntField<9704> MifidInvestmentDecision; +typedef IntField<9705> MifidExecutionDecision; +typedef IntField<9706> MifidClientIDCode; +typedef IntField<9707> MifidId; + typedef Groupset_exchange_id(source.numeric_id); dest.mutable_ice()->set_security_desc(source.security_desc()); - dest.mutable_ice()->set_deal_display_factor(source.ice_deal_display_factor); - dest.mutable_ice()->set_settle_display_factor(source.ice_settle_display_factor); + dest.mutable_ice()->set_price_denominator(source.ice_price_denominator); + dest.mutable_ice()->set_deal_denominator(source.ice_deal_denominator); + dest.mutable_ice()->set_settle_denominator(source.ice_settle_denominator); dest.mutable_ice()->set_market_description(source.ice_market_description()); dest.mutable_ice()->set_cleared_alias(source.ice_cleared_alias()); @@ -312,8 +314,9 @@ void convert_security(const Security& src, FixedSecurity& dest, bool set_securit case Security::ExchangeDataCase::kIce: dest.numeric_id = src.ice().exchange_id(); dest.security_desc(src.ice().security_desc()); - dest.ice_deal_display_factor = src.ice().deal_display_factor(); - dest.ice_settle_display_factor = src.ice().settle_display_factor(); + dest.ice_price_denominator = src.ice().price_denominator(); + dest.ice_deal_denominator = src.ice().deal_denominator(); + dest.ice_settle_denominator = src.ice().settle_denominator(); dest.ice_market_description(src.ice().market_description()); dest.ice_cleared_alias(src.ice().cleared_alias()); diff --git a/src/lib/md/Shm/FixedSecurity.h b/src/lib/md/Shm/FixedSecurity.h index 853db1308..f0828d7e9 100644 --- a/src/lib/md/Shm/FixedSecurity.h +++ b/src/lib/md/Shm/FixedSecurity.h @@ -59,8 +59,9 @@ public: uint8_t cme_main_fraction; uint8_t cme_sub_fraction; uint8_t cme_price_display_format; - int8_t ice_deal_display_factor; - int8_t ice_settle_display_factor; + int8_t ice_price_denominator; + int8_t ice_deal_denominator; + int8_t ice_settle_denominator; STRING_PROPERTY(ice_market_description); STRING_PROPERTY(ice_cleared_alias); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 4e366bcf4..c9e6a19bb 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -135,13 +135,15 @@ void ICEExecutionGateway::on_connection_status_change(bool is_connected) { LOG(OrderMan, Info, "Connection state of {} changed to {}", me->gw_name.value(), is_connected ? std::string("connected") : std::string("disconnected")); - me->on_gw_status_change(is_connected); if(is_connected && me->state == State::READY_TO_START_GW) { me->state = State::TRADER_LOGIN_TIMEOUT; me->connection_time = Timer::now(); } + + if(me->state == State::READY) + me->on_gw_status_change(is_connected); } @@ -192,9 +194,25 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); buffer.add(ice.company_id()); buffer.add(ice.authorized_trader()); - buffer.add(ice.password()); + buffer.add(ice.password()); + + if(ice.mifid_direct_electronic_access() >= 0) + buffer.add(ice.mifid_direct_electronic_access()); + if(ice.mifid_trading_capacity() >= 0) + buffer.add(ice.mifid_trading_capacity()); + if(ice.mifid_liquidity_provision() >= 0) + buffer.add(ice.mifid_liquidity_provision()); + if(ice.mifid_commodity_deriv_indicator() >= 0) + buffer.add(ice.mifid_commodity_deriv_indicator()); + if(ice.mifid_investment_decision() > 0) + buffer.add(ice.mifid_investment_decision()); + if(ice.mifid_execution_decision() > 0) + buffer.add(ice.mifid_execution_decision()); + if(ice.mifid_client_id_code() > 0) + buffer.add(ice.mifid_client_id_code()); + if(ice.mifid_id() > 0) + buffer.add(ice.mifid_id()); stream.close(); - //TODO MIFID Defaults trace::CorID trace; send_fix(result, trace); @@ -211,12 +229,11 @@ void ICEExecutionGateway::on_login() if (me->state == State::LOGIN_TIMEOUT_COMPLETE) { LOG(OrderMan, Warn, "Successful login traders {}", me->gw_name.value()); - me->state = State::READY; + me->state = State::READY; + me->on_gw_status_change(true); } } - - OnExeReport &ICEExecutionGateway::on_exe_report() { return me->on_exe_report; } OnGwStatusChange &ICEExecutionGateway::on_gw_status_change() diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index afff7e1d3..c2f6b9ab5 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -14,13 +14,20 @@ namespace md { namespace ice { template <> -double double_of_price(const onixs_ice::Rational& price, int8_t display_factor) +double double_of_price(const onixs_ice::Rational& price, int8_t denominator) { - UNUSED(display_factor); + UNUSED(denominator); double dbl = price.convertTo(); return dbl; } +template<> +void ICEListener::set_security_specific(const onixs_ice::FuturesProductDefinition& def, + FixedSecurity& fsec) +{ + fsec.cash_per_point = double_of_price(def.tickValue, fsec.ice_price_denominator); + //fsec.cash_per_point = def.tickValue; +} ICEListener::ICEListener(ICESecurityIndex& index, MDProducer& producer, const std::vector channels) : _index(index), @@ -145,7 +152,7 @@ void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, con if (data == nullptr) return; bts_assert(data->id == onixs_book.marketId()); - auto display_factor = data->handle.security().display_factor; + auto denominator = data->handle.security().ice_price_denominator; // Overwrite all entries every time size_t bids_size = onixs_book.bids().size(); @@ -163,20 +170,21 @@ void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, con { auto& bid = onixs_book.bids()[x]; if(x < COCONUT_MAX_DEPTH) - dbids[x] = pricesize_of_price_size(bid.price, display_factor, bid.quantity - bid.impliedQuantity); + dbids[x] = pricesize_of_price_size(bid.price, denominator, bid.quantity - bid.impliedQuantity); if(x < COCONUT_MAX_IMPLIED_DEPTH) - ibids[x] = pricesize_of_price_size(bid.price, display_factor, bid.impliedQuantity); + ibids[x] = pricesize_of_price_size(bid.price, denominator, bid.impliedQuantity); } for (size_t x = 0; x < asks_size; ++x) { auto& ask = onixs_book.offers()[x]; if(x < COCONUT_MAX_DEPTH) - dasks[x] = pricesize_of_price_size(ask.price, display_factor, ask.quantity - ask.impliedQuantity); + dasks[x] = pricesize_of_price_size(ask.price, denominator, ask.quantity - ask.impliedQuantity); if(x < COCONUT_MAX_IMPLIED_DEPTH) - iasks[x] = pricesize_of_price_size(ask.price, display_factor, ask.impliedQuantity); + iasks[x] = pricesize_of_price_size(ask.price, denominator, ask.impliedQuantity); } data->handle.update_books(TimeStamp::now(), dbids, dasks, ibids, iasks, (uint32_t) msg_info.sequenceNumber); -} +} + // // Trades @@ -196,7 +204,7 @@ AggressorSide map_aggressor(onixs_ice::AggressorSide::Enum agside) void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, onixs_ice::AggressorSide::Enum agside, const onixs_ice::DateTime& onixs_date) { auto ts = utils::TimeStamp::now(); - PriceSize ps = pricesize_of_price_size(price, data->handle.security().display_factor, size); + PriceSize ps = pricesize_of_price_size(price, data->handle.security().ice_deal_denominator, size); auto date = ll_of_timestamp(onixs_date); data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); } @@ -260,8 +268,8 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const bts_assert(data->id == msg.marketId); onixs_ice::Price price = msg.settlementPrice; onixs_ice::DateTime time = msg.dateTime; - auto display_factor = data->handle.security().display_factor; - data->handle.update_settlement(utils::TimeStamp::now(), convert_price(price, display_factor), date_of_timestamp(time)); + auto denominator = data->handle.security().ice_settle_denominator; + data->handle.update_settlement(utils::TimeStamp::now(), convert_price(price, denominator), date_of_timestamp(time)); } } @@ -279,8 +287,8 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: bts_assert(data->id == msg.marketId); onixs_ice::Price price = msg.openPrice; onixs_ice::DateTime time = msg.dateTime; - auto display_factor = data->handle.security().display_factor; - data->handle.update_opening( utils::TimeStamp::now(), double_of_price(price, display_factor), date_of_timestamp(time)); + auto denominator = data->handle.security().ice_settle_denominator; + data->handle.update_opening( utils::TimeStamp::now(), double_of_price(price, denominator), date_of_timestamp(time)); } } @@ -292,8 +300,8 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice bts_assert(data->id == msg.marketId); onixs_ice::Price price = msg.closePrice; onixs_ice::DateTime time = msg.dateTime; - auto display_factor = data->handle.security().display_factor; - data->handle.update_closing( utils::TimeStamp::now(), double_of_price(price, display_factor), date_of_timestamp(time)); + auto denominator = data->handle.security().ice_settle_denominator; + data->handle.update_closing( utils::TimeStamp::now(), double_of_price(price, denominator), date_of_timestamp(time)); } } @@ -304,11 +312,11 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary { bts_assert(data->id == msg.marketId); onixs_ice::DateTime time = msg.dateTime; - auto display_factor = data->handle.security().display_factor; - data->handle.update_opening( utils::TimeStamp::now(), double_of_price(msg.openingPrice, display_factor), date_of_timestamp(time) ); - data->handle.update_session_high( utils::TimeStamp::now(), double_of_price(msg.high, display_factor) ); - data->handle.update_session_low( utils::TimeStamp::now(), double_of_price(msg.low, display_factor) ); - data->handle.update_settlement( utils::TimeStamp::now(), convert_price(msg.settlementPrice, display_factor), date_of_timestamp(time) ); + auto denominator = data->handle.security().ice_settle_denominator; + data->handle.update_opening( utils::TimeStamp::now(), double_of_price(msg.openingPrice, denominator), date_of_timestamp(time) ); + data->handle.update_session_high( utils::TimeStamp::now(), double_of_price(msg.high, denominator) ); + data->handle.update_session_low( utils::TimeStamp::now(), double_of_price(msg.low, denominator) ); + data->handle.update_settlement( utils::TimeStamp::now(), convert_price(msg.settlementPrice, denominator), date_of_timestamp(time) ); } } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index 25eacf3aa..84bb2fa87 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -104,6 +104,8 @@ private: template void set_security_common(const Definition& def, FixedSecurity& fsec); template + void set_security_specific(const Definition& def, FixedSecurity& fsec); + template void on_future(const Definition& def, bool& is_interested); template void on_uds_future_spread(const Definition& def, bool& is_interested); @@ -142,15 +144,15 @@ void ICEListener::set_security_common(const Definition& def, FixedSecurity& fsec fsec.numeric_id = def.marketId; std::string sym = parse_contract_symbol(def.contractSymbol); fsec.symbol( sym ); - //fsec.security_desc(def.marketDesc); fsec.security_desc(def.contractSymbol); fsec.exchange = api::Venue::VENUE_ICE; - fsec.display_factor = (int8_t)(def.orderPriceDenominator - '0'); - fsec.ice_deal_display_factor = (int8_t)(def.dealPriceDenominator - '0'); - fsec.ice_settle_display_factor = (int8_t)(def.settlePriceDenominator - '0'); - double min_tick = double_of_price(def.incrementPrice, fsec.display_factor); - fsec.low_tick = fsec.high_tick = min_tick; - fsec.price_break = 0.; + fsec.display_factor = 0.0; + fsec.ice_price_denominator = (int8_t)(def.orderPriceDenominator - '0'); + fsec.ice_deal_denominator = (int8_t)(def.dealPriceDenominator - '0'); + fsec.ice_settle_denominator = (int8_t)(def.settlePriceDenominator - '0'); + double min_tick = double_of_price(def.incrementPrice, fsec.ice_price_denominator); + fsec.low_tick = fsec.high_tick = min_tick; + fsec.price_break = 0.0; fsec.ice_market_description(def.marketDesc); fsec.ice_cleared_alias(def.clearedAlias); @@ -160,6 +162,10 @@ void ICEListener::set_security_common(const Definition& def, FixedSecurity& fsec fsec.mic_code(def.micCode); } +template +void ICEListener::set_security_specific(const Definition&, FixedSecurity& ) {} + + template void ICEListener::on_future(const Definition& def, bool& is_interested) { @@ -169,7 +175,7 @@ void ICEListener::on_future(const Definition& def, bool& is_interested) FixedFutureSecurity fsec; set_security_common(def, fsec); - //fsec.cash_per_point = double_of_price(def.tickValue, fsec.display_factor); + set_security_specific(def, fsec); fsec.expiration_year = def.maturityYear; fsec.expiration_month = def.maturityMonth; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h index 7efa7b049..34d6f09f4 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListenerHelpers.h @@ -16,25 +16,25 @@ namespace md { namespace ice { template -double double_of_price(const OnixPrice& price, int8_t display_factor) +double double_of_price(const OnixPrice& price, int8_t denominator) { - double dbl = price / pow10(display_factor); + double dbl = price / pow10(denominator); return dbl; } template -IntPrice convert_price(const OnixsPrice& price, int8_t display_factor) +IntPrice convert_price(const OnixsPrice& price, int8_t denominator) { - double dbl = double_of_price(price, display_factor); + double dbl = double_of_price(price, denominator); const int PRECISION = 7; //TODO config::get().connection() case ICE auto intpx = md::IntPrice_from_double(dbl); return intpx; } template -inline PriceSize pricesize_of_price_size(const OnixsPrice& price, int8_t display_factor, Size size) +inline PriceSize pricesize_of_price_size(const OnixsPrice& price, int8_t denominator, Size size) { - auto intpx = convert_price(price, display_factor); + auto intpx = convert_price(price, denominator); PriceSize result({intpx.mantissa(), (int8_t)(intpx.exponent())}, size); return result; } diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index a7ce76376..f5d9a665d 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -74,6 +74,14 @@ let defaultScratchUser = { authorizedTrader = "" authorizedGroup = "" password = "" + mifidDirectElectronicAccess = -1 + mifidTradingCapacity = -1 + mifidLiquidityProvision = -1 + mifidCommodityDerivIndicator = -1 + mifidInvestmentDecision = -1 + mifidExecutionDecision = -1 + mifidClientIdCode = -1 + mifidId = -1 miscTags = JSMap.empty proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY From 0a163badf03a5e7eef72a8a1ced4da86f57a4303 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 23 Apr 2019 15:45:11 -0400 Subject: [PATCH 028/225] SPARK-2289: Add MIFID fields to Spark Admin --- src/web/ui/src/Users/State.fs | 13 ++++++++++++- src/web/ui/src/Users/Types.fs | 11 +++++++++++ src/web/ui/src/Users/View.fs | 12 ++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 95860cb0d..8cee4e173 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -81,7 +81,7 @@ let defaultScratchUser = { mifidInvestmentDecision = -1 mifidExecutionDecision = -1 mifidClientIdCode = -1 - mifidId = -1 + mifidId = -1 miscTags = JSMap.empty proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY @@ -202,11 +202,22 @@ let applyUpdate (field:UserField) (user:BTSUser) = | IsActive ia -> { user with isActive = ia } | CanCreate cr -> { user with canCreate = cr } | CMEOperatorID oid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with operatorId = oid } + | ICECompanyID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with companyId = oid } | ICEOperatorID oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with operatorId = oid } | ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid } | ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid } | ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid } + + | MifidClientIdCode value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidClientIdCode = value } + | MifidCommodityDerivIndicator value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidCommodityDerivIndicator = value } + | MifidDirectElectronicAccess value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidDirectElectronicAccess = value } + | MifidExecutionDecision value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidExecutionDecision = value } + | MifidId value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidId = value } + | MifidInvestmentDecision value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidInvestmentDecision = value } + | MifidLiquidityProvision value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidLiquidityProvision = value } + | MifidTradingCapacity value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidTradingCapacity = value } + | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index effec5395..91dc5bee5 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -23,6 +23,17 @@ type UserField = | ICEAuthorizedTrader of string | ICEAuthorizedGroup of string | ICEPassword of string + +| MifidClientIdCode of int +| MifidCommodityDerivIndicator of int +| MifidDirectElectronicAccess of int +| MifidExecutionDecision of int +| MifidId of int +| MifidInvestmentDecision of int +| MifidLiquidityProvision of int +| MifidTradingCapacity of int + + | SimOperatorID of string | SMPID of string | CMELocation of string diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index d6974cff7..7a8b749ca 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -283,6 +283,18 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = Fields.text "Authorized Trader" iceData.authorizedTrader [ MaxLength 18.0 ] (ICEAuthorizedTrader >> UpdateField >> dispatch) Fields.text "Authorized Group" iceData.authorizedGroup [ MaxLength 18.0 ] (ICEAuthorizedGroup >> UpdateField >> dispatch) Fields.text "Password" iceData.password [ MaxLength 18.0 ] (ICEPassword >> UpdateField >> dispatch) + + h2 [Class "is-size-4"] [ str "MIFID" ] + div [Style [MarginLeft "2em"]] [ + Fields.number "Client Id Code" iceData.mifidClientIdCode [ ] (MifidClientIdCode >> UpdateField >> dispatch) + Fields.number "Commodity Deriv Indicator" iceData.mifidCommodityDerivIndicator [ ] (MifidCommodityDerivIndicator >> UpdateField >> dispatch) + Fields.number "Direct Electronic Access" iceData.mifidDirectElectronicAccess [ ] (MifidDirectElectronicAccess >> UpdateField >> dispatch) + Fields.number "Execution Decision" iceData.mifidExecutionDecision [ ] (MifidExecutionDecision >> UpdateField >> dispatch) + Fields.number "Id" iceData.mifidId [ ] (MifidId >> UpdateField >> dispatch) + Fields.number "Investment Decision" iceData.mifidInvestmentDecision [ ] (MifidInvestmentDecision >> UpdateField >> dispatch) + Fields.number "Liquidity Provision" iceData.mifidLiquidityProvision [ ] (MifidLiquidityProvision >> UpdateField >> dispatch) + Fields.number "Trading Capacity" iceData.mifidTradingCapacity [ ] (MifidTradingCapacity >> UpdateField >> dispatch) + ] ] br [] h2 [Class "is-size-3"] [ str "Sim" ] From 625ebcc762252ebd6009add693356da09305c121 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 23 Apr 2019 17:21:52 -0400 Subject: [PATCH 029/225] got a fill --- .../api/service_helpers/AdminServiceUtils.cpp | 23 +++++-------------- .../orderman/actors/ICEExecutionGateway.cpp | 18 ++++++++++----- src/lib/orderman/orders/ICENativeOrder.cpp | 9 ++++---- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index b1ad0cedd..4da99f1d0 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -456,18 +456,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt out_result.set_error_text("Operator ID is not set"); return rv; } - if (ice_account_data->clearing_account().length() == 0) - { - out_result.set_is_success(false); - out_result.set_error_text("Clearing Account is not set"); - return rv; - } - if (ice_account_data->cti()==bts::api::orderman::CTICode::CTI_CODE_UNDEFINED) - { - out_result.set_is_success(false); - out_result.set_error_text("CTI Code is not set"); - return rv; - } + rv.set_session(conn_ptr->name()); rv.set_sender_compid(conn_ptr->ice_connection().sender_compid()); rv.set_account(ice_account_data->clearing_account()); @@ -1414,7 +1403,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ auto account_1 = create_account(data, parent_account->id(), std::string("ACC A1"), std::string("description"), true, account_result); account_1->set_is_active(true); auto account_2 = create_account(data, parent_account->id(), std::string("ACC A2"), std::string("description"), true, account_result); account_2->set_is_active(true); auto account_3 = create_account(data, parent_account->id(), std::string("ACC A3"), std::string("description"), true, account_result); account_3->set_is_active(true); - auto account_4 = create_account(data, parent_account->id(), std::string("BLUETEST"), std::string("description"), true, account_result); account_4->set_is_active(true); + auto account_4 = create_account(data, parent_account->id(), std::string("BLUETST"), std::string("description"), true, account_result); account_4->set_is_active(true); create_account(data, parent_account->id(), std::string("ACC A4"), std::string("description"), true, account_result); // add group auto def_group = create_group(data, 0, std::string("default"), result); @@ -1444,7 +1433,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_account_data.mutable_cme_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); exchange_account_data.mutable_cme_account_data()->set_clearing_account(parent_account->name()); - exchange_account_data.mutable_ice_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_CTI_CODE1); + exchange_account_data.mutable_ice_account_data()->set_cti(bts::api::orderman::CTICode::CTI_CODE_UNDEFINED); exchange_account_data.mutable_ice_account_data()->set_origin(bts::api::orderman::CustomerOrFirm::CUSTOMER_OR_FIRM_FIRM); exchange_account_data.mutable_ice_account_data()->set_clearing_account(parent_account->name()); exchange_account_data.mutable_ice_account_data()->set_clearing_firm("649"); @@ -1491,7 +1480,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); - exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(1); exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_1->name()); exchange_user_data.mutable_sim_data()->set_location("us,nc"); @@ -1512,7 +1501,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); - exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(1); exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_2->name()); @@ -1534,7 +1523,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ exchange_user_data.mutable_ice_data()->set_mifid_investment_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_execution_decision(-1); exchange_user_data.mutable_ice_data()->set_mifid_client_id_code(-1); - exchange_user_data.mutable_ice_data()->set_mifid_id(-1); + exchange_user_data.mutable_ice_data()->set_mifid_id(1); exchange_user_data.mutable_sim_data()->set_operator_id("op_id_" + user_3->name()); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index c9e6a19bb..dbc9de852 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -183,12 +183,13 @@ void ICEExecutionGateway::on_trader_login_timeout_expired() { if(u.has_user_data() && u.user_data().has_exchange_user_data() && u.user_data().exchange_user_data().has_ice_data()) { - if(me->nusers == -1) - me->nusers = 0; - me->nusers++; const auto& ice = u.user_data().exchange_user_data().ice_data(); if(auth_traders.find(ice.authorized_trader()) == auth_traders.end()) { + if(me->nusers == -1) + me->nusers = 0; + me->nusers++; + auto result = std::make_shared(me->cfg); auto &stream = result->fix.back(); auto &buffer = stream.new_msg(MessageTypes::ICETraderLogin); @@ -376,8 +377,14 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg : Price(0); if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); + + if (msg.has()) - str_to(msg.get(), &data->transact_time); + { + std::string stamp = msg.get(); + stamp.resize(sizeof(mercury::TimeStampStr)); + str_to(stamp, &data->transact_time); + } data->cfg = &me->cfg; data->msg = text_msg; data->exchange = api::Venue::VENUE_ICE; @@ -417,8 +424,7 @@ void ICEExecutionGateway::on_session_reject(const jetfix::fix::RejectMsg& m) void ICEExecutionGateway::dispatch_incoming_fix_messages() { - me->gw.dispatch_events(); - + me->gw.dispatch_events(); if(me->state == State::TRADER_LOGIN_TIMEOUT && ms_diff(Timer::now(), me->connection_time) >= 2000) { on_trader_login_timeout_expired(); diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 3981eb75c..fb3608f2c 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -17,6 +17,7 @@ #include "lib/orderman/actors/order_manager/OrderServices.h" #include +#include #include namespace bts { @@ -820,7 +821,8 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) if (!terminal_state(me->state.status())) { - state.set_price(er.data->price.value()); + if(!isnan(er.data->price.value())) + state.set_price(er.data->price.value()); state.set_quantity(er.data->quantity.value()); } @@ -1037,7 +1039,6 @@ void ICENativeOrder::init_fix() // initialize update FIX auto &update_encoding = me->update_encoding; - update_encoding.add(combined_clorid); update_encoding.add(combined_clorid); update_encoding.add(std::atoi(rr.company_id().c_str())); //update_encoding.add(""); //optional, unclear if we need @@ -1050,6 +1051,7 @@ void ICENativeOrder::init_fix() update_encoding.add(def.side()); me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); + me->update_clordid_bm = update_encoding.add(0, ice_orderid_sz()); update_encoding.add(def.time_in_force()); if(rr.account() != "") update_encoding.add(rr.account()); @@ -1065,13 +1067,12 @@ void ICENativeOrder::init_fix() // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; - cancel_encoding.add(combined_clorid); cancel_encoding.add(combined_clorid); cancel_encoding.add(std::atoi(rr.company_id().c_str())); cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - //me->cancel_transact_time_bm = cancel_encoding.add(datetime::FIX_timestamp(datetime::now())); + me->cancel_clordid_bm = cancel_encoding.add(0, ice_orderid_sz()); // special tags switch (def.custom_def().custom_case()) From f8626f81cdf6405d236101fa85bf9852f34b9f58 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 23 Apr 2019 18:14:14 -0400 Subject: [PATCH 030/225] throwing this back to michael for int64 --- src/lib/api/services/AdminService.proto | 8 +- src/lib/jetfix/codec/FieldDefinitions.h | 14 +- src/lib/jetfix/codec/Fields.h | 27 +++ src/lib/jetfix/codec/i32_toa.h | 244 ++++++++++++++++++++++++ src/web/ui/src/Users/Types.fs | 8 +- 5 files changed, 286 insertions(+), 15 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 9fea911db..75e42e1f1 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -367,10 +367,10 @@ message ICEUserData { int32 mifid_trading_capacity = 510; int32 mifid_liquidity_provision = 520; int32 mifid_commodity_deriv_indicator = 530; - int32 mifid_investment_decision = 540; - int32 mifid_execution_decision = 550; - int32 mifid_client_id_code = 560; - int32 mifid_id = 570; + int64 mifid_investment_decision = 540; + int64 mifid_execution_decision = 550; + int64 mifid_client_id_code = 560; + int64 mifid_id = 570; map misc_tags = 60; ProfessionalDesignation pro_nonpro = 100; diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index ec098b290..f7cee2eef 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -110,9 +110,9 @@ typedef TimeField<60> TransactTime; //ICE typedef IntField<9208> Int_CtiCode; -typedef IntField<11> Int_ClOrdID; -typedef IntField<37> Int_OrderID; -typedef IntField<41> Int_OrigClOrdID; +typedef BigIntField<11> Int_ClOrdID; +typedef BigIntField<37> Int_OrderID; +typedef BigIntField<41> Int_OrigClOrdID; typedef IntField<109> CompanyID; typedef IntField<55> Int_Symbol; typedef IntField<439> Int_ClearingFirm; @@ -134,10 +134,10 @@ typedef IntField<9700> MifidDirectElectronicAccess; typedef IntField<9701> MifidTradingCapacity; typedef IntField<9702> MifidLiquidityProvision; typedef IntField<9703> MifidCommodityDerivIndicator; -typedef IntField<9704> MifidInvestmentDecision; -typedef IntField<9705> MifidExecutionDecision; -typedef IntField<9706> MifidClientIDCode; -typedef IntField<9707> MifidId; +typedef BigIntField<9704> MifidInvestmentDecision; +typedef BigIntField<9705> MifidExecutionDecision; +typedef BigIntField<9706> MifidClientIDCode; +typedef BigIntField<9707> MifidId; typedef Group +class BigIntField : public BaseField +{ +public: + typedef BaseField Parent; + + void read (ReaderCursor &cursor) + { + auto loc = cursor.read_field (); + Parent::_value = atoi (&(cursor.data ()[loc.first])); + } + + static uint32_t max_value_size (int64_t,int pad = 0) + { + if (pad == 0) + return 20; + else + return pad; + } + + static std::pair write (char*buffer,int64_t i,int pad = 0) + { + auto written = i64_toa (i,buffer,pad); + return std::make_pair (written,sum_bytes (buffer,written)); + } +}; + template class StringField : public BaseField { diff --git a/src/lib/jetfix/codec/i32_toa.h b/src/lib/jetfix/codec/i32_toa.h index be546f39b..7a390294e 100644 --- a/src/lib/jetfix/codec/i32_toa.h +++ b/src/lib/jetfix/codec/i32_toa.h @@ -259,3 +259,247 @@ inline int u32_toa(uint32_t u, char* buffer, int pad) { } +inline int u64_toa(uint64_t value, char* buffer) +{ + char *start = buffer; + if (value < 100000000) { + uint32_t v = static_cast(value); + if (v < 10000) { + const uint32_t d1 = (v / 100) << 1; + const uint32_t d2 = (v % 100) << 1; + + if (v >= 1000) + *buffer++ = gDigitsLut[d1]; + if (v >= 100) + *buffer++ = gDigitsLut[d1 + 1]; + if (v >= 10) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + *buffer++ = '\0'; + } + else { + // value = bbbbcccc + const uint32_t b = v / 10000; + const uint32_t c = v % 10000; + const uint32_t d1 = (b / 100) << 1; + const uint32_t d2 = (b % 100) << 1; + const uint32_t d3 = (c / 100) << 1; + const uint32_t d4 = (c % 100) << 1; + if (value >= 10000000) + *buffer++ = gDigitsLut[d1]; + if (value >= 1000000) + *buffer++ = gDigitsLut[d1 + 1]; + if (value >= 100000) + *buffer++ = gDigitsLut[d2]; + *buffer++ = gDigitsLut[d2 + 1]; + *buffer++ = gDigitsLut[d3]; + *buffer++ = gDigitsLut[d3 + 1]; + *buffer++ = gDigitsLut[d4]; + *buffer++ = gDigitsLut[d4 + 1]; + *buffer++ = '\0'; + } + } + else if (value < 10000000000000000) { + const uint32_t v0 = static_cast(value / 100000000); + const uint32_t v1 = static_cast(value % 100000000); + const __m128i a0 = Convert8DigitsSSE2(v0); + const __m128i a1 = Convert8DigitsSSE2(v1); + // Convert to bytes, add '0' + const __m128i va = _mm_add_epi8(_mm_packus_epi16(a0, a1), reinterpret_cast(kAsciiZero)[0]); + + // Count number of digit + const unsigned mask = _mm_movemask_epi8(_mm_cmpeq_epi8(va, reinterpret_cast(kAsciiZero)[0])); +#ifdef _MSC_VER + unsigned long digit; + _BitScanForward(&digit, ~mask | 0x8000); +#else + unsigned digit = __builtin_ctz(~mask | 0x8000); +#endif + + // Shift digits to the beginning + __m128i result = ShiftDigits_SSE2(va, digit); + _mm_storeu_si128(reinterpret_cast<__m128i*>(buffer), result); + buffer[16 - digit] = '\0'; + } + else { + const uint32_t a = static_cast(value / 10000000000000000); // 1 to 1844 + value %= 10000000000000000; + + if (a < 10) + *buffer++ = '0' + static_cast(a); + else if (a < 100) { + const uint32_t i = a << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + } + else if (a < 1000) { + *buffer++ = '0' + static_cast(a / 100); + + const uint32_t i = (a % 100) << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + } + else { + const uint32_t i = (a / 100) << 1; + const uint32_t j = (a % 100) << 1; + *buffer++ = gDigitsLut[i]; + *buffer++ = gDigitsLut[i + 1]; + *buffer++ = gDigitsLut[j]; + *buffer++ = gDigitsLut[j + 1]; + } + + const uint32_t v0 = static_cast(value / 100000000); + const uint32_t v1 = static_cast(value % 100000000); + + const __m128i a0 = Convert8DigitsSSE2(v0); + const __m128i a1 = Convert8DigitsSSE2(v1); + + // Convert to bytes, add '0' + const __m128i va = _mm_add_epi8(_mm_packus_epi16(a0, a1), reinterpret_cast(kAsciiZero)[0]); + _mm_storeu_si128(reinterpret_cast<__m128i*>(buffer), va); + buffer[16] = '\0'; + return buffer+16-start; + } + return buffer-start-1; +} + +inline int count_digits (int64_t value) +{ + static auto P01 = 10u; + static auto P02 = P01*10; + static auto P03 = P02*10; + static auto P04 = P03*10; + static auto P05 = P04*10; + static auto P06 = P05*10; + static auto P07 = P06*10; + static auto P08 = P07*10; + static auto P09 = P08*10; + static auto P10 = P09*10; + static auto P11 = P10*10; + static auto P12 = P11*10; + static auto P13 = P12*10; + static auto P14 = P13*10; + static auto P15 = P14*10; + static auto P16 = P15*10; + static auto P17 = P16*10; + static auto P18 = P17*10; + static auto P19 = P18*10; + + uint64_t u = static_cast(value); + if (value < 0) + u = ~u + 1; + + if (u < P01) return 1; + if (u < P02) return 2; + if (u < P03) return 3; + if (u < P04) return 4; + if (u < P05) return 5; + if (u < P06) return 6; + if (u < P07) return 7; + if (u < P08) return 8; + if (u < P09) return 9; + if (u < P10) return 10; + if (u < P11) return 11; + if (u < P12) return 12; + if (u < P13) return 13; + if (u < P14) return 14; + if (u < P15) return 15; + if (u < P16) return 16; + if (u < P17) return 17; + if (u < P18) return 18; + if (u < P19) return 19; + return 20; +} + +inline int count_digits (uint64_t u) +{ + static auto P01 = 10u; + static auto P02 = P01*10; + static auto P03 = P02*10; + static auto P04 = P03*10; + static auto P05 = P04*10; + static auto P06 = P05*10; + static auto P07 = P06*10; + static auto P08 = P07*10; + static auto P09 = P08*10; + static auto P10 = P09*10; + static auto P11 = P10*10; + static auto P12 = P11*10; + static auto P13 = P12*10; + static auto P14 = P13*10; + static auto P15 = P14*10; + static auto P16 = P15*10; + static auto P17 = P16*10; + static auto P18 = P17*10; + static auto P19 = P18*10; + + if (u < P01) return 1; + if (u < P02) return 2; + if (u < P03) return 3; + if (u < P04) return 4; + if (u < P05) return 5; + if (u < P06) return 6; + if (u < P07) return 7; + if (u < P08) return 8; + if (u < P09) return 9; + if (u < P10) return 10; + if (u < P11) return 11; + if (u < P12) return 12; + if (u < P13) return 13; + if (u < P14) return 14; + if (u < P15) return 15; + if (u < P16) return 16; + if (u < P17) return 17; + if (u < P18) return 18; + if (u < P19) return 19; + return 20; +} + +inline int i64_toa(int32_t value, char* buffer, int pad) +{ + auto start = buffer; + uint64_t u = static_cast(value); + if (value < 0) { + *buffer++ = '-'; + u = ~u + 1; + } + if (pad) + { + auto digits = count_digits (value); + auto offset = pad - digits; + if (offset > 0) + { + auto start = buffer + offset; + while (buffer != start) + { + *buffer='0'; + buffer++; + } + } + else if (offset < 0) + return 0; + } + return (buffer-start) + u64_toa(u, buffer); +} + +inline int u64_toa(uint32_t u, char* buffer, int pad) +{ + auto start = buffer; + if (pad) + { + auto digits = count_digits (u); + auto offset = pad - digits; + if (offset > 0) + { + auto start = buffer + offset; + while (buffer != start) + { + *buffer='0'; + buffer++; + } + } + else if (offset < 0) + return 0; + } + return (buffer-start) + u64_toa(u, buffer); +} \ No newline at end of file diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 91dc5bee5..e3f9a6493 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -24,12 +24,12 @@ type UserField = | ICEAuthorizedGroup of string | ICEPassword of string -| MifidClientIdCode of int +| MifidClientIdCode of int64 | MifidCommodityDerivIndicator of int | MifidDirectElectronicAccess of int -| MifidExecutionDecision of int -| MifidId of int -| MifidInvestmentDecision of int +| MifidExecutionDecision of int64 +| MifidId of int64 +| MifidInvestmentDecision of int64 | MifidLiquidityProvision of int | MifidTradingCapacity of int From b5997d326ece8c8aea52e40ff0b2fa893a3fca58 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 23 Apr 2019 18:22:44 -0400 Subject: [PATCH 031/225] f# 64 bit ints, maybe --- src/web/ui/src/Controls/Fields.fs | 4 ++++ src/web/ui/src/Users/State.fs | 8 ++++---- src/web/ui/src/Users/View.fs | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 2fbd6cd2f..e0b3b002e 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -133,6 +133,10 @@ 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 number64 (lbl:string) (dv:int64) (attrs:IHTMLProp list) onchange = + text lbl (string dv) attrs (int64>>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 diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 8cee4e173..0fc7a901f 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -78,10 +78,10 @@ let defaultScratchUser = { mifidTradingCapacity = -1 mifidLiquidityProvision = -1 mifidCommodityDerivIndicator = -1 - mifidInvestmentDecision = -1 - mifidExecutionDecision = -1 - mifidClientIdCode = -1 - mifidId = -1 + mifidInvestmentDecision = -1L + mifidExecutionDecision = -1L + mifidClientIdCode = -1L + mifidId = -1L miscTags = JSMap.empty proNonpro = ProfessionalDesignation.PRO displayNondisplay = DisplayDesignation.DISPLAY diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 7a8b749ca..c7076165f 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -286,12 +286,12 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = h2 [Class "is-size-4"] [ str "MIFID" ] div [Style [MarginLeft "2em"]] [ - Fields.number "Client Id Code" iceData.mifidClientIdCode [ ] (MifidClientIdCode >> UpdateField >> dispatch) + Fields.number64 "Client Id Code" iceData.mifidClientIdCode [ ] (MifidClientIdCode >> UpdateField >> dispatch) Fields.number "Commodity Deriv Indicator" iceData.mifidCommodityDerivIndicator [ ] (MifidCommodityDerivIndicator >> UpdateField >> dispatch) Fields.number "Direct Electronic Access" iceData.mifidDirectElectronicAccess [ ] (MifidDirectElectronicAccess >> UpdateField >> dispatch) - Fields.number "Execution Decision" iceData.mifidExecutionDecision [ ] (MifidExecutionDecision >> UpdateField >> dispatch) - Fields.number "Id" iceData.mifidId [ ] (MifidId >> UpdateField >> dispatch) - Fields.number "Investment Decision" iceData.mifidInvestmentDecision [ ] (MifidInvestmentDecision >> UpdateField >> dispatch) + Fields.number64 "Execution Decision" iceData.mifidExecutionDecision [ ] (MifidExecutionDecision >> UpdateField >> dispatch) + Fields.number64 "Id" iceData.mifidId [ ] (MifidId >> UpdateField >> dispatch) + Fields.number64 "Investment Decision" iceData.mifidInvestmentDecision [ ] (MifidInvestmentDecision >> UpdateField >> dispatch) Fields.number "Liquidity Provision" iceData.mifidLiquidityProvision [ ] (MifidLiquidityProvision >> UpdateField >> dispatch) Fields.number "Trading Capacity" iceData.mifidTradingCapacity [ ] (MifidTradingCapacity >> UpdateField >> dispatch) ] From 20eb3ed39d24db9d1211ebb4ed371414dd57a506 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 24 Apr 2019 14:07:21 -0400 Subject: [PATCH 032/225] matched Pedro's ICE deferred cancel / update for ice --- src/lib/orderman/orders/ICENativeOrder.cpp | 78 +++++++++++++++++++--- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index fb3608f2c..5809e592c 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -64,6 +64,9 @@ struct ICENativeOrder::PImpl OrderServices::ExeReportSubID exe_report_sid; OrderServices::CancelRejectSubID cancel_reject_sid; + + bool buffered_cancel = false; + std::optional> buffered_update; }; ICENativeOrder::ICENativeOrder() : me(new PImpl()) {} @@ -602,7 +605,10 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_PENDING_WORKING: - transition(me->state.status(), "Cannot update order"); + LOG(OrderMan, Warn, + "Cannot apply update to order {}. Update: {}@{}. Buffering", + key().value(), q.value(), p.value()); + me->buffered_update.emplace(p, q); break; case ORDER_STATUS_REJECTED_BY_SPARK: @@ -711,18 +717,24 @@ OrderOpResult ICENativeOrder::on_cancel() result.error_msg = "Order is already terminated"; break; - case ORDER_STATUS_DISCONNECTED: - { - auto msg = "Cannot cancel order"; - result.error = ORDER_ERROR_GATEWAY_NOT_READY; - result.error_msg = msg; - transition(me->state.status(), msg); - break; - } case ORDER_STATUS_PENDING_WORKING: { - auto msg = "Cannot cancel order"; - result.error = ORDER_ERROR_ORDER_NOT_ACK; + me->buffered_cancel = true; + LOG(OrderMan, Warn, + "Cannot cancel order {} while in the pending working state. " + "Buffering cancel", + key().value()); + break; + } + case ORDER_STATUS_DISCONNECTED: + { + me->buffered_cancel = true; + LOG(OrderMan, Warn, + "Cannot cancel order {} while in the disconnected state. Buffering " + "cancel", + key().value()); + auto msg = "Order will be canceled when re-connected"; + result.error = ORDER_ERROR_GATEWAY_NOT_READY; result.error_msg = msg; transition(me->state.status(), msg); break; @@ -843,7 +855,30 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) !me->services->is_gateway_connected(*me->session_services)) transition(ORDER_STATUS_DISCONNECTED); else + { transition(external_status); + if (external_status == ORDER_STATUS_WORKING) + { + if (me->buffered_cancel) + { + LOG(OrderMan, Warn, + "Applying buffered cancel to order {}, on first ack", + key().value()); + on_cancel(); + } + else if (me->buffered_update.has_value()) + { + auto [p, q] = me->buffered_update.value(); + me->buffered_update.reset(); + LOG(OrderMan, Warn, + "Applying buffered update ({}@{}) to order {}, on " + "first ack", + q.value(),p.value(), + key().value()); + on_update(p, q); + } + } + } break; case ORDER_STATUS_WORKING: @@ -912,6 +947,27 @@ void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) { auto const &native_state = get_native_state(me->state); transition(map_external_status(native_state.native_status())); + if (me->state.status() == ORDER_STATUS_WORKING) + { + if (me->buffered_cancel) + { + LOG(OrderMan, Warn, + "Applying buffered cancel to order {}, on re-connection", + key().value()); + on_cancel(); + } + else if (me->buffered_update.has_value()) + { + auto [p, q] = me->buffered_update.value(); + me->buffered_update.reset(); + LOG(OrderMan, Warn, + "Applying buffered update ({}@{}) to order {}, on " + "re-connection", + q.value(),p.value(), + key().value()); + on_update(p, q); + } + } break; } case ORDER_STATUS_INACTIVE: From caa9671c96dde3fbdada49d81a4fccc90df0be7f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 24 Apr 2019 18:37:45 -0400 Subject: [PATCH 033/225] ids... --- src/lib/jetfix/codec/i32_toa.h | 164 ++++++++------------- src/lib/orderman/orders/ICENativeOrder.cpp | 48 +++--- src/lib/orderman/orders/ICENativeOrder.h | 3 +- 3 files changed, 86 insertions(+), 129 deletions(-) diff --git a/src/lib/jetfix/codec/i32_toa.h b/src/lib/jetfix/codec/i32_toa.h index 7a390294e..afc257ebc 100644 --- a/src/lib/jetfix/codec/i32_toa.h +++ b/src/lib/jetfix/codec/i32_toa.h @@ -259,113 +259,65 @@ inline int u32_toa(uint32_t u, char* buffer, int pad) { } -inline int u64_toa(uint64_t value, char* buffer) +///https://github.com/miloyip/itoa-benchmark + +#define BEGIN2(n) \ + do { \ + int t = (n); \ + if(t < 10) *p++ = '0' + t; \ + else { \ + t *= 2; \ + *p++ = gDigitsLut[t]; \ + *p++ = gDigitsLut[t + 1]; \ + } \ + } while(0) +#define MIDDLE2(n) \ + do { \ + int t = (n) * 2; \ + *p++ = gDigitsLut[t]; \ + *p++ = gDigitsLut[t + 1]; \ + } while(0) +#define BEGIN4(n) \ + do { \ + int t4 = (n); \ + if(t4 < 100) BEGIN2(t4); \ + else { BEGIN2(t4 / 100); MIDDLE2(t4 % 100); } \ + } while(0) +#define MIDDLE4(n) \ + do { \ + int t4 = (n); \ + MIDDLE2(t4 / 100); MIDDLE2(t4 % 100); \ + } while(0) +#define BEGIN8(n) \ + do { \ + uint32_t t8 = (n); \ + if(t8 < 10000) BEGIN4(t8); \ + else { BEGIN4(t8 / 10000); MIDDLE4(t8 % 10000); } \ + } while(0) +#define MIDDLE8(n) \ + do { \ + uint32_t t8 = (n); \ + MIDDLE4(t8 / 10000); MIDDLE4(t8 % 10000); \ + } while(0) +#define MIDDLE16(n) \ + do { \ + uint64_t t16 = (n); \ + MIDDLE8(t16 / 100000000); MIDDLE8(t16 % 100000000); \ + } while(0) + +inline int u64_toa(uint64_t value, char* p) { - char *start = buffer; - if (value < 100000000) { - uint32_t v = static_cast(value); - if (v < 10000) { - const uint32_t d1 = (v / 100) << 1; - const uint32_t d2 = (v % 100) << 1; - - if (v >= 1000) - *buffer++ = gDigitsLut[d1]; - if (v >= 100) - *buffer++ = gDigitsLut[d1 + 1]; - if (v >= 10) - *buffer++ = gDigitsLut[d2]; - *buffer++ = gDigitsLut[d2 + 1]; - *buffer++ = '\0'; - } - else { - // value = bbbbcccc - const uint32_t b = v / 10000; - const uint32_t c = v % 10000; - const uint32_t d1 = (b / 100) << 1; - const uint32_t d2 = (b % 100) << 1; - const uint32_t d3 = (c / 100) << 1; - const uint32_t d4 = (c % 100) << 1; - if (value >= 10000000) - *buffer++ = gDigitsLut[d1]; - if (value >= 1000000) - *buffer++ = gDigitsLut[d1 + 1]; - if (value >= 100000) - *buffer++ = gDigitsLut[d2]; - *buffer++ = gDigitsLut[d2 + 1]; - *buffer++ = gDigitsLut[d3]; - *buffer++ = gDigitsLut[d3 + 1]; - *buffer++ = gDigitsLut[d4]; - *buffer++ = gDigitsLut[d4 + 1]; - *buffer++ = '\0'; - } - } - else if (value < 10000000000000000) { - const uint32_t v0 = static_cast(value / 100000000); - const uint32_t v1 = static_cast(value % 100000000); - const __m128i a0 = Convert8DigitsSSE2(v0); - const __m128i a1 = Convert8DigitsSSE2(v1); - // Convert to bytes, add '0' - const __m128i va = _mm_add_epi8(_mm_packus_epi16(a0, a1), reinterpret_cast(kAsciiZero)[0]); - - // Count number of digit - const unsigned mask = _mm_movemask_epi8(_mm_cmpeq_epi8(va, reinterpret_cast(kAsciiZero)[0])); -#ifdef _MSC_VER - unsigned long digit; - _BitScanForward(&digit, ~mask | 0x8000); -#else - unsigned digit = __builtin_ctz(~mask | 0x8000); -#endif - - // Shift digits to the beginning - __m128i result = ShiftDigits_SSE2(va, digit); - _mm_storeu_si128(reinterpret_cast<__m128i*>(buffer), result); - buffer[16 - digit] = '\0'; - } - else { - const uint32_t a = static_cast(value / 10000000000000000); // 1 to 1844 - value %= 10000000000000000; - - if (a < 10) - *buffer++ = '0' + static_cast(a); - else if (a < 100) { - const uint32_t i = a << 1; - *buffer++ = gDigitsLut[i]; - *buffer++ = gDigitsLut[i + 1]; - } - else if (a < 1000) { - *buffer++ = '0' + static_cast(a / 100); - - const uint32_t i = (a % 100) << 1; - *buffer++ = gDigitsLut[i]; - *buffer++ = gDigitsLut[i + 1]; - } - else { - const uint32_t i = (a / 100) << 1; - const uint32_t j = (a % 100) << 1; - *buffer++ = gDigitsLut[i]; - *buffer++ = gDigitsLut[i + 1]; - *buffer++ = gDigitsLut[j]; - *buffer++ = gDigitsLut[j + 1]; - } - - const uint32_t v0 = static_cast(value / 100000000); - const uint32_t v1 = static_cast(value % 100000000); - - const __m128i a0 = Convert8DigitsSSE2(v0); - const __m128i a1 = Convert8DigitsSSE2(v1); - - // Convert to bytes, add '0' - const __m128i va = _mm_add_epi8(_mm_packus_epi16(a0, a1), reinterpret_cast(kAsciiZero)[0]); - _mm_storeu_si128(reinterpret_cast<__m128i*>(buffer), va); - buffer[16] = '\0'; - return buffer+16-start; - } - return buffer-start-1; -} + auto start = p; + if(value < 100000000) BEGIN8(value); + else if(value < 10000000000000000) { BEGIN8(value / 100000000); MIDDLE8(value % 100000000); } + else { BEGIN4(value / 10000000000000000); MIDDLE16(value % 10000000000000000); } + *p = 0; + return p-start; +} inline int count_digits (int64_t value) { - static auto P01 = 10u; + static auto P01 = 10ull; static auto P02 = P01*10; static auto P03 = P02*10; static auto P04 = P03*10; @@ -413,7 +365,7 @@ inline int count_digits (int64_t value) inline int count_digits (uint64_t u) { - static auto P01 = 10u; + static auto P01 = 10ull; static auto P02 = P01*10; static auto P03 = P02*10; static auto P04 = P03*10; @@ -455,7 +407,7 @@ inline int count_digits (uint64_t u) return 20; } -inline int i64_toa(int32_t value, char* buffer, int pad) +inline int i64_toa(int64_t value, char* buffer, int pad) { auto start = buffer; uint64_t u = static_cast(value); @@ -482,7 +434,7 @@ inline int i64_toa(int32_t value, char* buffer, int pad) return (buffer-start) + u64_toa(u, buffer); } -inline int u64_toa(uint32_t u, char* buffer, int pad) +inline int u64_toa(uint64_t u, char* buffer, int pad) { auto start = buffer; if (pad) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 5809e592c..fa9eec8e2 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -11,6 +11,7 @@ #include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/securities/ISecurityDB.h" +#include "lib/md/IntPrice.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" @@ -46,7 +47,8 @@ struct ICENativeOrder::PImpl OrderState state; int price_encoding_precision; std::string exchange_order_id; - std::string sender_compid; + int sender_compid; + uint64_t id_scale, update_scale, cancel_scale; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -114,8 +116,8 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation { transition(ORDER_STATUS_INACTIVE); auto &native_state = get_native_state(me->state); - *native_state.mutable_routing_record() = rq.routing_record; - me->sender_compid = rq.routing_record.sender_compid(); + *native_state.mutable_routing_record() = rq.routing_record; + setup_ids(rq.routing_record.sender_compid()); init_fix(); } else @@ -138,7 +140,7 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati me->previous_position_contribution = Quantity(rec.state().filled_quantity()); auto const &native_state = get_native_state(me->state); - me->sender_compid = native_state.routing_record().sender_compid(); + setup_ids(native_state.routing_record().sender_compid()); switch (me->state.status()) { case ORDER_STATUS_WORKING: @@ -587,8 +589,8 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) auto const &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); - static uint32_t update_id = 10000; //TODO Pedro please look - me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, get_clordid(update_id++), ice_orderid_sz() ); + auto update_clordid = get_clordid(me->update_scale + key().value()); + me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, update_clordid, count_digits(update_clordid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, @@ -659,7 +661,7 @@ void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_paren auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; - me->sender_compid = rq.routing_record.sender_compid(); + setup_ids(rq.routing_record.sender_compid()); init_fix(); if (has_exchange_order_id()) add_exchange_order_id_to_fix(); @@ -698,9 +700,9 @@ OrderOpResult ICENativeOrder::on_cancel() { case ORDER_STATUS_WORKING: { - auto &encoding = me->cancel_encoding; - static uint32_t cancel_id = 0; //TODO Pedro please look - me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, get_clordid(cancel_id++), ice_orderid_sz() ); + auto &encoding = me->cancel_encoding; + auto cancel_clordid = get_clordid(me->cancel_scale + key().value()); + me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clordid, count_digits(cancel_clordid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel, @@ -1034,16 +1036,18 @@ void ICENativeOrder::report_state() me->services->report_state(me->state); } -int ICENativeOrder::get_clordid(uint32_t bts_id) +void ICENativeOrder::setup_ids(const std::string& sender_compid) { - std::string orderid = std::to_string(bts_id); - int totalsz = me->sender_compid.size() + orderid.size(); - if(totalsz < 9) //9 is min size - orderid = std::string(9-totalsz, '0').append(orderid); - else if(totalsz > 12) //12 is max - orderid = orderid.substr(totalsz-12, orderid.size() - (totalsz-12)); - std::string combined_clorid = me->sender_compid+ orderid; - int id = std::atoi(combined_clorid.c_str()); + me->sender_compid = std::atoi(sender_compid.c_str()); + int digs = count_digits(me->sender_compid); + me->id_scale = md::pow10(12-digs); + me->update_scale = 8 * md::pow10(11-digs); + me->cancel_scale = 9 * md::pow10(11-digs); +} + +int64_t ICENativeOrder::get_clordid(uint32_t bts_id) +{ + int64_t id = me->id_scale * me->sender_compid + (bts_id % me->id_scale); return id; } @@ -1064,7 +1068,7 @@ void ICENativeOrder::init_fix() std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - int combined_clorid = get_clordid(key().value()); + auto combined_clorid = get_clordid(key().value()); // initialize create FIX auto &create_encoding = me->create_encoding; @@ -1107,7 +1111,7 @@ void ICENativeOrder::init_fix() update_encoding.add(def.side()); me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); - me->update_clordid_bm = update_encoding.add(0, ice_orderid_sz()); + me->update_clordid_bm = update_encoding.add(combined_clorid, count_digits(combined_clorid)); update_encoding.add(def.time_in_force()); if(rr.account() != "") update_encoding.add(rr.account()); @@ -1128,7 +1132,7 @@ void ICENativeOrder::init_fix() cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - me->cancel_clordid_bm = cancel_encoding.add(0, ice_orderid_sz()); + me->cancel_clordid_bm = cancel_encoding.add(combined_clorid, count_digits(combined_clorid)); // special tags switch (def.custom_def().custom_case()) diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index 093c4468c..e9ec652a9 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -67,7 +67,8 @@ class ICENativeOrder : public NativeOrder { api::orderman::NativeOrderState & get_native_state(api::orderman::OrderState &); - int get_clordid(uint32_t); + void setup_ids(const std::string& sender_compid); + int64_t get_clordid(uint32_t); }; } // namespace orderman From 4cbbf6972a917eaa2ef4e71bfafb09bfc9a9dd0c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 25 Apr 2019 15:25:07 -0400 Subject: [PATCH 034/225] add, update, remove orders work across logouts --- src/lib/jetfix/codec/Fields.h | 2 +- .../orderman/actors/ICEExecutionGateway.cpp | 14 +- .../orderman/orderman_utils/ExecutionReport.h | 1 + .../orderman/orderman_utils/fix_order_codec.h | 16 +- src/lib/orderman/orders/ICENativeOrder.cpp | 194 ++++++++++-------- src/lib/orderman/orders/ICENativeOrder.h | 26 ++- 6 files changed, 150 insertions(+), 103 deletions(-) diff --git a/src/lib/jetfix/codec/Fields.h b/src/lib/jetfix/codec/Fields.h index e6d180bda..c35bec8b0 100644 --- a/src/lib/jetfix/codec/Fields.h +++ b/src/lib/jetfix/codec/Fields.h @@ -165,7 +165,7 @@ public: void read (ReaderCursor &cursor) { auto loc = cursor.read_field (); - Parent::_value = atoi (&(cursor.data ()[loc.first])); + Parent::_value = atoll (&(cursor.data ()[loc.first])); } static uint32_t max_value_size (int64_t,int pad = 0) diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index dbc9de852..fca9dccf9 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -251,7 +251,16 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg { OrderKey ok; SecurityKey sk; - decode_memo(msg.get(), &ok, &sk); + if(!msg.has()) + { + LOG(OrderMan, Error, + "Received execution report with no memo {}. Will not be able to process this report. This is likely a bug that could lead " + "to lost fills. Please investigate.", + sk.value()); + return; + } + else + decode_memo(msg.get(), &ok, &sk); auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); @@ -348,6 +357,9 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg std::string oid_string = get_ice_order_id_string(msg); str_to(oid_string, &data->exchange_order_id); + data->ice_cl_ord_id = 0; + if(msg.has()) + data->ice_cl_ord_id = msg.get(); if (msg.has()) data->price = securities::decode_exchange_price(*sec, Price(msg.get())); diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index f49e85535..49497a5b1 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -35,6 +35,7 @@ public: config::JetFIX::Connection const *cfg; std::string msg; api::Venue exchange; + int64_t ice_cl_ord_id; }; }} diff --git a/src/lib/orderman/orderman_utils/fix_order_codec.h b/src/lib/orderman/orderman_utils/fix_order_codec.h index 5a8d364df..dd233d2ef 100644 --- a/src/lib/orderman/orderman_utils/fix_order_codec.h +++ b/src/lib/orderman/orderman_utils/fix_order_codec.h @@ -74,9 +74,21 @@ std::string get_ice_order_id_string(const MSG& msg) bts_assert(msg.template has()); std::string oid_string(ice_orderid_sz(), ' '); - int id = msg.template get(); - u32_toa((uint32_t)id, &(oid_string[0]), ice_orderid_sz() ); + int64_t id = msg.template get(); + u64_toa(id, &(oid_string[0]), ice_orderid_sz() ); return oid_string; } +template +std::string get_ice_clord_id_string(const MSG& msg) +{ + bts_assert(msg.template has()); + std::string oid_string(ice_orderid_sz(), ' '); + + int64_t id = msg.template get(); + u64_toa(id, &(oid_string[0]), ice_orderid_sz() ); + return oid_string; +} + + }} diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index fa9eec8e2..93f067be4 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -13,6 +13,7 @@ #include "lib/orderman/securities/ISecurityDB.h" #include "lib/md/IntPrice.h" #include "lib/utils/PBUtils.h" +#include "lib/utils/Puid.h" #include "lib/utils/bts_chrono.h" #include "lib/orderman/actors/order_manager/OrderServices.h" @@ -20,6 +21,7 @@ #include #include #include +#include namespace bts { namespace orderman { @@ -33,7 +35,8 @@ struct ICENativeOrder::PImpl PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), exchange_order_id() { + price_encoding_precision(7), exchange_order_id(), update_clordid_queue(), cancel_clordid_queue() + { exchange_order_id.reserve(100); } @@ -48,13 +51,15 @@ struct ICENativeOrder::PImpl int price_encoding_precision; std::string exchange_order_id; int sender_compid; - uint64_t id_scale, update_scale, cancel_scale; + uint64_t id_scale, orig_clordid; + std::queue update_clordid_queue, cancel_clordid_queue; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; jetfix::FIXFragment::Bookmark update_transact_time_bm; jetfix::FIXFragment::Bookmark update_clordid_bm; + jetfix::FIXFragment::Bookmark update_orig_clordid_bm; jetfix::FIXFragment create_encoding; jetfix::FIXFragment::Bookmark create_price_bm; @@ -63,6 +68,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment cancel_encoding; jetfix::FIXFragment::Bookmark cancel_clordid_bm; + jetfix::FIXFragment::Bookmark cancel_orig_clordid_bm; OrderServices::ExeReportSubID exe_report_sid; OrderServices::CancelRejectSubID cancel_reject_sid; @@ -129,17 +135,17 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation } } -void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivationOrderServices& serv) +void ICENativeOrder::init_recovered_common(const api::orderman::OrderRecord& rec, const PreActivationOrderServices& serv) { // order was recovered from our orders database or from an execution report - auto const &def = rec.def(); + const auto &def = rec.def(); me->definition = def; me->state = rec.state(); me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); me->previous_position_contribution = Quantity(rec.state().filled_quantity()); - auto const &native_state = get_native_state(me->state); + const auto &native_state = get_native_state(me->state); setup_ids(native_state.routing_record().sender_compid()); switch (me->state.status()) { @@ -160,7 +166,7 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati } // bail if the session we used for the order is no longer valid - auto const &session = native_state.routing_record().session(); + const auto &session = native_state.routing_record().session(); if (!serv.order_router.is_valid_session(session)) { LOG(OrderMan, Error, @@ -194,7 +200,16 @@ void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivati case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); return; - } + } +} + +void ICENativeOrder::on_init_recovered(const OrderRecord& rec, const PreActivationOrderServices& serv) +{ + //TODO need to figure out if this is a day order from a prev session and cancel it + // const auto &def = rec.def(); + // auto &state = *orecord.mutable_state(); + // state.set_status(map_external_status(api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_CANCELED); + init_recovered_common(rec, serv); } api::orderman::OrderDefinition @@ -290,7 +305,7 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); rr.set_location(er.cfg->sender_locationid()); - on_init_recovered(orecord, os); + init_recovered_common(orecord, os); return orecord.def(); } @@ -313,10 +328,8 @@ void ICENativeOrder::warm_up_activate(OrderServicesData &data, OrderServices &se me->state.set_status(before_state); me->state.set_last_msg(before_msg); - me->services->unsubscribe_from_exe_report(*me->session_services, - me->exe_report_sid); - me->services->unsubscribe_from_cancel_reject(*me->session_services, - me->cancel_reject_sid); + me->services->unsubscribe_from_exe_report(*me->session_services, me->exe_report_sid); + me->services->unsubscribe_from_cancel_reject(*me->session_services, me->cancel_reject_sid); me->services->unsubscribe_from_gateway_status(*me->session_services); me->services = nullptr; } @@ -338,8 +351,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve if (!me->services->is_gateway_connected(*me->session_services)) { LOG(OrderMan, reject_level, - "Attempt to send order to a disconnected gateway. " - "Dropping order {}", + "Attempt to send order to a disconnected gateway. Dropping order {}", key().value()); auto msg = "Exchange gateway is down"; transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); @@ -362,8 +374,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve } // can we trade this security, with this size? - lqr = me->services->limiter().can_send_new_order( - AccountID(me->definition.account_id()), *me->sec, me->definition.side(), q); + lqr = me->services->limiter().can_send_new_order( AccountID(me->definition.account_id()), *me->sec, me->definition.side(), q ); if (!lqr.ok) { @@ -378,12 +389,11 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve return OrderOpResult{ORDER_ERROR_LIMIT_BREACH, msg}; } - // are we under the messaging threshold? + // are we under the messaging threshold? TODO if (!me->services->governor(*me->session_services).can_send()) { LOG(OrderMan, reject_level, - "New order would cause breach of messaging " - "limits. Dropping order {}", key().value()); + "New order would cause breach of messaging limits. Dropping order {}", key().value()); auto msg = "Messaging threshold breached"; transition(transition_level, ORDER_STATUS_REJECTED_BY_SPARK, msg); return OrderOpResult(ORDER_ERROR_MESSAGING_LIMIT_BREACH, msg); @@ -392,11 +402,11 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve // if we are here we are good. // subscribe to usefull events me->exe_report_sid = me->services->subscribe_to_exe_report(*me->session_services, key(), - [this](auto const &r) { this->on_exe_report(r); }); + [this](const auto &r) { this->on_exe_report(r); }); me->cancel_reject_sid = me->services->subscribe_to_cancel_reject(*me->session_services, key(), - [this](auto const &cr) { this->on_cancel_reject(cr); }); + [this](const auto &cr) { this->on_cancel_reject(cr); }); me->services->subscribe_to_gateway_status(*me->session_services, - [this](auto const &gw) { this->on_gateway_status(gw); }); + [this](const auto &gw) { this->on_gateway_status(gw); }); // send out order auto &encoding = me->create_encoding; @@ -420,20 +430,18 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve } me->create_quantity_bm = encoding.overwrite(me->create_quantity_bm, q.value(), quantity_sz()); - auto const &ts = services.get_time_str(); + const auto &ts = services.get_time_str(); me->create_transact_time_bm = encoding.overwrite(me->create_transact_time_bm, &ts.value()[0], ts.value().size()); return OrderOpResult{}; } -OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, - bts::orderman::OrderServices &services) +OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, bts::orderman::OrderServices &services) { bts_assert(!me->services); me->services = &services; auto result = OrderOpResult{}; switch (me->state.status()) { - case ORDER_STATUS_INACTIVE: { auto scoped_log = services.log_scope("ICENativeOrder::on_activate", key().value()); @@ -442,10 +450,7 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, result = _on_activate(Warn, Info, p, q, services); if (result.ok()) { - me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::NewOrderSingle, - me->create_encoding); - + me->services->queue_fix(*me->session_services, jetfix::MessageTypes::NewOrderSingle, me->create_encoding); me->services->governor(*me->session_services).record_sent(); me->state.set_status(ORDER_STATUS_PENDING_WORKING); @@ -465,11 +470,11 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); me->services->subscribe_to_exe_report(*me->session_services, key(), - [this](auto const &r) { this->on_exe_report(r); }); + [this](const auto &r) { this->on_exe_report(r); }); me->services->subscribe_to_cancel_reject(*me->session_services, key(), - [this](auto const &cr) { this->on_cancel_reject(cr); }); + [this](const auto &cr) { this->on_cancel_reject(cr); }); me->services->subscribe_to_gateway_status(*me->session_services, - [this](auto const &gw) { this->on_gateway_status(gw); }); + [this](const auto &gw) { this->on_gateway_status(gw); }); if (!me->services->is_gateway_connected(*me->session_services)) { @@ -482,11 +487,11 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_DISCONNECTED: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); me->services->subscribe_to_exe_report(*me->session_services, key(), - [this](auto const &r) { this->on_exe_report(r); }); + [this](const auto &r) { this->on_exe_report(r); }); me->services->subscribe_to_cancel_reject(*me->session_services, key(), - [this](auto const &cr) { this->on_cancel_reject(cr); }); + [this](const auto &cr) { this->on_cancel_reject(cr); }); me->services->subscribe_to_gateway_status(*me->session_services, - [this](auto const &gw) { this->on_gateway_status(gw); }); + [this](const auto &gw) { this->on_gateway_status(gw); }); if (me->services->is_gateway_connected(*me->session_services)) transition(ORDER_STATUS_WORKING); @@ -495,11 +500,11 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, case ORDER_STATUS_PENDING_WORKING: me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session() ); me->services->subscribe_to_exe_report(*me->session_services, key(), - [this](auto const &r) { this->on_exe_report(r); }); + [this](const auto &r) { this->on_exe_report(r); }); me->services->subscribe_to_cancel_reject(*me->session_services, key(), - [this](auto const &cr) { this->on_cancel_reject(cr); }); + [this](const auto &cr) { this->on_cancel_reject(cr); }); me->services->subscribe_to_gateway_status(*me->session_services, - [this](auto const &gw) { this->on_gateway_status(gw); }); + [this](const auto &gw) { this->on_gateway_status(gw); }); break; case ORDER_STATUS_REJECTED_BY_SPARK: @@ -586,16 +591,20 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) me->price_encoding_precision, price_sz()); me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); - auto const &ts = me->services->get_time_str(); - me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); + const auto &ts = me->services->get_time_str(); + me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); - auto update_clordid = get_clordid(me->update_scale + key().value()); - me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, update_clordid, count_digits(update_clordid) ); - - me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::CancelReplace, - me->update_encoding); - + + if(me->update_clordid_queue.empty()) + { + generate_update_ids(); + LOG(OrderMan, Warn, "Update order slow {} because of we are out of clordids. ", key().value()); + } + auto update_clorid = get_clordid(me->update_clordid_queue.front()); + me->update_clordid_queue.pop(); + me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, update_clorid, count_digits(update_clorid) ); + + me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, me->update_encoding); me->services->governor(*me->session_services).record_sent(); update_working_position(); if (me->state.last_msg().size()) @@ -701,12 +710,17 @@ OrderOpResult ICENativeOrder::on_cancel() case ORDER_STATUS_WORKING: { auto &encoding = me->cancel_encoding; - auto cancel_clordid = get_clordid(me->cancel_scale + key().value()); - me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clordid, count_digits(cancel_clordid) ); - me->services->queue_fix(*me->session_services, - jetfix::MessageTypes::Cancel, - me->cancel_encoding); + if(me->cancel_clordid_queue.empty()) + { + generate_update_ids(); + LOG(OrderMan, Error, "Cancel order slow {} because of we are out of clordids.", key().value()); + } + auto cancel_clorid = get_clordid(me->cancel_clordid_queue.front()); + me->cancel_clordid_queue.pop(); + me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clorid, count_digits(cancel_clorid) ); + + me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel,me->cancel_encoding); break; } @@ -798,27 +812,18 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) native_state.set_last_transact_time(to_str(er.data->transact_time)); auto external_status = map_external_status(er.data->order_status); - // filled quantity is reset back to 0 when the order is canceled - if (external_status != ORDER_STATUS_CANCELED) //TODO + if (external_status != ORDER_STATUS_CANCELED) { - if (er.data->exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.data->exec_type == api::orderman::EXEC_TYPE_FILL) - { - - bts_assert(er.data->last_shares.value()); - auto previous_avg = state.avg_price(); - auto previous_sz = state.filled_quantity(); - auto fill_price = er.data->last_price.value(); - auto fill_sz = er.data->last_shares.value(); - - auto new_avg = - ((previous_avg * previous_sz) + (fill_price * fill_sz)) / - (previous_sz + fill_sz); - - state.set_avg_price(new_avg); - } + state.set_avg_price(er.data->avg_price.value()); state.set_filled_quantity(er.data->filled_quantity.value()); state.set_last_price(er.data->last_price.value()); + //cache the new clordid + if(er.data->ice_cl_ord_id > 0) + { + auto clordid = er.data->ice_cl_ord_id; + me->update_orig_clordid_bm = me->update_encoding.overwrite( me->update_orig_clordid_bm, clordid, count_digits(clordid) ); + me->cancel_orig_clordid_bm = me->cancel_encoding.overwrite( me->cancel_orig_clordid_bm, clordid, count_digits(clordid) ); + } } state.set_last_msg(er.data->msg); @@ -947,7 +952,7 @@ void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) break; case ORDER_STATUS_DISCONNECTED: { - auto const &native_state = get_native_state(me->state); + const auto &native_state = get_native_state(me->state); transition(map_external_status(native_state.native_status())); if (me->state.status() == ORDER_STATUS_WORKING) { @@ -1041,11 +1046,22 @@ void ICENativeOrder::setup_ids(const std::string& sender_compid) me->sender_compid = std::atoi(sender_compid.c_str()); int digs = count_digits(me->sender_compid); me->id_scale = md::pow10(12-digs); - me->update_scale = 8 * md::pow10(11-digs); - me->cancel_scale = 9 * md::pow10(11-digs); + generate_update_ids(); } -int64_t ICENativeOrder::get_clordid(uint32_t bts_id) +void ICENativeOrder::generate_update_ids() +{ + const std::string& scope = std::to_string(me->sender_compid); + auto ids = bts::utils::gen_ids(scope, 50); + for(const auto& i : ids) + me->update_clordid_queue.push(i); + + auto cids = bts::utils::gen_ids(scope, 5); + for(const auto& ci : cids) + me->cancel_clordid_queue.push(ci); +} + +int64_t ICENativeOrder::get_clordid(uint64_t bts_id) { int64_t id = me->id_scale * me->sender_compid + (bts_id % me->id_scale); return id; @@ -1060,20 +1076,20 @@ void ICENativeOrder::init_fix() me->update_encoding = FIXFragment{}; me->cancel_encoding = FIXFragment{}; - auto const &def = me->definition; - auto const &sec = *me->sec; + const auto &def = me->definition; + const auto &sec = *me->sec; bts_assert(sec.has_ice()); - auto const &rr = get_native_state(me->state).routing_record(); + const auto &rr = get_native_state(me->state).routing_record(); std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - auto combined_clorid = get_clordid(key().value()); + me->orig_clordid = get_clordid(key().value()); // initialize create FIX auto &create_encoding = me->create_encoding; create_encoding.add(memo); - create_encoding.add(combined_clorid); + create_encoding.add(me->orig_clordid); create_encoding.add(std::atoi(rr.company_id().c_str())); //create_encoding.add(""); //optional, unclear if we need create_encoding.add(rr.operator_id()); @@ -1099,7 +1115,8 @@ void ICENativeOrder::init_fix() // initialize update FIX auto &update_encoding = me->update_encoding; - update_encoding.add(combined_clorid); + update_encoding.add(memo); + me->update_orig_clordid_bm = update_encoding.add(me->orig_clordid); update_encoding.add(std::atoi(rr.company_id().c_str())); //update_encoding.add(""); //optional, unclear if we need update_encoding.add(rr.operator_id()); @@ -1111,7 +1128,7 @@ void ICENativeOrder::init_fix() update_encoding.add(def.side()); me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); - me->update_clordid_bm = update_encoding.add(combined_clorid, count_digits(combined_clorid)); + me->update_clordid_bm = update_encoding.add(me->orig_clordid); update_encoding.add(def.time_in_force()); if(rr.account() != "") update_encoding.add(rr.account()); @@ -1127,12 +1144,13 @@ void ICENativeOrder::init_fix() // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; - cancel_encoding.add(combined_clorid); + cancel_encoding.add(memo); + me->cancel_orig_clordid_bm = cancel_encoding.add(me->orig_clordid); cancel_encoding.add(std::atoi(rr.company_id().c_str())); cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - me->cancel_clordid_bm = cancel_encoding.add(combined_clorid, count_digits(combined_clorid)); + me->cancel_clordid_bm = cancel_encoding.add(me->orig_clordid); // special tags switch (def.custom_def().custom_case()) @@ -1213,8 +1231,8 @@ void ICENativeOrder::transition(api::orderman::OrderStatus new_status, std::stri void ICENativeOrder::transition(log::Level level, api::orderman::OrderStatus new_status, std::string const &msg) { - auto const &from = OrderStatus_Name(me->state.status()); - auto const &to = OrderStatus_Name(new_status); + const auto &from = OrderStatus_Name(me->state.status()); + const auto &to = OrderStatus_Name(new_status); if (from != to) LOG(OrderMan, level, "Transitioning order {} from {} to {}. Msg: {}", key().value(), from, to, msg); me->state.set_status(new_status); @@ -1223,8 +1241,8 @@ void ICENativeOrder::transition(log::Level level, api::orderman::OrderStatus new void ICENativeOrder::transition(api::orderman::OrderStatus new_status) { - auto const &from = OrderStatus_Name(me->state.status()); - auto const &to = OrderStatus_Name(new_status); + const auto &from = OrderStatus_Name(me->state.status()); + const auto &to = OrderStatus_Name(new_status); if (from != to) LOG(OrderMan, Info, "Transitioning order {} from {} to {}", key().value(), from, to); else diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index e9ec652a9..bba5482ac 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -17,24 +17,27 @@ class ICENativeOrder : public NativeOrder { ICENativeOrder(); ~ICENativeOrder() override; - api::orderman::OrderDefinition const &definition() const; - void on_init_new(api::orderman::OrderDefinition const &, - const PreActivationOrderServices &) override; - void on_init_recovered(api::orderman::OrderRecord const &, + const api::orderman::OrderDefinition& definition() const; + void on_init_new(const api::orderman::OrderDefinition&, + const PreActivationOrderServices&) override; + void on_init_recovered(const api::orderman::OrderRecord&, const PreActivationOrderServices &) override; OrderOpResult on_activate(Price, Quantity, OrderServices &) override; OrderOpResult on_update(Price, Quantity) override; - OrderOpResult on_update(api::orderman::Update const &) override; + OrderOpResult on_update(const api::orderman::Update&) override; OrderOpResult on_detach() override; OrderOpResult on_cancel() override; - void on_attached(api::orderman::OrderDefinition const &new_parent) override; + void on_attached(const api::orderman::OrderDefinition &new_parent) override; api::orderman::OrderDefinition - on_init_from_exe_report(ExecutionReport const &, const PreActivationOrderServices &) override; + on_init_from_exe_report(const ExecutionReport &, const PreActivationOrderServices &) override; protected: void warm_up_activate(OrderServicesData &, OrderServices &) override; + void init_recovered_common(const api::orderman::OrderRecord &, + const PreActivationOrderServices &); + private: struct PImpl; @@ -51,12 +54,12 @@ class ICENativeOrder : public NativeOrder { void transition(log::Level, api::orderman::OrderStatus new_state, - std::string const &msg); + const std::string& msg); void transition(api::orderman::OrderStatus new_state, - std::string const &msg); + const std::string& msg); void transition(api::orderman::OrderStatus new_state); void transition_to_error(api::orderman::NativeOrderState::SubError sub_error, - std::string const &msg); + const std::string& msg); void update_working_position(); bool has_exchange_order_id(); @@ -68,7 +71,8 @@ class ICENativeOrder : public NativeOrder { get_native_state(api::orderman::OrderState &); void setup_ids(const std::string& sender_compid); - int64_t get_clordid(uint32_t); + int64_t get_clordid(uint64_t); + void generate_update_ids(); }; } // namespace orderman From a94a66234a76c80f36daac590afb0417e69d07dd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 25 Apr 2019 15:57:04 -0400 Subject: [PATCH 035/225] ice puids --- src/lib/orderman/orders/ICENativeOrder.cpp | 67 +++++++++++++--------- src/lib/orderman/orders/ICENativeOrder.h | 9 ++- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 93f067be4..ef2eccd06 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -51,8 +51,8 @@ struct ICENativeOrder::PImpl int price_encoding_precision; std::string exchange_order_id; int sender_compid; - uint64_t id_scale, orig_clordid; - std::queue update_clordid_queue, cancel_clordid_queue; + int64_t id_scale, orig_clordid; + std::queue update_clordid_queue, cancel_clordid_queue; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -594,14 +594,7 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) const auto &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); - - if(me->update_clordid_queue.empty()) - { - generate_update_ids(); - LOG(OrderMan, Warn, "Update order slow {} because of we are out of clordids. ", key().value()); - } - auto update_clorid = get_clordid(me->update_clordid_queue.front()); - me->update_clordid_queue.pop(); + auto update_clorid = get_update_clordid(); me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, update_clorid, count_digits(update_clorid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, me->update_encoding); @@ -710,14 +703,7 @@ OrderOpResult ICENativeOrder::on_cancel() case ORDER_STATUS_WORKING: { auto &encoding = me->cancel_encoding; - - if(me->cancel_clordid_queue.empty()) - { - generate_update_ids(); - LOG(OrderMan, Error, "Cancel order slow {} because of we are out of clordids.", key().value()); - } - auto cancel_clorid = get_clordid(me->cancel_clordid_queue.front()); - me->cancel_clordid_queue.pop(); + auto cancel_clorid = get_cancel_clordid(); me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clorid, count_digits(cancel_clorid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel,me->cancel_encoding); @@ -1046,19 +1032,22 @@ void ICENativeOrder::setup_ids(const std::string& sender_compid) me->sender_compid = std::atoi(sender_compid.c_str()); int digs = count_digits(me->sender_compid); me->id_scale = md::pow10(12-digs); - generate_update_ids(); + generate_update_ids(sender_compid); + generate_cancel_ids(sender_compid); } -void ICENativeOrder::generate_update_ids() +void ICENativeOrder::generate_update_ids(const std::string& sender_compid) { - const std::string& scope = std::to_string(me->sender_compid); - auto ids = bts::utils::gen_ids(scope, 50); + auto ids = bts::utils::gen_ids(sender_compid, 50); for(const auto& i : ids) - me->update_clordid_queue.push(i); - - auto cids = bts::utils::gen_ids(scope, 5); + me->update_clordid_queue.push(get_clordid(i)); +} + +void ICENativeOrder::generate_cancel_ids(const std::string& sender_compid) +{ + auto cids = bts::utils::gen_ids(sender_compid, 5); for(const auto& ci : cids) - me->cancel_clordid_queue.push(ci); + me->cancel_clordid_queue.push(get_clordid(ci)); } int64_t ICENativeOrder::get_clordid(uint64_t bts_id) @@ -1067,6 +1056,30 @@ int64_t ICENativeOrder::get_clordid(uint64_t bts_id) return id; } +int64_t ICENativeOrder::get_update_clordid() +{ + if(me->update_clordid_queue.empty()) + { + generate_update_ids(std::to_string(me->sender_compid)); + LOG(OrderMan, Warn, "Update order slow {} because of we are out of clordids. ", key().value()); + } + auto update_clorid = me->update_clordid_queue.front(); + me->update_clordid_queue.pop(); + return update_clorid; +} + +int64_t ICENativeOrder::get_cancel_clordid() +{ + if(me->cancel_clordid_queue.empty()) + { + generate_cancel_ids(std::to_string(me->sender_compid)); + LOG(OrderMan, Error, "Cancel order slow {} because of we are out of clordids.", key().value()); + } + auto cancel_clorid = me->cancel_clordid_queue.front(); + me->cancel_clordid_queue.pop(); + return cancel_clorid; +} + void ICENativeOrder::init_fix() { bts_assert(me->sec); @@ -1084,7 +1097,7 @@ void ICENativeOrder::init_fix() std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - me->orig_clordid = get_clordid(key().value()); + me->orig_clordid = get_update_clordid(); // initialize create FIX auto &create_encoding = me->create_encoding; diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index bba5482ac..060b18527 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -69,10 +69,13 @@ class ICENativeOrder : public NativeOrder { bool terminal_state(api::orderman::OrderStatus status) const; api::orderman::NativeOrderState & get_native_state(api::orderman::OrderState &); - - void setup_ids(const std::string& sender_compid); + + int64_t get_update_clordid(); + int64_t get_cancel_clordid(); int64_t get_clordid(uint64_t); - void generate_update_ids(); + void setup_ids(const std::string& sender_compid); + void generate_update_ids(const std::string&); + void generate_cancel_ids(const std::string&); }; } // namespace orderman From aea02e212a1811dd606b9f56e9b05efad12b28d7 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 25 Apr 2019 16:36:07 -0400 Subject: [PATCH 036/225] cleaned up cancel / reject messages --- src/lib/orderman/actors/ICEExecutionGateway.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index fca9dccf9..ce3ace223 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -322,9 +322,10 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg if (msg.has()) text_msg = msg.get(); if (msg.has()) - text_msg += " OrdRejReason: " + msg.get(); + text_msg += " Rejected OrdRejReason: " + std::to_string(msg.get()); + if (msg.has()) - text_msg += " DeleteReason: " + msg.get(); + text_msg += " Cancelled DeleteReason: " + std::to_string(msg.get()); // allocate from our pool auto data = me->exe_report_pool.construct(); From 6e09d9e949d667a3e7edeffa0487d9b8b517cea5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 26 Apr 2019 14:35:36 -0400 Subject: [PATCH 037/225] small changes for ice cert --- src/lib/config/defaults/MarketData.conf | 11 +++++++---- src/lib/config/defaults/Symbols.conf | 1 + .../md/platforms/ice_onixs/ICEListener.cpp | 7 +++++-- .../sparkd/md/platforms/ice_onixs/ICEListener.h | 17 +++++++++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 94b3ba277..475381381 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -57,12 +57,15 @@ ICEOptions { name: "oil" #these names are arbitrary and are for debugging market_type: 5 #ICE Futures Brent, IPE Brent Futures market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures + #market_type: 11 #ICE WTI-Brent spreads + #market_type: 14 #ICE HO-WTI Crack + #market_type: 16 #ICE RB-WTI Crack #udp_buffer_size: 33554432 #32mb } - channel { - name: "juice" - market_type: 23 #ICE Futures US Agricultures, FCOJ A - } + # channel { + # name: "juice" + # market_type: 23 #ICE Futures US Agricultures, FCOJ A + # } ice_config_file: "ConnectivityConfiguration.APITest.xml" } } diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 78528d078..5c8903291 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -68,6 +68,7 @@ SymbolLists symbol: "BRN" symbol: "WBS" symbol: "OJ" + symbol: "*" } list { diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index c2f6b9ab5..42cbafd1a 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -42,8 +42,11 @@ ICEListener::~ICEListener() {} std::string ICEListener::parse_contract_symbol(const std::string& sym) { - const auto&& res = sym.substr(0, sym.find(' ')); - return res; + auto end = sym.find(' '); + if(end == std::string::npos) + return sym; + else + return sym.substr(0, end); } // diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index 84bb2fa87..b1ced5c73 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -124,8 +124,8 @@ private: { if (_index.has_security(exchange_id)) return SKIP; - // if(_symbol_filter.count("*") > 0) - // return ADD; + if(_symbol_filter.count("*") > 0) + return ADD; return _symbol_filter.count( parse_contract_symbol(def.contractSymbol) ) > 0 ? ADD : SKIP; } void flush_books(); @@ -143,8 +143,17 @@ void ICEListener::set_security_common(const Definition& def, FixedSecurity& fsec { fsec.numeric_id = def.marketId; std::string sym = parse_contract_symbol(def.contractSymbol); - fsec.symbol( sym ); - fsec.security_desc(def.contractSymbol); + if(!sym.empty()) + { + fsec.symbol( sym ); + fsec.security_desc(def.contractSymbol); + } + else + { + auto id = std::to_string(def.marketId); + fsec.symbol(id); + fsec.security_desc(id); + } fsec.exchange = api::Venue::VENUE_ICE; fsec.display_factor = 0.0; fsec.ice_price_denominator = (int8_t)(def.orderPriceDenominator - '0'); From 442aa156ac5e78d84dc2f9efd0ff373ed3e7051a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 29 Apr 2019 10:20:27 -0400 Subject: [PATCH 038/225] trying to get orance juice market --- src/lib/config/defaults/MarketData.conf | 2 ++ src/lib/config/defaults/Symbols.conf | 1 + src/lib/domain_model/Security.h | 18 ------------------ .../orderman/actors/ICEExecutionGateway.cpp | 3 ++- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 475381381..4d67ccf2c 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -60,6 +60,8 @@ ICEOptions { #market_type: 11 #ICE WTI-Brent spreads #market_type: 14 #ICE HO-WTI Crack #market_type: 16 #ICE RB-WTI Crack + market_type: 21 #ICE Futures US Agricultures, Coffee C + market_type: 23 #ICE Futures US Agricultures, FCOJ A #udp_buffer_size: 33554432 #32mb } # channel { diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 5c8903291..3fc5e050d 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -68,6 +68,7 @@ SymbolLists symbol: "BRN" symbol: "WBS" symbol: "OJ" + symbol: "KC" symbol: "*" } list diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index ad7519269..db3ddbfb7 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -168,23 +168,5 @@ inline bool gr_than_eq(double p1, double p2, double tick_size) { return test_price_equality(p1, p2, tick_size) || p1 >= p2; } -template -T exchange_id(const api::Security &sec) -{ - if (sec.has_glbx()) - return sec.glbx().exchange_id(); - else if (sec.has_ice()) - return sec.ice().exchange_id(); - else if (sec.has_cfe()) - return sec.cfe().exchange_id(); - else if (sec.has_cboe()) - return sec.cboe().exchange_id(); - else - { - bts_assert_msg(false, "No exchange_id for unfamiliar exchange"); - return T(); - } -} - }} diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index ce3ace223..f99c28253 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -86,7 +86,8 @@ void ICEExecutionGateway::on_securities(const mercury::Updatesecurities[sec_ptr->id()] = sec_ptr; - me->securities_by_exchange_id[securities::exchange_id(*sec_ptr)] = sec_ptr; + if(sec_ptr->has_ice()) + me->securities_by_exchange_id[sec_ptr->ice().exchange_id()] = sec_ptr; } if (me->state == State::WAITING_FOR_SECURITIES) From d025ee0c8938b50c7aac9996ce3b8a0c18ad47ac Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 29 Apr 2019 15:09:56 -0400 Subject: [PATCH 039/225] seems to be an onixs bug that exits a loop early if not provisioned for a market_type --- src/lib/config/defaults/MarketData.conf | 13 +++++++++---- src/lib/config/defaults/Symbols.conf | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 4d67ccf2c..966caeb23 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -56,12 +56,17 @@ ICEOptions { channel { name: "oil" #these names are arbitrary and are for debugging market_type: 5 #ICE Futures Brent, IPE Brent Futures - market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures - #market_type: 11 #ICE WTI-Brent spreads - #market_type: 14 #ICE HO-WTI Crack - #market_type: 16 #ICE RB-WTI Crack + market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures + market_type: 13 #ICE Heating Oil Futures + market_type: 15 #ICE NYH (RBOB) Gasoline Futures market_type: 21 #ICE Futures US Agricultures, Coffee C market_type: 23 #ICE Futures US Agricultures, FCOJ A + + #market_type: 11 #ICE WTI-Brent spreads + #market_type: 14 #ICE Heating Oil/WTI Futures Crack + #market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack + market_type: 58 #ICE Futures UI Heating Oil / Brent + market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack #udp_buffer_size: 33554432 #32mb } # channel { diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 3fc5e050d..3c7d2c4f5 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -69,6 +69,8 @@ SymbolLists symbol: "WBS" symbol: "OJ" symbol: "KC" + symbol: "UHO" + symbol: "UHU" symbol: "*" } list From 99c5129ea7aa42fe83befa61b205b454f8bcfba5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 29 Apr 2019 16:25:54 -0400 Subject: [PATCH 040/225] ice spreads are weird --- src/lib/config/defaults/MarketData.conf | 10 +++++----- src/lib/config/protos/MarketData.proto | 1 + src/lib/md/ice/ICEUtils.cpp | 5 +++++ src/lib/md/ice/ICEUtils.h | 1 + src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp | 7 +++++-- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 966caeb23..2bd986d93 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -62,11 +62,11 @@ ICEOptions { market_type: 21 #ICE Futures US Agricultures, Coffee C market_type: 23 #ICE Futures US Agricultures, FCOJ A - #market_type: 11 #ICE WTI-Brent spreads - #market_type: 14 #ICE Heating Oil/WTI Futures Crack - #market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack - market_type: 58 #ICE Futures UI Heating Oil / Brent - market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack + uds_market_type: 11 #ICE WTI-Brent spreads + uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack + uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack + uds_market_type: 58 #ICE Futures UI Heating Oil / Brent + uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack #udp_buffer_size: 33554432 #32mb } # channel { diff --git a/src/lib/config/protos/MarketData.proto b/src/lib/config/protos/MarketData.proto index be967e9d4..e18790079 100755 --- a/src/lib/config/protos/MarketData.proto +++ b/src/lib/config/protos/MarketData.proto @@ -153,6 +153,7 @@ message ICEOptions message ICEChannel { required string name = 1; repeated uint32 market_type = 2; + repeated uint32 uds_market_type = 7; optional uint32 udp_buffer_size = 3 [default = 4194304]; //4mb optional uint32 heartbeat_interval = 4 [default = 36000]; optional uint32 sequence_gap_margin = 5 [default = 10000]; diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index 1533964a0..98d7a6600 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -27,6 +27,8 @@ std::string ICEChannel::to_string() const std::string mt = name; for(const auto& x : market_types) mt += " " + std::to_string(x); + for(const auto& x : uds_market_types) + mt += " " + std::to_string(x); return mt; } @@ -45,6 +47,9 @@ const vector parse_ice_channels(const vector& symbols) chan.symbols.insert(symbols.begin(), symbols.end()); for(const auto& xx : x.market_type()) chan.market_types.push_back(xx); + for(const auto& xx : x.uds_market_type()) + chan.uds_market_types.push_back(xx); + result.push_back(chan); } return result; diff --git a/src/lib/md/ice/ICEUtils.h b/src/lib/md/ice/ICEUtils.h index 5e0df291e..7ce5f78b9 100644 --- a/src/lib/md/ice/ICEUtils.h +++ b/src/lib/md/ice/ICEUtils.h @@ -13,6 +13,7 @@ struct ICEChannel { std::string name; std::vector market_types; + std::vector uds_market_types; std::set symbols; std::string to_string() const; }; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index f36be139d..7da65b862 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -74,10 +74,13 @@ onixs_ice::MarketSubscriptions market_subcription_for_channel(const ICEChannel& { //onixs_ice::MarketSubType::NonImplied onixs_ice::MarketSubscription futures(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::Futures, onixs_ice::BookDepth::FOD); - onixs_ice::MarketSubscription spreads(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::UdsFuturesMarkets, onixs_ice::BookDepth::FOD); subs.push_back(futures); - subs.push_back(spreads); } + for(const auto& x : chan.uds_market_types) + { + onixs_ice::MarketSubscription spreads(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::UdsFuturesMarkets, onixs_ice::BookDepth::FOD); + subs.push_back(spreads); + } return subs; } From f3cd3a402e8ff27bbf1ad8bbaf3a38be1fae496d Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 29 Apr 2019 16:53:50 -0400 Subject: [PATCH 041/225] ice spread config, workaround for onixs bug --- src/lib/config/defaults/MarketData.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 2bd986d93..a227d054b 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -56,11 +56,17 @@ ICEOptions { channel { name: "oil" #these names are arbitrary and are for debugging market_type: 5 #ICE Futures Brent, IPE Brent Futures + uds_market_type: 5 market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures + uds_market_type: 9 market_type: 13 #ICE Heating Oil Futures + uds_market_type: 13 market_type: 15 #ICE NYH (RBOB) Gasoline Futures + uds_market_type: 15 market_type: 21 #ICE Futures US Agricultures, Coffee C + uds_market_type: 21 market_type: 23 #ICE Futures US Agricultures, FCOJ A + uds_market_type: 23 uds_market_type: 11 #ICE WTI-Brent spreads uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack From 5abc17adf326cdd5437113a304fa386b37d9187b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 29 Apr 2019 17:58:53 -0400 Subject: [PATCH 042/225] settles --- .../md/platforms/ice_onixs/ICEListener.cpp | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 42cbafd1a..f93b11fb1 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -126,19 +126,36 @@ void ICEListener::onNewOptionsStrategyDefinition(const onixs_ice::NewOptionsStra } // -// Gap Recovery -- This is not necessary if we subscribe to the onOrderBookUpdated callback, they handle the breaks transparently + void ICEListener::onMarketSnapshot(const onixs_ice::MarketSnapshot& msg, const onixs_ice::MessageInfo& msg_info) { - UNUSED(msg); UNUSED(msg_info); + auto* data = _index.get_security(msg.marketId); + if (data != nullptr) + { + bts_assert(data->id == msg.marketId); + auto ts = utils::TimeStamp::now(); + auto settle_denominator = data->handle.security().ice_settle_denominator; + data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(msg.settlePriceDateTime) ); + + auto deal_denominator = data->handle.security().ice_deal_denominator; + data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), datetime::today() ); + data->handle.update_session_high( ts, double_of_price(msg.high, deal_denominator) ); + data->handle.update_session_low( ts, double_of_price(msg.low, deal_denominator) ); + + data->handle.set_last_trade( ts, pricesize_of_price_size(msg.lastTradePrice, deal_denominator, msg.lastTradeQuantity), + ll_of_timestamp(msg.lastTradeDateTime), msg.volume ); + } } +// Gap Recovery -- This is not necessary if we subscribe to the onOrderBookUpdated callback, they handle the breaks transparently void ICEListener::onMarketSnapshotOrder(const onixs_ice::MarketSnapshotOrder& msg, const onixs_ice::MessageInfo& msg_info) { UNUSED(msg); UNUSED(msg_info); } +// Gap Recovery -- This is not necessary if we subscribe to the onOrderBookUpdated callback, they handle the breaks transparently void ICEListener::onMarketSnapshotPriceLevel(const onixs_ice::MarketSnapshotPriceLevel& msg, const onixs_ice::MessageInfo& msg_info) { UNUSED(msg); @@ -290,7 +307,7 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: bts_assert(data->id == msg.marketId); onixs_ice::Price price = msg.openPrice; onixs_ice::DateTime time = msg.dateTime; - auto denominator = data->handle.security().ice_settle_denominator; + auto denominator = data->handle.security().ice_deal_denominator; data->handle.update_opening( utils::TimeStamp::now(), double_of_price(price, denominator), date_of_timestamp(time)); } } @@ -303,7 +320,7 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice bts_assert(data->id == msg.marketId); onixs_ice::Price price = msg.closePrice; onixs_ice::DateTime time = msg.dateTime; - auto denominator = data->handle.security().ice_settle_denominator; + auto denominator = data->handle.security().ice_deal_denominator; data->handle.update_closing( utils::TimeStamp::now(), double_of_price(price, denominator), date_of_timestamp(time)); } } @@ -315,11 +332,14 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary { bts_assert(data->id == msg.marketId); onixs_ice::DateTime time = msg.dateTime; - auto denominator = data->handle.security().ice_settle_denominator; - data->handle.update_opening( utils::TimeStamp::now(), double_of_price(msg.openingPrice, denominator), date_of_timestamp(time) ); - data->handle.update_session_high( utils::TimeStamp::now(), double_of_price(msg.high, denominator) ); - data->handle.update_session_low( utils::TimeStamp::now(), double_of_price(msg.low, denominator) ); - data->handle.update_settlement( utils::TimeStamp::now(), convert_price(msg.settlementPrice, denominator), date_of_timestamp(time) ); + auto ts = utils::TimeStamp::now(); + auto settle_denominator = data->handle.security().ice_settle_denominator; + data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(time) ); + + auto deal_denominator = data->handle.security().ice_deal_denominator; + data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), date_of_timestamp(time) ); + data->handle.update_session_high( ts, double_of_price(msg.high, deal_denominator) ); + data->handle.update_session_low( ts, double_of_price(msg.low, deal_denominator) ); } } From 134950747fef1599a87bd1dd4af91dc435395793 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 30 Apr 2019 14:36:54 -0400 Subject: [PATCH 043/225] bugs found during cert --- src/lib/config/defaults/MarketData.conf | 1 + src/lib/md/MDProducerHandle.cpp | 5 +++++ src/lib/md/MDProducerHandle.h | 3 ++- src/lib/md/Shm/FixedSecurity.cpp | 5 ++++- .../sparkd/md/platforms/ice_onixs/ICEListener.cpp | 14 +++++++++++++- .../sparkd/md/platforms/ice_onixs/ICEListener.h | 4 ++++ 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index a227d054b..362268fdf 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -74,6 +74,7 @@ ICEOptions { uds_market_type: 58 #ICE Futures UI Heating Oil / Brent uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack #udp_buffer_size: 33554432 #32mb + #onixs_log_mode: Debug } # channel { # name: "juice" diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index cd22abe83..28aad751c 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -121,6 +121,11 @@ void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTi void MDProducerHandle::set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime tradetime, uint32_t total_volume) { cdata().last_trade.store(ps,time); cdata().last_trade_time = tradetime; + if(total_volume > 0) + cdata().total_volume = total_volume; +} + +void MDProducerHandle::set_total_volume(uint32_t total_volume) { cdata().total_volume = total_volume; } diff --git a/src/lib/md/MDProducerHandle.h b/src/lib/md/MDProducerHandle.h index da5afcf2d..4fea16972 100644 --- a/src/lib/md/MDProducerHandle.h +++ b/src/lib/md/MDProducerHandle.h @@ -94,7 +94,8 @@ public: // Updates trade log and last trade void add_trade(TimeStamp time, const PriceSize pricesize, datetime::LLDateTime date, co2::AggressorSide agside, uint32_t total_volume=0); // cold // Update last_trade without updating trade log - void set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime date, uint32_t total_volume); + void set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime date, uint32_t total_volume=0); + void set_total_volume(uint32_t total_volume); void add_rfq(TimeStamp time, const co2::QuoteRequestMessage& rfq); // cold void update_exchange_status(TimeStamp time, TradingStatus status); // cold diff --git a/src/lib/md/Shm/FixedSecurity.cpp b/src/lib/md/Shm/FixedSecurity.cpp index c5c397d11..55c2a9df2 100644 --- a/src/lib/md/Shm/FixedSecurity.cpp +++ b/src/lib/md/Shm/FixedSecurity.cpp @@ -100,7 +100,10 @@ void write_leg_descriptor(std::ostringstream& result, char separator, const api: std::string security_descriptor(const api::Security& security) { const char separator = ' '; std::ostringstream result; - result << security.symbol() << separator << Venue_Name(security.exchange()); + if(security.exchange() == Venue::VENUE_ICE || security.exchange() == Venue::VENUE_SIMICE) + result << security.ice().security_desc() << separator << Venue_Name(security.exchange()); + else + result << security.symbol() << separator << Venue_Name(security.exchange()); switch(security.Contract_case()) { case Security::ContractCase::kOption: { result << separator; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index f93b11fb1..4d7b7ba43 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -148,6 +148,17 @@ void ICEListener::onMarketSnapshot(const onixs_ice::MarketSnapshot& msg, const o } } +void ICEListener::onMarketStatistics(const onixs_ice::MarketStatistics& msg, const onixs_ice::MessageInfo& msg_info) +{ + UNUSED(msg_info); + auto* data = _index.get_security(msg.marketId); + if (data != nullptr) + { + bts_assert(data->id == msg.marketId); + data->handle.set_total_volume(msg.volume); + } +} + // Gap Recovery -- This is not necessary if we subscribe to the onOrderBookUpdated callback, they handle the breaks transparently void ICEListener::onMarketSnapshotOrder(const onixs_ice::MarketSnapshotOrder& msg, const onixs_ice::MessageInfo& msg_info) { @@ -238,7 +249,8 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI auto size = msg.quantity; auto price = msg.price; onixs_ice::AggressorSide::Enum agside = msg.aggressorSide; - on_trade(data, price, size, agside, msg.transactDateTime); + if(!msg.isSystemPricedLeg) + on_trade(data, price, size, agside, msg.transactDateTime); } } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index b1ced5c73..a0115cb8a 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -85,6 +85,7 @@ public: void onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msgInfo) override; void onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msgInfo) override; void onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msgInfo) override; + void onMarketStatistics(const onixs_ice::MarketStatistics& msg, const onixs_ice::MessageInfo& msgInfo); // Feed void onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msgInfo) override; @@ -123,7 +124,10 @@ private: SecurityFilterAction filter_security(int exchange_id, const Definition& def) { if (_index.has_security(exchange_id)) + { + LOG(md,Warn, "Duplicate exchange ID {} - {}", std::to_string(exchange_id), def.contractSymbol); return SKIP; + } if(_symbol_filter.count("*") > 0) return ADD; return _symbol_filter.count( parse_contract_symbol(def.contractSymbol) ) > 0 ? ADD : SKIP; From ca8e54045312e3f7bc22804e2bc894b926f2c249 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 30 Apr 2019 15:09:53 -0400 Subject: [PATCH 044/225] volume is tricky --- src/lib/md/MDProducerHandle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index 28aad751c..08b29f40a 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -104,7 +104,8 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { cdata().last_trade.store(price, time); cdata().last_trade_time = tradetime; - cdata().total_volume = volume; + if (volume > 0) + cdata().total_volume = volume; if (key() != invalid_security_key) { co2::TradeMessage trade; From a21a7699097d8f209089a40f893f5bb4c56f970a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 30 Apr 2019 17:43:23 -0400 Subject: [PATCH 045/225] cleaned up todos --- src/lib/config/defaults/MarketData.conf | 8 +++++++- src/lib/config/defaults/Symbols.conf | 4 ++++ src/lib/config/defaults/jetfix.conf | 1 + src/lib/orderman/orders/ICENativeOrder.cpp | 2 +- src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp | 6 ++---- src/server/sparkd/md/platforms/ice_onixs/ICEListener.h | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 362268fdf..8e21bd60c 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -66,13 +66,19 @@ ICEOptions { market_type: 21 #ICE Futures US Agricultures, Coffee C uds_market_type: 21 market_type: 23 #ICE Futures US Agricultures, FCOJ A - uds_market_type: 23 + uds_market_type: 23 uds_market_type: 11 #ICE WTI-Brent spreads uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack uds_market_type: 58 #ICE Futures UI Heating Oil / Brent uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack + + market_type: 44 #ICE Henry Hub + uds_market_type: 44 + + market_type: 1 #ICE Financial Power + uds_market_type: 1 #udp_buffer_size: 33554432 #32mb #onixs_log_mode: Debug } diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 3c7d2c4f5..b0630e628 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -71,6 +71,10 @@ SymbolLists symbol: "KC" symbol: "UHO" symbol: "UHU" + + symbol: "HEN" + symbol: "HIS" + symbol: "HNG" symbol: "*" } list diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 8785ad4d2..6c74e9d5f 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -56,6 +56,7 @@ JetFIX { sender_subid: "BTS" user_name: "bluetrd-os" #this is the order_server_id raw_data: "Starts123" + max_order_msgs_per_window: 300 auto_fix_seq_num: true } } diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index ef2eccd06..f7ade7c46 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -389,7 +389,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve return OrderOpResult{ORDER_ERROR_LIMIT_BREACH, msg}; } - // are we under the messaging threshold? TODO + // are we under the messaging threshold? if (!me->services->governor(*me->session_services).can_send()) { LOG(OrderMan, reject_level, diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 4d7b7ba43..19c19d599 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -51,14 +51,12 @@ std::string ICEListener::parse_contract_symbol(const std::string& sym) // //State change -void ICEListener::onHandlerStateChange(const onixs_ice::HandlerStateChange& ) +void ICEListener::onHandlerStateChange(const onixs_ice::HandlerStateChange&) { - //TODO } -void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , const onixs_ice::MessageInfo& ) +void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , const onixs_ice::MessageInfo&) { - //TODO } // diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index a0115cb8a..1bc6a9338 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -21,7 +21,7 @@ namespace ice { class ICEListener : public onixs_ice::ExchangeListener, //One Thread public onixs_ice::HandlerStateChangeListener, //One thread - public onixs_ice::OrderBookUpdateListener, //One thread //TODO? + public onixs_ice::OrderBookUpdateListener, //One thread public onixs_ice::FeedListener, //Multi thread public onixs_ice::ErrorListener, //Multi thread public onixs_ice::WarningListener //Multi thread From 0b40d3971d93a192de025cb1ce12631ebd9406e7 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 1 May 2019 14:05:02 -0400 Subject: [PATCH 046/225] lining up with ice downtime --- src/lib/config/defaults/jetfix.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 6c74e9d5f..0e67d8f7a 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -28,8 +28,8 @@ JetFIXSimConnection { target_compid: "BTS" target_subid: "BTS" cme_market_segment_id: 0 - end_time: "07:48:00" - start_time: "07:52:00" + end_time: "02:00:00" + start_time: "02:05:00" raw_data: "1JE9X" use_cme_secure_logon: false seconds_to_pause : 1 @@ -51,8 +51,8 @@ JetFIX { sender_compid: "51251" target_compid: "ICE" - start_time: "00:30:00" - end_time: "23:30:00" + start_time: "22:55:00" + end_time: "22:05:00" sender_subid: "BTS" user_name: "bluetrd-os" #this is the order_server_id raw_data: "Starts123" From 0db037175fbf0ab560bb193899cade7286698d82 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 2 May 2019 12:07:09 -0400 Subject: [PATCH 047/225] fixed ice forced logout issue --- src/lib/config/defaults/MarketData.conf | 13 ++++++++----- src/lib/config/defaults/Symbols.conf | 1 + src/lib/jetfix/codec/FieldDefinitions.h | 1 + src/lib/orderman/actors/ICEExecutionGateway.cpp | 6 +++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 8e21bd60c..713ffaa22 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -68,19 +68,22 @@ ICEOptions { market_type: 23 #ICE Futures US Agricultures, FCOJ A uds_market_type: 23 + #market_type: 26 #ICE Futures US Agricultures, FCOJ A + #uds_market_type: 26 + uds_market_type: 11 #ICE WTI-Brent spreads uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack uds_market_type: 58 #ICE Futures UI Heating Oil / Brent uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack - market_type: 44 #ICE Henry Hub - uds_market_type: 44 + # market_type: 44 #ICE Henry Hub + # uds_market_type: 44 - market_type: 1 #ICE Financial Power - uds_market_type: 1 + # market_type: 1 #ICE Financial Power + # uds_market_type: 1 #udp_buffer_size: 33554432 #32mb - #onixs_log_mode: Debug + onixs_log_mode: Debug } # channel { # name: "juice" diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index b0630e628..c6131535b 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -71,6 +71,7 @@ SymbolLists symbol: "KC" symbol: "UHO" symbol: "UHU" + #symbol: "DX" symbol: "HEN" symbol: "HIS" diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index f7cee2eef..4038149cc 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -129,6 +129,7 @@ typedef CharField<18> ExecInst; typedef IntField<210> MaxShow; typedef IntField<9006> ICEStrategyPreference; typedef IntField<9007> ICETimeStampPreference; +typedef StringField<1031> CustOrderHandlingInst; typedef IntField<9700> MifidDirectElectronicAccess; typedef IntField<9701> MifidTradingCapacity; diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index f99c28253..1b69e8a8d 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -144,7 +144,11 @@ void ICEExecutionGateway::on_connection_status_change(bool is_connected) } if(me->state == State::READY) - me->on_gw_status_change(is_connected); + { + me->on_gw_status_change(is_connected); + if(!is_connected) //if we disconnect, set state so we log in again + me->state = State::READY_TO_START_GW; + } } From 8d7a2f342e8f9fb758e7539bc15df34c3ed367bd Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 2 May 2019 12:00:09 -0400 Subject: [PATCH 048/225] Add Custom Order Instructions --- src/lib/api/services/AdminService.proto | 84 +++++++++++++------------ src/web/ui/src/Users/State.fs | 2 + src/web/ui/src/Users/Types.fs | 1 + src/web/ui/src/Users/View.fs | 11 ++-- 4 files changed, 52 insertions(+), 46 deletions(-) diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 75e42e1f1..e0924d8df 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -33,7 +33,7 @@ message AdminData{ repeated BTSUserGroup user_groups = 10; repeated BTSUser users = 20; repeated BTSAccount accounts = 30; - repeated ExchangeConnection connections = 40; + repeated ExchangeConnection connections = 40; } /************************************************************************/ @@ -55,12 +55,12 @@ message BTSUser{ string name = 30; string password = 40; string full_name = 42; - string company = 44; + string company = 44; bool is_active = 50; bool can_create = 55; - LicenseData license_data = 60; - LicenseEntitlements license_entitlements = 70; - + LicenseData license_data = 60; + LicenseEntitlements license_entitlements = 70; + BTSUserDerivableData user_data = 80; } @@ -77,7 +77,7 @@ message BTSUserDerivableData{ // b. else its overridden at the user level UserAccountPermissions account_permissions = 70; ExchangeUserData exchange_user_data = 80; - reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; + reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90; } message LicenseData{ @@ -99,15 +99,15 @@ message LicenseEntitlements{ // } message TradingPermissionUnit{ - reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused - reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused - reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused - + reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused + reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused + reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused + bool has_permissions = 5; } message AdminPermissionUnit{ - // TODO: needs to be more ellaborate (account writing, + // TODO: needs to be more ellaborate (account writing, // reading etc, routing etc) bool has_permissions = 10; bool has_md_permissions = 20; @@ -121,14 +121,14 @@ message UserAccountPermissionUnit{ message UserAccountPermissions{ //uint32 = account_id - map account_permissions = 10; + map account_permissions = 10; } // // unused now // message UserSecurityTradingLimit{ // SecurityScope security = 10; // uint32 clip_size = 20; -// bool can_trade = 30; +// bool can_trade = 30; // } /************************************************************************/ @@ -153,7 +153,7 @@ message BTSAccount{ RiskLimitEnforcement risk_limit_enforcement=120; } -message RiskLimitEnforcement{ +message RiskLimitEnforcement{ bool product_limit_in_net_terms = 10; } @@ -199,7 +199,7 @@ message AccountExchangeConnections{ message CMEMicData{ api.CMEMics mic=10; bool enabled=20; - // there are other things here + // there are other things here } message ICEMicData{ @@ -212,9 +212,9 @@ message ExchangeUserData{ CMEUserData cme_data = 10; ICEUserData ice_data = 20; SIMUserData sim_data = 30; - - enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } - AdminDisplay admin_display_flag = 120; + + enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + AdminDisplay admin_display_flag = 120; } message ExchangeAccountData{ @@ -276,7 +276,7 @@ message CMEAccountData { reserved 110; reserved "client_id"; //string client_id = 110; api.orderman.CTICode cti = 10; - api.orderman.CustomerOrFirm origin = 20; + api.orderman.CustomerOrFirm origin = 20; string clearing_account = 40; map misc_tags = 120; } @@ -304,18 +304,18 @@ message CMEUserData{ reserved 40; reserved "text_a"; //string text_a = 40; reserved 50; reserved "text_b"; //string text_b = 50; reserved 80; reserved "max_order_rate_per_connection"; //string max_order_rate_per_connection = 80; - //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } - reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120; + //enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; } + reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120; repeated CMEMicData md_permissions = 1000; - - string operator_id = 10; + + string operator_id = 10; string smp_id = 30; map misc_tags = 60; string smp_instruction = 70; string location = 90; ProfessionalDesignation pro_nonpro = 100; - DisplayDesignation display_nondisplay = 110; + DisplayDesignation display_nondisplay = 110; } message SIMUserData { @@ -329,10 +329,10 @@ message ICEConnection { string sender_compid = 10; } -message ICEAccountData { +message ICEAccountData { reserved 10; reserved "nybit_house"; //string nybit_house = 10; reserved 20; reserved "wce_house"; //int32 wce_house = 20; - reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30; + reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30; reserved 40; reserved "direct_electronic_access"; //bool direct_electronic_access = 40; reserved 50; reserved "trading_capacity"; //string trading_capacity = 50; reserved 60; reserved "liquidity_provision"; //bool liquidity_provision = 60; @@ -348,20 +348,22 @@ message ICEAccountData { string clearing_account = 210; string customer_account_ref_id = 220; string account_code = 230; - map misc_tags = 500; + map misc_tags = 500; } -message ICEUserData { +message ICEUserData { reserved 20; reserved "memo_field"; //string memo_field = 20; reserved 30; reserved "text_b"; //string text_b = 30; reserved 40; reserved "max_order_rate"; //uint32 max_order_rate = 40; - + int32 company_id = 3; //tag 109 clientid - string operator_id = 5; //tag 50 - string authorized_trader = 10; //tag 553 user_name - string authorized_group = 15; //tag 553 user_name + string operator_id = 5; //tag 50 + string authorized_trader = 10; //tag 553 user_name + string authorized_group = 15; //tag 553 user_name string password = 21; //tag 96 raw data - + + string cust_order_handing_inst = 25; + //mifid int32 mifid_direct_electronic_access = 500; int32 mifid_trading_capacity = 510; @@ -371,18 +373,18 @@ message ICEUserData { int64 mifid_execution_decision = 550; int64 mifid_client_id_code = 560; int64 mifid_id = 570; - + map misc_tags = 60; ProfessionalDesignation pro_nonpro = 100; DisplayDesignation display_nondisplay = 110; - - repeated ICEMicData md_permissions = 1000; + + repeated ICEMicData md_permissions = 1000; } /////////////////////////////////////////////////////////// // Order Auxiliary Service //////////////////////////////// -message OrdersSummaryUnit{ +message OrdersSummaryUnit{ string account = 10; string user = 20; uint32 total_orders = 30; @@ -393,11 +395,11 @@ message OrdersSummary{ } message OrderSummaryRequest{ } -// top level orders that have account +// top level orders that have account // and user that are present here, will // be cancelled. wild cards are not // supported. -message OrderCancelRequest{ +message OrderCancelRequest{ repeated string accounts = 10; repeated string users = 20; } @@ -433,7 +435,7 @@ message AccountCreateAPIArgument{ string creator_user = 40; } message AccountUpdateAPIArgument{ - BTSAccount complete_data=10; + BTSAccount complete_data=10; } message UserCreateAPIArgument{ uint32 parent_group_id = 20; @@ -477,7 +479,7 @@ service AdminService { // users rpc create_user(UserCreateAPIArgument) returns (AdminServiceCreateEntityResult); rpc update_user(UserUpdateAPIArgument) returns (AdminServiceOperationResult); - rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult); + rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult); // subscription rpc admin_data(bts.api.VoidMessage) returns (stream AdminData); rpc get_admin_data(bts.api.VoidMessage) returns (AdminData); diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 0fc7a901f..a413d9d3f 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -74,6 +74,7 @@ let defaultScratchUser = { authorizedTrader = "" authorizedGroup = "" password = "" + custOrderHandingInst = "" mifidDirectElectronicAccess = -1 mifidTradingCapacity = -1 mifidLiquidityProvision = -1 @@ -208,6 +209,7 @@ let applyUpdate (field:UserField) (user:BTSUser) = | ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid } | ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid } | ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid } + | ICECustOrderHandingInst oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with custOrderHandingInst = oid } | MifidClientIdCode value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidClientIdCode = value } | MifidCommodityDerivIndicator value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidCommodityDerivIndicator = value } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index e3f9a6493..b879744e3 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -23,6 +23,7 @@ type UserField = | ICEAuthorizedTrader of string | ICEAuthorizedGroup of string | ICEPassword of string +| ICECustOrderHandingInst of string | MifidClientIdCode of int64 | MifidCommodityDerivIndicator of int diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index c7076165f..eec262678 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -278,11 +278,12 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = br [] h2 [Class "is-size-3"] [ str "ICE" ] div [] [ - Fields.number "Company ID" iceData.companyId [ MaxLength 18.0 ] (ICECompanyID >> UpdateField >> dispatch) - Fields.text "Operator ID" iceData.operatorId [ MaxLength 18.0 ] (ICEOperatorID >> UpdateField >> dispatch) - Fields.text "Authorized Trader" iceData.authorizedTrader [ MaxLength 18.0 ] (ICEAuthorizedTrader >> UpdateField >> dispatch) - Fields.text "Authorized Group" iceData.authorizedGroup [ MaxLength 18.0 ] (ICEAuthorizedGroup >> UpdateField >> dispatch) - Fields.text "Password" iceData.password [ MaxLength 18.0 ] (ICEPassword >> UpdateField >> dispatch) + Fields.number "Company ID" iceData.companyId [ ] (ICECompanyID >> UpdateField >> dispatch) + Fields.text "Operator ID" iceData.operatorId [ ] (ICEOperatorID >> UpdateField >> dispatch) + Fields.text "Authorized Trader" iceData.authorizedTrader [ ] (ICEAuthorizedTrader >> UpdateField >> dispatch) + Fields.text "Authorized Group" iceData.authorizedGroup [ ] (ICEAuthorizedGroup >> UpdateField >> dispatch) + Fields.text "Password" iceData.password [ ] (ICEPassword >> UpdateField >> dispatch) + Fields.text "Custom Order Instructions" iceData.custOrderHandingInst [ ] (ICECustOrderHandingInst >> UpdateField >> dispatch) h2 [Class "is-size-4"] [ str "MIFID" ] div [Style [MarginLeft "2em"]] [ From 61ac626542a7bf363d20725e187f0ea6e7ee3920 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 2 May 2019 12:36:14 -0400 Subject: [PATCH 049/225] ice wants tag 1031 --- src/lib/api/service_helpers/AdminServiceUtils.cpp | 1 + src/lib/api/services/AdminService.proto | 1 - src/lib/api/services/OrderService.proto | 1 + src/lib/orderman/orders/ICENativeOrder.cpp | 4 ++++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 4da99f1d0..0fbdde042 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -469,6 +469,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record(const bt rv.set_company_id(std::to_string(ice_user_data->company_id())); rv.set_authorized_trader(ice_user_data->authorized_trader()); rv.set_authorized_group(ice_user_data->authorized_group()); + rv.set_cust_order_handing_inst(ice_user_data->cust_order_handing_inst()); return rv; } diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index e0924d8df..911ab2d2b 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -361,7 +361,6 @@ message ICEUserData { string authorized_trader = 10; //tag 553 user_name string authorized_group = 15; //tag 553 user_name string password = 21; //tag 96 raw data - string cust_order_handing_inst = 25; //mifid diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 199fb0dd4..b4f6df2aa 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -287,6 +287,7 @@ message RoutingRecord { string company_id = 45; string authorized_trader = 50; string authorized_group = 60; + string cust_order_handing_inst = 70; string order_server_id = 200; } diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index f7ade7c46..1292b4802 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -1105,6 +1105,10 @@ void ICENativeOrder::init_fix() create_encoding.add(me->orig_clordid); create_encoding.add(std::atoi(rr.company_id().c_str())); //create_encoding.add(""); //optional, unclear if we need + std::string cust = rr.cust_order_handing_inst(); + if(cust == "") + cust = "Y"; + create_encoding.add(cust); create_encoding.add(rr.operator_id()); create_encoding.add(rr.operator_id() + "|" + rr.authorized_trader()); create_encoding.add("ISV-BTS|" + rr.authorized_group()); From d7a2ae4b097a324e1b4de1b337b348301551dc01 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 2 May 2019 17:55:46 -0400 Subject: [PATCH 050/225] added spread marker to last trade display....lotta code for an S --- .../Market/MarketView/MarketViewRow.cs | 6 +- .../Modules/Market/MarketView/MarketViewVM.cs | 8 +- .../Market/MarketView/MarketViewView.xaml.cs | 2 +- .../MarketView/MarketViewWindowFactory.cs | 4 + .../Controls/DIYGrid/Columns/ColumnBase.cs | 1 + src/client/spark_api/Co2/MDConsumerHandle.cs | 9 +- src/client/spark_test/Co2/Co2Tests.cs | 3 +- src/lib/md/MDConsumerHandle.cpp | 3 +- src/lib/md/MDConsumerHandle.h | 2 +- src/lib/md/MDProducerHandle.cpp | 7 +- src/lib/md/MDProducerHandle.h | 5 +- src/lib/md/Shm/MDStructure.h | 14 +-- src/lib/md/protos/co2.proto | 1 + src/lib/md/relay/QueryServer.cpp | 5 +- src/lib/md/relay/RelayClient.cpp | 2 +- src/lib/md/test/Co2ManagedTestHelper.cpp | 3 +- .../orderman/actors/ICEExecutionGateway.cpp | 86 +++++++++++-------- src/lib/orderman/actors/ICEExecutionGateway.h | 2 + src/lib/orderman/orders/ICENativeOrder.cpp | 5 ++ .../md/platforms/ice_onixs/ICEListener.cpp | 8 +- 20 files changed, 113 insertions(+), 63 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 0813e8011..d779329b9 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -26,6 +26,7 @@ namespace mbts.spark { readonly ObservableFilterCollection _working_orders, _working_bids, _working_asks; readonly string _security_text, _security_key_text; readonly Property _bid_price, _ask_price, _last_price, _day_change, _settlement, _session_high, _session_low; + readonly Property _last_price_from_spread; readonly CellProperty _position; readonly CellProperty _last_size; readonly CellProperty _volume; @@ -53,6 +54,7 @@ namespace mbts.spark { _day_change = backing(nameof(day_change), double.NaN); _session_low = backing(nameof(session_low), double.NaN); _session_high = backing(nameof(session_high), double.NaN); + _last_price_from_spread = backing(nameof(last_price_from_spread), false); _settlement = backing(nameof(settlement), double.NaN); _volume = new CellProperty(this, nameof(volume), 0); _inside_bids = new CellProperty(this, nameof(inside_bids)); @@ -103,6 +105,7 @@ namespace mbts.spark { public bool inside_asks => _inside_asks.value; public int position => _position.value; public double last_price => _last_price.Value; + public bool last_price_from_spread => _last_price_from_spread.Value; public uint last_size => _last_size.value; public double bid_price => _bid_price.Value; public uint bid_direct_size => _bid_direct_size.Value; @@ -161,8 +164,9 @@ namespace mbts.spark { _inside_bids.on_next_distinct(_bid_price.Value >= _working_best_bid.value, ref dirty); _inside_asks.on_next_distinct(_ask_price.Value <= _working_best_ask.value, ref dirty); } - if (md.md.get_last_trade(ref _last_ref, out NativePriceSize ps, out DateTime ts, out ulong v)) { + if (md.md.get_last_trade(ref _last_ref, out NativePriceSize ps, out DateTime ts, out ulong v, out bool from_spread)) { _last_price.set(ps.price); + _last_price_from_spread.set(from_spread); _last_size.on_next_distinct(ps.size, ref dirty); _volume.on_next_distinct(v, ref dirty); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index ff0b789b1..bd0f93da4 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -39,7 +39,8 @@ namespace mbts.spark { IMultiValueConverter price_converter = new ui.spark.converters.TickDisplayConverter(); add_col(Columns.Security, "Security", r => r.security.ToString(), nameof(Row.security), DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex); add_col(Columns.Volume, "Volume", r => r.volume.ToString(), nameof(Row.volume), DefaultColumnWidths.Volume, volume_filter, DataGridFilterKnownTemplates.ULongMinMax); - add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax); + add_col(Columns.LastSpd, "Spd", r => r.last_price_from_spread ? "S" : "", nameof(Row.last_price_from_spread), DefaultColumnWidths.Side, last_price_from_spread_filter, DataGridFilterKnownTemplates.Regex); + add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax); add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax, h_alignment: System.Windows.HorizontalAlignment.Right); add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right); add_hl_working_orders_col(Columns.WorkingBids, working_col_header, nameof(Row.working_bids_text), nameof(Row.working_best_bid), nameof(Row.working_bids_click), working_bid_volume_filter, BTSColors.MarketData.bid, System.Windows.HorizontalAlignment.Right); @@ -145,6 +146,7 @@ namespace mbts.spark { ask_direct_size_filter.load_state(filters.ask_direct_size); ask_implied_size_filter.load_state(filters.ask_implied_size); last_price_filter.load_state(filters.last_price); + last_price_from_spread_filter.load_state(filters.last_price_from_spread); last_size_filter.load_state(filters.last_size); day_change_filter.load_state(filters.day_change); settlement_filter.load_state(filters.settlement); @@ -161,7 +163,7 @@ namespace mbts.spark { }), DataGridFilterHelper.hook_filters(rows_view, security_filter, bid_price_filter, bid_merged_size_filter, bid_direct_size_filter, bid_implied_size_filter, ask_price_filter, ask_merged_size_filter, ask_direct_size_filter, ask_implied_size_filter, - last_price_filter, last_size_filter, day_change_filter, settlement_filter, + last_price_filter, last_price_from_spread_filter, last_size_filter, day_change_filter, settlement_filter, session_low_filter, session_high_filter, position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter), securities_connectable.Connect(), settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager), @@ -191,6 +193,7 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter ask_direct_size_filter { get; } = new UIntMinMax(r => r.ask_direct_size, nameof(Row.ask_direct_size)); public IDataGridColumnPersistentFilter ask_implied_size_filter { get; } = new UIntMinMax(r => r.ask_implied_size, nameof(Row.ask_implied_size)); public IDataGridColumnPersistentFilter last_price_filter { get; } = new DoubleMinMax(r => r.last_price, nameof(Row.last_price)); + public IDataGridColumnPersistentFilter last_price_from_spread_filter { get; } = new RegexFilterVM(r => r.last_price_from_spread.ToString(), nameof(Row.last_price_from_spread)); public IDataGridColumnPersistentFilter last_size_filter { get; } = new UIntMinMax(r => r.last_size, nameof(Row.last_size)); public IDataGridColumnPersistentFilter day_change_filter { get; } = new DoubleMinMax(r => r.day_change, nameof(Row.day_change)); public IDataGridColumnPersistentFilter settlement_filter { get; } = new DoubleMinMax(r => r.settlement, nameof(Row.settlement)); @@ -222,6 +225,7 @@ namespace mbts.spark { ask_direct_size = ask_direct_size_filter.get_state(), ask_implied_size = ask_implied_size_filter.get_state(), last_price = last_price_filter.get_state(), + last_price_from_spread = last_price_from_spread_filter.get_state(), last_size = last_size_filter.get_state(), day_change = day_change_filter.get_state(), settlement = settlement_filter.get_state(), diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs index edbea884b..14dfdb626 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs @@ -8,7 +8,7 @@ namespace mbts.ui.spark { /// Interaction logic for MarketSheetsView.xaml /// partial class MarketViewView : UserControl { - public enum Columns { Security, Volume, Last, LastSize, Position, WorkingBids, Bid, BidMergedSize, BidDirectSize, BidImpliedSize, Ask, AskMergedSize, AskDirectSize, AskImpliedSize, WorkingAsks, Settlement, DayChange, SessionLow, SessionHigh, SecurityKey, + public enum Columns { Security, Volume, Last, LastSpd, LastSize, Position, WorkingBids, Bid, BidMergedSize, BidDirectSize, BidImpliedSize, Ask, AskMergedSize, AskDirectSize, AskImpliedSize, WorkingAsks, Settlement, DayChange, SessionLow, SessionHigh, SecurityKey, MarketDescription, ClearedAlias, ProductDescription, HubAlias, StripName, MicCode } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index 38931a3eb..da1b23358 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -80,6 +80,7 @@ namespace bts.shell { public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security); public static GridColumnSettings volume => new GridColumnSettings(col_id(Columns.Volume), DefaultColumnHeaders.Volume, width: DefaultColumnWidths.Volume); public static GridColumnSettings last => new GridColumnSettings(col_id(Columns.Last), DefaultColumnHeaders.Last, width: DefaultColumnWidths.Price); + public static GridColumnSettings last_from_spread => new GridColumnSettings(col_id(Columns.LastSpd), DefaultColumnHeaders.S, width: DefaultColumnWidths.Price, is_visible: false); public static GridColumnSettings last_size => new GridColumnSettings(col_id(Columns.LastSize), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings position => new GridColumnSettings(col_id(Columns.Position), DefaultColumnHeaders.Pos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings working_bids => new GridColumnSettings(col_id(Columns.WorkingBids), DefaultColumnHeaders.Working, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Working, horizontal_alignment: System.Windows.HorizontalAlignment.Right); @@ -117,6 +118,7 @@ namespace bts.shell { yield return security; yield return volume; yield return last; + yield return last_from_spread; yield return last_size; yield return position; yield return working_bids; @@ -200,6 +202,8 @@ namespace bts.shell { [ProtoMember(25)] public string strip_name; [ProtoMember(26)] + public string last_price_from_spread; + [ProtoMember(27)] public string mic_code; } } diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index d0d2c98f7..4bf15f346 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -86,6 +86,7 @@ namespace mbts.ui.controls { Aggressor = "Aggressor", Volume = "Volume", Last = "Last", + S = "S", Pos = "Pos", Working = "Working", Bid = "Bid", diff --git a/src/client/spark_api/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs index 4a12f2f99..4a0b37f16 100644 --- a/src/client/spark_api/Co2/MDConsumerHandle.cs +++ b/src/client/spark_api/Co2/MDConsumerHandle.cs @@ -133,6 +133,12 @@ namespace mbts.co2 { total_volume = _cold->total_volume; return (_cold->last_trade.load_if_new(ref time, out ps)); } + public bool get_last_trade(ref ulong time, out NativePriceSize ps, out DateTime timestamp, out ulong total_volume, out bool from_spread) { + timestamp = _cold->last_trade_time; + total_volume = _cold->total_volume; + from_spread = (_cold->from_spread != 0); + return (_cold->last_trade.load_if_new(ref time, out ps)); + } public ulong misc_timestamp { get { return _cold->misc_timestamp; } } public ulong total_volume { get { return _cold->total_volume; } } @@ -250,7 +256,7 @@ namespace mbts.co2 { // Last trade public AtomicPriceSize last_trade; public ulong total_volume; - public utils.LLDateTime last_trade_time; + public utils.LLDateTime last_trade_time; //// Settlement public UInt64 misc_timestamp; @@ -271,6 +277,7 @@ namespace mbts.co2 { public double session_low_offer; public double fixing_price; + public int from_spread; public int deleted; // FixedSecurity will not be directly addressable. Instead the security is available through the callback public Int64 security_size; diff --git a/src/client/spark_test/Co2/Co2Tests.cs b/src/client/spark_test/Co2/Co2Tests.cs index a5f1b292a..af5edc856 100644 --- a/src/client/spark_test/Co2/Co2Tests.cs +++ b/src/client/spark_test/Co2/Co2Tests.cs @@ -142,7 +142,8 @@ namespace mbts.co2.tests Assert.IsTrue(entry.session_low_offer == 5.5); Assert.IsTrue(entry.fixing_price == 6.6); - Assert.IsTrue(entry.deleted == 1); + Assert.IsTrue(entry.from_spread == 0); + Assert.IsTrue(entry.deleted == 1); } [Test] diff --git a/src/lib/md/MDConsumerHandle.cpp b/src/lib/md/MDConsumerHandle.cpp index 40efeded5..35f43f54d 100644 --- a/src/lib/md/MDConsumerHandle.cpp +++ b/src/lib/md/MDConsumerHandle.cpp @@ -293,7 +293,7 @@ TimeStamp copy_synthetic_depth(const SyntheticStrategy& synth, size_t count, Pri // END SYNTHETIC DEPTH ///////////////////////////// -bool MDConsumerHandle::get_last_trade(TimeStamp& time, PriceSize& trade, datetime::LLDateTime& trade_timestamp, size_t* total_volume) const { +bool MDConsumerHandle::get_last_trade(TimeStamp& time, PriceSize& trade, datetime::LLDateTime& trade_timestamp, size_t* total_volume, int* from_spread) const { switch(_type) { case HANDLETYPE_VOID: return false; case HANDLETYPE_DEPTH: @@ -303,6 +303,7 @@ bool MDConsumerHandle::get_last_trade(TimeStamp& time, PriceSize& trade, datetim if (result) { trade_timestamp = pcold->last_trade_time; if (total_volume) { *total_volume = pcold->total_volume; } + if (from_spread) { *from_spread = pcold->from_spread; } } return result; } diff --git a/src/lib/md/MDConsumerHandle.h b/src/lib/md/MDConsumerHandle.h index 506e64f7b..66581f7d1 100644 --- a/src/lib/md/MDConsumerHandle.h +++ b/src/lib/md/MDConsumerHandle.h @@ -239,7 +239,7 @@ public: return get_book(read_combined, time, copydepth, bids, asks); } - bool get_last_trade(TimeStamp& time, PriceSize& out_trade, datetime::LLDateTime& out_trade_timestamp, size_t* total_volume=nullptr) const; + bool get_last_trade(TimeStamp& time, PriceSize& out_trade, datetime::LLDateTime& out_trade_timestamp, size_t* total_volume=nullptr,int* from_spread=nullptr) const; IntPrice settlement_price() const { switch(_type) { diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index 08b29f40a..362e988d5 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -101,9 +101,11 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { } } -void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { +void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, + co2::AggressorSide agside, uint32_t volume, bool from_spread) { cdata().last_trade.store(price, time); cdata().last_trade_time = tradetime; + cdata().from_spread = (from_spread ? 1 : 0); if (volume > 0) cdata().total_volume = volume; @@ -119,9 +121,10 @@ void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTi _channel.add_trade(trade); } } -void MDProducerHandle::set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime tradetime, uint32_t total_volume) { +void MDProducerHandle::set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime tradetime, uint32_t total_volume, bool from_spread) { cdata().last_trade.store(ps,time); cdata().last_trade_time = tradetime; + cdata().from_spread = (from_spread ? 1 : 0); if(total_volume > 0) cdata().total_volume = total_volume; } diff --git a/src/lib/md/MDProducerHandle.h b/src/lib/md/MDProducerHandle.h index 4fea16972..78466987a 100644 --- a/src/lib/md/MDProducerHandle.h +++ b/src/lib/md/MDProducerHandle.h @@ -92,9 +92,10 @@ public: void set_status(co2::CoconutSecurityStatus status); // hot // Updates trade log and last trade - void add_trade(TimeStamp time, const PriceSize pricesize, datetime::LLDateTime date, co2::AggressorSide agside, uint32_t total_volume=0); // cold + void add_trade(TimeStamp time, const PriceSize pricesize, datetime::LLDateTime date, + co2::AggressorSide agside, uint32_t total_volume=0, bool from_spread=false); // cold // Update last_trade without updating trade log - void set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime date, uint32_t total_volume=0); + void set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime date, uint32_t total_volume=0,bool from_spread=false); void set_total_volume(uint32_t total_volume); void add_rfq(TimeStamp time, const co2::QuoteRequestMessage& rfq); // cold diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib/md/Shm/MDStructure.h index 3553b71d8..2bad7f6ee 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 = 102; +const uint32_t shm_version = 107; struct ALIGNED_(CACHE_LINE) HotHeader { size_t count; @@ -213,9 +213,10 @@ struct ColdEntry { exchange_status(co2::TRADINGSTATUS_UNKNOWN), last_trade(), total_volume(0), - last_trade_time(), + last_trade_time(), misc(), - deleted(false) + from_spread(0), + deleted(0) { this->security.size = security_size; } @@ -227,12 +228,13 @@ struct ColdEntry { // Last Trade AtomicPriceSize last_trade; - size_t total_volume; + size_t total_volume; datetime::LLDateTime last_trade_time; - + MiscData misc; - bool deleted; + int from_spread; + int deleted; FixedSecurity security; }; diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index 8d5355be6..82c88df3a 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -151,6 +151,7 @@ message TradeMessage { uint32 total_volume = 7; bool gap = 8; AggressorSide aggressor_side = 9; + bool from_spread = 10; } message QuoteRequestMessage { enum Side { diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 248491942..d6555847a 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -306,12 +306,13 @@ public: TimeStamp time(snapshot ? 0 : chan.time()); PriceSize price; datetime::LLDateTime trade_time; - size_t volume; - if (handle.get_last_trade(time, price, trade_time, &volume)) { + size_t volume; int from_spread; + if (handle.get_last_trade(time, price, trade_time, &volume, &from_spread)) { auto* trade = pupd->mutable_last_trade(); trade->set_key(handle.key()); trade->set_time(trade_time); trade->set_total_volume(volume); + trade->set_from_spread(from_spread); set_price(price, trade); } } diff --git a/src/lib/md/relay/RelayClient.cpp b/src/lib/md/relay/RelayClient.cpp index 9830a6cc7..bf04c11d2 100644 --- a/src/lib/md/relay/RelayClient.cpp +++ b/src/lib/md/relay/RelayClient.cpp @@ -86,7 +86,7 @@ class RelayProducer : public IRelayWriter { handle.update_fixing_price(updated, misc.fixing_price()); } if (update.has_last_trade()) { - handle.set_last_trade(updated, trade_pricesize(update.last_trade()), update.last_trade().time(), update.last_trade().total_volume()); + handle.set_last_trade(updated, trade_pricesize(update.last_trade()), update.last_trade().time(), update.last_trade().total_volume(), update.last_trade().from_spread()); } } diff --git a/src/lib/md/test/Co2ManagedTestHelper.cpp b/src/lib/md/test/Co2ManagedTestHelper.cpp index 30caf3bde..90462dfcd 100644 --- a/src/lib/md/test/Co2ManagedTestHelper.cpp +++ b/src/lib/md/test/Co2ManagedTestHelper.cpp @@ -87,7 +87,8 @@ extern "C" BTS_EXPORT void co2_get_sample_cold(size_t& size, ColdEntry& entry) { entry.misc.session_high_bid = 4.4; entry.misc.session_low_offer = 5.5; entry.misc.fixing_price = 6.6; - entry.deleted = true; + entry.deleted = 1; + entry.from_spread = 0; } extern "C" BTS_EXPORT void co2_get_sample_cold_header(ColdHeader& header) { diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 1b69e8a8d..8fd446604 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -53,6 +53,7 @@ struct ICEExecutionGateway::PImpl api::admin::AdminData admin_data; std::atomic nusers; TimeStamp connection_time; + std::unordered_map exec_id_to_memo; //for the bullshit adjusts }; ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log) @@ -252,21 +253,54 @@ OnCancelReject &ICEExecutionGateway::on_cancel_reject() return me->on_cancel_reject; } +bool ICEExecutionGateway::process_memo(const jetfix::fix::ICEExecutionReportMsg &msg, OrderKey* ok, SecurityKey* sk) +{ + if(msg.has()) + { + decode_memo(msg.get(), ok, sk); + return true; + } + else + { + if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT && msg.has()) + { + std::string ref_exec_id = msg.get(); + auto found = me->exec_id_to_memo.find(ref_exec_id); + if(found == me->exec_id_to_memo.end()) + { + auto new_price = Price(0); + if(msg.has()) + new_price = Price(msg.get()); + + LOG(OrderMan, Error, + "Received unsupported trade correction msg. This correction will not be forwarded. The trader should be alerted. " + "Partial original fill id: {}. New price: {}", ref_exec_id, new_price.value()); + return false; + } + else + { + decode_memo(found->second, ok, sk); + return true; + } + } + } + return false; +} + void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg &msg) { OrderKey ok; SecurityKey sk; - if(!msg.has()) + if(!process_memo(msg, &ok, &sk)) { + std::string execid = ""; + if(msg.has()) + execid = msg.get(); LOG(OrderMan, Error, - "Received execution report with no memo {}. Will not be able to process this report. This is likely a bug that could lead " - "to lost fills. Please investigate.", - sk.value()); - return; + "Received execution report with no memo execid: {}. Will not be able to process this report. This is likely a bug that could lead " + "to lost fills. Please investigate.", execid); + return; } - else - decode_memo(msg.get(), &ok, &sk); - auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); LOG(Latency, Info, "Started handling of execution report for order {}", ok.value()); @@ -279,32 +313,6 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg sk.value()); else { - // Ignore trade correction messages. - if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CORRECT) - { - auto new_price = Price(0); - if(msg.has()) - new_price = securities::decode_exchange_price(*sec, Price(msg.get())); - std::string ref_exec_id = ""; - if(msg.has()) - ref_exec_id = msg.get(); - LOG(OrderMan, Error, - "Received unsupported trade correction msg. This correction will not be forwarded. The trader should be alerted. " - "Order: {} SecKey: {} Partial original fill id: {}. New price: {}", - ok.value(), sk.value(), ref_exec_id, new_price.value()); - return; - } - - // Ignore unsupported trade cancelation messages. - if (msg.get() == api::orderman::EXEC_TYPE_TRADE_CANCEL) - { - LOG(OrderMan, Error, - "Received unsupported trade cancel msg. This correction will not be forwarded. The trader should be alerted. " - "Order: {} SecKey: {} ", - ok.value(), sk.value()); - return; - } - api::Security const *leg_security = nullptr; if (msg.has() && msg.get() == 2) { @@ -383,6 +391,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg data->quantity = Quantity(0); data->filled_quantity = Quantity(msg.get()); + data->last_shares = msg.has() ? Quantity(msg.get()) : Quantity(0); @@ -394,9 +403,12 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg ? securities::decode_exchange_price(*last_px_sec, Price(msg.get())) : Price(0); if (msg.has()) - str_to(msg.get(), &data->exchange_fill_id); - - + { + auto execid = msg.get(); + str_to(execid, &data->exchange_fill_id); + me->exec_id_to_memo[execid] = msg.get(); + } + if (msg.has()) { std::string stamp = msg.get(); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index b7cb5dd72..8c453ab71 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -36,6 +36,8 @@ class ICEExecutionGateway : public IExecutionGateway { void on_connection_status_change(bool connected); void on_business_reject(const jetfix::fix::BusinessMessageRejectMsg&); void on_session_reject(const jetfix::fix::RejectMsg&); + + bool process_memo(const jetfix::fix::ICEExecutionReportMsg &msg, OrderKey*, SecurityKey*); }; } // namespace orderman diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 1292b4802..bfbe967e4 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -835,6 +835,11 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) { // terminal states, nothing can change them case ORDER_STATUS_COMPLETED: + { + if(external_status == ORDER_STATUS_CANCELED) //BUSTS + transition(external_status); + } + break; case ORDER_STATUS_CANCELED: break; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 19c19d599..3fce386d9 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -230,12 +230,13 @@ AggressorSide map_aggressor(onixs_ice::AggressorSide::Enum agside) } } -void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, onixs_ice::AggressorSide::Enum agside, const onixs_ice::DateTime& onixs_date) +void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, + onixs_ice::AggressorSide::Enum agside, const onixs_ice::DateTime& onixs_date, bool from_spread) { auto ts = utils::TimeStamp::now(); PriceSize ps = pricesize_of_price_size(price, data->handle.security().ice_deal_denominator, size); auto date = ll_of_timestamp(onixs_date); - data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); + data->handle.add_trade(ts, ps, date, map_aggressor(agside), 0u, from_spread); } void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& ) @@ -247,8 +248,7 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI auto size = msg.quantity; auto price = msg.price; onixs_ice::AggressorSide::Enum agside = msg.aggressorSide; - if(!msg.isSystemPricedLeg) - on_trade(data, price, size, agside, msg.transactDateTime); + on_trade(data, price, size, agside, msg.transactDateTime, msg.isSystemPricedLeg); } } From 65f41452fb579998c220ccc30da335fb16252119 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 2 May 2019 18:33:54 -0400 Subject: [PATCH 051/225] work around onixs assert for us financials that does not have an implieds feed --- src/lib/config/defaults/MarketData.conf | 6 ++--- src/lib/config/defaults/Symbols.conf | 2 +- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 24 +++++++++++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 713ffaa22..516378ead 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -68,8 +68,8 @@ ICEOptions { market_type: 23 #ICE Futures US Agricultures, FCOJ A uds_market_type: 23 - #market_type: 26 #ICE Futures US Agricultures, FCOJ A - #uds_market_type: 26 + market_type: 26 #ICE Futures US Financials DX + uds_market_type: 26 uds_market_type: 11 #ICE WTI-Brent spreads uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack @@ -87,7 +87,7 @@ ICEOptions { } # channel { # name: "juice" - # market_type: 23 #ICE Futures US Agricultures, FCOJ A + # market_type: 26 #ICE Futures US Agricultures, FCOJ A # } ice_config_file: "ConnectivityConfiguration.APITest.xml" } diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index c6131535b..25634c1b9 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -71,7 +71,7 @@ SymbolLists symbol: "KC" symbol: "UHO" symbol: "UHU" - #symbol: "DX" + symbol: "DX" symbol: "HEN" symbol: "HIS" diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index 7da65b862..9956b381c 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -73,13 +73,29 @@ onixs_ice::MarketSubscriptions market_subcription_for_channel(const ICEChannel& for(const auto& x : chan.market_types) { //onixs_ice::MarketSubType::NonImplied - onixs_ice::MarketSubscription futures(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::Futures, onixs_ice::BookDepth::FOD); - subs.push_back(futures); + if(x == 26) + { + onixs_ice::MarketSubscription futures(x, onixs_ice::MarketSubType::NonImplied, onixs_ice::SecurityType::Futures, onixs_ice::BookDepth::FOD); + subs.push_back(futures); + } + else + { + onixs_ice::MarketSubscription futures(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::Futures, onixs_ice::BookDepth::FOD); + subs.push_back(futures); + } } for(const auto& x : chan.uds_market_types) { - onixs_ice::MarketSubscription spreads(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::UdsFuturesMarkets, onixs_ice::BookDepth::FOD); - subs.push_back(spreads); + if(x == 26) + { + onixs_ice::MarketSubscription spreads(x, onixs_ice::MarketSubType::NonImplied, onixs_ice::SecurityType::UdsFuturesMarkets, onixs_ice::BookDepth::FOD); + subs.push_back(spreads); + } + else + { + onixs_ice::MarketSubscription spreads(x, onixs_ice::MarketSubType::FullImplied, onixs_ice::SecurityType::UdsFuturesMarkets, onixs_ice::BookDepth::FOD); + subs.push_back(spreads); + } } return subs; } From 4b7db298c418f10f1c83a4b8818c87443ec2456f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 3 May 2019 10:39:54 -0400 Subject: [PATCH 052/225] something up with settlement re-price --- src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 3fce386d9..dd8148a62 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -299,7 +299,8 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::Price price = msg.settlementPrice; onixs_ice::DateTime time = msg.dateTime; auto denominator = data->handle.security().ice_settle_denominator; - data->handle.update_settlement(utils::TimeStamp::now(), convert_price(price, denominator), date_of_timestamp(time)); + auto prx = convert_price(price, denominator); + data->handle.update_settlement(utils::TimeStamp::now(), prx, date_of_timestamp(time)); } } From f3d16502de435506dabb244c64892acc0d7ec607 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 3 May 2019 13:39:35 -0400 Subject: [PATCH 053/225] going a new way on the busts --- src/lib/orderman/orders/ICENativeOrder.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index bfbe967e4..1292b4802 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -835,11 +835,6 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) { // terminal states, nothing can change them case ORDER_STATUS_COMPLETED: - { - if(external_status == ORDER_STATUS_CANCELED) //BUSTS - transition(external_status); - } - break; case ORDER_STATUS_CANCELED: break; From 263ff63a37707c44a542cb8ab79aadee90223fbb Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 3 May 2019 15:31:23 -0400 Subject: [PATCH 054/225] added concept of active and busted fill to support ice busts --- .../spark/Modules/Trading/Fills/FillsVM.cs | 3 +++ .../Modules/Trading/Fills/FillsView.xaml.cs | 2 +- .../Trading/Fills/FillsWindowFactory.cs | 6 +++++ .../Controls/DIYGrid/Columns/ColumnBase.cs | 1 + src/lib/api/services/OrderService.proto | 6 +++++ src/lib/orderman/actors/FillStore.cpp | 27 +++++++++++++++---- .../orderman/actors/ICEExecutionGateway.cpp | 4 +-- src/lib/orderman/actors/SODPosition.cpp | 2 +- .../orderman/orderman_utils/ExecutionReport.h | 1 + .../md/platforms/ice_onixs/ICEListener.cpp | 5 ++-- 10 files changed, 46 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 841e32391..0eb9488fb 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -83,6 +83,7 @@ namespace mbts.spark { add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), new DoubleMinMax(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size); add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), new DoubleMinMax(r => r.fill.LastPrice), DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price); add_col(Columns.FillKind, DefaultColumnHeaders.FillKind, r => r.fill_kind.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillKind), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind); + add_col(Columns.FillStatus, DefaultColumnHeaders.FillStatus, r => r.fill_status.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillStatus), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind); add_col(Columns.FillKey, DefaultColumnHeaders.FillKey, r => r.fill_key.ToString(), new RegexFilterVM(r => r.fill.FillKey), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.FillKey); add_col(Columns.OrderKey, DefaultColumnHeaders.OrderKey, r => r.order_key.ToString(), new RegexFilterVM(r => r.fill.OrderKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.OrderKey); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), new RegexFilterVM(r => r.fill.SecurityKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); @@ -182,6 +183,7 @@ namespace mbts.spark { case Columns.Exchange: return wrap_default(ft => ft.security.exchange_or_default()); case Columns.FillKey: return wrap(ft => ft.fill.FillKey); case Columns.FillKind: return wrap_default(ft => ft.fill.FillKind); + case Columns.FillStatus: return wrap_default(ft => ft.fill.FillStatus); case Columns.FillTime: return wrap(ft => ft.fill.Timestamp.to_local_time()); case Columns.OrderKey: return wrap(ft => ft.fill.OrderKey); case Columns.OrderType: return wrap_default(ft => ft.order?.order_type() ?? OrderType.None); @@ -241,6 +243,7 @@ namespace mbts.spark { public double price => _fill.LastPrice; public double size => _fill.LastShares; public FillKind fill_kind => _fill.FillKind; + public FillStatus fill_status => _fill.FillStatus; public string fill_key => _fill.FillKey; public string order_key => _order.Key.ToString(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index 55fb8fe2e..d53ca3810 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -7,7 +7,7 @@ namespace mbts.ui.spark { /// Interaction logic for FillsView.xaml /// partial class FillsView : UserControl { - public enum Columns { FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillKind, FillKey, OrderKey, SecurityKey } + public enum Columns { FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillKind, FillStatus, FillKey, OrderKey, SecurityKey } public FillsView() => InitializeComponent(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs index 939bef5a0..ef19a8a68 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs @@ -86,6 +86,7 @@ namespace bts.shell { public static GridColumnSettings quantity => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings fill_kind => new GridColumnSettings(col_id(Columns.FillKind), DefaultColumnHeaders.FillKind, width: DefaultColumnWidths.FillKind); + public static GridColumnSettings fill_status => new GridColumnSettings(col_id(Columns.FillStatus), DefaultColumnHeaders.FillStatus, width: DefaultColumnWidths.FillKind); public static GridColumnSettings fill_key => new GridColumnSettings(col_id(Columns.FillKey), DefaultColumnHeaders.FillKey, width: DefaultColumnWidths.FillKey); public static GridColumnSettings order_key => new GridColumnSettings(col_id(Columns.OrderKey), DefaultColumnHeaders.OrderKey, width: DefaultColumnWidths.OrderKey); public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey); @@ -108,6 +109,7 @@ namespace bts.shell { yield return quantity; yield return price; yield return fill_kind; + yield return fill_status; yield return fill_key; yield return order_key; yield return security_key; @@ -200,6 +202,10 @@ namespace bts.shell { [ProtoMember(14)] [DIYGridColumnID(nameof(Columns.FillKind))] public Fill.Types.FillKind[] fill_kind { get; set; } + + [ProtoMember(15)] + [DIYGridColumnID(nameof(Columns.FillStatus))] + public Fill.Types.FillStatus[] fill_status { get; set; } } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 4bf15f346..270bc14db 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -96,6 +96,7 @@ namespace mbts.ui.controls { SessionLow = "Low", SessionHigh = "High", FillKind = "Fill Kind", + FillStatus = "Fill Status", Name = "Name", Description = "Description", N_Legs = "# Legs", diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index b4f6df2aa..6faf7bd07 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -262,6 +262,12 @@ message Fill { FILL_KIND_SOD = 2; } FillKind fill_kind = 10; + + enum FillStatus { + FILL_STATUS_ACTIVE = 0; + FILL_STATUS_BUSTED = 1; + } + FillStatus fill_status = 20; } enum OrderSubType { diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 3d6652726..ee5cd6aa6 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -87,12 +87,13 @@ void FillStore::on_execution_report( if (u.events) { for (auto const &ev : *u.events) { auto &er = *ev.data; + auto fk = fmt::format("{}:{}", er.order_key.value(), + to_str(er.exchange_fill_id)); + auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.exec_type == api::orderman::EXEC_TYPE_FILL) { - - auto fk = fmt::format("{}:{}", er.order_key.value(), - to_str(er.exchange_fill_id)); - auto is_known = me->known_fills.count(fk); + er.exec_type == api::orderman::EXEC_TYPE_FILL || + er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + api::orderman::Fill fill; if (!is_known) { fill.set_order_key(er.order_key.value()); @@ -108,6 +109,7 @@ void FillStore::on_execution_report( fill.set_avg_price(er.avg_price.value()); fill.set_side(er.side); fill.set_last_shares(er.last_shares.value()); + fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); fill.set_fill_key(fk); struct timeval tv; gettimeofday(&tv, NULL); @@ -130,6 +132,21 @@ void FillStore::on_execution_report( "Discarding known execution report for fill {}", fk); } // if partial_fill or fill + else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) + { + //TODO SOD + auto data = me->store->retrieve_one(fills_ns, fk); + Fill existing_fill; + if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) + { + existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); + auto fv = utils::pb::to_string(existing_fill); + me->store->update(fills_ns, fk, fv); + publish(me->fill_stream, existing_fill, *er.security); + } + else + LOG(OrderMan, Warn, "Received bust for unknown fill {}", fk); + } } // for loop } // if u.events } diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 8fd446604..afc6584d7 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -329,8 +329,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg return; } leg_security = it->second; - } - + } std::string text_msg; if (msg.has()) text_msg = msg.get(); @@ -343,6 +342,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg // allocate from our pool auto data = me->exe_report_pool.construct(); + data->memo = msg.get(); data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index 18f6d83c4..b1dbb2d74 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -141,7 +141,7 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { } bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { + if (_enabled && fill.fill_status() == api::orderman::Fill::FILL_STATUS_ACTIVE && 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); diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 49497a5b1..1fa1c0b55 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -36,6 +36,7 @@ public: std::string msg; api::Venue exchange; int64_t ice_cl_ord_id; + std::string memo; }; }} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index dd8148a62..aef39bf9e 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -296,10 +296,11 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const if (data != nullptr) { bts_assert(data->id == msg.marketId); - onixs_ice::Price price = msg.settlementPrice; - onixs_ice::DateTime time = msg.dateTime; + auto price = msg.settlementPrice; + auto time = msg.dateTime; auto denominator = data->handle.security().ice_settle_denominator; auto prx = convert_price(price, denominator); + LOG(md,Warn, "OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(prx.price())); data->handle.update_settlement(utils::TimeStamp::now(), prx, date_of_timestamp(time)); } } From c4eeaf2ec8fb62555ca2863498dfa9d40da6ef40 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 3 May 2019 16:28:37 -0400 Subject: [PATCH 055/225] this should do it for bust / adjust --- src/lib/api/services/OrderService.proto | 3 ++- src/lib/orderman/actors/FillStore.cpp | 25 ++++++++++++++++++---- src/lib/orderman/actors/SODPosition.cpp | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 6 ++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 19b168f23..e4c965c3f 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -274,7 +274,8 @@ message Fill { enum FillStatus { FILL_STATUS_ACTIVE = 0; - FILL_STATUS_BUSTED = 1; + FILL_STATUS_CORRECTED = 1; + FILL_STATUS_BUSTED = 2; } FillStatus fill_status = 20; } diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index ee5cd6aa6..6a4f0a816 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -91,8 +91,7 @@ void FillStore::on_execution_report( to_str(er.exchange_fill_id)); auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.exec_type == api::orderman::EXEC_TYPE_FILL || - er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + er.exec_type == api::orderman::EXEC_TYPE_FILL) { api::orderman::Fill fill; if (!is_known) { @@ -134,7 +133,6 @@ void FillStore::on_execution_report( } // if partial_fill or fill else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) { - //TODO SOD auto data = me->store->retrieve_one(fills_ns, fk); Fill existing_fill; if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) @@ -146,7 +144,26 @@ void FillStore::on_execution_report( } else LOG(OrderMan, Warn, "Received bust for unknown fill {}", fk); - } + } + else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) + { + auto data = me->store->retrieve_one(fills_ns, fk); + Fill existing_fill; + if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) + { + existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_CORRECTED); + existing_fill.set_last_price(er.last_price.value()); + existing_fill.set_avg_price(er.avg_price.value()); + existing_fill.set_side(er.side); + existing_fill.set_last_shares(er.last_shares.value()); + + auto fv = utils::pb::to_string(existing_fill); + me->store->update(fills_ns, fk, fv); + publish(me->fill_stream, existing_fill, *er.security); + } + else + LOG(OrderMan, Warn, "Received correction for unknown fill {}", fk); + } } // for loop } // if u.events } diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index b1dbb2d74..a9560741e 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -141,7 +141,7 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { } bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.fill_status() == api::orderman::Fill::FILL_STATUS_ACTIVE && fill.timestamp().seconds() < _sod_time.tv_sec) { + if (_enabled && fill.fill_status() != api::orderman::Fill::FILL_STATUS_BUSTED && 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); diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 1292b4802..135acf4ca 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -777,6 +777,12 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) auto &state = me->state; auto &native_state = get_native_state(state); + if(er.data->exec_type == api::orderman::ExecType::EXEC_TYPE_TRADE_CANCEL || + er.data->exec_type == api::orderman::ExecType::EXEC_TYPE_TRADE_CORRECT) + { + LOG(OrderMan, Info, "ICENativeOrder ignoring Cancel or Correct execution report {} in order {}", er.data->msg_seq_num, key().value()); + return; + } // if we have a previous state we want to ensure this execution // report was not already considered. From 140f1d88ea7679cf7483abd00215105c07683653 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sun, 5 May 2019 16:41:13 -0400 Subject: [PATCH 056/225] ice entitlements --- src/lib/domain_model/Security.proto | 8 ++--- src/lib/md/relay/QueryServer.cpp | 48 ++++++++++++++++++++++------- src/web/ui/src/Users/Types.fs | 8 ++--- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index fa2b9fb0b..3e4996f90 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -56,10 +56,10 @@ enum CMEMics { enum ICEMics{ IF_UNSET = 0; - IFUS = 1; - IFEU = 2; - IFLL = 3; - IFCA = 4; + IFU = 1; + IFE = 2; + IFL = 3; + IFC = 4; IFEN = 5; } diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index d6555847a..ffeb9866e 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -219,8 +219,12 @@ public: } // the hot part - void fill(const SecurityChannel& chan, MDConsumerGroup& group, ChannelReply* reply, bool entitled) const { + void fill(const SecurityChannel& chan, MDConsumerGroup& group, ChannelReply* reply, + const Entitlements* entitlements, bool bypass_entitlement) const { bts_assert(reply); + bool entitled = bypass_entitlement || chan.exchange() == api::VENUE_BTS || + (chan.exchange() == api::VENUE_GLBX && entitlements && entitlements->count(chan.symbol())); + reply->mutable_channel()->CopyFrom(chan); reply->set_platform(group.platform); reply->mutable_channel()->set_time(TimeStamp::now().to_uint64()); @@ -242,9 +246,17 @@ public: bts_assert_d(handle.is_initialized()); if (!handle.is_initialized()) continue; // If the security was just discovered try to ensure all data is sent - if (instrument.discovered > TimeStamp(chan.time())) { - pupd->mutable_security()->CopyFrom(handle.get_normalized_security()); + if (instrument.discovered > TimeStamp(chan.time())) + { + auto security = handle.get_normalized_security(); + pupd->mutable_security()->CopyFrom(security); snapshot = true; + if(!entitled && (chan.exchange() == api::VENUE_ICE || chan.exchange() == api::VENUE_SIMICE)) + { + entitled = entitlements && entitlements->count("ICE:" + security.ice().mic_code()); + if(entitled) + reply->mutable_channel()->set_entitled(entitled); + } } if (entitled) { // If we are entitled now but this is the first request where we are ensure we send all values @@ -357,10 +369,7 @@ public: auto groupiter = _groups.find(UserSymbol(ch.symbol(), ch.exchange(), ch.type())); if (groupiter != _groups.end()) { auto& group = groupiter->second; - bool is_entitled = bypass_entitlement || - ch.exchange() == api::VENUE_BTS || - (entitlements && entitlements->count(ch.symbol())); - fill(ch, *group, reply->add_channels(), is_entitled); + fill(ch, *group, reply->add_channels(), entitlements, bypass_entitlement); } } } @@ -525,10 +534,14 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, MDClient& c { const auto& cme_symb_mics = config::get().cme_mic(); auto entitlements = std::make_shared>(); - for (const auto& row : all_updates) { - if (row && row->enabled()) { - for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++){ - if(api::CMEMics_Name(mic->second) == row->mic()) { + for (const auto& row : all_updates) + { + if (row && row->enabled()) + { + for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++) + { + if(api::CMEMics_Name(mic->second) == row->mic()) + { const auto& symbol = mic->first; auto iter = entitlements->find(row->user_id()); if (iter == entitlements->end()) { @@ -543,6 +556,19 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, MDClient& c } } } + api::ICEMics icemic; + if(api::ICEMics_Parse(row->mic(), &icemic)) //this is an ice mic, just put the mic in the set and resolve later + { + auto iter = entitlements->find(row->user_id()); + if (iter == entitlements->end()) { + Entitlements ents; + ents.insert("ICE:" + row->mic()); + entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); + } + else { + iter->second.insert("ICE:" + row->mic()); + } + } } } container->relay.update_entitlements(entitlements); diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index b879744e3..ae2ad5d9b 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -94,9 +94,9 @@ let CMEMicMap:Map = [ ] |> Map.ofList let ICEMicMap:Map = [ - ("IFCA", bts.api.ICEMics.IFCA); + ("IFCA", bts.api.ICEMics.IFC); ("IFEN", bts.api.ICEMics.IFEN); - ("IFEU", bts.api.ICEMics.IFEU); - ("IFLL", bts.api.ICEMics.IFLL); - ("IFUS", bts.api.ICEMics.IFUS) + ("IFEU", bts.api.ICEMics.IFE); + ("IFLL", bts.api.ICEMics.IFL); + ("IFUS", bts.api.ICEMics.IFU) ] |> Map.ofList From 9fa34641880d8b59d3539dc16ff572a60a02d597 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 14 May 2019 09:55:05 -0400 Subject: [PATCH 057/225] ice busts and corrects, ugh... --- src/lib/orderman/actors/FillStore.cpp | 27 +++++++++++-- .../orderman/actors/ICEExecutionGateway.cpp | 6 ++- .../actors/order_manager/OrderManager.cpp | 39 ++++++++++--------- .../md/platforms/ice_onixs/ICEListener.cpp | 10 +++-- 4 files changed, 55 insertions(+), 27 deletions(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 6a4f0a816..4d1ffee4c 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -91,7 +91,8 @@ void FillStore::on_execution_report( to_str(er.exchange_fill_id)); auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.exec_type == api::orderman::EXEC_TYPE_FILL) { + er.exec_type == api::orderman::EXEC_TYPE_FILL || + er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) { api::orderman::Fill fill; if (!is_known) { @@ -109,6 +110,8 @@ void FillStore::on_execution_report( fill.set_side(er.side); fill.set_last_shares(er.last_shares.value()); fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); + if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) + fill.set_fill_status(api::orderman::Fill::FILL_STATUS_CORRECTED); fill.set_fill_key(fk); struct timeval tv; gettimeofday(&tv, NULL); @@ -131,13 +134,31 @@ void FillStore::on_execution_report( "Discarding known execution report for fill {}", fk); } // if partial_fill or fill - else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) + } + for (auto const &ev : *u.events) + { + auto &er = *ev.data; + auto efi = to_str(er.exchange_fill_id); + if(std::count(efi.begin(), efi.end(), ':') > 0) + { + auto cpos = efi.find_last_of(':'); + efi = efi.substr(0, cpos); + ExchangeFillID temp; + str_to(efi, &temp); + efi = to_str(temp); + } + if(efi == "") + continue; + auto fk = fmt::format("{}:{}", er.order_key.value(), efi); + auto is_known = me->known_fills.count(fk); + + if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) { auto data = me->store->retrieve_one(fills_ns, fk); Fill existing_fill; if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) { - existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); + existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_BUSTED); auto fv = utils::pb::to_string(existing_fill); me->store->update(fills_ns, fk, fv); publish(me->fill_stream, existing_fill, *er.security); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index afc6584d7..d21db6f1f 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -342,7 +342,8 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg // allocate from our pool auto data = me->exe_report_pool.construct(); - data->memo = msg.get(); + if(msg.has()) + data->memo = msg.get(); data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); @@ -406,7 +407,8 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg { auto execid = msg.get(); str_to(execid, &data->exchange_fill_id); - me->exec_id_to_memo[execid] = msg.get(); + if(msg.has()) + me->exec_id_to_memo[execid] = msg.get(); } if (msg.has()) diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index c86d4af1e..1ac6cf319 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -178,25 +178,26 @@ void OrderManager::on_execution_report( auto k = report.data->order_key; auto it = me->orders.find(k); if (it == me->orders.end()) { - LOG(OrderMan, Error, - "Received an execution report for an unknown order with key " - "{}. Order state will be reconstructed from this report but " - "some " - "information will be lost, including CustomerOrFirm,CTI " - "code " - "and " - "parent order id", - k.value()); - auto order = - &me->services_data.order_factory.recreate_from_exe_report( - *report.data); - auto const &def = order->def(); - publish_order_def_update(OrderKey(k), def); - order->init_order_services(me->services_data); - auto r = me->orders.emplace(order->key(), order); - bts_assert(r.second); - order->on_activate(report.data->price, report.data->quantity, - *order->_services); + //TODO Pedro, this crashes somehow + // LOG(OrderMan, Error, + // "Received an execution report for an unknown order with key " + // "{}. Order state will be reconstructed from this report but " + // "some " + // "information will be lost, including CustomerOrFirm,CTI " + // "code " + // "and " + // "parent order id", + // k.value()); + // auto order = + // &me->services_data.order_factory.recreate_from_exe_report( + // *report.data); + // auto const &def = order->def(); + // publish_order_def_update(OrderKey(k), def); + // order->init_order_services(me->services_data); + // auto r = me->orders.emplace(order->key(), order); + // bts_assert(r.second); + // order->on_activate(report.data->price, report.data->quantity, + // *order->_services); } } } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index aef39bf9e..008f4623b 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -136,6 +136,8 @@ void ICEListener::onMarketSnapshot(const onixs_ice::MarketSnapshot& msg, const o auto settle_denominator = data->handle.security().ice_settle_denominator; data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(msg.settlePriceDateTime) ); + LOG(md,Warn, "OnixSICE Got Market Snap : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); + auto deal_denominator = data->handle.security().ice_deal_denominator; data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), datetime::today() ); data->handle.update_session_high( ts, double_of_price(msg.high, deal_denominator) ); @@ -296,12 +298,12 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const if (data != nullptr) { bts_assert(data->id == msg.marketId); + auto ts = utils::TimeStamp::now(); auto price = msg.settlementPrice; auto time = msg.dateTime; auto denominator = data->handle.security().ice_settle_denominator; - auto prx = convert_price(price, denominator); - LOG(md,Warn, "OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(prx.price())); - data->handle.update_settlement(utils::TimeStamp::now(), prx, date_of_timestamp(time)); + LOG(md,Warn, "OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(price)); + data->handle.update_settlement(ts, convert_price(price, denominator), date_of_timestamp(time)); } } @@ -348,6 +350,8 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary auto settle_denominator = data->handle.security().ice_settle_denominator; data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(time) ); + LOG(md,Warn, "OnixSICE Got EOD Market : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); + auto deal_denominator = data->handle.security().ice_deal_denominator; data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), date_of_timestamp(time) ); data->handle.update_session_high( ts, double_of_price(msg.high, deal_denominator) ); From 222e1a51dc4146c6eee7901c723f9e3f5d2e6702 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 14 May 2019 15:50:53 -0400 Subject: [PATCH 058/225] fixed SOD time for dev fixed bugs in mview when settle/last/low/high change without a bid or offer changing --- .../spark/Modules/Market/MarketView/MarketViewRow.cs | 9 +++++---- src/lib/config/defaults/orders_fills_cleanup.conf | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 97c6ea187..50181fa6e 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -170,10 +170,11 @@ namespace mbts.spark { _last_size.on_next_distinct(ps.size, ref dirty); _volume.on_next_distinct(v, ref dirty); } - _settlement.set(md.md.settlement_price); - _session_low.set(md.md.session_low); - _session_high.set(md.md.session_high); - _day_change.set(last_price - settlement); + dirty |= _settlement.set_new(md.md.settlement_price); + dirty |= _session_low.set_new(md.md.session_low); + dirty |= _session_high.set_new(md.md.session_high); + dirty |= _day_change.set_new(last_price - settlement); + _volume.on_next_distinct(md.md.total_volume, ref dirty); if (dirty) invalidated?.Invoke(); diff --git a/src/lib/config/defaults/orders_fills_cleanup.conf b/src/lib/config/defaults/orders_fills_cleanup.conf index 73597ff53..b26e96b6c 100644 --- a/src/lib/config/defaults/orders_fills_cleanup.conf +++ b/src/lib/config/defaults/orders_fills_cleanup.conf @@ -2,4 +2,14 @@ OrdersSoftCleanupCutoff { value { extra_days: 1 } +} + +SODTime +{ + rule: "DeploymentType.type == 'dev'" + value + { + sod_hh: 20 + sod_mm: 30 + } } \ No newline at end of file From 7ce101f7f794a67688f16b930b99458a7c554d26 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 14 May 2019 16:41:49 -0400 Subject: [PATCH 059/225] messed up docker linux pointer --- docker/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux b/docker/linux index ce08a5129..e13bb5d8d 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit ce08a5129f14af0d1bb9fa569d1e721b694964fe +Subproject commit e13bb5d8df14171a9a5abfdb8b6b4ecbc519032a From a4c3a61f130152a6a41ead7eff7bc4bbeec662a8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 14 May 2019 17:55:52 -0400 Subject: [PATCH 060/225] fixed ice specific bug with attach detach --- src/lib/orderman/orders/ICENativeOrder.cpp | 17 +++++++++++------ .../md/platforms/ice_onixs/ICEListener.cpp | 6 +++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 135acf4ca..af8dada57 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -35,7 +35,8 @@ struct ICENativeOrder::PImpl PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), exchange_order_id(), update_clordid_queue(), cancel_clordid_queue() + price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale(), orig_clordid(0), + update_clordid_queue(), cancel_clordid_queue() { exchange_order_id.reserve(100); } @@ -663,10 +664,15 @@ void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_paren auto &native_state = get_native_state(me->state); *native_state.mutable_routing_record() = rq.routing_record; - setup_ids(rq.routing_record.sender_compid()); - init_fix(); - if (has_exchange_order_id()) - add_exchange_order_id_to_fix(); + + // setup_ids(rq.routing_record.sender_compid()); + // init_fix(); + // if (has_exchange_order_id()) + // add_exchange_order_id_to_fix(); + //TODO ICE is a little different with some of these tags, there is no manual order reported and the user is really + //not the user we are updating here. So we can update the BTS data but not reinit the fix + //We should not reinit the fix because we need to correctly cache the orig_clordid for cancels and updates subsequent to + //the first update. // Update user, account and manual order indicator based on new parent me->definition.set_manual_order_indicator(api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO); @@ -1102,7 +1108,6 @@ void ICENativeOrder::init_fix() std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - me->orig_clordid = get_update_clordid(); // initialize create FIX auto &create_encoding = me->create_encoding; diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 008f4623b..50f3b4393 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -136,7 +136,7 @@ void ICEListener::onMarketSnapshot(const onixs_ice::MarketSnapshot& msg, const o auto settle_denominator = data->handle.security().ice_settle_denominator; data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(msg.settlePriceDateTime) ); - LOG(md,Warn, "OnixSICE Got Market Snap : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); + LOG(md,Diag,"OnixSICE Got Market Snap : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); auto deal_denominator = data->handle.security().ice_deal_denominator; data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), datetime::today() ); @@ -302,7 +302,7 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const auto price = msg.settlementPrice; auto time = msg.dateTime; auto denominator = data->handle.security().ice_settle_denominator; - LOG(md,Warn, "OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(price)); + LOG(md,Diag,"OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(price)); data->handle.update_settlement(ts, convert_price(price, denominator), date_of_timestamp(time)); } } @@ -350,7 +350,7 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary auto settle_denominator = data->handle.security().ice_settle_denominator; data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(time) ); - LOG(md,Warn, "OnixSICE Got EOD Market : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); + LOG(md,Warn,"OnixSICE Got EOD Market : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); auto deal_denominator = data->handle.security().ice_deal_denominator; data->handle.update_opening( ts, double_of_price(msg.openingPrice, deal_denominator), date_of_timestamp(time) ); From b5468e5565383dab4fcb794e43f19e912ff092d6 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 16 May 2019 15:02:04 -0400 Subject: [PATCH 061/225] changes for ice certification perf testing and to recover an order from an exec report --- .../ConnectivityConfiguration.PerfTest.xml | 6 +- .../api/service_helpers/AdminServiceUtils.cpp | 67 +++- .../api/service_helpers/AdminServiceUtils.h | 6 + src/lib/config/defaults/MarketData.conf | 25 +- src/lib/config/defaults/jetfix.conf | 312 +++++++++++++++++- .../orderman/actors/ICEExecutionGateway.cpp | 2 + .../actors/order_manager/OrderManager.cpp | 39 ++- .../orderman/orderman_utils/ExecutionReport.h | 1 + src/lib/orderman/orders/ICENativeOrder.cpp | 31 +- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 37 ++- 10 files changed, 461 insertions(+), 65 deletions(-) diff --git a/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml b/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml index 23680779e..94edae6c4 100644 --- a/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml +++ b/src/data_files/files/onixs_ice/ConnectivityConfiguration.PerfTest.xml @@ -17,10 +17,10 @@ 63.247.113.214 3000 - Value from ICE Support - Value from ICE Support + bt_ps + Starts123 N - Legacy + New diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 0fbdde042..e131f8f2d 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -321,6 +321,13 @@ std::string AdminServiceUtils::find_account_exchange_account (const bts::api::ad rv = cme_account_data->clearing_account(); break; } + case api::Venue::VENUE_ICE: + { + auto ice_account_data = get_account_ice_data(account, data); + if (ice_account_data != nullptr) + rv = ice_account_data->clearing_account(); + break; + } case api::Venue::VENUE_SIM: case api::Venue::VENUE_SIMICE: { @@ -332,8 +339,7 @@ std::string AdminServiceUtils::find_account_exchange_account (const bts::api::ad case api::Venue::VENUE_UNSET: case api::Venue::VENUE_BTS: case api::Venue::VENUE_CBOE: - case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: + case api::Venue::VENUE_CBOECFE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: out_result.set_is_success(false); out_result.set_error_text("Exchange not supported"); @@ -899,6 +905,13 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm rv = cme_user_data->operator_id(); break; } + case api::Venue::VENUE_ICE: + { + auto ice_user_data = get_user_ice_data(user, data); + if (ice_user_data != nullptr) + rv = ice_user_data->operator_id(); + break; + } case api::Venue::VENUE_SIM: case api::Venue::VENUE_SIMICE: { @@ -911,8 +924,7 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm case api::Venue::VENUE_UNSET: case api::Venue::VENUE_BTS: case api::Venue::VENUE_CBOE: - case api::Venue::VENUE_CBOECFE: - case api::Venue::VENUE_ICE: + case api::Venue::VENUE_CBOECFE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: out_result.set_is_success(false); out_result.set_error_text("Exchange not supported"); @@ -920,6 +932,38 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm } return rv; } + +std::string AdminServiceUtils::find_user_company_id (const bts::api::admin::AdminData& data, + const bts::api::admin::BTSUser& user, + api::Venue exchange, + bts::api::admin::AdminServiceOperationResult& out_result) +{ + out_result.set_is_success(true); + std::string rv = ""; + switch(exchange) + { + case api::Venue::VENUE_ICE: + { + auto ice_user_data = get_user_ice_data(user, data); + if (ice_user_data != nullptr) + rv = std::to_string(ice_user_data->company_id()); + break; + } + case api::Venue::VENUE_SIM: + case api::Venue::VENUE_SIMICE: + case api::Venue::VENUE_GLBX: + case api::Venue::VENUE_UNSET: + case api::Venue::VENUE_BTS: + case api::Venue::VENUE_CBOE: + case api::Venue::VENUE_CBOECFE: + case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: + case api::Venue::Venue_INT_MAX_SENTINEL_DO_NOT_USE_: + out_result.set_is_success(false); out_result.set_error_text("Exchange not supported"); + break; + } + return rv; +} + std::pair AdminServiceUtils::find_user_account_matches (const bts::api::admin::AdminData& admin_data, const std::string& connection, const std::string& exchange_account, @@ -930,14 +974,17 @@ AdminServiceUtils::find_user_account_matches (const bts::api::admin::AdminData& auto user_ptrs = users(admin_data, false); for(const bts::api::admin::BTSAccount* account_ptr : account_ptrs){ if (account_has_connection(*account_ptr, connection)){ - if (boost::algorithm::iequals(exchange_account, - find_account_exchange_account(admin_data,*account_ptr,exchange,find_account_result)) && - find_account_result.is_success()){ - for(const bts::api::admin::BTSUser* user_ptr : user_ptrs){ - if (boost::algorithm::iequals(exchange_user, - find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result)) && + if (boost::algorithm::iequals(exchange_account, find_account_exchange_account(admin_data,*account_ptr,exchange,find_account_result)) && + find_account_result.is_success()) + { + for(const bts::api::admin::BTSUser* user_ptr : user_ptrs) + { + if (boost::algorithm::iequals(exchange_user,find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result)) && find_user_result.is_success()) return std::pair(account_ptr,user_ptr); + if (boost::algorithm::iequals(exchange_user,find_user_company_id(admin_data,*user_ptr,exchange,find_user_result)) && + find_user_result.is_success()) + return std::pair(account_ptr,user_ptr); } } } diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index a1ccfbee5..5821a735e 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -209,6 +209,12 @@ public: const BTSUser& user, api::Venue exchange, AdminServiceOperationResult& out_result); + static std::string find_user_company_id ( + const AdminData& data, + const BTSUser& user, + api::Venue exchange, + AdminServiceOperationResult& out_result); + static std::pair find_user_account_matches (const AdminData& admin_data, const std::string& connection, diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 516378ead..8236f3020 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -59,23 +59,23 @@ ICEOptions { uds_market_type: 5 market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures uds_market_type: 9 - market_type: 13 #ICE Heating Oil Futures - uds_market_type: 13 - market_type: 15 #ICE NYH (RBOB) Gasoline Futures - uds_market_type: 15 - market_type: 21 #ICE Futures US Agricultures, Coffee C - uds_market_type: 21 - market_type: 23 #ICE Futures US Agricultures, FCOJ A - uds_market_type: 23 + ##market_type: 13 #ICE Heating Oil Futures + ##uds_market_type: 13 + ##market_type: 15 #ICE NYH (RBOB) Gasoline Futures + ##uds_market_type: 15 + ##market_type: 21 #ICE Futures US Agricultures, Coffee C + ##uds_market_type: 21 + ##market_type: 23 #ICE Futures US Agricultures, FCOJ A + ##uds_market_type: 23 market_type: 26 #ICE Futures US Financials DX uds_market_type: 26 uds_market_type: 11 #ICE WTI-Brent spreads - uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack - uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack - uds_market_type: 58 #ICE Futures UI Heating Oil / Brent - uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack + ##uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack + ##uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack + ##uds_market_type: 58 #ICE Futures UI Heating Oil / Brent + ##uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack # market_type: 44 #ICE Henry Hub # uds_market_type: 44 @@ -90,6 +90,7 @@ ICEOptions { # market_type: 26 #ICE Futures US Agricultures, FCOJ A # } ice_config_file: "ConnectivityConfiguration.APITest.xml" + #ice_config_file: "ConnectivityConfiguration.PerfTest.xml" } } diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 0e67d8f7a..fe5a654b3 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -49,8 +49,7 @@ JetFIX { socket_connect_host_ip: "63.247.113.154" socket_connect_port: 80 sender_compid: "51251" - target_compid: "ICE" - + target_compid: "ICE" start_time: "22:55:00" end_time: "22:05:00" sender_subid: "BTS" @@ -58,7 +57,316 @@ JetFIX { raw_data: "Starts123" max_order_msgs_per_window: 300 auto_fix_seq_num: true + + seconds_to_replay: 6000 } + connection: @JetFIXSimConnection.sim + # connection { + # name: "cme_mc1_99" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.199" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "99" + # cme_market_segment_id: 99 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_58" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.172" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "58" + # cme_market_segment_id: 58 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_54" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.191" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "54" + # cme_market_segment_id: 54 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_82" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.179" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "82" + # cme_market_segment_id: 82 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_56" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.174" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "56" + # cme_market_segment_id: 56 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_50" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.202" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "50" + # cme_market_segment_id: 50 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_52" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.181" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "52" + # cme_market_segment_id: 52 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_60" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.195" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "60" + # cme_market_segment_id: 60 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_76" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.204" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "76" + # cme_market_segment_id: 76 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_88" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.169" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "88" + # cme_market_segment_id: 88 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_74" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.197" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "74" + # cme_market_segment_id: 74 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_64" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.177" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "64" + # cme_market_segment_id: 64 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_72" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.189" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "72" + # cme_market_segment_id: 72 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_70" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.183" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "70" + # cme_market_segment_id: 70 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_68" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.168" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "68" + # cme_market_segment_id: 68 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_80" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.187" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "80" + # cme_market_segment_id: 80 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_84" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.198" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "84" + # cme_market_segment_id: 84 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc1_78" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.167" + # socket_connect_port: 61921 + # sender_compid: "MC1004N" + # target_compid: "CME" + # target_subid: "78" + # cme_market_segment_id: 78 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } } } diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index d21db6f1f..deb749301 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -352,6 +352,8 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg str_to(msg.get(), &data->account_name); if (msg.has()) str_to(msg.get(), &data->operator_id); + if (msg.has()) + data->ice_company_id = msg.get(); data->order_key = ok; data->security = sec; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 1ac6cf319..c86d4af1e 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -178,26 +178,25 @@ void OrderManager::on_execution_report( auto k = report.data->order_key; auto it = me->orders.find(k); if (it == me->orders.end()) { - //TODO Pedro, this crashes somehow - // LOG(OrderMan, Error, - // "Received an execution report for an unknown order with key " - // "{}. Order state will be reconstructed from this report but " - // "some " - // "information will be lost, including CustomerOrFirm,CTI " - // "code " - // "and " - // "parent order id", - // k.value()); - // auto order = - // &me->services_data.order_factory.recreate_from_exe_report( - // *report.data); - // auto const &def = order->def(); - // publish_order_def_update(OrderKey(k), def); - // order->init_order_services(me->services_data); - // auto r = me->orders.emplace(order->key(), order); - // bts_assert(r.second); - // order->on_activate(report.data->price, report.data->quantity, - // *order->_services); + LOG(OrderMan, Error, + "Received an execution report for an unknown order with key " + "{}. Order state will be reconstructed from this report but " + "some " + "information will be lost, including CustomerOrFirm,CTI " + "code " + "and " + "parent order id", + k.value()); + auto order = + &me->services_data.order_factory.recreate_from_exe_report( + *report.data); + auto const &def = order->def(); + publish_order_def_update(OrderKey(k), def); + order->init_order_services(me->services_data); + auto r = me->orders.emplace(order->key(), order); + bts_assert(r.second); + order->on_activate(report.data->price, report.data->quantity, + *order->_services); } } } diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 1fa1c0b55..0d7f6f808 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -36,6 +36,7 @@ public: std::string msg; api::Venue exchange; int64_t ice_cl_ord_id; + int32_t ice_company_id; std::string memo; }; diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index af8dada57..e19826954 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -227,7 +227,7 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi def.set_side(er.side); auto sec = os.sec_db.resolve(SecurityKey(def.security_key())); - auto rev_rec = os.order_router.get_reverse_routing_record(er.cfg->name(), to_trim_str(er.operator_id), + auto rev_rec = os.order_router.get_reverse_routing_record(er.cfg->name(), std::to_string(er.ice_company_id), to_trim_str(er.account_name), sec); if (rev_rec.ok) @@ -270,7 +270,7 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi break; case NATIVE_ORDER_TYPE_LIMIT: def.mutable_custom_def()->mutable_limit(); - state.mutable_market(); + state.mutable_limit(); break; case NATIVE_ORDER_TYPE_STOP: { @@ -299,13 +299,28 @@ ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActi native_state.set_last_msg_seq_num(er.msg_seq_num); native_state.set_native_type(er.order_type); + auto &rr = *native_state.mutable_routing_record(); - rr.set_session(er.cfg->name()); - rr.set_account(to_trim_str(er.account_name)); - rr.set_operator_id(to_trim_str(er.operator_id)); - rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); - rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); - rr.set_location(er.cfg->sender_locationid()); + bool real_routing = false; + if (rev_rec.ok && sec) + { + const auto& real_rr = os.order_router.get_routing_record(rev_rec.user_id, rev_rec.account_id, *sec); + if(real_rr.has_route) + { + rr.CopyFrom(real_rr.routing_record); + real_routing = true; + } + } + if(!real_routing) + { + rr.set_sender_compid(er.cfg->sender_compid()); + rr.set_session(er.cfg->name()); + rr.set_account(to_trim_str(er.account_name)); + rr.set_operator_id(to_trim_str(er.operator_id)); + rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); + rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); + rr.set_location(er.cfg->sender_locationid()); + } init_recovered_common(orecord, os); return orecord.def(); } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index 9956b381c..035e05352 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -137,7 +137,16 @@ void ICEMain::start(std::vector& symbols) LOG(md,Info, "ICE: Init Handler {}", pair.first.to_string()); sleep_for(16s); onixs_ice::MarketSubscriptions subs = market_subcription_for_channel(pair.first); - pair.second->start(subs); + try + { + pair.second->start(subs); + } + catch (std::exception& e) + { + LOG(md,Error,"handler->start ONIXSERROR {}", std::string(e.what())); + throw; + } + } LOG(md,Info, "** ICE Publisher started **"); } @@ -219,8 +228,9 @@ unique_ptr ICEMain::prepare_handler(const ICEChannel& channe auto handler = unique_ptr(new onixs_ice::Handler(settings)); return handler; } - catch (std::exception& e) { - LOG(md,Error,"ONIXSERROR{}", std::string(e.what())); + catch (std::exception& e) + { + LOG(md,Error,"handler create ONIXSERROR {}", std::string(e.what())); throw; } } @@ -240,13 +250,20 @@ unique_ptr ICEMain::prepare_listener(onixs_ice::Handler& handler, c for (auto& symbol : channel.symbols) listener->add_filter_symbol(symbol.symbol()); - handler.registerExchangeListener(listener.get()); - handler.registerFeedListener(listener.get()); - handler.registerOrderBookUpdateListener(listener.get()); - handler.registerErrorListener(listener.get()); - handler.registerWarningListener(listener.get()); - handler.registerHandlerStateChangeListener(listener.get()); - + try + { + handler.registerExchangeListener(listener.get()); + handler.registerFeedListener(listener.get()); + handler.registerOrderBookUpdateListener(listener.get()); + handler.registerErrorListener(listener.get()); + handler.registerWarningListener(listener.get()); + handler.registerHandlerStateChangeListener(listener.get()); + } + catch (std::exception& e) + { + LOG(md,Error,"handler register ONIXSERROR {}", std::string(e.what())); + throw; + } return listener; } From 15d9afb2de45fd9a327630129629b27745093423 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 16 May 2019 15:26:21 -0400 Subject: [PATCH 062/225] added a comment about ice reverse_routing_record --- src/lib/api/service_helpers/AdminServiceUtils.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index e131f8f2d..5c627bd79 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -982,6 +982,11 @@ AdminServiceUtils::find_user_account_matches (const bts::api::admin::AdminData& if (boost::algorithm::iequals(exchange_user,find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result)) && find_user_result.is_success()) return std::pair(account_ptr,user_ptr); + + //This code eventually gets called by get_reverse_routing_record(...) + //At the ice, they send back the login level tag50 in exec reports which doesn't match any user level tag50s in the exchange_user + //so instead we look for the CompanyID (or client_id, tag 109) field here. If this field matches we have a good bet that + //the user we find is enough to fulfill the routing record enough to cancel or modify orphaned orders, etc if (boost::algorithm::iequals(exchange_user,find_user_company_id(admin_data,*user_ptr,exchange,find_user_result)) && find_user_result.is_success()) return std::pair(account_ptr,user_ptr); From 618c41ce976c0eb61dcbe6308babbd5ecb5c0074 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 7 Jun 2019 17:49:33 -0400 Subject: [PATCH 063/225] synthesized Pedro's cme changes for ice --- src/lib/jetfix/codec/MessageDefinitions.h | 1 + .../orderman/actors/ICEExecutionGateway.cpp | 25 +++- src/lib/orderman/actors/ICEExecutionGateway.h | 3 +- src/lib/orderman/actors/IExecutionGateway.cpp | 6 +- src/lib/orderman/actors/IExecutionGateway.h | 3 +- src/lib/orderman/orders/ICENativeOrder.cpp | 129 +++++++++--------- src/lib/orderman/orders/ICENativeOrder.h | 1 + 7 files changed, 95 insertions(+), 73 deletions(-) diff --git a/src/lib/jetfix/codec/MessageDefinitions.h b/src/lib/jetfix/codec/MessageDefinitions.h index 61976f274..fe849c027 100644 --- a/src/lib/jetfix/codec/MessageDefinitions.h +++ b/src/lib/jetfix/codec/MessageDefinitions.h @@ -90,6 +90,7 @@ typedef FIXMsg nusers; TimeStamp connection_time; std::unordered_map exec_id_to_memo; //for the bullshit adjusts + md::SecurityOracle sec_oracle; }; -ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log) - : IExecutionGateway(), me(new PImpl(cfg, log)) +ICEExecutionGateway::ICEExecutionGateway(const config::JetFIX::Connection &cfg, trace::PerfLog &log, md::SecurityOracle o) + : IExecutionGateway(), me(new PImpl(cfg, log, o)) { me->state = State::WAITING_FOR_ADMIN; } @@ -304,8 +307,13 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg auto scoped_log = trace::log_scope(me->perf_log, msg.trace(), "ICEExecutionGateway::on_exe_report", ok.value()); LOG(Latency, Info, "Started handling of execution report for order {}", ok.value()); - auto sec = me->securities[sk.value()]; - + auto &sec = me->securities[sk.value()]; + if (!sec) + { + sec = me->sec_oracle.get_security(SecurityKey(sk.value())); + if(sec->has_ice()) + me->securities_by_exchange_id[sec->ice().exchange_id()] = sec; + } if (!sec) LOG(OrderMan, Error, "Received execution report for an unknown security {}. Will not be able to process this report. This is likely a bug that could lead " @@ -387,6 +395,11 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg data->stop_price = securities::decode_exchange_price(*sec, Price(msg.get())); else data->stop_price = Price(os::nan()); + + if (msg.has()) + data->max_show = Quantity(msg.get()); + else + data->max_show = Quantity(0); if (msg.has()) data->quantity = Quantity(msg.get()); diff --git a/src/lib/orderman/actors/ICEExecutionGateway.h b/src/lib/orderman/actors/ICEExecutionGateway.h index 8c453ab71..c885a90af 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.h +++ b/src/lib/orderman/actors/ICEExecutionGateway.h @@ -8,7 +8,8 @@ namespace orderman { // fix execution gateway for a single FIX session class ICEExecutionGateway : public IExecutionGateway { public: - ICEExecutionGateway(const config::JetFIX::Connection&, trace::PerfLog &); + ICEExecutionGateway(const config::JetFIX::Connection&, trace::PerfLog &, + md::SecurityOracle); virtual ~ICEExecutionGateway(); void start() override; diff --git a/src/lib/orderman/actors/IExecutionGateway.cpp b/src/lib/orderman/actors/IExecutionGateway.cpp index 7bfe8efec..ebe2a9e2b 100644 --- a/src/lib/orderman/actors/IExecutionGateway.cpp +++ b/src/lib/orderman/actors/IExecutionGateway.cpp @@ -7,13 +7,13 @@ namespace bts { namespace orderman { std::unique_ptr -ExecutionGatewayFactory::create_gateway(const config::JetFIX::Connection& conn, trace::PerfLog& pl) +ExecutionGatewayFactory::create_gateway(const config::JetFIX::Connection& conn, trace::PerfLog& pl, md::SecurityOracle o) { if(conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) - return std::make_unique(conn, pl); + return std::make_unique(conn, pl, o); else - return std::make_unique(conn, pl); + return std::make_unique(conn, pl, o); } } // namespace orderman diff --git a/src/lib/orderman/actors/IExecutionGateway.h b/src/lib/orderman/actors/IExecutionGateway.h index 4d486b964..14eff752d 100644 --- a/src/lib/orderman/actors/IExecutionGateway.h +++ b/src/lib/orderman/actors/IExecutionGateway.h @@ -3,6 +3,7 @@ #include "lib/config/protos/jetfix.pb.h" #include "lib/jetfix/codec/MessageDefinitions.h" #include "lib/jetfix/common/OutFIXPtr.h" +#include "lib/md/SecurityOracle.h" #include "lib/mercury/events/Update.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_no_copy.h" @@ -43,7 +44,7 @@ private: class ExecutionGatewayFactory { public: - static std::unique_ptr create_gateway(const config::JetFIX::Connection&, trace::PerfLog&); + static std::unique_ptr create_gateway(const config::JetFIX::Connection&, trace::PerfLog&, md::SecurityOracle); }; diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index e19826954..fcbe1dc26 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -58,6 +58,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; jetfix::FIXFragment::Bookmark update_quantity_bm; + jetfix::FIXFragment::Bookmark update_stop_px_bm; jetfix::FIXFragment::Bookmark update_transact_time_bm; jetfix::FIXFragment::Bookmark update_clordid_bm; jetfix::FIXFragment::Bookmark update_orig_clordid_bm; @@ -89,6 +90,14 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation { // order was just created. me->definition = def; + me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); + if (!me->sec) + { + auto msg = fmt::format("Unknown security: {}", def.security_key()); + me->state.set_last_msg(msg); + transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + return; + } switch (def.custom_def().custom_case()) { case CustomOrderDefinition::kMarket: @@ -108,32 +117,21 @@ void ICENativeOrder::on_init_new(const OrderDefinition& def, const PreActivation break; } - me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); - - if (!me->sec) + auto rq = serv.order_router.get_routing_record( UserID(def.user_id()), AccountID(def.account_id()), *me->sec ); + if (!rq.has_route) { - auto msg = fmt::format("Unknown security: {}", def.security_key()); + auto msg = fmt::format("Could not route order: {}", rq.error_msg); + LOG(OrderMan, Error, "{}", msg); me->state.set_last_msg(msg); transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); + return; } - else - { - auto rq = serv.order_router.get_routing_record(UserID(def.user_id()), AccountID(def.account_id()), *me->sec); - if (rq.has_route) - { - transition(ORDER_STATUS_INACTIVE); - auto &native_state = get_native_state(me->state); - *native_state.mutable_routing_record() = rq.routing_record; - setup_ids(rq.routing_record.sender_compid()); - init_fix(); - } - else - { - auto msg = fmt::format("Could not route order: {}", rq.error_msg); - LOG(OrderMan, Error, "{}", msg); - transition(ORDER_STATUS_REJECTED_BY_SPARK, msg); - } - } + + transition(ORDER_STATUS_INACTIVE); + auto &native_state = get_native_state(me->state); + *native_state.mutable_routing_record() = rq.routing_record; + setup_ids(rq.routing_record.sender_compid()); + init_fix(); } void ICENativeOrder::init_recovered_common(const api::orderman::OrderRecord& rec, const PreActivationOrderServices& serv) @@ -376,7 +374,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve // can we trade? auto lqr = me->services->limiter().can_trade( UserID(me->definition.user_id()), AccountID(me->definition.account_id()) ); - if (!lqr.ok) + if (!lqr.ok()) { LOG(OrderMan, reject_level, "Unauthorized order attempted. User: {} on " @@ -392,7 +390,7 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve // can we trade this security, with this size? lqr = me->services->limiter().can_send_new_order( AccountID(me->definition.account_id()), *me->sec, me->definition.side(), q ); - if (!lqr.ok) + if (!lqr.ok()) { LOG(OrderMan, reject_level, "New order would breach limit. User: {} Account: " @@ -474,6 +472,7 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, bts::orderman::Or // Early return so we skip the expensive report_state() // call. It is OK to spkip it because we are bound to report // our state once the excange aknowledges the order. + update_working_position(); return OrderOpResult{}; } @@ -540,6 +539,16 @@ OrderOpResult ICENativeOrder::on_activate(Price p, Quantity q, bts::orderman::Or OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) { + api::orderman::Update update; + update.set_price(p.value()); + update.set_quantity(q.value()); + return on_update(update); +} + +OrderOpResult ICENativeOrder::on_update(api::orderman::Update const &update) +{ + auto p = Price(update.price()); + auto q = Quantity(update.quantity()); auto scoped_log = me->services->log_scope("ICENativeOrder::on_update", key().value()); auto result = OrderOpResult{}; @@ -560,24 +569,13 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) Quantity(current_working_qty)); // are we under the position limits? - if (!lqr.ok) + if (!lqr.ok()) { auto msg = fmt::format("Cannot update order due to limit breach: {}", lqr.error_msg); LOG(OrderMan, Error, "Order update failed due to limit breach. Order: {} Msg: {}", key().value(), lqr.error_msg); - - // if we are not being driven by an algo we just signal the - // error but keep running. otherwise we stop. - if (parent_key() == null_order_key()) - transition(me->state.status(), msg); - else - { - me->state.set_last_msg(msg); - on_cancel(); - } - result.error = api::orderman::ORDER_ERROR_LIMIT_BREACH; - result.error_msg = lqr.error_msg; + ignore_or_cancel(msg, ORDER_ERROR_LIMIT_BREACH, &result); break; } @@ -586,23 +584,24 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) { LOG(OrderMan, Warn, "Cannot update order {} because of messaging limits. ", key().value()); auto msg = "Messaging threshold breached"; - - // if we are not being driven by an algo we just signal the - // error but keep running. otherwise we stop. - if (parent_key() == null_order_key()) - transition(me->state.status(), msg); - else - { - me->state.set_last_msg(msg); - on_cancel(); - } - result.error = api::orderman::ORDER_ERROR_MESSAGING_LIMIT_BREACH; - result.error_msg = msg; + ignore_or_cancel(msg, ORDER_ERROR_MESSAGING_LIMIT_BREACH, &result); break; } - // all good auto &encoding = me->update_encoding; + + if (update.has_custom()) + { + bts_assert(update.custom().custom_case() == me->definition.custom_def().custom_case()); + if (update.custom().custom_case() == CustomOrderDefinition::kStopLimit) + { + auto const &stop_limit = update.custom().stop_limit(); + auto stop_px = Price(stop_limit.stop_price()); + me->update_stop_px_bm = encoding.overwrite(me->update_stop_px_bm, + securities::encode_exchange_price(*me->sec, stop_px).value(), + me->price_encoding_precision, price_sz()); + } + } me->update_price_bm = encoding.overwrite(me->update_price_bm, securities::encode_exchange_price(*me->sec, p).value(), me->price_encoding_precision, price_sz()); me->update_quantity_bm = encoding.overwrite(me->update_quantity_bm, q.value(), quantity_sz()); @@ -647,11 +646,6 @@ OrderOpResult ICENativeOrder::on_update(Price p, Quantity q) return result; } -OrderOpResult ICENativeOrder::on_update(api::orderman::Update const &update) -{ - return on_update(Price(update.price()),Quantity(update.quantity())); -} - OrderOpResult ICENativeOrder::on_detach() { return OrderOpResult{}; } void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_parent) @@ -684,7 +678,7 @@ void ICENativeOrder::on_attached(api::orderman::OrderDefinition const &new_paren // init_fix(); // if (has_exchange_order_id()) // add_exchange_order_id_to_fix(); - //TODO ICE is a little different with some of these tags, there is no manual order reported and the user is really + //ICE is a little different with some of these tags, there is no manual order reported and the user is really //not the user we are updating here. So we can update the BTS data but not reinit the fix //We should not reinit the fix because we need to correctly cache the orig_clordid for cancels and updates subsequent to //the first update. @@ -983,8 +977,7 @@ void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) LOG(OrderMan, Warn, "Applying buffered update ({}@{}) to order {}, on " "re-connection", - q.value(),p.value(), - key().value()); + q.value(),p.value(), key().value()); on_update(p, q); } } @@ -1033,12 +1026,12 @@ void ICENativeOrder::update_working_position() if (current_position.value() > previous_position.value()) { me->services->limiter().add( *me->sec, AccountID(me->definition.account_id()), - me->definition.side(), Quantity(current_position.value() - previous_position.value())); + me->definition.side(), Quantity(current_position.value() - previous_position.value()), true); } else if (previous_position.value() > current_position.value()) { me->services->limiter().remove( *me->sec, AccountID(me->definition.account_id()), - me->definition.side(), Quantity(previous_position.value() - current_position.value())); + me->definition.side(), Quantity(previous_position.value() - current_position.value()), true); } } else @@ -1227,7 +1220,6 @@ void ICENativeOrder::init_fix() auto stop_px = def.custom_def().stop().stop_price(); auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); - update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); break; } @@ -1242,7 +1234,7 @@ void ICENativeOrder::init_fix() auto stop_px = def.custom_def().stop_limit().stop_price(); auto encoded_stop_px = securities::encode_exchange_price(*me->sec, Price(stop_px)).value(); create_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); - update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); + me->update_stop_px_bm = update_encoding.add(encoded_stop_px, me->price_encoding_precision, -1); // price me->create_price_bm = create_encoding.add(0, me->price_encoding_precision, price_sz()); @@ -1373,5 +1365,18 @@ api::orderman::NativeOrderState& ICENativeOrder::get_native_state(api::orderman: bts_assert(false); return *st.mutable_stop_limit()->mutable_native_state(); } + +void ICENativeOrder::ignore_or_cancel(std::string const &msg, api::orderman::OrderError error, OrderOpResult *out) +{ + if (parent_key() == null_order_key()) + transition(me->state.status(), msg); + else + { + me->state.set_last_msg(msg); + on_cancel(); + } + *out = {error, msg}; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index 060b18527..cc62f47ef 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -32,6 +32,7 @@ class ICENativeOrder : public NativeOrder { api::orderman::OrderDefinition on_init_from_exe_report(const ExecutionReport &, const PreActivationOrderServices &) override; + void ignore_or_cancel(const std::string&, api::orderman::OrderError, OrderOpResult* out); protected: void warm_up_activate(OrderServicesData &, OrderServices &) override; From 38575039b9a32c919bbef4f68f633641970568d9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 27 Jun 2019 14:11:23 -0400 Subject: [PATCH 064/225] Fixed clang build. --- src/lib/orderman/orders/GLBXNativeOrder.h | 2 +- src/lib/orderman/orders/ICENativeOrder.h | 2 +- src/server/sparkd/md/platforms/ice_onixs/ICEListener.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/orders/GLBXNativeOrder.h b/src/lib/orderman/orders/GLBXNativeOrder.h index ec8243e44..17490d8db 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.h +++ b/src/lib/orderman/orders/GLBXNativeOrder.h @@ -17,7 +17,7 @@ class GLBXNativeOrder : public NativeOrder { GLBXNativeOrder(); ~GLBXNativeOrder() override; - api::orderman::OrderDefinition const &definition() const; + api::orderman::OrderDefinition const &definition() const override; void on_init_new(api::orderman::OrderDefinition const &, const PreActivationOrderServices &) override; void on_init_recovered(api::orderman::OrderRecord const &, diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index cc62f47ef..bed96c463 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -17,7 +17,7 @@ class ICENativeOrder : public NativeOrder { ICENativeOrder(); ~ICENativeOrder() override; - const api::orderman::OrderDefinition& definition() const; + const api::orderman::OrderDefinition& definition() const override; void on_init_new(const api::orderman::OrderDefinition&, const PreActivationOrderServices&) override; void on_init_recovered(const api::orderman::OrderRecord&, diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index 1bc6a9338..e4f4d1083 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -85,7 +85,7 @@ public: void onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msgInfo) override; void onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msgInfo) override; void onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msgInfo) override; - void onMarketStatistics(const onixs_ice::MarketStatistics& msg, const onixs_ice::MessageInfo& msgInfo); + void onMarketStatistics(const onixs_ice::MarketStatistics& msg, const onixs_ice::MessageInfo& msgInfo) override; // Feed void onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msgInfo) override; From 75c54bbe3e23c087b2807aa57475322567877a09 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 27 Jun 2019 14:11:40 -0400 Subject: [PATCH 065/225] Refactored order factory. --- src/lib/orderman/order_factory/OrderFactory.cpp | 4 ++-- src/lib/orderman/order_factory/OrderFactory.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 11fd1808f..a3b425f4e 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -119,7 +119,7 @@ NativeOrder* OrderFactory::make_order(const api::Venue exchange) return new GLBXNativeOrder(); } -NativeOrder* OrderFactory::make_order(const api::orderman::OrderDefinition& def) +NativeOrder* OrderFactory::make_native_order(const api::orderman::OrderDefinition& def) { auto secptr = me->sec_db.resolve( SecurityKey(def.security_key()) ); bts_assert_msg(secptr, "can't resolve security_id in order factory"); @@ -165,7 +165,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kStop: case CustomOrderDefinition::kStopLimit: case CustomOrderDefinition::kGlbxIceberg: - order_ptr.reset(make_order(def)); + order_ptr.reset(make_native_order(def)); break; case CustomOrderDefinition::kIceberg: order_ptr.reset( diff --git a/src/lib/orderman/order_factory/OrderFactory.h b/src/lib/orderman/order_factory/OrderFactory.h index 5cb9152aa..2f4fbbdcc 100644 --- a/src/lib/orderman/order_factory/OrderFactory.h +++ b/src/lib/orderman/order_factory/OrderFactory.h @@ -47,7 +47,7 @@ class OrderFactory : public IOrderFactory { Order &allocate(OrderKey k, OrderKey pk, api::orderman::OrderDefinition const &); NativeOrder* make_order(const api::Venue exchange); - NativeOrder* make_order(const api::orderman::OrderDefinition& def); + NativeOrder* make_native_order(const api::orderman::OrderDefinition& def); struct PImpl; std::unique_ptr me; From 32fbdf8a21158812d4355ca2dfe513b8f3d07bb6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 27 Jun 2019 14:15:40 -0400 Subject: [PATCH 066/225] Better handling of unresolved securities. --- src/lib/orderman/order_factory/OrderFactory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index a3b425f4e..0e1192efe 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -122,8 +122,10 @@ NativeOrder* OrderFactory::make_order(const api::Venue exchange) NativeOrder* OrderFactory::make_native_order(const api::orderman::OrderDefinition& def) { auto secptr = me->sec_db.resolve( SecurityKey(def.security_key()) ); - bts_assert_msg(secptr, "can't resolve security_id in order factory"); - return make_order(secptr->exchange()); + if (secptr == nullptr) + return new GLBXNativeOrder(); // GLBX Native can handle unresolved securities + else + return make_order(secptr->exchange()); } Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { From a73a1cc4f53ba64fb4a83b9f5c312f1e25d649f1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 27 Jun 2019 14:16:05 -0400 Subject: [PATCH 067/225] CMakeDeps updates. --- src/lib/CMakeDeps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index b05780e88..9e5c32ed1 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/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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.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/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.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 From a60a792dfa351ba44a71c51b3063adc3148569fc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 27 Jun 2019 14:16:36 -0400 Subject: [PATCH 068/225] Ran clang-format. --- .../orderman/order_factory/OrderFactory.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 0e1192efe..611a71c24 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -9,6 +9,7 @@ // order types #include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/orderman/orders/CompositeOrder.h" #include "lib/orderman/orders/DynamicOrder.h" #include "lib/orderman/orders/GLBXNativeOrder.h" #include "lib/orderman/orders/ICENativeOrder.h" @@ -16,16 +17,15 @@ #include "lib/orderman/orders/TriggerOrder.h" #include "lib/orderman/orders/algo/AlgoWrapperOrder.h" #include "lib/orderman/orders/algo/algo_orders/CoverAlgo.h" -#include "lib/orderman/orders/algo/algo_orders/JoinAlgo.h" -#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/JoinAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/TopAlgo.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" #include "lib/orderman/orders/queue_holder/QueueHolderOrder.h" +#include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" #include #include @@ -111,19 +111,20 @@ Order &OrderFactory::recover(api::orderman::OrderRecord const &rec) { return order; } -NativeOrder* OrderFactory::make_order(const api::Venue exchange) -{ - if(exchange == api::Venue::VENUE_ICE || exchange == api::Venue::VENUE_SIMICE) +NativeOrder *OrderFactory::make_order(const api::Venue exchange) { + if (exchange == api::Venue::VENUE_ICE || + exchange == api::Venue::VENUE_SIMICE) return new ICENativeOrder(); else - return new GLBXNativeOrder(); + return new GLBXNativeOrder(); } -NativeOrder* OrderFactory::make_native_order(const api::orderman::OrderDefinition& def) -{ - auto secptr = me->sec_db.resolve( SecurityKey(def.security_key()) ); +NativeOrder * +OrderFactory::make_native_order(const api::orderman::OrderDefinition &def) { + auto secptr = me->sec_db.resolve(SecurityKey(def.security_key())); if (secptr == nullptr) - return new GLBXNativeOrder(); // GLBX Native can handle unresolved securities + return new GLBXNativeOrder(); // GLBX Native can handle unresolved + // securities else return make_order(secptr->exchange()); } @@ -153,7 +154,6 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const &r) { } } - Order &OrderFactory::allocate(OrderKey k, OrderKey pk, api::orderman::OrderDefinition const &def) { using namespace bts::api::orderman; From 8cb4151f63a70af8841e24994f9dd99575311acb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 30 Jun 2019 20:27:48 -0400 Subject: [PATCH 069/225] Added id generator to order services. --- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/OrderManager.cpp | 26 +- .../actors/order_manager/OrderServices.h | 3 + .../order_manager/OrderServicesData.cpp | 4 +- .../actors/order_manager/OrderServicesData.h | 4 +- src/lib/utils/Puid.cpp | 260 +++++++++--------- src/lib/utils/Puid.h | 69 ++++- src/lib/utils/tests/IDGeneratorTests.cpp | 53 ++++ src/web/CMakeDeps.cmake | 2 +- 9 files changed, 268 insertions(+), 155 deletions(-) create mode 100644 src/lib/utils/tests/IDGeneratorTests.cpp diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 9e5c32ed1..609bfce92 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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.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/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.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/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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.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/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.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/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index ca26e5d57..33c565a84 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -55,17 +55,16 @@ void OrderManager::init() { } void OrderManager::on_admin_data(const mercury::Update &m) { - if (m.events) - { - if (me->state == State::WAIT_ADMIN) - { - LOG(OrderMan, Info, "Order manager received admin data. Subscribing to security list now "); - for (auto &osd : me->services_data.sessions) + if (m.events) { + if (me->state == State::WAIT_ADMIN) { + LOG(OrderMan, Info, + "Order manager received admin data. Subscribing to security list " + "now "); + for (auto &osd : me->services_data.sessions) osd->gw->on_admin_data(m); - + me->state = State::WAIT_SEC; - subscribe([this](auto const &sec_update) - { + subscribe([this](auto const &sec_update) { this->on_securities(sec_update); }); } @@ -119,9 +118,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( @@ -434,7 +433,8 @@ void OrderManager::init_order_services() { publish(s_ptr->gw_status_change_pub, gw_name, b); }; s->cancel_reject_pub = make_stream(gw_name); - s->gw->on_cancel_reject() = [s_ptr, this](auto const &k, auto const &msg) { + s->gw->on_cancel_reject() = [s_ptr, this](auto const &k, + auto const &msg) { publish(s_ptr->cancel_reject_pub, k, msg); }; // handlers are ready so we can start processing fix events diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 322b2a7a8..33915faf2 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -46,6 +46,9 @@ class OrderServices { return ss.is_gateway_connected(); } + int64_t gen_id() { + return _data->id_gen.next(); + } Governor &governor(SessionServices &ss) { return ss.governor(); } void queue_fix(SessionServices &ss, jetfix::MessageTypes mt, diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index e175ba396..f6bbbd841 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -12,7 +12,9 @@ OrderServicesData::OrderServicesData(OrderManager &owner, order_factory(sec_db, order_router, b), last_timer_ev( Timer::now(), - to(datetime::FIX_timestamp(datetime::now()))) { + to(datetime::FIX_timestamp(datetime::now()))), + id_gen("orderman_ids",5000) +{ auto &all_connections = config::get().connection(); for (auto const &c : all_connections) diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 678fb4aad..f133c0f49 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -33,6 +33,7 @@ #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_router/OrderRouter.h" #include "lib/utils/datetime.h" +#include "lib/utils/Puid.h" #include @@ -108,7 +109,8 @@ class OrderServicesData { mercury::Stream report_order_op_result_pub; mercury::TimerEvent last_timer_ev; std::vector> sessions; - + utils::IDGenerator id_gen; + SessionServicesData &get_session(std::string const &session_name) { for (auto &s : sessions) if (s->session == session_name) diff --git a/src/lib/utils/Puid.cpp b/src/lib/utils/Puid.cpp index 2bb27e1a3..c6511e1d8 100644 --- a/src/lib/utils/Puid.cpp +++ b/src/lib/utils/Puid.cpp @@ -7,17 +7,17 @@ #include #include -#include -#include +#include #include #include -#include #include +#include +#include -#include #include -#include #include +#include +#include namespace bts { namespace utils { @@ -35,93 +35,99 @@ const std::string counter_file_name = "counter_file"; // relying on the fact that metadata changes (like renaming) are // atomic to provide transactional updates to a counter file which is // used to generate uuids. -// -// Write process (on Foo.txt): -// - Step W1: Acquire "write lock" on the existing file. -// - Step W2: Copy the old file in a new unique temporary file. (copy Foo.txt Foo.TmpNNNN.txt) -// - Step W3: Apply the writes to the new file (Foo.TmpNNNN.txt). -// - Step W4: Flush all the writes (for example those being remaining in the cache manager). -// - Step W5: Rename the old file in a new unique Alternate form (ren Foo.txt Foo.AltNNNN.txt) -// - Step W6: Rename the new file into the old file (ren Foo.TmpNNNN.txt Foo.txt) -// - Step W7: Delete the old Alternate file (del Foo.AltNNNN.txt). If this fails, simply ignore. The file will be deleted later during the next recovery. +// +// Write process (on Foo.txt): +// - Step W1: Acquire "write lock" on the existing file. +// - Step W2: Copy the old file in a new unique temporary file. (copy Foo.txt +// Foo.TmpNNNN.txt) +// - Step W3: Apply the writes to the new file (Foo.TmpNNNN.txt). +// - Step W4: Flush all the writes (for example those being remaining in the +// cache manager). +// - Step W5: Rename the old file in a new unique Alternate form (ren Foo.txt +// Foo.AltNNNN.txt) +// - Step W6: Rename the new file into the old file (ren Foo.TmpNNNN.txt +// Foo.txt) +// - Step W7: Delete the old Alternate file (del Foo.AltNNNN.txt). If this +// fails, simply ignore. The file will be deleted later during the next +// recovery. // - Step W8: Release "write lock" on the existing file. -// Recovery from a crash during write (on Foo.txt): -// - Step R1: If Foo.txt is missing but we have both Foo.AltNNNN.txt and Foo.TmpNNNN.txt present, then we crashed between Step W5 and Step W6. Retry from Step W6. -// - Step R2: If Foo.txt is present but Foo.TmpNNNN.txt is also present, then we crashed before Step W5. Try to delete all Foo.TmpNNNN.txt files and ignore failures. -// - Step R3: If Foo.txt is present but Foo.AltNNNN.txt is also present, then we crashed between Step W6 and Step W7. Try to delete all Foo.AltNNNN.txt files and ignore failures. +// Recovery from a crash during write (on Foo.txt): +// - Step R1: If Foo.txt is missing but we have both Foo.AltNNNN.txt and +// Foo.TmpNNNN.txt present, then we crashed between Step W5 and Step W6. Retry +// from Step W6. +// - Step R2: If Foo.txt is present but Foo.TmpNNNN.txt is also present, then we +// crashed before Step W5. Try to delete all Foo.TmpNNNN.txt files and ignore +// failures. +// - Step R3: If Foo.txt is present but Foo.AltNNNN.txt is also present, then we +// crashed between Step W6 and Step W7. Try to delete all Foo.AltNNNN.txt files +// and ignore failures. -void init_store (std::string const &path, - std::string const &lock_path, - std::string const &counter_path) -{ - if (!boost::filesystem::is_directory(path)) - { +void init_store(std::string const &path, std::string const &lock_path, + std::string const &counter_path) { + if (!boost::filesystem::is_directory(path)) { boost::filesystem::create_directories(path); - std::ofstream fs(lock_path.c_str ()); - std::ofstream fc(counter_path.c_str ()); + std::ofstream fs(lock_path.c_str()); + std::ofstream fc(counter_path.c_str()); fc << 0; } } -std::string find_file (std::string const &path, std::string const &ending) -{ +std::string find_file(std::string const &path, std::string const &ending) { for (boost::filesystem::directory_iterator p = - boost::filesystem::directory_iterator (path); - p != boost::filesystem::directory_iterator (); p++) - { - std::string fn (p->path ().string ()); + boost::filesystem::directory_iterator(path); + p != boost::filesystem::directory_iterator(); p++) { + std::string fn(p->path().string()); if (boost::algorithm::ends_with(fn, ending)) return fn; } - return std::string (); + return std::string(); } // boost::filesystem::copy_file is broken for C++ 11 unless one compiles boost -// with c++ 11. (See http://boost.2283326.n4.nabble.com/Filesystem-problems-with-g-std-c-0x-td2639716.html) +// with c++ 11. (See +// http://boost.2283326.n4.nabble.com/Filesystem-problems-with-g-std-c-0x-td2639716.html) // so we provide our own. -void copy_file(std::string const&in, std::string const &out) -{ - std::fstream f(in.c_str (), std::fstream::in|std::fstream::binary); +void copy_file(std::string const &in, std::string const &out) { + std::fstream f(in.c_str(), std::fstream::in | std::fstream::binary); f << std::noskipws; std::istream_iterator begin(f); std::istream_iterator end; - - std::fstream f2(out.c_str (), std::fstream::out|std::fstream::trunc|std::fstream::binary); + + std::fstream f2(out.c_str(), std::fstream::out | std::fstream::trunc | + std::fstream::binary); std::ostream_iterator begin2(f2); std::copy(begin, end, begin2); } -uint32_t get_host_ip_uint32 (std::string const &ip) -{ +uint32_t get_host_ip_uint32(std::string const &ip) { std::vector split_vec; - boost::algorithm::split( split_vec, ip,boost::algorithm::is_any_of(".") ); - bts_assert (split_vec.size () == 4); + boost::algorithm::split(split_vec, ip, boost::algorithm::is_any_of(".")); + bts_assert(split_vec.size() == 4); uint32_t result = 0; int idx = 0; for (std::string &byte : split_vec) { - uint32_t this_byte = atoi (byte.c_str ()); + uint32_t this_byte = atoi(byte.c_str()); this_byte = (this_byte << (idx++ * 8)); result += this_byte; } return result; } -std::string &get_host_ip_string (std::string const &ip) -{ +std::string &get_host_ip_string(std::string const &ip) { static std::string result; - if (result.size () == 0) { + if (result.size() == 0) { std::ostringstream result_stream; - - bts_assert (ip.size ()); - bts_assert (ip != "127.0.0.1"); - std::istringstream ip_str (ip); + + bts_assert(ip.size()); + bts_assert(ip != "127.0.0.1"); + std::istringstream ip_str(ip); for (int i = 0; i < 4; i++) { int b; ip_str >> b; - ip_str.get (); - + ip_str.get(); + char high_nibble = (b & 0xf0) >> 4; char low_nibble = b & 0x0f; if (high_nibble >= 10) @@ -134,14 +140,13 @@ std::string &get_host_ip_string (std::string const &ip) low_nibble += '0'; result_stream << high_nibble << low_nibble; } - result = result_stream.str (); + result = result_stream.str(); } return result; } -uint64_t reserve_ids (std::string const &scope, int n_ids) -{ - tbb::mutex::scoped_lock l (lock); +uint64_t reserve_ids(std::string const &scope, int n_ids) { + tbb::mutex::scoped_lock l(lock); // we risk race conditions if the directory is not there. // but that's OK, this is rare and easily manageable. @@ -149,83 +154,82 @@ uint64_t reserve_ids (std::string const &scope, int n_ids) std::string lock_path = path + "/" + lock_file_name; std::string counter_path = path + "/" + counter_file_name; - init_store (path,lock_path, counter_path); + init_store(path, lock_path, counter_path); // W1 - boost::interprocess::file_lock f_lock(lock_path.c_str ()); - boost::interprocess::scoped_lock scope_lock (f_lock); + boost::interprocess::file_lock f_lock(lock_path.c_str()); + boost::interprocess::scoped_lock scope_lock( + f_lock); - std::string tmp_file = find_file (path, ".tmp"); - std::string alt_file = find_file (path, ".alt"); - std::string counter_file = find_file (path, counter_file_name); + std::string tmp_file = find_file(path, ".tmp"); + std::string alt_file = find_file(path, ".alt"); + std::string counter_file = find_file(path, counter_file_name); // r1? - if (counter_file.size () == 0 && tmp_file.size () && alt_file.size ()) { - boost::filesystem::rename (tmp_file,counter_path); - boost::filesystem::remove (alt_file); - f_lock.unlock (); - lock.unlock (); - return reserve_ids (scope,n_ids); - + if (counter_file.size() == 0 && tmp_file.size() && alt_file.size()) { + boost::filesystem::rename(tmp_file, counter_path); + boost::filesystem::remove(alt_file); + f_lock.unlock(); + lock.unlock(); + return reserve_ids(scope, n_ids); + } // r2 - else if (counter_file.size () && tmp_file.size ()) { - boost::filesystem::remove (tmp_file); - f_lock.unlock (); - lock.unlock (); - return reserve_ids (scope,n_ids); + else if (counter_file.size() && tmp_file.size()) { + boost::filesystem::remove(tmp_file); + f_lock.unlock(); + lock.unlock(); + return reserve_ids(scope, n_ids); } // r3 - else if (counter_file.size () && alt_file.size ()) { - boost::filesystem::remove (alt_file); - f_lock.unlock (); - lock.unlock (); - return reserve_ids (scope,n_ids); + else if (counter_file.size() && alt_file.size()) { + boost::filesystem::remove(alt_file); + f_lock.unlock(); + lock.unlock(); + return reserve_ids(scope, n_ids); } else { - + // W2, copy counter file to a temp file - tmp_file = path + "/" + Uuid ().to_text_string () + ".tmp"; - copy_file (counter_path, tmp_file); + tmp_file = path + "/" + Uuid().to_text_string() + ".tmp"; + copy_file(counter_path, tmp_file); // W3, W4 update temp file, close and flush uint64_t counter_value; - std::ifstream (tmp_file.c_str ()) >> counter_value; - std::ofstream (tmp_file.c_str ()) << counter_value + n_ids; - - // W5, rename counter file to an alt file (renames are atomic) - alt_file = path + "/" + Uuid ().to_text_string () + ".alt"; - boost::filesystem::rename (counter_path, alt_file); + std::ifstream(tmp_file.c_str()) >> counter_value; + std::ofstream(tmp_file.c_str()) << counter_value + n_ids; - // W6, rename temp file to counter file - boost::filesystem::rename (tmp_file,counter_path); + // W5, rename counter file to an alt file (renames are atomic) + alt_file = path + "/" + Uuid().to_text_string() + ".alt"; + boost::filesystem::rename(counter_path, alt_file); + + // W6, rename temp file to counter file + boost::filesystem::rename(tmp_file, counter_path); // W7 delete alt file - boost::filesystem::remove (alt_file); + boost::filesystem::remove(alt_file); return counter_value; } } -std::vector gen_ids (std::string const &scope, int n_ids) -{ - auto counter_value = reserve_ids (scope,n_ids); +std::vector gen_ids(std::string const &scope, int n_ids) { + auto counter_value = reserve_ids(scope, n_ids); std::vector result; for (int i = 0; i < n_ids; i++) - result.push_back (counter_value + i); + result.push_back(counter_value + i); return result; } -static char base_62_alphabet [] = { - '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f', - 'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v', - 'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L', - 'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z' -}; +static char base_62_alphabet[] = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', + 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', + 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', + 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'}; -std::string to_base_62 (uint32_t src) -{ - std::string out (6, ' '); - for (int i=5; i >= 0;i--) { +std::string to_base_62(uint32_t src) { + std::string out(6, ' '); + for (int i = 5; i >= 0; i--) { int r = src % 62; out[i] = base_62_alphabet[r]; src = src / 62; @@ -233,47 +237,45 @@ std::string to_base_62 (uint32_t src) return out; } -void to_base_62 (std::vector const &id_vec, std::vector *out) -{ - for (auto src : id_vec) - for (int i=5; i >= 0;i--) { +void to_base_62(std::vector const &id_vec, std::vector *out) { + for (auto src : id_vec) + for (int i = 5; i >= 0; i--) { int r = src % 62; - out->push_back (base_62_alphabet[r]); + out->push_back(base_62_alphabet[r]); src = src / 62; } } -uint64_t gen_id (std::string const &scope) -{ - std::vector result = gen_ids (scope, 1); +uint64_t gen_id(std::string const &scope) { + std::vector result = gen_ids(scope, 1); return result[0]; } -std::vector gen_puids (std::string const &scope, int n_puids) -{ +std::vector gen_puids(std::string const &scope, int n_puids) { // first generate a series of unique uint32 numbers (For this machine) - std::vector ids = gen_ids (scope, n_puids); + std::vector ids = gen_ids(scope, n_puids); // now add the host ip and a timer string to the generated id to // guarantee uniqueness across machines - uint32_t ip = get_host_ip_uint32 (os::default_host_ip ()); - std::string encoded_ip (to_base_62 (ip)); - - uint32_t seconds = time (NULL); - std::string encoded_time (to_base_62 (seconds)); - + uint32_t ip = get_host_ip_uint32(os::default_host_ip()); + std::string encoded_ip(to_base_62(ip)); + + uint32_t seconds = time(NULL); + std::string encoded_time(to_base_62(seconds)); + std::vector result; for (uint32_t id : ids) { std::ostringstream s; - s << encoded_ip << "-" << encoded_time << "-" << to_base_62 (id); - result.push_back (s.str ()); + s << encoded_ip << "-" << encoded_time << "-" << to_base_62(id); + result.push_back(s.str()); } return result; } -Puid gen_puid (std::string const &scope) -{ - return *(gen_puids (scope,1).begin ()); +Puid gen_puid(std::string const &scope) { + return *(gen_puids(scope, 1).begin()); } -}} + +} // namespace utils +} // namespace bts diff --git a/src/lib/utils/Puid.h b/src/lib/utils/Puid.h index 2340320a9..e70204163 100644 --- a/src/lib/utils/Puid.h +++ b/src/lib/utils/Puid.h @@ -1,10 +1,12 @@ #pragma once #include "bts_export.h" +#include "lib/utils/bts_assert.h" +#include #include #include -#include +#include namespace bts { namespace utils { @@ -19,21 +21,70 @@ typedef std::string Puid; // machine's ip, the unix time (seconds since 1970) and a machine // unique counter. id's are 20 bytes long and can contain [a-z], [A-Z] // [0-9] and - -BTS_EXPORT std::vector gen_puids (std::string const &scope, int n_puids); -BTS_EXPORT Puid gen_puid (std::string const &scope); +BTS_EXPORT std::vector gen_puids(std::string const &scope, int n_puids); +BTS_EXPORT Puid gen_puid(std::string const &scope); // generate machine unique ids (no guarantees of uniqueness across // machines) -BTS_EXPORT std::vector gen_ids (std::string const &scope, int n_ids); +BTS_EXPORT std::vector gen_ids(std::string const &scope, int n_ids); // Similar to the above but instead of copying the ids to a vector // this simply returns the first free id (x) and skips ahead by n_ids // so that the next gen_id call will will be x+n_ids -BTS_EXPORT uint64_t reserve_ids (std::string const &scope, int n_ids); +BTS_EXPORT uint64_t reserve_ids(std::string const &scope, int n_ids); // generate a single id -BTS_EXPORT uint64_t gen_id (std::string const &scope); +BTS_EXPORT uint64_t gen_id(std::string const &scope); // convert a uint32 to a 6 byte human readeable string containing only // alpha numerical characters. -BTS_EXPORT std::string to_base_62 (uint32_t id); -BTS_EXPORT void to_base_62 (std::vector const &ids, std::vector *out); -}} +BTS_EXPORT std::string to_base_62(uint32_t id); +BTS_EXPORT void to_base_62(std::vector const &ids, + std::vector *out); + +class BTS_EXPORT IDGenerator { + public: + IDGenerator(std::string const &scope, uint32_t batch_size) + : _lock(), _batch_size(batch_size), _next(0), _end(0), _scope(scope) { + bts_assert((int)batch_size > 0); + refill(); + } + + uint64_t next() { + std::lock_guard _(_lock); + if (_remaning() == 0) + _refill(); + bts_assert(_remaning() > 0); + return _next++; + } + + void refill() { + std::lock_guard _(_lock); + _refill(); + } + + private: + uint64_t _remaning() { + bts_assert(_end >= _next); + return _end - _next; + } + + void _refill() { + if (_remaning() <= _batch_size / 2) { + auto next_block_start = reserve_ids(_scope, _batch_size); + if (next_block_start == _end) + _end += _batch_size; + else { + _next = next_block_start; + _end = _next + _batch_size; + } + } + } + + std::mutex _lock; + uint32_t _batch_size; + uint64_t _next; + uint64_t _end; + const std::string _scope; +}; + +} // namespace utils +} // namespace bts diff --git a/src/lib/utils/tests/IDGeneratorTests.cpp b/src/lib/utils/tests/IDGeneratorTests.cpp new file mode 100644 index 000000000..8e3cb743d --- /dev/null +++ b/src/lib/utils/tests/IDGeneratorTests.cpp @@ -0,0 +1,53 @@ +#include "../Puid.h" +#include "catch/catch.hpp" + +namespace bts { + +TEST_CASE("IDGenerator", "[utils]") { + SECTION("1") { + utils::IDGenerator gen("test",1); + auto start = gen.next(); + for (int i = 0; i < 10;i++) { + auto previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + } + } + SECTION("10") { + utils::IDGenerator gen("test",4); + auto start = gen.next(); + for (int i = 0; i < 10;i++) { + auto previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + } + } + SECTION("10_interference") { + utils::IDGenerator gen("test",4); + auto start = gen.next(); + auto previous_start = start; + auto interferance = utils::reserve_ids("test", 3); + + previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + + previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + + previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + + previous_start = start; + start = gen.next(); + REQUIRE( interferance + 3 == start); + + previous_start = start; + start = gen.next(); + REQUIRE( start == previous_start + 1); + } +} + +}//ns diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..21739132b 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/cssstyle/scripts/run_tests.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 From 1ce041c5e5c9280c71d9b70214590e0113809927 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 3 Jul 2019 15:23:38 -0400 Subject: [PATCH 070/225] called Pedro's new id generator --- .../actors/order_manager/OrderServices.h | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 39 ++----------------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/src/lib/orderman/actors/order_manager/OrderServices.h b/src/lib/orderman/actors/order_manager/OrderServices.h index 33915faf2..1d64f554d 100644 --- a/src/lib/orderman/actors/order_manager/OrderServices.h +++ b/src/lib/orderman/actors/order_manager/OrderServices.h @@ -46,7 +46,7 @@ class OrderServices { return ss.is_gateway_connected(); } - int64_t gen_id() { + uint64_t gen_id() { return _data->id_gen.next(); } Governor &governor(SessionServices &ss) { return ss.governor(); } diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index fcbe1dc26..b2f2616ae 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -35,8 +35,7 @@ struct ICENativeOrder::PImpl PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale(), orig_clordid(0), - update_clordid_queue(), cancel_clordid_queue() + price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale(), orig_clordid(0) { exchange_order_id.reserve(100); } @@ -53,7 +52,6 @@ struct ICENativeOrder::PImpl std::string exchange_order_id; int sender_compid; int64_t id_scale, orig_clordid; - std::queue update_clordid_queue, cancel_clordid_queue; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -1052,23 +1050,8 @@ void ICENativeOrder::setup_ids(const std::string& sender_compid) me->sender_compid = std::atoi(sender_compid.c_str()); int digs = count_digits(me->sender_compid); me->id_scale = md::pow10(12-digs); - generate_update_ids(sender_compid); - generate_cancel_ids(sender_compid); } -void ICENativeOrder::generate_update_ids(const std::string& sender_compid) -{ - auto ids = bts::utils::gen_ids(sender_compid, 50); - for(const auto& i : ids) - me->update_clordid_queue.push(get_clordid(i)); -} - -void ICENativeOrder::generate_cancel_ids(const std::string& sender_compid) -{ - auto cids = bts::utils::gen_ids(sender_compid, 5); - for(const auto& ci : cids) - me->cancel_clordid_queue.push(get_clordid(ci)); -} int64_t ICENativeOrder::get_clordid(uint64_t bts_id) { @@ -1077,27 +1060,13 @@ int64_t ICENativeOrder::get_clordid(uint64_t bts_id) } int64_t ICENativeOrder::get_update_clordid() -{ - if(me->update_clordid_queue.empty()) - { - generate_update_ids(std::to_string(me->sender_compid)); - LOG(OrderMan, Warn, "Update order slow {} because of we are out of clordids. ", key().value()); - } - auto update_clorid = me->update_clordid_queue.front(); - me->update_clordid_queue.pop(); - return update_clorid; +{ + return get_clordid(me->services->gen_id()); } int64_t ICENativeOrder::get_cancel_clordid() { - if(me->cancel_clordid_queue.empty()) - { - generate_cancel_ids(std::to_string(me->sender_compid)); - LOG(OrderMan, Error, "Cancel order slow {} because of we are out of clordids.", key().value()); - } - auto cancel_clorid = me->cancel_clordid_queue.front(); - me->cancel_clordid_queue.pop(); - return cancel_clorid; + return get_clordid(me->services->gen_id()); } void ICENativeOrder::init_fix() From 270ee60df9b7433476998858c16aac489362066b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 3 Jul 2019 19:39:22 +0000 Subject: [PATCH 071/225] nonstatic cme --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 67a79263b..6b8c745fb 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 67a79263ba116a7646beb8368cef015530bea027 +Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 From 444e3154b31e6bcc6eb24ee57fae9d42276711fc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 3 Jul 2019 16:26:07 -0400 Subject: [PATCH 072/225] Made exchange id gen asynchronous, improved concurrency. --- src/lib/CMakeDeps.cmake | 2 +- .../actors/order_manager/OrderManager.cpp | 21 +++++++++- .../actors/order_manager/OrderServicesData.h | 2 +- src/lib/utils/Puid.h | 41 +++++++++++-------- src/web/CMakeDeps.cmake | 2 +- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..bdd16cb35 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/FillStore.cpp;orderman/actors/GLBXExecutionGateway.cpp;orderman/actors/ICEExecutionGateway.cpp;orderman/actors/IExecutionGateway.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/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.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/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 33c565a84..6be6c2146 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -13,6 +13,7 @@ #include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/inplace_function.h" +#include "lib/utils/thread_manager.h" #include #include @@ -42,12 +43,28 @@ struct OrderManager::PImpl { mercury::Actor::SubHandle stored_fills_sub; OrderServicesData services_data; mercury::Stream pub_ready; + std::thread background_thread; + std::atomic shutdown = false; }; OrderManager::OrderManager(DynamicOrderRegistry const &b, trace::PerfLog &l, md::SecurityOracle o) - : me(new PImpl(*this, b, l, o)) {} -OrderManager::~OrderManager() {} + : me(new PImpl(*this, b, l, o)) { + auto id_gen = &me->services_data.id_gen; + auto done = &me->shutdown; + me->background_thread = + threading::make_thread("oman_background", [id_gen, done]() { + while (!(*done)) { + id_gen->refill(); + sleep_for(10ms); + } + }); +} + +OrderManager::~OrderManager() { + me->shutdown = true; + me->background_thread.join(); +} void OrderManager::init() { subscribe( diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index f133c0f49..11c0257ae 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -109,7 +109,7 @@ class OrderServicesData { mercury::Stream report_order_op_result_pub; mercury::TimerEvent last_timer_ev; std::vector> sessions; - utils::IDGenerator id_gen; + utils::IDGenerator id_gen ; SessionServicesData &get_session(std::string const &session_name) { for (auto &s : sessions) diff --git a/src/lib/utils/Puid.h b/src/lib/utils/Puid.h index e70204163..e30a3c917 100644 --- a/src/lib/utils/Puid.h +++ b/src/lib/utils/Puid.h @@ -3,10 +3,10 @@ #include "bts_export.h" #include "lib/utils/bts_assert.h" +#include #include #include #include -#include namespace bts { namespace utils { @@ -43,22 +43,32 @@ BTS_EXPORT void to_base_62(std::vector const &ids, class BTS_EXPORT IDGenerator { public: IDGenerator(std::string const &scope, uint32_t batch_size) - : _lock(), _batch_size(batch_size), _next(0), _end(0), _scope(scope) { + : _batch_size(batch_size), _next(0), _end(0), _scope(scope), _lock() { bts_assert((int)batch_size > 0); refill(); } + // next should only be called from a single thread uint64_t next() { - std::lock_guard _(_lock); - if (_remaning() == 0) - _refill(); + if (_remaning() == 0) { + std::lock_guard _(_lock); + if (!_next_block.has_value()) + _get_next_block(); + + bts_assert(_next_block.has_value()); + _next = _next_block.value().first; + _end = _next_block.value().second; + _next_block.reset(); + } bts_assert(_remaning() > 0); return _next++; } + // refill can be called from any thread void refill() { std::lock_guard _(_lock); - _refill(); + if (!_next_block.has_value()) + _get_next_block(); } private: @@ -67,23 +77,18 @@ class BTS_EXPORT IDGenerator { return _end - _next; } - void _refill() { - if (_remaning() <= _batch_size / 2) { - auto next_block_start = reserve_ids(_scope, _batch_size); - if (next_block_start == _end) - _end += _batch_size; - else { - _next = next_block_start; - _end = _next + _batch_size; - } - } + void _get_next_block() { + auto block_start = reserve_ids(_scope, _batch_size); + auto block_end = block_start + _batch_size; + _next_block = std::make_pair(block_start, block_end); } - std::mutex _lock; - uint32_t _batch_size; + const uint32_t _batch_size; uint64_t _next; uint64_t _end; const std::string _scope; + std::mutex _lock; + std::optional> _next_block; }; } // namespace utils diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 21739132b..40156daa9 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/cssstyle/scripts/run_tests.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/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 23738b109d011e3a6f0ac27117641128cefca2b2 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 3 Jul 2019 17:26:46 -0400 Subject: [PATCH 073/225] changes to use non-static onixs --- CMakeLists.txt | 2 + src/lib/CMakeDeps_win.cmake | 2 +- src/lib/config/defaults/MarketData.conf | 2 +- src/lib/config/defaults/jetfix.conf | 188 +---------------------- src/lib/utils/Puid.cpp | 2 + src/lib/utils/Puid.h | 2 + src/lib/utils/tests/IDGeneratorTests.cpp | 2 + src/server/sparkd/CMakeLists.txt | 2 +- 8 files changed, 12 insertions(+), 190 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be98723f2..c841445ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,8 @@ else () COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.13.0.0 ${CMAKE_BINARY_DIR}/server + COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libonixs-cmemdh.so.4 ${CMAKE_BINARY_DIR}/server + COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libonixs-cmemdh.so.4.8.0 ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index f862b0d26..cf0fdd4ec 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/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/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 8236f3020..70a91715c 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -83,7 +83,7 @@ ICEOptions { # market_type: 1 #ICE Financial Power # uds_market_type: 1 #udp_buffer_size: 33554432 #32mb - onixs_log_mode: Debug + #onixs_log_mode: Debug } # channel { # name: "juice" diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index fe5a654b3..b982405ab 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -805,193 +805,7 @@ JetFIX { raw_data: "S4PMA" auto_fix_seq_num: true } - connection { - name: "cme_mc5_60" - platform: GLBX - socket_connect_host_ip: "69.50.112.195" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "60" - cme_market_segment_id: 60 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_76" - platform: GLBX - socket_connect_host_ip: "69.50.112.204" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "76" - cme_market_segment_id: 76 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_88" - platform: GLBX - socket_connect_host_ip: "69.50.112.169" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "88" - cme_market_segment_id: 88 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_74" - platform: GLBX - socket_connect_host_ip: "69.50.112.197" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "74" - cme_market_segment_id: 74 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_64" - platform: GLBX - socket_connect_host_ip: "69.50.112.177" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "64" - cme_market_segment_id: 64 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_72" - platform: GLBX - socket_connect_host_ip: "69.50.112.189" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "72" - cme_market_segment_id: 72 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_70" - platform: GLBX - socket_connect_host_ip: "69.50.112.183" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "70" - cme_market_segment_id: 70 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_68" - platform: GLBX - socket_connect_host_ip: "69.50.112.168" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "68" - cme_market_segment_id: 68 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_80" - platform: GLBX - socket_connect_host_ip: "69.50.112.187" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "80" - cme_market_segment_id: 80 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_84" - platform: GLBX - socket_connect_host_ip: "69.50.112.198" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "84" - cme_market_segment_id: 84 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } - connection { - name: "cme_mc5_78" - platform: GLBX - socket_connect_host_ip: "69.50.112.167" - socket_connect_port: 61922 - sender_compid: "MC5004N" - target_compid: "CME" - target_subid: "78" - cme_market_segment_id: 78 - start_time: "00:30:00" - end_time: "23:30:00" - start_day: "sunday" - end_day: "friday" - sender_subid: "BTS" - raw_data: "S4PMA" - auto_fix_seq_num: true - } + } } JetFIX { diff --git a/src/lib/utils/Puid.cpp b/src/lib/utils/Puid.cpp index c6511e1d8..072a03065 100644 --- a/src/lib/utils/Puid.cpp +++ b/src/lib/utils/Puid.cpp @@ -1,3 +1,4 @@ +#ifndef _WIN32 #include "Puid.h" #include "../os/os.h" @@ -279,3 +280,4 @@ Puid gen_puid(std::string const &scope) { } // namespace utils } // namespace bts +#endif \ No newline at end of file diff --git a/src/lib/utils/Puid.h b/src/lib/utils/Puid.h index e70204163..fad0d6f9f 100644 --- a/src/lib/utils/Puid.h +++ b/src/lib/utils/Puid.h @@ -40,6 +40,7 @@ BTS_EXPORT std::string to_base_62(uint32_t id); BTS_EXPORT void to_base_62(std::vector const &ids, std::vector *out); +#ifndef _WIN32 class BTS_EXPORT IDGenerator { public: IDGenerator(std::string const &scope, uint32_t batch_size) @@ -85,6 +86,7 @@ class BTS_EXPORT IDGenerator { uint64_t _end; const std::string _scope; }; +#endif } // namespace utils } // namespace bts diff --git a/src/lib/utils/tests/IDGeneratorTests.cpp b/src/lib/utils/tests/IDGeneratorTests.cpp index 8e3cb743d..832a17fe4 100644 --- a/src/lib/utils/tests/IDGeneratorTests.cpp +++ b/src/lib/utils/tests/IDGeneratorTests.cpp @@ -1,3 +1,4 @@ +#ifndef _WIN32 #include "../Puid.h" #include "catch/catch.hpp" @@ -51,3 +52,4 @@ TEST_CASE("IDGenerator", "[utils]") { } }//ns +#endif diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 802ffd19b..543d53dd6 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries( sparkd ssl cryptopp tbb - onixs-cmemdh-all-4.8.0 + onixs-cmemdh OnixS.IceImpactMulticastPriceFeedHandlerCpp ACE quickfix From f8d5b9bace506b936e34c981e6fdb40a54a092bc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 3 Jul 2019 18:20:11 -0400 Subject: [PATCH 074/225] bookmark initial clordid --- src/lib/orderman/orders/ICENativeOrder.cpp | 33 +++++++++++----------- src/lib/orderman/orders/ICENativeOrder.h | 3 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index b2f2616ae..7e981f5bc 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -35,7 +35,7 @@ struct ICENativeOrder::PImpl PImpl() : services(nullptr), session_services(), sec(nullptr), previous_position_contribution(0), definition(), state(), - price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale(), orig_clordid(0) + price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale() { exchange_order_id.reserve(100); } @@ -51,7 +51,7 @@ struct ICENativeOrder::PImpl int price_encoding_precision; std::string exchange_order_id; int sender_compid; - int64_t id_scale, orig_clordid; + int64_t id_scale; jetfix::FIXFragment update_encoding; jetfix::FIXFragment::Bookmark update_price_bm; @@ -62,6 +62,7 @@ struct ICENativeOrder::PImpl jetfix::FIXFragment::Bookmark update_orig_clordid_bm; jetfix::FIXFragment create_encoding; + jetfix::FIXFragment::Bookmark create_clordid_bm; jetfix::FIXFragment::Bookmark create_price_bm; jetfix::FIXFragment::Bookmark create_quantity_bm; jetfix::FIXFragment::Bookmark create_transact_time_bm; @@ -422,7 +423,10 @@ ICENativeOrder::_on_activate(log::Level reject_level, log::Level transition_leve // send out order auto &encoding = me->create_encoding; - + + auto create_clorid = get_new_clordid(); + me->create_clordid_bm = encoding.overwrite( me->create_clordid_bm, create_clorid, count_digits(create_clorid) ); + switch (me->definition.custom_def().custom_case()) { case CustomOrderDefinition::kLimit: @@ -607,7 +611,7 @@ OrderOpResult ICENativeOrder::on_update(api::orderman::Update const &update) const auto &ts = me->services->get_time_str(); me->update_transact_time_bm = encoding.overwrite( me->update_transact_time_bm, &ts.value()[0], ts.value().size() ); - auto update_clorid = get_update_clordid(); + auto update_clorid = get_new_clordid(); me->update_clordid_bm = encoding.overwrite( me->update_clordid_bm, update_clorid, count_digits(update_clorid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::CancelReplace, me->update_encoding); @@ -716,7 +720,7 @@ OrderOpResult ICENativeOrder::on_cancel() case ORDER_STATUS_WORKING: { auto &encoding = me->cancel_encoding; - auto cancel_clorid = get_cancel_clordid(); + auto cancel_clorid = get_new_clordid(); me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clorid, count_digits(cancel_clorid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel,me->cancel_encoding); @@ -1059,16 +1063,11 @@ int64_t ICENativeOrder::get_clordid(uint64_t bts_id) return id; } -int64_t ICENativeOrder::get_update_clordid() +int64_t ICENativeOrder::get_new_clordid() { return get_clordid(me->services->gen_id()); } -int64_t ICENativeOrder::get_cancel_clordid() -{ - return get_clordid(me->services->gen_id()); -} - void ICENativeOrder::init_fix() { bts_assert(me->sec); @@ -1085,12 +1084,12 @@ void ICENativeOrder::init_fix() std::string memo(memo_sz(), ' '); encode_memo(key(), SecurityKey(sec.id()), &memo); - me->orig_clordid = get_update_clordid(); + // initialize create FIX auto &create_encoding = me->create_encoding; create_encoding.add(memo); - create_encoding.add(me->orig_clordid); + me->create_clordid_bm =create_encoding.add(get_clordid(0)); create_encoding.add(std::atoi(rr.company_id().c_str())); //create_encoding.add(""); //optional, unclear if we need std::string cust = rr.cust_order_handing_inst(); @@ -1121,7 +1120,7 @@ void ICENativeOrder::init_fix() // initialize update FIX auto &update_encoding = me->update_encoding; update_encoding.add(memo); - me->update_orig_clordid_bm = update_encoding.add(me->orig_clordid); + me->update_orig_clordid_bm = update_encoding.add(get_clordid(0)); update_encoding.add(std::atoi(rr.company_id().c_str())); //update_encoding.add(""); //optional, unclear if we need update_encoding.add(rr.operator_id()); @@ -1133,7 +1132,7 @@ void ICENativeOrder::init_fix() update_encoding.add(def.side()); me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); - me->update_clordid_bm = update_encoding.add(me->orig_clordid); + me->update_clordid_bm = update_encoding.add(get_clordid(0)); update_encoding.add(def.time_in_force()); if(rr.account() != "") update_encoding.add(rr.account()); @@ -1150,12 +1149,12 @@ void ICENativeOrder::init_fix() // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; cancel_encoding.add(memo); - me->cancel_orig_clordid_bm = cancel_encoding.add(me->orig_clordid); + me->cancel_orig_clordid_bm = cancel_encoding.add(get_clordid(0)); cancel_encoding.add(std::atoi(rr.company_id().c_str())); cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - me->cancel_clordid_bm = cancel_encoding.add(me->orig_clordid); + me->cancel_clordid_bm = cancel_encoding.add(get_clordid(0)); // special tags switch (def.custom_def().custom_case()) diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index bed96c463..2ab985d58 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -71,8 +71,7 @@ class ICENativeOrder : public NativeOrder { api::orderman::NativeOrderState & get_native_state(api::orderman::OrderState &); - int64_t get_update_clordid(); - int64_t get_cancel_clordid(); + int64_t get_new_clordid(); int64_t get_clordid(uint64_t); void setup_ids(const std::string& sender_compid); void generate_update_ids(const std::string&); From 72aa028bd62be1960b8c71c3f276db4505b1c030 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 4 Jul 2019 14:31:57 -0400 Subject: [PATCH 075/225] ice orders works again --- .../Fills/Settings/FillsFilterStates.cs | 5 + src/lib/config/defaults/jetfix.conf | 615 +++++++++--------- .../orderman/actors/ICEExecutionGateway.cpp | 5 +- src/lib/orderman/orders/ICENativeOrder.cpp | 14 +- 4 files changed, 323 insertions(+), 316 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs index d981552be..653393258 100644 --- a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs +++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs @@ -70,6 +70,10 @@ namespace bts.shell.fills { [ProtoMember(15)] [DIYGridColumnID(nameof(Columns.Symbol))] public string[] symbol { get; set; } + + [ProtoMember(16)] + [DIYGridColumnID(nameof(Columns.FillStatus))] + public Fill.Types.FillStatus[] fill_status { get; set; } } static class FillsFilterStatesExtensions { @@ -91,6 +95,7 @@ namespace bts.shell.fills { pb.add_discrete_values(fs.side, ft => ft.fill.Side); pb.add_discrete_values(fs.fill_kind, ft => ft.fill.FillKind); pb.add_discrete_values(fs.symbol, ft => ft.security?.Symbol ?? string.Empty); + pb.add_discrete_values(fs.fill_status, ft => ft.fill.FillStatus); // numeric pb.add_numeric(fs.size, ft => ft.fill.LastShares); pb.add_numeric(fs.price, ft => ft.fill.LastPrice); diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index b982405ab..c58aef573 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -61,312 +61,127 @@ JetFIX { seconds_to_replay: 6000 } connection: @JetFIXSimConnection.sim - # connection { - # name: "cme_mc1_99" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.199" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "99" - # cme_market_segment_id: 99 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_58" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.172" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "58" - # cme_market_segment_id: 58 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_54" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.191" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "54" - # cme_market_segment_id: 54 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_82" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.179" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "82" - # cme_market_segment_id: 82 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_56" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.174" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "56" - # cme_market_segment_id: 56 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_50" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.202" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "50" - # cme_market_segment_id: 50 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_52" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.181" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "52" - # cme_market_segment_id: 52 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_60" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.195" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "60" - # cme_market_segment_id: 60 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_76" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.204" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "76" - # cme_market_segment_id: 76 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_88" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.169" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "88" - # cme_market_segment_id: 88 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_74" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.197" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "74" - # cme_market_segment_id: 74 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_64" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.177" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "64" - # cme_market_segment_id: 64 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_72" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.189" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "72" - # cme_market_segment_id: 72 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_70" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.183" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "70" - # cme_market_segment_id: 70 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_68" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.168" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "68" - # cme_market_segment_id: 68 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_80" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.187" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "80" - # cme_market_segment_id: 80 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_84" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.198" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "84" - # cme_market_segment_id: 84 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } - # connection { - # name: "cme_mc1_78" - # platform: GLBX - # socket_connect_host_ip: "69.50.112.167" - # socket_connect_port: 61921 - # sender_compid: "MC1004N" - # target_compid: "CME" - # target_subid: "78" - # cme_market_segment_id: 78 - # start_time: "00:30:00" - # end_time: "23:30:00" - # start_day: "sunday" - # end_day: "friday" - # sender_subid: "BTS" - # raw_data: "S4PMA" - # auto_fix_seq_num: true - # } + #connection: @JetFIXSimConnection.sim_ice + + connection { + name: "cme_mc5_99" + platform: GLBX + socket_connect_host_ip: "69.50.112.199" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "99" + cme_market_segment_id: 99 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_58" + platform: GLBX + socket_connect_host_ip: "69.50.112.172" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "58" + cme_market_segment_id: 58 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_54" + platform: GLBX + socket_connect_host_ip: "69.50.112.191" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "54" + cme_market_segment_id: 54 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_82" + platform: GLBX + socket_connect_host_ip: "69.50.112.179" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "82" + cme_market_segment_id: 82 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_56" + platform: GLBX + socket_connect_host_ip: "69.50.112.174" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "56" + cme_market_segment_id: 56 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_50" + platform: GLBX + socket_connect_host_ip: "69.50.112.202" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "50" + cme_market_segment_id: 50 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc5_52" + platform: GLBX + socket_connect_host_ip: "69.50.112.181" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "52" + cme_market_segment_id: 52 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } } } @@ -805,7 +620,193 @@ JetFIX { raw_data: "S4PMA" auto_fix_seq_num: true } - + # connection { + # name: "cme_mc5_60" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.195" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "60" + # cme_market_segment_id: 60 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_76" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.204" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "76" + # cme_market_segment_id: 76 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_88" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.169" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "88" + # cme_market_segment_id: 88 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_74" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.197" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "74" + # cme_market_segment_id: 74 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_64" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.177" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "64" + # cme_market_segment_id: 64 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_72" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.189" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "72" + # cme_market_segment_id: 72 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_70" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.183" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "70" + # cme_market_segment_id: 70 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_68" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.168" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "68" + # cme_market_segment_id: 68 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_80" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.187" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "80" + # cme_market_segment_id: 80 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_84" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.198" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "84" + # cme_market_segment_id: 84 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } + # connection { + # name: "cme_mc5_78" + # platform: GLBX + # socket_connect_host_ip: "69.50.112.167" + # socket_connect_port: 61922 + # sender_compid: "MC5004N" + # target_compid: "CME" + # target_subid: "78" + # cme_market_segment_id: 78 + # start_time: "00:30:00" + # end_time: "23:30:00" + # start_day: "sunday" + # end_day: "friday" + # sender_subid: "BTS" + # raw_data: "S4PMA" + # auto_fix_seq_num: true + # } } } JetFIX { diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 0a55d2722..c97d729c2 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -311,8 +311,6 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg if (!sec) { sec = me->sec_oracle.get_security(SecurityKey(sk.value())); - if(sec->has_ice()) - me->securities_by_exchange_id[sec->ice().exchange_id()] = sec; } if (!sec) LOG(OrderMan, Error, @@ -321,6 +319,9 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg sk.value()); else { + if(sec->has_ice()) + me->securities_by_exchange_id[sec->ice().exchange_id()] = sec; + api::Security const *leg_security = nullptr; if (msg.has() && msg.get() == 2) { diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 7e981f5bc..e05348387 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -1053,13 +1053,13 @@ void ICENativeOrder::setup_ids(const std::string& sender_compid) { me->sender_compid = std::atoi(sender_compid.c_str()); int digs = count_digits(me->sender_compid); - me->id_scale = md::pow10(12-digs); + me->id_scale = md::pow10(ice_orderid_sz()-digs); } int64_t ICENativeOrder::get_clordid(uint64_t bts_id) { - int64_t id = me->id_scale * me->sender_compid + (bts_id % me->id_scale); + int64_t id = me->id_scale * std::max(me->sender_compid, 1) + (bts_id % me->id_scale); return id; } @@ -1089,7 +1089,7 @@ void ICENativeOrder::init_fix() auto &create_encoding = me->create_encoding; create_encoding.add(memo); - me->create_clordid_bm =create_encoding.add(get_clordid(0)); + me->create_clordid_bm = create_encoding.add(get_clordid(0), ice_orderid_sz()); create_encoding.add(std::atoi(rr.company_id().c_str())); //create_encoding.add(""); //optional, unclear if we need std::string cust = rr.cust_order_handing_inst(); @@ -1120,7 +1120,7 @@ void ICENativeOrder::init_fix() // initialize update FIX auto &update_encoding = me->update_encoding; update_encoding.add(memo); - me->update_orig_clordid_bm = update_encoding.add(get_clordid(0)); + me->update_orig_clordid_bm = update_encoding.add(get_clordid(0), ice_orderid_sz()); update_encoding.add(std::atoi(rr.company_id().c_str())); //update_encoding.add(""); //optional, unclear if we need update_encoding.add(rr.operator_id()); @@ -1132,7 +1132,7 @@ void ICENativeOrder::init_fix() update_encoding.add(def.side()); me->update_transact_time_bm = update_encoding.add(datetime::FIX_timestamp(datetime::now())); me->update_quantity_bm = update_encoding.add(0, quantity_sz()); - me->update_clordid_bm = update_encoding.add(get_clordid(0)); + me->update_clordid_bm = update_encoding.add(get_clordid(0), ice_orderid_sz()); update_encoding.add(def.time_in_force()); if(rr.account() != "") update_encoding.add(rr.account()); @@ -1149,12 +1149,12 @@ void ICENativeOrder::init_fix() // initialize cancel FIX auto &cancel_encoding = me->cancel_encoding; cancel_encoding.add(memo); - me->cancel_orig_clordid_bm = cancel_encoding.add(get_clordid(0)); + me->cancel_orig_clordid_bm = cancel_encoding.add(get_clordid(0), ice_orderid_sz()); cancel_encoding.add(std::atoi(rr.company_id().c_str())); cancel_encoding.add(rr.authorized_trader()); cancel_encoding.add(sec.ice().exchange_id()); cancel_encoding.add(def.side()); - me->cancel_clordid_bm = cancel_encoding.add(get_clordid(0)); + me->cancel_clordid_bm = cancel_encoding.add(get_clordid(0), ice_orderid_sz()); // special tags switch (def.custom_def().custom_case()) From e96d9112ef32d285b871cca52b52aea9db449151 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Aug 2019 14:25:17 -0400 Subject: [PATCH 076/225] SIMICE causing some trouble sharing replay and MBO --- src/server/sparkd/md/run_md.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 0b5b95989..1c99a8d63 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -153,7 +153,8 @@ void run_market_datapublishers(MBOWriter* mbo) { if (config::get().use_sim()) { threading::make_thread("ExchangeSimGLBX", [mbo]() { sim::start_exchange_sim(api::Venue::VENUE_SIM, mbo); }).detach(); - threading::make_thread("ExchangeSimICE", [mbo]() { sim::start_exchange_sim(api::Venue::VENUE_SIMICE, mbo); }).detach(); + //threading::make_thread("ExchangeSimICE", [mbo]() { sim::start_exchange_sim(api::Venue::VENUE_SIMICE, mbo); }).detach(); + //TODO I'll need Eric's help to disambiguate replay / relay here } boot_sleep(); } From e1137c4e1d8082ac799223fcf7309dffe1252802 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 6 Aug 2019 11:27:38 -0400 Subject: [PATCH 077/225] go back to statically linked CME --- CMakeLists.txt | 2 -- src/server/sparkd/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c841445ea..be98723f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,8 +56,6 @@ else () COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.13.0.0 ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libonixs-cmemdh.so.4 ${CMAKE_BINARY_DIR}/server - COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libonixs-cmemdh.so.4.8.0 ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/sdk/examples/order_plugin_example.so ${CMAKE_BINARY_DIR}/server/plugins/ diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 543d53dd6..802ffd19b 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries( sparkd ssl cryptopp tbb - onixs-cmemdh + onixs-cmemdh-all-4.8.0 OnixS.IceImpactMulticastPriceFeedHandlerCpp ACE quickfix From 13b09ffc12b748887ad250d2b2ef4ad3f59eed73 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 7 Aug 2019 10:42:41 -0400 Subject: [PATCH 078/225] add 3 minute delay to system tests --- src/client/spark_test/Utils/TestUtils.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index b36693280..f5d8a5c94 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -85,6 +85,8 @@ namespace bts.tests.utils { if(timeout == null) { timeout = TimeSpan.FromMinutes(2); } + Console.WriteLine("Please Wait... this is going to take some time..."); + await Task.Delay(180000); System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch(); sw.Start(); From 683b85c66b71f6eb11b3cd821624d4fed1a1edd5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 14 Aug 2019 15:25:27 -0400 Subject: [PATCH 079/225] subrepos --- docker/linux | 2 +- externals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index e13bb5d8d..ce08a5129 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit e13bb5d8df14171a9a5abfdb8b6b4ecbc519032a +Subproject commit ce08a5129f14af0d1bb9fa569d1e721b694964fe diff --git a/externals b/externals index 6b8c745fb..d0e8645b5 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 +Subproject commit d0e8645b5ef7380314eddc68114a9f0eaa379318 From cc3353e2431a459691891ab4ab64f09036673c60 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 14 Aug 2019 15:42:16 -0400 Subject: [PATCH 080/225] messed up the externals --- docker/linux | 2 +- externals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index ce08a5129..b09d4c035 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit ce08a5129f14af0d1bb9fa569d1e721b694964fe +Subproject commit b09d4c035b4c0d0e600c7639cd9cb5edaee98d2e diff --git a/externals b/externals index d0e8645b5..6b8c745fb 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit d0e8645b5ef7380314eddc68114a9f0eaa379318 +Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 From 14cbd4a174ffc6d17483b8b5b47befdbf34fbb81 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 19 Aug 2019 16:27:56 -0400 Subject: [PATCH 081/225] ICE: make settlement price conditional on onMarketSnapshot --- src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 50f3b4393..304f114cf 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -134,7 +134,9 @@ void ICEListener::onMarketSnapshot(const onixs_ice::MarketSnapshot& msg, const o bts_assert(data->id == msg.marketId); auto ts = utils::TimeStamp::now(); auto settle_denominator = data->handle.security().ice_settle_denominator; - data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(msg.settlePriceDateTime) ); + if (msg.settlePriceDateTime > 0) { + data->handle.update_settlement( ts, convert_price(msg.settlementPrice, settle_denominator), date_of_timestamp(msg.settlePriceDateTime) ); + } LOG(md,Diag,"OnixSICE Got Market Snap : {} - {}", std::to_string(data->id), std::to_string(msg.settlementPrice)); From 1b043f77cb42e3cb18f3093f4818c95084d29679 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 22 Aug 2019 11:01:42 -0400 Subject: [PATCH 082/225] Basic scaffolding in place for pyramid algo, shows up in the UI --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 51 +++++++++++++++++++ .../orders/algo/algo_orders/PyramidAlgo.h | 29 +++++++++++ .../algo/algo_orders/RegisterDorman.cpp | 22 +++++++- 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp new file mode 100644 index 000000000..e41bbe041 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -0,0 +1,51 @@ +#include "lib/orderman/orders/algo/algo_orders/PyramidAlgo.h" + +#include "lib/domain_model/Security.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/orderman_utils.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; + +struct PyramidAlgo::PImpl { +}; + +PyramidAlgo::PyramidAlgo() : me(new PImpl()) {} +PyramidAlgo::~PyramidAlgo() {} +//IAlgoServices &PyramidAlgo::algo() const { return *me->algo_services; } + +// initialization ///////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices&) { + return {}; +} +void PyramidAlgo::do_launch(IAlgoServices&) { +} +void PyramidAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { +} +// updates //////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +void PyramidAlgo::do_update(const api::orderman::Update&) { +} +// callbacks ////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +void PyramidAlgo::on_book(SecurityKey, const Book&) { +} +void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { + LOG(OrderMan, Info, + "PyramidAlgo::on_child_change child_key:{} status:{} total_fills:{} " + "last_price:{}", + key, + static_cast(st.status), + st.total_fills, + st.last_price); +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h new file mode 100644 index 000000000..08eed73e5 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -0,0 +1,29 @@ +#pragma once + +#include "lib/domain_model/Security.pb.h" +#include "lib/md/PriceSize.h" +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +class PyramidAlgo : public IAlgoOrder { + public: + PyramidAlgo(); + ~PyramidAlgo(); + + public: + 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: + struct PImpl; + std::unique_ptr me; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 0125d4e25..5c50372c8 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -4,6 +4,7 @@ #include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "DormanAlgo.h" +#include "PyramidAlgo.h" using namespace bts; using namespace api::orderman; @@ -11,7 +12,7 @@ using namespace orderman::dorman; using namespace orderman; namespace bts { -namespace orderman { +namespace orderman { namespace dorman { template @@ -83,7 +84,7 @@ Result to_dorman_params(const api::orderman::DynamicOr return {res}; } -extern "C" void init_spark_plugin(bts::SparkServices &srv) { +extern "C" void init_dorman_plugin(bts::SparkServices &srv) { DynamicOrderDescriptor join_desc; join_desc.set_dynamic_order_type("Dorman"); @@ -115,4 +116,21 @@ extern "C" void init_spark_plugin(bts::SparkServices &srv) { srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); } +extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { + DynamicOrderDescriptor join_desc; + + join_desc.set_dynamic_order_type("Pyramid"); + + *join_desc.add_param_desc() = param_uint32("top"); + *join_desc.add_param_desc() = param_uint32("child_1"); + *join_desc.add_param_desc() = param_uint32("child_2"); + + srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); +} + +extern "C" void init_spark_plugin(bts::SparkServices &srv) { + init_dorman_plugin(srv); + init_pyramid_plugin(srv); +} + }}} \ No newline at end of file From 3e7627ac24974d8d12001013380af3fb0ed04e25 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 24 Aug 2019 13:08:26 -0400 Subject: [PATCH 083/225] Almost done, need to hook up hedging (cover) and parameter change --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 232 +++++++++++++++++- .../orders/algo/algo_orders/PyramidAlgo.h | 22 +- .../algo/algo_orders/RegisterDorman.cpp | 9 +- 3 files changed, 252 insertions(+), 11 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index e41bbe041..aa5812a6c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -14,19 +14,83 @@ namespace orderman { using namespace api::orderman; +enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DONE }; + +struct LegData{ + const api::Side side; //trading side + ChildTemplate* order_template = nullptr; + OrderKey order_key = null_order_key(); + Book book; + LegData (api::Side side_a, + ChildTemplate* order_template_a) + : + side (side_a), + order_template (order_template_a), + book() + { + } + const BookSide& opp_md() const{ + return book.side(SpreaderUtils::invert_side(side)); + } +}; + struct PyramidAlgo::PImpl { + Status state = Status::WAITING_FOR_MD; + IAlgoServices* algo_services = nullptr; + PyramidAlgo::PyramidAlgoParams params; + std::vector legs; + api::Side side; + Price out_price; + Quantity out_qty; + LegData* find_leg_data (SecurityKey sec_key){ + size_t i = 0; + for(SecurityKey k : params.sec_keys){ + if (k == sec_key) + return &legs[i]; + i++; + } + return nullptr; + } }; PyramidAlgo::PyramidAlgo() : me(new PImpl()) {} PyramidAlgo::~PyramidAlgo() {} -//IAlgoServices &PyramidAlgo::algo() const { return *me->algo_services; } +IAlgoServices& PyramidAlgo::_algo() const { return *me->algo_services; } // initialization ///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices&) { +OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { + auto& def = serv.definition(); + if (def.has_custom_def() && def.custom_def().has_dynamic()){ + auto conv_res = _convert_params(def.custom_def()); + if (std::get<1>(conv_res)){ + // params are good + me->params = std::get<0>(conv_res); + me->side = def.side(); + size_t i = 0; + for (SecurityKey key : me->params.sec_keys){ + auto side = i++ == 0 ? def.side() : _opp(def.side()); + auto* t = _create_order_template(serv, + key, + side); + me->legs.emplace_back(side, t); + } + } + else + return {OrderError::ORDER_ERROR_INVALID_PARAMETER, + std::get<2>(conv_res)}; + } + else + return {OrderError::ORDER_ERROR_INVALID_PARAMETER, + std::string("Missing parameters")}; return {}; } -void PyramidAlgo::do_launch(IAlgoServices&) { +void PyramidAlgo::do_launch(IAlgoServices& algo_services) { + me->algo_services = &algo_services; + me->out_price = algo_services.price(); + me->out_qty = algo_services.quantity(); + for (SecurityKey bkey : me->params.sec_keys) + algo_services.subscribe_book(bkey); } void PyramidAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { } @@ -36,16 +100,170 @@ void PyramidAlgo::do_update(const api::orderman::Update&) { } // callbacks ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -void PyramidAlgo::on_book(SecurityKey, const Book&) { +void PyramidAlgo::on_book(SecurityKey key, const Book& book) { + LegData* leg_data = me->find_leg_data(key); + if(leg_data != nullptr){ + leg_data->book = book; + _analyze_and_act(); + } } void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { LOG(OrderMan, Info, - "PyramidAlgo::on_child_change child_key:{} status:{} total_fills:{} " - "last_price:{}", + "PyramidAlgo::on_child_change key:{} child_key:{} state:{} status:{} " + "total_fills:{} last_price:{}", + _algo().order_key(), key, + static_cast(me->state), static_cast(st.status), st.total_fills, - st.last_price); + st.last_price); + if(me->legs[0].order_key == key){ + // react to fill + // only main top order is reacted to + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + _algo().complete(); + _switch_state(PyramidAlgo::Status::DONE); + break; + case ChildStatus::CANCELED: + _algo().cancel("Unexpected child cancel"); + _switch_state(PyramidAlgo::Status::DONE); + break; + } + } } + +/////////////////////////////////////////////////////////////////////////////// +// helpers //////////////////////////////////////////////////////////////////// + +std::tuple +PyramidAlgo::_convert_params (const CustomOrderDefinition&){ + // const DynamicOrderDefinition& def = cod.dynamic(); + // const auto& params = def.order_params(); + PyramidAlgoParams rv; + rv.sec_keys.emplace_back(4294964892); + rv.sec_keys.emplace_back(4294964643); + rv.sec_keys.emplace_back(4294964605); + // auto r = get_if(params, "Top Spread"); + // if (r.has_value()) + // rv.sec_keys.emplace_back(r.value()); + // else + // return std::make_tuple(rv,false, + // std::string("Top Spread is not defined")); + // for (size_t i = 0; i < 5; i++){ + // auto idx = std::to_string(i+1); + // auto b = get_if(params, "Spread " + idx); + // if (b.has_value()) + // rv.sec_keys.emplace_back(r.value()); + // } + // if(rv.sec_keys.size() < 3) + // return std::make_tuple( + // rv, + // false, + // std::string("Pyramid Algo has to have atlest 2 base spreads")); + return std::make_tuple(rv,true,std::string("")); +} + +ChildTemplate* PyramidAlgo::_create_order_template ( + IBeforeLaunchAlgoServices& serv, + SecurityKey key, + api::Side side) const{ + OrderDefinition order_def = serv.definition(); + order_def.set_security_key (key.value()); + order_def.set_side(side); + order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( + api::orderman::LimitOrderDefinition()); + return &(serv.make_child_template(order_def)); +} + +void PyramidAlgo::_analyze_and_act(){ + switch(me->state){ + case PyramidAlgo::Status::WAITING_FOR_MD: + for (const LegData& l : me->legs) + if(l.opp_md()[0].size() == 0) + return; + // received data for the first time + if (_working_state_met()){ + // enter order, and switch state + LegData& top_leg = me->legs[0]; + top_leg.order_key = _algo().launch_child( + *top_leg.order_template, + me->out_price, + me->out_qty); + LOG(OrderMan, Info,"PyramidAlgo::_analyze_and_act key:{} " + "child_key:{} price:{} qty:{}", + _algo().order_key(), + top_leg.order_key, + me->out_price, + me->out_qty); + _switch_state(PyramidAlgo::Status::WORKING); + } + else{ + _algo().cancel("Order cancelled (Cover prices not met)"); + _switch_state(PyramidAlgo::Status::DONE); + // go to end + } + break; + case PyramidAlgo::Status::WORKING: + if (!_working_state_met()){ + _algo().cancel("Order cancelled (Cover prices not met)"); + _switch_state(PyramidAlgo::Status::DONE); + } + break; + case PyramidAlgo::Status::WAITING_FOR_CANCEL: + case PyramidAlgo::Status::DONE: + break; + } +} + +bool PyramidAlgo::_working_state_met() const{ + double cover_sum = 0.0; + size_t i = 0; + for (const auto& l : me->legs) + if (i++ > 0){ + const auto& ps = l.opp_md()[0]; + cover_sum += ps.price(); + } + return !os::is_nan(cover_sum) && + ((me->side == api::Side::SIDE_BUY && + me->out_price.value() <= cover_sum) || + (me->side == api::Side::SIDE_SELL && + me->out_price.value() >= cover_sum)); +} + +api::Side PyramidAlgo::_opp (api::Side side){ + return SpreaderUtils::invert_side(side); +} + +void PyramidAlgo::_switch_state(Status new_state){ + switch(new_state){ + case (PyramidAlgo::Status::WAITING_FOR_MD): + bts_assert(false); + break; + case (PyramidAlgo::Status::WORKING): + bts_assert(me->state == PyramidAlgo::Status::WAITING_FOR_MD); + break; + case (PyramidAlgo::Status::WAITING_FOR_CANCEL): + bts_assert(me->state == PyramidAlgo::Status::WORKING); + break; + case (PyramidAlgo::Status::DONE): + bts_assert( + // when an order is entered and the criteria is not met + me->state == PyramidAlgo::Status::WAITING_FOR_MD || + // when the child order gets into an unexpected state + me->state == PyramidAlgo::Status::WORKING || + // as expected, order gets cancelled + me->state == PyramidAlgo::Status::WAITING_FOR_CANCEL); + break; + } + LOG(OrderMan, Info,"PyramidAlgo::_switch_state key:{} {}->{} ", + _algo().order_key(), + static_cast(me->state), + static_cast(new_state)); + me->state = new_state; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 08eed73e5..0acfa06f2 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -4,14 +4,22 @@ #include "lib/md/PriceSize.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" +//namespace bts{namespace api{namespace orderman{class ChildTemplate;}}} + namespace bts { namespace orderman { +class ChildTemplate; + class PyramidAlgo : public IAlgoOrder { public: PyramidAlgo(); ~PyramidAlgo(); - + struct PyramidAlgoParams{ + // first one is the top + std::vector sec_keys; + Quantity del_threshold; + }; public: OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; void do_launch(IAlgoServices &) override; @@ -21,8 +29,20 @@ class PyramidAlgo : public IAlgoOrder { void on_child_change(OrderKey, ChildState const &) override; private: + enum class Status; struct PImpl; std::unique_ptr me; +private: + IAlgoServices& _algo() const ; + static std::tuple _convert_params ( + const bts::api::orderman::CustomOrderDefinition&); + ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, + SecurityKey, + api::Side) const; + void _analyze_and_act(); + bool _working_state_met() const; + static api::Side _opp (api::Side); + void _switch_state (Status new_status); }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 5c50372c8..663202822 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -121,9 +121,12 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { join_desc.set_dynamic_order_type("Pyramid"); - *join_desc.add_param_desc() = param_uint32("top"); - *join_desc.add_param_desc() = param_uint32("child_1"); - *join_desc.add_param_desc() = param_uint32("child_2"); + *join_desc.add_param_desc() = param_uint32("Top Spread"); + *join_desc.add_param_desc() = param_uint32("Spread 1"); + *join_desc.add_param_desc() = param_uint32("Spread 2"); + *join_desc.add_param_desc() = param_uint32("Spread 3"); + *join_desc.add_param_desc() = param_uint32("Spread 4"); + *join_desc.add_param_desc() = param_uint32("Spread 5"); srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); } From dba3747d98c6017392a30f9153ec8891d541a06e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 28 Aug 2019 11:17:33 -0400 Subject: [PATCH 084/225] Need more robust error checking, functionality works --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 206 +++++++++++++----- .../orders/algo/algo_orders/PyramidAlgo.h | 4 + 2 files changed, 161 insertions(+), 49 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index aa5812a6c..c643debb5 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -17,21 +17,33 @@ using namespace api::orderman; enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DONE }; struct LegData{ + const size_t index; + const SecurityKey sec_key; const api::Side side; //trading side ChildTemplate* order_template = nullptr; - OrderKey order_key = null_order_key(); + OrderKey order_key; + ChildState order_state; Book book; - LegData (api::Side side_a, + LegData (size_t index_a, + SecurityKey sec_key_a, + api::Side side_a, ChildTemplate* order_template_a) : + index (index_a), + sec_key (sec_key_a), side (side_a), order_template (order_template_a), + order_key(null_order_key()), + order_state(), book() { } const BookSide& opp_md() const{ return book.side(SpreaderUtils::invert_side(side)); } + bool is_top_spread() const{ + return index == 0; + } }; struct PyramidAlgo::PImpl { @@ -42,13 +54,16 @@ struct PyramidAlgo::PImpl { api::Side side; Price out_price; Quantity out_qty; - LegData* find_leg_data (SecurityKey sec_key){ - size_t i = 0; - for(SecurityKey k : params.sec_keys){ - if (k == sec_key) - return &legs[i]; - i++; - } + LegData* find_leg_from_sec (SecurityKey sec_key){ + for (auto& l : legs) + if(l.sec_key == sec_key) + return &l; + return nullptr; + } + LegData* find_leg_from_ord_key (OrderKey ord_key){ + for (auto& l : legs) + if(l.order_key == ord_key) + return &l; return nullptr; } }; @@ -69,11 +84,11 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { me->side = def.side(); size_t i = 0; for (SecurityKey key : me->params.sec_keys){ - auto side = i++ == 0 ? def.side() : _opp(def.side()); + auto side = i == 0 ? def.side() : _opp(def.side()); auto* t = _create_order_template(serv, key, side); - me->legs.emplace_back(side, t); + me->legs.emplace_back(i++, key, side, t); } } else @@ -96,12 +111,55 @@ void PyramidAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { } // updates //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -void PyramidAlgo::do_update(const api::orderman::Update&) { +void PyramidAlgo::do_update(const api::orderman::Update& update) { + LOG(OrderMan, Diag, "PyramidAlgo::do_update order:{} state:{} receiving update: {}", + _algo().order_key().value(), + static_cast(me->state), + utils::pb::to_string(update)); + + if (update.has_custom() && !update.custom().has_dynamic()) { + _algo().terminate_error("Invalid update"); + return; + } + auto conv_res = _convert_params(update.custom()); + if (!std::get<1>(conv_res)){ + _algo().terminate_error("Invalid update"); + return; + } + switch(me->state){ + case PyramidAlgo::Status::WAITING_FOR_MD: + me->out_price = Price(update.price()); + me->out_qty = Quantity(update.quantity()); + // TODO, check is qty >= filled (filled >=0 in the case of attach) + break; + case PyramidAlgo::Status::WORKING: + me->out_price = Price(update.price()); + me->out_qty = Quantity(update.quantity()); + // TODO, check if qty >= filled + if (_working_state_met()){ + // change price of top spread order + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); + _algo().update_child(me->legs[0].order_key, child_update); + } + else{ + _algo().cancel("Order cancelled (Cover prices not met)"); + _switch_state(PyramidAlgo::Status::WAITING_FOR_CANCEL); + } + break; + case PyramidAlgo::Status::WAITING_FOR_CANCEL: + LOG(OrderMan, Warn, "PyramidAlgo::do_update order:{} ignoring update since the " + "order is already cancelled", _algo().order_key().value()); + break; + case PyramidAlgo::Status::DONE: + break; + } } // callbacks ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void PyramidAlgo::on_book(SecurityKey key, const Book& book) { - LegData* leg_data = me->find_leg_data(key); + LegData* leg_data = me->find_leg_from_sec(key); if(leg_data != nullptr){ leg_data->book = book; _analyze_and_act(); @@ -117,21 +175,19 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { static_cast(st.status), st.total_fills, st.last_price); - if(me->legs[0].order_key == key){ - // react to fill - // only main top order is reacted to - switch (st.status) { - case ChildStatus::WORKING: + + switch(me->state){ + case PyramidAlgo::Status::WAITING_FOR_MD: + bts_assert_msg (false, "No child orders"); break; - case ChildStatus::COMPLETED: - _algo().complete(); - _switch_state(PyramidAlgo::Status::DONE); + case PyramidAlgo::Status::WORKING: + _handle_order_in_working (key, st); break; - case ChildStatus::CANCELED: - _algo().cancel("Unexpected child cancel"); - _switch_state(PyramidAlgo::Status::DONE); + case PyramidAlgo::Status::WAITING_FOR_CANCEL: + _handle_order_in_waiting_cancel(key, st); + break; + case PyramidAlgo::Status::DONE: break; - } } } @@ -139,30 +195,30 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { // helpers //////////////////////////////////////////////////////////////////// std::tuple -PyramidAlgo::_convert_params (const CustomOrderDefinition&){ - // const DynamicOrderDefinition& def = cod.dynamic(); - // const auto& params = def.order_params(); +PyramidAlgo::_convert_params (const CustomOrderDefinition& cod){ + const DynamicOrderDefinition& def = cod.dynamic(); + const auto& params = def.order_params(); PyramidAlgoParams rv; - rv.sec_keys.emplace_back(4294964892); - rv.sec_keys.emplace_back(4294964643); - rv.sec_keys.emplace_back(4294964605); - // auto r = get_if(params, "Top Spread"); - // if (r.has_value()) - // rv.sec_keys.emplace_back(r.value()); - // else - // return std::make_tuple(rv,false, - // std::string("Top Spread is not defined")); - // for (size_t i = 0; i < 5; i++){ - // auto idx = std::to_string(i+1); - // auto b = get_if(params, "Spread " + idx); - // if (b.has_value()) - // rv.sec_keys.emplace_back(r.value()); - // } - // if(rv.sec_keys.size() < 3) - // return std::make_tuple( - // rv, - // false, - // std::string("Pyramid Algo has to have atlest 2 base spreads")); + // rv.sec_keys.emplace_back(4294964892); + // rv.sec_keys.emplace_back(4294964643); + // rv.sec_keys.emplace_back(4294964605); + auto r = get_if(params, "Top Spread"); + if (r.has_value() && r.value()!=0) + rv.sec_keys.emplace_back(r.value()); + else + return std::make_tuple(rv,false, + std::string("Top Spread is not defined")); + for (size_t i = 0; i < 5; i++){ + auto idx = std::to_string(i+1); + auto b = get_if(params, "Spread " + idx); + if (b.has_value() && b.value() != 0) + rv.sec_keys.emplace_back(b.value()); + } + if(rv.sec_keys.size() < 3) + return std::make_tuple( + rv, + false, + std::string("Pyramid Algo has to have atlest 2 base spreads")); return std::make_tuple(rv,true,std::string("")); } @@ -192,7 +248,7 @@ void PyramidAlgo::_analyze_and_act(){ *top_leg.order_template, me->out_price, me->out_qty); - LOG(OrderMan, Info,"PyramidAlgo::_analyze_and_act key:{} " + LOG(OrderMan, Info,"PyramidAlgo::_analyze_and_act launching order key:{} " "child_key:{} price:{} qty:{}", _algo().order_key(), top_leg.order_key, @@ -265,5 +321,57 @@ void PyramidAlgo::_switch_state(Status new_state){ me->state = new_state; } +void PyramidAlgo::_handle_order_in_waiting_cancel(OrderKey key, + const ChildState& st){ + LegData* leg = me->find_leg_from_ord_key (key); + if (leg == nullptr) + LOG(OrderMan, Error, + "PyramidAlgo::on_child_change key:{} unknown order:{}", + _algo().order_key(), key); + else if(leg->is_top_spread()) + _send_hedges(st.last_fills); + _check_for_completion(); +} + +void PyramidAlgo::_handle_order_in_working (OrderKey key, + const ChildState &st){ + LegData* leg = me->find_leg_from_ord_key (key); + if (leg == nullptr) + LOG(OrderMan, Error, + "PyramidAlgo::on_child_change key:{} unknown order:{}", + _algo().order_key(), key); + else if(leg->is_top_spread()){ + _send_hedges(st.last_fills); + switch (st.status) { + case ChildStatus::WORKING: + case ChildStatus::COMPLETED: + break; + case ChildStatus::CANCELED: + _algo().cancel("Unexpected child cancel"); + _switch_state(PyramidAlgo::Status::WAITING_FOR_CANCEL); + break; + } + _check_for_completion(); + } +} + +void PyramidAlgo::_send_hedges (Quantity filled_qty){ + if (filled_qty.value() > 0) + for (auto& l : me->legs) + if(!l.is_top_spread()) + l.order_key = _algo().launch_child( + *l.order_template, + Price(l.opp_md()[0].price()), + filled_qty); +} + +void PyramidAlgo::_check_for_completion(){ + for (auto& l : me->legs) + if (l.order_state.status == ChildStatus::WORKING) + return; + // all orders are in end state -> go to end state + _switch_state(PyramidAlgo::Status::DONE); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 0acfa06f2..bcc8e5947 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -43,6 +43,10 @@ private: bool _working_state_met() const; static api::Side _opp (api::Side); void _switch_state (Status new_status); + void _handle_order_in_working (OrderKey key, const ChildState &st); + void _handle_order_in_waiting_cancel (OrderKey key, const ChildState &st); + void _send_hedges (Quantity filled_qty); + void _check_for_completion(); }; } // namespace orderman From e179f7e5a483d39ef52dbcf5e73fa4b88dc2c0e6 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 28 Aug 2019 12:27:36 -0400 Subject: [PATCH 085/225] Some error handling (originating the algo from the wrong top spread) --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 24 +++++++++++++++++-- .../orders/algo/algo_orders/PyramidAlgo.h | 6 +++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index c643debb5..769cd22d9 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -77,7 +77,7 @@ IAlgoServices& PyramidAlgo::_algo() const { return *me->algo_services; } OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ - auto conv_res = _convert_params(def.custom_def()); + auto conv_res = _get_creation_params(def.custom_def(), serv); if (std::get<1>(conv_res)){ // params are good me->params = std::get<0>(conv_res); @@ -121,7 +121,7 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { _algo().terminate_error("Invalid update"); return; } - auto conv_res = _convert_params(update.custom()); + auto conv_res = _get_update_params(update, me->params); if (!std::get<1>(conv_res)){ _algo().terminate_error("Invalid update"); return; @@ -222,6 +222,26 @@ PyramidAlgo::_convert_params (const CustomOrderDefinition& cod){ return std::make_tuple(rv,true,std::string("")); } +std::tuple +PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, + IBeforeLaunchAlgoServices& serv){ + auto rv = _convert_params(cod); + if (std::get<1>(rv)){ + const auto& p = std::get<0>(rv); + if(p.sec_keys[0].value() != serv.security().id()){ + std::get<2>(rv) = "Algo can only be launched from the Top Spread"; + std::get<1>(rv) = false; + } + } + return rv; +} + +std::tuple +PyramidAlgo::_get_update_params(const Update&, + const PyramidAlgoParams& curr_params){ + return std::make_tuple(curr_params,true,std::string("")); +} + ChildTemplate* PyramidAlgo::_create_order_template ( IBeforeLaunchAlgoServices& serv, SecurityKey key, diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index bcc8e5947..585a5403c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -36,6 +36,12 @@ private: IAlgoServices& _algo() const ; static std::tuple _convert_params ( const bts::api::orderman::CustomOrderDefinition&); + static std::tuple _get_creation_params( + const bts::api::orderman::CustomOrderDefinition&, + IBeforeLaunchAlgoServices&); + static std::tuple _get_update_params( + const api::orderman::Update&, + const PyramidAlgoParams& curr_params); ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, SecurityKey, api::Side) const; From 69dcfdb2bd9e0abe3b4c1f3bf3ee2921b19eb433 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 3 Sep 2019 16:57:41 -0400 Subject: [PATCH 086/225] Delete parameter added --- src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp | 9 ++++++++- src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h | 3 ++- .../orderman/orders/algo/algo_orders/RegisterDorman.cpp | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 769cd22d9..51d9641ed 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -8,6 +8,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/utils/PBUtils.h" +#include namespace bts { namespace orderman { @@ -208,11 +209,15 @@ PyramidAlgo::_convert_params (const CustomOrderDefinition& cod){ else return std::make_tuple(rv,false, std::string("Top Spread is not defined")); + rv.top_delete = Quantity(r.has_value() ? r.value() : UINT32_MAX); for (size_t i = 0; i < 5; i++){ auto idx = std::to_string(i+1); auto b = get_if(params, "Spread " + idx); - if (b.has_value() && b.value() != 0) + if (b.has_value() && b.value() != 0){ rv.sec_keys.emplace_back(b.value()); + auto pu = get_if(params, "Spread " + idx + " Payup"); + rv.cover_payups.emplace_back(pu.has_value() ? pu.value() : UINT32_MAX); + } } if(rv.sec_keys.size() < 3) return std::make_tuple( @@ -302,6 +307,7 @@ bool PyramidAlgo::_working_state_met() const{ const auto& ps = l.opp_md()[0]; cover_sum += ps.price(); } + // TODO, check for delete return !os::is_nan(cover_sum) && ((me->side == api::Side::SIDE_BUY && me->out_price.value() <= cover_sum) || @@ -379,6 +385,7 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ if (filled_qty.value() > 0) for (auto& l : me->legs) if(!l.is_top_spread()) + // check payup l.order_key = _algo().launch_child( *l.order_template, Price(l.opp_md()[0].price()), diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 585a5403c..6092c857e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -18,7 +18,8 @@ class PyramidAlgo : public IAlgoOrder { struct PyramidAlgoParams{ // first one is the top std::vector sec_keys; - Quantity del_threshold; + Quantity top_delete; + std::vector cover_payups; }; public: OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 663202822..d4c7e1da4 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -122,11 +122,17 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { join_desc.set_dynamic_order_type("Pyramid"); *join_desc.add_param_desc() = param_uint32("Top Spread"); + *join_desc.add_param_desc() = param_uint32("Delete"); *join_desc.add_param_desc() = param_uint32("Spread 1"); + *join_desc.add_param_desc() = param_uint32("Spread 1 Payup"); *join_desc.add_param_desc() = param_uint32("Spread 2"); + *join_desc.add_param_desc() = param_uint32("Spread 2 Payup"); *join_desc.add_param_desc() = param_uint32("Spread 3"); + *join_desc.add_param_desc() = param_uint32("Spread 3 Payup"); *join_desc.add_param_desc() = param_uint32("Spread 4"); + *join_desc.add_param_desc() = param_uint32("Spread 4 Payup"); *join_desc.add_param_desc() = param_uint32("Spread 5"); + *join_desc.add_param_desc() = param_uint32("Spread 5 Payup"); srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); } From aaca502500ad99171bfe761a8779c04dda22cae6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 9 Sep 2019 11:42:11 -0500 Subject: [PATCH 087/225] add dispatcher thread name to assert log --- src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs index b28b21b41..0419641eb 100644 --- a/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs +++ b/src/client/spark/view/Shell/ViewModels/ShellThreadFactory.cs @@ -42,8 +42,8 @@ namespace mbts.ui.shell try { Dispatcher.Run(); } - catch (Exception e) { - Log.assert(false, e.ToString()); + catch (Exception ex) { + Log.assert(false, $"Exception on dispatcher thread '{name}': {ex}."); } finally { Log.Ui.info("Disposing slow {0} and cleaning up background thread.".fmt(name)); From fe647044f80daaef6ba735c1e30db1ac3612e820 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 9 Sep 2019 15:03:52 -0400 Subject: [PATCH 088/225] Adding comments to SpreaderUtils --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 37 ++++++++++++++----- .../spreader_orders/spreader/SpreaderUtils.h | 8 ++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 51d9641ed..e6ef95071 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -25,6 +25,8 @@ struct LegData{ OrderKey order_key; ChildState order_state; Book book; + Quantity top_delete; + Quantity cover_payup; LegData (size_t index_a, SecurityKey sec_key_a, api::Side side_a, @@ -36,7 +38,9 @@ struct LegData{ order_template (order_template_a), order_key(null_order_key()), order_state(), - book() + book(), + top_delete(0), + cover_payup(0) { } const BookSide& opp_md() const{ @@ -131,7 +135,7 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { case PyramidAlgo::Status::WAITING_FOR_MD: me->out_price = Price(update.price()); me->out_qty = Quantity(update.quantity()); - // TODO, check is qty >= filled (filled >=0 in the case of attach) + // TODO, check if qty >= filled (filled >=0 in the case of attach) break; case PyramidAlgo::Status::WORKING: me->out_price = Price(update.price()); @@ -242,8 +246,10 @@ PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, } std::tuple -PyramidAlgo::_get_update_params(const Update&, +PyramidAlgo::_get_update_params(const Update& update, const PyramidAlgoParams& curr_params){ + auto rv = _convert_params(update.custom()); + // TODO: compare contracts and dont allow them to change return std::make_tuple(curr_params,true,std::string("")); } @@ -307,12 +313,25 @@ bool PyramidAlgo::_working_state_met() const{ const auto& ps = l.opp_md()[0]; cover_sum += ps.price(); } - // TODO, check for delete - return !os::is_nan(cover_sum) && - ((me->side == api::Side::SIDE_BUY && - me->out_price.value() <= cover_sum) || - (me->side == api::Side::SIDE_SELL && - me->out_price.value() >= cover_sum)); + bool rv = !os::is_nan(cover_sum) && + ((me->side == api::Side::SIDE_BUY && + me->out_price.value() <= cover_sum) || + (me->side == api::Side::SIDE_SELL && + me->out_price.value() >= cover_sum)); + if (!rv){ + // price condition does not met, but if the + // cum qty at the top leg price is > threashold + // then the condition is met () + const auto& top_leg = me->legs[0]; + Quantity cumm_level_qty; + SpreaderUtils::find_qty_upto_price_level(top_leg.book, + top_leg.side, + Price(me->out_price), + 0.0, + cumm_level_qty); + rv = cumm_level_qty.value() > top_leg.top_delete.value(); + } + return rv; } api::Side PyramidAlgo::_opp (api::Side side){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 0d34acfe2..559fa2c96 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -238,11 +238,9 @@ public: } } // CRITICAL PATH (for hedging) - // travserses the book to locate the target_price, - // and finds the qty at the target price and the - // cum qty upto that price. - // returns false if the target_price is not found. - // this is used to find the qty and cumm_qty + // travserses the book to locate the target_price, + // and finds the cumm qty up to that level (last our arg) + // Returns false if the target_price is not found. static bool find_qty_upto_price_level (const Book& book, api::Side book_side, Price target_price, From 1b767f6e5efeccba6eae535473022fb41f51dfad Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 9 Sep 2019 18:03:07 -0400 Subject: [PATCH 089/225] Cleaning up --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 87 +++++++++++-------- .../orders/algo/algo_orders/PyramidAlgo.h | 9 +- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index e6ef95071..ef20cc95e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -17,6 +17,7 @@ using namespace api::orderman; enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DONE }; + struct LegData{ const size_t index; const SecurityKey sec_key; @@ -25,8 +26,8 @@ struct LegData{ OrderKey order_key; ChildState order_state; Book book; - Quantity top_delete; - Quantity cover_payup; + Quantity top_delete; // this will be DONTCARE for covers + Quantity cover_payup;// this will be DONTCARE for top LegData (size_t index_a, SecurityKey sec_key_a, api::Side side_a, @@ -87,9 +88,15 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { // params are good me->params = std::get<0>(conv_res); me->side = def.side(); - size_t i = 0; - for (SecurityKey key : me->params.sec_keys){ - auto side = i == 0 ? def.side() : _opp(def.side()); + // top spread + auto* t = _create_order_template(serv, + me->params.top_spread, + def.side()); + me->legs.emplace_back(0, me->params.top_spread, def.side(), t); + // covers + size_t i = 1; + for (SecurityKey key : me->params.cover_spreads){ + auto side = _opp(def.side()); auto* t = _create_order_template(serv, key, side); @@ -109,8 +116,8 @@ void PyramidAlgo::do_launch(IAlgoServices& algo_services) { me->algo_services = &algo_services; me->out_price = algo_services.price(); me->out_qty = algo_services.quantity(); - for (SecurityKey bkey : me->params.sec_keys) - algo_services.subscribe_book(bkey); + for (const LegData& l : me->legs) + algo_services.subscribe_book(l.sec_key); } void PyramidAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { } @@ -131,6 +138,14 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { _algo().terminate_error("Invalid update"); return; } + else{ + // copy state + auto params = std::get<0>(conv_res); + me->legs[0].top_delete = params.top_delete; + size_t i = 1; + for (Quantity pu : params.cover_payups) + me->legs[i++].cover_payup = pu; + } switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: me->out_price = Price(update.price()); @@ -199,58 +214,56 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { /////////////////////////////////////////////////////////////////////////////// // helpers //////////////////////////////////////////////////////////////////// -std::tuple -PyramidAlgo::_convert_params (const CustomOrderDefinition& cod){ +PyramidAlgo::PyramidAlgoParams PyramidAlgo::_convert_params ( + const CustomOrderDefinition& cod){ const DynamicOrderDefinition& def = cod.dynamic(); const auto& params = def.order_params(); PyramidAlgoParams rv; // rv.sec_keys.emplace_back(4294964892); // rv.sec_keys.emplace_back(4294964643); // rv.sec_keys.emplace_back(4294964605); - auto r = get_if(params, "Top Spread"); - if (r.has_value() && r.value()!=0) - rv.sec_keys.emplace_back(r.value()); - else - return std::make_tuple(rv,false, - std::string("Top Spread is not defined")); + // top contract + auto r = get_if(params, "Top Spread"); + rv.top_spread = r.has_value() ? SecurityKey(r.value()) : SecurityKey(0); + // top delete + r = get_if(params, "Delete"); rv.top_delete = Quantity(r.has_value() ? r.value() : UINT32_MAX); for (size_t i = 0; i < 5; i++){ auto idx = std::to_string(i+1); auto b = get_if(params, "Spread " + idx); if (b.has_value() && b.value() != 0){ - rv.sec_keys.emplace_back(b.value()); + rv.cover_spreads.emplace_back(b.value()); auto pu = get_if(params, "Spread " + idx + " Payup"); rv.cover_payups.emplace_back(pu.has_value() ? pu.value() : UINT32_MAX); } } - if(rv.sec_keys.size() < 3) - return std::make_tuple( - rv, - false, - std::string("Pyramid Algo has to have atlest 2 base spreads")); - return std::make_tuple(rv,true,std::string("")); -} - -std::tuple -PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, - IBeforeLaunchAlgoServices& serv){ - auto rv = _convert_params(cod); - if (std::get<1>(rv)){ - const auto& p = std::get<0>(rv); - if(p.sec_keys[0].value() != serv.security().id()){ - std::get<2>(rv) = "Algo can only be launched from the Top Spread"; - std::get<1>(rv) = false; - } - } return rv; } +std::tuple +PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, + IBeforeLaunchAlgoServices& serv){ + PyramidAlgo::PyramidAlgoParams rv = _convert_params(cod); + // error checking + if(rv.top_spread.value() != serv.security().id()) + return std::make_tuple(rv,false, + "Algo can only be launched from the Top Spread"); + if(rv.cover_spreads.size() < 2) + return std::make_tuple(rv,false, + "Not enough cover spreads"); + if (rv.cover_spreads[0].value() == 0 || + rv.cover_spreads[1].value() == 0) + return std::make_tuple(rv,false, + "Not enough cover spreads"); + return std::make_tuple(rv,true,std::string("")); +} + std::tuple PyramidAlgo::_get_update_params(const Update& update, - const PyramidAlgoParams& curr_params){ + const PyramidAlgoParams&){ auto rv = _convert_params(update.custom()); // TODO: compare contracts and dont allow them to change - return std::make_tuple(curr_params,true,std::string("")); + return std::make_tuple(rv,true,std::string("")); } ChildTemplate* PyramidAlgo::_create_order_template ( diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 6092c857e..83cbc51b6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -16,9 +16,10 @@ class PyramidAlgo : public IAlgoOrder { PyramidAlgo(); ~PyramidAlgo(); struct PyramidAlgoParams{ - // first one is the top - std::vector sec_keys; + // first one is the top + SecurityKey top_spread; Quantity top_delete; + std::vector cover_spreads; std::vector cover_payups; }; public: @@ -35,7 +36,9 @@ class PyramidAlgo : public IAlgoOrder { std::unique_ptr me; private: IAlgoServices& _algo() const ; - static std::tuple _convert_params ( + // converts parameters from the CustomOrderDefinition::dynamic + // to PyramidAlgoParams + static PyramidAlgoParams _convert_params ( const bts::api::orderman::CustomOrderDefinition&); static std::tuple _get_creation_params( const bts::api::orderman::CustomOrderDefinition&, From 1b3f5bc8a6a574c37a5f6c3c2f62f1c07d088bcf Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 11 Sep 2019 13:44:37 -0400 Subject: [PATCH 090/225] Fixed a bug with reporting --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 90 ++++++++++--------- .../orders/algo/algo_orders/PyramidAlgo.h | 11 +-- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index ef20cc95e..7c20eedfe 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -17,7 +17,6 @@ using namespace api::orderman; enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DONE }; - struct LegData{ const size_t index; const SecurityKey sec_key; @@ -25,13 +24,15 @@ struct LegData{ ChildTemplate* order_template = nullptr; OrderKey order_key; ChildState order_state; + bool recv_book; Book book; Quantity top_delete; // this will be DONTCARE for covers Quantity cover_payup;// this will be DONTCARE for top LegData (size_t index_a, SecurityKey sec_key_a, api::Side side_a, - ChildTemplate* order_template_a) + ChildTemplate* order_template_a, + Quantity qty) : index (index_a), sec_key (sec_key_a), @@ -39,9 +40,10 @@ struct LegData{ order_template (order_template_a), order_key(null_order_key()), order_state(), + recv_book(false), book(), - top_delete(0), - cover_payup(0) + top_delete(index == 0 ? qty.value() : 0), + cover_payup(index == 0 ? 0 : qty.value()) { } const BookSide& opp_md() const{ @@ -50,6 +52,10 @@ struct LegData{ bool is_top_spread() const{ return index == 0; } + void set_book (const Book& book_a){ + recv_book = true; + book = book_a; + } }; struct PyramidAlgo::PImpl { @@ -92,15 +98,17 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto* t = _create_order_template(serv, me->params.top_spread, def.side()); - me->legs.emplace_back(0, me->params.top_spread, def.side(), t); + me->legs.emplace_back(0, me->params.top_spread, def.side(), t, + me->params.top_delete); // covers - size_t i = 1; + size_t i = 0; for (SecurityKey key : me->params.cover_spreads){ auto side = _opp(def.side()); auto* t = _create_order_template(serv, key, side); - me->legs.emplace_back(i++, key, side, t); + me->legs.emplace_back(i+1, key, side, t, me->params.cover_payups[i]); + i++; } } else @@ -181,8 +189,8 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { void PyramidAlgo::on_book(SecurityKey key, const Book& book) { LegData* leg_data = me->find_leg_from_sec(key); if(leg_data != nullptr){ - leg_data->book = book; - _analyze_and_act(); + leg_data->set_book(book); + _analyze_md_and_act(); } } void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { @@ -194,20 +202,26 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { static_cast(me->state), static_cast(st.status), st.total_fills, - st.last_price); - - switch(me->state){ + st.last_price); + LegData* leg = me->find_leg_from_ord_key (key); + if (leg == nullptr){ + LOG(OrderMan, Error, + "PyramidAlgo::on_child_change key:{} unknown order:{}", + _algo().order_key(), key); + return; + } + switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: bts_assert_msg (false, "No child orders"); break; case PyramidAlgo::Status::WORKING: - _handle_order_in_working (key, st); + _handle_order_in_working (*leg, st); break; case PyramidAlgo::Status::WAITING_FOR_CANCEL: - _handle_order_in_waiting_cancel(key, st); + _handle_order_in_waiting_cancel(*leg, st); break; case PyramidAlgo::Status::DONE: - break; + break; } } @@ -278,11 +292,11 @@ ChildTemplate* PyramidAlgo::_create_order_template ( return &(serv.make_child_template(order_def)); } -void PyramidAlgo::_analyze_and_act(){ +void PyramidAlgo::_analyze_md_and_act(){ switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: for (const LegData& l : me->legs) - if(l.opp_md()[0].size() == 0) + if(!l.recv_book) return; // received data for the first time if (_working_state_met()){ @@ -292,7 +306,7 @@ void PyramidAlgo::_analyze_and_act(){ *top_leg.order_template, me->out_price, me->out_qty); - LOG(OrderMan, Info,"PyramidAlgo::_analyze_and_act launching order key:{} " + LOG(OrderMan, Info,"PyramidAlgo::_analyze_md_and_act launching order key:{} " "child_key:{} price:{} qty:{}", _algo().order_key(), top_leg.order_key, @@ -331,7 +345,7 @@ bool PyramidAlgo::_working_state_met() const{ me->out_price.value() <= cover_sum) || (me->side == api::Side::SIDE_SELL && me->out_price.value() >= cover_sum)); - if (!rv){ + if (!rv && !os::is_nan(cover_sum)){ // price condition does not met, but if the // cum qty at the top leg price is > threashold // then the condition is met () @@ -379,26 +393,11 @@ void PyramidAlgo::_switch_state(Status new_state){ me->state = new_state; } -void PyramidAlgo::_handle_order_in_waiting_cancel(OrderKey key, - const ChildState& st){ - LegData* leg = me->find_leg_from_ord_key (key); - if (leg == nullptr) - LOG(OrderMan, Error, - "PyramidAlgo::on_child_change key:{} unknown order:{}", - _algo().order_key(), key); - else if(leg->is_top_spread()) - _send_hedges(st.last_fills); - _check_for_completion(); -} - -void PyramidAlgo::_handle_order_in_working (OrderKey key, +void PyramidAlgo::_handle_order_in_working (LegData& leg, const ChildState &st){ - LegData* leg = me->find_leg_from_ord_key (key); - if (leg == nullptr) - LOG(OrderMan, Error, - "PyramidAlgo::on_child_change key:{} unknown order:{}", - _algo().order_key(), key); - else if(leg->is_top_spread()){ + leg.order_state = st; + if(leg.is_top_spread()){ + _algo().update_fill_state(st.total_fills, st.last_price); _send_hedges(st.last_fills); switch (st.status) { case ChildStatus::WORKING: @@ -408,9 +407,19 @@ void PyramidAlgo::_handle_order_in_working (OrderKey key, _algo().cancel("Unexpected child cancel"); _switch_state(PyramidAlgo::Status::WAITING_FOR_CANCEL); break; - } - _check_for_completion(); + } } + _check_for_completion(); +} + +void PyramidAlgo::_handle_order_in_waiting_cancel(LegData& leg, + const ChildState& st){ + leg.order_state = st; + if(leg.is_top_spread()){ + _algo().update_fill_state(st.total_fills, st.last_price); + _send_hedges(st.last_fills); + } + _check_for_completion(); } void PyramidAlgo::_send_hedges (Quantity filled_qty){ @@ -429,6 +438,7 @@ void PyramidAlgo::_check_for_completion(){ if (l.order_state.status == ChildStatus::WORKING) return; // all orders are in end state -> go to end state + _algo().complete(); _switch_state(PyramidAlgo::Status::DONE); } diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 83cbc51b6..804e96c8b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -1,15 +1,12 @@ #pragma once -#include "lib/domain_model/Security.pb.h" -#include "lib/md/PriceSize.h" #include "lib/orderman/orders/algo/IAlgoOrder.h" -//namespace bts{namespace api{namespace orderman{class ChildTemplate;}}} - namespace bts { namespace orderman { class ChildTemplate; +class LegData; class PyramidAlgo : public IAlgoOrder { public: @@ -49,12 +46,12 @@ private: ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, SecurityKey, api::Side) const; - void _analyze_and_act(); + void _analyze_md_and_act(); bool _working_state_met() const; static api::Side _opp (api::Side); void _switch_state (Status new_status); - void _handle_order_in_working (OrderKey key, const ChildState &st); - void _handle_order_in_waiting_cancel (OrderKey key, const ChildState &st); + void _handle_order_in_working (LegData&, const ChildState &st); + void _handle_order_in_waiting_cancel (LegData&, const ChildState &st); void _send_hedges (Quantity filled_qty); void _check_for_completion(); }; From bb232d8f1e50551c328545220d960d5f702f8768 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 12 Sep 2019 17:17:15 -0400 Subject: [PATCH 091/225] Add easy convert to immutable function c# --- src/lib/api/service_compiler/templates/c#/immutable.pb.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs index 06c8260c6..2698f8750 100644 --- a/src/lib/api/service_compiler/templates/c#/immutable.pb.cs +++ b/src/lib/api/service_compiler/templates/c#/immutable.pb.cs @@ -10,6 +10,7 @@ namespace {{package}} { {{#each message_type}} partial class {{name}} : bts.api.IImmutableMessage { MessageDescriptor bts.api.IImmutableMessage.Descriptor => {{name}}.Descriptor; + public {{name}}Immutable immutable() => new {{name}}Immutable(this); } public readonly partial struct {{name}}Immutable : bts.api.IImmutableMessage { readonly {{name}} _impl; From b5b5101faf0e9df8714f82384e3f7a27459cb6f1 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 12 Sep 2019 17:17:57 -0400 Subject: [PATCH 092/225] SP-229 Allow ErrorReportService to accept an arbitrary list of files --- src/lib/api/services/ErrorReportService.proto | 6 ++++ .../sparkd/support/ErrorReportService.cpp | 34 +++++++++++-------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/lib/api/services/ErrorReportService.proto b/src/lib/api/services/ErrorReportService.proto index d85ec4e4c..d5d382d9d 100644 --- a/src/lib/api/services/ErrorReportService.proto +++ b/src/lib/api/services/ErrorReportService.proto @@ -4,6 +4,11 @@ option csharp_namespace="bts.support"; import "lib/api/apioptions.proto"; import "google/protobuf/timestamp.proto"; +message FileData { + string name = 1; + bytes contents = 2; +} + message ErrorReport { google.protobuf.Timestamp timestamp = 1; string user = 2; @@ -13,6 +18,7 @@ message ErrorReport { string log = 6; bytes image = 7; string contact = 8; + repeated FileData files = 9; } message ErrorResponse { } diff --git a/src/server/sparkd/support/ErrorReportService.cpp b/src/server/sparkd/support/ErrorReportService.cpp index 1a90be267..5b972267a 100644 --- a/src/server/sparkd/support/ErrorReportService.cpp +++ b/src/server/sparkd/support/ErrorReportService.cpp @@ -29,6 +29,17 @@ ErrorReportServer::ErrorReportServer(bts::api::ServiceContext& context) : ErrorReportServer::~ErrorReportServer() {} +void write_file(const std::string& destination, const std::string& data) { + if (data.size() > 0) { + std::ofstream file; + file.open(destination, std::ios::binary); + if (file.is_open()) { + file << data; + file.close(); + } + } +} + void ErrorReportServer::send_report( const ErrorReport& request, const api::Response& reply) { @@ -37,7 +48,7 @@ void ErrorReportServer::send_report( auto dt = datetime::local_now(); auto dir_name = request.user() + "-" + datetime::FIX_timestamp(dt); dir_name = os::sanitize_file_name(dir_name); - dir_name = get_report_dir() + dir_name; + dir_name = get_report_dir() + dir_name + "/"; // create directory with that name boost::filesystem::create_directories(dir_name); @@ -46,7 +57,7 @@ void ErrorReportServer::send_report( // user_text.txt std::ofstream file; - file.open(dir_name + "/user_text.txt"); + file.open(dir_name + "user_text.txt"); if (file.is_open()) { file << request.user() << " - " << request.contact() << std::endl; file << "================" << std::endl; @@ -56,20 +67,13 @@ void ErrorReportServer::send_report( file.close(); } // logs.txt - if (request.log().size() > 0) { - file.open(dir_name + "/logs.txt"); - if (file.is_open()) { - file << request.log(); - file.close(); - } - } + write_file(dir_name + "logs.txt", request.log()); // screenshot.jpeg - if (request.image().size() > 0) { - file.open(dir_name + "/screenshot.jpeg", std::ios::binary); - if (file.is_open()) { - file << request.image(); - file.close(); - } + write_file(dir_name + "screenshot.jpeg", request.image()); + for (const auto& fd : request.files()) { + // boost::filesystem::path p = fd.name(); + auto name = os::sanitize_file_name(fd.name()); + write_file(dir_name + name, fd.contents()); } // log error for visibility From 62274f5129bbd61c768c941416c3f2413f90d63b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 12 Sep 2019 17:18:47 -0400 Subject: [PATCH 093/225] Append windows event log and crash dumps to error reports --- src/client/spark/Daemons/ErrorReporter.cs | 31 ++++++ .../Dialogs/SupportRequestWindow.xaml.cs | 60 +++++++----- src/client/spark_core/logging/LogUtil.cs | 96 +++++++++++++++++++ src/client/spark_core/logging/Logger.cs | 32 ------- src/client/spark_core/utils/FileUtils.cs | 76 +++++++++++++++ src/lib/CMakeDeps_win.cmake | 2 +- 6 files changed, 239 insertions(+), 58 deletions(-) create mode 100644 src/client/spark_core/logging/LogUtil.cs delete mode 100644 src/client/spark_core/logging/Logger.cs create mode 100644 src/client/spark_core/utils/FileUtils.cs diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index fa8ccc6ad..3c77d0538 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -11,6 +11,7 @@ using System.Windows.Threading; using System.Windows; using System.Threading.Tasks; using mbts.ui.shell; +using Google.Protobuf; namespace bts.spark { @@ -48,6 +49,36 @@ namespace bts.spark ErrorMessage = message, }); } + + public static ErrorReportImmutable append_logs(ErrorReportImmutable src) { + var result = src.CloneToMutable(); + + var windows_log = LogUtil.read_windows_event_log(); + if (!windows_log.IsEmpty) { + result.Files.Add(new FileData { + Name = "Application.evtx.gz", + Contents = windows_log + }); + } + + var (data,date) = LogUtil.read_latest_crash_dump(); + if (!data.IsEmpty) { + result.Files.Add(new FileData { + Name = $"spark-{date.ToString("s")}.dmp.gz", + Contents = data + }); + } + + var spark_log = LogUtil.read_logs_compressed(); + if (!spark_log.IsEmpty) { + result.Files.Add(new FileData { + Name = "log.gz", + Contents = spark_log + }); + } + return result.immutable(); + } + } static class ErrorReporterExtensions { diff --git a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs index 89e202b05..2d17e92b6 100644 --- a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs +++ b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs @@ -1,10 +1,4 @@ -using bts.support; -using Google.Protobuf; -using mbts; -using mbts.ui; -using mbts.ui.shell; -using mbts.ui.utility; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -18,6 +12,13 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; +using bts.support; +using Google.Protobuf; +using mbts; +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.shell; +using mbts.ui.utility; namespace bts.view.controls { partial class SupportRequestWindow : Window { @@ -50,28 +51,37 @@ namespace bts.view.controls { _base = report_base; send_command = new DelegateCommand(send_report, _ => !string.IsNullOrWhiteSpace(_text.Value)); _text = backing(nameof(user_text), ""); - _text.Changed += (_,__) => send_command.TryRaiseCanExecuteChanged(); + _text.Changed += (_, __) => send_command.TryRaiseCanExecuteChanged(); _contact = backing(nameof(user_contact), ""); - _contact.Changed += (_,__) => send_command.TryRaiseCanExecuteChanged(); + _contact.Changed += (_, __) => send_command.TryRaiseCanExecuteChanged(); } async void send_report(object _) { - ByteString screenshot = null; - if (include_screenshot) { - var stream = ScreenCapture.capture_encoded("jpeg"); - screenshot = await ByteString.FromStreamAsync(stream); - } - var reply = await _service.send_report_async(_base.with( - user_description: _text.Value, - contact: user_contact, - log: include_logs ? LogUtil.read_logs() : "", - image: screenshot - )); - if (reply.success) { - BTSMessageBox.Show("Your message has been received.", "Thank You", BTSMessageBoxButtons.OK, MessageBoxImage.Information, is_modal: false, top_most:true); - } - else { - BTSMessageBox.Show($"There was an error submitting your message. '{reply.error_message}'", "Error", BTSMessageBoxButtons.OK, MessageBoxImage.Error, is_modal: false, top_most: true); + using (var d = new BusyDialog { Text = "Sending your error report...", Topmost = true }) { + d.Show(); + ByteString screenshot = null; + if (include_screenshot) { + var stream = ScreenCapture.capture_encoded("jpeg"); + screenshot = await ByteString.FromStreamAsync(stream); + } + var request = await Task.Run(() => { + var result = _base.with( + user_description: _text.Value, + contact: user_contact, + image: screenshot); + if (include_logs) { + result = spark.ErrorReporter.append_logs(result); + } + return result; + }); + + var reply = await _service.send_report_async(request); + if (reply.success) { + BTSMessageBox.Show("Your message has been received.", "Thank You", BTSMessageBoxButtons.OK, MessageBoxImage.Information, is_modal: false, top_most: true); + } + else { + BTSMessageBox.Show($"There was an error submitting your message. '{reply.error_message}'", "Error", BTSMessageBoxButtons.OK, MessageBoxImage.Error, is_modal: false, top_most: true); + } } } diff --git a/src/client/spark_core/logging/LogUtil.cs b/src/client/spark_core/logging/LogUtil.cs new file mode 100644 index 000000000..7c7d569b8 --- /dev/null +++ b/src/client/spark_core/logging/LogUtil.cs @@ -0,0 +1,96 @@ +using System; +using System.IO; +using mbts.config; +using System.IO.Compression; +using System.Runtime.InteropServices; +using Google.Protobuf; +using bts; +using System.Linq; +using bts.support; + +namespace mbts +{ + public static class LogUtil { + private static string log_path = Path.Combine(Configuration.get().data_path, "logging", "log"); + + + + public static ByteString read_logs_compressed() { + return FileUtils.read_and_gzip(log_path); + } + + public static (ByteString,DateTime) read_latest_crash_dump() { + // Find the latest crash dump + // If it is < 5 days old + // gzip it in place (delete original) + // upload the gziped dump + + var crash_dump_folder = "c:\\programdata\\bts\\crash_dumps"; + FileUtils.keep_n_matching_files(crash_dump_folder, "*.gz", 4); + try { + if (Directory.Exists(crash_dump_folder)) { + var latest = + Directory.GetFiles(crash_dump_folder, "*.dmp") + .Select(f => new { name = f, modified = File.GetLastWriteTimeUtc(f) }) + .OrderBy(f => f.modified) + .Reverse() + .FirstOrDefault(); + if (latest != null) { + if (DateTime.Now - latest.modified <= TimeSpan.FromDays(5)) { + var newname = FileUtils.gzip_file_in_place(latest.name); + if (!string.IsNullOrEmpty(newname)) { + return (ByteString.FromStream(File.OpenRead(newname)), latest.modified); + } + } + } + } + } + catch (Exception e) { + Log.Gen.error($"Failed to read crash dumps. Exception: {e.Message}"); + } + return (ByteString.Empty, DateTime.MinValue); + } + + public static ByteString read_windows_event_log() { + // try to export the events to temp + var temp = Path.Combine(Path.GetTempPath(), Path.GetTempFileName() + ".evtx"); + bool success = NativeMethods.EvtExportLog( + IntPtr.Zero, + "Application", + "*", + temp, + NativeMethods.EventExportLogFlags.ChannelPath); + if (success) { + var result = FileUtils.read_and_gzip(temp); + FileUtils.try_delete(temp); + return result; + } + else { + string msg = new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error()).Message; + Log.Gen.error($"Error exporting windows event log. {msg}"); + } + return ByteString.Empty; + } + + + static class NativeMethods { + [Flags] + public enum EventExportLogFlags { + ChannelPath = 1, + LogfilePath = 2, + TolerateQueryErrors = 0x1000 + } + + [DllImport("wevtapi.dll", CallingConvention=CallingConvention.Winapi, CharSet = CharSet.Auto, SetLastError =true)] + public static extern bool EvtExportLog( + IntPtr session, + string path, + string query, + string targetPath, + [MarshalAs(UnmanagedType.I4)] + EventExportLogFlags flags); + + } + + } +} diff --git a/src/client/spark_core/logging/Logger.cs b/src/client/spark_core/logging/Logger.cs deleted file mode 100644 index a1dacd603..000000000 --- a/src/client/spark_core/logging/Logger.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Net.Mail; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using mbts.config; -using System.Collections.Generic; - - -namespace mbts -{ - public static class LogUtil { - public static string read_logs() { - var log_path = Path.Combine(Configuration.get().data_path, "logging", "log"); - if (File.Exists(log_path)) { - try { - using (var f = File.Open(log_path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { - var reader = new StreamReader(f); - return reader.ReadToEnd(); - } - } - catch (Exception e) { - return e.ToString(); - } - } - return "Log file does not exist"; - } - - } -} diff --git a/src/client/spark_core/utils/FileUtils.cs b/src/client/spark_core/utils/FileUtils.cs new file mode 100644 index 000000000..6be341755 --- /dev/null +++ b/src/client/spark_core/utils/FileUtils.cs @@ -0,0 +1,76 @@ +using System; +using System.IO; +using System.IO.Compression; +using System.Linq; +using Google.Protobuf; + +namespace bts.support { + static class FileUtils { + public static bool try_delete(string path) { + try { + if (File.Exists(path)) { + File.Delete(path); + } + else if (Directory.Exists(path)) { + Directory.Delete(path, true); + } + } + catch { + return false; + } + return true; + } + + public static ByteString read_and_gzip(string path) { + if (File.Exists(path)) { + try { + using (var fs = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite /*Note: ReadWrite is more permissive than Read*/)) + using (var ms = new MemoryStream()) + using (var gz = new GZipStream(ms, CompressionMode.Compress, true)) { + fs.CopyTo(gz); + gz.Close(); + return ByteString.CopyFrom(ms.GetBuffer(), 0, (int)ms.Length); + } + } + catch (Exception e) { + Log.Gen.error($"Failed to read file '{path}' -- {e.Message}"); + return ByteString.Empty; + } + } + return ByteString.Empty; + } + + + // If input exists compress it and add a .gz extension + // original file is deleted + public static string gzip_file_in_place(string file) { + if (File.Exists(file)) { + string destination = file + ".gz"; + using (var input = File.OpenRead(file)) { + using (var output = File.OpenWrite(destination)) { + using (var writer = new GZipStream(output, CompressionMode.Compress)) { + input.CopyTo(writer); + } + } + } + try_delete(file); + return destination; + } + return null; + } + + // Delete the oldest files matching pattern (*.txt) keeping {count} files + public static void keep_n_matching_files(string directory, string pattern, int count) { + var to_delete = + Directory.GetFiles(directory, pattern) + .Select(f => new { name = f, modified = File.GetLastWriteTimeUtc(f) }) + .OrderBy(f => f.modified) + .Reverse() + .Skip(count); + + foreach (var f in to_delete) { + try_delete(f.name); + } + } + } +} diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index ecd7b1cc6..2c14978ea 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/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/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file From 44571a5af5c6f37436b83d9925c442b1451d0c71 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 16 Sep 2019 10:41:58 -0400 Subject: [PATCH 094/225] spark shell should dispose daemons --- src/client/spark/view/Shell/ShellModel.cs | 8 +++++++- src/client/spark/view/Shell/ViewModels/LauncherVM.cs | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Shell/ShellModel.cs b/src/client/spark/view/Shell/ShellModel.cs index 776ee66cd..7832bf1c5 100644 --- a/src/client/spark/view/Shell/ShellModel.cs +++ b/src/client/spark/view/Shell/ShellModel.cs @@ -114,10 +114,16 @@ namespace mbts.ui } public void Dispose() { - foreach (IShellModule module in _modules.OrderBy(m => m.priority).Reverse()) { + foreach (var module in _modules.OrderBy(m => m.priority).Reverse()) { module.Dispose(); } _modules.Clear(); + foreach (var daemon in _services) { + if (daemon is IDisposable d) { + d.Dispose(); + } + } + _services.Clear(); } } } \ No newline at end of file diff --git a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs index 63b760725..f44e83649 100644 --- a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs +++ b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs @@ -123,7 +123,7 @@ namespace mbts.ui.shell { _shown = true; if (_window != null) { Application.Current.ShutdownMode = ShutdownMode.OnMainWindowClose; - if (shown != null) shown(); + shown?.Invoke(); _window.Show(); } } From c78e6e83152012b2cfe48af44d89431c557b20f3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 10:43:19 -0400 Subject: [PATCH 095/225] rather large master -> ice merge --- docker/linux | 2 +- externals | 2 +- src/lib/CMakeDeps_win.cmake | 2 +- .../api/service_helpers/AdminServiceUtils.cpp | 17 +++++------ .../api/service_helpers/AdminServiceUtils.h | 2 -- src/lib/orderman/orders/GLBXNativeOrder.h | 2 +- src/lib/orderman/orders/ICENativeOrder.cpp | 29 ++++++++++--------- src/lib/orderman/orders/ICENativeOrder.h | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docker/linux b/docker/linux index b09d4c035..e13bb5d8d 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit b09d4c035b4c0d0e600c7639cd9cb5edaee98d2e +Subproject commit e13bb5d8df14171a9a5abfdb8b6b4ecbc519032a diff --git a/externals b/externals index 6b8c745fb..67a79263b 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 +Subproject commit 67a79263ba116a7646beb8368cef015530bea027 diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index ecd7b1cc6..0f42c5041 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/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/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 440ea9ee5..b9a50356e 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1276,13 +1276,13 @@ void AdminServiceUtils::set_user_exchange_data(bts::api::admin::BTSUser* user, if (!user->user_data().has_exchange_user_data()) user->mutable_user_data()->mutable_exchange_user_data()->CopyFrom(exchange_user_data); } -void AdminServiceUtils::set_user_md_entitlement_data(bts::api::admin::BTSUser* user, - const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){ - if (!user->has_user_data()) - user->mutable_user_data(); - if (!user->user_data().has_exchange_md_entitlement_data()) - user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data); -} +// void AdminServiceUtils::set_user_md_entitlement_data(bts::api::admin::BTSUser* user, +// const bts::api::admin::ExchangeUserMarketDataEntitlementData& exchange_user_md_entitelemnt_data){ +// if (!user->has_user_data()) +// user->mutable_user_data(); +// if (!user->user_data().has_exchange_md_entitlement_data()) +// user->mutable_user_data()->mutable_exchange_md_entitlement_data()->CopyFrom(exchange_user_md_entitelemnt_data); +// } void AdminServiceUtils::clear_user_accounts (bts::api::admin::BTSUser* user){ if(user->has_user_data() && user->user_data().has_account_permissions()) user->mutable_user_data()->clear_account_permissions(); @@ -1538,8 +1538,7 @@ void AdminServiceUtils::bootstrap_data (bts::api::admin::AdminData& data){ auto user_2 = create_user(data, def_group->id(), std::string("bts_2"), std::string("bts_2"), empty, empty, false, license_data, license_entitlements, user_result); user_2->set_is_active(true); auto user_3 = create_user(data, def_group->id(), std::string("bts_3"), std::string("bts_3"), empty, empty, false, license_data, license_entitlements, user_result); user_3->set_is_active(true); //associate users - bts::api::admin::UserAccountPermissionUnit permission_unit; - permission_unit.mutable_trading_permission()->set_submit_market_orders(true); + bts::api::admin::UserAccountPermissionUnit permission_unit; permission_unit.mutable_trading_permission()->set_has_permissions(true); permission_unit.mutable_admin_permission()->set_has_permissions(true); bts::api::admin::UserAccountPermissions account_permissions; diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index c72283cdb..3a654548a 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -97,8 +97,6 @@ public: const AdminData& data); static const ICEAccountData* get_account_ice_data(const BTSAccount& account, const AdminData& data); - static const ICEAccountData* get_account_ice_data(const BTSAccount& account, - const AdminData& data); static const SIMAccountData* get_account_sim_data(const BTSAccount& account, const AdminData& data); // returns true if an account has a connection diff --git a/src/lib/orderman/orders/GLBXNativeOrder.h b/src/lib/orderman/orders/GLBXNativeOrder.h index ee2a8b001..82d7c8ae3 100644 --- a/src/lib/orderman/orders/GLBXNativeOrder.h +++ b/src/lib/orderman/orders/GLBXNativeOrder.h @@ -33,7 +33,7 @@ class NativeOrder : public NativeOrderBase { api::orderman::OrderDefinition on_init_from_exe_report(ExecutionReport const &, - const PreActivationOrderServices &) override + const PreActivationOrderServices &) override; protected: void warm_up_activate(OrderServicesData &, OrderServices &) override; diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index e05348387..4969efc7f 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -34,7 +34,7 @@ struct ICENativeOrder::PImpl { PImpl() : services(nullptr), session_services(), sec(nullptr), - previous_position_contribution(0), definition(), state(), + previous_working_position(0), definition(), state(), price_encoding_precision(7), exchange_order_id(), sender_compid(), id_scale() { exchange_order_id.reserve(100); @@ -44,7 +44,7 @@ struct ICENativeOrder::PImpl SessionServices *session_services; const api::Security *sec; - Quantity previous_position_contribution; + Quantity previous_working_position; OrderDefinition definition; OrderState state; @@ -141,7 +141,7 @@ void ICENativeOrder::init_recovered_common(const api::orderman::OrderRecord& rec me->definition = def; me->state = rec.state(); me->sec = serv.sec_db.resolve(SecurityKey(def.security_key())); - me->previous_position_contribution = Quantity(rec.state().filled_quantity()); + me->previous_working_position = Quantity(0); const auto &native_state = get_native_state(me->state); setup_ids(native_state.routing_record().sender_compid()); @@ -1021,19 +1021,19 @@ void ICENativeOrder::update_working_position() { if (me->sec) { - auto current_position = position_contribution(); - auto previous_position = me->previous_position_contribution; - me->previous_position_contribution = current_position; + auto current_position = working_position(); + auto previous_position = me->previous_working_position; + me->previous_working_position = current_position; if (current_position.value() > previous_position.value()) { - me->services->limiter().add( *me->sec, AccountID(me->definition.account_id()), - me->definition.side(), Quantity(current_position.value() - previous_position.value()), true); + me->services->limiter().add_to_working_position( *me->sec, AccountID(me->definition.account_id()), + me->definition.side(), Quantity(current_position.value() - previous_position.value()) ); } else if (previous_position.value() > current_position.value()) { - me->services->limiter().remove( *me->sec, AccountID(me->definition.account_id()), - me->definition.side(), Quantity(previous_position.value() - current_position.value()), true); + me->services->limiter().remove_from_working_position( *me->sec, AccountID(me->definition.account_id()), + me->definition.side(), Quantity(previous_position.value() - current_position.value()) ); } } else @@ -1260,7 +1260,7 @@ void ICENativeOrder::transition_to_error(api::orderman::NativeOrderState::SubErr transition(ORDER_STATUS_ERROR, msg); } -Quantity ICENativeOrder::position_contribution() +Quantity ICENativeOrder::working_position() { switch (me->state.status()) { @@ -1268,13 +1268,16 @@ Quantity ICENativeOrder::position_contribution() case ORDER_STATUS_WORKING: case ORDER_STATUS_PENDING_WORKING: case ORDER_STATUS_DISCONNECTED: - return Quantity(std::max(me->state.quantity(), me->state.filled_quantity())); + if (me->state.quantity() > me->state.filled_quantity()) + return Quantity(me->state.quantity() - me->state.filled_quantity()); + else + return Quantity(0); case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_ERROR: case ORDER_STATUS_COMPLETED: case ORDER_STATUS_CANCELED: - return Quantity(me->state.filled_quantity()); + return Quantity(0); case ORDER_STATUS_INACTIVE: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index 91a53f9c8..7c615c7a9 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -64,7 +64,7 @@ class ICENativeOrder : public NativeOrderBase { void update_working_position(); bool has_exchange_order_id(); - Quantity position_contribution(); + Quantity working_position() ; bool is_old_exe_report(api::orderman::NativeOrderState &, const NewExecutionReportEvent &) const; bool terminal_state(api::orderman::OrderStatus status) const; From e6ab7d825a2c8527206b0e25a9a1e47853265af4 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 11:15:56 -0400 Subject: [PATCH 096/225] fix fs build --- src/lib/config/defaults/MarketData.conf | 34 +++++++++++++------------ src/lib/config/defaults/Symbols.conf | 4 +-- src/server/sparkd/cmds/FIXSim.cpp | 2 +- src/web/ui/src/Controls/Fields.fs | 5 ++-- src/web/ui/src/Users/View.fs | 18 ++++++------- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/lib/config/defaults/MarketData.conf b/src/lib/config/defaults/MarketData.conf index 9d63e760e..7ffb0b467 100644 --- a/src/lib/config/defaults/MarketData.conf +++ b/src/lib/config/defaults/MarketData.conf @@ -62,34 +62,36 @@ ICEOptions { value { channel { name: "oil" #these names are arbitrary and are for debugging + market_type: 3 + uds_market_type: 3 + market_type: 4 #ICE IPE Gas Oil Futures + uds_market_type: 4 market_type: 5 #ICE Futures Brent, IPE Brent Futures uds_market_type: 5 market_type: 9 #ICE Futures WTI, ICE WTI Crude Futures uds_market_type: 9 - ##market_type: 13 #ICE Heating Oil Futures - ##uds_market_type: 13 - ##market_type: 15 #ICE NYH (RBOB) Gasoline Futures - ##uds_market_type: 15 + market_type: 13 #ICE Heating Oil Futures + uds_market_type: 13 + market_type: 15 #ICE NYH (RBOB) Gasoline Futures + uds_market_type: 15 ##market_type: 21 #ICE Futures US Agricultures, Coffee C ##uds_market_type: 21 ##market_type: 23 #ICE Futures US Agricultures, FCOJ A ##uds_market_type: 23 - market_type: 26 #ICE Futures US Financials DX - uds_market_type: 26 + ##market_type: 26 #ICE Futures US Financials DX + ##uds_market_type: 26 uds_market_type: 11 #ICE WTI-Brent spreads - ##uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack - ##uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack - ##uds_market_type: 58 #ICE Futures UI Heating Oil / Brent - ##uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack + uds_market_type: 14 #ICE Heating Oil/WTI Futures Crack + uds_market_type: 16 #ICE NYH (RBOB) Gasoline/WTI Futures Crack + uds_market_type: 58 #ICE Futures UI Heating Oil / Brent + uds_market_type: 59 #ICE NYH (RBOB) Gasoline/Brent Futures Crack + uds_market_type: 66 #ICE NYH (RBOB) Gasoline/Heating Oil Spread + uds_market_type: 70 #ICE Heating Oil/LS Gasoil Futures Spread + uds_market_type: 71 #ICE LS Gasoil/Brent Futures Crack + uds_market_type: 72 #ICE NYH (RBOB) Gasoline/LS Gasoil Futures Spread - # market_type: 44 #ICE Henry Hub - # uds_market_type: 44 - - # market_type: 1 #ICE Financial Power - # uds_market_type: 1 - #udp_buffer_size: 33554432 #32mb #onixs_log_mode: Debug } # channel { diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 25634c1b9..c95aaba61 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -68,14 +68,12 @@ SymbolLists symbol: "BRN" symbol: "WBS" symbol: "OJ" + symbol: "G" symbol: "KC" symbol: "UHO" symbol: "UHU" symbol: "DX" - symbol: "HEN" - symbol: "HIS" - symbol: "HNG" symbol: "*" } list diff --git a/src/server/sparkd/cmds/FIXSim.cpp b/src/server/sparkd/cmds/FIXSim.cpp index 413719a14..2ce8e9bfe 100644 --- a/src/server/sparkd/cmds/FIXSim.cpp +++ b/src/server/sparkd/cmds/FIXSim.cpp @@ -5,7 +5,7 @@ namespace bts { namespace cmd { int FIXSim::execute(std::vector const &) { - bts::sim::start_exchange_sim(); + bts::sim::start_exchange_sim(bts::api::Venue::VENUE_GLBX); return 0; } diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 08b53953e..2a80caaa1 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -150,6 +150,7 @@ let password (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = ] @ attrs) ] ] + let number (lbl:string) (dv:string) (attrs:IHTMLProp list) (validate: string -> bool) onchange = let errorClass = match dv |> validate with @@ -184,8 +185,8 @@ let positiveIntNumber (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = -let number64 (lbl:string) (dv:int64) (attrs:IHTMLProp list) onchange = - text lbl (string dv) attrs (int64>>onchange) +let number_novalidate (lbl:string) (dv) (attrs:IHTMLProp list) onchange = + text lbl (string dv) attrs (unbox>>onchange) let double (lbl:string) (dv:double) (attrs:IHTMLProp list) onchange = diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 722554310..4b0a7b2fe 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -280,7 +280,7 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = br [] h2 [Class "is-size-3"] [ str "ICE" ] div [] [ - Fields.number "Company ID" iceData.companyId [ ] (ICECompanyID >> UpdateField >> dispatch) + Fields.number_novalidate "Company ID" iceData.companyId [ ] (ICECompanyID >> UpdateField >> dispatch) Fields.text "Operator ID" iceData.operatorId [ ] (ICEOperatorID >> UpdateField >> dispatch) Fields.text "Authorized Trader" iceData.authorizedTrader [ ] (ICEAuthorizedTrader >> UpdateField >> dispatch) Fields.text "Authorized Group" iceData.authorizedGroup [ ] (ICEAuthorizedGroup >> UpdateField >> dispatch) @@ -289,14 +289,14 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) = h2 [Class "is-size-4"] [ str "MIFID" ] div [Style [MarginLeft "2em"]] [ - Fields.number64 "Client Id Code" iceData.mifidClientIdCode [ ] (MifidClientIdCode >> UpdateField >> dispatch) - Fields.number "Commodity Deriv Indicator" iceData.mifidCommodityDerivIndicator [ ] (MifidCommodityDerivIndicator >> UpdateField >> dispatch) - Fields.number "Direct Electronic Access" iceData.mifidDirectElectronicAccess [ ] (MifidDirectElectronicAccess >> UpdateField >> dispatch) - Fields.number64 "Execution Decision" iceData.mifidExecutionDecision [ ] (MifidExecutionDecision >> UpdateField >> dispatch) - Fields.number64 "Id" iceData.mifidId [ ] (MifidId >> UpdateField >> dispatch) - Fields.number64 "Investment Decision" iceData.mifidInvestmentDecision [ ] (MifidInvestmentDecision >> UpdateField >> dispatch) - Fields.number "Liquidity Provision" iceData.mifidLiquidityProvision [ ] (MifidLiquidityProvision >> UpdateField >> dispatch) - Fields.number "Trading Capacity" iceData.mifidTradingCapacity [ ] (MifidTradingCapacity >> UpdateField >> dispatch) + Fields.number_novalidate "Client Id Code" iceData.mifidClientIdCode [ ] (MifidClientIdCode >> UpdateField >> dispatch) + Fields.number_novalidate "Commodity Deriv Indicator" iceData.mifidCommodityDerivIndicator [ ] (MifidCommodityDerivIndicator >> UpdateField >> dispatch) + Fields.number_novalidate "Direct Electronic Access" iceData.mifidDirectElectronicAccess [ ] (MifidDirectElectronicAccess >> UpdateField >> dispatch) + Fields.number_novalidate "Execution Decision" iceData.mifidExecutionDecision [ ] (MifidExecutionDecision >> UpdateField >> dispatch) + Fields.number_novalidate "Id" iceData.mifidId [ ] (MifidId >> UpdateField >> dispatch) + Fields.number_novalidate "Investment Decision" iceData.mifidInvestmentDecision [ ] (MifidInvestmentDecision >> UpdateField >> dispatch) + Fields.number_novalidate "Liquidity Provision" iceData.mifidLiquidityProvision [ ] (MifidLiquidityProvision >> UpdateField >> dispatch) + Fields.number_novalidate "Trading Capacity" iceData.mifidTradingCapacity [ ] (MifidTradingCapacity >> UpdateField >> dispatch) ] ] br [] From 5908b4478ec1b1ea92c43f0ee211e89cd522573c Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 16 Sep 2019 13:20:03 -0400 Subject: [PATCH 097/225] Error reports should be logged on the client --- .../spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs index 2d17e92b6..a5a139800 100644 --- a/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs +++ b/src/client/spark/view/Controls/Dialogs/SupportRequestWindow.xaml.cs @@ -77,10 +77,13 @@ namespace bts.view.controls { var reply = await _service.send_report_async(request); if (reply.success) { + Log.Ui.info("Support request message has been received."); BTSMessageBox.Show("Your message has been received.", "Thank You", BTSMessageBoxButtons.OK, MessageBoxImage.Information, is_modal: false, top_most: true); } else { - BTSMessageBox.Show($"There was an error submitting your message. '{reply.error_message}'", "Error", BTSMessageBoxButtons.OK, MessageBoxImage.Error, is_modal: false, top_most: true); + var errmsg = $"There was an error submitting your message. '{reply.error_message}'"; + Log.Ui.error(errmsg); + BTSMessageBox.Show(errmsg, "Error", BTSMessageBoxButtons.OK, MessageBoxImage.Error, is_modal: false, top_most: true); } } } From 399e4bf654d52949ff809238a880e8a458255cdc Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 16 Sep 2019 13:48:12 -0400 Subject: [PATCH 098/225] SP-229 Detect unclean shell shutdown and automatically upload an error report --- src/client/spark/Daemons/ErrorReporter.cs | 9 ++++ src/client/spark/Daemons/OopsDaemon.cs | 55 +++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 src/client/spark/Daemons/OopsDaemon.cs diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index 3c77d0538..8af305dfd 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -49,6 +49,15 @@ namespace bts.spark ErrorMessage = message, }); } + public async Task report_silently(string contact, string description, string userdata) { + var request = append_logs(new ErrorReport { + User = _username, + ErrorMessage = description, + UserDescription = userdata, + Contact = contact + }.immutable()); + var reply = await _svc.send_report_async(request); + } public static ErrorReportImmutable append_logs(ErrorReportImmutable src) { var result = src.CloneToMutable(); diff --git a/src/client/spark/Daemons/OopsDaemon.cs b/src/client/spark/Daemons/OopsDaemon.cs new file mode 100644 index 000000000..791394414 --- /dev/null +++ b/src/client/spark/Daemons/OopsDaemon.cs @@ -0,0 +1,55 @@ +using System; +using System.ComponentModel.Composition; +using mbts.ui; +using mbts; +using Newtonsoft.Json; +using System.Threading.Tasks; + +namespace bts.spark { + [Export(typeof(IShellDaemon))] + class OopsDaemon : IShellDaemon, IDisposable { + [ImportingConstructor] + public OopsDaemon(ErrorReporter e) { + var pid = get_pid(); + if (pid.HasValue) { + handle_unclean_shutdown(e, pid.Value); + } + save_pid(); + } + + public void Dispose() { + clear_pid(); + } + + void handle_unclean_shutdown(ErrorReporter e, int oldpid) { + string extra = ""; + try { + var conf = mbts.config.Configuration.get(); + extra = JsonConvert.SerializeObject(conf, Formatting.Indented); + } + catch { } + Task.Run(() => e.report_silently( + $"Host: {Environment.MachineName}", + $"pid: {oldpid}\n{extra}", + "Automated crash report") + ); + } + + const string _subkey = @"Software\BTS"; + private void save_pid() { + using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(_subkey)) { + key.SetValue("pid", System.Diagnostics.Process.GetCurrentProcess().Id, Microsoft.Win32.RegistryValueKind.DWord); + } + } + private void clear_pid() { + using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(_subkey)) { + key.DeleteValue("pid"); + } + } + private int? get_pid() { + using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(_subkey)) { + return key.GetValue("pid") as int?; + } + } + } +} From bf8323e79ba8342cbab092c79790bc217d081bc5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 15:53:50 -0400 Subject: [PATCH 099/225] fixed ice entitlements --- .../api/service_helpers/AdminServiceUtils.cpp | 40 +++++++-- .../api/service_helpers/AdminServiceUtils.h | 3 + src/lib/config/defaults/keycode.conf | 8 +- src/lib/md/relay/QueryServer.cpp | 88 +++++++++---------- src/lib/utils/AuthToken.cpp | 8 ++ .../md/platforms/ice_onixs/ICEListener.h | 15 +++- 6 files changed, 102 insertions(+), 60 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index b9a50356e..ebffa69f8 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1145,16 +1145,26 @@ void AdminServiceUtils::validate_user_exchange_data (const bts::api::admin::BTSU } void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, std::vector& entitlements){ - for (const auto& user : admin_data.users()){ - const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user, - admin_data); - if(cme_data!=nullptr){ - for (const auto& cme_mic_data : cme_data->md_permissions()){ - MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, - cme_mic_data); + for (const auto& user : admin_data.users()) + { + const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user, admin_data); + if(cme_data!=nullptr) + { + for (const auto& cme_mic_data : cme_data->md_permissions()) + { + MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, cme_mic_data); entitlements.push_back(rv); } } + const ICEUserData* ice_data=AdminServiceUtils::get_user_ice_data(user, admin_data); + if(ice_data!=nullptr) + { + for (const auto& ice_mic_data : ice_data->md_permissions()) + { + MDEntitlementReportUnit rv=get_ice_md_entitlement_unit(user, ice_mic_data); + entitlements.push_back(rv); + } + } } } MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( @@ -1202,6 +1212,22 @@ MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( rv.set_record_id(key.str()); return rv; } +MDEntitlementReportUnit AdminServiceUtils::get_ice_md_entitlement_unit( + const BTSUser& user, + const ICEMicData& ice_mic_data){ + MDEntitlementReportUnit rv; + rv.set_user(user.name()); + rv.set_user_id(user.id()); + rv.set_exchange( bts::api::Venue_Name(bts::api::Venue::VENUE_ICE) ); + rv.set_mic( bts::api::ICEMics_Name( ice_mic_data.mic()) ); + + rv.set_enabled(ice_mic_data.enabled()); + std::ostringstream key; + key << rv.user() << rv.exchange() << rv.mic(); + rv.set_record_id(key.str()); + return rv; +} + void AdminServiceUtils::get_user_symbol_permissions(const AdminData& data, const BTSUser& user, std::vector& rv){ diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 3a654548a..2b55f6874 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -260,6 +260,9 @@ public: static MDEntitlementReportUnit get_cme_md_entitlement_unit( const BTSUser& user, const CMEMicData& cme_mic_data); + static MDEntitlementReportUnit get_ice_md_entitlement_unit( + const BTSUser& user, + const ICEMicData& ice_mic_data); static void get_user_symbol_permissions( const AdminData& data, const BTSUser& user, diff --git a/src/lib/config/defaults/keycode.conf b/src/lib/config/defaults/keycode.conf index 49832fb86..dd3365479 100644 --- a/src/lib/config/defaults/keycode.conf +++ b/src/lib/config/defaults/keycode.conf @@ -1,9 +1,9 @@ #nusers: 1 -#allow concurrent : false -#expires: 2019-Sep-30 00:00:00 637053984000000000 -#generation_time: 2019-Jun-18 18:25:44.333280 5248650809870720704 +#allow concurrent : true +#expires: 2019-Dec-31 00:00:00 637133472000000000 +#generation_time: 2019-Sep-16 17:50:57.225054 5248728548999638444 EncryptedKeyCode { value { - keycode: "pgtv/OmievnpmNlgxTYuN801Hbetgu7ZGkHnlGWtK+DBrKSEgKxr5lGvCW1ld/jsztkWhKHDh0iediMDjrPm4+C5qmXlt4JJlAFvKolMN8HVC59m82fECvakcqKq28WSEjf6/DuPJNP1ZwxjcmKouxx1LZ15VlNkECtNrC9pkCnifazbfQZGV3kD08zMEyw/RPmOaVLFFeav8lwI5UpcjPYBIK1rJowXdGSvm1CJViwG5Z2JbdHR39QbKjVx112d5VbVtBq9nO3i0FEKvobjN/Gzcz/5x4TgQtEShKsbmgEN+MBVL3AItQlcFzZvE/05JLmfACUFmk5Eu0a3DlLs3A==" + keycode: "E7sUCxYuveyuvvBfwMdTrUCpFROJWQvsy4pYjwZ+zonjHwEmDkjxbxaqUEKqMzBbAq3YFnxIGOrQpRJte71SEoG5FGy4ZoRrVOjrMdNVLmieUWtZU43FKGJzImj/tJKEXu2xgwYJRZTj/AJ8C30PuVnzm0qUmR+UCgCOxKVeK0OFlo6zSqyDutcy5kLW3va+nTuFp43aknm6Iiu8LFW16wa6QDDCSQd4QgnHmiz5wyMC90yGBE4qObTKRGKDl5mWsjEL16aWK2ZO/0/ebFgGG8WygQfkeFzJS7B4q5Ta0nkSkVyLZjq1LN2/g9AXeCzCJUX5/F96kdfsnfSgAJepeg==" } } \ No newline at end of file diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index bd636b4c3..22e37e459 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -78,7 +78,8 @@ struct MDConsumerGroup { symbol(symbol), platform(platform_for_exchange(symbol.exchange())), channel(consumer.get_channel(symbol)), - handles() + handles(), + mic() { set_consumer(consumer); @@ -118,9 +119,34 @@ struct MDConsumerGroup { bts_assert_d(handle.is_initialized()); bts_assert(handle.get_usersymbol() == symbol); DatedHandle h = { TimeStamp::now(), handle }; - handles->push_back(h); + handles->push_back(h); + if(this->mic == "") + set_mic(h); } - + + void set_mic(const DatedHandle& h) + { + if(channel.exchange() == api::VENUE_ICE || channel.exchange() == api::VENUE_SIMICE) + { + this->mic = h.handle.get_normalized_security().ice().mic_code(); + } + else if(channel.exchange() == api::VENUE_GLBX || channel.exchange() == api::VENUE_SIM) + { + const auto& cme_symb_mics = config::get().cme_mic(); + for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++) + { + const auto& micsym = mic->first; + if(micsym == symbol.symbol()) + { + this->mic = api::CMEMics_Name(mic->second); + break; + } + } + } + else + bts_assert_msg(false, "unknown venue in QueryServer"); + } + UserSymbol symbol; Platform platform; MDConsumerChannel channel; @@ -128,7 +154,7 @@ struct MDConsumerGroup { // Can add to handles without invalidating readers (no lock needed) // When we recover we swap a new vector into this unique_ptr and delayed-delete shared_ptr> handles; - + std::string mic; }; void convert(PriceSize ps, PriceSizeMessage* pps) { @@ -222,13 +248,14 @@ public: void fill(const SecurityChannel& chan, MDConsumerGroup& group, ChannelReply* reply, const Entitlements* entitlements, bool bypass_entitlement) const { bts_assert(reply); - bool entitled = bypass_entitlement || chan.exchange() == api::VENUE_BTS || - (chan.exchange() == api::VENUE_GLBX && entitlements && entitlements->count(chan.symbol())); reply->mutable_channel()->CopyFrom(chan); reply->set_platform(group.platform); reply->mutable_channel()->set_time(TimeStamp::now().to_uint64()); - reply->mutable_channel()->set_entitled(entitled); + bool entitled = bypass_entitlement; + if(entitlements && !entitled) + entitled = entitlements->count(group.mic); + reply->mutable_channel()->set_entitled(entitled); auto flags = (MDRequest::Flags)chan.flags(); // Get a copy of handles. If recovery happens during this call @@ -251,12 +278,6 @@ public: auto security = handle.get_normalized_security(); pupd->mutable_security()->CopyFrom(security); snapshot = true; - if(!entitled && (chan.exchange() == api::VENUE_ICE || chan.exchange() == api::VENUE_SIMICE)) - { - entitled = entitlements && entitlements->count("ICE:" + security.ice().mic_code()); - if(entitled) - reply->mutable_channel()->set_entitled(entitled); - } } //if we are not entitled AND this is the first request since we lost our entitlement, zero out books if (!entitled && chan.entitled() ) { @@ -548,44 +569,21 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, MDClient& c container->admin_client.subscribe_md_entitlement_data().subscribe([=](const api::admin::Md_entitlement_dataUpdate& update) { const auto& all_updates = update.all(); utils::Dispatcher::background().post([all_updates, container]() - { - const auto& cme_symb_mics = config::get().cme_mic(); + { auto entitlements = std::make_shared>(); for (const auto& row : all_updates) { if (row && row->enabled()) { - for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++) - { - if(api::CMEMics_Name(mic->second) == row->mic()) - { - const auto& symbol = mic->first; - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert(symbol); - ents.insert("SIM:" + symbol); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert(symbol); - iter->second.insert("SIM:" + symbol); - } - } - } - api::ICEMics icemic; - if(api::ICEMics_Parse(row->mic(), &icemic)) //this is an ice mic, just put the mic in the set and resolve later - { - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert("ICE:" + row->mic()); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert("ICE:" + row->mic()); - } + auto iter = entitlements->find(row->user_id()); + if (iter == entitlements->end()) { + Entitlements ents; + ents.insert(row->mic()); + entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); } + else { + iter->second.insert(row->mic()); + } } } container->relay.update_entitlements(entitlements); diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 9c062c592..2ea9034ac 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -76,6 +76,14 @@ bool requires_auth_session(const admin::BTSUser& user) return true; } } + if(user.user_data().exchange_user_data().has_ice_data()) + { + for(const auto& i: user.user_data().exchange_user_data().ice_data().md_permissions()) + { + if(i.enabled()) + return true; + } + } } return false; } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index e4f4d1083..b73cf1c49 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -216,11 +216,18 @@ void ICEListener::on_uds_future_spread(const Definition& def, bool& is_intereste for(size_t x = 0; x < fsec.leg_count(); ++x) { const auto& leg = legs[x]; - if(leg.ratioPriceNumerator) - fsec.legs[x].leg_price = double_of_price(leg.ratioPriceNumerator.value(), leg.ratioPriceDenominator.value()); - + if(leg.ratioPriceNumerator && leg.ratioPriceDenominator) + { + auto num = *leg.ratioPriceNumerator; + auto denom = *leg.ratioPriceDenominator; + fsec.legs[x].leg_price = num / (double) denom; + } if(leg.ratioQtyNumerator && leg.ratioQtyDenominator) - fsec.legs[x].leg_delta = double_of_price(leg.ratioQtyNumerator.value(), leg.ratioQtyDenominator.value()); + { + auto num = *leg.ratioQtyNumerator; + auto denom = *leg.ratioQtyDenominator; + fsec.legs[x].leg_delta = num / (double) denom; + } fsec.legs[x].leg_quantity = leg.ratio; fsec.legs[x].leg_side = leg.side == onixs_ice::Side::Bid ? api::SIDE_BUY : api::SIDE_SELL; From 838550d78a378276b5567daa6506993d78fb6bdc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 16:15:38 -0400 Subject: [PATCH 100/225] entitlements are tricky --- src/lib/md/relay/QueryServer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 22e37e459..82133f8db 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -252,7 +252,8 @@ public: reply->mutable_channel()->CopyFrom(chan); reply->set_platform(group.platform); reply->mutable_channel()->set_time(TimeStamp::now().to_uint64()); - bool entitled = bypass_entitlement; + + bool entitled = bypass_entitlement || chan.exchange() == api::VENUE_BTS; if(entitlements && !entitled) entitled = entitlements->count(group.mic); reply->mutable_channel()->set_entitled(entitled); From baaa3c4f98503cfc47459c9727fc2849d2058d3c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 16:28:53 -0400 Subject: [PATCH 101/225] Fixed case where a non-super user shell denied market data after bring left up through a server restart --- src/lib/utils/AuthSessionManager.cpp | 12 ++++++++---- src/lib/utils/AuthSessionManager.h | 2 +- src/lib/utils/AuthToken.cpp | 2 +- testing/manual/keycodes/keycode.txt | 3 ++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 8b1b74438..2e22b823d 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -80,7 +80,7 @@ bool AuthSessionManager::validate_ip_port(const bts::config::KeyCode& kc) return portgood && ipgood; } -bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& tok, const admin::BTSUser& user, std::string* msg) +bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& tok, const std::string& username, std::string* msg) { if(tok.wheel()) return true; @@ -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(User, Warn, "KEYCODE: Replacing session {} user:{}:{} ", tok.id(), user.id(), user.name()); + LOG(User, Warn, "KEYCODE: Replacing session {} user:{} ", tok.id(), username); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; - LOG(User, Warn, "KEYCODE: Creating session {} user:{}:{}", tok.id(), user.id(), user.name()); + LOG(User, Warn, "KEYCODE: Creating session {} user:{}", tok.id(), username); return true; } if(msg) *msg = "KEYCODES: Not Enough Logins available for session"; - LOG(User, Error, "KEYCODES: Not Enough Logins available for session {} user:{}:{}", tok.id(), user.id(), user.name()); + LOG(User, Error, "KEYCODES: Not Enough Logins available for session {} user:{}", tok.id(), username); return false; } @@ -134,6 +134,10 @@ bool AuthSessionManager::check_session(const api::user::TokenPayload& tok) bool same_token = _concurrent || (tok.date() == it->second.token.date()); return not_expired && same_token; } + else //not in map, try to login in case server booted + { + return add_or_replace_session(tok); + } } return false; } diff --git a/src/lib/utils/AuthSessionManager.h b/src/lib/utils/AuthSessionManager.h index fa68d097e..1be135bb0 100644 --- a/src/lib/utils/AuthSessionManager.h +++ b/src/lib/utils/AuthSessionManager.h @@ -19,7 +19,7 @@ class AuthSessionManager public: AuthSessionManager(); - bool add_or_replace_session(const api::user::TokenPayload& tok, const admin::BTSUser& user, std::string* msg = nullptr); + bool add_or_replace_session(const api::user::TokenPayload& tok, const std::string& username = "", std::string* msg = nullptr); bool check_session(const api::user::TokenPayload& tok); private: diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 9c062c592..09095b883 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -89,7 +89,7 @@ AuthToken generate_token(const admin::BTSUser& user, std::string* msg) payload.set_wheel(true); if(requires_auth_session(user)) - session_manager().add_or_replace_session(payload, user, msg); + session_manager().add_or_replace_session(payload, user.name(), msg); auto token = encrypt(payload.SerializeAsString()); bts_assert_d(token.size() < 255-8); AuthToken result; diff --git a/testing/manual/keycodes/keycode.txt b/testing/manual/keycodes/keycode.txt index ed9535602..43106e45c 100644 --- a/testing/manual/keycodes/keycode.txt +++ b/testing/manual/keycodes/keycode.txt @@ -23,7 +23,8 @@ You should see keycode details printed to screen -You should see the data zero out on the first instance logged in as bts_2 and data ticking on the bts instance as well as the second bts_2 instance - d)Kill your sparkd + d) Kill your sparkd but leave your shells open + e) bring sparkd back up, you should see market data in the shell logged in as bts AND one of the other shells 4.5) For extra credit generate a keycode with -allow_concurrent and make sure we don't zero the market data for concurrent logins From 16adb9ee182ff89d6d28245c6ec3cd6e7afbb1d7 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 17 Sep 2019 14:09:34 -0400 Subject: [PATCH 102/225] Fixing SP-232 --- .../api/service_helpers/AdminServiceUtils.cpp | 61 +++++++++++++------ .../api/service_helpers/AdminServiceUtils.h | 3 + 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 022542544..80001cbf4 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -886,30 +886,51 @@ std::string AdminServiceUtils::find_user_exchange_id (const bts::api::admin::Adm } return rv; } -std::pair -AdminServiceUtils::find_user_account_matches (const bts::api::admin::AdminData& admin_data, - const std::string& connection, const std::string& exchange_account, + +std::pair +AdminServiceUtils::find_user_account_matches (const AdminData& admin_data, + const std::string& connection, + const std::string& exchange_account, const std::string& exchange_user, api::Venue exchange){ - bts::api::admin::AdminServiceOperationResult find_account_result, find_user_result; - auto account_ptrs = accounts(admin_data, false); - auto user_ptrs = users(admin_data, false); - for(const bts::api::admin::BTSAccount* account_ptr : account_ptrs){ - if (account_has_connection(*account_ptr, connection)){ - if (boost::algorithm::iequals(exchange_account, - find_account_exchange_account(admin_data,*account_ptr,exchange,find_account_result)) && - find_account_result.is_success()){ - for(const bts::api::admin::BTSUser* user_ptr : user_ptrs){ - if (boost::algorithm::iequals(exchange_user, - find_user_exchange_id(admin_data,*user_ptr,exchange,find_user_result)) && - find_user_result.is_success()) - return std::pair(account_ptr,user_ptr); - } - } - } + AdminServiceOperationResult find_account_result, find_user_result; + // i. uses the exchange and exchange_user to reverse lookup the user(s) + auto user_ptrs = users(admin_data, false); + std::vector matching_users; + for (BTSUser const* u : user_ptrs){ + auto exchange_u = find_user_exchange_id(admin_data, *u, + exchange, find_user_result); + if (find_user_result.is_success() && boost::algorithm::iequals ( + exchange_u, + exchange_user)) + matching_users.push_back(u); } - return std::pair(nullptr, nullptr); + // ii. uses the exchange, connection and exchange_account to reverse lookup the account(s) + auto account_ptrs = accounts(admin_data, false); + std::vector matching_accounts; + for (BTSAccount const* a :account_ptrs) + if (account_has_connection(*a, connection)){ + auto exchange_a = find_account_exchange_account(admin_data, *a, + exchange, + find_account_result); + if (find_account_result.is_success() && boost::algorithm::iequals ( + exchange_a, + exchange_account)) + matching_accounts.push_back(a); + } + // iii. finds the first account from ii that the user from i is authorized to trade + for (BTSUser const* u : matching_users){ + std::vector user_auth_accounts; + find_user_trading_accounts (admin_data, u->id(), user_auth_accounts); + for (BTSAccount const* i : user_auth_accounts) + for (BTSAccount const* j : matching_accounts) + if(i->id() == j->id()) + return std::pair(i,u); + } + return std::pair(nullptr, nullptr); } + + // for a given user finds the account permissions (if permissions are // derived from the group, it traverses the group hierarcy to find the // correct permissions. diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index ebd941cf6..70d1e1e5b 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -207,6 +207,9 @@ public: const BTSUser& user, api::Venue exchange, AdminServiceOperationResult& out_result); + // i. uses the exchange and exchange_user to reverse lookup the user(s) + // ii. uses the exchange, connection and exchange_account to reverse lookup the account(s) + // iii. finds the first account from ii that a user from i is authorized to trade static std::pair find_user_account_matches (const AdminData& admin_data, const std::string& connection, From 0156bbfc468064aa977093d3764b4f88b4814c7f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 17 Sep 2019 15:06:04 -0400 Subject: [PATCH 103/225] fix id corner case --- src/lib/orderman/orders/ICENativeOrder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index 4969efc7f..e3341a3de 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -214,6 +214,12 @@ api::orderman::OrderDefinition ICENativeOrder::on_init_from_exe_report(const ExecutionReport& er, const PreActivationOrderServices& os) { auto k = er.order_key; + auto nextid = me->services->gen_id(); + if(k.value() < nextid) + { + k = OrderKey(nextid); + LOG(OrderMan, Error, "Updating recovered order id with newly generated id {}", k.value()); + } OrderRecord orecord; orecord.set_key(k.value()); From 51ffa7e7f72e99abb93cb0aecdd7290bef1a5c5e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 17 Sep 2019 16:15:17 -0400 Subject: [PATCH 104/225] set_mic for synthetics --- src/lib/md/relay/QueryServer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 82133f8db..e404ff2b1 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -143,6 +143,10 @@ struct MDConsumerGroup { } } } + else if(channel.exchange() == api::VENUE_BTS || channel.exchange() == api::VENUE_UNSET) + { + this->mic = "BTS"; + } else bts_assert_msg(false, "unknown venue in QueryServer"); } From d1422ddc5843488918ce38aff91abfd15489aafe Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 17 Sep 2019 16:36:16 -0400 Subject: [PATCH 105/225] fix auth tests --- src/lib/utils/AuthSessionManager.cpp | 5 +++++ src/lib/utils/AuthSessionManager.h | 1 + src/lib/utils/AuthToken.cpp | 5 +++++ src/lib/utils/AuthToken.h | 2 ++ src/lib/utils/tests/AuthTokenTests.cpp | 7 +++++-- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 2e22b823d..0c397d8f9 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -141,6 +141,11 @@ bool AuthSessionManager::check_session(const api::user::TokenPayload& tok) } return false; } + +void AuthSessionManager::clear_sessions() +{ + _map.clear(); +} }}} #endif \ No newline at end of file diff --git a/src/lib/utils/AuthSessionManager.h b/src/lib/utils/AuthSessionManager.h index 1be135bb0..f9b1fa2be 100644 --- a/src/lib/utils/AuthSessionManager.h +++ b/src/lib/utils/AuthSessionManager.h @@ -21,6 +21,7 @@ public: bool add_or_replace_session(const api::user::TokenPayload& tok, const std::string& username = "", std::string* msg = nullptr); bool check_session(const api::user::TokenPayload& tok); + void clear_sessions(); private: bool validate_ip_port(const bts::config::KeyCode& kc); diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 410a5cf89..cd9be38d6 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -51,6 +51,11 @@ AuthSessionManager& session_manager() return mgr; } +void clear_all_sessions() +{ + session_manager().clear_sessions(); +} + bool requires_auth_session(const admin::BTSUser& user) { //if the user can trade in any account or see market data, it needs a session diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index a85605a0b..e8dd1f700 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -10,6 +10,8 @@ namespace auth { AuthToken generate_token(const admin::BTSUser&, std::string* msg = nullptr); AuthToken generate_wheel_token(); bool decode_token(const api::AuthToken& token, user::TokenPayload* payload); +bool requires_auth_session(const admin::BTSUser& user); +void clear_all_sessions(); }}} diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 6bcbe52d8..6c550426d 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -19,7 +19,9 @@ TEST_CASE("AuthToken", "[security]") { // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; - REQUIRE(!api::auth::decode_token(token, &payload)); + api::auth::clear_all_sessions(); + REQUIRE(!api::auth::requires_auth_session(admin_user)); + REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == admin_user.id()); REQUIRE(payload.wheel() == false); } @@ -28,7 +30,8 @@ TEST_CASE("AuthToken", "[security]") { auto token = api::auth::generate_token(trader_user); // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); - api::user::TokenPayload payload; + api::user::TokenPayload payload; + api::auth::clear_all_sessions(); REQUIRE(api::auth::decode_token(token, &payload)); REQUIRE(payload.id() == trader_user.id()); REQUIRE(payload.wheel() == false); From 0fa97aeb5687d57780fb1f94f949fea28bced5cc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 17 Sep 2019 16:43:24 -0400 Subject: [PATCH 106/225] added a service call to clear the auth sessions list in case of keycode trouble --- src/lib/api/services/AuthService.proto | 3 +++ src/server/sparkd/user/AuthServiceServer.cpp | 6 ++++++ src/server/sparkd/user/AuthServiceServer.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/lib/api/services/AuthService.proto b/src/lib/api/services/AuthService.proto index 2dd9997d2..f7b984497 100644 --- a/src/lib/api/services/AuthService.proto +++ b/src/lib/api/services/AuthService.proto @@ -57,4 +57,7 @@ service AuthService { rpc get_users(GetUsersRequest) returns (GetUsersResponse) {option (bts.api.method_description)="Returns list of valid users";} + + rpc clear_all_sessions(bts.api.VoidMessage) returns (bts.api.ResultMessage) + {option (bts.api.method_description)="Clears all reserved auth sessions";} } diff --git a/src/server/sparkd/user/AuthServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp index 357a683c9..9853fb0d4 100644 --- a/src/server/sparkd/user/AuthServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -33,6 +33,12 @@ AuthServiceServer::AuthServiceServer (bts::api::ServiceContext& context) : AuthS AuthServiceServer::~AuthServiceServer () {} +void AuthServiceServer::clear_all_sessions(const api::VoidMessage& , + const std::function& ) +{ + api::auth::clear_all_sessions(); +} + void AuthServiceServer::get_users(const api::user::GetUsersRequest& , const std::function& respond) { diff --git a/src/server/sparkd/user/AuthServiceServer.h b/src/server/sparkd/user/AuthServiceServer.h index 91df48a8e..0e00cc334 100644 --- a/src/server/sparkd/user/AuthServiceServer.h +++ b/src/server/sparkd/user/AuthServiceServer.h @@ -20,6 +20,9 @@ public: void authenticate_login(const api::user::AuthenticateLoginRequest& , const std::function& ) override; + void clear_all_sessions(const api::VoidMessage& , + const std::function& ) override; + private: struct PImpl; std::unique_ptr me; From c9b2ac290ce911f05de28a2eb1538058a6be2af3 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 17 Sep 2019 22:10:53 -0400 Subject: [PATCH 107/225] payup logic implemented --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 7c20eedfe..30c19cac5 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -7,6 +7,7 @@ #include "lib/orderman/orders/algo/IAlgoServices.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" +#include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include @@ -20,6 +21,7 @@ enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DO struct LegData{ const size_t index; const SecurityKey sec_key; + const double tick_size; const api::Side side; //trading side ChildTemplate* order_template = nullptr; OrderKey order_key; @@ -30,12 +32,14 @@ struct LegData{ Quantity cover_payup;// this will be DONTCARE for top LegData (size_t index_a, SecurityKey sec_key_a, + double tick_size_a, api::Side side_a, ChildTemplate* order_template_a, Quantity qty) : index (index_a), sec_key (sec_key_a), + tick_size(tick_size_a), side (side_a), order_template (order_template_a), order_key(null_order_key()), @@ -98,7 +102,8 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto* t = _create_order_template(serv, me->params.top_spread, def.side()); - me->legs.emplace_back(0, me->params.top_spread, def.side(), t, + double tick_size = serv.lookup_security(me->params.top_spread)->contract_spec().low_tick(); + me->legs.emplace_back(0, me->params.top_spread, tick_size, def.side(), t, me->params.top_delete); // covers size_t i = 0; @@ -107,7 +112,8 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto* t = _create_order_template(serv, key, side); - me->legs.emplace_back(i+1, key, side, t, me->params.cover_payups[i]); + double tick_size = serv.lookup_security(key)->contract_spec().low_tick(); + me->legs.emplace_back(i+1, key, tick_size, side, t, me->params.cover_payups[i]); i++; } } @@ -425,12 +431,20 @@ void PyramidAlgo::_handle_order_in_waiting_cancel(LegData& leg, void PyramidAlgo::_send_hedges (Quantity filled_qty){ if (filled_qty.value() > 0) for (auto& l : me->legs) - if(!l.is_top_spread()) + if(!l.is_top_spread()){ + // TODO: check for no market? + const auto& inside_md = l.opp_md()[0]; + Price hedge_price = Price(inside_md.price()); + uint32_t inside_md_qty = inside_md.size(); + if (l.cover_payup.value() != 0 && + inside_md_qty > l.cover_payup.value()) + hedge_price = securities::worsen_price(l.side, hedge_price, Price(l.tick_size)); // check payup l.order_key = _algo().launch_child( *l.order_template, - Price(l.opp_md()[0].price()), + hedge_price, filled_qty); + } } void PyramidAlgo::_check_for_completion(){ From bda135c435da61e41345d2cda3930333dfef464a Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 18 Sep 2019 10:12:40 -0400 Subject: [PATCH 108/225] Add more logging to system tests --- src/client/spark_test/Utils/TestUtils.cs | 6 +++++- .../spark_test/system_test_scripts/test_position_limits.sh | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index f5d8a5c94..2bb90df76 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -145,6 +145,10 @@ namespace bts.tests.utils { products = tmpp.value; break; } + else { + Console.WriteLine("mdrelay.request_products_async Error: "); + Console.WriteLine(tmpp.error_message); + } await Task.Delay(10000); } @@ -239,7 +243,7 @@ namespace bts.tests.utils { Result? md_result = await await_with_timeout( md_relay.requestmd_async(md_request), timeout); - + Console.Write(md_result); return md_result != null; } } diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index 45837eab0..f3ba902b6 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -30,6 +30,8 @@ cat << EOF > $sparkdata_dir/conf/spark.conf } EOF +echo "Port" +./sparkd configcheck -Ports nohup ./sparkd run & pid=$! From a8ffe3a6ecaa8f8c4685d2bba2cb1e67c2599729 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 18 Sep 2019 11:20:13 -0400 Subject: [PATCH 109/225] logging ports --- src/client/spark_test/Utils/TestUtils.cs | 2 +- .../spark_test/system_test_scripts/test_position_limits.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index 2bb90df76..e5a8e6f73 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -132,7 +132,7 @@ namespace bts.tests.utils { public static async Task wait_for_orders_service_ready(TimeSpan timeout) { System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start(); - + Console.WriteLine(mbts.config.Configuration.get()); var ctx = new ServiceContext(); var mdrelay = ctx.locate(); diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index f3ba902b6..3906aec09 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -31,7 +31,7 @@ cat << EOF > $sparkdata_dir/conf/spark.conf EOF echo "Port" -./sparkd configcheck -Ports +./sparkd configcheck Ports nohup ./sparkd run & pid=$! From 7d26ff641e276dc88453c870fe8269cf9a793446 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 18 Sep 2019 12:20:26 -0400 Subject: [PATCH 110/225] more ports --- src/client/spark_test/Utils/TestUtils.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index e5a8e6f73..2c33080eb 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -132,7 +132,14 @@ namespace bts.tests.utils { public static async Task wait_for_orders_service_ready(TimeSpan timeout) { System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start(); - Console.WriteLine(mbts.config.Configuration.get()); + + var prts = mbts.config.Configuration.get(); + Console.WriteLine("\n\n\n\n\n\n\n\n\n\n"); + Console.WriteLine("config_port: " + prts.config_port); + Console.WriteLine("qbus_port: " + prts.qbus_port); + Console.WriteLine("glbx_sim_fix_port: " + prts.glbx_sim_fix_port); + Console.WriteLine("\n\n\n\n\n\n\n\n\n\n"); + var ctx = new ServiceContext(); var mdrelay = ctx.locate(); From be5f54326e5b5c1d5b25087093ed737ffab41f68 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 18 Sep 2019 15:16:28 -0400 Subject: [PATCH 111/225] sparkcmd test should always respect test type (unit/system) --- .../spark_core/TestRunner/InProcessTestRunner.cs | 6 +++--- src/client/spark_core/TestRunner/TestEnumerator.cs | 9 +++++---- src/client/sparkcmd/Cmd/TestCommand.cs | 12 +++++++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/client/spark_core/TestRunner/InProcessTestRunner.cs b/src/client/spark_core/TestRunner/InProcessTestRunner.cs index 871f06b58..4b786d1f5 100644 --- a/src/client/spark_core/TestRunner/InProcessTestRunner.cs +++ b/src/client/spark_core/TestRunner/InProcessTestRunner.cs @@ -10,9 +10,9 @@ using System.Diagnostics; namespace bts.test { public static class InProcessTestRunner { - public static void run_test_synchronously(string v, TestEnumerator enumerator, Action report) { - foreach (var t in enumerator.find(v)) { - run_test_synchronously(t, report); + public static void run_test_synchronously(string v, TestType type, TestEnumerator enumerator, Action report) { + foreach (var t in enumerator.find(v,type)) { + run_test_synchronously(t, report); } } public static void run_test_synchronously(TestMethod test, Action report) { diff --git a/src/client/spark_core/TestRunner/TestEnumerator.cs b/src/client/spark_core/TestRunner/TestEnumerator.cs index e18c9b838..0fbaf3087 100644 --- a/src/client/spark_core/TestRunner/TestEnumerator.cs +++ b/src/client/spark_core/TestRunner/TestEnumerator.cs @@ -36,18 +36,19 @@ namespace bts.test { } - public IEnumerable find(string name) { + public IEnumerable find(string name, TestType type) { foreach (var g in TestGroups) { foreach (var t in g.methods) { - if (g.name == name || t.name == name || t.full_name == name) { + if (g.test_type == type && + (g.name == name || t.name == name || t.full_name == name)) { yield return t; } } } } - public IEnumerable match(IEnumerable names) { - return names.SelectMany(find).Distinct(); + public IEnumerable match(TestType type, IEnumerable names) { + return names.SelectMany(name => find(name,type)).Distinct(); } } diff --git a/src/client/sparkcmd/Cmd/TestCommand.cs b/src/client/sparkcmd/Cmd/TestCommand.cs index 9b071eb7a..aff93988d 100644 --- a/src/client/sparkcmd/Cmd/TestCommand.cs +++ b/src/client/sparkcmd/Cmd/TestCommand.cs @@ -48,7 +48,7 @@ namespace sparkcmd { } else Configuration.initialize(); - Console.WriteLine(JsonConvert.SerializeObject(o)); + ConsoleEx.WriteLine(JsonConvert.SerializeObject(o), ConsoleColor.DarkGray); if (o.list) { list_tests((o.type)); @@ -58,13 +58,19 @@ namespace sparkcmd { if (o.timeout == 0 && o.tests.Count() == 1 && !o.self_contained) { //System.Threading.Thread.Sleep(5000); using (var trr = new TestResultReceiver(true)) { - InProcessTestRunner.run_test_synchronously(o.tests.First(), Enumerator, trr.get_reporter()); + InProcessTestRunner.run_test_synchronously(o.tests.First(), o.type, Enumerator, trr.get_reporter()); trr.print_summary(); + if (trr.ResultCount == 0) { + ConsoleEx.Write("No ", ConsoleColor.Red); + ConsoleEx.Write(o.type.ToString(), ConsoleColor.Yellow); + ConsoleEx.WriteLine($" tests matched filter '{o.tests.First()}'", ConsoleColor.Red); + return -1; + } return trr.ErrorCount; } } else if (o.tests.Count() > 0) { - return run_tests(o, Enumerator.match(o.tests)); + return run_tests(o, Enumerator.match(o.type, o.tests)); } else { return run_tests(o, Enumerator.get_of_type(o.type)); From 71915de4b0e0a9c1a4d839f78657d245be575509 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 18 Sep 2019 15:47:53 -0400 Subject: [PATCH 112/225] sparkcmd CaseInsensitiveEnumValues --- src/client/sparkcmd/Program.cs | 6 +++++- src/client/sparkcmd/sparkcmd.csproj | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 8999b8bcc..96b1d2dc8 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -29,8 +29,12 @@ namespace sparkcmd { // initialized from c++ instead of c# BTSNativeMethods.provide_command_line(args, args.Length); + var parser = new Parser(ps => { + ps.CaseInsensitiveEnumValues = true; + }); + // note: this can be made to infer the options type list from the list of delegates - return Parser.Default + return parser .ParseArguments< ConfigcheckOptions, ScriptClientOptions, diff --git a/src/client/sparkcmd/sparkcmd.csproj b/src/client/sparkcmd/sparkcmd.csproj index 52d9db007..b05a9d2d3 100644 --- a/src/client/sparkcmd/sparkcmd.csproj +++ b/src/client/sparkcmd/sparkcmd.csproj @@ -22,7 +22,7 @@ - + From b42febdf6056b720bf70298afca294e75c0842eb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 18 Sep 2019 16:11:16 -0400 Subject: [PATCH 113/225] Documented OrderMatcher better. --- .../sparkd/exchange_sim/book/OrderMatcher.h | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/src/server/sparkd/exchange_sim/book/OrderMatcher.h b/src/server/sparkd/exchange_sim/book/OrderMatcher.h index 4e4301762..f5d58ac43 100644 --- a/src/server/sparkd/exchange_sim/book/OrderMatcher.h +++ b/src/server/sparkd/exchange_sim/book/OrderMatcher.h @@ -14,27 +14,56 @@ namespace bts { namespace ex_sim { +// An order matcher maintains a book of same security orders +// and generates matches as the sides cross class OrderMatcher { public: OrderMatcher(); ~OrderMatcher(); + // Add a new order, returning any updates to the new order or + // existing ones resulting from matching void add_new(Order const &, std::vector *out); + + // Add a new order or, if a threshold of existing orders at same + // level from the same owner is met, merge its quantity with the + // last similar order. The merge is usefull to keep memory growth + // in check. Return any changes resulting from matching on the new + // order. void add_or_merge(Order const &, std::vector *out); + // Change an existing order, returning any changed orders that + // resulted matches made possible by the update. void update(std::string const &clorid, Price, Quantity, std::vector *out); + + // Cancel an existing order, removing it from the book void cancel(std::string const &clorid); + // Try to reduce the quantity available at the specified level, + // side by the specified owner, by the specified amount. The + // updated orders are not returned. void try_reduce_quantity_at_level(api::Side, Price level, Quantity by_quantity, std::string const& order_owner); + + // Take the all the orders and consolidated their quantities, per + // level, in a book structure Book get_book() const; - OrderBook get_order_book(const char*) const; - + + // Copy all the orders *not* owned by owner to a PB type that can + // be stored on disk + OrderBook get_order_book(const char* owner) const; + + // Get a single order Order const *get_order(std::string const &clorid); - + + // Orders are kept in two multisets (one for bids, one for + // offers). Each multiset uses a comparison operator that uses + // first the price and then the time_changed of each order to sort + // the orders. FIFO matching is a matter of peeling off matching + // entries from bid and offer. using OrdersSide = std::multiset; struct Trade { From 1d538b4cb00b8a954520206cfe603d80ee73f940 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 18 Sep 2019 17:04:38 -0400 Subject: [PATCH 114/225] Code review feedback. Checked DeleteValue --- src/client/spark/Daemons/OopsDaemon.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Daemons/OopsDaemon.cs b/src/client/spark/Daemons/OopsDaemon.cs index 791394414..190f98fa2 100644 --- a/src/client/spark/Daemons/OopsDaemon.cs +++ b/src/client/spark/Daemons/OopsDaemon.cs @@ -10,7 +10,7 @@ namespace bts.spark { class OopsDaemon : IShellDaemon, IDisposable { [ImportingConstructor] public OopsDaemon(ErrorReporter e) { - var pid = get_pid(); + var pid = get_pid(); if (pid.HasValue) { handle_unclean_shutdown(e, pid.Value); } @@ -43,7 +43,7 @@ namespace bts.spark { } private void clear_pid() { using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(_subkey)) { - key.DeleteValue("pid"); + key.DeleteValue("pid",false); } } private int? get_pid() { From cf977befd10c00b2b18a0fa02bb128177652217f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 18 Sep 2019 17:22:09 -0400 Subject: [PATCH 115/225] odds and ends --- src/lib/orderman/orders/algo/IAlgoServices.h | 2 +- .../orders/algo/algo_orders/PyramidAlgo.cpp | 153 +++++++++++------- .../orders/algo/algo_orders/PyramidAlgo.h | 9 +- 3 files changed, 104 insertions(+), 60 deletions(-) diff --git a/src/lib/orderman/orders/algo/IAlgoServices.h b/src/lib/orderman/orders/algo/IAlgoServices.h index 2222c90e1..77cf2450a 100644 --- a/src/lib/orderman/orders/algo/IAlgoServices.h +++ b/src/lib/orderman/orders/algo/IAlgoServices.h @@ -20,7 +20,7 @@ class IAlgoServices : public IBeforeLaunchAlgoServices { // Returns the filled quantity for this algo virtual Quantity total_fills() const = 0; - // Returns wheter the algo is in the process of shutting down (due + // Returns whether the algo is in the process of shutting down (due // to a cancel, an error, or just having completed its work). When // an algo is shutting down any requests to create, update or // cancel child orders will be ignored. diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 30c19cac5..ca2f5e5a7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -16,7 +16,7 @@ namespace orderman { using namespace api::orderman; -enum class PyramidAlgo::Status { WAITING_FOR_MD, WORKING, WAITING_FOR_CANCEL, DONE }; +enum class PyramidAlgo::Status { WAITING_FOR_MD, WAITING_FOR_MD_ATTACH, WORKING, WAITING_FOR_CANCEL, DONE }; struct LegData{ const size_t index; @@ -101,17 +101,19 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { // top spread auto* t = _create_order_template(serv, me->params.top_spread, - def.side()); + def.side(), + true); double tick_size = serv.lookup_security(me->params.top_spread)->contract_spec().low_tick(); me->legs.emplace_back(0, me->params.top_spread, tick_size, def.side(), t, me->params.top_delete); // covers size_t i = 0; for (SecurityKey key : me->params.cover_spreads){ - auto side = _opp(def.side()); + auto side = SpreaderUtils::invert_side(def.side()); auto* t = _create_order_template(serv, key, - side); + side, + false); double tick_size = serv.lookup_security(key)->contract_spec().low_tick(); me->legs.emplace_back(i+1, key, tick_size, side, t, me->params.cover_payups[i]); i++; @@ -131,9 +133,19 @@ void PyramidAlgo::do_launch(IAlgoServices& algo_services) { me->out_price = algo_services.price(); me->out_qty = algo_services.quantity(); for (const LegData& l : me->legs) - algo_services.subscribe_book(l.sec_key); + algo_services.subscribe_book(l.sec_key); } -void PyramidAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { +void PyramidAlgo::do_launch_attached(IAlgoServices& algo_services, + OrderKey key, + ChildState c) { + me->algo_services = &algo_services; + me->legs[0].order_key = key; + me->out_price = c.price; + me->out_qty = c.quantity; + for (const LegData& l : me->legs) + algo_services.subscribe_book(l.sec_key); + _switch_state(PyramidAlgo::Status::WAITING_FOR_MD_ATTACH); + on_child_change(key,c); } // updates //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -162,6 +174,10 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { } switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: + me->out_price = Price(update.price()); + me->out_qty = Quantity(update.quantity()); + break; + case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: me->out_price = Price(update.price()); me->out_qty = Quantity(update.quantity()); // TODO, check if qty >= filled (filled >=0 in the case of attach) @@ -220,6 +236,10 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { case PyramidAlgo::Status::WAITING_FOR_MD: bts_assert_msg (false, "No child orders"); break; + case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: + // cant do anything here since if there are fills + // wont know where the send the hedges + break; case PyramidAlgo::Status::WORKING: _handle_order_in_working (*leg, st); break; @@ -232,16 +252,13 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { } /////////////////////////////////////////////////////////////////////////////// -// helpers //////////////////////////////////////////////////////////////////// +// stateless conversion /////////////////////////////////////////////////////// PyramidAlgo::PyramidAlgoParams PyramidAlgo::_convert_params ( const CustomOrderDefinition& cod){ const DynamicOrderDefinition& def = cod.dynamic(); const auto& params = def.order_params(); PyramidAlgoParams rv; - // rv.sec_keys.emplace_back(4294964892); - // rv.sec_keys.emplace_back(4294964643); - // rv.sec_keys.emplace_back(4294964605); // top contract auto r = get_if(params, "Top Spread"); rv.top_spread = r.has_value() ? SecurityKey(r.value()) : SecurityKey(0); @@ -286,13 +303,19 @@ PyramidAlgo::_get_update_params(const Update& update, return std::make_tuple(rv,true,std::string("")); } +/////////////////////////////////////////////////////////////////////////////// +// order template creation///////////////////////////////////////////////////// + ChildTemplate* PyramidAlgo::_create_order_template ( IBeforeLaunchAlgoServices& serv, SecurityKey key, - api::Side side) const{ + api::Side side, + bool is_top_spread) const{ OrderDefinition order_def = serv.definition(); order_def.set_security_key (key.value()); order_def.set_side(side); + if(!is_top_spread) + order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( api::orderman::LimitOrderDefinition()); return &(serv.make_child_template(order_def)); @@ -301,13 +324,13 @@ ChildTemplate* PyramidAlgo::_create_order_template ( void PyramidAlgo::_analyze_md_and_act(){ switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: - for (const LegData& l : me->legs) - if(!l.recv_book) - return; + if(!_md_recvd()) + return; // received data for the first time if (_working_state_met()){ // enter order, and switch state LegData& top_leg = me->legs[0]; + // this is the only place top spread order is sent (once) top_leg.order_key = _algo().launch_child( *top_leg.order_template, me->out_price, @@ -323,7 +346,17 @@ void PyramidAlgo::_analyze_md_and_act(){ else{ _algo().cancel("Order cancelled (Cover prices not met)"); _switch_state(PyramidAlgo::Status::DONE); - // go to end + } + break; + case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: + if(!_md_recvd()) + return; + // received data for the first time + if (_working_state_met()) + _switch_state(PyramidAlgo::Status::WORKING); + else{ + _algo().cancel("Order cancelled (Cover prices not met)"); + _switch_state(PyramidAlgo::Status::DONE); } break; case PyramidAlgo::Status::WORKING: @@ -338,47 +371,18 @@ void PyramidAlgo::_analyze_md_and_act(){ } } -bool PyramidAlgo::_working_state_met() const{ - double cover_sum = 0.0; - size_t i = 0; - for (const auto& l : me->legs) - if (i++ > 0){ - const auto& ps = l.opp_md()[0]; - cover_sum += ps.price(); - } - bool rv = !os::is_nan(cover_sum) && - ((me->side == api::Side::SIDE_BUY && - me->out_price.value() <= cover_sum) || - (me->side == api::Side::SIDE_SELL && - me->out_price.value() >= cover_sum)); - if (!rv && !os::is_nan(cover_sum)){ - // price condition does not met, but if the - // cum qty at the top leg price is > threashold - // then the condition is met () - const auto& top_leg = me->legs[0]; - Quantity cumm_level_qty; - SpreaderUtils::find_qty_upto_price_level(top_leg.book, - top_leg.side, - Price(me->out_price), - 0.0, - cumm_level_qty); - rv = cumm_level_qty.value() > top_leg.top_delete.value(); - } - return rv; -} - -api::Side PyramidAlgo::_opp (api::Side side){ - return SpreaderUtils::invert_side(side); -} - void PyramidAlgo::_switch_state(Status new_state){ switch(new_state){ case (PyramidAlgo::Status::WAITING_FOR_MD): bts_assert(false); break; - case (PyramidAlgo::Status::WORKING): + case (PyramidAlgo::Status::WAITING_FOR_MD_ATTACH): bts_assert(me->state == PyramidAlgo::Status::WAITING_FOR_MD); break; + case (PyramidAlgo::Status::WORKING): + bts_assert(me->state == PyramidAlgo::Status::WAITING_FOR_MD || + me->state == PyramidAlgo::Status::WAITING_FOR_MD_ATTACH); + break; case (PyramidAlgo::Status::WAITING_FOR_CANCEL): bts_assert(me->state == PyramidAlgo::Status::WORKING); break; @@ -386,6 +390,8 @@ void PyramidAlgo::_switch_state(Status new_state){ bts_assert( // when an order is entered and the criteria is not met me->state == PyramidAlgo::Status::WAITING_FOR_MD || + // when an order is attached and the market conditions are not met + me->state == PyramidAlgo::Status::WAITING_FOR_MD_ATTACH || // when the child order gets into an unexpected state me->state == PyramidAlgo::Status::WORKING || // as expected, order gets cancelled @@ -403,7 +409,7 @@ void PyramidAlgo::_handle_order_in_working (LegData& leg, const ChildState &st){ leg.order_state = st; if(leg.is_top_spread()){ - _algo().update_fill_state(st.total_fills, st.last_price); + _algo().update_fill_state(st.total_fills, st.avg_price); _send_hedges(st.last_fills); switch (st.status) { case ChildStatus::WORKING: @@ -432,7 +438,7 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ if (filled_qty.value() > 0) for (auto& l : me->legs) if(!l.is_top_spread()){ - // TODO: check for no market? + // TODO: check for no market (cache the last observed valid markets) const auto& inside_md = l.opp_md()[0]; Price hedge_price = Price(inside_md.price()); uint32_t inside_md_qty = inside_md.size(); @@ -448,13 +454,50 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ } void PyramidAlgo::_check_for_completion(){ - for (auto& l : me->legs) - if (l.order_state.status == ChildStatus::WORKING) - return; - // all orders are in end state -> go to end state + if(me->legs[0].order_state.status == ChildStatus::WORKING) + return; + // detach the working hedge orders + // for (const auto& l : me->legs) + // if(l.order_state.status == ChildStatus::WORKING) + // _algo().detach_child(l.order_key); + _algo().detach_all_children(); _algo().complete(); _switch_state(PyramidAlgo::Status::DONE); } +bool PyramidAlgo::_md_recvd() const{ + for (const LegData& l : me->legs) + if(!l.recv_book) + return false; + return true; +} + +bool PyramidAlgo::_working_state_met() const{ + double cover_sum = 0.0; + size_t i = 0; + for (const auto& l : me->legs) + if (i++ > 0) + cover_sum += l.opp_md()[0].price(); + bool rv = !os::is_nan(cover_sum) && + ((me->side == api::Side::SIDE_BUY && + me->out_price.value() <= cover_sum) || + (me->side == api::Side::SIDE_SELL && + me->out_price.value() >= cover_sum)); + if (!rv && !os::is_nan(cover_sum)){ + // price condition is not met, but if the + // cum qty at the top leg price is > threashold + // then the condition is met () + const auto& top_leg = me->legs[0]; + Quantity cumm_level_qty; + SpreaderUtils::find_qty_upto_price_level(top_leg.book, + top_leg.side, + Price(me->out_price), + 0.0, + cumm_level_qty); + rv = cumm_level_qty.value() > top_leg.top_delete.value(); + } + return rv; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 804e96c8b..e6bec2e75 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -45,15 +45,16 @@ private: const PyramidAlgoParams& curr_params); ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, SecurityKey, - api::Side) const; - void _analyze_md_and_act(); - bool _working_state_met() const; - static api::Side _opp (api::Side); + api::Side, + bool is_top_spread) const; + void _analyze_md_and_act(); void _switch_state (Status new_status); void _handle_order_in_working (LegData&, const ChildState &st); void _handle_order_in_waiting_cancel (LegData&, const ChildState &st); void _send_hedges (Quantity filled_qty); void _check_for_completion(); + bool _md_recvd() const; + bool _working_state_met() const; }; } // namespace orderman From d7d170f22892d6192b668d8a5b9d21ee29a95451 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Sep 2019 11:23:36 -0500 Subject: [PATCH 116/225] SP-181 Remove the option to enter manual fills of spreads --- src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs index 57579502c..8dcdb489e 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs @@ -70,7 +70,7 @@ namespace bts.shell.manual_fills { mfd => new ManualFillRow(mfd), mfr => mfr.data), _bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(m => { - security_map = m; + security_map = new FilteredDictionary(m, smd => smd.security.ContractCase == Security.ContractOneofCase.Future); RaisePropertyChanged(nameof(security_map)); }), ObservableAutoWrapper.connect_item_hooks(_persisted_rows, r => Disposable.Create(dirty_mon.join(r), selection_mon.join(r))), From 48b62f1cab0684a4950211f3142858b985c757f1 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 19 Sep 2019 13:40:01 -0400 Subject: [PATCH 117/225] new externals --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 67a79263b..b5ca26428 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 67a79263ba116a7646beb8368cef015530bea027 +Subproject commit b5ca264286e2a7033b7ce6ad0000254dea03dc8a From 34fc6af1378e64ed6f0349af24e4120285d2a93a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 19 Sep 2019 14:17:53 -0400 Subject: [PATCH 118/225] fix mview test --- .../spark/Modules/Market/MarketView/MarketViewWindowFactory.cs | 2 +- .../spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index 9f99abcd7..d3ae03818 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -227,7 +227,7 @@ namespace bts.shell { public string strip_name; [ProtoMember(26)] public string last_price_from_spread; - [ProtoMember(27)] + [ProtoMember(28)] public string mic_code; } diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs index efa5d3aa2..45077ef1d 100644 --- a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs +++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs @@ -75,7 +75,7 @@ namespace bts.shell.fills { [DIYGridColumnID(nameof(Columns.Symbol))] public string[] symbol { get; set; } - [ProtoMember(16)] + [ProtoMember(17)] [DIYGridColumnID(nameof(Columns.FillStatus))] public Fill.Types.FillStatus[] fill_status { get; set; } } From 4663ae9e4dcd6e81447a8ce6c8d218e50e3559cf Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 19 Sep 2019 14:38:00 -0400 Subject: [PATCH 119/225] SP-236 Disable websocketpp open_handshake timeout --- src/server/sparkd/http/WebServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 11a6cea27..c5d8e8160 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -84,6 +84,7 @@ namespace http { // Turn off logging _server.clear_access_channels(websocketpp::log::alevel::all); _server.clear_error_channels(websocketpp::log::alevel::all); + _server.set_open_handshake_timeout(0); run(); } From 999973c34978cf822dbcfa7e3077b6070ee37244 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 19 Sep 2019 14:59:09 -0400 Subject: [PATCH 120/225] upgrade websocketpp 0.7.0 to 0.8.1 (externals) --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index b5ca26428..6d8f64ca5 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit b5ca264286e2a7033b7ce6ad0000254dea03dc8a +Subproject commit 6d8f64ca5cee3acbf9addb51428f25d54b9f906a From 33c201b395c5eced02f60e24b934ec1615fca19a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Sep 2019 17:21:17 -0500 Subject: [PATCH 121/225] remove unused SparkTag.CreateOrder --- src/client/spark/Orders/OrdersModel.cs | 1 - src/client/spark/core/Bus/SparkTags.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index b0d45ad96..8ef3241c9 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -241,7 +241,6 @@ namespace mbts.spark { .Filter(os => os.order.is_active() && os.order.State.DisplayStatus == OrderState.Types.DisplayStatus.Visible, key => key.order.Key) .Subscribe(_security_working_orders_with_piq_demuxer), on_positions.Subscribe(_security_positions_demuxer), - _bus.subscribe(SparkTags.CreateOrder).Subscribe(a => send_order(a.definition, a.price, a.size).ignore()), _bus.subscribe(SparkTags.RecreateOrder).Subscribe(a => a.ForEach(x => send_order(x.definition, x.price, x.size).ignore())), _bus.subscribe(SparkTags.CancelOrders).Subscribe(x => cancel_orders(x).ignore()), _bus.subscribe(SparkTags.DetachOrders).Subscribe(x => detach_orders(x).ignore()), diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index a05477e7f..0449e8065 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -17,7 +17,6 @@ namespace mbts.spark { #endregion #region Order - public static ITag<(OrderDefinitionImmutable definition, double price, uint size)> CreateOrder { get; } = new SparkTag<(OrderDefinitionImmutable, double, uint)>(); public static ITag> RecreateOrder { get; } = new SparkTag>(); public static ITag> CancelOrders { get; } = new SparkTag>(); From 1eb8352b6b101e4f5ae9a3f283c09b2d308cef2d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Sep 2019 17:21:48 -0500 Subject: [PATCH 122/225] OrdersModel blocks GlbxIceberg orders from going out to non-glbx exchange --- .../Modules/Trading/Ladder/VM/LadderVM.cs | 2 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 10 ++++++- src/client/spark/Orders/NewOrderTicketVM.cs | 2 +- src/client/spark/Orders/OrderUtils.cs | 7 +++++ src/client/spark/Orders/OrdersModel.cs | 30 +++++++++++++++---- 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index f72d2cc1c..d5d1c38da 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -451,7 +451,7 @@ namespace mbts.spark { price = temp_price; } } - await _model.order_gateway.send_order(order, price, size); + await _model.order_gateway.send_order(security, order, price, size); if (auto_clear) size_calculator.value = 0; var fav_algo = order_properties_vm.selected_favorite_algo_definition; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 54ffe800c..40990a269 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -288,7 +288,14 @@ namespace mbts.spark { double price = attach_vm.price; uint? size = attach_vm.size; uint algo_template_key = attach_vm.algo_vm.algo_root.id.is_persisted ? attach_vm.algo_vm.algo_root.id.persisted : 0u; - var order_tups = selected_rows.Select(r => r.order_tuple).ToList(); + // Don't pass any order tuples that don't have a security defined. + // The actual security is passed to the OrdersModel - instead of just the security key - + // so it can prevent GlbxIceberg orders from being sent to a non-glbx exchange (such as Ice). + /// Impl details: + var order_tups = selected_rows + .Select(r => r.order_tuple) + .Where(ot => ot.order.security.HasValue) + .ToList(); var mod_algo_vm = attach_vm.algo_vm.algo_root; await Task.WhenAll(order_tups.Select(t => { var algo = t.order.order.Def.CustomDef.actual().CloneToMutable(); @@ -302,6 +309,7 @@ namespace mbts.spark { }; } return _model.send_order( + t.order.security.Value, t.order.order.Def.with( attach_target_order_key: t.order.order.Key, custom_def: algo diff --git a/src/client/spark/Orders/NewOrderTicketVM.cs b/src/client/spark/Orders/NewOrderTicketVM.cs index f9945b649..4e5b36122 100644 --- a/src/client/spark/Orders/NewOrderTicketVM.cs +++ b/src/client/spark/Orders/NewOrderTicketVM.cs @@ -53,7 +53,7 @@ namespace mbts.spark { send_order = new DelegateCommand(side => { bool price_valid = _validate_price(), size_valid = size_calculator.validate(); if (price_valid && size_valid && !HasErrors && !properties_vm.HasErrors) { - model.send_order(properties_vm.create(side), price, size_calculator.value.Value).ignore(); + model.send_order(security, properties_vm.create(side), price, size_calculator.value.Value).ignore(); RequestClose?.Invoke(this, new EventArgs()); } }); diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index 6bc4cc7c6..2b4773a67 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -200,6 +200,13 @@ namespace mbts.spark { public static string short_description(this OrderRecordImmutable order, ContractSpecificationImmutable? spec) => $"{(order.HasDef ? order.Def.Side.ToString() : "(unknown-side)")} {(order.HasState ? ($@"{spec.format(order.State.Price)} @ {order.State.Quantity}") : "(unknown-price) @ (unknown-quantity)")}"; + public static string short_description(SecurityImmutable security, Side side, double price, uint quantity) => + new StringBuilderEx( + security.ToString(), " ", + side.ToString(), " ", + price_quantity_description(price, quantity, security.spec_or_default()) + ).ToString(); + public static string short_description(this OrderRecordImmutable order, SecurityImmutable? security) { var spec = security.spec_or_default(); return new StringBuilderEx( diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 8ef3241c9..278324bcb 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -286,13 +286,33 @@ namespace mbts.spark { #endregion #region Input - public async Task send_order(OrderDefinitionImmutable? order, double price, uint size) { + // the security arg is needed for a temporary hack to prevent GlbxIceberg orders from going out in non-glbx exchanges (like Ice) + // eventually, we'll need an algo type model to handle this stuff. + // This hack leverages the fact that every place that calls 'send_order' already has the security handy (not just the sec id). + public Task send_order(SecurityImmutable security, OrderDefinitionImmutable? order, double price, uint size) { if (order.HasValue) { - var result = (await send_order_get_error(order.Value, price, size)); - _activity.on_send_order(order.Value, price, size, result.key, result.error); - return result.key; +#if DEBUG + if (security.Exchange != Venue.Glbx && security.Exchange != Venue.Sim) { +#else + if (security.Exchange != Venue.Glbx) { +#endif + var algo_structure = OrderDataHelper.enumerate_algo_structure(order.Value.CustomDef); + if (algo_structure.Any(t => t.type == CustomOrderDefinition.CustomOneofCase.GlbxIceberg)) { + Log.Ui.info($"OrdersModel prevented a GlbxIceberg order from going out to a non-glbx exchange ({OrderUtils.short_description(security, order.Value.Side, price, size)})."); + return Task.FromResult(null); + } + } + return send_order(order.Value, price, size); } - return 0; + return Task.FromResult(null); + } + + /// Note: this method is private to force outside callers to use this overload . + /// This allows us to control which orders can be sent to which security/exchange (e.g., GlbxIceberg orders are only permitted for securities on the Glbx exchange). + async Task send_order(OrderDefinitionImmutable order, double price, uint size) { + var result = (await send_order_get_error(order, price, size)); + _activity.on_send_order(order, price, size, result.key, result.error); + return result.key; } async Task<(uint? key, string error)> send_order_get_error(OrderDefinitionImmutable order, double price, uint size) { From 633ebf38a2ea351d4b46b203595911683e835869 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Sep 2019 18:58:19 -0500 Subject: [PATCH 123/225] restore original ComboBox default padding on the left --- src/client/spark/Themes/generic.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Themes/generic.xaml b/src/client/spark/Themes/generic.xaml index 78caf3cbf..c9f6ac225 100644 --- a/src/client/spark/Themes/generic.xaml +++ b/src/client/spark/Themes/generic.xaml @@ -339,7 +339,7 @@ - + From f7184b09499ca6210071c7fa55a323fea5a63baf Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 20 Sep 2019 09:13:01 -0500 Subject: [PATCH 124/225] updating tests --- testing/manual/ladder/badge_spec.PNG | Bin 76476 -> 0 bytes testing/manual/orders/order_book.txt | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 testing/manual/ladder/badge_spec.PNG diff --git a/testing/manual/ladder/badge_spec.PNG b/testing/manual/ladder/badge_spec.PNG deleted file mode 100644 index 38a870d7f71a3f3f19ecd110adbfe489d99223f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76476 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%0DB>m1cuFO_{v_`&*!Bx%GF$3k~e@DW} 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 diff --git a/testing/manual/orders/order_book.txt b/testing/manual/orders/order_book.txt index 0b724e132..c1e7ec741 100644 --- a/testing/manual/orders/order_book.txt +++ b/testing/manual/orders/order_book.txt @@ -36,7 +36,7 @@ Left click on a cancelled parent order of a parent-child order type Order tree node collapsing testing ---------------------------------- -- Create an algo using the algo studio consisting of IB -> IB, call it IB2. +- Create an algo using the algo studio consisting of IB -> Limit, call it IB2. - Launch an instance of IB2 on a normal security away from the market so it does not execute immediately - In an order book form ensure that the setting "Show Full Algo Tree" is checked - Ensure further that there are no filters on the OB @@ -61,7 +61,7 @@ Filter/Collapse interaction --------------------------- - Now uncheck the "Show Full Algo Tree" setting and clear all filters - You should only see the top algo for CIB and the the hedges and currently working limit order -- Now filter for order type = limit, you should only the hedges and the currently working limit +- Now filter for order type = limit, you should only see the hedges and the currently working limit - Now filter for order type = IB and you should see nothing From c24700195f3ec13c0488b78b0fef3d3c458614c7 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 20 Sep 2019 14:15:27 -0400 Subject: [PATCH 125/225] fixed cpp coming from market data for ice, added the obligatory overrides --- .../config/defaults/cme_reference_data.conf | 23 +++++++++++-------- .../md/platforms/ice_onixs/ICEListener.cpp | 3 ++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index ac365cefb..5d6164cc6 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -3,10 +3,15 @@ # source: tools/cpp_helper/generate-cpps.ps1 # -CppConfig -{ - value +CppConfig +{ + value { + #ICE + cpp_entry { key: "OJ" value: 150 } + cpp_entry { key: "KC" value: 375 } + cpp_entry { key: "UHO" value: 1000 } + cpp_entry { key: "098" value: 2000 } cpp_entry { key: "0A" value: 100 } cpp_entry { key: "0B" value: 100 } @@ -1455,12 +1460,12 @@ CppConfig cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } cpp_entry { key: "ZWT" value: 50 } - } -} + } +} -CmeSymbolMics -{ - value +CmeSymbolMics +{ + value { cme_mic { key: "098" value: CBT } cme_mic { key: "0A" value: NYMEX } @@ -2910,5 +2915,5 @@ CmeSymbolMics cme_mic { key: "ZT" value: CBT } cme_mic { key: "ZW" value: CBT } cme_mic { key: "ZWT" value: CBT } - } + } } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index 304f114cf..d9bc8a316 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -25,8 +25,9 @@ template<> void ICEListener::set_security_specific(const onixs_ice::FuturesProductDefinition& def, FixedSecurity& fsec) { - fsec.cash_per_point = double_of_price(def.tickValue, fsec.ice_price_denominator); + //fsec.cash_per_point = double_of_price(def.tickValue, fsec.ice_price_denominator); //fsec.cash_per_point = def.tickValue; + fsec.cash_per_point = def.unitQuantity; } ICEListener::ICEListener(ICESecurityIndex& index, MDProducer& producer, const std::vector channels) : From 424bb36fc7d71efb12a376b6ddda03fe6ab7cfa3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 20 Sep 2019 14:30:27 -0400 Subject: [PATCH 126/225] update jakes script for ice cpps --- .../config/defaults/cme_reference_data.conf | 109 +++++++++--------- tools/cpp_helper/ics_spreads.csv | 4 +- 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index 5d6164cc6..6e01fbf24 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -3,15 +3,10 @@ # source: tools/cpp_helper/generate-cpps.ps1 # -CppConfig -{ - value +CppConfig +{ + value { - #ICE - cpp_entry { key: "OJ" value: 150 } - cpp_entry { key: "KC" value: 375 } - cpp_entry { key: "UHO" value: 1000 } - cpp_entry { key: "098" value: 2000 } cpp_entry { key: "0A" value: 100 } cpp_entry { key: "0B" value: 100 } @@ -359,6 +354,7 @@ CppConfig cpp_entry { key: "BOB" value: 1000 } cpp_entry { key: "BOO" value: 6350 } cpp_entry { key: "BOS" value: 250 } + cpp_entry { key: "BPU" value: 1000 } cpp_entry { key: "BR7" value: 1000 } cpp_entry { key: "BSF" value: 25 } cpp_entry { key: "BTC" value: 5 } @@ -447,12 +443,12 @@ CppConfig cpp_entry { key: "D3L" value: 80 } cpp_entry { key: "D4L" value: 5 } cpp_entry { key: "D7L" value: 80 } + cpp_entry { key: "DAB" value: 1000 } cpp_entry { key: "DAX" value: 5 } cpp_entry { key: "DAZ" value: 80 } cpp_entry { key: "DBB" value: 1000 } cpp_entry { key: "DBI" value: 1000 } cpp_entry { key: "DBL" value: 100 } - cpp_entry { key: "DBR" value: 1000 } cpp_entry { key: "DBT" value: 100 } cpp_entry { key: "DC" value: 2000 } cpp_entry { key: "DCB" value: 1000 } @@ -463,14 +459,13 @@ CppConfig cpp_entry { key: "DDE" value: 1000 } cpp_entry { key: "DDI" value: 1000 } cpp_entry { key: "DDO" value: 1000 } - cpp_entry { key: "DEB" value: 744 } + cpp_entry { key: "DEB" value: 720 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 264 } + cpp_entry { key: "DEP" value: 252 } cpp_entry { key: "DFL" value: 100 } cpp_entry { key: "DFN" value: 100 } cpp_entry { key: "DG2" value: 100 } cpp_entry { key: "DG3" value: 100 } - cpp_entry { key: "DGH" value: 1000 } cpp_entry { key: "DGI" value: 100 } cpp_entry { key: "DGS" value: 100 } cpp_entry { key: "DGT" value: 100 } @@ -478,19 +473,13 @@ CppConfig cpp_entry { key: "DHI" value: 1000 } cpp_entry { key: "DJR" value: 100 } cpp_entry { key: "DKR" value: 1000 } - cpp_entry { key: "DMB" value: 100 } - cpp_entry { key: "DOB" value: 1000 } - cpp_entry { key: "DOP" value: 1000 } - cpp_entry { key: "DRB" value: 1000 } cpp_entry { key: "DRI" value: 100 } cpp_entry { key: "DRS" value: 100 } cpp_entry { key: "DRT" value: 100 } cpp_entry { key: "DSD" value: 1000 } cpp_entry { key: "DSE" value: 1000 } - cpp_entry { key: "DSG" value: 1000 } cpp_entry { key: "DTR" value: 2 } cpp_entry { key: "DTT" value: 2 } - cpp_entry { key: "DUA" value: 6350 } cpp_entry { key: "DUP" value: 1000 } cpp_entry { key: "DVE" value: 200 } cpp_entry { key: "DVT" value: 200 } @@ -535,8 +524,11 @@ CppConfig cpp_entry { key: "EP1" value: 1000 } cpp_entry { key: "EPN" value: 1000 } cpp_entry { key: "EPZ" value: 500000 } + cpp_entry { key: "EQ1" value: 50 } cpp_entry { key: "ERL" value: 5 } cpp_entry { key: "ES" value: 50 } + cpp_entry { key: "ES1" value: 50 } + cpp_entry { key: "ES2" value: 50 } cpp_entry { key: "ESB" value: 1000 } cpp_entry { key: "ESK" value: 125000 } cpp_entry { key: "ESQ" value: 50 } @@ -738,8 +730,8 @@ CppConfig cpp_entry { key: "IPO" value: 10 } cpp_entry { key: "IPT" value: 10 } cpp_entry { key: "IS" value: 50 } - cpp_entry { key: "ITB" value: 744 } - cpp_entry { key: "ITP" value: 264 } + cpp_entry { key: "ITB" value: 720 } + cpp_entry { key: "ITP" value: 252 } cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } @@ -753,7 +745,7 @@ CppConfig cpp_entry { key: "JKB" value: 10000 } cpp_entry { key: "JKF" value: 10000 } cpp_entry { key: "JKM" value: 10000 } - cpp_entry { key: "JML" value: 480 } + cpp_entry { key: "JML" value: 240 } cpp_entry { key: "JNC" value: 1000 } cpp_entry { key: "JNG" value: 10000 } cpp_entry { key: "JNL" value: 80 } @@ -781,6 +773,7 @@ CppConfig cpp_entry { key: "K5" value: 20 } cpp_entry { key: "K5K" value: 20 } cpp_entry { key: "K5N" value: 20 } + cpp_entry { key: "KC" value: 375 } cpp_entry { key: "KE" value: 50 } cpp_entry { key: "KET" value: 50 } cpp_entry { key: "KQ" value: 20 } @@ -1010,6 +1003,7 @@ CppConfig cpp_entry { key: "OAD" value: 1 } cpp_entry { key: "ODO" value: 1000 } cpp_entry { key: "OFF" value: 5 } + cpp_entry { key: "OJ" value: 150 } cpp_entry { key: "OML" value: 5 } cpp_entry { key: "OMM" value: 80 } cpp_entry { key: "OOD" value: 5 } @@ -1152,7 +1146,7 @@ CppConfig cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1760 } + cpp_entry { key: "SDD" value: 1600 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1191,7 +1185,7 @@ CppConfig cpp_entry { key: "SR3" value: 2500 } cpp_entry { key: "SR5" value: 1000 } cpp_entry { key: "SRB" value: 1000 } - cpp_entry { key: "SRT" value: 1760 } + cpp_entry { key: "SRT" value: 1600 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1202,27 +1196,28 @@ CppConfig cpp_entry { key: "STY" value: 1000 } cpp_entry { key: "SU" value: 250 } cpp_entry { key: "SUT" value: 250 } + cpp_entry { key: "T01" value: 800 } + cpp_entry { key: "T02" value: 800 } cpp_entry { key: "T03" value: 800 } cpp_entry { key: "T04" value: 800 } - cpp_entry { key: "T06" value: 800 } cpp_entry { key: "T07" value: 800 } cpp_entry { key: "T08" value: 800 } cpp_entry { key: "T09" value: 800 } + cpp_entry { key: "T10" value: 800 } + cpp_entry { key: "T11" value: 800 } cpp_entry { key: "T12" value: 800 } cpp_entry { key: "T13" value: 800 } - cpp_entry { key: "T14" value: 800 } - cpp_entry { key: "T15" value: 800 } cpp_entry { key: "T16" value: 800 } + cpp_entry { key: "T17" value: 800 } + cpp_entry { key: "T18" value: 800 } cpp_entry { key: "T19" value: 800 } cpp_entry { key: "T1U" value: 1000 } cpp_entry { key: "T20" value: 800 } - cpp_entry { key: "T21" value: 800 } - cpp_entry { key: "T22" value: 800 } cpp_entry { key: "T23" value: 800 } + cpp_entry { key: "T24" value: 800 } + cpp_entry { key: "T25" value: 800 } cpp_entry { key: "T26" value: 800 } cpp_entry { key: "T27" value: 800 } - cpp_entry { key: "T28" value: 800 } - cpp_entry { key: "T29" value: 800 } cpp_entry { key: "T2B" value: 1000 } cpp_entry { key: "T2D" value: 1000 } cpp_entry { key: "T2M" value: 100 } @@ -1281,7 +1276,7 @@ CppConfig cpp_entry { key: "TT" value: 50000 } cpp_entry { key: "TTD" value: 24 } cpp_entry { key: "TTE" value: 10000 } - cpp_entry { key: "TTF" value: 744 } + cpp_entry { key: "TTF" value: 720 } cpp_entry { key: "TUB" value: 1000 } cpp_entry { key: "TUF" value: 1000 } cpp_entry { key: "TUL" value: 1000 } @@ -1300,12 +1295,11 @@ CppConfig cpp_entry { key: "UDL" value: 80 } cpp_entry { key: "UFB" value: 100 } cpp_entry { key: "UFE" value: 100 } - cpp_entry { key: "UFG" value: 100 } cpp_entry { key: "UFN" value: 100 } cpp_entry { key: "UFU" value: 100 } cpp_entry { key: "UFV" value: 100 } cpp_entry { key: "UGG" value: 42000 } - cpp_entry { key: "UKG" value: 310 } + cpp_entry { key: "UKG" value: 300 } cpp_entry { key: "ULB" value: 42000 } cpp_entry { key: "UMB" value: 1000 } cpp_entry { key: "UMD" value: 1000 } @@ -1313,6 +1307,9 @@ CppConfig cpp_entry { key: "UN" value: 1000 } cpp_entry { key: "UNB" value: 1000 } cpp_entry { key: "UNS" value: 1000 } + cpp_entry { key: "UP5" value: 1000 } + cpp_entry { key: "UPB" value: 1000 } + cpp_entry { key: "UPM" value: 1000 } cpp_entry { key: "UR" value: 1000 } cpp_entry { key: "USC" value: 1000 } cpp_entry { key: "USDBRL" value: 1 } @@ -1460,12 +1457,12 @@ CppConfig cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } cpp_entry { key: "ZWT" value: 50 } - } -} + } +} -CmeSymbolMics -{ - value +CmeSymbolMics +{ + value { cme_mic { key: "098" value: CBT } cme_mic { key: "0A" value: NYMEX } @@ -1814,6 +1811,7 @@ CmeSymbolMics cme_mic { key: "BOB" value: CBT } cme_mic { key: "BOO" value: NYMEX } cme_mic { key: "BOS" value: CME } + cme_mic { key: "BPU" value: NYMEX } cme_mic { key: "BR7" value: NYMEX } cme_mic { key: "BSF" value: CBT } cme_mic { key: "BTC" value: CME } @@ -1902,12 +1900,12 @@ CmeSymbolMics cme_mic { key: "D3L" value: NYMEX } cme_mic { key: "D4L" value: NYMEX } cme_mic { key: "D7L" value: NYMEX } + cme_mic { key: "DAB" value: NYMEX } cme_mic { key: "DAX" value: NYMEX } cme_mic { key: "DAZ" value: NYMEX } cme_mic { key: "DBB" value: NYMEX } cme_mic { key: "DBI" value: DME } cme_mic { key: "DBL" value: NYMEX } - cme_mic { key: "DBR" value: DME } cme_mic { key: "DBT" value: NYMEX } cme_mic { key: "DC" value: CME } cme_mic { key: "DCB" value: NYMEX } @@ -1925,7 +1923,6 @@ CmeSymbolMics cme_mic { key: "DFN" value: CBT } cme_mic { key: "DG2" value: CBT } cme_mic { key: "DG3" value: CBT } - cme_mic { key: "DGH" value: DME } cme_mic { key: "DGI" value: CBT } cme_mic { key: "DGS" value: CBT } cme_mic { key: "DGT" value: CBT } @@ -1933,19 +1930,13 @@ CmeSymbolMics cme_mic { key: "DHI" value: DME } cme_mic { key: "DJR" value: CBT } cme_mic { key: "DKR" value: DME } - cme_mic { key: "DMB" value: DME } - cme_mic { key: "DOB" value: DME } - cme_mic { key: "DOP" value: DME } - cme_mic { key: "DRB" value: DME } cme_mic { key: "DRI" value: CBT } cme_mic { key: "DRS" value: CBT } cme_mic { key: "DRT" value: CBT } cme_mic { key: "DSD" value: DME } cme_mic { key: "DSE" value: DME } - cme_mic { key: "DSG" value: DME } cme_mic { key: "DTR" value: CBT } cme_mic { key: "DTT" value: CBT } - cme_mic { key: "DUA" value: DME } cme_mic { key: "DUP" value: DME } cme_mic { key: "DVE" value: CME } cme_mic { key: "DVT" value: CME } @@ -1990,8 +1981,11 @@ CmeSymbolMics cme_mic { key: "EP1" value: NYMEX } cme_mic { key: "EPN" value: NYMEX } cme_mic { key: "EPZ" value: CME } + cme_mic { key: "EQ1" value: CME } cme_mic { key: "ERL" value: NYMEX } cme_mic { key: "ES" value: CME } + cme_mic { key: "ES1" value: CME } + cme_mic { key: "ES2" value: CME } cme_mic { key: "ESB" value: NYMEX } cme_mic { key: "ESK" value: CME } cme_mic { key: "ESQ" value: CME } @@ -2236,6 +2230,7 @@ CmeSymbolMics cme_mic { key: "K5" value: CME } cme_mic { key: "K5K" value: CME } cme_mic { key: "K5N" value: CME } + cme_mic { key: "KC" value: IFU } cme_mic { key: "KE" value: CBT } cme_mic { key: "KET" value: CBT } cme_mic { key: "KQ" value: CME } @@ -2465,6 +2460,7 @@ CmeSymbolMics cme_mic { key: "OAD" value: NYMEX } cme_mic { key: "ODO" value: DME } cme_mic { key: "OFF" value: NYMEX } + cme_mic { key: "OJ" value: IFU } cme_mic { key: "OML" value: NYMEX } cme_mic { key: "OMM" value: NYMEX } cme_mic { key: "OOD" value: NYMEX } @@ -2657,27 +2653,28 @@ CmeSymbolMics cme_mic { key: "STY" value: NYMEX } cme_mic { key: "SU" value: CME } cme_mic { key: "SUT" value: CME } + cme_mic { key: "T01" value: NYMEX } + cme_mic { key: "T02" value: NYMEX } cme_mic { key: "T03" value: NYMEX } cme_mic { key: "T04" value: NYMEX } - cme_mic { key: "T06" value: NYMEX } cme_mic { key: "T07" value: NYMEX } cme_mic { key: "T08" value: NYMEX } cme_mic { key: "T09" value: NYMEX } + cme_mic { key: "T10" value: NYMEX } + cme_mic { key: "T11" value: NYMEX } cme_mic { key: "T12" value: NYMEX } cme_mic { key: "T13" value: NYMEX } - cme_mic { key: "T14" value: NYMEX } - cme_mic { key: "T15" value: NYMEX } cme_mic { key: "T16" value: NYMEX } + cme_mic { key: "T17" value: NYMEX } + cme_mic { key: "T18" value: NYMEX } cme_mic { key: "T19" value: NYMEX } cme_mic { key: "T1U" value: CBT } cme_mic { key: "T20" value: NYMEX } - cme_mic { key: "T21" value: NYMEX } - cme_mic { key: "T22" value: NYMEX } cme_mic { key: "T23" value: NYMEX } + cme_mic { key: "T24" value: NYMEX } + cme_mic { key: "T25" value: NYMEX } cme_mic { key: "T26" value: NYMEX } cme_mic { key: "T27" value: NYMEX } - cme_mic { key: "T28" value: NYMEX } - cme_mic { key: "T29" value: NYMEX } cme_mic { key: "T2B" value: NYMEX } cme_mic { key: "T2D" value: NYMEX } cme_mic { key: "T2M" value: NYMEX } @@ -2755,7 +2752,6 @@ CmeSymbolMics cme_mic { key: "UDL" value: NYMEX } cme_mic { key: "UFB" value: CBT } cme_mic { key: "UFE" value: CBT } - cme_mic { key: "UFG" value: CBT } cme_mic { key: "UFN" value: CBT } cme_mic { key: "UFU" value: CBT } cme_mic { key: "UFV" value: CBT } @@ -2768,6 +2764,9 @@ CmeSymbolMics cme_mic { key: "UN" value: NYMEX } cme_mic { key: "UNB" value: NYMEX } cme_mic { key: "UNS" value: NYMEX } + cme_mic { key: "UP5" value: NYMEX } + cme_mic { key: "UPB" value: NYMEX } + cme_mic { key: "UPM" value: NYMEX } cme_mic { key: "UR" value: NYMEX } cme_mic { key: "USC" value: NYMEX } cme_mic { key: "USDBRL" value: CME } @@ -2915,5 +2914,5 @@ CmeSymbolMics cme_mic { key: "ZT" value: CBT } cme_mic { key: "ZW" value: CBT } cme_mic { key: "ZWT" value: CBT } - } + } } diff --git a/tools/cpp_helper/ics_spreads.csv b/tools/cpp_helper/ics_spreads.csv index 0f58741d9..266475fd4 100644 --- a/tools/cpp_helper/ics_spreads.csv +++ b/tools/cpp_helper/ics_spreads.csv @@ -28,4 +28,6 @@ Sym,Mult,Exch "BOB",1000,CBT "BUB",1000,CBT "FNU",1000,CBT -"SOM",500,CBT \ No newline at end of file +"SOM",500,CBT +"OJ",150,IFU +"KC",375,IFU From 96bec55ee7812587b050dffccc114324704fa5bb Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 20 Sep 2019 15:01:56 -0400 Subject: [PATCH 127/225] fix build, we will have to handle these ice cpps someplace else --- .../config/defaults/cme_reference_data.conf | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index 6e01fbf24..b0e734abe 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -3,9 +3,9 @@ # source: tools/cpp_helper/generate-cpps.ps1 # -CppConfig -{ - value +CppConfig +{ + value { cpp_entry { key: "098" value: 2000 } cpp_entry { key: "0A" value: 100 } @@ -1457,12 +1457,12 @@ CppConfig cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } cpp_entry { key: "ZWT" value: 50 } - } -} + } +} -CmeSymbolMics -{ - value +CmeSymbolMics +{ + value { cme_mic { key: "098" value: CBT } cme_mic { key: "0A" value: NYMEX } @@ -2230,7 +2230,6 @@ CmeSymbolMics cme_mic { key: "K5" value: CME } cme_mic { key: "K5K" value: CME } cme_mic { key: "K5N" value: CME } - cme_mic { key: "KC" value: IFU } cme_mic { key: "KE" value: CBT } cme_mic { key: "KET" value: CBT } cme_mic { key: "KQ" value: CME } @@ -2460,7 +2459,6 @@ CmeSymbolMics cme_mic { key: "OAD" value: NYMEX } cme_mic { key: "ODO" value: DME } cme_mic { key: "OFF" value: NYMEX } - cme_mic { key: "OJ" value: IFU } cme_mic { key: "OML" value: NYMEX } cme_mic { key: "OMM" value: NYMEX } cme_mic { key: "OOD" value: NYMEX } @@ -2914,5 +2912,5 @@ CmeSymbolMics cme_mic { key: "ZT" value: CBT } cme_mic { key: "ZW" value: CBT } cme_mic { key: "ZWT" value: CBT } - } + } } From ec1d925dbe629fa4392062af1ef834c24a78c229 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Sun, 22 Sep 2019 08:24:21 -0400 Subject: [PATCH 128/225] Added to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6896b131c..b8b69fa2d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ trace_data/ /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* .ionide/* +/.ignore From 010a1fecb160f5b09c10d724b2cbb7cb78957a42 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 12:26:53 -0500 Subject: [PATCH 129/225] remove unused function 'OrderFactory.subscribe_user_tuples' --- src/client/spark/Orders/OrderDataHelper.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 27df49a4c..6d26b2a3a 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -67,7 +67,6 @@ namespace mbts.spark.utilities { public IObservable> subscribe_accounts() => _admin_model.on_accounts; public IObservable> subscribe_users() => _admin_model.on_users; - public IObservable> subscribe_user_tuples() => _admin_model.on_user_tuples; public IObservable> subscribe_account_tuples() => _admin_model.on_account_tuples; #region Defaults From 8cbae28dd88a16e8e28c265ba4f16b6b83b3df31 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 12:31:24 -0500 Subject: [PATCH 130/225] move UserTuple.cs into spark_api --- src/client/{spark/core => spark_api}/data/UserTuple.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/client/{spark/core => spark_api}/data/UserTuple.cs (100%) diff --git a/src/client/spark/core/data/UserTuple.cs b/src/client/spark_api/data/UserTuple.cs similarity index 100% rename from src/client/spark/core/data/UserTuple.cs rename to src/client/spark_api/data/UserTuple.cs From e6884b6654048bdbbf9a1fcc4ff699f3d5bf88f7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 12:32:44 -0500 Subject: [PATCH 131/225] add 'Permissions' enum to UserTuple --- src/client/spark_api/data/UserTuple.cs | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/client/spark_api/data/UserTuple.cs b/src/client/spark_api/data/UserTuple.cs index b0689a74f..a0c4bbff5 100644 --- a/src/client/spark_api/data/UserTuple.cs +++ b/src/client/spark_api/data/UserTuple.cs @@ -1,15 +1,28 @@ using System; namespace bts { - struct UserTuple : IEquatable, IComparable, IComparable { + readonly struct UserTuple : IEquatable, IComparable, IComparable { + const string _admin_name = "bts"; + public static readonly Func key_fn = u => u.id; + public static UserTuple admin => new UserTuple(0, _admin_name, Permissions.Admin); public readonly uint id; public readonly string name; + public readonly Permissions permissions; - public UserTuple(uint id, string name) { + public UserTuple(uint id, string name) + : this(id, name, name == _admin_name ? Permissions.Admin : Permissions.Regular) { } + + public UserTuple(uint id, string name, Permissions permissions) { this.id = id; this.name = name; + this.permissions = permissions; + } + + public enum Permissions { + Regular, + Admin } public int CompareTo(UserTuple other) { @@ -28,4 +41,9 @@ namespace bts { public static bool operator ==(UserTuple a, UserTuple b) => a.Equals(b); public static bool operator !=(UserTuple a, UserTuple b) => !a.Equals(b); } -} + + static class UserTupleExtensions { + public static bool can_access_user_data(this UserTuple user, uint user_id) => + user.id == user_id || user.permissions == UserTuple.Permissions.Admin; + } +} \ No newline at end of file From 039791a296fb37345037f6e80de568f3fb33ceea Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 12:48:43 -0500 Subject: [PATCH 132/225] simplify AdminModel, api 'permission filters' use new UserTuple.Permissions enum --- src/client/spark/Admin/AdminModel.cs | 97 +++++++------------ src/client/spark/Orders/OrdersModel.cs | 29 +++--- .../Extensions/DictionaryExtensions.cs | 54 +++++++++++ 3 files changed, 109 insertions(+), 71 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 9e8508b22..43c6b6ec9 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -1,83 +1,60 @@ using bts; using bts.api.admin; +using bts.api.core; using System; using System.Collections.Generic; using System.ComponentModel.Composition; 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 { public readonly UserTuple user; - - readonly BehaviorSubject> - _accounts_subject = new BehaviorSubject>(new Dictionary()), - _users_subject = new BehaviorSubject>(new Dictionary()); - IReadOnlyDictionary - _account_map = new Dictionary(), - _user_map = new Dictionary(); - readonly BehaviorSubject _wrapper_subject = new BehaviorSubject(new AdminModelWrapper()); - IDisposable _dispose; + + IDisposable _dispose; + IReadOnlyDictionary _account_map = DictionaryHelper.empty(); [ImportingConstructor] 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)); - 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 - select bts_user; - - IEnumerable active_accounts = - from admin_data in update.all - from bts_account in admin_data.Accounts - where bts_account.IsPresent && _wrapper_subject.Value.can_view_account(bts_account.Name) - join account_id in ( - from bts_user in active_users - from account_id in bts_user.UserData.AccountPermissions.AccountPermissions.Keys - select account_id - ) on bts_account.Id equals account_id - select bts_account; - - var users = active_users.ToDictionary(u => u.Id, u => u.Name); - var accounts = active_accounts.ToDictionary(a => a.Id, a => a.Name); - return (users, accounts); - }).Subscribe(t => { - _account_map = t.accounts; - _user_map = t.users; - _users_subject.OnNext(_user_map = t.users); - _accounts_subject.OnNext(_account_map = t.accounts); - }); + // accounts + on_accounts = service.subscribei_admin_data() + .Select(up => up.all.TryGetFirst(out var ad) && ad.Users.Where(u => u.Name == user.name).TryGetSingle(out var usr) && usr.HasUserData && usr.UserData.HasAccountPermissions ? + usr.UserData.AccountPermissions.AccountPermissions + .Where(kv => kv.Value.TradingPermission.HasPermissions && kv.Value.AdminPermission.HasPermissions) + .Select(kv => ad.Accounts.Where(a => a.Id == kv.Key).TryGetSingle(out var acc) ? acc : (BTSAccountImmutable?)null) + .Where(acc => acc.HasValue) + .Select(acc => acc.Value) + .ToDictionary(acc => acc.Id, acc => acc.Name) : + new Dictionary(0)); + // users + on_users = Observable.Return(DictionaryHelper.wrap_value(user.id, user.name)); + // internal subs + _dispose = on_accounts.Subscribe(map => _account_map = map); } - public IObservable> on_users => _users_subject.AsObservable(); - public IObservable> on_accounts => _accounts_subject.AsObservable(); - public IObservable> on_user_tuples => on_users.Select(d => d.Select(kv => new UserTuple(kv.Key, kv.Value)).ToList()); + public IObservable> on_users { get; } + public IObservable> on_accounts { get; } 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 AccountTuple? get_default_account() { - foreach (var kv in _account_map) { - return new AccountTuple(kv.Key, kv.Value); - } - return null; - } - public uint? get_user_id(string user) => _id_for_name(user, _user_map); - public uint? get_account_id(string account) => _id_for_name(account, _account_map); - public void Dispose() => Disposable.dispose(ref _dispose); + public IObservable> permission_filter(IObservable> positions, Func get_account_id) where TKey : IEquatable => + user.permissions == UserTuple.Permissions.Admin ? + positions : + positions.Filter(on_accounts.Select(map => new Func(p => map.ContainsKey(get_account_id(p))))); - static uint? _id_for_name(string name, IReadOnlyDictionary map) { - foreach (var kv in map) { - if (kv.Value == name) - return kv.Key; - } - return null; - } + public IObservable> permission_filter(IObservable> positions, Func get_account_name) where TKey : IEquatable => + user.permissions == UserTuple.Permissions.Admin ? + positions : + positions.Filter(on_accounts.Select(map => { + var hash = new HashSet(map.Values); + return new Func(v => hash.Contains(get_account_name(v))); + })); + + public AccountTuple? get_default_account() => + _account_map.Select(kv => new AccountTuple(kv.Key, kv.Value)).TryFirst(); + + public void Dispose() => + Disposable.dispose(ref _dispose); } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 278324bcb..5126d8406 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -59,16 +59,22 @@ namespace mbts.spark { this.md_auxiliary_model = md_auxiliary_model; var scheduler = ThreadPoolScheduler.Instance; var interval = TimeSpan.FromMilliseconds(100); - on_orders = - _service - .subscribei_orders() - .Naggle(interval, scheduler) - .PermissionFilter(admin_model.on_admin_data) - .join(sstore, order => order.security_key()) + on_orders = admin_model + .permission_filter( + _service.subscribei_orders() + .Naggle(interval, scheduler), + o => o.account_id() + ).join(sstore, order => order.security_key()) .Table() .Cache(); - on_positions = _position_service.subscribei_position_data().Naggle(interval, scheduler).PermissionFilter(admin_model.on_admin_data).join(sstore, pos => pos.SecurityId).Table().Cache(); + on_positions = admin_model + .permission_filter( + _position_service.subscribei_position_data().Naggle(interval, scheduler), + p => p.AccountId) + .join(sstore, pos => pos.SecurityId) + .Table() + .Cache(); on_pnl = _position_service.subscribei_pnl_data() .Naggle(interval, scheduler) .join(sstore, p => p.Pos.SecurityId) @@ -174,10 +180,11 @@ namespace mbts.spark { .Where(t => t.has_changes()) .Cache(); // fill tuples - var on_fills = - _service.subscribei_fills() - .Naggle(interval, scheduler) - .PermissionFilter(admin_model.on_admin_data) + var on_fills = admin_model + .permission_filter( + _service.subscribei_fills() + .Naggle(interval, scheduler), + f => f.Account) .join(sstore, f => f.SecurityKey) .Table().Cache(); var fill_order_tuples_join = on_fills.LeftJoin( diff --git a/src/client/spark_core/Collections/Extensions/DictionaryExtensions.cs b/src/client/spark_core/Collections/Extensions/DictionaryExtensions.cs index d0f9c95cb..4ff0a9aa7 100644 --- a/src/client/spark_core/Collections/Extensions/DictionaryExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/DictionaryExtensions.cs @@ -278,6 +278,9 @@ namespace System.Collections.Generic { public static IComparer> key_comparer() => Impl.key_comparer; + public static IReadOnlyDictionary wrap_value(TKey key, TValue value) => + new Impl.ValueWrapper(key, value); + static class Impl { public static readonly IReadOnlyDictionary empty = new ReadOnlyDictionary(new Dictionary(0)); @@ -297,6 +300,57 @@ namespace System.Collections.Generic { public int Compare(object x, object y) => x is KeyValuePair xkv ? (y is KeyValuePair ykv ? Compare(xkv, ykv) : 1) : -1; } + + public class ValueWrapper : IReadOnlyDictionary { + readonly TKey _key; + readonly TValue _value; + readonly IEqualityComparer _key_comparer; + + public ValueWrapper(TKey key, TValue value) + : this(key, value, EqualityComparer.Default) { } + + public ValueWrapper(TKey key, TValue value, IEqualityComparer key_comparer) { + _key = key; + _value = value; + _key_comparer = key_comparer; + } + + public TValue this[TKey key] => + _key_comparer.Equals(key, _key) ? _value : throw new KeyNotFoundException(); + + public int Count => 1; + + public IEnumerable Keys { + get { + yield return _key; + } + } + + public IEnumerable Values { + get { + yield return _value; + } + } + + public bool ContainsKey(TKey key) => _key_comparer.Equals(key, _key); + + public IEnumerator> GetEnumerator() { + yield return new KeyValuePair(_key, _value); + } + + IEnumerator IEnumerable.GetEnumerator() { + yield return new KeyValuePair(_key, _value); + } + + public bool TryGetValue(TKey key, out TValue value) { + if (_key_comparer.Equals(key, _key)) { + value = _value; + return true; + } + value = default; + return false; + } + } } } } \ No newline at end of file From e47b1c3048c2c713447d80d224f4b933edc0e415 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:23:46 -0500 Subject: [PATCH 133/225] [non-functional] style cop/whitespace changes in MDSource/Daemon.cs --- src/client/spark/Daemons/MDDaemon.cs | 35 +++++++---------- src/client/spark_api/md/MDSource.cs | 57 +++++++++++++--------------- 2 files changed, 40 insertions(+), 52 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index a2f866421..b358e560e 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -1,21 +1,18 @@ using bts.api; using bts.api.synthetic; +using bts.md; using mbts; using mbts.co2; using mbts.spark; using mbts.ui; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; +using System.Linq; 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 bts.md; -using mbts.ui.shell; namespace bts { [Export(typeof(IInitializable))] @@ -25,17 +22,21 @@ namespace bts { readonly Lazy _ss; readonly Dictionary _deleted_synthetics = new Dictionary(); - static uint get_naggle() => mbts.config.Configuration.get().naggle_ms; - [ImportingConstructor] - public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginContainer.Exports.UserID)]uint user_id) : - base(get_naggle(), MDSourceOptions.DeferInit, user_id) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginContainer.Exports.UserID)]uint user_id) + : base(mbts.config.Configuration.get().naggle_ms, MDSourceOptions.DeferInit, user_id) { _bus = bus; _token = token; - _ss = ss; + _ss = ss; } - override public void initialize() { + public int priority => 55; + + [Export] + MDConsumer consumer => _consumer; + IBus bus => _bus.Value; + + public override void initialize() { _relay.set_token(_token.Value); _dispose.Add( _ss.Value.subscribei_metadata() @@ -60,16 +61,8 @@ namespace bts { // Post full dictionary of syntheics here bus.post(SparkTags.SyntheticstrategiesTag, t); })); - _dispose.Add( this.on_securities.Subscribe( (md) => { - bus.post(SparkTags.SecuritiesTag, md); - })); + _dispose.Add(on_securities.Subscribe(md => bus.post(SparkTags.SecuritiesTag, md))); Task.Run(run); } - - [Export] - MDConsumer consumer => _consumer; - - public int priority => 55; - IBus bus => _bus.Value; } } \ No newline at end of file diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index 7281aba04..36374c82f 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -13,44 +13,44 @@ namespace bts.md { enum MDSourceOptions { DeferInit = 1, } - class MDSource : IObserver>, IDisposable - { + + 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; + protected DateTime _version = DateTime.MinValue; + protected List _dispose = new List(); - public MDSource(uint naggle_ms, MDSourceOptions options = 0, uint user_id = _no_user_id) - { + readonly uint _user_id; + readonly BehaviorSubject> _on_securities = + new BehaviorSubject>(new ConcurrentDictionary()); + + 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)); - if(!options.HasFlag(MDSourceOptions.DeferInit)) + if (!options.HasFlag(MDSourceOptions.DeferInit)) initialize(); } - readonly BehaviorSubject> _on_securities = - new BehaviorSubject>( new ConcurrentDictionary() ); public IObservable> on_securities => _on_securities; - virtual public void initialize() - { + public virtual void initialize() => Task.Run(run); - } - public void set_token(AuthTokenImmutable token) - { + public void set_token(AuthTokenImmutable token) => _relay.set_token(token); - } public void OnCompleted() { } - public void OnError(Exception error) => Log.Md.error(error.ToString()); + + public void OnError(Exception error) => + Log.Md.error(error.ToString()); + public void OnNext(List values) { if (values.Count > 0) { foreach (var v in values) { @@ -67,30 +67,25 @@ namespace bts.md { } } - public void Dispose() => Disposable.dispose(_dispose); - async protected Task run() - { + public void Dispose() => + Disposable.dispose(_dispose); + + protected async Task run() { DateTime run_version = DateTime.MinValue; - while (true) - { + while (true) { var exch = _exchange_sec_map; var current_version = _version; - if (current_version > run_version) - { + if (current_version > run_version) { run_version = current_version; - try - { + try { Log.Md.info($"MDSource publishing {exch.Count} securities"); _on_securities.OnNext(exch); - } - catch (Exception e) - { + } catch (Exception e) { Log.Md.error($"Error in publish_securities: {e}"); } } await Task.Delay(TimeSpan.FromSeconds(1)); } } - } -} +} \ No newline at end of file From e5d85db8883088e0a055edf7228233520815481f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:33:11 -0500 Subject: [PATCH 134/225] SP-151 BTS user can view/edit all synths/algos --- src/client/spark/Daemons/MDDaemon.cs | 5 ++--- .../Model/AlgoStudioFlatDefinitionModel.cs | 2 +- src/client/spark_api/md/MDSource.cs | 19 +++++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index b358e560e..b6bcfa70b 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -5,7 +5,6 @@ using mbts; using mbts.co2; using mbts.spark; using mbts.ui; -using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -23,8 +22,8 @@ namespace bts { readonly Dictionary _deleted_synthetics = new Dictionary(); [ImportingConstructor] - public MDDaemon(Lazy bus, Lazy token, Lazy ss, [Import(LoginContainer.Exports.UserID)]uint user_id) - : base(mbts.config.Configuration.get().naggle_ms, MDSourceOptions.DeferInit, user_id) { + public MDDaemon(Lazy bus, Lazy token, Lazy ss, UserTuple user) + : base(mbts.config.Configuration.get().naggle_ms, MDSourceOptions.DeferInit, user) { _bus = bus; _token = token; _ss = ss; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs index a955270d7..aec98c8cd 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs @@ -27,7 +27,7 @@ namespace mbts.spark { _error_reporter = error_reporter; definitions = service.subscribei_algo_definitions() - .Filter(r => r.Metadata.IsActive && r.Metadata.CreatorUserId == _admin_model.user.id) + .Filter(r => r.Metadata.IsActive && _admin_model.user.can_access_user_data(r.Metadata.CreatorUserId)) .SelectKeyValue(_definition_data, d => d.key) .Table() .Cache(); diff --git a/src/client/spark_api/md/MDSource.cs b/src/client/spark_api/md/MDSource.cs index 36374c82f..7aefc929a 100644 --- a/src/client/spark_api/md/MDSource.cs +++ b/src/client/spark_api/md/MDSource.cs @@ -24,13 +24,16 @@ namespace bts.md { protected DateTime _version = DateTime.MinValue; protected List _dispose = new List(); - readonly uint _user_id; + readonly UserTuple _user; readonly BehaviorSubject> _on_securities = new BehaviorSubject>(new ConcurrentDictionary()); - public MDSource(uint naggle_ms, MDSourceOptions options = 0, uint user_id = _no_user_id) { + public MDSource(uint naggle_ms, MDSourceOptions options = 0) + : this(naggle_ms, options, UserTuple.admin) { } + + public MDSource(uint naggle_ms, MDSourceOptions options, UserTuple user) { _options = options; - _user_id = user_id; + _user = user; _relay = new Co2RelayControl(_consumer, naggle_ms); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); _dispose.Add(_consumer.on_security.Subscribe(this)); @@ -54,14 +57,10 @@ namespace bts.md { 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; + if (v.security.ContractCase != Security.ContractOneofCase.Synthetic || _user.can_access_user_data(v.security.Synthetic.UserId)) { + var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle); + _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); } - var smd = new SecurityMD(new SecurityImmutable(v.security), v.handle); - _exchange_sec_map.AddOrUpdate(smd.security.Id, smd, (_, __) => smd); } _version = DateTime.UtcNow; } From 1ccc4c374642a3fa94d3d3bf7e52d64b67598cae Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:36:45 -0500 Subject: [PATCH 135/225] add 'ShowLadderAutoLookupTag' to eschew securitymd depependency --- .../Trading/Ladder/LadderWindowFactory.cs | 18 +++++++++++- src/client/spark/core/Bus/SparkCommands.cs | 4 +++ src/client/spark/core/Bus/SparkTags.cs | 3 ++ src/client/spark_api/md/SecurityMD.cs | 10 +++---- .../Extensions/ImmutableSetExtensions.cs | 29 +++++++++++++++++++ 5 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 src/client/spark_core/Collections/Extensions/ImmutableSetExtensions.cs diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index e7a16fdce..0d1b3ac40 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -1,4 +1,5 @@ using bts.api; +using bts.collections; using bts.md; using mbts; using mbts.config; @@ -50,6 +51,7 @@ namespace bts.shell { _mbo = mbo; _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), + bus.subscribe(SparkTags.ShowLadderAutoLookupTag).Subscribe(_show_windows), bus.subscribe(SparkTags.ShowLadderTag).OnDispatcher().Subscribe(s => show_windows(new[] { s })), bus.subscribe(SparkTags.ShowLaddersTag).OnDispatcher().Subscribe(show_windows) ); @@ -273,7 +275,21 @@ namespace bts.shell { }); } - void show_windows(IReadOnlyCollection securities) { + async void _show_windows(IImmutableSet securities) { + if (securities == null) + return; + var start_time = DateTime.Now; + do { + var found = securities.KeyJoin(_securities).ToList(); + securities = securities.RemoveRange(found.Select(SecurityMD.key_fn)); + show_windows(found); + if (securities.Count == 0) + break; + await Task.Delay(500); + } while ((DateTime.Now - start_time) < _ladder_conf.security_timeout); + } + + void show_windows(IEnumerable securities) { int n_allowed = (int)_ladder_conf.max_open_ladders - _wm.list_windows().Where(w => w.window_type == _window_type).Count(); int n_opened = 0; foreach (var s in securities) { diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 1c2e0cea5..ee4414e48 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -8,6 +8,7 @@ using mbts.spark; using mbts.ui; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Windows.Input; namespace bts.spark { @@ -41,6 +42,9 @@ namespace bts.spark { SparkCommand.create("P&L (2.0)", Icons.Accounting, SparkTags.ShowPNLTag); // Ladder + public static PartialCommand> ShowLadderAutoLookup(KeyGesture key_gesture = null) => + SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLadderAutoLookupTag, key_gesture); + public static PartialCommand ShowLadder(KeyGesture key_gesture = null) => SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLadderTag, key_gesture); diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 0449e8065..311e7fb13 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -7,6 +7,7 @@ using bts.spark; using mbts.ui; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Threading.Tasks; namespace mbts.spark { @@ -55,6 +56,8 @@ namespace mbts.spark { // The owners of the various SparkWindows may remove dependencies on the former at their leasure. // For now, both tags go through the same logic in the LadderWindowFactory anyways. public static ITag ShowLadderTag { get; } = new SparkTag("Show Ladder"); + // TODO: get rid of the SecurityMD ShowLadderTag. This has created burdensome dependency issues. + public static ITag> ShowLadderAutoLookupTag { get; } = new SparkTag>("Show Ladder Auto Lookup"); public static ITag> ShowLaddersTag { get; } = new SparkTag>(nameof(ShowLaddersTag)); public static ITag> ShowLinkedLadder { get; } = new SparkTag>("Linked Ladder"); public static ITag ShowMarketViewTag { get; } = new SparkTag("Show MarketView"); diff --git a/src/client/spark_api/md/SecurityMD.cs b/src/client/spark_api/md/SecurityMD.cs index d4ce00c1b..6af6e0324 100644 --- a/src/client/spark_api/md/SecurityMD.cs +++ b/src/client/spark_api/md/SecurityMD.cs @@ -1,13 +1,11 @@ using bts.api; using mbts.co2; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace mbts { - struct SecurityMD : IEquatable { + readonly struct SecurityMD : IEquatable { + public static readonly Func key_fn = smd => smd.security.Id; + public SecurityImmutable security { get; } public MDConsumerHandle md { get; } @@ -36,4 +34,4 @@ namespace mbts { return !(left == right); } } -} +} \ No newline at end of file diff --git a/src/client/spark_core/Collections/Extensions/ImmutableSetExtensions.cs b/src/client/spark_core/Collections/Extensions/ImmutableSetExtensions.cs new file mode 100644 index 000000000..d22b9f6df --- /dev/null +++ b/src/client/spark_core/Collections/Extensions/ImmutableSetExtensions.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Collections.Immutable; + +namespace bts.collections { + public static class ImmutableSetExtensions { + public static IImmutableSet RemoveRange(this IImmutableSet source, IEnumerable values) { + /// Prefer the implementation. + /// It uses an to remove values, which is optimized for bulk changes (less memory allocations, etc.). + if (source is ImmutableHashSet ihs) { + return ihs.RemoveRange(values); + } + if (source == null) throw new ArgumentNullException(nameof(source)); + if (values == null) throw new ArgumentNullException(nameof(values)); + foreach (var v in values) + source = source.Remove(v); + return source; + } + + public static ImmutableHashSet RemoveRange(this ImmutableHashSet source, IEnumerable values) { + if (source == null) throw new ArgumentNullException(nameof(source)); + if (values == null) throw new ArgumentNullException(nameof(values)); + var bd = source.ToBuilder(); + foreach (var v in values) + bd.Remove(v); + return bd.ToImmutable(); + } + } +} \ No newline at end of file From a3f0c2fbf688c129bb5fd1069155eb114d1029fe Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:41:11 -0500 Subject: [PATCH 136/225] pass UserTuple to SyntheticManagement row (for imminent user column), remove dependency on securitymd --- src/client/spark/Admin/AdminModel.cs | 15 +++++- .../spark/Modules/Spreader/SpreaderModel.cs | 34 +++++++++++++- .../Spreader/SyntheticManagementWindow.cs | 7 +-- .../VM/SyntheticManagementDialogVM.cs | 23 ++++++---- src/client/spark/core/data/SyntheticTuple.cs | 46 +++++++++++++++++++ 5 files changed, 109 insertions(+), 16 deletions(-) create mode 100644 src/client/spark/core/data/SyntheticTuple.cs diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 43c6b6ec9..d8a73ab1b 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -1,6 +1,7 @@ using bts; using bts.api.admin; using bts.api.core; +using bts.utils; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -16,7 +17,7 @@ namespace mbts.spark { IReadOnlyDictionary _account_map = DictionaryHelper.empty(); [ImportingConstructor] - AdminModel(AdminService service, [Import]UserTuple user) { + AdminModel(AdminService service, UserTuple user) { this.user = user; // accounts on_accounts = service.subscribei_admin_data() @@ -30,12 +31,24 @@ namespace mbts.spark { new Dictionary(0)); // users on_users = Observable.Return(DictionaryHelper.wrap_value(user.id, user.name)); + all_user_tuples = user.permissions == UserTuple.Permissions.Admin ? + service.subscribei_admin_data() + .Select(u => u.all.TryFirst()) + .Where(ad => ad.HasValue) + .Select(ad => ad.Value.Users + .Where(u => user.can_access_user_data(u.Id)) + .Select(u => new UserTuple(u.Id, u.Name)) + .ToDictionary(UserTuple.key_fn)) + .Table(UserTuple.key_fn) + .Cache() : + Observable.Return(TableUpdate.mk_empty(UserTuple.key_fn).with_added(new[] { user })); // internal subs _dispose = on_accounts.Subscribe(map => _account_map = map); } public IObservable> on_users { get; } public IObservable> on_accounts { get; } + public IObservable> all_user_tuples { get; } public IObservable> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList()); public IObservable> permission_filter(IObservable> positions, Func get_account_id) where TKey : IEquatable => diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index f34af26ab..d18c0a9ce 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -1,5 +1,8 @@ -using bts.api; +using bts; +using bts.api; +using bts.api.core; using bts.api.synthetic; +using bts.collections; using bts.spark; using mbts.ui.shell; using System; @@ -18,11 +21,36 @@ namespace mbts.spark { readonly uint _user_id; [ImportingConstructor] - public SpreaderModel(IBus bus, SyntheticSecurityService service, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) { + public SpreaderModel(IBus bus, SyntheticSecurityService service, AdminModel admin_model, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) { _bus = bus; _service = service; _error = error; _user_id = user_id; + // synthetic tuples + var strategy_source = _bus.subscribe(SparkTags.SyntheticstrategiesTag) + .Select(map => MappedDictionary.create(map, (k, v) => (k, v))) + .Table(tup => tup.security_id); + + var synthetic_source = _bus.subscribe(SparkTags.SecuritiesTag) + .Select(map => new FilteredDictionary(map, smd => smd.security.ContractCase == Security.ContractOneofCase.Synthetic)) + .Table(smd => smd.security.Id); + + var synthetic_user_join = synthetic_source.LeftJoin( + admin_model.all_user_tuples, + SecurityMD.key_fn, + UserTuple.key_fn, + smd => smd.security.Synthetic.UserId, + (smd, sid, ut, uid) => new SyntheticTuple(smd.security, ut.name, null), + (smd, sid, uid) => new SyntheticTuple(smd.security, null, null), + SyntheticTuple.key_fn); + + synthetic_tuples = synthetic_user_join.LeftJoin( + strategy_source, + SyntheticTuple.key_fn, + tup => tup.security_id, + (synth_tup, id, strat_tup) => new SyntheticTuple(synth_tup.security, synth_tup.user_name, strat_tup.strategy), + (synth_tup, id) => synth_tup, + SyntheticTuple.key_fn); } public IObservable> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag); @@ -36,6 +64,8 @@ namespace mbts.spark { .LeftJoin(strategies, (security, strategy) => (new ExecutionStrategyImmutable?(strategy), security), security => (new ExecutionStrategyImmutable?(), security)) ); + public IObservable> synthetic_tuples { get; } + public IObservable security_strategy(uint security_key) => strategy.TrySelect(s => { bool success = s.TryGetValue(security_key, out ExecutionStrategyImmutable result); diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index 52458556b..cfbe2b7e3 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -10,6 +10,7 @@ using mbts.ui.utility; using mbts.utils; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Linq; using System.Reactive.Linq; using System.Windows; @@ -27,7 +28,7 @@ namespace mbts.spark { readonly IWindowSettingsManager _settings_manager; - public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state, WindowSettingsManager settings_manager) + public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state, IWindowSettingsManager settings_manager) : base("Synthetic Management", bus, factory, SparkCommands.ShowSyntheticManagement.icon) { _orders_model = orders_model; _state = state; @@ -66,8 +67,8 @@ namespace mbts.spark { ), SparkCommand.create("Clone", Icons.CloneSynthetic, SparkTags.ShowSyntheticCloneTag).complete( current_row_connectable_builder.create(observe_row_strategy), rs => rs.HasValue, select_row_strategy_tuple - ), SparkCommands.ShowLadder(SparkCommands.KeyGestures.ShowLadder).complete( - vm_connectable_builder.create(vm => vm.current_security_md), md => md.HasValue, ConvertUtils.ValueOrDefault + ), SparkCommands.ShowLadderAutoLookup(SparkCommands.KeyGestures.ShowLadder).complete( + vm_connectable_builder.create(vm => vm.current_security_observable.Select(s => s.HasValue ? ImmutableHashSet.Empty.Add(s.Value.Id) : null)), id => id != null ), SparkCommands.ShowOrders.complete(() => { var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; ob_settings.filters = new bts.shell.orderbook.FilterStates { diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index c6dd59102..135f083e6 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -1,4 +1,5 @@ -using bts.api; +using bts; +using bts.api; using bts.collections; using bts.spark; using mbts.persist; @@ -7,6 +8,7 @@ using mbts.ui; using mbts.ui.settings; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Linq; @@ -17,7 +19,7 @@ using static mbts.ui.controls.DIYGrid; using static mbts.ui.spark.SyntheticManagementView; namespace mbts.spark { - class SyntheticManagementDialogVM : SecurityMDGrid { + class SyntheticManagementDialogVM : SecurityGrid { readonly IBus _bus; readonly OrdersModel _orders_model; IWindowSettingsManager _settings_manager; @@ -25,7 +27,7 @@ namespace mbts.spark { public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager) : this(bus, orders_model, settings_manager, null, null) { } public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager, IReadOnlyCollection sorting, FilterStates filters) - : base(orders_model.spreader.strategy_tuple.Select(map => map.Values), sorting) { + : base(orders_model.spreader.synthetic_tuples.Select(t => t.state.Values), sorting) { _bus = bus; _orders_model = orders_model; if (filters != null) { @@ -73,8 +75,8 @@ namespace mbts.spark { ); } - protected override Row row_factory((ExecutionStrategyImmutable? strategy, SecurityMD md) row_model) => - new Row(_bus, row_model.md, row_model.strategy, _orders_model); + protected override Row row_factory(SyntheticTuple row_model) => + new Row(_bus, row_model, _orders_model); protected override void on_row_removed(Row row) => row.Dispose(); @@ -111,15 +113,15 @@ namespace mbts.spark { }; #endregion - public class Row : SecurityMDRow, IEquatable, IRowVM, IActionableRowVM { - public readonly ExecutionStrategyImmutable? strategy; + public class Row : SecurityRow, IEquatable, IRowVM, IActionableRowVM { + public readonly SyntheticTuple synthetic_tuple; readonly IBus _bus; readonly Property _n_working_orders; - public Row(IBus bus, SecurityMD security_md, ExecutionStrategyImmutable? strategy, OrdersModel orders_model) : base(security_md) { + public Row(IBus bus, SyntheticTuple synthetic_tuple, OrdersModel orders_model) : base(synthetic_tuple.security) { _bus = bus; - this.strategy = strategy; + this.synthetic_tuple = synthetic_tuple; _n_working_orders = backing(nameof(n_working_orders), orders_model.on_security_orders(security_key) .Select(t => (uint)(t.state @@ -137,6 +139,7 @@ namespace mbts.spark { public string name { get; } public int n_legs { get; } public string description { get; } + public ExecutionStrategyImmutable? strategy => synthetic_tuple.strategy; public bool strategy_present => strategy.HasValue; public uint n_working_orders => _n_working_orders.Value; public ICommand show_ladder { get; } @@ -166,7 +169,7 @@ namespace mbts.spark { void _show_ladder() => - _bus.post(SparkTags.ShowLadderTag, md); + _bus.post(SparkTags.ShowLadderAutoLookupTag, ImmutableHashSet.Empty.Add(security.Id)); void _show_order_book() { var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; diff --git a/src/client/spark/core/data/SyntheticTuple.cs b/src/client/spark/core/data/SyntheticTuple.cs new file mode 100644 index 000000000..b0717f1b5 --- /dev/null +++ b/src/client/spark/core/data/SyntheticTuple.cs @@ -0,0 +1,46 @@ +using bts.api; +using bts.spark; +using bts.utils; +using System; + +namespace bts { + struct SyntheticTuple : IEquatable, IComparable, IComparable { + public static readonly Func key_fn = a => a.security.Id; + public static readonly Func nullable_key_fn = a => a.HasValue ? a.Value.security.Id : 0u; + + public readonly SecurityImmutable security; + public readonly string user_name; + public readonly ExecutionStrategyImmutable? strategy; + public readonly int? num_working_orders; + + public SyntheticTuple(SecurityImmutable security, string user_name, ExecutionStrategyImmutable? strategy, int? num_working_orders = null) { + this.security = security; + this.user_name = user_name; + this.strategy = strategy; + this.num_working_orders = num_working_orders; + } + + public int CompareTo(SyntheticTuple other) => + SecurityHelper.Comparer.Compare(security, other.security); + + int IComparable.CompareTo(object obj) => + obj is SyntheticTuple other ? CompareTo(other) : 1; + + public bool Equals(SyntheticTuple other) => + security == other.security && + user_name == other.user_name && + EqualityComparer.nullable_equals(strategy, other.strategy); + + public override bool Equals(object obj) => + EqualityComparer.equals_obj(this, obj); + + public override int GetHashCode() => + security.Id.GetHashCode(); + + public override string ToString() => + user_name == null ? security.ToString() : $"{user_name}:{security}"; + + public static bool operator ==(SyntheticTuple a, SyntheticTuple b) => a.Equals(b); + public static bool operator !=(SyntheticTuple a, SyntheticTuple b) => !a.Equals(b); + } +} From 76050e0722d0aa4f884a2153ac19a843f97aaed4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:43:40 -0500 Subject: [PATCH 137/225] SyntheticManagement vm uses 'DataGridFilterHelper.hook_all' method to eliminate risk of omitting column filters --- .../VM/SyntheticManagementDialogVM.cs | 2 +- .../spark/core/Utility/ObjectSnapshot.cs | 20 +++++++++++++------ .../Filters/DataGridFilterHelper.cs | 19 ++++++++++++++---- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 135f083e6..14e704d79 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -70,7 +70,7 @@ namespace mbts.spark { grid_settings_manager.load_from(settings_manager.current_settings()); _resources.AddRange( - DataGridFilterHelper.hook_filters(rows_view, create_time_filter, name_filter, description_filter, n_legs_filter, n_working_orders_filter, security_key_filter), + DataGridFilterHelper.hook_all(this, rows_view), settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) ); } diff --git a/src/client/spark/core/Utility/ObjectSnapshot.cs b/src/client/spark/core/Utility/ObjectSnapshot.cs index 4e8418417..e649f55ed 100644 --- a/src/client/spark/core/Utility/ObjectSnapshot.cs +++ b/src/client/spark/core/Utility/ObjectSnapshot.cs @@ -15,12 +15,8 @@ namespace bts.utils { } static class ObjectSnapshot { - public static IEnumerable> property_delegates_of_type() where TSource : class where TValue : class { - var tval = typeof(TValue); - return typeof(TSource).GetProperties(BindingFlags.Public | BindingFlags.Instance) - .Where(p => tval.IsAssignableFrom(p.PropertyType)) - .Select(_prop_getter); - } + public static IReadOnlyList> property_delegates_of_type() => + PropertyGetterStore.value; public static IObservable> property_table(T instance, params string[] prop_names) where T : INotifyPropertyChanged => _property_table(instance, Array.ConvertAll(prop_names, PropertyInfoStore.type.GetProperty)); @@ -162,6 +158,18 @@ namespace bts.utils { } } + static class PropertyGetterStore { + public static readonly IReadOnlyList> value; + + static PropertyGetterStore() { + var tval = typeof(TValue); + value = typeof(TSource).GetProperties(BindingFlags.Public | BindingFlags.Instance) + .Where(p => tval.IsAssignableFrom(p.PropertyType)) + .Select(_prop_getter) + .ToReadOnlyList(); + } + } + class PropNode { public readonly PropertyInfo prop; diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs b/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs index 54822a36e..1c13e5a21 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/DataGridFilterHelper.cs @@ -1,11 +1,22 @@ -using System; +using bts.utils; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; namespace mbts.spark.filters { static class DataGridFilterHelper { - public static IDisposable hook_filters(ICollectionView rows, params IDataGridColumnFilter[] filters) { + public static IDisposable hook_all(TSource source, ICollectionView rows) => + hook_filters(rows, + ObjectSnapshot.property_delegates_of_type>() + .Select(f => f(source)) + .ExceptNull() + .ToList()); + + public static IDisposable hook_filters(ICollectionView rows, params IDataGridColumnFilter[] filters) => + hook_filters(rows, filters.AsEnumerable()); + + public static IDisposable hook_filters(ICollectionView rows, IEnumerable> filters) { var icvls = (ICollectionViewLiveShaping)rows; icvls.IsLiveFiltering = true; return _hook_filters(set_filter, filters); @@ -22,7 +33,7 @@ namespace mbts.spark.filters { } } - static IDisposable _hook_filters(Action set_filter, params IDataGridColumnFilter[] filters) { + static IDisposable _hook_filters(Action set_filter, IEnumerable> filters) { foreach (var f in filters) f.filter_changed += set_filter; set_filter(); @@ -34,7 +45,7 @@ namespace mbts.spark.filters { }); } - static List> _get_active_filters(IDataGridColumnFilter[] filters) => + static List> _get_active_filters(IEnumerable> filters) => filters.Where(f => f.active.HasValue && f.active.Value).ToList(); } From 2d06fd3d92092737deeebca9a58c672929f3f947 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:46:56 -0500 Subject: [PATCH 138/225] [non-functional] style cop/whitespace changes to SyntheticManagementDialogVM.cs --- .../VM/SyntheticManagementDialogVM.cs | 66 +++++++------------ 1 file changed, 25 insertions(+), 41 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 14e704d79..1e62b973c 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -22,40 +22,37 @@ namespace mbts.spark { class SyntheticManagementDialogVM : SecurityGrid { readonly IBus _bus; readonly OrdersModel _orders_model; - IWindowSettingsManager _settings_manager; - + readonly IWindowSettingsManager _settings_manager; public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager) : this(bus, orders_model, settings_manager, null, null) { } public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager, IReadOnlyCollection sorting, FilterStates filters) : base(orders_model.spreader.synthetic_tuples.Select(t => t.state.Values), sorting) { _bus = bus; _orders_model = orders_model; + _settings_manager = settings_manager; if (filters != null) { create_time_filter.load_state(filters.create_time); name_filter.load_state(filters.name); description_filter.load_state(filters.description); n_legs_filter.load_state(filters.n_legs); n_working_orders_filter.load_state(filters.n_working_orders); - security_key_filter.load_state(filters.security_key); + security_key_filter.load_state(filters.security_key); } - _settings_manager = settings_manager; // columns add_col(Columns.Name, DefaultColumnHeaders.Name, r => r.name, nameof(Row.name), name_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Security); add_col(Columns.Description, DefaultColumnHeaders.Description, r => r.description, nameof(Row.description), description_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Description); add_col(Columns.n_legs, DefaultColumnHeaders.N_Legs, r => r.n_legs.ToString(), nameof(Row.n_legs), n_legs_filter, DataGridFilterKnownTemplates.IntMinMax, DefaultColumnWidths.N_Legs); columns.Add(new HyperlinkElementColumn( - Columns.n_working_orders, - new Binding(nameof(Row.n_working_orders)), + Columns.n_working_orders, + new Binding(nameof(Row.n_working_orders)), new Binding(nameof(Row.show_order_book)), n_working_orders_filter, DataGridFilterKnownTemplates.UIntMinMax) { id = col_id(Columns.n_working_orders), Header = DefaultColumnHeaders.N_Working_Orders, Width = DefaultColumnWidths.N_Working_Orders - } - ); + }); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); - // void add_col(Columns col_key, string header, Func get_text, string prop, IDataGridColumnFilter filter, string filter_template, double width) => columns.Add(new RenderTextColumn(col_key, get_text, filter, filter_template) { @@ -65,7 +62,7 @@ namespace mbts.spark { Width = width }); // - grid_settings_manager = new SimpleGridSettingsManager(columns, new Dictionary { }, row_vms); + grid_settings_manager = new SimpleGridSettingsManager(columns, DictionaryHelper.empty(), row_vms); // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) grid_settings_manager.load_from(settings_manager.current_settings()); @@ -75,26 +72,9 @@ namespace mbts.spark { ); } - protected override Row row_factory(SyntheticTuple row_model) => - new Row(_bus, row_model, _orders_model); - - protected override void on_row_removed(Row row) => row.Dispose(); - - public ObservableCollection columns { get; } = new ObservableCollection(); + public ObservableCollection columns { get; } = new ObservableCollection(); public SimpleGridSettingsManager grid_settings_manager { get; } - public GridSettings get_grid_save_state() { - if (_settings_manager.instance_settings == null) - return null; - else - return grid_settings_manager.create(); - } - - public StartupData create() => - new StartupData(rows_view.get_sorting_criteria(columns), _get_filter_states(), get_grid_save_state()); - - - #region Filters public IDataGridColumnPersistentFilter create_time_filter { get; } = new TimeFilterVM(r => r.create_time, nameof(Row.create_time)); public IDataGridColumnPersistentFilter name_filter { get; } = new RegexFilterVM(r => r.name, nameof(Row.name)); public IDataGridColumnPersistentFilter description_filter { get; } = new RegexFilterVM(r => r.description, nameof(Row.description)); @@ -102,6 +82,18 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter n_working_orders_filter { get; } = new UIntMinMax(r => r.n_working_orders, nameof(Row.n_legs)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(r => r.security_key.ToString(), nameof(Row.security_key)); + public GridSettings get_grid_save_state() => + _settings_manager.instance_settings == null ? null : grid_settings_manager.create(); + + public StartupData create() => + new StartupData(rows_view.get_sorting_criteria(columns), _get_filter_states(), get_grid_save_state()); + + protected override Row row_factory(SyntheticTuple row_model) => + new Row(_bus, row_model, _orders_model); + + protected override void on_row_removed(Row row) => + row.Dispose(); + FilterStates _get_filter_states() => new FilterStates { description = description_filter.get_state(), @@ -111,7 +103,6 @@ namespace mbts.spark { n_working_orders = n_working_orders_filter.get_state(), security_key = security_key_filter.get_state() }; - #endregion public class Row : SecurityRow, IEquatable, IRowVM, IActionableRowVM { public readonly SyntheticTuple synthetic_tuple; @@ -135,6 +126,8 @@ namespace mbts.spark { show_order_book = new DelegateCommand(_show_order_book); } + public event Action invalidated; + public DateTime create_time => DateTime.MinValue; //TODO public string name { get; } public int n_legs { get; } @@ -146,15 +139,8 @@ namespace mbts.spark { public ICommand show_order_book { get; } public ICommand default_command => show_ladder; - - public ObservableCollection row_animations => new ObservableCollection(); - - public IReadOnlyList cell_stores => new IGridCellStore[0]; - - - public event Action invalidated; - - public void raise_invalidated() => invalidated?.Invoke(); + public void raise_invalidated() => + invalidated?.Invoke(); public bool Equals(Row other) => other != null && @@ -166,8 +152,6 @@ namespace mbts.spark { public override int GetHashCode() => security_key.GetHashCode(); - - void _show_ladder() => _bus.post(SparkTags.ShowLadderAutoLookupTag, ImmutableHashSet.Empty.Add(security.Id)); @@ -180,4 +164,4 @@ namespace mbts.spark { } } } -} +} \ No newline at end of file From 8a96b00f64f96950e0aeb77a87ec5caaf037585d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2019 13:56:37 -0500 Subject: [PATCH 139/225] add 'User' column to Synthetic Management window --- .../Spreader/SyntheticManagementView.xaml.cs | 9 ++++++- .../SyntheticManagementWindowFactory.cs | 24 ++++++++++++------- .../VM/SyntheticManagementDialogVM.cs | 13 +++++++++- .../UserSettings/ISettingsMigrationRule.cs | 1 + .../UserSettings/UserSettingsHub.cs | 18 +++++++++++--- .../Filters/VM/DiscreteValuesFilterVM.cs | 14 ++++++----- 6 files changed, 60 insertions(+), 19 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml.cs b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml.cs index c3b7e6bea..e74b52c18 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementView.xaml.cs @@ -7,8 +7,15 @@ namespace mbts.ui.spark { /// Interaction logic for SyntheticManagementView.xaml /// partial class SyntheticManagementView : UserControl { + public enum Columns { + Name, + Description, + n_legs, + n_working_orders, + SecurityKey, + User + } - public enum Columns { Name, Description, n_legs, n_working_orders, SecurityKey} public SyntheticManagementView() => InitializeComponent(); } diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs index e676dd306..29125b873 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs @@ -1,4 +1,5 @@ using bts.api; +using bts.settings; using mbts.persist; using mbts.spark; using mbts.spark.filters; @@ -7,6 +8,7 @@ using mbts.ui.settings; using ProtoBuf; using System; using System.Collections.Generic; +using System.ComponentModel.Composition; using System.Reactive.Linq; using System.Threading.Tasks; using static mbts.ui.controls.DIYGrid; @@ -33,13 +35,8 @@ namespace bts.shell { public async void show(SparkTags.Nothing nothing) => _bus.post(SparkTags.ShowWindow, await load(new StartupData())); - IShellWindow _create(StartupData state) { - var settings_manager = new WindowSettingsManager(_settings_hub, - state.grid, - get: us => us.synthetic_management_grid, - set: (us, gs) => us.with(provided_synthetic_management_gridsettings: gs)); - return new SyntheticManagementWindow(this, _bus, _orders_model, state, settings_manager); - } + IShellWindow _create(StartupData state) => + new SyntheticManagementWindow(this, _bus, _orders_model, state, _settings_hub.create_synth_settings_manager(state.grid)); [ProtoContract] public class StartupData { @@ -67,6 +64,7 @@ namespace bts.shell { public static GridColumnSettings n_legs => new GridColumnSettings(col_id(Columns.n_legs), DefaultColumnHeaders.N_Legs, width: DefaultColumnWidths.N_Legs); public static GridColumnSettings n_working_orders => new GridColumnSettings(col_id(Columns.n_working_orders), DefaultColumnHeaders.N_Working_Orders, width: DefaultColumnWidths.N_Working_Orders); public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey); + public static GridColumnSettings user => new GridColumnSettings(col_id(Columns.User), DefaultColumnHeaders.User, is_visible: false, width: DefaultColumnWidths.User); public static IEnumerable default_sorting_criterion { get { @@ -81,6 +79,7 @@ namespace bts.shell { yield return n_legs; yield return n_working_orders; yield return security_key; + yield return user; } } @@ -101,6 +100,15 @@ namespace bts.shell { public UIntMinMaxState n_working_orders; [ProtoMember(6)] public string security_key; + [ProtoMember(7)] + public uint[] user; + } + + // migration rules + [Export(typeof(ISyntheticManagementMigrationRule))] + class AddMissingColumnsMigrationRule : ISyntheticManagementMigrationRule { + public bool apply(GridSettings settings, out GridSettings new_settings) => + settings.add_missing_columns(StartupData.DefaultGridSettings.columns, out new_settings); } } -} +} \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 1e62b973c..1f63cb046 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -2,6 +2,7 @@ using bts.api; using bts.collections; using bts.spark; +using bts.utils; using mbts.persist; using mbts.spark.filters; using mbts.ui; @@ -30,6 +31,9 @@ namespace mbts.spark { _bus = bus; _orders_model = orders_model; _settings_manager = settings_manager; + // init filters + user_filter = DiscreteValuesFilterVM.CreateTableUpdate(r => r.user_tuple, UserTuple.key_fn, out var user_filter_items_observer, out var user_filter_items_view, nameof(Row.user_tuple)); + user_filter_items_view.CustomSort = Comparer.Default.wrap(ut => ut.name).to_non_generic(); if (filters != null) { create_time_filter.load_state(filters.create_time); name_filter.load_state(filters.name); @@ -37,6 +41,7 @@ namespace mbts.spark { n_legs_filter.load_state(filters.n_legs); n_working_orders_filter.load_state(filters.n_working_orders); security_key_filter.load_state(filters.security_key); + user_filter.load_state(filters.user); } // columns add_col(Columns.Name, DefaultColumnHeaders.Name, r => r.name, nameof(Row.name), name_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Security); @@ -53,6 +58,7 @@ namespace mbts.spark { Width = DefaultColumnWidths.N_Working_Orders }); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); + add_col(Columns.User, DefaultColumnHeaders.User, r => r.user_name, nameof(Row.user_name), user_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.User); // void add_col(Columns col_key, string header, Func get_text, string prop, IDataGridColumnFilter filter, string filter_template, double width) => columns.Add(new RenderTextColumn(col_key, get_text, filter, filter_template) { @@ -67,6 +73,7 @@ namespace mbts.spark { grid_settings_manager.load_from(settings_manager.current_settings()); _resources.AddRange( + orders_model.admin_model.all_user_tuples.OnDispatcher().Subscribe(user_filter_items_observer), DataGridFilterHelper.hook_all(this, rows_view), settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) ); @@ -81,6 +88,7 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter n_legs_filter { get; } = new IntMinMax(r => r.n_legs, nameof(Row.n_legs)); public IDataGridColumnPersistentFilter n_working_orders_filter { get; } = new UIntMinMax(r => r.n_working_orders, nameof(Row.n_legs)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(r => r.security_key.ToString(), nameof(Row.security_key)); + public IDataGridColumnPersistentFilter user_filter { get; } public GridSettings get_grid_save_state() => _settings_manager.instance_settings == null ? null : grid_settings_manager.create(); @@ -101,7 +109,8 @@ namespace mbts.spark { name = name_filter.get_state(), n_legs = n_legs_filter.get_state(), n_working_orders = n_working_orders_filter.get_state(), - security_key = security_key_filter.get_state() + security_key = security_key_filter.get_state(), + user = user_filter.get_state() }; public class Row : SecurityRow, IEquatable, IRowVM, IActionableRowVM { @@ -130,6 +139,8 @@ namespace mbts.spark { public DateTime create_time => DateTime.MinValue; //TODO public string name { get; } + public string user_name => synthetic_tuple.user_name; + public UserTuple user_tuple => new UserTuple(synthetic_tuple.security.Synthetic.UserId, user_name); public int n_legs { get; } public string description { get; } public ExecutionStrategyImmutable? strategy => synthetic_tuple.strategy; diff --git a/src/client/spark/core/ShellInterface/UserSettings/ISettingsMigrationRule.cs b/src/client/spark/core/ShellInterface/UserSettings/ISettingsMigrationRule.cs index 9e4b314c5..ce301199a 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/ISettingsMigrationRule.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/ISettingsMigrationRule.cs @@ -17,6 +17,7 @@ namespace bts.settings { interface IMarketViewGridSettingsMigrationRule : ISettingsMigrationRule { } interface IPAndLGridSettingsMigrationRule : ISettingsMigrationRule { } interface IPNLSettingsMigrationRule : ISettingsMigrationRule { } + interface ISyntheticManagementMigrationRule : ISettingsMigrationRule { } static class SettingsMigrationHelper { public static bool apply(T settings, IEnumerable> migration_rules, out T new_settings) { diff --git a/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs b/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs index a2b70175d..50dd84359 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/UserSettingsHub.cs @@ -25,7 +25,8 @@ namespace mbts.persist { static readonly IImmutableProperty _fills_propi = ImmutableProperty.create(us => us.fills_grid, (us, gs) => us.with(provided_fills_gridsettings: gs)), _mview_propi = ImmutableProperty.create(us => us.market_view_grid, (us, gs) => us.with(provided_market_view_gridsettings: gs)), - _pandl_propi = ImmutableProperty.create(us => us.pnl_grid, (us, gs) => us.with(provided_pnl_gridsettings: gs)); + _pandl_propi = ImmutableProperty.create(us => us.pnl_grid, (us, gs) => us.with(provided_pnl_gridsettings: gs)), + _synth_propi = ImmutableProperty.create(us => us.synthetic_management_grid, (us, gs) => us.with(provided_synthetic_management_gridsettings: gs)); static readonly IImmutableProperty _pnl_propi = ImmutableProperty.create(us => us.pnl, (us, pnl) => us.with(pnl: pnl)); @@ -36,6 +37,7 @@ namespace mbts.persist { readonly IEnumerable _mview_migration_rules; readonly IEnumerable _pandl_migration_rules; readonly IEnumerable _pnl_migration_rules; + readonly IEnumerable _synth_migration_rules; readonly IUserPersist _persist; UserSettings _default_settings; @@ -46,13 +48,15 @@ namespace mbts.persist { [ImportMany]IEnumerable fills_migration_rules, [ImportMany]IEnumerable mview_migration_rules, [ImportMany]IEnumerable pandl_migration_rules, - [ImportMany]IEnumerable pnl_migration_rules) { + [ImportMany]IEnumerable pnl_migration_rules, + [ImportMany]IEnumerable synth_migration_rules) { // _persist = persist; _fills_migration_rules = fills_migration_rules ?? Enumerable.Empty(); _mview_migration_rules = mview_migration_rules ?? Enumerable.Empty(); _pandl_migration_rules = pandl_migration_rules ?? Enumerable.Empty(); _pnl_migration_rules = pnl_migration_rules ?? Enumerable.Empty(); + _synth_migration_rules = synth_migration_rules ?? Enumerable.Empty(); init(); async void init() { UserSettings s; @@ -62,7 +66,9 @@ namespace mbts.persist { var wrapped_rules = new[] { _fills_migration_rules.merge().wrap(_fills_propi), _mview_migration_rules.merge().wrap(_mview_propi), - _pandl_migration_rules.merge().wrap(_pandl_propi) + _pandl_migration_rules.merge().wrap(_pandl_propi), + _pnl_migration_rules.merge().wrap(_pnl_propi), + _synth_migration_rules.merge().wrap(_synth_propi) }; SettingsMigrationHelper.apply_quiet(ref s, wrapped_rules); // TODO: move ladder sanitization logic into ISettingsMigrationRule @@ -136,6 +142,12 @@ namespace mbts.persist { _pnl_migration_rules, _pnl_propi); + public IWindowSettingsManager create_synth_settings_manager(GridSettings instance_settings) => + _create_settings_manager( + instance_settings, + _synth_migration_rules, + _synth_propi); + public async Task save_default(UserSettings value) { // notify observers before persisting so the changes are reflected immediately in the ui lock (_default_settings_lock) { diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index ce8927104..e42550ee5 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -68,10 +68,11 @@ namespace mbts.spark.filters { Func factory, Func key, out IObserver> items_observer, - out ListCollectionView items_view) + out ListCollectionView items_view, + string prop_name = null) where TKey : struct, IEquatable => // - CreateTableUpdate(factory, key, keys => keys, keys => keys.ToArray(), out items_observer, out items_view); + CreateTableUpdate(factory, key, keys => keys, keys => keys.ToArray(), out items_observer, out items_view, prop_name); public static IDataGridColumnPersistentFilter CreateTableUpdate( Func factory, @@ -79,10 +80,11 @@ namespace mbts.spark.filters { Func> load_state, Func, TState> get_state, out IObserver> items_observer, - out ListCollectionView items_view) + out ListCollectionView items_view, + string prop_name = null) where TKey : struct, IEquatable { // - var filter = new TableUpdateItemsFilter(factory, key, load_state, get_state); + var filter = new TableUpdateItemsFilter(factory, key, load_state, get_state, prop_name); items_observer = filter; items_view = filter.items_view; return filter; @@ -291,8 +293,8 @@ namespace mbts.spark.filters { readonly HashSet _selected_keys = new HashSet(), _desired_keys = new HashSet(); ListCollectionView _items_view; - public TableUpdateItemsFilter(Func factory, Func key, Func> load_state, Func, TState> get_state) - : base(factory, null) { + public TableUpdateItemsFilter(Func factory, Func key, Func> load_state, Func, TState> get_state, string prop_name) + : base(factory, prop_name) { _factory = factory; _key = key; _load_state = load_state; From 35d4fcc513e6f08115a2a949e85e2f8dba485295 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 12:26:23 -0500 Subject: [PATCH 140/225] make UserTuple public (it's referenced in multiple assemblies) --- src/client/spark_api/data/UserTuple.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark_api/data/UserTuple.cs b/src/client/spark_api/data/UserTuple.cs index a0c4bbff5..c4200b75c 100644 --- a/src/client/spark_api/data/UserTuple.cs +++ b/src/client/spark_api/data/UserTuple.cs @@ -1,7 +1,7 @@ using System; namespace bts { - readonly struct UserTuple : IEquatable, IComparable, IComparable { + public readonly struct UserTuple : IEquatable, IComparable, IComparable { const string _admin_name = "bts"; public static readonly Func key_fn = u => u.id; @@ -42,7 +42,7 @@ namespace bts { public static bool operator !=(UserTuple a, UserTuple b) => !a.Equals(b); } - static class UserTupleExtensions { + public static class UserTupleExtensions { public static bool can_access_user_data(this UserTuple user, uint user_id) => user.id == user_id || user.permissions == UserTuple.Permissions.Admin; } From a27f383b628ebce852ecdab56ae373de04e7f239 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 12:30:11 -0500 Subject: [PATCH 141/225] remove LoginContainer MEF Export consts (replace usages with UserTuple) --- src/client/spark/Daemons/AboutDaemon.cs | 11 +++-------- src/client/spark/Daemons/ErrorReporter.cs | 12 +++++------- src/client/spark/Daemons/ShellLatencyDaemon.cs | 10 +++------- .../spark/Modules/Market/MarketShellModule.cs | 9 +++------ src/client/spark/Modules/Spreader/SpreaderModel.cs | 5 ++--- src/client/spark/core/ShellInterface/UISettings.cs | 13 ++++++++----- src/client/spark/view/Shell/Login/LoginModel.cs | 12 +----------- .../spark/view/Shell/ViewModels/LauncherVM.cs | 9 ++++----- 8 files changed, 29 insertions(+), 52 deletions(-) diff --git a/src/client/spark/Daemons/AboutDaemon.cs b/src/client/spark/Daemons/AboutDaemon.cs index 8a8ad2f06..1777477cb 100644 --- a/src/client/spark/Daemons/AboutDaemon.cs +++ b/src/client/spark/Daemons/AboutDaemon.cs @@ -3,15 +3,10 @@ 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; using System.Diagnostics; -using System.Linq; using System.Reactive.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Input; @@ -23,8 +18,8 @@ namespace bts.ui { IDisposable _dispose; [ImportingConstructor] - public AboutDaemon(IBus bus, [Import(LoginContainer.Exports.UserName)]string username) { - _user = username; + public AboutDaemon(IBus bus, UserTuple user) { + _user = user.name; _bus = bus; _dispose = bus.subscribe(SparkTags.About).OnDispatcher().Subscribe(_ => show_about()); } @@ -63,4 +58,4 @@ namespace bts.ui { Disposable.dispose(ref _dispose); } } -} +} \ No newline at end of file diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index fa8ccc6ad..cfd5bc936 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -7,13 +7,11 @@ using mbts.ui; using System; using System.ComponentModel.Composition; using System.Reactive.Linq; -using System.Windows.Threading; -using System.Windows; using System.Threading.Tasks; -using mbts.ui.shell; +using System.Windows; +using System.Windows.Threading; -namespace bts.spark -{ +namespace bts.spark { [Export, Export(typeof(IShellDaemon))] public class ErrorReporter : IShellDaemon, IDisposable { readonly ErrorReportService _svc; @@ -21,9 +19,9 @@ namespace bts.spark IDisposable _dispose; [ImportingConstructor] - public ErrorReporter(ErrorReportService svc, IBus bus, [Import(LoginContainer.Exports.UserName)] string username) { + public ErrorReporter(ErrorReportService svc, IBus bus, UserTuple user) { _svc = svc; - _username = username; + _username = user.name; _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 0f4e10fd3..723174cb6 100644 --- a/src/client/spark/Daemons/ShellLatencyDaemon.cs +++ b/src/client/spark/Daemons/ShellLatencyDaemon.cs @@ -3,17 +3,13 @@ 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; using System.Linq; using System.Net.NetworkInformation; -using System.Text; using System.Threading.Tasks; namespace bts.perf { - [Export, Export(typeof(IShellDaemon))] class ShellLatencyDaemon : IShellDaemon, IDisposable { readonly ShellLatencyService _service; @@ -24,10 +20,10 @@ namespace bts.perf { Ping _pinger = new Ping(); [ImportingConstructor] - public ShellLatencyDaemon(ShellLatencyService service, [Import(LoginContainer.Exports.UserName)] string user) { + public ShellLatencyDaemon(ShellLatencyService service, UserTuple user) { _service = service; _version = Configuration.get().version; - _username = user; + _username = user.name; _hostname = Environment.MachineName; _forever_ping_host(_pinger); @@ -105,4 +101,4 @@ namespace bts.perf { Disposable.dispose(ref _subs); } } -} +} \ No newline at end of file diff --git a/src/client/spark/Modules/Market/MarketShellModule.cs b/src/client/spark/Modules/Market/MarketShellModule.cs index f2db00136..391801886 100644 --- a/src/client/spark/Modules/Market/MarketShellModule.cs +++ b/src/client/spark/Modules/Market/MarketShellModule.cs @@ -5,7 +5,6 @@ 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; @@ -13,13 +12,11 @@ using System.Threading.Tasks; using System.Windows.Media; using static mbts.ui.shell.ProtoBufSerializationHelper; -namespace bts.shell -{ +namespace bts.shell { [Export(typeof(IShellModule))] - class MarketShellModule : IShellModule - { + class MarketShellModule : IShellModule { [ImportingConstructor] - public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import(LoginContainer.Exports.UserName)]string user_name) { + public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model) { _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub); _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model); } diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index d18c0a9ce..916e7f078 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -4,7 +4,6 @@ using bts.api.core; using bts.api.synthetic; using bts.collections; using bts.spark; -using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -21,11 +20,11 @@ namespace mbts.spark { readonly uint _user_id; [ImportingConstructor] - public SpreaderModel(IBus bus, SyntheticSecurityService service, AdminModel admin_model, ErrorReporter error, [Import(LoginContainer.Exports.UserID)]uint user_id) { + public SpreaderModel(IBus bus, SyntheticSecurityService service, AdminModel admin_model, ErrorReporter error, UserTuple user) { _bus = bus; _service = service; _error = error; - _user_id = user_id; + _user_id = user.id; // synthetic tuples var strategy_source = _bus.subscribe(SparkTags.SyntheticstrategiesTag) .Select(map => MappedDictionary.create(map, (k, v) => (k, v))) diff --git a/src/client/spark/core/ShellInterface/UISettings.cs b/src/client/spark/core/ShellInterface/UISettings.cs index 2b454f848..48385d724 100644 --- a/src/client/spark/core/ShellInterface/UISettings.cs +++ b/src/client/spark/core/ShellInterface/UISettings.cs @@ -11,6 +11,7 @@ using bts.api.persistence; using System.Text.RegularExpressions; using System.Reactive.Linq; using bts.spark; +using bts; namespace mbts.persist { @@ -146,16 +147,18 @@ namespace mbts.persist } [Export(typeof(IUserPersist))] - public class UserUISettings : UISettingsBase - { + public class UserUISettings : UISettingsBase { string _user; - [ImportingConstructor] - public UserUISettings([Import("userid")]uint user, [Import("settings")]PersistenceService persist, ErrorReporter err) + public UserUISettings(uint user_id, [Import("settings")]PersistenceService persist, ErrorReporter err) : base(persist,err) { - _user = $"User {user}"; + _user = $"User {user_id}"; } + [ImportingConstructor] + UserUISettings(UserTuple user, [Import("settings")]PersistenceService persist, ErrorReporter err) + : this(user.id, persist, err) { } + protected override string user() { return _user; } } } diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 35f666503..9fb963b61 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -15,8 +15,7 @@ namespace mbts.ui.shell { // The LoginContainer participates in the startup Import/Export dependency system // Since the login form should not depend on *anything* it will be shown before this is created // Once this is created it access the global LoginModel and retrieves the username - internal class LoginContainer - { + class LoginContainer { [ImportingConstructor] public LoginContainer(ServiceContext context) { var model = LoginModel.instance; @@ -28,10 +27,8 @@ namespace mbts.ui.shell { model.Dispose(); } - [Export(Exports.UserName)] public string UserName { get; private set; } - [Export(Exports.UserID)] public uint UserId { get; private set; } [Export] @@ -42,13 +39,6 @@ namespace mbts.ui.shell { [Export("workspace")] public string Workspace { get; private set; } - - public static class Exports { - public const string - UserName = "username", - UserID = "userid", - UserTuple = "usertuple"; - } } public struct User { diff --git a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs index 63b760725..9fd63320c 100644 --- a/src/client/spark/view/Shell/ViewModels/LauncherVM.cs +++ b/src/client/spark/view/Shell/ViewModels/LauncherVM.cs @@ -12,8 +12,7 @@ using System.Windows.Input; namespace mbts.ui.shell { [Export(typeof(ILauncher))] - public class LauncherVM : ViewModelBase, ILauncher - { + public class LauncherVM : ViewModelBase, ILauncher { Window _window; string _user; readonly IBus _bus; @@ -23,9 +22,9 @@ namespace mbts.ui.shell { [ImportingConstructor] public LauncherVM( ObservableCollection modules, - [Import(LoginContainer.Exports.UserName)]string username, + UserTuple user, ErrorReporter errors, IBus bus) { - _user = username; + _user = user.name; _modules = new ObservableAutoWrapper(modules, m => new ShellModuleVM(m, bus)); _error_service = errors; _bus = bus; @@ -140,4 +139,4 @@ namespace mbts.ui.shell { #endregion } -} +} \ No newline at end of file From f21902d60d8c429129827b2535f4b1c24abe4801 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 14:46:52 -0500 Subject: [PATCH 142/225] remove unused files AdminModelWrapper/PermissionFilter.cs --- .../spark_core/admin/AdminModelWrapper.cs | 64 ------------------- .../spark_core/admin/PermissionFilters.cs | 64 ------------------- 2 files changed, 128 deletions(-) delete mode 100644 src/client/spark_core/admin/AdminModelWrapper.cs delete mode 100644 src/client/spark_core/admin/PermissionFilters.cs diff --git a/src/client/spark_core/admin/AdminModelWrapper.cs b/src/client/spark_core/admin/AdminModelWrapper.cs deleted file mode 100644 index d709c7675..000000000 --- a/src/client/spark_core/admin/AdminModelWrapper.cs +++ /dev/null @@ -1,64 +0,0 @@ -using bts; -using bts.api.admin; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace bts.api.core -{ - public class AdminModelWrapper - { - readonly AdminDataImmutable? _admin_data; - public AdminDataImmutable? admin_data => _admin_data; - readonly string _user_name; - readonly List _allowed_accounts; - readonly Dictionary _allowed_account_dict = new Dictionary(); - public AdminModelWrapper(AdminDataImmutable? admin_data = null, string user_name = null) - { - _admin_data = admin_data; - _user_name = user_name ?? string.Empty; - _allowed_accounts = search_admin(u => u.Name == _user_name).Where(x => - { - return (x.Item2 != null && x.Item2.HasPermissions) || (x.Item3 != null && x.Item3.HasPermissions); - }).Select(xx => xx.Item1).ToList(); - foreach (var val in _allowed_accounts) - _allowed_account_dict[val.Name] = val.Name; - } - public IEnumerable viewable_accounts() - { - return _allowed_accounts; - } - public bool can_view_account(string account) - { - return _allowed_account_dict.ContainsKey(account) || _user_name.ToLower().Equals("bts"); - } - - IEnumerable> - search_admin(Func predicate) - { - var rv = new List>(); - if (_admin_data.HasValue) - { - var users = _admin_data.Value.Users.Where(predicate); - if (users != null && users.Count() == 1) - { - var user = users.ElementAt(0); - if (user.HasUserData && user.UserData.HasAccountPermissions) - { - foreach (var kv in user.UserData.AccountPermissions.AccountPermissions) - { - var account_id = kv.Key; - var accounts = _admin_data.Value.Accounts.Where(a => a.Id == account_id); - if (accounts != null && accounts.Count() == 1) - { - var account = accounts.ElementAt(0); - rv.Add(Tuple.Create(account, kv.Value.TradingPermission, kv.Value.AdminPermission)); - } - } - } - } - } - return rv; - } - } -} \ No newline at end of file diff --git a/src/client/spark_core/admin/PermissionFilters.cs b/src/client/spark_core/admin/PermissionFilters.cs deleted file mode 100644 index 3da6a137c..000000000 --- a/src/client/spark_core/admin/PermissionFilters.cs +++ /dev/null @@ -1,64 +0,0 @@ -using bts; -using bts.api; -using bts.api.core; -using bts.api.orderman; -using bts.api.position; -using bts.spark; -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Collections.Specialized; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Linq; - -namespace bts.api.core -{ - public static class PermissionFilters - { - public static IObservable> - PermissionFilter(this IObservable> source, IObservable am) - { - var pred = Observable.Create>( observer => - { - return am.Subscribe(x => - { - Func filter = (z => x.can_view_account(z.Account)); - observer.OnNext(filter); - }); - }); - - return source.Filter(pred); - } - - public static IObservable> - PermissionFilter(this IObservable> source, IObservable am) - { - var pred = Observable.Create>(observer => - { - return am.Subscribe(x => - { - Func filter = (z => x.can_view_account(z.Def.Account ?? string.Empty)); - observer.OnNext(filter); - }); - }); - - return source.Filter(pred); - } - - public static IObservable> - PermissionFilter(this IObservable> source, IObservable am) - { - var pred = Observable.Create>(observer => - { - return am.Subscribe(x => - { - Func filter = (z => x.can_view_account(z.Account)); - observer.OnNext(filter); - }); - }); - - return source.Filter(pred); - } - } -} \ No newline at end of file From 06165b3842b0baabee269e2b83b7035c884d1ba1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 15:06:03 -0500 Subject: [PATCH 143/225] SPARK-2534 Fills Form seems to always have SOD orders in there --- .../spark/view/Controls/DataGridEx/Filters/Views/TimeFilter.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilter.cs b/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilter.cs index 20155813d..145228b80 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilter.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilter.cs @@ -24,6 +24,7 @@ namespace mbts.ui { public TimeTextTuple end => _end; public bool is_active => _mode == TimeFilterMode.Today || + _mode == TimeFilterMode.CMEOpen || (_mode == TimeFilterMode.Period && (_begin.result.HasValue || _end.result.HasValue)); From 70aa62c0cf84e53c4d92165e374eb94ebd9154d2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 15:22:20 -0500 Subject: [PATCH 144/225] add border to DateTimePicker 'time' part view --- src/client/spark/view/Controls/Time/DateTimePicker.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/view/Controls/Time/DateTimePicker.xaml b/src/client/spark/view/Controls/Time/DateTimePicker.xaml index 9a8deb2cc..f0fc67218 100644 --- a/src/client/spark/view/Controls/Time/DateTimePicker.xaml +++ b/src/client/spark/view/Controls/Time/DateTimePicker.xaml @@ -93,7 +93,6 @@ u:TextBoxBehavior.EnableArrowKeyTraverse="True" u:Behavior.DisablePaste="True" Height="20" - BorderThickness="0" > From 0680dddab470a4fb2b7fcb97a3ae5e412fe7c725 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 22 Sep 2019 15:22:57 -0500 Subject: [PATCH 145/225] normalize line endings in TickUpDown.xaml --- src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml index 5a392c532..1915202c2 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDown.xaml @@ -457,15 +457,15 @@ Name="PART_TextBox" u:TextBoxBehavior.EnableArrowKeyTraverse="True" BorderThickness="0"> - + - + + From 80850146c12035d88f495c0a621054a5bef9e2ee Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 00:08:12 -0500 Subject: [PATCH 146/225] TableUpdate.AggregateLatest shouldn't share seed across subscriptions --- src/client/spark_api/api/Update.cs | 14 ++++++++++---- .../spark_api/api/Update/TableUpdateFullJoin.cs | 2 +- .../spark_api/api/Update/TableUpdateLeftJoin.cs | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 80ed9b1cf..b63d243a4 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -736,13 +736,19 @@ namespace bts.api.core { return new CompositeDisposable(source.Subscribe(aggregator.on_left), right.Subscribe(aggregator.on_right)); }); - public static IObservable AggregateLatest(this IObservable source, IObservable right, - Func, TRight, TAggregate> update_left, Func, TAggregate> update_right, TAggregate seed, + public static IObservable AggregateLatest( + this IObservable source, + IObservable right, + Func, TRight, TAggregate> update_left, + Func, TAggregate> update_right, + Func seed_factory, Func result_selector, - TLeft init_left = default, TRight init_right = default) => + TLeft init_left = default, + TRight init_right = default) => + // Observable.Create(o => { Log.DataFlow.diag($"Create AggregateLatest (Left: {typeof(TLeft)}, Right: {typeof(TRight)})."); - var aggregator = new ConcurrentAggregator(update_left, update_right, agg => o.OnNext(result_selector(agg)), seed, init_left, init_right); + var aggregator = new ConcurrentAggregator(update_left, update_right, agg => o.OnNext(result_selector(agg)), seed_factory(), init_left, init_right); return new CompositeDisposable(source.Subscribe(aggregator.on_left), right.Subscribe(aggregator.on_right)); }); diff --git a/src/client/spark_api/api/Update/TableUpdateFullJoin.cs b/src/client/spark_api/api/Update/TableUpdateFullJoin.cs index c1cc9d2b3..a66381fb3 100644 --- a/src/client/spark_api/api/Update/TableUpdateFullJoin.cs +++ b/src/client/spark_api/api/Update/TableUpdateFullJoin.cs @@ -18,7 +18,7 @@ namespace bts.api.core { return left_source.AggregateLatest, TableUpdate, (TableUpdate result, IReadOnlyDictionary left_state, IReadOnlyDictionary right_state), TableUpdate>(right_source, process_left, process_right, - (TableUpdate.mk_empty(result_key), new Dictionary(0), new Dictionary(0)), + () => (TableUpdate.mk_empty(result_key), new Dictionary(0), new Dictionary(0)), t => t.result, TableUpdate.mk_empty(left_key), TableUpdate.mk_empty(right_key)); // left diff --git a/src/client/spark_api/api/Update/TableUpdateLeftJoin.cs b/src/client/spark_api/api/Update/TableUpdateLeftJoin.cs index 1b6832260..eb9f7a56f 100644 --- a/src/client/spark_api/api/Update/TableUpdateLeftJoin.cs +++ b/src/client/spark_api/api/Update/TableUpdateLeftJoin.cs @@ -20,7 +20,7 @@ namespace bts.api.core { right_source, process_left, process_right, - (TableUpdate.mk_empty(result_key), new Dictionary>()), + () => (TableUpdate.mk_empty(result_key), new Dictionary>()), state => state.result, TableUpdate.mk_empty(left_key), TableUpdate.mk_empty(right_key)); From 6b5b517d70626bcf44daab3edbfe5dd5e05c0574 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 12:29:38 -0400 Subject: [PATCH 147/225] slight nit in GLBXExecutionGateway --- src/lib/orderman/actors/GLBXExecutionGateway.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/orderman/actors/GLBXExecutionGateway.cpp b/src/lib/orderman/actors/GLBXExecutionGateway.cpp index d0e33eb0b..68210573f 100644 --- a/src/lib/orderman/actors/GLBXExecutionGateway.cpp +++ b/src/lib/orderman/actors/GLBXExecutionGateway.cpp @@ -264,6 +264,7 @@ void GLBXExecutionGateway::on_exe_report( str_to(msg.get(), &data->transact_time); data->cfg = &me->cfg; data->msg = text_msg; + data->exchange = api::Venue::VENUE_GLBX; me->on_exe_report(*data, msg.trace()); } } From b9fd0e2e28d09eede3b664c22e69b434fd1e89c4 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 12:31:03 -0400 Subject: [PATCH 148/225] in SIM you can trade an expired security and if we leave it out of this map we will later attempt to add this fill twice while testing SOD because the test asks to delete the fills db --- src/lib/orderman/actors/FillStore.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index c5a492fa7..7d0eb01dd 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -59,8 +59,13 @@ void FillStore::init() { auto sec = me->oracle.get_security(SecurityKey(fill.security_key())); if (sec) { if (config::get().enabled() && - securities::is_expired(*sec)) + securities::is_expired(*sec)) { + //KD -- in SIM you can trade an expired security and if we leave it out of this map + //we will later attempt to add this fill twice while testing SOD because the test asks to delete the fills db + auto fk = kvp.first; + me->known_fills.insert(fk); continue; + } else { auto fk = kvp.first; me->known_fills.insert(fk); From 8fdab4a510942eec2ddbb02fb49bd126326158c8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 12:47:48 -0400 Subject: [PATCH 149/225] note about expired securities in sod tests --- testing/manual/positions_and_fills/SOD.txt | 2 ++ testing/manual/positions_and_fills/SOD_timezone.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/testing/manual/positions_and_fills/SOD.txt b/testing/manual/positions_and_fills/SOD.txt index cd5c62572..3e5f9dfbd 100644 --- a/testing/manual/positions_and_fills/SOD.txt +++ b/testing/manual/positions_and_fills/SOD.txt @@ -3,6 +3,8 @@ rm ~/sparkdata/data/databases/fills/* rm ~/sparkdata/data/databases/orders/* and bounce your server. +BE SURE NOT TO PICK AN EXPIRED SECURITY, THOSE FILLS ARE FILTERED + 0. We will force fills across for 3 securities, across 2 accounts. a. Pick 2 futures and one exchange traded spread, all on different symbols b. Choose these securities such that there is market data (sim or cert) that you can get fills against (maybe bring up the market view and select securities from there). diff --git a/testing/manual/positions_and_fills/SOD_timezone.txt b/testing/manual/positions_and_fills/SOD_timezone.txt index 78b53ffef..fb2336615 100644 --- a/testing/manual/positions_and_fills/SOD_timezone.txt +++ b/testing/manual/positions_and_fills/SOD_timezone.txt @@ -12,6 +12,8 @@ ExchangeSim { 2. Clean up your fills database. Cross the market to buy a 10 lot future (any future). Lets say the fill time is 6:03:XX EST. Wait until 6:05 and do a 20 lot sell. +BE SURE NOT TO PICK AN EXPIRED SECURITY, THOSE FILLS ARE FILTERED + 3. Now we will make 6:05 as the SOD Time. Enter this in your spark.conf SODTime{ From 9bf7666c30d86bbd56165673f53295b14ac1b565 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 11:56:57 -0500 Subject: [PATCH 150/225] downgrade pnl rounding error Log assert to warning --- .../spark/Modules/Trading/PNL/View/PNLRowCollectionView.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLRowCollectionView.cs b/src/client/spark/Modules/Trading/PNL/View/PNLRowCollectionView.cs index 083556ab7..d3dec5aa3 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLRowCollectionView.cs +++ b/src/client/spark/Modules/Trading/PNL/View/PNLRowCollectionView.cs @@ -373,7 +373,9 @@ namespace bts.shell.pnl { var less_last = data - last_data; var plus_new = less_last + new_data; data += new_data - last_data; - Log.assert(plus_new == data); + if (plus_new != data) { + Log.Ui.warn($"Detected PNL arithmetic rounding error in the group sum for '{string.Join(" ", GroupNamePath)}' (this bug is under investigation)."); + } last_data = new_data; } void on_is_selected_changed(bool is_selected) { From 5968ac10d2b81160ffa17dd1313984a31cbb72c2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 23 Sep 2019 13:48:26 -0400 Subject: [PATCH 151/225] The fix is right, but the code was a bit clumsy. --- src/lib/orderman/actors/FillStore.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 7d0eb01dd..ef5ebfb60 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -58,17 +58,10 @@ void FillStore::init() { fill.set_fill_kind(Fill::FILL_KIND_SOD); auto sec = me->oracle.get_security(SecurityKey(fill.security_key())); if (sec) { - if (config::get().enabled() && - securities::is_expired(*sec)) { - //KD -- in SIM you can trade an expired security and if we leave it out of this map - //we will later attempt to add this fill twice while testing SOD because the test asks to delete the fills db - auto fk = kvp.first; - me->known_fills.insert(fk); - continue; - } - else { - auto fk = kvp.first; - me->known_fills.insert(fk); + auto fk = kvp.first; + me->known_fills.insert(fk); + if (!config::get().enabled() || + !securities::is_expired(*sec)) { stored_batch.emplace_back(fill, *sec); } } else From 34e7d6a61759ad805a508907b3c90a05b3d4d4fd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 13:57:43 -0400 Subject: [PATCH 152/225] remove ice bust handling --- src/lib/orderman/actors/FillStore.cpp | 56 ++------------------------- 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 47ef27367..abca023ae 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -104,8 +104,7 @@ void FillStore::on_execution_report( to_str(er.exchange_fill_id)); auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.exec_type == api::orderman::EXEC_TYPE_FILL || - er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + er.exec_type == api::orderman::EXEC_TYPE_FILL) { api::orderman::Fill fill; if (!is_known) { @@ -149,60 +148,11 @@ void FillStore::on_execution_report( } // if partial_fill or fill } - for (auto const &ev : *u.events) - { - auto &er = *ev.data; - auto efi = to_str(er.exchange_fill_id); - if(std::count(efi.begin(), efi.end(), ':') > 0) - { - auto cpos = efi.find_last_of(':'); - efi = efi.substr(0, cpos); - ExchangeFillID temp; - str_to(efi, &temp); - efi = to_str(temp); - } - if(efi == "") - continue; - auto fk = fmt::format("{}:{}", er.order_key.value(), efi); - auto is_known = me->known_fills.count(fk); - - if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) - { - auto data = me->store->retrieve_one(fills_ns, fk); - Fill existing_fill; - if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) - { - existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_BUSTED); - auto fv = utils::pb::to_string(existing_fill); - me->store->update(fills_ns, fk, fv); - publish(me->fill_stream, existing_fill, *er.security); - } - else - LOG(OrderMan, Warn, "Received bust for unknown fill {}", fk); - } - else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) - { - auto data = me->store->retrieve_one(fills_ns, fk); - Fill existing_fill; - if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) - { - existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_CORRECTED); - existing_fill.set_last_price(er.last_price.value()); - existing_fill.set_avg_price(er.avg_price.value()); - existing_fill.set_side(er.side); - existing_fill.set_last_shares(er.last_shares.value()); - - auto fv = utils::pb::to_string(existing_fill); - me->store->update(fills_ns, fk, fv); - publish(me->fill_stream, existing_fill, *er.security); - } - else - LOG(OrderMan, Warn, "Received correction for unknown fill {}", fk); - } - } // for loop } // if u.events } + + void FillStore::on_order_definition_update( mercury::Update const &u) { if (u.events) From f20c53bced75142a3514456dbbe36a9d2c52bdc3 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 23 Sep 2019 14:08:21 -0400 Subject: [PATCH 153/225] Organized the code better --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 198 ++++++++++-------- .../orders/algo/algo_orders/PyramidAlgo.h | 17 +- 2 files changed, 123 insertions(+), 92 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index ca2f5e5a7..67d106ecf 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -16,7 +16,7 @@ namespace orderman { using namespace api::orderman; -enum class PyramidAlgo::Status { WAITING_FOR_MD, WAITING_FOR_MD_ATTACH, WORKING, WAITING_FOR_CANCEL, DONE }; +enum class PyramidAlgo::Status { WAITING_FOR_MD, WAITING_FOR_MD_ATTACH, WORKING, DONE }; struct LegData{ const size_t index; @@ -154,53 +154,46 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { _algo().order_key().value(), static_cast(me->state), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_dynamic()) { - _algo().terminate_error("Invalid update"); + _cxl_and_end(true,false,"Invalid update, Dynamic algo data is missing"); return; } auto conv_res = _get_update_params(update, me->params); if (!std::get<1>(conv_res)){ - _algo().terminate_error("Invalid update"); + _cxl_and_end(true,false,std::get<2>(conv_res)); return; } - else{ - // copy state - auto params = std::get<0>(conv_res); - me->legs[0].top_delete = params.top_delete; - size_t i = 1; - for (Quantity pu : params.cover_payups) - me->legs[i++].cover_payup = pu; - } + const PyramidAlgoParams& algo_params = std::get<0>(conv_res); + Price price = Price(update.price()); + Quantity qty = Quantity(update.quantity()); switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: - me->out_price = Price(update.price()); - me->out_qty = Quantity(update.quantity()); + _copy_update(algo_params, price, qty); + if(_target_reached()){ // if qty is set to 0 + _cxl_and_end (false,true,"Target reached"); + return; + } break; case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: - me->out_price = Price(update.price()); - me->out_qty = Quantity(update.quantity()); - // TODO, check if qty >= filled (filled >=0 in the case of attach) + _copy_update(algo_params, price, qty); + if(_target_reached()){ + // target could be reached if the algo order qty is + // set <= filled qty of the attached order + _cxl_and_end (false,true,"Target reached"); + return; + } + _update_top_spread(); break; case PyramidAlgo::Status::WORKING: - me->out_price = Price(update.price()); - me->out_qty = Quantity(update.quantity()); - // TODO, check if qty >= filled - if (_working_state_met()){ - // change price of top spread order - Update child_update; - child_update.set_price(update.price()); - child_update.set_quantity(update.quantity()); - _algo().update_child(me->legs[0].order_key, child_update); + _copy_update(algo_params, price, qty); + if(_target_reached()){ + _cxl_and_end (false,true,"Target reached"); + return; } - else{ - _algo().cancel("Order cancelled (Cover prices not met)"); - _switch_state(PyramidAlgo::Status::WAITING_FOR_CANCEL); - } - break; - case PyramidAlgo::Status::WAITING_FOR_CANCEL: - LOG(OrderMan, Warn, "PyramidAlgo::do_update order:{} ignoring update since the " - "order is already cancelled", _algo().order_key().value()); + if (_working_state_met()) + _update_top_spread(); + else + _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); break; case PyramidAlgo::Status::DONE: break; @@ -215,6 +208,19 @@ void PyramidAlgo::on_book(SecurityKey key, const Book& book) { _analyze_md_and_act(); } } +IAlgoOrder::OnCancelResponse PyramidAlgo::on_cancel(){ + // cancel top spread, let hedges work, cancel algo + switch(me->state){ + case PyramidAlgo::Status::WAITING_FOR_MD: + case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: + case PyramidAlgo::Status::WORKING: + _cxl_and_end(false,true,"Order cancelled"); + break; + case PyramidAlgo::Status::DONE: + break; + } + return IAlgoOrder::OnCancelResponse::IGNORE; +} void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { LOG(OrderMan, Info, "PyramidAlgo::on_child_change key:{} child_key:{} state:{} status:{} " @@ -232,19 +238,23 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { _algo().order_key(), key); return; } - switch(me->state){ + switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: bts_assert_msg (false, "No child orders"); break; case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: - // cant do anything here since if there are fills - // wont know where the send the hedges + leg->order_state = st; + if(leg->is_top_spread()) + _algo().update_fill_state(st.total_fills, st.avg_price); + _check_for_completion(); break; case PyramidAlgo::Status::WORKING: - _handle_order_in_working (*leg, st); - break; - case PyramidAlgo::Status::WAITING_FOR_CANCEL: - _handle_order_in_waiting_cancel(*leg, st); + leg->order_state = st; + if(leg->is_top_spread()){ + _algo().update_fill_state(st.total_fills, st.avg_price); + _send_hedges(st.last_fills); + } + _check_for_completion(); break; case PyramidAlgo::Status::DONE: break; @@ -297,10 +307,15 @@ PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, std::tuple PyramidAlgo::_get_update_params(const Update& update, - const PyramidAlgoParams&){ - auto rv = _convert_params(update.custom()); - // TODO: compare contracts and dont allow them to change - return std::make_tuple(rv,true,std::string("")); + const PyramidAlgoParams& curr_params){ + PyramidAlgoParams new_params = _convert_params(update.custom()); + if(new_params.top_spread != curr_params.top_spread || + new_params.cover_spreads.size() != curr_params.cover_spreads.size()) + return std::make_tuple(new_params,false,"Contracts can not be updated"); + for (size_t i=0; i < curr_params.cover_spreads.size(); i++) + if(new_params.cover_spreads[i] != curr_params.cover_spreads[i]) + return std::make_tuple(new_params,false,"Contracts can not be updated"); + return std::make_tuple(new_params,true,std::string("")); } /////////////////////////////////////////////////////////////////////////////// @@ -343,10 +358,8 @@ void PyramidAlgo::_analyze_md_and_act(){ me->out_qty); _switch_state(PyramidAlgo::Status::WORKING); } - else{ - _algo().cancel("Order cancelled (Cover prices not met)"); - _switch_state(PyramidAlgo::Status::DONE); - } + else + _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); break; case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: if(!_md_recvd()) @@ -354,18 +367,13 @@ void PyramidAlgo::_analyze_md_and_act(){ // received data for the first time if (_working_state_met()) _switch_state(PyramidAlgo::Status::WORKING); - else{ - _algo().cancel("Order cancelled (Cover prices not met)"); - _switch_state(PyramidAlgo::Status::DONE); - } + else + _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); break; case PyramidAlgo::Status::WORKING: - if (!_working_state_met()){ - _algo().cancel("Order cancelled (Cover prices not met)"); - _switch_state(PyramidAlgo::Status::DONE); - } + if (!_working_state_met()) + _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); break; - case PyramidAlgo::Status::WAITING_FOR_CANCEL: case PyramidAlgo::Status::DONE: break; } @@ -383,9 +391,6 @@ void PyramidAlgo::_switch_state(Status new_state){ bts_assert(me->state == PyramidAlgo::Status::WAITING_FOR_MD || me->state == PyramidAlgo::Status::WAITING_FOR_MD_ATTACH); break; - case (PyramidAlgo::Status::WAITING_FOR_CANCEL): - bts_assert(me->state == PyramidAlgo::Status::WORKING); - break; case (PyramidAlgo::Status::DONE): bts_assert( // when an order is entered and the criteria is not met @@ -393,9 +398,7 @@ void PyramidAlgo::_switch_state(Status new_state){ // when an order is attached and the market conditions are not met me->state == PyramidAlgo::Status::WAITING_FOR_MD_ATTACH || // when the child order gets into an unexpected state - me->state == PyramidAlgo::Status::WORKING || - // as expected, order gets cancelled - me->state == PyramidAlgo::Status::WAITING_FOR_CANCEL); + me->state == PyramidAlgo::Status::WORKING); break; } LOG(OrderMan, Info,"PyramidAlgo::_switch_state key:{} {}->{} ", @@ -405,25 +408,6 @@ void PyramidAlgo::_switch_state(Status new_state){ me->state = new_state; } -void PyramidAlgo::_handle_order_in_working (LegData& leg, - const ChildState &st){ - leg.order_state = st; - if(leg.is_top_spread()){ - _algo().update_fill_state(st.total_fills, st.avg_price); - _send_hedges(st.last_fills); - switch (st.status) { - case ChildStatus::WORKING: - case ChildStatus::COMPLETED: - break; - case ChildStatus::CANCELED: - _algo().cancel("Unexpected child cancel"); - _switch_state(PyramidAlgo::Status::WAITING_FOR_CANCEL); - break; - } - } - _check_for_completion(); -} - void PyramidAlgo::_handle_order_in_waiting_cancel(LegData& leg, const ChildState& st){ leg.order_state = st; @@ -453,18 +437,52 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ } } +void PyramidAlgo::_update_top_spread(){ + Update child_update; + child_update.set_price(me->out_price.value()); + child_update.set_quantity(me->out_qty.value()); + // TODO log + _algo().update_child(me->legs[0].order_key, child_update); +} + +void PyramidAlgo::_copy_update(const PyramidAlgoParams& algo_params, + Price price, Quantity qty){ + // params + me->legs[0].top_delete = algo_params.top_delete; + size_t i = 1; + for (Quantity pu : algo_params.cover_payups) + me->legs[i++].cover_payup = pu; + // price, qty + me->out_price = price; + me->out_qty = qty; +} + void PyramidAlgo::_check_for_completion(){ - if(me->legs[0].order_state.status == ChildStatus::WORKING) - return; - // detach the working hedge orders - // for (const auto& l : me->legs) - // if(l.order_state.status == ChildStatus::WORKING) - // _algo().detach_child(l.order_key); + if(me->legs[0].order_state.status != ChildStatus::WORKING) + _cxl_and_end(false, + me->legs[0].order_state.status == ChildStatus::CANCELED,""); +} + +void PyramidAlgo::_cxl_and_end(bool is_error, + bool is_cxl, + const std::string& msg){ + if(me->legs[0].order_key != OrderKey(0)) + _algo().cancel_child(me->legs[0].order_key); _algo().detach_all_children(); - _algo().complete(); + if(is_error) + _algo().terminate_error(msg); + else if (is_cxl) + _algo().cancel(msg); + else + _algo().complete(); _switch_state(PyramidAlgo::Status::DONE); } +bool PyramidAlgo::_target_reached() const{ + return me->legs[0].order_state.total_fills.value() >= + me->out_qty.value(); +} + bool PyramidAlgo::_md_recvd() const{ for (const LegData& l : me->legs) if(!l.recv_book) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index e6bec2e75..f7b381b79 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -26,6 +26,7 @@ class PyramidAlgo : public IAlgoOrder { void do_update(api::orderman::Update const &) override; void on_book(SecurityKey, Book const &) override; void on_child_change(OrderKey, ChildState const &) override; + IAlgoOrder::OnCancelResponse on_cancel() override; private: enum class Status; @@ -47,12 +48,24 @@ private: SecurityKey, api::Side, bool is_top_spread) const; - void _analyze_md_and_act(); + // acts on md, cognizant of the state + void _analyze_md_and_act(); void _switch_state (Status new_status); - void _handle_order_in_working (LegData&, const ChildState &st); void _handle_order_in_waiting_cancel (LegData&, const ChildState &st); void _send_hedges (Quantity filled_qty); + // updates it to the price, qty in the state + void _update_top_spread(); + void _copy_update(const PyramidAlgoParams& algo_params, + Price price, Quantity qty); void _check_for_completion(); + // cxl's the working top leg order (if any), detaches + // all hedges. if is_error then terminates algo, is + // is_cxl then cxl's algo, otherwise completes it + void _cxl_and_end(bool is_error, + bool is_cxl, + const std::string& err_txt); + bool _target_reached() const; + // true is all legs have recvd md bool _md_recvd() const; bool _working_state_met() const; }; From 032836dea471a036f839b42d7c0f9a9cdf52a29b Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 23 Sep 2019 15:54:33 -0400 Subject: [PATCH 154/225] Test updates --- testing/manual/admin/order_router.txt | 2 +- .../server_performance/spreader_requote.txt | 8 +- testing/manual/settings/UserSettingsTest.txt | 91 ++++++++----------- 3 files changed, 42 insertions(+), 59 deletions(-) diff --git a/testing/manual/admin/order_router.txt b/testing/manual/admin/order_router.txt index c66cb1789..5030ae767 100644 --- a/testing/manual/admin/order_router.txt +++ b/testing/manual/admin/order_router.txt @@ -17,7 +17,7 @@ Prerequisites User settings ------------- 3. Navigate to http://sparkvm:8000 (or wherever your sparkd resides), Users tab -4. Between bts and bts_2 users, verify that have distinct operator ids (Order Routing tab) +4. Between bts and bts_2 users, verify they have distinct operator ids (Order Routing tab) 5. In another ssh session on your server, let's tail the sim fix log for orders tail -f ~/sparkdata/data/jetfix/sim/current/fix | grep --line-buffered 35=D | tr '\001' '|' 6. Open up a client, login as bts, pick your favorite symbol and submit an order diff --git a/testing/manual/server_performance/spreader_requote.txt b/testing/manual/server_performance/spreader_requote.txt index 3724f0fb1..19d8a7d5c 100644 --- a/testing/manual/server_performance/spreader_requote.txt +++ b/testing/manual/server_performance/spreader_requote.txt @@ -1,4 +1,4 @@ -Test Author: Pedro +Test Author: Pedro If it breaks: Pedro Spreader Requote Performance test @@ -30,13 +30,13 @@ OrdermanCfg { value { executor { thread_name: "oman_orders" - poll: true + poll: true hosted_actor: "MDSource" hosted_actor: "OrderManager" } executor { thread_name: "oman_slow" - poll: false + poll: false hosted_actor: "*" } } @@ -54,7 +54,7 @@ Threads { 5) Now you are ready to start testing. Start a shell and create a new synthetic say with 2 CL futures. Use the near month (fast ticking) future as the non quoting leg, so that the other leg gets quoted -often. Make sure to disable throtling in the synthetic definition +often. Make sure to disable throttling in the synthetic definition dialog. 6) Place an order for this synthetic, away from the market. diff --git a/testing/manual/settings/UserSettingsTest.txt b/testing/manual/settings/UserSettingsTest.txt index 573a14106..5201d95b6 100644 --- a/testing/manual/settings/UserSettingsTest.txt +++ b/testing/manual/settings/UserSettingsTest.txt @@ -1,50 +1,33 @@ -User Settings Test (15 min) +User Settings Test + (there is a REFERENCE section at the bottom, please consult it before getting frustrated, if things are still unclear, ask John.) NOTES: - - in addition to the notes below, there is a "Reference" section at the bottom of the test, - feel free to add things to it if you run into problems; impart your wisdom unto the next tester. - the settings button is located in the bottom-left corner of the Ladder - - the "Default" tab will be referred to as [DTab], "Custom" as [CTab] - - the "Use Defaults" checkbox is located at the top of the dialog - - when "Use Defaults" is checked, [CTab] is disabled ([DTab], however, is always enabled) - to Import/Export settings to files, click the hamburger icon in the upper-right corner of the settings dialog. - you cannot open multiple settings dialog for the same Ladder i) if a settings dialog is already open, clicking the settings button in the Ladder again closes said dialog, then opens a new one - - the settings dialogs do not live update - i) this only pertains to [DTab], as Custom settings are not shared. - - commit changes by clicking "Apply" or "OK" - i) the only difference between the 2 buttons is that "OK" also closes the dialog - - when you commit changes: - i) even if "Use Defaults" is NOT checked, the settings in [DTab] will be compared with the current defaults, - if they are different, the default changes will be committed as well. - ii) be advised of the following scenario: - You have 2 settings dialogs open (call them [A] and [B]), and commit changes to the defaults in [A]. - As the dialogs do NOT live update, [B] will have stale defaults. - When you click commit in [B] (even if you have not actually changed anything in [DTab]) - the stale defaults in [B] will be committed, effectively overwritting the changes to the defaults you just committed from [A]. + - the "sample" areas should always reflect the properties in your editor, if this is unclear, see the reference section at the bottom for a more detailed explanation. - - when the test directs you to "Visually Confirm blah...," just give it a quick glance, if something isn't matching it should be obvious. - - when the test directs you to repeat a step for each property, here is the list (in case it isn't clear in the dialog): - Note: the Sample column is purely output, don't bother clicking it - - Order Badge Style - - Alternate Order Quantity - - Size Presets (aka Number Pad buttons) - - Fonts and Colors section: - for each column (Orders, Bid, Price, Ask, Last) + + - when the test directs you to repeat a step for each property, here is the list: + - Ladder Columns tab -> + - Order Badge Style + - for each column (Orders, Bid, Price, Ask, Last) i) background ii) foreground iii) font (family, size, and weight) - - Market Break Lines section: - i) for each "price-line" (session high, ask, mid, bid, and session low) + - Order Quantities tab -> + - 'Single Click' Quantity + - Number Pad Quantities + - Market Break Lines tab: + i) for each "price-line" (session high, ask, mid, bid, and session low) a) toggle show/hide b) color ii) for session range (this is not actually a line, but the color between the session low/high a) toggle show/hide b) color - - when the test advises you to name files (screenshots, or ladder settings files), it is because they will be referenced later by that name. - - if you uncheck all 3 market break lines, the ladder resolves to show the bid line by design. - - just to reiterate: there is a REFERENCE section at the bottom, please consult it before getting frustrated, if things are still unclear, ask John. + - if you uncheck all market break lines, the ladder resolves to show the bid line by design. ------------TEST STEPS------------------ @@ -52,61 +35,61 @@ NOTES: - the security needs a few working orders on both sides, and a gap of 5-8 ticks between the top bid/ask. The gap is needed to separate the market break lines (Bid, Ask, and Mid). - from hence forth, the 2 ladders will be referred to as "[A]" and "[B]" and their settings dialogs as "dialog[A]" and "dialog[B]" - - at the risk of sounding redundant, the "Default" tab will be referred to as [DTab], the "Custom" as [CTab] - + 2) Open the settings dialogs for [A] and [B] 3) Make sure that both [A] and [B] are using default settings, then close [B]dialog -4) In dialog[A] (with [DTab] selected, [CTab] should be disabled anyways), change each property, then click "Apply" +4) In dialog[A] change each property, then click "Apply" 5) Visually confirm that all the changes have been applied to both ladders - the row height should adjust to fit the largest font size, - the scroll position should be maintained, assuming the AutoRecenterTimer didn't move it. - + 6) Take a screenshot, name it "A-1-confirmation.png" -7) In dialog[A], export the default settings to a file, name it "A-1.ladder" (instructions on how to import/export are in the NOTES section) +7) In dialog[A], export the settings to a file, name it "A-1.ladder" (from the irregular hamburger menu) -8) In dialog[A], click "Restore to Factory," then click "Apply" +8) In dialog[A], click "Load Factory Defaults" in the irregular hamburger menu then click "Apply" 9) Visually confirm that dialog[A], and both ladders, each changed appearance, and match one another. -10) In dialog[A], uncheck "Use Defaults", then select [CTab] - -11) Import "A-1.ladder" to Custom, then click Apply +10) In dialog[A] Import "A-1.ladder", then click Apply 12) Visually confirm that: - dialog[A] and [A] changed appearance, and look just like they did in "A-1-confirmation.png" - [B] did not change appearance 13) Click the settings button in [A] and [B] to get 2 fresh dialogs (dialog[A] should close and reopen) - - in dialog[A], "Use Default" should be false, and [CTab] selected - - in dialog[B], "Use Default" should be true, and [DTab] selected ([CTab] should be disabled) 14) Take a screenshot, then save the workspace, then restore it - visually confirm that [A] and [B] look as they did in the screenshot - repeat step 13 -15) In dialog[A], with [CTab] selected, click "Copy from Default" - - [CTab] should now have the same settings as [DTab] +15) In dialog[A] hit the plus stack icon to add a new Profile, give it a unique and memorable name -16) Click the settings button in [A] to close and reopen dialog[A] +16) In Dialog [B] select the profile you just created, if you remember the name -17) In dialog[A] select [DTab], then click "Copy from Custom" - - [DTab] should now have the same settings as [CTab] +17) Click Apply and verify [B] changes to match [A] + +18) Click the smaller than average pencil button in dialog[B] change the name of your profile and hit enter. Verify the name changed in dialog[A] + +19) Change any one setting of your choice in either dialog. Click the 3.5 inch floppy disk icon and wait for the light to go off before ejecting the disk. Verify both dialogs have the setting you changed. + +2001) Change any one setting of your choice in either dialog; click apply in the same dialog and verify both ladders and both dialogs reflect the changed setting. + +2002) Revert to factory defaults and create a new profile named "Unsafety Checks" + +2003) On the Safety Checks tab uncheck Warn on Market Cross + +2004) Click the security selection icon (with the hand), double click every entry in the Exchange column, and click OK. Save or Apply. + +2005) Open a new ladder for any symbol and verify you can cross your own orders without being pestered by a confirmation dialog DONE!!! Reference----------------------------------------------------------- - Alternate Order Quantity: - - you may send an order with this size via a RIGHT CLICK on a price cell - - Size Presets: - - aka the number-pad buttons - - click the expander-arrow button next to the "Size Presets" label to modify them - - you control the quantities in the buttons, and the order in which they appear Market Break Lines (Bid, Ask, Mid, and Session Low/High/Range): - each row corresponds to one item, and represents a "horizontal price-line" that will be displayed in the ladder (if show is checked, of course) From 0cc581793266abf1068dc6cb70cb3a356ac8dac2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 22:38:24 -0500 Subject: [PATCH 155/225] expand synthetic leg columns to fit name --- .../spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs index 83d205f2d..ef8137e25 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs @@ -227,7 +227,7 @@ namespace mbts.ui.spark { } DataGridColumn _column_factory(LegSpreaderParamsTuple l) { - var col = new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter) { Width = 75, }; + var col = new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter); col.HeaderTemplate = (DataTemplate)FindResource(IsNew ? RemovableColumnHeaderTemplateKey : NonRemovableColumnHeaderTemplateKey); DataGridEx.SetRightBorder(col, new DataGridExVerticalLine(false, true, Colors.DarkGray, 1)); return col; From 016ddf9b6950c83dd2a35a7787229f627376e895 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 24 Sep 2019 08:21:56 -0500 Subject: [PATCH 156/225] fixing pay less definition --- doc/user/content/bts_spark/Spreader/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/content/bts_spark/Spreader/_index.md b/doc/user/content/bts_spark/Spreader/_index.md index a69a3731e..79a1c6168 100644 --- a/doc/user/content/bts_spark/Spreader/_index.md +++ b/doc/user/content/bts_spark/Spreader/_index.md @@ -154,7 +154,7 @@ insert_anchor_links = "right" - Pay Less - If enabled by checking the checkbox, the spreader will attempt to pay less when the quantity at the level of the calculated - hedge price is more than the threshold defined.  The hedge order is + hedge price is less than the threshold defined.  The hedge order is paid less by the “Payless Ticks” as defined per leg. - Pay Up - If enabled by checking the checkbox, the spreader will pay up when the quantity at the level of the calculated hedge price is From 5eeb5a534ce15f433fe72fdeebec8dbe7f7543be Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 24 Sep 2019 13:12:16 -0400 Subject: [PATCH 157/225] Adding logs --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 17 ++++++----------- .../orders/algo/algo_orders/PyramidAlgo.h | 1 - 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 67d106ecf..94ef6390d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -408,16 +408,6 @@ void PyramidAlgo::_switch_state(Status new_state){ me->state = new_state; } -void PyramidAlgo::_handle_order_in_waiting_cancel(LegData& leg, - const ChildState& st){ - leg.order_state = st; - if(leg.is_top_spread()){ - _algo().update_fill_state(st.total_fills, st.last_price); - _send_hedges(st.last_fills); - } - _check_for_completion(); -} - void PyramidAlgo::_send_hedges (Quantity filled_qty){ if (filled_qty.value() > 0) for (auto& l : me->legs) @@ -441,7 +431,12 @@ void PyramidAlgo::_update_top_spread(){ Update child_update; child_update.set_price(me->out_price.value()); child_update.set_quantity(me->out_qty.value()); - // TODO log + LOG(OrderMan, Info,"PyramidAlgo::_update_top_spread modifying order key:{} " + "child_key:{} price:{} qty:{}", + _algo().order_key(), + me->legs[0].order_key, + me->out_price, + me->out_qty); _algo().update_child(me->legs[0].order_key, child_update); } diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index f7b381b79..a17888622 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -51,7 +51,6 @@ private: // acts on md, cognizant of the state void _analyze_md_and_act(); void _switch_state (Status new_status); - void _handle_order_in_waiting_cancel (LegData&, const ChildState &st); void _send_hedges (Quantity filled_qty); // updates it to the price, qty in the state void _update_top_spread(); From d033275694eed0a88515672c28db2616951b5866 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 12:26:07 -0500 Subject: [PATCH 158/225] remove unused member OrdersModel.on_account_pnl --- src/client/spark/Orders/OrdersModel.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 278324bcb..920acfca3 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -75,7 +75,6 @@ namespace mbts.spark { .TableCheckedAutoCorrect(EqualityComparer<(SecurityImmutable? sec, PNLUnitImmutable data)>.Default) .Where(t => t.has_changes()) .Cache(); - on_account_pnl = _position_service.subscribei_pnl_account_data().Naggle(interval, scheduler).Table().Cache(); var working_orders = on_orders.Filter(tup => tup.order.is_active()); this.working_orders = on_orders.Scan( @@ -265,7 +264,6 @@ namespace mbts.spark { public IObservable> working_orders { get; } public IObservable> on_pnl { get; } public IObservable> security_account_pnl { get; } - public IObservable> on_account_pnl { get; } public IObservable> on_positions { get; } public IObservable> studio_algos_with_meta { get; } public IObservable> on_manual_fills_securities { get; } From a3730eb20354df481fe56d18f0c6a10aa1686876 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 18:08:38 -0500 Subject: [PATCH 159/225] Update.naggle merge maintains changes (could get into state where changes became adds/removes) --- src/client/spark_api/api/Update.cs | 99 ++++++++++++++++-------------- 1 file changed, 54 insertions(+), 45 deletions(-) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 80ed9b1cf..004e81dec 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Reactive.Concurrency; using System.Reactive.Disposables; using System.Reactive.Linq; -using System.Reactive.Subjects; using System.Text; namespace bts.api.core { @@ -94,38 +93,38 @@ namespace bts.api.core { new Update(new T[0], new T[0], new Change[0], new T[0], key_extractor); public Update merge(Update next) { - var comp = new RowEqualityComparer(_key); - var added = this.added as HashSet ?? new HashSet(this.added, comp); + var added = this.added as KeyedValueSet ?? new KeyedValueSet(this.added, _key); var changes = this.changed as ChangeDict ?? new ChangeDict(this.changes, _key); - var removed = this.removed as HashSet ?? new HashSet(this.removed, comp); + var removed = this.removed as KeyedValueSet ?? new KeyedValueSet(this.removed, _key); // Add - added.UnionWith(next.added); + foreach (var v in next.added) { + var k = _key(v); + if (removed.TryPop(k, out var oldval)) { + changes.AddOrMerge(new Change(oldval, v)); + } else { + added[k] = v; + } + } // Change foreach (var c in next.changes) { - if (added.Contains(c.Old)) { - added.Remove(c.Old); - added.Add(c.New); - } - else { + var k = _key(c.Old); + if (!added.TryReplace(k, c.New)) changes.AddOrMerge(c); - } } // Remove foreach (var r in next.removed) { - if (!added.Remove(r)) { - removed.Add(r); - } - changes.Remove(_key(r)); + var k = _key(r); + if (!added.Remove(k)) + removed[k] = changes.TryRemove(k, out var ch) ? ch.Old : r; } return new Update( next.all, added, changes, removed, - _key - ); + _key); } public IEnumerable all { get; } @@ -148,6 +147,39 @@ namespace bts.api.core { #endif } + class KeyedValueSet : IEnumerable { + readonly Dictionary _cache = new Dictionary(); + + public KeyedValueSet(IEnumerable value, Func key) { + foreach (var v in value) + _cache[key(v)] = v; + } + + public TValue this[TKey key] { + set => _cache[key] = value; + } + + public bool Remove(TKey key) => + _cache.Remove(key); + + public bool TryPop(TKey key, out TValue value) => + _cache.TryGetValue(key, out value) && _cache.Remove(key); + + public bool TryReplace(TKey key, TValue value) { + if (_cache.ContainsKey(key)) { + _cache[key] = value; + return true; + } + return false; + } + + public IEnumerator GetEnumerator() => + _cache.Values.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => + GetEnumerator(); + } + class ChangeDict : IEnumerable> { Dictionary> _changes; Func, TKey> _key; @@ -167,9 +199,11 @@ namespace bts.api.core { return null; } - public void Remove(TKey key) { + public bool Remove(TKey key) => _changes.Remove(key); - } + + public bool TryRemove(TKey key, out Change result) => + _changes.TryGetValue(key, out result) && _changes.Remove(key); #region IEnumerable public IEnumerator> GetEnumerator() { @@ -181,31 +215,6 @@ namespace bts.api.core { #endregion } - struct RowEqualityComparer : IEqualityComparer, IEqualityComparer> - where TKey : IEquatable { - readonly Func _key; - - public RowEqualityComparer(Func key) { - _key = key; - } - - public bool Equals(T x, T y) { - return _key(x).Equals(_key(y)); - } - - public bool Equals(Change x, Change y) { - return Equals(x.New, y.New); - } - - public int GetHashCode(T obj) { - return _key(obj).GetHashCode(); - } - - public int GetHashCode(Change c) { - return GetHashCode(c.New); - } - } - public class TableUpdate where TKey : IEquatable { // warning: this does not have a key_extractor public static readonly TableUpdate empty = new TableUpdate(ImmutableDictionary.Empty, Array.Empty(), Array.Empty>(), Array.Empty(), null); @@ -922,4 +931,4 @@ namespace bts.api.core { $"T is '{typeof(T)}', TKey is '{typeof(TKey)}'"; } } -} \ No newline at end of file +} From 2a36c05d7597d7ddc121224ee505131f15b3b935 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 18:12:09 -0500 Subject: [PATCH 160/225] fix PNLRowData Equals impl (was not comparing market prices) --- src/client/spark/Modules/Trading/PNL/Data/PNLData.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs index 9c941fc55..b6a83ae6a 100644 --- a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs +++ b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs @@ -501,6 +501,12 @@ namespace bts.shell.pnl { account_name == other.account_name && sod == other.sod && day == other.day && + bid_price.Equals(other.bid_price) && + ask_price.Equals(other.ask_price) && + last_price.Equals(other.last_price) && + mid_price.Equals(other.mid_price) && + settlement_price.Equals(other.settlement_price) && + calc_type.Equals(other.calc_type) && raw_day == other.raw_day && working.summary == other.working.summary; From ffb571d1cfbf0318d8fce5626df6a3ce7623b7b5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 18:14:34 -0500 Subject: [PATCH 161/225] fix pnl rounding issues (use 9 decimal places) --- .../spark/Modules/Trading/PNL/VM/PNLRowVM.cs | 20 +++++++++---------- .../spark/view/Controls/DIYGrid/DoubleUtil.cs | 10 ++++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs index f32cee536..52cfa3ff0 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs @@ -97,22 +97,22 @@ namespace bts.shell.pnl { if (security.HasValue && security.Value.ContractCase != Security.ContractOneofCase.Future) { day_long = day_short = sod_long = sod_short = 0; } else { - day_long = (decimal)DoubleUtil.nan_to_zero(data.day.long_pos); - day_short = (decimal)DoubleUtil.nan_to_zero(data.day.short_pos); - sod_long = (decimal)DoubleUtil.nan_to_zero(data.sod.long_pos); - sod_short = (decimal)DoubleUtil.nan_to_zero(data.sod.short_pos); + day_long = DoubleUtil.round_to_decimal(data.day.long_pos); + day_short = DoubleUtil.round_to_decimal(data.day.short_pos); + sod_long = DoubleUtil.round_to_decimal(data.sod.long_pos); + sod_short = DoubleUtil.round_to_decimal(data.sod.short_pos); } var nd = new PNLNormalizedData( - (decimal)DoubleUtil.nan_to_zero(day_pnl.value), + DoubleUtil.round_to_decimal(day_pnl.value), day_long, day_short, - (decimal)DoubleUtil.nan_to_zero(data.raw_day.long_pos), - (decimal)DoubleUtil.nan_to_zero(data.raw_day.short_pos), - (decimal)DoubleUtil.nan_to_zero(sod_pnl.value), + DoubleUtil.round_to_decimal(data.raw_day.long_pos), + DoubleUtil.round_to_decimal(data.raw_day.short_pos), + DoubleUtil.round_to_decimal(sod_pnl.value), sod_long, sod_short, - (decimal)DoubleUtil.nan_to_zero(data.working_long_pos), - (decimal)DoubleUtil.nan_to_zero(data.working_short_pos)); + DoubleUtil.round_to_decimal(data.working_long_pos), + DoubleUtil.round_to_decimal(data.working_short_pos)); if (_normalized_data != nd) { _normalized_data = nd; updated?.Invoke(nd); diff --git a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs index 2ac6f579b..aa2019135 100644 --- a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs +++ b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs @@ -1,10 +1,9 @@ using System; using System.Linq; -namespace mbts.ui.controls -{ - internal class DoubleUtil - { +namespace mbts.ui.controls { + static class DoubleUtil { + public const int API_DECIMAL_PRECISION = 9; /* smallest such that 1.0+DBL_EPSILON != 1.0 */ private const double EPSILON = 2.2204460492503131e-016; private const double BIG_EPSILON = EPSILON * 10; @@ -36,6 +35,9 @@ namespace mbts.ui.controls (double.IsNaN(right) ? double.NaN : -right) : (double.IsNaN(right) ? left : left - right); + public static decimal round_to_decimal(double value, int decimals = API_DECIMAL_PRECISION) => + double.IsNaN(value) ? 0 : (decimal)Math.Round(value, decimals, MidpointRounding.AwayFromZero); + internal static bool AreClose(double v1, double v2) { if (v1 == v2) return true; double delta = Math.Abs(v1 - v2); From ddc50e1fbacd0b57ea3adeba52caf20c6b711f93 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 23 Sep 2019 21:57:54 -0500 Subject: [PATCH 162/225] pnl initial calc type was not being applied to data --- src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index b04c03ead..19b6ff8da 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -103,7 +103,7 @@ namespace bts.shell.pnl { load_from(settings); _dispose = Disposable.Create( pnl_source.Operate( - _calculation_type.observe_current(), + _calculation_type.observe_current(true), (data, calc) => data.with(calc_type: calc) ).FilterWithRaw(filter_src, PNLRowData.key_fn, null) .OnDispatcher() From 055f0015e78b69e10e4919b0758d9b2e03bd5653 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 24 Sep 2019 17:28:06 -0500 Subject: [PATCH 163/225] Update.naggle pr edit: 'TryPop' is an innappropriate name (just use 'Remove') --- src/client/spark_api/api/Update.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 004e81dec..8522a6430 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -100,7 +100,7 @@ namespace bts.api.core { // Add foreach (var v in next.added) { var k = _key(v); - if (removed.TryPop(k, out var oldval)) { + if (removed.Remove(k, out var oldval)) { changes.AddOrMerge(new Change(oldval, v)); } else { added[k] = v; @@ -110,7 +110,7 @@ namespace bts.api.core { // Change foreach (var c in next.changes) { var k = _key(c.Old); - if (!added.TryReplace(k, c.New)) + if (!added.Replace(k, c.New)) changes.AddOrMerge(c); } @@ -162,10 +162,10 @@ namespace bts.api.core { public bool Remove(TKey key) => _cache.Remove(key); - public bool TryPop(TKey key, out TValue value) => + public bool Remove(TKey key, out TValue value) => _cache.TryGetValue(key, out value) && _cache.Remove(key); - public bool TryReplace(TKey key, TValue value) { + public bool Replace(TKey key, TValue value) { if (_cache.ContainsKey(key)) { _cache[key] = value; return true; From a878a55ac15eb592c0f6634251b95a46e58d038b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 25 Sep 2019 10:00:20 -0400 Subject: [PATCH 164/225] moved externals --- docker/linux | 2 +- externals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index e13bb5d8d..b09d4c035 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit e13bb5d8df14171a9a5abfdb8b6b4ecbc519032a +Subproject commit b09d4c035b4c0d0e600c7639cd9cb5edaee98d2e diff --git a/externals b/externals index b5ca26428..6b8c745fb 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit b5ca264286e2a7033b7ce6ad0000254dea03dc8a +Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 From da42e957541b325df5a5f64655f1137189841e4b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 25 Sep 2019 10:59:58 -0400 Subject: [PATCH 165/225] fixed externals and docker --- docker/linux | 2 +- externals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index b09d4c035..c40e6eba4 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit b09d4c035b4c0d0e600c7639cd9cb5edaee98d2e +Subproject commit c40e6eba4ba72480a68cf784b6ffbcacc3fbf4af diff --git a/externals b/externals index 6b8c745fb..6d8f64ca5 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679 +Subproject commit 6d8f64ca5cee3acbf9addb51428f25d54b9f906a From d2e9352e4899013d08e387005f6e569ba7135863 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 25 Sep 2019 12:01:31 -0500 Subject: [PATCH 166/225] unit test for update.naggle fix --- src/client/spark_test/api/ApiUpdateTests.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/client/spark_test/api/ApiUpdateTests.cs b/src/client/spark_test/api/ApiUpdateTests.cs index e41f9dbce..1b9e9dff7 100644 --- a/src/client/spark_test/api/ApiUpdateTests.cs +++ b/src/client/spark_test/api/ApiUpdateTests.cs @@ -347,6 +347,12 @@ namespace mbts.api.Test { var a3 = new Update(new[] { "a3" }, empty, new[] { new Change("a2", "a3") }, empty, key); var merged = a2.merge(a3); Assert.SequenceEqual(new[] { new Change("a1", "a3") }, merged.changes); + // clear the state, then add a2 back + // (this validates the fix for the Update.naggle bug where interim changes were converted into added/removed). + var cleared = new Update(empty, empty, Array.Empty>(), merged.all, key); + a2 = new Update(new[] { "a2" }, new[] { "a2" }, Array.Empty>(), empty, key); + merged = merged.merge(cleared).merge(a2); + Assert.SequenceEqual(new[] { new Change("a1", "a2") }, merged.changes); } T id(T t) => t; From 963a4207e270a6812235c2160cbb183cfc3b8e97 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 26 Sep 2019 19:00:15 -0400 Subject: [PATCH 167/225] Code complete, need cleanup and testing --- .../algo/algo_orders/RegisterDorman.cpp | 16 ++ .../orders/algo/algo_orders/TASAlgo.cpp | 207 ++++++++++++++++++ .../orders/algo/algo_orders/TASAlgo.h | 46 ++++ 3 files changed, 269 insertions(+) create mode 100644 src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/TASAlgo.h diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index d4c7e1da4..c109da57c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -137,6 +137,22 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); } +extern "C" void init_tas_plugin(bts::SparkServices& srv) { + DynamicOrderDescriptor tas_desc; + + tas_desc.set_dynamic_order_type("TAS"); + + *tas_desc.add_param_desc() = param_double("Order 1 Price"); + *tas_desc.add_param_desc() = param_uint32("Order 1 Quantity"); + *tas_desc.add_param_desc() = param_bool("Order 1 Buy?"); + + *tas_desc.add_param_desc() = param_double("Order 2 Price"); + *tas_desc.add_param_desc() = param_uint32("Order 2 Quantity"); + *tas_desc.add_param_desc() = param_bool("Order 2 Buy?"); + + srv.register_dynamic_algo_order(tas_desc, []() { return std::make_unique(); }); +} + extern "C" void init_spark_plugin(bts::SparkServices &srv) { init_dorman_plugin(srv); init_pyramid_plugin(srv); diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp new file mode 100644 index 000000000..871447edf --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -0,0 +1,207 @@ +#include "lib/orderman/orders/algo/algo_orders/TASAlgo.h" + +#include "lib/domain_model/Security.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" +#include "lib/domain_model/Security.h" +#include "lib/utils/PBUtils.h" +#include + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +struct LegData{ + const size_t index; + const SecurityKey sec_key; + double tick_size; + const api::Side side; //trading side + Price price; + Quantity quantity; + ChildTemplate* order_template = nullptr; + OrderKey order_key; + ChildState order_state; + LegData (size_t index, + SecurityKey sec_key, + double tick_size, + api::Side side, + Price price, + Quantity quantity, + ChildTemplate* order_template) + : + index (index), + sec_key (sec_key), + tick_size(tick_size), + side (side), + price(price), + quantity(quantity), + order_template (order_template), + order_key(null_order_key()), + order_state() + { + } +}; + +enum class TASAlgo::Status { WAITING_FOR_SIGNAL, WORKING, DONE }; + +struct TASAlgo::PImpl { + TASAlgo::TASAlgoParams algo_params; + Status state = Status::WAITING_FOR_SIGNAL; + IAlgoServices* algo_services = nullptr; + std::vector legs; + SecurityKey sec_key; + api::Side side; + Price out_price; + Quantity out_qty; + LegData* find_leg_from_sec (SecurityKey sec_key){ + for (auto& l : legs) + if(l.sec_key == sec_key) + return &l; + return nullptr; + } + LegData* find_leg_from_ord_key (OrderKey ord_key){ + for (auto& l : legs) + if(l.order_key == ord_key) + return &l; + return nullptr; + } +}; + +TASAlgo::TASAlgo() : me(new PImpl()) {} +TASAlgo::~TASAlgo() {} +IAlgoServices& TASAlgo::_algo() const { return *me->algo_services; } + +OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { + auto& def = serv.definition(); + if (def.has_custom_def() && def.custom_def().has_dynamic()){ + me->algo_params = _convert_params(def.custom_def()); + me->side = def.side(); + const auto& sec = serv.security(); + me->sec_key = SecurityKey(sec.id()); + size_t i = 0; + for (const auto& t : me->algo_params.child_orders){ + auto price = std::get<0>(t); + auto quantity = std::get<1>(t); + auto side = std::get<2>(t); + auto* ordt = _create_order_template( + serv, + SecurityKey(sec.id()), + side); + double tick_size = sec.contract_spec().low_tick(); + me->legs.emplace_back(i++, + SecurityKey(sec.id()), + tick_size, + side, price, + quantity, + ordt); + } + } + else + return {OrderError::ORDER_ERROR_INVALID_PARAMETER, + std::string("Missing parameters")}; + return {}; +} + +void TASAlgo::do_launch(IAlgoServices& algo_services) { + me->algo_services = &algo_services; + _algo().subscribe_status(me->sec_key); +} + +void TASAlgo::do_launch_attached(IAlgoServices&, + OrderKey, + ChildState) { +} + +void TASAlgo::do_update(const api::orderman::Update&) { +} + +void TASAlgo::on_book(SecurityKey, const Book&) { +} + +void TASAlgo::on_child_change(OrderKey key, + ChildState const &st){ + LegData* ld_ptr = me->find_leg_from_ord_key(key); + if (ld_ptr != nullptr) + ld_ptr->order_state = st; + for (const auto& l : me->legs) + if(l.order_state.status == ChildStatus::WORKING) + return; + _algo().complete(); + _switch_state(TASAlgo::Status::DONE); +} + +void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ + if(key == me->sec_key && + status == co2::TradingStatus::TRADINGSTATUS_PRE_OPEN){ + switch (me->state){ + case TASAlgo::Status::WAITING_FOR_SIGNAL: + _switch_state(TASAlgo::Status::WORKING); + break; + case TASAlgo::Status::WORKING: + case TASAlgo::Status::DONE: + break; + } + } +} + +IAlgoOrder::OnCancelResponse TASAlgo::on_cancel() { + return IAlgoOrder::OnCancelResponse::HONOR; +} + +TASAlgo::TASAlgoParams TASAlgo::_convert_params ( + const bts::api::orderman::CustomOrderDefinition& cod){ + const DynamicOrderDefinition& def = cod.dynamic(); + const auto& params = def.order_params(); + TASAlgo::TASAlgoParams rv; + // top contract + for (size_t i = 0; i < 1024; i++){ + auto idx = std::to_string(i+1); + auto price = get_if(params, "Order " + idx + " Price"); + auto qty = get_if(params, "Order " + idx + " Quantity"); + auto is_buy = get_if(params, "Order " + idx + " Buy?"); + api::Side side = is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL; + if (qty.has_value() && qty.value() != 0){ + rv.child_orders.emplace_back(Price(price.value()), Quantity(qty.value()), side); + } + } + return rv; +} + +void TASAlgo::_switch_state(TASAlgo::Status new_state){ + switch (new_state){ + case (TASAlgo::Status::WAITING_FOR_SIGNAL): + bts_assert(false); + break; + case (TASAlgo::Status::WORKING): + bts_assert(me->state == TASAlgo::Status::WAITING_FOR_SIGNAL); + for (const auto& l : me->legs) + _algo().launch_child( + *l.order_template, + l.price, + l.quantity); + break; + case (TASAlgo::Status::DONE): + bts_assert(me->state != TASAlgo::Status::DONE); + break; + } +} + +ChildTemplate* TASAlgo::_create_order_template ( + IBeforeLaunchAlgoServices& serv, + SecurityKey key, + api::Side side) const{ + OrderDefinition order_def = serv.definition(); + order_def.set_security_key (key.value()); + order_def.set_side(side); + order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( + api::orderman::LimitOrderDefinition()); + return &(serv.make_child_template(order_def)); +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h new file mode 100644 index 000000000..10aa78b46 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h @@ -0,0 +1,46 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +class ChildTemplate; +class LegData; + +class TASAlgo : public IAlgoOrder { + public: + TASAlgo(); + ~TASAlgo(); + struct TASAlgoParams{ + // first one is the top + bool cxl_child_on_cxl; + std::vector> child_orders; + }; + public: + 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; + void on_status(SecurityKey, co2::TradingStatus) override; + IAlgoOrder::OnCancelResponse on_cancel() override; + + private: + enum class Status; + struct PImpl; + std::unique_ptr me; +private: + IAlgoServices& _algo() const ; + static TASAlgoParams _convert_params ( + const bts::api::orderman::CustomOrderDefinition&); + ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, + SecurityKey, + api::Side) const; + // acts on md, cognizant of the state + void _switch_state (Status new_status); +}; + +} // namespace orderman +} // namespace bts From dfd83487240abe0d632468a8c7135318b6f4827a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 30 Sep 2019 11:03:03 -0400 Subject: [PATCH 168/225] add temporary config to ignore nan day pnl to stop the loss limit from keeping traders out of market --- src/lib/config/protos/toggles.proto | 4 ++++ .../sparkd/position/PositionServicePNLHelper.cpp | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index f1733290f..5c3c87ee0 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -58,3 +58,7 @@ message EnsureOnScreenWithWorkAreaRect { // Should verify that the code works with every monitor arrangement before enabling by default. optional bool enabled = 1 [default = false]; } + +message IgnoreNansInDayPnL { + optional bool enabled = 1 [default = true]; +} \ No newline at end of file diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index 403c9b52b..a547f6643 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -4,6 +4,7 @@ #include "lib/os/os.h" #include "PositionServicePNLHelper.h" #include "lib/config/protos/cme_reference_data.pb.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/config/config.h" #include "lib/utils/PBUtils.h" @@ -217,6 +218,15 @@ double PositionServicePNLHelper::_compute_day_pnl ( (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); + + if(config::get().enabled()) + { + if(bts::os::is_nan(long_pnl)) + long_pnl = 0.0; + if(bts::os::is_nan(short_pnl)) + short_pnl = 0.0; + } + pnl = long_pnl + short_pnl; break; } From 50e61604bab8d50ecaeb7505d9b51855911ae101 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 30 Sep 2019 11:53:44 -0400 Subject: [PATCH 169/225] move default keycode exp to 12/31/2019 to fix unit tests --- src/lib/config/defaults/keycode.conf | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/config/defaults/keycode.conf b/src/lib/config/defaults/keycode.conf index 49832fb86..5b41d0705 100644 --- a/src/lib/config/defaults/keycode.conf +++ b/src/lib/config/defaults/keycode.conf @@ -1,9 +1,13 @@ + + #nusers: 1 -#allow concurrent : false -#expires: 2019-Sep-30 00:00:00 637053984000000000 -#generation_time: 2019-Jun-18 18:25:44.333280 5248650809870720704 +#allow concurrent : true +#expires: 2019-Dec-31 00:00:00 637133472000000000 +#generation_time: 2019-Sep-30 15:52:10.434845 5248740573731736354 EncryptedKeyCode { value { - keycode: "pgtv/OmievnpmNlgxTYuN801Hbetgu7ZGkHnlGWtK+DBrKSEgKxr5lGvCW1ld/jsztkWhKHDh0iediMDjrPm4+C5qmXlt4JJlAFvKolMN8HVC59m82fECvakcqKq28WSEjf6/DuPJNP1ZwxjcmKouxx1LZ15VlNkECtNrC9pkCnifazbfQZGV3kD08zMEyw/RPmOaVLFFeav8lwI5UpcjPYBIK1rJowXdGSvm1CJViwG5Z2JbdHR39QbKjVx112d5VbVtBq9nO3i0FEKvobjN/Gzcz/5x4TgQtEShKsbmgEN+MBVL3AItQlcFzZvE/05JLmfACUFmk5Eu0a3DlLs3A==" + keycode: "fVZlub92ulkXME+uZSyO9+WmyAXYKD735Qzxxfdj4G+SqEDTuwfNxOZVPS3TCFQqWPDmgjKTbbvfqIrGe3icxkVObUcUoS7lBXRXFrSvzOfs9eTz9RqHRvquDidnOzKxmSXsxV2bMb21UqBCJFeTzb4Q6Agp8EtjXJRc57UMVVygvdXg528S3ocBIq1V4W5NYraFn5WpqrTuBhpYbnsZAHi77s/EEwUT+6la3J2OHPtbiQnB6JFb0zsExMuzE4gwp79ojuQ5pnV2DXBZFNwxYvFyBUU/ac6oU89saZ/ay1DbOjz76TNqnNFewZvzdXZl3y6+X1eblX2streH2pn7gg==" } -} \ No newline at end of file +} + + From 58906eb3b64988919aa74974b565e75854023442 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 30 Sep 2019 16:55:35 -0400 Subject: [PATCH 170/225] Code complete --- .../algo/algo_orders/RegisterDorman.cpp | 4 +- .../orders/algo/algo_orders/TASAlgo.cpp | 81 +++++++++++-------- .../orders/algo/algo_orders/TASAlgo.h | 1 + 3 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index c109da57c..32098cc87 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -5,6 +5,7 @@ #include "lib/orderman/orderman_utils/orderman_utils.h" #include "DormanAlgo.h" #include "PyramidAlgo.h" +#include "TASAlgo.h" using namespace bts; using namespace api::orderman; @@ -150,12 +151,13 @@ extern "C" void init_tas_plugin(bts::SparkServices& srv) { *tas_desc.add_param_desc() = param_uint32("Order 2 Quantity"); *tas_desc.add_param_desc() = param_bool("Order 2 Buy?"); - srv.register_dynamic_algo_order(tas_desc, []() { return std::make_unique(); }); + srv.register_dynamic_algo_order(tas_desc, []() { return std::make_unique(); }); } extern "C" void init_spark_plugin(bts::SparkServices &srv) { init_dorman_plugin(srv); init_pyramid_plugin(srv); + init_tas_plugin(srv); } }}} \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp index 871447edf..751237efc 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -9,6 +9,7 @@ #include "lib/os/os.h" #include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" +#include "lib/utils/datetime.h" #include namespace bts { @@ -16,6 +17,8 @@ namespace orderman { using namespace api::orderman; +enum class TASAlgo::Status { WAITING_FOR_SIGNAL, WORKING, DONE }; + struct LegData{ const size_t index; const SecurityKey sec_key; @@ -47,23 +50,28 @@ struct LegData{ } }; -enum class TASAlgo::Status { WAITING_FOR_SIGNAL, WORKING, DONE }; - -struct TASAlgo::PImpl { - TASAlgo::TASAlgoParams algo_params; - Status state = Status::WAITING_FOR_SIGNAL; - IAlgoServices* algo_services = nullptr; - std::vector legs; +struct TASAlgo::PImpl { SecurityKey sec_key; api::Side side; Price out_price; Quantity out_qty; - LegData* find_leg_from_sec (SecurityKey sec_key){ - for (auto& l : legs) - if(l.sec_key == sec_key) - return &l; - return nullptr; - } + TASAlgo::TASAlgoParams algo_params; + std::vector legs; + Status state; + IAlgoServices* algo_services; + bts::datetime::PTime start_time; + PImpl() + : + sec_key(SecurityKey(0)), + side(api::Side::SIDE_BUY), + out_price(Price(0)), + out_qty(Quantity(0)), + algo_params(), + legs(), + state(Status::WAITING_FOR_SIGNAL), + algo_services(nullptr), + start_time(bts::datetime::local_now()) + {} LegData* find_leg_from_ord_key (OrderKey ord_key){ for (auto& l : legs) if(l.order_key == ord_key) @@ -76,27 +84,31 @@ TASAlgo::TASAlgo() : me(new PImpl()) {} TASAlgo::~TASAlgo() {} IAlgoServices& TASAlgo::_algo() const { return *me->algo_services; } +// initialization ///////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ - me->algo_params = _convert_params(def.custom_def()); - me->side = def.side(); const auto& sec = serv.security(); - me->sec_key = SecurityKey(sec.id()); + me->sec_key = SecurityKey(sec.id()); + me->side = def.side(); + me->algo_params = _convert_params(def.custom_def()); + double tick_size = sec.contract_spec().low_tick(); size_t i = 0; for (const auto& t : me->algo_params.child_orders){ auto price = std::get<0>(t); + bts_assert(price.value()>0); auto quantity = std::get<1>(t); - auto side = std::get<2>(t); + auto side = std::get<2>(t); auto* ordt = _create_order_template( serv, SecurityKey(sec.id()), side); - double tick_size = sec.contract_spec().low_tick(); - me->legs.emplace_back(i++, - SecurityKey(sec.id()), + me->legs.emplace_back(i++, + me->sec_key, tick_size, - side, price, + side, + price, quantity, ordt); } @@ -106,23 +118,23 @@ OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { std::string("Missing parameters")}; return {}; } - void TASAlgo::do_launch(IAlgoServices& algo_services) { me->algo_services = &algo_services; _algo().subscribe_status(me->sec_key); + _algo().subscribe_timer(); } - void TASAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { } - +// updates //////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// void TASAlgo::do_update(const api::orderman::Update&) { } - +// callbacks ////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// void TASAlgo::on_book(SecurityKey, const Book&) { } - void TASAlgo::on_child_change(OrderKey key, ChildState const &st){ LegData* ld_ptr = me->find_leg_from_ord_key(key); @@ -134,7 +146,6 @@ void TASAlgo::on_child_change(OrderKey key, _algo().complete(); _switch_state(TASAlgo::Status::DONE); } - void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ if(key == me->sec_key && status == co2::TradingStatus::TRADINGSTATUS_PRE_OPEN){ @@ -148,11 +159,15 @@ void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ } } } - +void TASAlgo::on_timer(){ + if (bts::datetime::msecs_since(me->start_time) > 10000) + on_status(me->sec_key,co2::TradingStatus::TRADINGSTATUS_PRE_OPEN); +} IAlgoOrder::OnCancelResponse TASAlgo::on_cancel() { return IAlgoOrder::OnCancelResponse::HONOR; } - +/////////////////////////////////////////////////////////////////////////////// +// stateless conversion /////////////////////////////////////////////////////// TASAlgo::TASAlgoParams TASAlgo::_convert_params ( const bts::api::orderman::CustomOrderDefinition& cod){ const DynamicOrderDefinition& def = cod.dynamic(); @@ -164,8 +179,9 @@ TASAlgo::TASAlgoParams TASAlgo::_convert_params ( auto price = get_if(params, "Order " + idx + " Price"); auto qty = get_if(params, "Order " + idx + " Quantity"); auto is_buy = get_if(params, "Order " + idx + " Buy?"); - api::Side side = is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL; - if (qty.has_value() && qty.value() != 0){ + if(is_buy.has_value()){ + api::Side side = is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL; + // TODO, get it from the parent rv.child_orders.emplace_back(Price(price.value()), Quantity(qty.value()), side); } } @@ -178,7 +194,7 @@ void TASAlgo::_switch_state(TASAlgo::Status new_state){ bts_assert(false); break; case (TASAlgo::Status::WORKING): - bts_assert(me->state == TASAlgo::Status::WAITING_FOR_SIGNAL); + bts_assert(me->state == TASAlgo::Status::WAITING_FOR_SIGNAL); for (const auto& l : me->legs) _algo().launch_child( *l.order_template, @@ -189,6 +205,7 @@ void TASAlgo::_switch_state(TASAlgo::Status new_state){ bts_assert(me->state != TASAlgo::Status::DONE); break; } + me->state = new_state; } ChildTemplate* TASAlgo::_create_order_template ( diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h index 10aa78b46..ea770df03 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h @@ -25,6 +25,7 @@ class TASAlgo : public IAlgoOrder { void on_book(SecurityKey, Book const &) override; void on_child_change(OrderKey, ChildState const &) override; void on_status(SecurityKey, co2::TradingStatus) override; + void on_timer() override; IAlgoOrder::OnCancelResponse on_cancel() override; private: From b6dc2bd4d407033f52fdac195a2b52186304ee38 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 30 Sep 2019 18:03:52 -0500 Subject: [PATCH 171/225] add 'SecurityKey' dynamic param descriptor --- src/lib/api/services/OrderService.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 091487e66..83db45d21 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -585,6 +585,7 @@ enum DynamicOrderPrimitiveDescriptor { DYNAMIC_ORDER_PRIMITIVE_BOOL = 4; DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF = 5; DYNAMIC_ORDER_PRIMITIVE_QUANTITY = 6; + DYNAMIC_ORDER_PRIMITIVE_SECURITY_KEY = 7; } message DynamicOrderTypeDescriptor { From d1844afeae77fcd7144ed92f77b39cc8991d1e7e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 30 Sep 2019 18:08:41 -0500 Subject: [PATCH 172/225] server side impl for 'SecurityKey' dynamic param descriptor --- src/lib/orderman/orderman_utils/orderman_utils.cpp | 7 +++++++ src/lib/orderman/orderman_utils/orderman_utils.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index ce9d4af61..be9535229 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -133,6 +133,13 @@ api::orderman::DynamicOrderParamDescriptor param_uint32(const std::string& name) return doap; } +api::orderman::DynamicOrderParamDescriptor param_security_key(const std::string& name) { + api::orderman::DynamicOrderParamDescriptor doap; + doap.set_param_name(name); + doap.mutable_param_type()->set_primitive(api::orderman::DYNAMIC_ORDER_PRIMITIVE_SECURITY_KEY); + return doap; +} + api::orderman::DynamicOrderParamDescriptor param_double(const std::string& name) { api::orderman::DynamicOrderParamDescriptor doap; doap.set_param_name(name); diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib/orderman/orderman_utils/orderman_utils.h index 4deda32e9..dac8c43df 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib/orderman/orderman_utils/orderman_utils.h @@ -93,6 +93,7 @@ std::optional get_if(const google::protobuf::Map Date: Mon, 30 Sep 2019 18:09:11 -0500 Subject: [PATCH 173/225] PyramidAlgo uses 'SecurityKey' dynamic param descriptor --- .../orders/algo/algo_orders/RegisterDorman.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index d4c7e1da4..7a6302d0b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -123,15 +123,15 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { *join_desc.add_param_desc() = param_uint32("Top Spread"); *join_desc.add_param_desc() = param_uint32("Delete"); - *join_desc.add_param_desc() = param_uint32("Spread 1"); + *join_desc.add_param_desc() = param_security_key("Spread 1"); *join_desc.add_param_desc() = param_uint32("Spread 1 Payup"); - *join_desc.add_param_desc() = param_uint32("Spread 2"); + *join_desc.add_param_desc() = param_security_key("Spread 2"); *join_desc.add_param_desc() = param_uint32("Spread 2 Payup"); - *join_desc.add_param_desc() = param_uint32("Spread 3"); + *join_desc.add_param_desc() = param_security_key("Spread 3"); *join_desc.add_param_desc() = param_uint32("Spread 3 Payup"); - *join_desc.add_param_desc() = param_uint32("Spread 4"); + *join_desc.add_param_desc() = param_security_key("Spread 4"); *join_desc.add_param_desc() = param_uint32("Spread 4 Payup"); - *join_desc.add_param_desc() = param_uint32("Spread 5"); + *join_desc.add_param_desc() = param_security_key("Spread 5"); *join_desc.add_param_desc() = param_uint32("Spread 5 Payup"); srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); From 3f7ea71de7aaa3c1050078c9a9c4b291f47744cc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 30 Sep 2019 18:11:18 -0500 Subject: [PATCH 174/225] [non-functional] normalize whitespace in AlgoContentTemplateSelector.xaml --- .../Order/AlgoContentTemplateSelector.xaml | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 656513fc3..6ebe95aec 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1181,30 +1181,35 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + From db64f2f45bd9798a3f61a8262182526248052265 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 30 Sep 2019 18:21:06 -0500 Subject: [PATCH 175/225] migrate common ManualFills resource keys into central location --- .../Modules/Trading/ManualFills/ManualFillRowEditor.xaml | 8 ++++---- .../Trading/ManualFills/ManualFillRowEditor.xaml.cs | 6 ------ .../Modules/Trading/ManualFills/ManualFillsView.xaml.cs | 8 ++++---- src/client/spark/view/Resources/ResourceKeys.cs | 9 +++++++++ 4 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/client/spark/view/Resources/ResourceKeys.cs diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml index d9d27d638..7779621e7 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml @@ -62,15 +62,15 @@ Header="{Binding security}" IsEditMode="False" IsLazy="True" - SecurityMap="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.SecuritiesKey}}" + SecurityMap="{DynamicResource ResourceKey={x:Static u:ResourceKeys.Securities}}" SelectedSecurity="{Binding security, UpdateSourceTrigger=Explicit}" ShowDialogSkirt="True" ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}" OKClick="{x:Static c:ContractPickerPopup.FlushSelectedSecurityHandler}" /> - - - + + + diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs index 0c597bf14..48a5d5ffa 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml.cs @@ -6,12 +6,6 @@ namespace mbts.ui.spark { /// Interaction logic for ManualFillRowEditor.xaml /// partial class ManualFillRowEditor : UserControl { - public const string - SecuritiesKey = nameof(SecuritiesKey), - AccountsKey = nameof(AccountsKey), - UsersKey = nameof(UsersKey), - SidesKey = nameof(SidesKey); - public static readonly RoutedCommand CommitCommand = new RoutedCommand(), CancelCommand = new RoutedCommand(); diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs index 78fb5b10b..cbc3ed8bc 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml.cs @@ -50,11 +50,11 @@ namespace mbts.ui.spark { row_editor.CommandBindings.Add(new CommandBinding(ManualFillRowEditor.CommitCommand, commit_executed)); row_editor.CommandBindings.Add(new CommandBinding(ManualFillRowEditor.CancelCommand, cancel_executed)); // dynamic resources - row_editor.Resources[ManualFillRowEditor.AccountsKey] = vm.accounts; - row_editor.Resources[ManualFillRowEditor.UsersKey] = vm.users; - row_editor.Resources[ManualFillRowEditor.SidesKey] = vm.sides; + row_editor.Resources[ResourceKeys.Accounts] = vm.accounts; + row_editor.Resources[ResourceKeys.Users] = vm.users; + row_editor.Resources[ResourceKeys.Sides] = vm.sides; FocusManager.SetIsFocusScope(row_editor, true); - var sec_hook = vm.as_demuxer().subscribe(nameof(ManualFillsVM.security_map)).OnDispatcher().Subscribe(v => row_editor.Resources[ManualFillRowEditor.SecuritiesKey] = v); + var sec_hook = vm.as_demuxer().subscribe(nameof(ManualFillsVM.security_map)).OnDispatcher().Subscribe(v => row_editor.Resources[ResourceKeys.Securities] = v); // popup adorner var popup_adorner = new PopupAdorner( data_grid, data_grid, diff --git a/src/client/spark/view/Resources/ResourceKeys.cs b/src/client/spark/view/Resources/ResourceKeys.cs new file mode 100644 index 000000000..634de738b --- /dev/null +++ b/src/client/spark/view/Resources/ResourceKeys.cs @@ -0,0 +1,9 @@ +namespace mbts.ui { + static class ResourceKeys { + public const string + Securities = nameof(Securities), + Accounts = nameof(Accounts), + Users = nameof(Users), + Sides = nameof(Sides); + } +} \ No newline at end of file From 77459e9c648bee8556bbd9386efd3c2a2b61dc35 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 1 Oct 2019 16:15:36 -0400 Subject: [PATCH 176/225] price changes dont have the algo params filled in --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 94ef6390d..518702a78 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -308,14 +308,19 @@ PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, std::tuple PyramidAlgo::_get_update_params(const Update& update, const PyramidAlgoParams& curr_params){ - PyramidAlgoParams new_params = _convert_params(update.custom()); - if(new_params.top_spread != curr_params.top_spread || - new_params.cover_spreads.size() != curr_params.cover_spreads.size()) - return std::make_tuple(new_params,false,"Contracts can not be updated"); - for (size_t i=0; i < curr_params.cover_spreads.size(); i++) - if(new_params.cover_spreads[i] != curr_params.cover_spreads[i]) + if(update.has_custom()){ + // means there is a params change + PyramidAlgoParams new_params = _convert_params(update.custom()); + if(new_params.top_spread != curr_params.top_spread || + new_params.cover_spreads.size() != curr_params.cover_spreads.size()) return std::make_tuple(new_params,false,"Contracts can not be updated"); - return std::make_tuple(new_params,true,std::string("")); + for (size_t i=0; i < curr_params.cover_spreads.size(); i++) + if(new_params.cover_spreads[i] != curr_params.cover_spreads[i]) + return std::make_tuple(new_params,false,"Contracts can not be updated"); + return std::make_tuple(curr_params,true,std::string("")); + } + else + return std::make_tuple(curr_params,true,std::string("")); } /////////////////////////////////////////////////////////////////////////////// From ddc2c67feae7fe5171b0f789565a87ecba6df4b5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 09:49:51 -0500 Subject: [PATCH 177/225] add SelectedSecurityKey dp to ContractPickerPopup --- .../ContractPicker/ContractPickerModel.cs | 38 ++++++++---- .../ContractPickerPopup.xaml.cs | 60 +++++++++++++++++-- 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs index ad43e7aee..b4f3aa76b 100644 --- a/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs +++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerModel.cs @@ -20,8 +20,8 @@ namespace mbts.spark { readonly IRaiseCanExecuteChangedCommand _add_criteria_command, _remove_criteria_command, _ok_button_command; bool _allow_empty, _is_edit_mode; - SecurityImmutable? _pending_sec; - (SecurityCriteria criteria, SecurityImmutable? sec, SecurityMD? md)? _snapshot; + uint? _pending_sec_key; + (SecurityCriteria criteria, uint? sec, SecurityMD? md)? _snapshot; public ContractPickerModel(IBus bus, bool edit_mode, SecurityCriteria existing_criteria, SecurityCriteria world_view_filter = null) : this(bus.subscribe(SecuritiesTag), edit_mode, existing_criteria, world_view_filter) { } @@ -209,9 +209,9 @@ namespace mbts.spark { _update_security_types(); _update_symbols(); _update_securities(); - if (_pending_sec.HasValue && changed_securities.ContainsKey(_pending_sec.Value.Id)) { - select_security_request?.Invoke(_pending_sec.Value); - _pending_sec = null; + if (_pending_sec_key.HasValue && changed_securities.TryGetValue(_pending_sec_key.Value, out var smd)) { + select_security_request?.Invoke(smd.security); + _pending_sec_key = null; } } internal void criteria_selection_changed(IEnumerable selected_clauses) { @@ -229,6 +229,8 @@ namespace mbts.spark { security_criteria_clause_changed?.Invoke(this, e); } + public bool is_editing => _snapshot.HasValue; + public ObservableCollection all_exchanges { get; } = new ObservableCollection(); public List selected_exchanges = new List(); @@ -298,7 +300,22 @@ namespace mbts.spark { if (all_securities.ContainsKey(value.Value.security.Id)) { select_security_request?.Invoke(value.Value.security); } else { - _pending_sec = value.Value.security; + _pending_sec_key = value.Value.security.Id; + } + } + } + } + } + + public uint? selected_security_key { + get => selected_securities.Count == 1 && all_securities.TryGetValue(selected_securities[0], out var smd) ? smd.security.Id : (uint?)null; + set { + if (value != selected_security_key) { + if (value.HasValue) { + if (all_securities.TryGetValue(value.Value, out var smd)) { + select_security_request?.Invoke(smd.security); + } else { + _pending_sec_key = value.Value; } } } @@ -313,7 +330,7 @@ namespace mbts.spark { if (all_securities.ContainsKey(value.Value.Id)) { select_security_request?.Invoke(value.Value); } else { - _pending_sec = value.Value; + _pending_sec_key = value.Value.Id; } } } @@ -336,18 +353,19 @@ namespace mbts.spark { } #region IEditableObject - public void BeginEdit() => _snapshot = (result_criteria, _pending_sec ?? selected_security, selected_security_md); + public void BeginEdit() => _snapshot = (result_criteria, _pending_sec_key ?? selected_security_key, selected_security_md); public void EndEdit() => _snapshot = null; public void CancelEdit() { if (_snapshot.HasValue) { var (criteria, sec, md) = _snapshot.Value; security_criteria_clauses.SetItems(criteria.clauses); - selected_security = sec; + selected_security_key = sec; /// A may have been used to create the snapshot when was called (this happens when securities are loaded lazily). /// If this is the case, pending sec was assigned to the security; /// check if the security is now present in , if so, use that value instead of the null. - selected_security_md = sec.HasValue && !md.HasValue && all_securities.TryGetValue(sec.Value.Id, out var md_match) ? md_match : md; + selected_security_md = sec.HasValue && !md.HasValue && all_securities.TryGetValue(sec.Value, out var md_match) ? md_match : md; _snapshot = null; + RaisePropertyChanged(nameof(selected_security)); _add_criteria_command.RaiseCanExecuteChanged(); _remove_criteria_command.RaiseCanExecuteChanged(); } diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs index 49eb0599b..28e76b6c6 100644 --- a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs +++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml.cs @@ -2,6 +2,7 @@ using mbts.spark; using mbts.ui.converters; using mbts.ui.shell; +using mbts.ui.utility; using System; using System.Collections.Generic; using System.Collections.Specialized; @@ -16,8 +17,11 @@ namespace mbts.ui.controls { partial class ContractPickerPopup : PopupControl { public static readonly EventHandler FlushSelectedCriteriaHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedCriteriaProperty)?.UpdateSource(), + FlushSelectedSecurityKeyHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedSecurityKeyProperty)?.UpdateSource(), FlushSelectedSecurityHandler = (s, e) => (s as ContractPickerPopup)?.GetBindingExpression(SelectedSecurityProperty)?.UpdateSource(); + readonly PropertyUpdateGate _selection_sync_gate = new PropertyUpdateGate(); + IReadOnlyDictionary _cached_security_map = DictionaryHelper.empty(); ContractPickerPopupController _controller; bool _allow_empty, _is_lazy; @@ -97,12 +101,55 @@ namespace mbts.ui.controls { } #endregion + #region SelectedSecurityKey + public static readonly DependencyProperty SelectedSecurityKeyProperty = + WPFHelper.create_dp( + nameof(SelectedSecurityKey), + FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, + (o, v) => { + o.Controller.model.selected_security_key = v; + o._selection_sync_gate.try_update(() => o._sync_selection_props(o.SelectedSecurityMD, o.SelectedSecurity, v, v)); + }); + //(o, base_value) => base_value is uint u && u != 0 ? u : (uint?)null); + + public uint? SelectedSecurityKey { + get => GetValue(SelectedSecurityKeyProperty) as uint?; + set => SetValue(SelectedSecurityKeyProperty, value); + } + #endregion + + enum SecurityProp { + Security, + SecurityMD, + ID + } + + void _sync_selection_props(SecurityMD? curr_sec_md, SecurityImmutable? curr_sec, uint? curr_sec_key, uint? target_sec_key) { + if (curr_sec_key != target_sec_key) { + SetCurrentValue(SelectedSecurityKeyProperty, target_sec_key); + } + bool sec_md_dirty = target_sec_key != (curr_sec_md?.security)?.Id; + bool sec_dirty = target_sec_key != curr_sec?.Id; + if (sec_md_dirty || sec_dirty) { + curr_sec_md = target_sec_key.HasValue && _cached_security_map.TryGetValue(target_sec_key.Value, out var smd) ? smd : (SecurityMD?)null; + if (sec_md_dirty) + SetCurrentValue(SelectedSecurityMDProperty, curr_sec_md); + if (sec_dirty) + SetCurrentValue(SelectedSecurityProperty, curr_sec_md?.security); + } + if (!IsEditMode) + SetCurrentValue(SelectedCriteriaProperty, target_sec_key.HasValue ? SecurityCriteria.from_keys(new[] { target_sec_key.Value }) : null); + } + #region SelectedSecurity public static readonly DependencyProperty SelectedSecurityProperty = WPFHelper.create_dp( nameof(SelectedSecurity), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, - (o, v) => o.Controller.model.selected_security = v); + (o, v) => { + o.Controller.model.selected_security = v; + o._selection_sync_gate.try_update(() => o._sync_selection_props(o.SelectedSecurityMD, v, o.SelectedSecurityKey, v?.Id)); + }); public SecurityImmutable? SelectedSecurity { get => GetValue(SelectedCriteriaProperty) as SecurityImmutable?; @@ -115,7 +162,10 @@ namespace mbts.ui.controls { WPFHelper.create_dp( nameof(SelectedSecurityMD), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, - (o, v) => o.Controller.model.selected_security_md = v); + (o, v) => { + o.Controller.model.selected_security_md = v; + o._selection_sync_gate.try_update(() => o._sync_selection_props(v, o.SelectedSecurity, o.SelectedSecurityKey, (v?.security)?.Id)); + }); public SecurityMD? SelectedSecurityMD { get => GetValue(SelectedCriteriaProperty) as SecurityMD?; @@ -248,12 +298,10 @@ namespace mbts.ui.controls { } void on_cancel() { model.CancelEdit(); - propagate_to_owner(); owner.CancelClick?.Invoke(owner, EventArgs.Empty); } void propagate_to_owner() { - owner.set_current_if_changed(SelectedSecurityMDProperty, owner.Controller.model.selected_security_md); - owner.set_current_if_changed(SelectedSecurityProperty, owner.Controller.model.selected_security); + owner.set_current_if_changed(SelectedSecurityKeyProperty, owner.Controller.model.selected_security_key); owner.set_current_if_changed(SelectedCriteriaProperty, owner.Controller.model.result_criteria); } } @@ -262,4 +310,4 @@ namespace mbts.ui.controls { public SecurityCriteria selected_criteria => _selected_criteria.Value; } } -} \ No newline at end of file +} From 68ed90487b0152892030a606f0a5b968f42285dd Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 13:58:45 -0500 Subject: [PATCH 178/225] AlgoParamVM template key impl --- .../Trading/AlgoStudio/VM/AlgoParamRowVM.cs | 3 +++ src/client/spark/Orders/AlgoParamVM.cs | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs index e7ebaa288..8d1297899 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoParamRowVM.cs @@ -13,6 +13,9 @@ namespace mbts.spark { string _template_key; ICommand _set_value_cmd; + public AlgoParamRowVM(IAlgoVM algo, IAlgoParamVM param, AlgoParamRowVM parent) + : this(algo, param, parent, (param as ITemplateSelectorKey)?.key) { } + public AlgoParamRowVM(IAlgoVM algo, IAlgoParamVM param, AlgoParamRowVM parent, string template_key = null) { this.param = param; this.algo = algo; diff --git a/src/client/spark/Orders/AlgoParamVM.cs b/src/client/spark/Orders/AlgoParamVM.cs index e8ded6009..cc7a43a2a 100644 --- a/src/client/spark/Orders/AlgoParamVM.cs +++ b/src/client/spark/Orders/AlgoParamVM.cs @@ -1,4 +1,5 @@ -using mbts.ui.shell; +using mbts.ui; +using mbts.ui.shell; using System; using System.Collections.Generic; using System.ComponentModel; @@ -6,8 +7,9 @@ using System.Reactive.Linq; using System.Runtime.CompilerServices; namespace mbts.spark { - class AlgoParamVM : IAlgoParamVM, INotifyPropertyChanged { + class AlgoParamVM : IAlgoParamVM, INotifyPropertyChanged, ITemplateSelectorKey { readonly IEqualityComparer _comparer; + readonly string _template_key; AlgoParamPermissions _permissions; bool _is_enabled, _has_value; T _committed_value, _value; @@ -15,15 +17,16 @@ namespace mbts.spark { public AlgoParamVM(string id, string display_name) : this(id, display_name, default, EqualityComparer.Default) { } - public AlgoParamVM(string id, string display_name, T value) - : this(id, display_name, value, EqualityComparer.Default) { } + public AlgoParamVM(string id, string display_name, T value, string template_key = null) + : this(id, display_name, value, EqualityComparer.Default, template_key) { } - public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer) { + public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer, string template_key = null) { this.id = id; this.display_name = display_name; _value = value; _committed_value = value; _comparer = comparer; + _template_key = template_key; } public event PropertyChangedEventHandler PropertyChanged; @@ -50,7 +53,9 @@ namespace mbts.spark { public bool is_enabled { get => _is_enabled; set => _set(ref _is_enabled, value); } public bool has_value { get => _has_value; set => _set(ref _has_value, value); } public bool is_dirty { get; private set; } - object IAlgoParamVM.value { get => value; set => this.value = (T)value; } + object IAlgoParamVM.value { get => value; set => this.value = (T)value; } + + string ITemplateSelectorKey.key => _template_key; public void revert() { if (is_dirty) { From 4d468c8026e6f81f82358f3c82b3aa6fb7ab042b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 09:51:56 -0500 Subject: [PATCH 179/225] DynamicOrderVM 'SecurityKey' descriptor impl --- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 1 + .../spark/Orders/OrderTypeVMs/DynamicOrderVM.cs | 14 ++++++++------ .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 15 +++++++++++++-- src/client/spark/view/Resources/TemplateKeys.cs | 6 ++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/client/spark/view/Resources/TemplateKeys.cs diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index 81178590c..7a657e393 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -62,6 +62,7 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: param.AsInt32 = 0; break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: param.AsOrderDef = new CustomOrderDefinition(); break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: param.AsString = string.Empty; break; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: param.AsUint32 = 0u; break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: param.AsQuantity = new bts.spark.QuantityMeasure(); break; } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index d69230589..d28c554a2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -4,6 +4,7 @@ using bts.collections; using bts.spark; using mbts.collections; using mbts.spark.utilities; +using mbts.ui; using mbts.ui.utility; using mbts.utils; using System; @@ -73,9 +74,9 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault(), template_key: TemplateKeys.SecurityKey); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: - { + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: { var qm = new DynamicOrderQuantityVM(descriptor); return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); } @@ -88,16 +89,16 @@ namespace mbts.spark { default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.DescriptorCase, nameof(descriptor)); } - DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default) { + DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default, string template_key = null) { var fdesc = DynamicOrderParam.Descriptor.FindFieldByNumber(field_number); var pvm = new DynamicOrderParamVM(descriptor, fdesc, convert, convert_back); - return attached>(pvm, get_from_param, assign_to_param, default_value); + return attached>(pvm, get_from_param, assign_to_param, default_value, template_key); TView get_from_param(DynamicOrderParam param) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); void assign_to_param(DynamicOrderParam param, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); } - TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { + TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default, string template_key = null) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { add_property( pvm.descriptor.ParamName, mdef => mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p) ? selector(p) : default_value, @@ -105,7 +106,8 @@ namespace mbts.spark { () => pvm.value, v => pvm.value = v, pvm.subscribe_value(), - default_value); + default_value, + template_key: template_key); return pvm; } } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index b24547c8e..ba74637e2 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -542,8 +542,19 @@ namespace mbts.spark { } } - protected void add_property(string prop_name, Func get_from_def, Action assign_to_def, Func get_local, Action set_local, IObservable subscribe_local, TValue non_uniform_value = default, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) { - var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local()) { permissions = permissions }; + protected void add_property( + string prop_name, + Func get_from_def, + Action assign_to_def, + Func get_local, + Action set_local, + IObservable subscribe_local, + TValue non_uniform_value = default, + AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite, + string template_key = null) { + var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), get_local(), template_key) { + permissions = permissions + }; _algo_params.Add(param); _auto_props[prop_name] = new AutoProp(prop_name, def => { diff --git a/src/client/spark/view/Resources/TemplateKeys.cs b/src/client/spark/view/Resources/TemplateKeys.cs new file mode 100644 index 000000000..d376785ed --- /dev/null +++ b/src/client/spark/view/Resources/TemplateKeys.cs @@ -0,0 +1,6 @@ +namespace mbts.ui { + static class TemplateKeys { + public const string + SecurityKey = nameof(SecurityKey); + } +} \ No newline at end of file From 25a594895eac63c3f78e9426f46b5dc4160e8cfe Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 14:44:56 -0500 Subject: [PATCH 180/225] ladder/ticket/algo studio views store SecurityMap in resource dictionary --- src/client/spark/Daemons/OrderTicketDaemon.cs | 5 +++++ .../spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs | 5 ++++- .../spark/Modules/Trading/Ladder/View/LadderView.xaml.cs | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Daemons/OrderTicketDaemon.cs b/src/client/spark/Daemons/OrderTicketDaemon.cs index cf18c0835..b825740e9 100644 --- a/src/client/spark/Daemons/OrderTicketDaemon.cs +++ b/src/client/spark/Daemons/OrderTicketDaemon.cs @@ -43,6 +43,11 @@ namespace bts.shell { void _show_order_window(Window window) { foreach (var kv in AlgoStudioModelUtils.get_dynamic_resources(_model.algo_model.ui_configuration)) window.Resources[kv.Key] = kv.Value; + // the dynamic algo 'SecurityKey' template has a ContractPickerPopup that expects the security map to be available as a DynamicResource. + var sub = _bus.subscribe(SparkTags.SecuritiesTag) + .OnDispatcher() + .Subscribe(sec_map => window.Resources[ResourceKeys.Securities] = sec_map); + window.Closed += (s, e) => Disposable.dispose(ref sub); window.Show(-200, -160, true); } diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs index 5d2b975e4..3edb390a9 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs @@ -62,7 +62,10 @@ namespace mbts.spark { _vm = new AlgoStudioVM(_model); _vm.load_from(_state); _view = new AlgoStudioView { DataContext = _vm }; - _resources = new CompositeDisposable(); + _resources = new CompositeDisposable( + _bus.subscribe(SparkTags.SecuritiesTag) + .OnDispatcher() + .Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map)); // add definition _commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, _vm.add_definition_cmd)); // clone definition diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs index 015680d5c..d3696d053 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs @@ -1,9 +1,13 @@ using bts; using bts.collections; using bts.utils; +using mbts.ui; using mbts.ui.converters; +using mbts.ui.extensions; using mbts.utils; +using System; using System.Linq; +using System.Reactive.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Data; @@ -80,6 +84,7 @@ namespace mbts.spark { _ladder.visible_columns_changed += () => _column_headers_presenter.Columns.SetItems( _ladder.visible_column_types.Select(t => ColumnFactory.create(_ladder, t))); this.vm = vm; + this.ConnectDataContext(lvm => lvm.bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(sec_map => Resources[ResourceKeys.Securities] = sec_map)); DataContext = vm; DataContextChanged += datacontext_changed; _ui_scaler.MouseDoubleClick += _ui_scaler_MouseDoubleClick; From bd3ef33607a426fcba200eaa2a4ede782b1fa5cb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 14:45:29 -0500 Subject: [PATCH 181/225] AlgoStudio dynamic order 'SecurityKey' template --- .../DynamicOrderTemplateSelector.cs | 2 ++ .../Order/AlgoContentTemplateSelector.xaml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs index cdf5a4906..d27c0e4d4 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs @@ -20,6 +20,7 @@ namespace mbts.ui.spark public DataTemplate StringTemplate { get; set; } public DataTemplate OrderDefTemplate { get; set; } public DataTemplate QuantityMeasureTemplate { get; set; } + public DataTemplate SecurityKeyTemplate { get; set; } public DataTemplate EnumTemplate { get; set; } @@ -38,6 +39,7 @@ namespace mbts.ui.spark case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return DoubleTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return IntTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return UIntTemplate; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveSecurityKey: return SecurityKeyTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return StringTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: return OrderDefTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: return QuantityMeasureTemplate; diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 6ebe95aec..3ab885bde 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1145,6 +1145,24 @@ + + + + + + + + + + + + + From bed52db98a533e42e467afb667e75fc40ae1735d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 14:00:47 -0500 Subject: [PATCH 182/225] dynamic order SecurityKey DataTemplate --- .../AlgoEditorGridView.xaml | 40 ++++++ .../Order/AlgoContentTemplateSelector.xaml | 8 +- .../Converters/AnonymousValueConverter.cs | 8 ++ .../Converters/DictionaryLookupConverter.cs | 116 ++++++++++++++++++ src/client/spark/view/Utility/BindingProxy.cs | 13 ++ 5 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 src/client/spark/view/Converters/DictionaryLookupConverter.cs create mode 100644 src/client/spark/view/Utility/BindingProxy.cs diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml index ce29fd798..cabe66d50 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml @@ -247,6 +247,31 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -320,6 +345,21 @@ + + + + + diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 3ab885bde..bd0aad15e 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1156,9 +1156,15 @@ diff --git a/src/client/spark/view/Converters/AnonymousValueConverter.cs b/src/client/spark/view/Converters/AnonymousValueConverter.cs index 29ba7db43..93ce4aa32 100644 --- a/src/client/spark/view/Converters/AnonymousValueConverter.cs +++ b/src/client/spark/view/Converters/AnonymousValueConverter.cs @@ -28,9 +28,17 @@ namespace mbts.ui.converters { IntTextConverter = new IntTextConverter(), UIntTextConverter = new UIntTextConverter(), QuantityMeasureTextConverter = ValueConverter.create(fmt), + SecuritySelectorText, SimpleString = new AnonymousValueConverter(obj => obj?.ToString()), ThicknessToDouble = new ThicknessToDoubleConverter(); + static ValueConverters() { + SecuritySelectorText = new NullSubstitutionConverterWrapper { + Converter = SimpleString, + ValueForNull = "(None)" + }; + } + public static readonly IMultiValueConverter AreEqualConverter = new AreEqualConverter(); diff --git a/src/client/spark/view/Converters/DictionaryLookupConverter.cs b/src/client/spark/view/Converters/DictionaryLookupConverter.cs new file mode 100644 index 000000000..cdc635b02 --- /dev/null +++ b/src/client/spark/view/Converters/DictionaryLookupConverter.cs @@ -0,0 +1,116 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Windows.Data; + +namespace mbts.ui.converters { + class DictionaryLookupConverter : IMultiValueConverter { + [ThreadStatic] + Dictionary _type_impls_backing; + Dictionary _type_impls => _type_impls_backing ?? (_type_impls_backing = new Dictionary()); + + delegate bool Lookup(object source, object key, out object result); + + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { + if (values.Length == 2 && values[0] != null && values[1] != null) { + var lookup_type = values[0].GetType(); + var lookup = _type_impls.GetOrAdd(lookup_type, TypeImplResolver.resolve); + if (lookup(values[0], values[1], out var result)) + return result; + } + return null; + } + + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => + throw new NotImplementedException(); + + static class TypeImplResolver { + public static Lookup resolve(Type lookup_type) => + _prioritized_impls(lookup_type) + .OrderBy(tup => tup.priority) + .Select(tup => tup.impl) + .FirstOrDefault() ?? _lookup_fail; + + static bool _lookup_fail(object source, object key, out object result) { + result = null; + return false; + } + + static IEnumerable<(int priority, Lookup impl)> _prioritized_impls(Type lookup_type) { + foreach (var itype in lookup_type.GetInterfaces()) { + if (itype.IsGenericType) { + var gen_def = itype.GetGenericTypeDefinition(); + if (gen_def == typeof(IDictionary<,>)) + yield return (1, _get_generic_impl(nameof(_GenericImpls.idictionary), itype)); + if (gen_def == typeof(IReadOnlyDictionary<,>)) + yield return (2, _get_generic_impl(nameof(_GenericImpls.ireadonly_dictionary), itype)); + if (gen_def == typeof(ILookup<,>)) + yield return (3, _get_generic_impl(nameof(_GenericImpls.ilookup), itype)); + } + if (itype == typeof(IDictionary)) + yield return (4, _NonGenericImpls.idictionary); + } + } + + static Lookup _get_generic_impl(string impl_name, Type impl_type) => + _get_generic_impl(impl_name, impl_type.GetGenericArguments()); + + static Lookup _get_generic_impl(string impl_name, Type[] key_value_types) => + (Lookup)typeof(_GenericImpls<,>) + .MakeGenericType(key_value_types) + .GetField(nameof(_GenericImpls.idictionary)) + .GetValue(null); + + static class _GenericImpls { + public static readonly Lookup + idictionary = _idictionary, + ireadonly_dictionary = _ireadonly_dictionary, + ilookup = _ilookup; + + static bool _idictionary(object lookup, object key, out object result) { + if (key is TKey k && lookup is IDictionary d && d.TryGetValue(k, out var value)) { + result = value; + return true; + } + result = null; + return false; + } + + static bool _ireadonly_dictionary(object lookup, object key, out object result) { + if (key is TKey k && lookup is IReadOnlyDictionary rod && rod.TryGetValue(k, out var value)) { + result = value; + return true; + } + result = null; + return false; + } + + static bool _ilookup(object lookup, object key, out object result) { + if ((key is TKey k) && lookup is ILookup l && l.Contains(k)) { + result = l[k]; + return true; + } + result = null; + return false; + } + } + + static class _NonGenericImpls { + public static readonly Lookup + idictionary = _idictionary; + + static bool _idictionary(object lookup, object key, out object result) { + var dict = (IDictionary)lookup; + if (dict.Contains(key)) { + result = dict[key]; + return true; + } + result = null; + return false; + } + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Utility/BindingProxy.cs b/src/client/spark/view/Utility/BindingProxy.cs new file mode 100644 index 000000000..c00646a04 --- /dev/null +++ b/src/client/spark/view/Utility/BindingProxy.cs @@ -0,0 +1,13 @@ +using System.Windows; + +namespace mbts.ui { + class BindingProxy : FrameworkElement { + public static readonly DependencyProperty ValueProperty = + DependencyProperty.Register(nameof(Value), typeof(object), typeof(BindingProxy)); + + public object Value { + get => GetValue(ValueProperty); + set => SetValue(ValueProperty, value); + } + } +} \ No newline at end of file From eaff4774e0e255851f71ed3b282591bfddb5e8a6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 16:53:19 -0500 Subject: [PATCH 183/225] refactor some Disposable.replace calls so that the prev hook is disposed before the new one is created --- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 25 ++++++++++--------- .../spark_core/utils/ObservableExtensions.cs | 5 +++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index ba74637e2..06996a881 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -166,7 +166,8 @@ namespace mbts.spark { }; void subscribe_new_algo(IAlgoVM old_algo, IAlgoVM new_algo) { RaisePropertyChanged(sd.prop_name); - Disposable.replace(ref def_sub, new CompositeDisposable()); + Disposable.dispose(ref def_sub); + def_sub = new CompositeDisposable(); if (assert(new_algo != null, sd.prop_name, "No algo specified.")) { def_sub.Add(new_algo.subscribe_definition().Subscribe(_ => _def_change_notifier.execute())); if (new_algo is INotifyDataErrorInfo ndei) @@ -255,14 +256,14 @@ namespace mbts.spark { _security_changed += o.OnNext; return Disposable.Create(() => _security_changed -= o.OnNext); }); - Disposable.replace(ref _pending_load, Disposable.Create( + Disposable.dispose(ref _pending_load); + _pending_load = Disposable.Create( // load children ObservableAutoWrapper.connect_item_hooks( _child_algo_selector_data.AsCollection(), sd => security_src.SubscribeEach(_ => ObservableAutoWrapper.connect_item_actions(_child_algo_selector_data.AsCollection(), selector_load_impl))), // load regular props - ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load(algom)))); - + ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load(algom))); } void selector_load_impl(AlgoSelectorData sd) { @@ -298,11 +299,12 @@ namespace mbts.spark { _security_changed += o.OnNext; return Disposable.Create(() => _security_changed -= o.OnNext); }); - Disposable.replace(ref _pending_load, Disposable.Create( + Disposable.dispose(ref _pending_load); + _pending_load = Disposable.Create( ObservableAutoWrapper.connect_item_hooks( _child_algo_selector_data.AsCollection(), sd => security_src.Subscribe(_ => ObservableAutoWrapper.connect_item_actions(_child_algo_selector_data.AsCollection(), selector_load_impl))), - ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load_many(algos)))); + ObservableAutoWrapper.connect_item_actions(_auto_props.AsCollection(), p => p.load_many(algos))); void selector_load_impl(AlgoSelectorData sd) { // **assume that algos has more than 1 element @@ -827,12 +829,11 @@ namespace mbts.spark { var default_algo = AlgoKey.from_known_type(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.Value.ContractCase))); foreach (var sd in _child_algo_selectors) sd.load_algo_data_recursive(algo_data, default_algo); - Disposable.replace( - ref _selector_data_hooks, - ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => { - s.load_algo_data_recursive(algo_data, default_algo); - return Disposable.empty; - })); + Disposable.dispose(ref _selector_data_hooks); + _selector_data_hooks = ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => { + s.load_algo_data_recursive(algo_data, default_algo); + return Disposable.empty; + }); } } diff --git a/src/client/spark_core/utils/ObservableExtensions.cs b/src/client/spark_core/utils/ObservableExtensions.cs index 8544f29d0..fd1b102f8 100644 --- a/src/client/spark_core/utils/ObservableExtensions.cs +++ b/src/client/spark_core/utils/ObservableExtensions.cs @@ -212,7 +212,10 @@ namespace System.Reactive.Linq { IDisposable source_sub = source.Select(v => v).Subscribe(on_source); return Disposable.Create(dispose); // local methods - void on_source(T value) => Disposable.replace(ref value_sub, subscribe_value(value)); + void on_source(T value) { + Disposable.dispose(ref value_sub); + value_sub = subscribe_value(value); + } void dispose() { Disposable.dispose(ref source_sub); Disposable.dispose(ref value_sub); From f6299ab5c3e07ee8c2eba291f55e26bc780f4aac Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 17:06:45 -0500 Subject: [PATCH 184/225] clean up DynamicOrderParamVM - don't store value with the descriptor, make 'param' prop readonly --- .../OrderTypeVMs/DynamicOrderParamVM.cs | 37 +++---------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs index ade3260a4..b2cf2b1d3 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs @@ -12,7 +12,7 @@ using System.Reactive.Linq; namespace mbts.spark { interface IDynamicOrderParamVM { DynamicOrderParamDescriptor descriptor { get; } - DynamicOrderParam param { get; set; } + DynamicOrderParam param { get; } } interface IDynamicOrderParamVM : IDynamicOrderParamVM { @@ -21,26 +21,16 @@ namespace mbts.spark { } abstract class DynamicOrderParamVM : DisposableViewModelBase, IDynamicOrderParamVM { - DynamicOrderParam _param; - protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor) : this(descriptor, DynamicOrderHelper.init_param(descriptor)) { } private DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) { this.descriptor = descriptor; - _param = param; + this.param = param; } public DynamicOrderParamDescriptor descriptor { get; set; } - public DynamicOrderParam param { - get => _param; - set { - _param = value; - on_param_changed(); - } - } - - protected abstract void on_param_changed(); + public DynamicOrderParam param { get; } } class DynamicOrderParamVM : DynamicOrderParamVM, IDynamicOrderParamVM { @@ -53,14 +43,12 @@ namespace mbts.spark { _field_desc = field_descriptor; _convert = convert; _convert_back = convert_back; + value = _convert(ConvertUtils.try_convert(_field_desc.Accessor.GetValue(param))); } public TView value { get => _value; - set { - _field_desc.Accessor.SetValue(param, _convert_back(_value = value)); - RaisePropertyChanged(); - } + set => Set(ref _value, value); } public IObservable subscribe_value() => @@ -70,11 +58,6 @@ namespace mbts.spark { void on_prop_changed(object sender, PropertyChangedEventArgs e) => o.OnNext(value); }); - - protected override void on_param_changed() { - _value = _convert(ConvertUtils.try_convert(_field_desc.Accessor.GetValue(param))); - RaisePropertyChanged(nameof(value)); - } } class DynamicOrderEnumeratedVM : DynamicOrderParamVM, IDynamicOrderParamVM { @@ -105,11 +88,6 @@ namespace mbts.spark { o.OnNext(selected_element); }); - protected override void on_param_changed() { - _sync_elements(); - RaisePropertyChanged(nameof(selected_element)); - } - static IEnumerable _get_elements(DynamicOrderParamDescriptor descriptor) => descriptor.ParamType?.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated ? descriptor.ParamType.Enumerated.Element : Enumerable.Empty(); @@ -148,10 +126,5 @@ namespace mbts.spark { o.OnNext(quantity); }); } - - protected override void on_param_changed() - { - RaisePropertyChanged(nameof(quantity)); - } } } From 1d97e620fdeb99f3e929618eb63eab926d9f48e6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 1 Oct 2019 17:17:31 -0500 Subject: [PATCH 185/225] add security map to view's resources for dynamic security key param's ContractPickerPopup --- src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index bcbc64aca..b416e6937 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -66,6 +66,10 @@ namespace mbts.spark { _vm = new OrderBookVM(_bus, _notification_service, _model, _settings_manager); _vm.load_from(_state); _view = new OrderBookView(_vm); + _vm.SubscribeDisposed( + _bus.subscribe(SparkTags.SecuritiesTag) + .OnDispatcher() + .Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map)); var show_fills_command = SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills).complete(() => new FillsSettings(_vm.selected_orders.Select(r => r.Key).ToArray())); From 3e035197d0b75118a569e9f0a80ed74f664a1613 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 1 Oct 2019 20:42:06 -0400 Subject: [PATCH 186/225] Top Spread is also a security (forgot to mark it as a security, so it was showing as a uint in the ui) --- src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp | 2 +- src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 518702a78..b797b1591 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -317,7 +317,7 @@ PyramidAlgo::_get_update_params(const Update& update, for (size_t i=0; i < curr_params.cover_spreads.size(); i++) if(new_params.cover_spreads[i] != curr_params.cover_spreads[i]) return std::make_tuple(new_params,false,"Contracts can not be updated"); - return std::make_tuple(curr_params,true,std::string("")); + return std::make_tuple(new_params,true,std::string("")); } else return std::make_tuple(curr_params,true,std::string("")); diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 7a6302d0b..68b5751de 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -121,7 +121,7 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { join_desc.set_dynamic_order_type("Pyramid"); - *join_desc.add_param_desc() = param_uint32("Top Spread"); + *join_desc.add_param_desc() = param_security_key("Top Spread"); *join_desc.add_param_desc() = param_uint32("Delete"); *join_desc.add_param_desc() = param_security_key("Spread 1"); *join_desc.add_param_desc() = param_uint32("Spread 1 Payup"); From 9cc0b471f2e19b6bef90daef5a671302488c7cee Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 2 Oct 2019 10:32:23 -0400 Subject: [PATCH 187/225] Added support for tag 1031, defaults to Y. --- src/lib/api/services/OrderService.proto | 1 + src/lib/config/protos/orderman_cfg.proto | 1 + src/lib/jetfix/codec/FieldDefinitions.h | 1 + src/lib/jetfix/codec/MessageDefinitions.h | 3 ++- src/lib/orderman/actors/ExecutionGateway.cpp | 4 ++++ src/lib/orderman/orderman_utils/ExecutionReport.h | 1 + src/lib/orderman/orders/NativeOrder.cpp | 12 ++++++++++++ src/lib/orderman/orders/NativeOrder.h | 1 + 8 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 091487e66..f2b48d8fb 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -327,6 +327,7 @@ message RoutingRecord { string smp_id = 6 ; SelfMatchPreventionInstruction smp_instruction = 7; string location = 8; + string cust_order_handling_inst = 9; } message NativeOrderState { diff --git a/src/lib/config/protos/orderman_cfg.proto b/src/lib/config/protos/orderman_cfg.proto index 5d899ea95..aee3e0802 100644 --- a/src/lib/config/protos/orderman_cfg.proto +++ b/src/lib/config/protos/orderman_cfg.proto @@ -9,4 +9,5 @@ message OrdermanCfg { } repeated Executor executor = 1; optional uint32 default_iceberg_pause_secs = 2 [default = 0]; + optional string fallback_cust_order_handling_inst = 3 [default = "Y"]; } diff --git a/src/lib/jetfix/codec/FieldDefinitions.h b/src/lib/jetfix/codec/FieldDefinitions.h index f1bacd704..cad3503e0 100644 --- a/src/lib/jetfix/codec/FieldDefinitions.h +++ b/src/lib/jetfix/codec/FieldDefinitions.h @@ -9,6 +9,7 @@ namespace jetfix { namespace fix { typedef BoolField<1028> ManualOrderIndicator; +typedef StringField<1031> CustOrderHandlingInst; typedef BoolField<123> GapFillFlag; typedef BoolField<43> PossDupFlag; typedef BoolField<9768> InFlightMitigation; diff --git a/src/lib/jetfix/codec/MessageDefinitions.h b/src/lib/jetfix/codec/MessageDefinitions.h index 197f5580f..1674673f5 100644 --- a/src/lib/jetfix/codec/MessageDefinitions.h +++ b/src/lib/jetfix/codec/MessageDefinitions.h @@ -45,7 +45,8 @@ typedef FIXMsg + TransactTimeStr, + CustOrderHandlingInst > ExecutionReportMsg; typedef FIXMsg diff --git a/src/lib/orderman/actors/ExecutionGateway.cpp b/src/lib/orderman/actors/ExecutionGateway.cpp index c14fff3f0..84805ba4d 100644 --- a/src/lib/orderman/actors/ExecutionGateway.cpp +++ b/src/lib/orderman/actors/ExecutionGateway.cpp @@ -260,6 +260,10 @@ void ExecutionGateway::on_exe_report( if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); str_to(msg.get(), &data->transact_time); + + if (msg.has()) + data->cust_order_handling_inst = msg.get(); + data->cfg = &me->cfg; data->msg = text_msg; me->on_exe_report(*data, msg.trace()); diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 6081be732..76b91a348 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -34,6 +34,7 @@ public: ExchangeFillID exchange_fill_id; mercury::TimeStampStr transact_time; config::JetFIX::Connection const *cfg; + std::string cust_order_handling_inst; std::string msg; }; diff --git a/src/lib/orderman/orders/NativeOrder.cpp b/src/lib/orderman/orders/NativeOrder.cpp index c32eca3e9..1bcdcf32a 100644 --- a/src/lib/orderman/orders/NativeOrder.cpp +++ b/src/lib/orderman/orders/NativeOrder.cpp @@ -15,6 +15,7 @@ #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" +#include "lib/config/protos/orderman_cfg.pb.h" #include "lib/orderman/actors/order_manager/OrderServices.h" @@ -336,6 +337,7 @@ NativeOrder::on_init_from_exe_report(ExecutionReport const &er, rr.set_cti_code(CTICode(er.cfg->cti_code()[0])); rr.set_customer_or_firm(CustomerOrFirm(er.cfg->customer_or_firm())); rr.set_location(er.cfg->sender_locationid()); + rr.set_cust_order_handling_inst(er.cust_order_handling_inst); on_init_recovered(orecord, os); return orecord.def(); } @@ -1102,6 +1104,13 @@ void NativeOrder::report_state() { me->services->report_state(me->state); } +std::string NativeOrder::get_cust_order_handling_inst(api::orderman::RoutingRecord const&rr) { + if (rr.cust_order_handling_inst().size()) + return rr.cust_order_handling_inst(); + else + return config::get().fallback_cust_order_handling_inst(); +} + void NativeOrder::init_fix() { bts_assert(me->sec); @@ -1129,6 +1138,8 @@ void NativeOrder::init_fix() { create_encoding.add(rr.cti_code()); create_encoding.add(sec.glbx().security_desc()); create_encoding.add(clordid); + create_encoding.add (get_cust_order_handling_inst(rr)); + if (rr.smp_id().size()) { create_encoding.add(rr.smp_id()); if (rr.smp_instruction() != SELF_MATCH_PREVENTION_INSTRUCTION_UNDEFINED) @@ -1158,6 +1169,7 @@ void NativeOrder::init_fix() { update_encoding.add(clordid); update_encoding.add(clordid); update_encoding.add(true); + update_encoding.add (get_cust_order_handling_inst(rr)); // Self Match Protection if (rr.smp_id().size()) { update_encoding.add(rr.smp_id()); diff --git a/src/lib/orderman/orders/NativeOrder.h b/src/lib/orderman/orders/NativeOrder.h index e3b7d6fa4..517051347 100644 --- a/src/lib/orderman/orders/NativeOrder.h +++ b/src/lib/orderman/orders/NativeOrder.h @@ -71,6 +71,7 @@ class NativeOrder : public Order { void ignore_or_cancel(std::string const &, api::orderman::OrderError, OrderOpResult *out) ; + std::string get_cust_order_handling_inst(api::orderman::RoutingRecord const&) ; }; } // namespace orderman From f74e719a9fc887e89fe102641a3b336f7d1a16c9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 2 Oct 2019 11:28:07 -0500 Subject: [PATCH 188/225] sort accounts/users in filter dropdowns for OrderBook/Fills/PNL --- src/client/spark/Admin/AdminModel.cs | 2 +- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 4 ++-- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 4 ++-- .../Collections/Extensions/EnumerableExtensions.cs | 12 ++++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index d8a73ab1b..d1c11d482 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -49,7 +49,7 @@ namespace mbts.spark { public IObservable> on_users { get; } public IObservable> on_accounts { get; } public IObservable> all_user_tuples { get; } - public IObservable> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToList()); + public IObservable> on_account_tuples => on_accounts.Select(d => d.Select(kv => new AccountTuple(kv.Key, kv.Value)).ToListSorted(a => a.name)); public IObservable> permission_filter(IObservable> positions, Func get_account_id) where TKey : IEquatable => user.permissions == UserTuple.Permissions.Admin ? diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index d600aef4f..1ad591a57 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -118,8 +118,8 @@ namespace mbts.spark { add_col_expl(Columns.Side, new SideColumn(Columns.Side, r => r.side, side_filter) { id = col_id(Columns.Side) }, side_filter); // all others (easily identified by the enum 'Columns.Foo') add_col(Columns.FillTime, DefaultColumnHeaders.FillTime, r => r.fill_time.ToString("M/d h:mm:ss tt"), new TimeFilterVM(r => r.fill.Timestamp.ToDateTimeOffset().LocalDateTime), DataGridFilterKnownTemplates.TimeFilter, DefaultColumnWidths.Time); - add_col(Columns.User, DefaultColumnHeaders.User, r => r.user, dv_filter_rx(_model.factory.subscribe_users().Select(d => d.Values), r => r.order?.user() ?? string.Empty), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.User); - add_col(Columns.Account, DefaultColumnHeaders.Account, r => r.account, dv_filter_rx(_model.factory.subscribe_accounts().Select(d => d.Values), r => r.account), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Account); + add_col(Columns.User, DefaultColumnHeaders.User, r => r.user, dv_filter_rx(_model.factory.subscribe_users().Select(d => d.Values.Ordered()), r => r.order?.user() ?? string.Empty), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.User); + add_col(Columns.Account, DefaultColumnHeaders.Account, r => r.account, dv_filter_rx(_model.factory.subscribe_accounts().Select(d => d.Values.Ordered()), r => r.account), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Account); add_col(Columns.Exchange, DefaultColumnHeaders.Exchange, r => r.exchange.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.security.exchange_or_default()), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Exchange); add_col(Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, r => r.time_in_force.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.order?.time_in_force() ?? TimeInForce.Undefined), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.TimeInForce); add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), new DoubleMinMax(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index b9330c030..eb5a11bfb 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -121,7 +121,7 @@ namespace mbts.spark { r => r.user, DefaultColumnWidths.User, DiscreteValuesFilterVM.Create( - model.factory.subscribe_users().Select(d => d.Values), + model.factory.subscribe_users().Select(d => d.Values.Ordered()), ort => ort.order.order.user(), nameof(OrderBookRowVM.user)), DataGridFilterKnownTemplates.DiscreteValues, @@ -133,7 +133,7 @@ namespace mbts.spark { r => r.account, DefaultColumnWidths.Account, DiscreteValuesFilterVM.Create( - model.factory.subscribe_accounts().Select(d => d.Values), + model.factory.subscribe_accounts().Select(d => d.Values.Ordered()), ort => ort.order.order.account(), vals => vals.ToArray(), vals => Observable.Return(vals), diff --git a/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs b/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs index c6fcd85e2..c1384e079 100644 --- a/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/EnumerableExtensions.cs @@ -343,6 +343,18 @@ namespace System.Collections.Generic { return false; } + public static List ToListSorted(this IEnumerable enumerable, Func key_selector) => + enumerable.ToListSorted(key_selector, Comparer.Default); + + public static List ToListSorted(this IEnumerable enumerable, Func key_selector, IComparer key_comparer) => + enumerable.ToListSorted(key_comparer.wrap(key_selector)); + + public static List ToListSorted(this IEnumerable enumerable, IComparer comparer) { + var list = new List(enumerable); + list.Sort(comparer); + return list; + } + /// /// Simply returns enumerable.ToList(), under the guise ofo IReadOnlyList<> /// From 149cd90fb41d64cb277fc36979b9dd372f590890 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 2 Oct 2019 11:42:53 -0500 Subject: [PATCH 189/225] apply permission filter to pnl stream --- src/client/spark/Orders/OrdersModel.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 82baf8ce5..ffeceeb34 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -75,8 +75,10 @@ namespace mbts.spark { .join(sstore, pos => pos.SecurityId) .Table() .Cache(); - on_pnl = _position_service.subscribei_pnl_data() - .Naggle(interval, scheduler) + on_pnl = admin_model + .permission_filter( + _position_service.subscribei_pnl_data().Naggle(interval, scheduler), + p => p.Pos.AccountId) .join(sstore, p => p.Pos.SecurityId) .TableCheckedAutoCorrect(EqualityComparer<(SecurityImmutable? sec, PNLUnitImmutable data)>.Default) .Where(t => t.has_changes()) From 0bd477594c07e7d05382eb3a0cd0f08b475b41da Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 2 Oct 2019 13:36:58 -0500 Subject: [PATCH 190/225] FillsVM disposes filters --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 1ad591a57..8509914e1 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -146,6 +146,7 @@ namespace mbts.spark { }); _dispose = new CompositeDisposable( ObservableAutoWrapper.connect(col_tups, columns, ct => ct.col), + ObservableAutoWrapper.connect_item_hooks(col_tups, ct => ct.filter as IDisposable), RXCollection.connect(rows, fills_buffer.Filter(filter_src, FillTuple.key_fn), comp_src, ft => new Row(ft, model), r => r.fill_tuple), fills_source.OnDispatcher().Subscribe(t => { last_unfiltered_fills = t; From 79b2121f5e3fe310a0a5937fd0226fa2e8124d7a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 2 Oct 2019 13:37:30 -0500 Subject: [PATCH 191/225] OrderBookVM disposes order_mod_vm --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 40990a269..612a0adeb 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -239,7 +239,7 @@ namespace mbts.spark { grid_settings_manager, order_mod_vm.algo_vm.connect_data(Observable.Return(model)), order_mod_vm.algo_vm.connect_data(_selected_params_mon.subscribe_spreader_security()), - order_mod_vm.algo_vm, + order_mod_vm, attach_vm, _show_fills.observe_current(true) .Subscribe(is_visible => { @@ -735,17 +735,13 @@ namespace mbts.spark { _size_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write; SecurityMD? _security_md; - public OrderParamsVM(OrderBookVM owner, AlgoFormats init_format, AlgoEditingPermissions init_permissions) - : this(owner, - AlgoDefinitionVM.create( - owner._model, - AlgoData.create_unpersisted(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg), CustomOrderDefinition.CustomOneofCase.Iceberg.display_name()), - init_format: init_format, - editing_permissions: init_permissions)) { } - - OrderParamsVM(OrderBookVM owner, AlgoDefinitionVM algo_vm) { + public OrderParamsVM(OrderBookVM owner, AlgoFormats init_format, AlgoEditingPermissions init_permissions) { _owner = owner; - this.algo_vm = algo_vm; + algo_vm = AlgoDefinitionVM.create( + owner._model, + AlgoData.create_unpersisted(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg), CustomOrderDefinition.CustomOneofCase.Iceberg.display_name()), + init_format: init_format, + editing_permissions: init_permissions); _accounts = backing( nameof(selected_account), _model.factory.subscribe_account_tuples(), @@ -784,7 +780,8 @@ namespace mbts.spark { appended_param_rows.insert_front(new AlgoParamRowVM(root, _price_param, null, AlgoParamTemplateKeys.Price)); } }), - ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join)); + ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join), + algo_vm); // payup methods void payup_bid(int ticks) => payup(bbo.bid, -ticks); void payup_ask(int ticks) => payup(bbo.ask, ticks); From 7f187224c1c2f34dcfccdb0e760c7b928d8b0900 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 2 Oct 2019 13:38:37 -0500 Subject: [PATCH 192/225] add .Replay(1).RefCount() to AdminModel.on_accounts --- src/client/spark/Admin/AdminModel.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index d1c11d482..2ff340e18 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -28,7 +28,9 @@ namespace mbts.spark { .Where(acc => acc.HasValue) .Select(acc => acc.Value) .ToDictionary(acc => acc.Id, acc => acc.Name) : - new Dictionary(0)); + new Dictionary(0)) + .Replay(1) + .RefCount(); // users on_users = Observable.Return(DictionaryHelper.wrap_value(user.id, user.name)); all_user_tuples = user.permissions == UserTuple.Permissions.Admin ? @@ -42,7 +44,6 @@ namespace mbts.spark { .Table(UserTuple.key_fn) .Cache() : Observable.Return(TableUpdate.mk_empty(UserTuple.key_fn).with_added(new[] { user })); - // internal subs _dispose = on_accounts.Subscribe(map => _account_map = map); } From 562b9419bdd3161859c0a12e04a21f1472f6eee8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 4 Oct 2019 17:32:03 -0400 Subject: [PATCH 193/225] hedge is a lean now --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 67 ++++++++++++++----- .../orders/algo/algo_orders/PyramidAlgo.h | 3 + 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index b797b1591..9c6a401ad 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -99,10 +99,7 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { me->params = std::get<0>(conv_res); me->side = def.side(); // top spread - auto* t = _create_order_template(serv, - me->params.top_spread, - def.side(), - true); + auto* t = _create_top_order_template(serv); double tick_size = serv.lookup_security(me->params.top_spread)->contract_spec().low_tick(); me->legs.emplace_back(0, me->params.top_spread, tick_size, def.side(), t, me->params.top_delete); @@ -110,10 +107,7 @@ OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { size_t i = 0; for (SecurityKey key : me->params.cover_spreads){ auto side = SpreaderUtils::invert_side(def.side()); - auto* t = _create_order_template(serv, - key, - side, - false); + auto* t = _create_hedge_order_template(serv,i); double tick_size = serv.lookup_security(key)->contract_spec().low_tick(); me->legs.emplace_back(i+1, key, tick_size, side, t, me->params.cover_payups[i]); i++; @@ -326,21 +320,58 @@ PyramidAlgo::_get_update_params(const Update& update, /////////////////////////////////////////////////////////////////////////////// // order template creation///////////////////////////////////////////////////// -ChildTemplate* PyramidAlgo::_create_order_template ( - IBeforeLaunchAlgoServices& serv, - SecurityKey key, - api::Side side, - bool is_top_spread) const{ +// ChildTemplate* PyramidAlgo::_create_order_template ( +// IBeforeLaunchAlgoServices& serv, +// SecurityKey key, +// api::Side side, +// bool is_top_spread) const{ +// OrderDefinition order_def = serv.definition(); +// order_def.set_security_key (key.value()); +// order_def.set_side(side); +// if(is_top_spread){ +// order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( +// LimitOrderDefinition()); +// } +// else{ +// order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); +// LeanOrderDefinition lean; +// lean.mutable_cross_threshold()->set_absolute(100); // TODO need to be passed +// lean.set_max_chase_ticks(1); +// lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); +// lean.mutable_child()->mutable_limit()->MergeFrom ( +// LimitOrderDefinition()); +// order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); +// } +// return &(serv.make_child_template(order_def)); +// } + +ChildTemplate* PyramidAlgo::_create_top_order_template ( + IBeforeLaunchAlgoServices& serv) const{ OrderDefinition order_def = serv.definition(); - order_def.set_security_key (key.value()); - order_def.set_side(side); - if(!is_top_spread) - order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); + order_def.set_security_key (me->params.top_spread.value()); + order_def.set_side(me->side); order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( - api::orderman::LimitOrderDefinition()); + LimitOrderDefinition()); return &(serv.make_child_template(order_def)); } +ChildTemplate* PyramidAlgo::_create_hedge_order_template ( + IBeforeLaunchAlgoServices& serv, + size_t hedge_idx) const{ + OrderDefinition order_def = serv.definition(); + order_def.set_security_key (me->params.cover_spreads[hedge_idx].value()); + order_def.set_side(SpreaderUtils::invert_side(me->side)); + order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); + LeanOrderDefinition lean; + lean.mutable_cross_threshold()->set_absolute(me->params.cover_payups[hedge_idx].value()); + lean.set_max_chase_ticks(1); + lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); + lean.mutable_child()->mutable_limit()->MergeFrom ( + LimitOrderDefinition()); + order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); + return &(serv.make_child_template(order_def)); +} + void PyramidAlgo::_analyze_md_and_act(){ switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index a17888622..a157a054b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -48,6 +48,9 @@ private: SecurityKey, api::Side, bool is_top_spread) const; + ChildTemplate* _create_top_order_template (IBeforeLaunchAlgoServices&) const; + ChildTemplate* _create_hedge_order_template (IBeforeLaunchAlgoServices&, + size_t) const; // acts on md, cognizant of the state void _analyze_md_and_act(); void _switch_state (Status new_status); From 532591c34f98113f8111638b3f0e601f14664adb Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 08:36:14 -0400 Subject: [PATCH 194/225] 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 7746bd20f..8f1c26d04 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.11.0 +### Internal Changes + - Added support for tag 1031. Currently defaults to Y, can it be override through config. + ## 2.10.0 ### User Visible Changes - Fills now include information about the algo that originated the fill From d681a6924bbde031050ee42480296b2c9ec30c13 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 08:39:01 -0400 Subject: [PATCH 195/225] Updated release notes. --- doc/user/content/release_notes/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 8f1c26d04..81afe5ca3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,7 +7,7 @@ insert_anchor_links = "right" ## 2.11.0 ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - + - To facilitate support, allowed the bts user to view and edit algos from all other users ## 2.10.0 ### User Visible Changes - Fills now include information about the algo that originated the fill From 2684d25f09b3e6aad15f6eb75fde6cc567be2c1e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:01:32 -0400 Subject: [PATCH 196/225] Updated release notes --- doc/user/content/release_notes/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 81afe5ca3..09408ee6c 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -8,6 +8,8 @@ insert_anchor_links = "right" ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users + - Improved system tests + ## 2.10.0 ### User Visible Changes - Fills now include information about the algo that originated the fill From dab1e76766c58f111dca3f17f9212eb9bce67c56 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:10:32 -0400 Subject: [PATCH 197/225] Updated release notes. --- doc/user/content/release_notes/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 09408ee6c..eb8f2bdd8 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -5,6 +5,8 @@ sort_by = "weight" insert_anchor_links = "right" +++ ## 2.11.0 +### User Visible Changes + - Fixed fills form time filter to also apply to SOD fills ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users From 795b77ea3f83b27cc3f8c88d7a3540568fc171e0 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:12:45 -0400 Subject: [PATCH 198/225] 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 eb8f2bdd8..57cff6e72 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" - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users - Improved system tests + - Improved log messages in UI to include dispatcher thread name ## 2.10.0 ### User Visible Changes From d9d0e1f4efb0744ebe74bf1c05ae48a871b11947 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:14:46 -0400 Subject: [PATCH 199/225] 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 57cff6e72..52aeabb66 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.11.0 ### User Visible Changes - Fixed fills form time filter to also apply to SOD fills + - Addressed an issue that could prevent the web Admin UI from displaying over slow HTTP connections ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users From 84a2e50bf7a22a62af50bd109d4bbace6fc9ade0 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:19:18 -0400 Subject: [PATCH 200/225] 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 52aeabb66..8a6dde73f 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 - Fixed fills form time filter to also apply to SOD fills - Addressed an issue that could prevent the web Admin UI from displaying over slow HTTP connections + - Removed the option to enter manual spread fills ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users From 8a743a91a54bdb8dddbca42238004cfad93ecf15 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:29:30 -0400 Subject: [PATCH 201/225] 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 8a6dde73f..6bd677b4e 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" - Fixed fills form time filter to also apply to SOD fills - Addressed an issue that could prevent the web Admin UI from displaying over slow HTTP connections - Removed the option to enter manual spread fills + - Fixed an issue that could cause erroneous fill account attribution in the event of a crash ### Internal Changes - Added support for tag 1031. Currently defaults to Y, can it be override through config. - To facilitate support, allowed the bts user to view and edit algos from all other users From 761a89f0529c2e9c542411efa7bf4332213054a2 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 7 Oct 2019 09:37:00 -0400 Subject: [PATCH 202/225] 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 6bd677b4e..2ed5fb588 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -15,6 +15,7 @@ insert_anchor_links = "right" - To facilitate support, allowed the bts user to view and edit algos from all other users - Improved system tests - Improved log messages in UI to include dispatcher thread name + - Added support for Windows core dumps in the UI ## 2.10.0 ### User Visible Changes From 1aa9c46367c06ce4fd4d424bf24290a3c053e2f5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 7 Oct 2019 10:48:12 -0500 Subject: [PATCH 203/225] fix build (bad using directives after merge) --- src/client/spark/Daemons/ErrorReporter.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index 5ffeb3ec9..e2a7b462b 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -7,11 +7,9 @@ using mbts.ui; using System; using System.ComponentModel.Composition; using System.Reactive.Linq; -using System.Windows.Threading; -using System.Windows; using System.Threading.Tasks; using System.Windows; -using Google.Protobuf; +using System.Windows.Threading; namespace bts.spark { [Export, Export(typeof(IShellDaemon))] From 100316b79161d71891ea9ebf814597aeac74d5d2 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 8 Oct 2019 11:06:41 -0400 Subject: [PATCH 204/225] SP-246: Fix System Tests --- .../spark_test/Utils/MarketDataUtilities.cs | 24 ++++++++++++++++++- src/client/spark_test/Utils/TestUtils.cs | 14 +++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/client/spark_test/Utils/MarketDataUtilities.cs b/src/client/spark_test/Utils/MarketDataUtilities.cs index 5ab58171a..c08ab7678 100644 --- a/src/client/spark_test/Utils/MarketDataUtilities.cs +++ b/src/client/spark_test/Utils/MarketDataUtilities.cs @@ -2,6 +2,7 @@ using bts.co2; using System; using System.Collections.Generic; +using System.Linq; using System.Text; using System.Threading.Tasks; @@ -39,8 +40,29 @@ namespace bts.tests { return null; } +public static async Task> get_multiple_securities(MarketDataRelay relay, IEnumerable products, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) { + var request = new MDRequest() { Host = _MD_HOST }; + request.Channels.AddRange(products.Select(z => + new SecurityChannel() { + Time = 0, + Flags = (uint)flags, + Type = security_type, + Exchange = v, + Symbol = z.Symbol, + TradeCursor = 0, + RfqCursor = 0 + })); + + var result = await relay.requestmd_async(request); + + if (result.success) { + return result.value.Channels.Where(s => s.Updates.Count > 0).Select(x => (SecurityImmutable) x.Updates.First().Security); + } + return Enumerable.Empty(); + } + public static async Task> get_expirations(MarketDataRelay relay, string symbol, SecurityType security_type, MDRequest.Types.Flags flags = MDRequest.Types.Flags.Bbo, Venue v = Venue.Sim) { - var request = new MDRequest() { + var request = new MDRequest() { Host = _MD_HOST, Channels = { new SecurityChannel() { diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index b36693280..dba07db3b 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -145,18 +145,22 @@ namespace bts.tests.utils { } await Task.Delay(10000); } + //UserSymbol.get_all() in MDConsumer.cs bts.test.Assert.IsTrue(products != null, "No products found"); - var filtered_products = products.Products.Where(z => z.Exchange == Venue.Sim && z.Type == SecurityType.Future); - bts.test.Assert.IsTrue(filtered_products.Count() > 0, "No suitable products found"); + IEnumerable filtered_products = products.Products.Where(z => z.Exchange == Venue.Sim && z.Type == SecurityType.Future); + bts.test.Assert.IsTrue(filtered_products.Count() > 0, "No suitable products found"); //products are not guaranteed to have securities, so I need to get the product from the list of securities uint? sec_id = null; + /* get securities if the list is not empty use the top one */ + for(int i = 0; i < 10; i++) { - var test_security = await MarketDataUtilities.get_security(mdrelay, filtered_products.First().Symbol, SecurityType.Future, f => true); - if(test_security.HasValue) { + var test_security = await MarketDataUtilities.get_multiple_securities(mdrelay, filtered_products, SecurityType.Future); + + if(test_security.Count() > 0) { Console.Write("," + i); - sec_id = test_security.Value.Id; + sec_id = test_security.FirstOrDefault().Id; break; } await Task.Delay(10000); From 8b738787827b3b998a6383c1b38e410f2cadb5ca Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 8 Oct 2019 11:46:32 -0500 Subject: [PATCH 205/225] null check for TradingPermissions (fixes login crash) --- src/client/spark/Admin/AdminModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 2ff340e18..4f8c38f15 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -23,7 +23,7 @@ namespace mbts.spark { on_accounts = service.subscribei_admin_data() .Select(up => up.all.TryGetFirst(out var ad) && ad.Users.Where(u => u.Name == user.name).TryGetSingle(out var usr) && usr.HasUserData && usr.UserData.HasAccountPermissions ? usr.UserData.AccountPermissions.AccountPermissions - .Where(kv => kv.Value.TradingPermission.HasPermissions && kv.Value.AdminPermission.HasPermissions) + .Where(kv => kv.Value.TradingPermission != null && kv.Value.TradingPermission.HasPermissions && kv.Value.AdminPermission.HasPermissions) .Select(kv => ad.Accounts.Where(a => a.Id == kv.Key).TryGetSingle(out var acc) ? acc : (BTSAccountImmutable?)null) .Where(acc => acc.HasValue) .Select(acc => acc.Value) From 1469373b9c9542a22f7f8350f7a442e48ec29bdf Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 8 Oct 2019 15:59:15 -0400 Subject: [PATCH 206/225] fix Sparkcmd -h help printer --- src/client/sparkcmd/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/sparkcmd/Program.cs b/src/client/sparkcmd/Program.cs index 96b1d2dc8..61b1ba983 100644 --- a/src/client/sparkcmd/Program.cs +++ b/src/client/sparkcmd/Program.cs @@ -31,6 +31,7 @@ namespace sparkcmd { var parser = new Parser(ps => { ps.CaseInsensitiveEnumValues = true; + ps.HelpWriter = Console.Out; }); // note: this can be made to infer the options type list from the list of delegates From dc8e65923df49f8eb978b6d898be80d0d1f2f3dc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 9 Oct 2019 12:00:08 -0500 Subject: [PATCH 207/225] fix adminModel typo '&&' -> '||' (users need admin OR trade permissions to see account) --- src/client/spark/Admin/AdminModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index 4f8c38f15..2bbf79243 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -23,7 +23,7 @@ namespace mbts.spark { on_accounts = service.subscribei_admin_data() .Select(up => up.all.TryGetFirst(out var ad) && ad.Users.Where(u => u.Name == user.name).TryGetSingle(out var usr) && usr.HasUserData && usr.UserData.HasAccountPermissions ? usr.UserData.AccountPermissions.AccountPermissions - .Where(kv => kv.Value.TradingPermission != null && kv.Value.TradingPermission.HasPermissions && kv.Value.AdminPermission.HasPermissions) + .Where(kv => (kv.Value.TradingPermission != null && kv.Value.TradingPermission.HasPermissions) || kv.Value.AdminPermission.HasPermissions) .Select(kv => ad.Accounts.Where(a => a.Id == kv.Key).TryGetSingle(out var acc) ? acc : (BTSAccountImmutable?)null) .Where(acc => acc.HasValue) .Select(acc => acc.Value) From b85de51d0cda5bd52f2044d078b10cedbbb57b06 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 9 Oct 2019 12:33:40 -0500 Subject: [PATCH 208/225] bring back DefaultAlgoVM for 'None' case (dynamic children placeholders do not have specific impl) --- src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 06996a881..4243de0be 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -89,6 +89,7 @@ namespace mbts.spark { case AlgoType.Dynamic: vm = dynamic(key, name, name, editing_permissions); break; case AlgoType.Splitter: vm = splitter(key,name,editing_permissions); break; case AlgoType.Composite: vm = composite(key, name, editing_permissions); break; + case AlgoType.None: vm = new DefaultAlgoVM(); break; default: vm = generic(key, name, algo_type, editing_permissions); break; //default: // Log.Ui.debug_fatal($"Failed to create {typeof(IAlgoVM)}: unknown algo type '{algo_type}.'"); From c9663cf7ab9ab1e7cc83a55d24e01d9be3dfbf4c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Oct 2019 13:46:08 -0400 Subject: [PATCH 209/225] made the child orders configurable --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 51 +++++++------------ .../orders/algo/algo_orders/PyramidAlgo.h | 5 +- .../algo/algo_orders/RegisterDorman.cpp | 5 ++ 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 9c6a401ad..8e7d05a15 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -276,6 +276,15 @@ PyramidAlgo::PyramidAlgoParams PyramidAlgo::_convert_params ( rv.cover_spreads.emplace_back(b.value()); auto pu = get_if(params, "Spread " + idx + " Payup"); rv.cover_payups.emplace_back(pu.has_value() ? pu.value() : UINT32_MAX); + auto order_def = get_if(params, "Spread " + idx + " Order"); + if(order_def.has_value()) + rv.cover_order_defs.push_back(order_def.value()); + else{ + // if the algo does not have the cover set up it defaults to limit + CustomOrderDefinition custom_order_def; + custom_order_def.mutable_limit(); + rv.cover_order_defs.push_back(custom_order_def); + } } } return rv; @@ -320,31 +329,6 @@ PyramidAlgo::_get_update_params(const Update& update, /////////////////////////////////////////////////////////////////////////////// // order template creation///////////////////////////////////////////////////// -// ChildTemplate* PyramidAlgo::_create_order_template ( -// IBeforeLaunchAlgoServices& serv, -// SecurityKey key, -// api::Side side, -// bool is_top_spread) const{ -// OrderDefinition order_def = serv.definition(); -// order_def.set_security_key (key.value()); -// order_def.set_side(side); -// if(is_top_spread){ -// order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( -// LimitOrderDefinition()); -// } -// else{ -// order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); -// LeanOrderDefinition lean; -// lean.mutable_cross_threshold()->set_absolute(100); // TODO need to be passed -// lean.set_max_chase_ticks(1); -// lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); -// lean.mutable_child()->mutable_limit()->MergeFrom ( -// LimitOrderDefinition()); -// order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); -// } -// return &(serv.make_child_template(order_def)); -// } - ChildTemplate* PyramidAlgo::_create_top_order_template ( IBeforeLaunchAlgoServices& serv) const{ OrderDefinition order_def = serv.definition(); @@ -362,13 +346,14 @@ ChildTemplate* PyramidAlgo::_create_hedge_order_template ( order_def.set_security_key (me->params.cover_spreads[hedge_idx].value()); order_def.set_side(SpreaderUtils::invert_side(me->side)); order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); - LeanOrderDefinition lean; - lean.mutable_cross_threshold()->set_absolute(me->params.cover_payups[hedge_idx].value()); - lean.set_max_chase_ticks(1); - lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); - lean.mutable_child()->mutable_limit()->MergeFrom ( - LimitOrderDefinition()); - order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); + // LeanOrderDefinition lean; + // lean.mutable_cross_threshold()->set_absolute(me->params.cover_payups[hedge_idx].value()); + // lean.set_max_chase_ticks(1); + // lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); + // lean.mutable_child()->mutable_limit()->MergeFrom ( + // LimitOrderDefinition()); + // order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); + order_def.mutable_custom_def()->CopyFrom(me->params.cover_order_defs[hedge_idx]); return &(serv.make_child_template(order_def)); } @@ -499,7 +484,7 @@ void PyramidAlgo::_cxl_and_end(bool is_error, const std::string& msg){ if(me->legs[0].order_key != OrderKey(0)) _algo().cancel_child(me->legs[0].order_key); - _algo().detach_all_children(); + //_algo().detach_all_children(); if(is_error) _algo().terminate_error(msg); else if (is_cxl) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index a157a054b..10b92d04a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -17,6 +17,7 @@ class PyramidAlgo : public IAlgoOrder { SecurityKey top_spread; Quantity top_delete; std::vector cover_spreads; + std::vector cover_order_defs; std::vector cover_payups; }; public: @@ -44,10 +45,6 @@ private: static std::tuple _get_update_params( const api::orderman::Update&, const PyramidAlgoParams& curr_params); - ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, - SecurityKey, - api::Side, - bool is_top_spread) const; ChildTemplate* _create_top_order_template (IBeforeLaunchAlgoServices&) const; ChildTemplate* _create_hedge_order_template (IBeforeLaunchAlgoServices&, size_t) const; diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 68b5751de..908865eea 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -125,14 +125,19 @@ extern "C" void init_pyramid_plugin(bts::SparkServices& srv) { *join_desc.add_param_desc() = param_uint32("Delete"); *join_desc.add_param_desc() = param_security_key("Spread 1"); *join_desc.add_param_desc() = param_uint32("Spread 1 Payup"); + *join_desc.add_param_desc() = param_order("Spread 1 Order"); *join_desc.add_param_desc() = param_security_key("Spread 2"); *join_desc.add_param_desc() = param_uint32("Spread 2 Payup"); + *join_desc.add_param_desc() = param_order("Spread 2 Order"); *join_desc.add_param_desc() = param_security_key("Spread 3"); *join_desc.add_param_desc() = param_uint32("Spread 3 Payup"); + *join_desc.add_param_desc() = param_order("Spread 3 Order"); *join_desc.add_param_desc() = param_security_key("Spread 4"); *join_desc.add_param_desc() = param_uint32("Spread 4 Payup"); + *join_desc.add_param_desc() = param_order("Spread 4 Order"); *join_desc.add_param_desc() = param_security_key("Spread 5"); *join_desc.add_param_desc() = param_uint32("Spread 5 Payup"); + *join_desc.add_param_desc() = param_order("Spread 5 Order"); srv.register_dynamic_algo_order(join_desc, []() { return std::make_unique(); }); } From 6b30c42c0d97afc5be6c8a0d5244c829482f590b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 10 Oct 2019 14:56:32 -0400 Subject: [PATCH 210/225] added gt_cert jetfix rule to conf per Pete --- src/lib/config/defaults/jetfix.conf | 333 ++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index c58aef573..4e4a4f558 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -185,6 +185,339 @@ JetFIX { } } +JetFIX { + rule: "CannedCertSession.name='gt_cert'" + value { + connection { + name: "ice_cert" + platform: ICE + use_cme_secure_logon: false + log_fix_stream: true + socket_connect_host_ip: "63.247.113.154" + socket_connect_port: 80 + sender_compid: "51251" + target_compid: "ICE" + start_time: "22:55:00" + end_time: "22:05:00" + sender_subid: "BTS" + user_name: "bluetrd-os" #this is the order_server_id + raw_data: "Starts123" + max_order_msgs_per_window: 300 + auto_fix_seq_num: true + + seconds_to_replay: 6000 + } + connection: @JetFIXSimConnection.sim + connection { + name: "cme_mc7_99" + platform: GLBX + socket_connect_host_ip: "69.50.112.199" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "99" + cme_market_segment_id: 99 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_58" + platform: GLBX + socket_connect_host_ip: "69.50.112.172" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "58" + cme_market_segment_id: 58 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_54" + platform: GLBX + socket_connect_host_ip: "69.50.112.191" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "54" + cme_market_segment_id: 54 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_82" + platform: GLBX + socket_connect_host_ip: "69.50.112.179" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "82" + cme_market_segment_id: 82 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_56" + platform: GLBX + socket_connect_host_ip: "69.50.112.174" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "56" + cme_market_segment_id: 56 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_50" + platform: GLBX + socket_connect_host_ip: "69.50.112.202" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "50" + cme_market_segment_id: 50 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_52" + platform: GLBX + socket_connect_host_ip: "69.50.112.181" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "52" + cme_market_segment_id: 52 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_60" + platform: GLBX + socket_connect_host_ip: "69.50.112.195" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "60" + cme_market_segment_id: 60 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_76" + platform: GLBX + socket_connect_host_ip: "69.50.112.204" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "76" + cme_market_segment_id: 76 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_88" + platform: GLBX + socket_connect_host_ip: "69.50.112.169" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "88" + cme_market_segment_id: 88 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_74" + platform: GLBX + socket_connect_host_ip: "69.50.112.197" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "74" + cme_market_segment_id: 74 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_64" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "64" + cme_market_segment_id: 64 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_72" + platform: GLBX + socket_connect_host_ip: "69.50.112.189" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "72" + cme_market_segment_id: 72 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_70" + platform: GLBX + socket_connect_host_ip: "69.50.112.183" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "70" + cme_market_segment_id: 70 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_68" + platform: GLBX + socket_connect_host_ip: "69.50.112.168" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "68" + cme_market_segment_id: 68 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_80" + platform: GLBX + socket_connect_host_ip: "69.50.112.187" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "80" + cme_market_segment_id: 80 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_84" + platform: GLBX + socket_connect_host_ip: "69.50.112.198" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "84" + cme_market_segment_id: 84 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + connection { + name: "cme_mc7_78" + platform: GLBX + socket_connect_host_ip: "69.50.112.167" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "78" + cme_market_segment_id: 78 + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + auto_fix_seq_num: true + } + } +} + + JetFIX { rule: "CannedCertSession.name='mc7'" value { From 2677144bfa1bb4537c231c98bcdfbf0d16918f03 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 10 Oct 2019 17:43:28 -0400 Subject: [PATCH 211/225] buffer cancel and updates because ice sucks --- src/lib/orderman/orders/ICENativeOrder.cpp | 79 ++++++++++++---------- src/lib/orderman/orders/ICENativeOrder.h | 1 + 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index e3341a3de..a83276c92 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -626,6 +626,11 @@ OrderOpResult ICENativeOrder::on_update(api::orderman::Update const &update) if (me->state.last_msg().size()) me->state.set_last_msg(""); + LOG(OrderMan, Warn, + "ICE may not honor this update if we recently issued an unacknowledged cancelreplace {}. Update: {}@{}. Buffering", + key().value(), q.value(), p.value()); + me->buffered_update.emplace(p, q); + // early return so we skip report_state (for speed) return OrderOpResult{}; } @@ -730,6 +735,11 @@ OrderOpResult ICENativeOrder::on_cancel() me->cancel_clordid_bm = encoding.overwrite( me->cancel_clordid_bm, cancel_clorid, count_digits(cancel_clorid) ); me->services->queue_fix(*me->session_services, jetfix::MessageTypes::Cancel,me->cancel_encoding); + me->buffered_cancel = true; + LOG(OrderMan, Warn, + "ICE May not honor this cancel if we'd previously issued an unacknowledged cancelreplace " + "Buffering cancel to be safe", + key().value()); break; } @@ -865,6 +875,8 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) // terminal states, nothing can change them case ORDER_STATUS_COMPLETED: case ORDER_STATUS_CANCELED: + me->buffered_cancel = false; + me->buffered_update.reset(); break; // receiving an execution report does does not mean @@ -881,30 +893,20 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) transition(external_status); if (external_status == ORDER_STATUS_WORKING) { - if (me->buffered_cancel) - { - LOG(OrderMan, Warn, - "Applying buffered cancel to order {}, on first ack", - key().value()); - on_cancel(); - } - else if (me->buffered_update.has_value()) - { - auto [p, q] = me->buffered_update.value(); - me->buffered_update.reset(); - LOG(OrderMan, Warn, - "Applying buffered update ({}@{}) to order {}, on " - "first ack", - q.value(),p.value(), - key().value()); - on_update(p, q); - } + handle_buffered_state("first ack"); } } break; case ORDER_STATUS_WORKING: + { transition(external_status); + auto [p, q] = me->buffered_update.value(); + if(er.data->price.value() == p.value() && er.data->quantity.value() == q.value()) + me->buffered_update.reset(); + + handle_buffered_state("working"); + } break; case ORDER_STATUS_INACTIVE: @@ -927,6 +929,28 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) } } +void ICENativeOrder::handle_buffered_state(const std::string& condition) +{ + if (me->buffered_cancel) + { + LOG(OrderMan, Warn, + "Applying buffered cancel to order {}, on ", + condition, + key().value()); + on_cancel(); + } + else if (me->buffered_update.has_value()) + { + auto [p, q] = me->buffered_update.value(); + //me->buffered_update.reset(); + LOG(OrderMan, Warn, + "Applying buffered update ({}@{}) to order {}, on ", + condition, + q.value(),p.value(), key().value()); + on_update(p, q); + } +} + void ICENativeOrder::on_cancel_reject(const orderman::CancelRejectEvent &cr) { auto &state = me->state; @@ -963,6 +987,7 @@ void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) case ORDER_STATUS_CANCELED: case ORDER_STATUS_ERROR: case ORDER_STATUS_PENDING_WORKING: + break; case ORDER_STATUS_WORKING: break; case ORDER_STATUS_DISCONNECTED: @@ -971,23 +996,7 @@ void ICENativeOrder::on_gateway_status(const GatewayStatusChangeEvent &ev) transition(map_external_status(native_state.native_status())); if (me->state.status() == ORDER_STATUS_WORKING) { - if (me->buffered_cancel) - { - LOG(OrderMan, Warn, - "Applying buffered cancel to order {}, on re-connection", - key().value()); - on_cancel(); - } - else if (me->buffered_update.has_value()) - { - auto [p, q] = me->buffered_update.value(); - me->buffered_update.reset(); - LOG(OrderMan, Warn, - "Applying buffered update ({}@{}) to order {}, on " - "re-connection", - q.value(),p.value(), key().value()); - on_update(p, q); - } + handle_buffered_state("re-connection"); } break; } diff --git a/src/lib/orderman/orders/ICENativeOrder.h b/src/lib/orderman/orders/ICENativeOrder.h index 7c615c7a9..9a581a69a 100644 --- a/src/lib/orderman/orders/ICENativeOrder.h +++ b/src/lib/orderman/orders/ICENativeOrder.h @@ -38,6 +38,7 @@ class ICENativeOrder : public NativeOrderBase { void warm_up_activate(OrderServicesData &, OrderServices &) override; void init_recovered_common(const api::orderman::OrderRecord &, const PreActivationOrderServices &); + void handle_buffered_state(const std::string& condition); private: From 0c5a03922640d9c21e9ed1ed93967aaf15a1a687 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 11 Oct 2019 14:04:32 -0400 Subject: [PATCH 212/225] tested buffered cancel and replace with lean_controlled.txt, verified in fix --- src/lib/orderman/orders/ICENativeOrder.cpp | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/orders/ICENativeOrder.cpp b/src/lib/orderman/orders/ICENativeOrder.cpp index a83276c92..0155bf4f1 100644 --- a/src/lib/orderman/orders/ICENativeOrder.cpp +++ b/src/lib/orderman/orders/ICENativeOrder.cpp @@ -76,6 +76,7 @@ struct ICENativeOrder::PImpl bool buffered_cancel = false; std::optional> buffered_update; + int buffered_tries = 0; }; ICENativeOrder::ICENativeOrder() : me(new PImpl()) {} @@ -899,14 +900,21 @@ void ICENativeOrder::on_exe_report(const NewExecutionReportEvent &er) break; case ORDER_STATUS_WORKING: - { - transition(external_status); - auto [p, q] = me->buffered_update.value(); - if(er.data->price.value() == p.value() && er.data->quantity.value() == q.value()) - me->buffered_update.reset(); - - handle_buffered_state("working"); - } + { + transition(external_status); + if(me->buffered_update) + { + auto [p, q] = me->buffered_update.value(); + if(er.data->price.value() == p.value() && er.data->quantity.value() == q.value()) + me->buffered_update.reset(); + if(me->buffered_tries++ > 10) + { + me->buffered_tries = 0; + me->buffered_update.reset(); + } + } + handle_buffered_state("working"); + } break; case ORDER_STATUS_INACTIVE: @@ -942,7 +950,6 @@ void ICENativeOrder::handle_buffered_state(const std::string& condition) else if (me->buffered_update.has_value()) { auto [p, q] = me->buffered_update.value(); - //me->buffered_update.reset(); LOG(OrderMan, Warn, "Applying buffered update ({}@{}) to order {}, on ", condition, From b0c1d93c500bf749cb650e928b9b5c6b9e8d10fe Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 14 Oct 2019 11:08:29 -0400 Subject: [PATCH 213/225] Corner cases fixed --- .../orders/algo/algo_orders/PyramidAlgo.cpp | 242 ++++++++++-------- .../orders/algo/algo_orders/PyramidAlgo.h | 21 +- 2 files changed, 145 insertions(+), 118 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index 8e7d05a15..d36634a99 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -17,6 +17,7 @@ namespace orderman { using namespace api::orderman; enum class PyramidAlgo::Status { WAITING_FOR_MD, WAITING_FOR_MD_ATTACH, WORKING, DONE }; +enum class PyramidAlgo::ExitPath { CANCEL, ERR, COMPLETE }; struct LegData{ const size_t index; @@ -65,11 +66,14 @@ struct LegData{ struct PyramidAlgo::PImpl { Status state = Status::WAITING_FOR_MD; IAlgoServices* algo_services = nullptr; + IBeforeLaunchAlgoServices* bl_algo_services; PyramidAlgo::PyramidAlgoParams params; std::vector legs; api::Side side; Price out_price; Quantity out_qty; + PImpl(){ + } LegData* find_leg_from_sec (SecurityKey sec_key){ for (auto& l : legs) if(l.sec_key == sec_key) @@ -91,7 +95,8 @@ IAlgoServices& PyramidAlgo::_algo() const { return *me->algo_services; } // initialization ///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// OrderOpResult PyramidAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { - auto& def = serv.definition(); + me->bl_algo_services = &serv; + auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ auto conv_res = _get_creation_params(def.custom_def(), serv); if (std::get<1>(conv_res)){ @@ -131,30 +136,36 @@ void PyramidAlgo::do_launch(IAlgoServices& algo_services) { } void PyramidAlgo::do_launch_attached(IAlgoServices& algo_services, OrderKey key, - ChildState c) { + ChildState c) { me->algo_services = &algo_services; - me->legs[0].order_key = key; - me->out_price = c.price; - me->out_qty = c.quantity; - for (const LegData& l : me->legs) - algo_services.subscribe_book(l.sec_key); - _switch_state(PyramidAlgo::Status::WAITING_FOR_MD_ATTACH); - on_child_change(key,c); + if(c.quantity != algo_services.quantity() || + !bts::securities::is_same(c.price, algo_services.price())){ + _cxl_and_end(ExitPath::ERR, + "Pyramid price or quantity did not match the working order", + true); + } + else{ + me->legs[0].order_key = key; + me->out_price = c.price; + me->out_qty = c.quantity; + for (const LegData& l : me->legs) + algo_services.subscribe_book(l.sec_key); + _switch_state(PyramidAlgo::Status::WAITING_FOR_MD_ATTACH); + on_child_change(key,c); + } } // updates //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void PyramidAlgo::do_update(const api::orderman::Update& update) { - LOG(OrderMan, Diag, "PyramidAlgo::do_update order:{} state:{} receiving update: {}", + LOG(OrderMan, Diag, "PyramidAlgo::do_update order:{} state:{} " + "receiving update: {}", _algo().order_key().value(), static_cast(me->state), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_dynamic()) { - _cxl_and_end(true,false,"Invalid update, Dynamic algo data is missing"); - return; - } auto conv_res = _get_update_params(update, me->params); if (!std::get<1>(conv_res)){ - _cxl_and_end(true,false,std::get<2>(conv_res)); + LOG(OrderMan, Warn, "PyramidAlgo::do_update order:{} bad update, ignoring", + _algo().order_key().value()); return; } const PyramidAlgoParams& algo_params = std::get<0>(conv_res); @@ -162,33 +173,25 @@ void PyramidAlgo::do_update(const api::orderman::Update& update) { Quantity qty = Quantity(update.quantity()); switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: - _copy_update(algo_params, price, qty); - if(_target_reached()){ // if qty is set to 0 - _cxl_and_end (false,true,"Target reached"); - return; - } - break; case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: - _copy_update(algo_params, price, qty); - if(_target_reached()){ - // target could be reached if the algo order qty is - // set <= filled qty of the attached order - _cxl_and_end (false,true,"Target reached"); - return; - } - _update_top_spread(); + LOG(OrderMan, Info, "PyramidAlgo::do_update order:{} state:{} ignored", + _algo().order_key().value(),static_cast(me->state)); break; - case PyramidAlgo::Status::WORKING: - _copy_update(algo_params, price, qty); + case PyramidAlgo::Status::WORKING:{ + bool pq_changed = _copy_update(algo_params, price, qty); if(_target_reached()){ - _cxl_and_end (false,true,"Target reached"); + _cxl_and_end (PyramidAlgo::ExitPath::CANCEL, "Target reached"); return; } - if (_working_state_met()) - _update_top_spread(); + if (_working_state_met()){ + if(pq_changed) + _modify_top_spread_order(); + } else - _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); + _cxl_and_end(PyramidAlgo::ExitPath::CANCEL, + "Order cancelled (Cover prices not met)"); break; + } case PyramidAlgo::Status::DONE: break; } @@ -202,13 +205,15 @@ void PyramidAlgo::on_book(SecurityKey key, const Book& book) { _analyze_md_and_act(); } } +// this only gets called on am explicit algo cancel +// from the outside IAlgoOrder::OnCancelResponse PyramidAlgo::on_cancel(){ // cancel top spread, let hedges work, cancel algo switch(me->state){ case PyramidAlgo::Status::WAITING_FOR_MD: case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: case PyramidAlgo::Status::WORKING: - _cxl_and_end(false,true,"Order cancelled"); + _cxl_and_end(PyramidAlgo::ExitPath::CANCEL,"Algo cancelled"); break; case PyramidAlgo::Status::DONE: break; @@ -226,33 +231,26 @@ void PyramidAlgo::on_child_change(OrderKey key, const ChildState &st) { st.total_fills, st.last_price); LegData* leg = me->find_leg_from_ord_key (key); - if (leg == nullptr){ - LOG(OrderMan, Error, - "PyramidAlgo::on_child_change key:{} unknown order:{}", - _algo().order_key(), key); - return; - } - switch(me->state){ - case PyramidAlgo::Status::WAITING_FOR_MD: - bts_assert_msg (false, "No child orders"); - break; - case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: - leg->order_state = st; - if(leg->is_top_spread()) + if (me->legs[0].order_key == key){ + switch(me->state){ + case PyramidAlgo::Status::WAITING_FOR_MD: + bts_assert_msg (false, "No child orders"); + break; + case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: + leg->order_state = st; _algo().update_fill_state(st.total_fills, st.avg_price); - _check_for_completion(); - break; - case PyramidAlgo::Status::WORKING: - leg->order_state = st; - if(leg->is_top_spread()){ + _check_for_completion(); + break; + case PyramidAlgo::Status::WORKING: + leg->order_state = st; _algo().update_fill_state(st.total_fills, st.avg_price); _send_hedges(st.last_fills); - } - _check_for_completion(); - break; - case PyramidAlgo::Status::DONE: - break; - } + _check_for_completion(); + break; + case PyramidAlgo::Status::DONE: + break; + } + } } /////////////////////////////////////////////////////////////////////////////// @@ -275,16 +273,7 @@ PyramidAlgo::PyramidAlgoParams PyramidAlgo::_convert_params ( if (b.has_value() && b.value() != 0){ rv.cover_spreads.emplace_back(b.value()); auto pu = get_if(params, "Spread " + idx + " Payup"); - rv.cover_payups.emplace_back(pu.has_value() ? pu.value() : UINT32_MAX); - auto order_def = get_if(params, "Spread " + idx + " Order"); - if(order_def.has_value()) - rv.cover_order_defs.push_back(order_def.value()); - else{ - // if the algo does not have the cover set up it defaults to limit - CustomOrderDefinition custom_order_def; - custom_order_def.mutable_limit(); - rv.cover_order_defs.push_back(custom_order_def); - } + rv.cover_payups.emplace_back(pu.has_value() ? pu.value() : UINT32_MAX); } } return rv; @@ -311,7 +300,7 @@ PyramidAlgo::_get_creation_params(const CustomOrderDefinition& cod, std::tuple PyramidAlgo::_get_update_params(const Update& update, const PyramidAlgoParams& curr_params){ - if(update.has_custom()){ + if(update.has_custom() && update.custom().has_dynamic()){ // means there is a params change PyramidAlgoParams new_params = _convert_params(update.custom()); if(new_params.top_spread != curr_params.top_spread || @@ -343,17 +332,17 @@ ChildTemplate* PyramidAlgo::_create_hedge_order_template ( IBeforeLaunchAlgoServices& serv, size_t hedge_idx) const{ OrderDefinition order_def = serv.definition(); + order_def.set_attach_target_order_key(null_order_key().value()); order_def.set_security_key (me->params.cover_spreads[hedge_idx].value()); order_def.set_side(SpreaderUtils::invert_side(me->side)); order_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); - // LeanOrderDefinition lean; - // lean.mutable_cross_threshold()->set_absolute(me->params.cover_payups[hedge_idx].value()); - // lean.set_max_chase_ticks(1); - // lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); - // lean.mutable_child()->mutable_limit()->MergeFrom ( - // LimitOrderDefinition()); - // order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); - order_def.mutable_custom_def()->CopyFrom(me->params.cover_order_defs[hedge_idx]); + LeanOrderDefinition lean; + lean.mutable_cross_threshold()->set_absolute(me->params.cover_payups[hedge_idx].value()); + lean.set_max_chase_ticks(1); + lean.set_trade_toward_behavior(LeanOrderDefinition::NO_CHANGE); + lean.mutable_child()->mutable_limit()->MergeFrom ( + LimitOrderDefinition()); + order_def.mutable_custom_def()->mutable_lean()->MergeFrom (lean); return &(serv.make_child_template(order_def)); } @@ -380,7 +369,8 @@ void PyramidAlgo::_analyze_md_and_act(){ _switch_state(PyramidAlgo::Status::WORKING); } else - _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); + _cxl_and_end(PyramidAlgo::ExitPath::CANCEL, + "Order cancelled (Cover prices not met)"); break; case PyramidAlgo::Status::WAITING_FOR_MD_ATTACH: if(!_md_recvd()) @@ -389,11 +379,14 @@ void PyramidAlgo::_analyze_md_and_act(){ if (_working_state_met()) _switch_state(PyramidAlgo::Status::WORKING); else - _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); + _cxl_and_end(PyramidAlgo::ExitPath::CANCEL, + "Order detached (Cover prices not met)", + true); break; case PyramidAlgo::Status::WORKING: if (!_working_state_met()) - _cxl_and_end(false,true,"Order cancelled (Cover prices not met)"); + _cxl_and_end(PyramidAlgo::ExitPath::CANCEL, + "Order cancelled (Cover prices not met)"); break; case PyramidAlgo::Status::DONE: break; @@ -433,7 +426,6 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ if (filled_qty.value() > 0) for (auto& l : me->legs) if(!l.is_top_spread()){ - // TODO: check for no market (cache the last observed valid markets) const auto& inside_md = l.opp_md()[0]; Price hedge_price = Price(inside_md.price()); uint32_t inside_md_qty = inside_md.size(); @@ -445,14 +437,15 @@ void PyramidAlgo::_send_hedges (Quantity filled_qty){ *l.order_template, hedge_price, filled_qty); + _algo().detach_child(l.order_key); } } -void PyramidAlgo::_update_top_spread(){ +void PyramidAlgo::_modify_top_spread_order(){ Update child_update; child_update.set_price(me->out_price.value()); child_update.set_quantity(me->out_qty.value()); - LOG(OrderMan, Info,"PyramidAlgo::_update_top_spread modifying order key:{} " + LOG(OrderMan, Info,"PyramidAlgo::_modify_top_spread_order modifying order key:{} " "child_key:{} price:{} qty:{}", _algo().order_key(), me->legs[0].order_key, @@ -460,40 +453,73 @@ void PyramidAlgo::_update_top_spread(){ me->out_qty); _algo().update_child(me->legs[0].order_key, child_update); } - -void PyramidAlgo::_copy_update(const PyramidAlgoParams& algo_params, +// copies the params, price and qty to the state +// retuns true is the price or qty has changed +bool PyramidAlgo::_copy_update(const PyramidAlgoParams& algo_params, Price price, Quantity qty){ // params me->legs[0].top_delete = algo_params.top_delete; - size_t i = 1; - for (Quantity pu : algo_params.cover_payups) - me->legs[i++].cover_payup = pu; - // price, qty + size_t cov_idx = 0; + for (Quantity pu : algo_params.cover_payups){ + LegData& cover_leg = me->legs[cov_idx+1]; + if(cover_leg.cover_payup != pu){ + cover_leg.cover_payup = pu; + cover_leg.order_template = _create_hedge_order_template( + *me->bl_algo_services, + cov_idx); + } + cov_idx++; + } + bool pq_changed = me->out_qty.value() != qty.value() || + !bts::securities::is_same(me->out_price, price); me->out_price = price; me->out_qty = qty; + return pq_changed; } - +// if the top spread order is in a final state, the algo +// algo goes to the final state void PyramidAlgo::_check_for_completion(){ - if(me->legs[0].order_state.status != ChildStatus::WORKING) - _cxl_and_end(false, - me->legs[0].order_state.status == ChildStatus::CANCELED,""); + const ChildState& top_ord = me->legs[0].order_state; + switch (top_ord.status){ + case (ChildStatus::WORKING): + break; + case (ChildStatus::COMPLETED): + _cxl_and_end(PyramidAlgo::ExitPath::ERR,""); + break; + case (ChildStatus::CANCELED): + _cxl_and_end(PyramidAlgo::ExitPath::ERR, + "Top spread unexpectedly cancelled"); + break; + } } -void PyramidAlgo::_cxl_and_end(bool is_error, - bool is_cxl, - const std::string& msg){ - if(me->legs[0].order_key != OrderKey(0)) - _algo().cancel_child(me->legs[0].order_key); - //_algo().detach_all_children(); - if(is_error) - _algo().terminate_error(msg); - else if (is_cxl) - _algo().cancel(msg); - else - _algo().complete(); +void PyramidAlgo::_cxl_and_end(PyramidAlgo::ExitPath exit_path, + const std::string& msg, + bool detach_top){ + if(me->legs[0].order_key != null_order_key()){ + const ChildState& top_ord_state = me->legs[0].order_state; + if(top_ord_state.status == ChildStatus::WORKING){ + if(detach_top) + _algo().detach_child(me->legs[0].order_key); + else + _algo().cancel_child(me->legs[0].order_key); + } + } + switch(exit_path){ + case PyramidAlgo::ExitPath::ERR: + _algo().terminate_error(msg); + break; + case PyramidAlgo::ExitPath::CANCEL: + _algo().cancel(msg); + break; + case PyramidAlgo::ExitPath::COMPLETE: + _algo().complete(); + break; + } _switch_state(PyramidAlgo::Status::DONE); } - +// true the out qty is changed it be below +// the filled qty bool PyramidAlgo::_target_reached() const{ return me->legs[0].order_state.total_fills.value() >= me->out_qty.value(); diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h index 10b92d04a..c24ea468f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.h @@ -9,7 +9,7 @@ class ChildTemplate; class LegData; class PyramidAlgo : public IAlgoOrder { - public: +public: PyramidAlgo(); ~PyramidAlgo(); struct PyramidAlgoParams{ @@ -17,10 +17,9 @@ class PyramidAlgo : public IAlgoOrder { SecurityKey top_spread; Quantity top_delete; std::vector cover_spreads; - std::vector cover_order_defs; std::vector cover_payups; }; - public: +public: OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; void do_launch(IAlgoServices &) override; void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; @@ -29,8 +28,10 @@ class PyramidAlgo : public IAlgoOrder { void on_child_change(OrderKey, ChildState const &) override; IAlgoOrder::OnCancelResponse on_cancel() override; - private: +private: enum class Status; + enum class ExitPath; + struct PImpl; std::unique_ptr me; private: @@ -52,17 +53,17 @@ private: void _analyze_md_and_act(); void _switch_state (Status new_status); void _send_hedges (Quantity filled_qty); - // updates it to the price, qty in the state - void _update_top_spread(); - void _copy_update(const PyramidAlgoParams& algo_params, + void _modify_top_spread_order(); + // returns true is the price, qty changes + bool _copy_update(const PyramidAlgoParams& algo_params, Price price, Quantity qty); void _check_for_completion(); // cxl's the working top leg order (if any), detaches // all hedges. if is_error then terminates algo, is // is_cxl then cxl's algo, otherwise completes it - void _cxl_and_end(bool is_error, - bool is_cxl, - const std::string& err_txt); + void _cxl_and_end(ExitPath exit_path, + const std::string& err_txt, + bool detach_top = false); bool _target_reached() const; // true is all legs have recvd md bool _md_recvd() const; From 7ecb1068802ebeb331a30c4f4750fb7a70faa855 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 14 Oct 2019 11:39:27 -0400 Subject: [PATCH 214/225] Done --- .../orderman/orders/algo/algo_orders/PyramidAlgo.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp index d36634a99..09facf535 100644 --- a/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/PyramidAlgo.cpp @@ -457,9 +457,14 @@ void PyramidAlgo::_modify_top_spread_order(){ // retuns true is the price or qty has changed bool PyramidAlgo::_copy_update(const PyramidAlgoParams& algo_params, Price price, Quantity qty){ - // params - me->legs[0].top_delete = algo_params.top_delete; + // copy input params (which are stored seperately) + me->params.top_delete = algo_params.top_delete; size_t cov_idx = 0; + for (Quantity payup : algo_params.cover_payups) + me->params.cover_payups[cov_idx++] = payup; + // copy leg data + cov_idx = 0; + me->legs[0].top_delete = algo_params.top_delete; for (Quantity pu : algo_params.cover_payups){ LegData& cover_leg = me->legs[cov_idx+1]; if(cover_leg.cover_payup != pu){ @@ -470,6 +475,7 @@ bool PyramidAlgo::_copy_update(const PyramidAlgoParams& algo_params, } cov_idx++; } + // copy price and qty (returns true is they have changed) bool pq_changed = me->out_qty.value() != qty.value() || !bts::securities::is_same(me->out_price, price); me->out_price = price; From 93b954ce46fa3354aaccb3b7dde4fcf7f12e0c21 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 16 Oct 2019 11:37:32 -0400 Subject: [PATCH 215/225] Some cleanup remains, mostlty done --- .../orders/algo/algo_orders/TASAlgo.cpp | 89 +++++++++---------- .../orders/algo/algo_orders/TASAlgo.h | 1 + 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp index 751237efc..31c1751eb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -11,6 +11,7 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" #include +#include namespace bts { namespace orderman { @@ -19,18 +20,18 @@ using namespace api::orderman; enum class TASAlgo::Status { WAITING_FOR_SIGNAL, WORKING, DONE }; -struct LegData{ - const size_t index; - const SecurityKey sec_key; +struct TASLegData{ + size_t index; + SecurityKey sec_key; double tick_size; - const api::Side side; //trading side + api::Side side; //trading side Price price; Quantity quantity; ChildTemplate* order_template = nullptr; OrderKey order_key; ChildState order_state; - LegData (size_t index, - SecurityKey sec_key, + TASLegData (size_t index, + SecurityKey sec_key, double tick_size, api::Side side, Price price, @@ -50,29 +51,19 @@ struct LegData{ } }; -struct TASAlgo::PImpl { - SecurityKey sec_key; - api::Side side; - Price out_price; - Quantity out_qty; +struct TASAlgo::PImpl { + Status state = Status::WAITING_FOR_SIGNAL; + IAlgoServices* algo_services = nullptr; + SecurityKey sec_key = SecurityKey(0); TASAlgo::TASAlgoParams algo_params; - std::vector legs; - Status state; - IAlgoServices* algo_services; - bts::datetime::PTime start_time; - PImpl() - : - sec_key(SecurityKey(0)), - side(api::Side::SIDE_BUY), - out_price(Price(0)), - out_qty(Quantity(0)), - algo_params(), - legs(), - state(Status::WAITING_FOR_SIGNAL), - algo_services(nullptr), - start_time(bts::datetime::local_now()) - {} - LegData* find_leg_from_ord_key (OrderKey ord_key){ + std::vector legs; + api::Side side = api::Side::SIDE_BUY; + Price out_price = Price(0); + Quantity out_qty = Quantity(0); + bts::datetime::PTime start_time = bts::datetime::local_now(); + PImpl(){ + } + TASLegData* find_leg_from_ord_key (OrderKey ord_key){ for (auto& l : legs) if(l.order_key == ord_key) return &l; @@ -87,7 +78,7 @@ IAlgoServices& TASAlgo::_algo() const { return *me->algo_services; } // initialization ///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { - auto& def = serv.definition(); + auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ const auto& sec = serv.security(); me->sec_key = SecurityKey(sec.id()); @@ -96,10 +87,9 @@ OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { double tick_size = sec.contract_spec().low_tick(); size_t i = 0; for (const auto& t : me->algo_params.child_orders){ - auto price = std::get<0>(t); - bts_assert(price.value()>0); - auto quantity = std::get<1>(t); - auto side = std::get<2>(t); + Price price = std::get<0>(t); + Quantity quantity = std::get<1>(t); + api::Side side = std::get<2>(t); auto* ordt = _create_order_template( serv, SecurityKey(sec.id()), @@ -125,11 +115,13 @@ void TASAlgo::do_launch(IAlgoServices& algo_services) { } void TASAlgo::do_launch_attached(IAlgoServices&, OrderKey, - ChildState) { + ChildState) { + _cxl_and_end(true, "Algo can not be attached to working orders"); } // updates //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void TASAlgo::do_update(const api::orderman::Update&) { + // TODO } // callbacks ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -137,20 +129,24 @@ void TASAlgo::on_book(SecurityKey, const Book&) { } void TASAlgo::on_child_change(OrderKey key, ChildState const &st){ - LegData* ld_ptr = me->find_leg_from_ord_key(key); + TASLegData* ld_ptr = me->find_leg_from_ord_key(key); if (ld_ptr != nullptr) ld_ptr->order_state = st; for (const auto& l : me->legs) if(l.order_state.status == ChildStatus::WORKING) return; - _algo().complete(); - _switch_state(TASAlgo::Status::DONE); + _cxl_and_end(false,""); } void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ if(key == me->sec_key && status == co2::TradingStatus::TRADINGSTATUS_PRE_OPEN){ switch (me->state){ case TASAlgo::Status::WAITING_FOR_SIGNAL: + for (auto& l : me->legs) + l.order_key = _algo().launch_child( + *l.order_template, + l.price, + l.quantity); _switch_state(TASAlgo::Status::WORKING); break; case TASAlgo::Status::WORKING: @@ -164,7 +160,7 @@ void TASAlgo::on_timer(){ on_status(me->sec_key,co2::TradingStatus::TRADINGSTATUS_PRE_OPEN); } IAlgoOrder::OnCancelResponse TASAlgo::on_cancel() { - return IAlgoOrder::OnCancelResponse::HONOR; + return IAlgoOrder::OnCancelResponse::HONOR; } /////////////////////////////////////////////////////////////////////////////// // stateless conversion /////////////////////////////////////////////////////// @@ -182,7 +178,7 @@ TASAlgo::TASAlgoParams TASAlgo::_convert_params ( if(is_buy.has_value()){ api::Side side = is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL; // TODO, get it from the parent - rv.child_orders.emplace_back(Price(price.value()), Quantity(qty.value()), side); + rv.child_orders.emplace_back(Price(price.value()), Quantity(qty.value()), side); } } return rv; @@ -194,12 +190,7 @@ void TASAlgo::_switch_state(TASAlgo::Status new_state){ bts_assert(false); break; case (TASAlgo::Status::WORKING): - bts_assert(me->state == TASAlgo::Status::WAITING_FOR_SIGNAL); - for (const auto& l : me->legs) - _algo().launch_child( - *l.order_template, - l.price, - l.quantity); + bts_assert(me->state == TASAlgo::Status::WAITING_FOR_SIGNAL); break; case (TASAlgo::Status::DONE): bts_assert(me->state != TASAlgo::Status::DONE); @@ -208,6 +199,14 @@ void TASAlgo::_switch_state(TASAlgo::Status new_state){ me->state = new_state; } +void TASAlgo::_cxl_and_end (bool is_error, const std::string& err_msg){ + if(is_error) + _algo().terminate_error(err_msg); + else + _algo().complete(); + _switch_state(TASAlgo::Status::DONE); +} + ChildTemplate* TASAlgo::_create_order_template ( IBeforeLaunchAlgoServices& serv, SecurityKey key, diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h index ea770df03..d43071033 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h @@ -41,6 +41,7 @@ private: api::Side) const; // acts on md, cognizant of the state void _switch_state (Status new_status); + void _cxl_and_end (bool is_error, const std::string& err_msg); }; } // namespace orderman From 1576541bd1b48ec39a9a1b7dae1f10dd22ac5370 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 16 Oct 2019 14:59:34 -0400 Subject: [PATCH 216/225] Clean up --- .../orders/algo/algo_orders/TASAlgo.cpp | 121 ++++++++---------- .../orders/algo/algo_orders/TASAlgo.h | 9 +- 2 files changed, 53 insertions(+), 77 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp index 31c1751eb..af3b274bc 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -11,7 +11,6 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" #include -#include namespace bts { namespace orderman { @@ -21,33 +20,24 @@ using namespace api::orderman; enum class TASAlgo::Status { WAITING_FOR_SIGNAL, WORKING, DONE }; struct TASLegData{ - size_t index; - SecurityKey sec_key; - double tick_size; api::Side side; //trading side Price price; Quantity quantity; ChildTemplate* order_template = nullptr; OrderKey order_key; ChildState order_state; - TASLegData (size_t index, - SecurityKey sec_key, - double tick_size, - api::Side side, - Price price, - Quantity quantity, - ChildTemplate* order_template) + TASLegData (api::Side side, + Price price, + Quantity quantity, + ChildTemplate* order_template) : - index (index), - sec_key (sec_key), - tick_size(tick_size), side (side), price(price), quantity(quantity), order_template (order_template), order_key(null_order_key()), - order_state() - { + order_state(){ + order_state.status = ChildStatus::WORKING; } }; @@ -57,9 +47,6 @@ struct TASAlgo::PImpl { SecurityKey sec_key = SecurityKey(0); TASAlgo::TASAlgoParams algo_params; std::vector legs; - api::Side side = api::Side::SIDE_BUY; - Price out_price = Price(0); - Quantity out_qty = Quantity(0); bts::datetime::PTime start_time = bts::datetime::local_now(); PImpl(){ } @@ -73,55 +60,51 @@ struct TASAlgo::PImpl { TASAlgo::TASAlgo() : me(new PImpl()) {} TASAlgo::~TASAlgo() {} -IAlgoServices& TASAlgo::_algo() const { return *me->algo_services; } - // initialization ///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { auto& def = serv.definition(); if (def.has_custom_def() && def.custom_def().has_dynamic()){ const auto& sec = serv.security(); - me->sec_key = SecurityKey(sec.id()); - me->side = def.side(); + me->sec_key = SecurityKey(sec.id()); me->algo_params = _convert_params(def.custom_def()); - double tick_size = sec.contract_spec().low_tick(); - size_t i = 0; - for (const auto& t : me->algo_params.child_orders){ - Price price = std::get<0>(t); - Quantity quantity = std::get<1>(t); - api::Side side = std::get<2>(t); - auto* ordt = _create_order_template( - serv, - SecurityKey(sec.id()), - side); - me->legs.emplace_back(i++, - me->sec_key, - tick_size, - side, - price, - quantity, - ordt); + if (me->algo_params.child_orders.size() > 0){ + for (const auto& t : me->algo_params.child_orders){ + Price price = std::get<0>(t); + Quantity quantity = std::get<1>(t); + api::Side side = std::get<2>(t); + auto* ordt = _create_order_template( + serv, + SecurityKey(sec.id()), + side); + me->legs.emplace_back(side, + price, + quantity, + ordt); + } + return {}; } } - else - return {OrderError::ORDER_ERROR_INVALID_PARAMETER, - std::string("Missing parameters")}; - return {}; + return {OrderError::ORDER_ERROR_INVALID_PARAMETER, + std::string("Parameters are not well formed")}; } void TASAlgo::do_launch(IAlgoServices& algo_services) { me->algo_services = &algo_services; _algo().subscribe_status(me->sec_key); _algo().subscribe_timer(); } -void TASAlgo::do_launch_attached(IAlgoServices&, - OrderKey, - ChildState) { - _cxl_and_end(true, "Algo can not be attached to working orders"); +void TASAlgo::do_launch_attached(IAlgoServices& algo_services, + OrderKey, + ChildState) { + me->algo_services = &algo_services; + _cxl_and_end(true, "TAS Algo can not be attached to working orders"); } // updates //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void TASAlgo::do_update(const api::orderman::Update&) { - // TODO + LOG(OrderMan, Warn, "TASAlgo::do_update order:{} state:{} update not allowed ", + _algo().order_key().value(), + static_cast(me->state)); } // callbacks ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +129,7 @@ void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ l.order_key = _algo().launch_child( *l.order_template, l.price, - l.quantity); + l.quantity); _switch_state(TASAlgo::Status::WORKING); break; case TASAlgo::Status::WORKING: @@ -159,9 +142,7 @@ void TASAlgo::on_timer(){ if (bts::datetime::msecs_since(me->start_time) > 10000) on_status(me->sec_key,co2::TradingStatus::TRADINGSTATUS_PRE_OPEN); } -IAlgoOrder::OnCancelResponse TASAlgo::on_cancel() { - return IAlgoOrder::OnCancelResponse::HONOR; -} +IAlgoServices& TASAlgo::_algo() const { return *me->algo_services; } /////////////////////////////////////////////////////////////////////////////// // stateless conversion /////////////////////////////////////////////////////// TASAlgo::TASAlgoParams TASAlgo::_convert_params ( @@ -169,21 +150,31 @@ TASAlgo::TASAlgoParams TASAlgo::_convert_params ( const DynamicOrderDefinition& def = cod.dynamic(); const auto& params = def.order_params(); TASAlgo::TASAlgoParams rv; - // top contract for (size_t i = 0; i < 1024; i++){ auto idx = std::to_string(i+1); auto price = get_if(params, "Order " + idx + " Price"); auto qty = get_if(params, "Order " + idx + " Quantity"); - auto is_buy = get_if(params, "Order " + idx + " Buy?"); - if(is_buy.has_value()){ - api::Side side = is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL; - // TODO, get it from the parent + auto is_buy = get_if(params, "Order " + idx + " Buy?"); + if(price.has_value() && qty.has_value() && qty.value() != 0){ + api::Side side = is_buy.has_value() ? + (is_buy.value() ? api::Side::SIDE_BUY : api::Side::SIDE_SELL) : + api::Side::SIDE_SELL; rv.child_orders.emplace_back(Price(price.value()), Quantity(qty.value()), side); } } return rv; } - +ChildTemplate* TASAlgo::_create_order_template ( + IBeforeLaunchAlgoServices& serv, + SecurityKey key, + api::Side side){ + OrderDefinition order_def = serv.definition(); + order_def.set_security_key (key.value()); + order_def.set_side(side); + order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( + api::orderman::LimitOrderDefinition()); + return &(serv.make_child_template(order_def)); +} void TASAlgo::_switch_state(TASAlgo::Status new_state){ switch (new_state){ case (TASAlgo::Status::WAITING_FOR_SIGNAL): @@ -207,17 +198,5 @@ void TASAlgo::_cxl_and_end (bool is_error, const std::string& err_msg){ _switch_state(TASAlgo::Status::DONE); } -ChildTemplate* TASAlgo::_create_order_template ( - IBeforeLaunchAlgoServices& serv, - SecurityKey key, - api::Side side) const{ - OrderDefinition order_def = serv.definition(); - order_def.set_security_key (key.value()); - order_def.set_side(side); - order_def.mutable_custom_def()->mutable_limit()->MergeFrom ( - api::orderman::LimitOrderDefinition()); - return &(serv.make_child_template(order_def)); -} - } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h index d43071033..739b2e864 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.h @@ -13,8 +13,6 @@ class TASAlgo : public IAlgoOrder { TASAlgo(); ~TASAlgo(); struct TASAlgoParams{ - // first one is the top - bool cxl_child_on_cxl; std::vector> child_orders; }; public: @@ -26,7 +24,6 @@ class TASAlgo : public IAlgoOrder { void on_child_change(OrderKey, ChildState const &) override; void on_status(SecurityKey, co2::TradingStatus) override; void on_timer() override; - IAlgoOrder::OnCancelResponse on_cancel() override; private: enum class Status; @@ -36,9 +33,9 @@ private: IAlgoServices& _algo() const ; static TASAlgoParams _convert_params ( const bts::api::orderman::CustomOrderDefinition&); - ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, - SecurityKey, - api::Side) const; + static ChildTemplate* _create_order_template (IBeforeLaunchAlgoServices&, + SecurityKey, + api::Side); // acts on md, cognizant of the state void _switch_state (Status new_status); void _cxl_and_end (bool is_error, const std::string& err_msg); From 3212b2fcee3656d22a656bfa23714c62eb86ef23 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 16 Oct 2019 16:38:12 -0400 Subject: [PATCH 217/225] Added logs for TAS Algo --- .../algo/algo_orders/RegisterDorman.cpp | 15 ++++++------- .../orders/algo/algo_orders/TASAlgo.cpp | 22 ++++++++++++++++++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 1dab0912a..64f295261 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -148,14 +148,13 @@ extern "C" void init_tas_plugin(bts::SparkServices& srv) { tas_desc.set_dynamic_order_type("TAS"); - *tas_desc.add_param_desc() = param_double("Order 1 Price"); - *tas_desc.add_param_desc() = param_uint32("Order 1 Quantity"); - *tas_desc.add_param_desc() = param_bool("Order 1 Buy?"); - - *tas_desc.add_param_desc() = param_double("Order 2 Price"); - *tas_desc.add_param_desc() = param_uint32("Order 2 Quantity"); - *tas_desc.add_param_desc() = param_bool("Order 2 Buy?"); - + size_t n_child_ords = 8; + for (size_t i=0; i< n_child_ords; i++){ + auto idx = std::to_string(i+1); + *tas_desc.add_param_desc() = param_double("Order " + idx + " Price"); + *tas_desc.add_param_desc() = param_uint32("Order " + idx + " Quantity"); + *tas_desc.add_param_desc() = param_bool("Order " + idx + " Buy?"); + } srv.register_dynamic_algo_order(tas_desc, []() { return std::make_unique(); }); } diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp index af3b274bc..2a87554fd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -112,6 +112,15 @@ void TASAlgo::on_book(SecurityKey, const Book&) { } void TASAlgo::on_child_change(OrderKey key, ChildState const &st){ + LOG(OrderMan, Info, + "TASAlgo::on_child_change key:{} child_key:{} state:{} status:{} " + "total_fills:{} last_price:{}", + _algo().order_key(), + key, + static_cast(me->state), + static_cast(st.status), + st.total_fills, + st.last_price); TASLegData* ld_ptr = me->find_leg_from_ord_key(key); if (ld_ptr != nullptr) ld_ptr->order_state = st; @@ -125,11 +134,18 @@ void TASAlgo::on_status(SecurityKey key, co2::TradingStatus status){ status == co2::TradingStatus::TRADINGSTATUS_PRE_OPEN){ switch (me->state){ case TASAlgo::Status::WAITING_FOR_SIGNAL: - for (auto& l : me->legs) + for (auto& l : me->legs){ l.order_key = _algo().launch_child( *l.order_template, l.price, l.quantity); + LOG(OrderMan, Info,"TASAlgo::on_status launching order key:{} " + "child_key:{} price:{} qty:{}", + _algo().order_key(), + l.order_key, + l.price, + l.quantity); + } _switch_state(TASAlgo::Status::WORKING); break; case TASAlgo::Status::WORKING: @@ -187,6 +203,10 @@ void TASAlgo::_switch_state(TASAlgo::Status new_state){ bts_assert(me->state != TASAlgo::Status::DONE); break; } + LOG(OrderMan, Info,"TASAlgo::_switch_state key:{} {}->{} ", + _algo().order_key(), + static_cast(me->state), + static_cast(new_state)); me->state = new_state; } From 62cef7c2f786265fe171ec042003704634269126 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 17 Oct 2019 09:44:53 -0400 Subject: [PATCH 218/225] release notes --- doc/user/content/release_notes/_index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index c4500a003..e581d77a0 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,12 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.12.0 +### User Visible Changes + - Added support for ICE market data and order execution +### Internal Changes + - Lots of permission / admin changes to facilitate ICE + ## 2.11.0 ### User Visible Changes - Fixed fills form time filter to also apply to SOD fills From a008f4d0fddc1f8e23aad6f497b107d2b119a1d6 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 17 Oct 2019 11:38:35 -0400 Subject: [PATCH 219/225] Hiding pyramid, ignoring timer (which was faking market status) --- src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp | 1 - src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 64f295261..29930db8b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -160,7 +160,6 @@ extern "C" void init_tas_plugin(bts::SparkServices& srv) { extern "C" void init_spark_plugin(bts::SparkServices &srv) { init_dorman_plugin(srv); - init_pyramid_plugin(srv); init_tas_plugin(srv); } diff --git a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp index 2a87554fd..f167cdca0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TASAlgo.cpp @@ -91,7 +91,7 @@ OrderOpResult TASAlgo::do_before_launch(IBeforeLaunchAlgoServices& serv) { void TASAlgo::do_launch(IAlgoServices& algo_services) { me->algo_services = &algo_services; _algo().subscribe_status(me->sec_key); - _algo().subscribe_timer(); + //_algo().subscribe_timer(); } void TASAlgo::do_launch_attached(IAlgoServices& algo_services, OrderKey, From d4749dd381dba8c3085e34c5d7ed80ec6da22504 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 17 Oct 2019 09:31:24 -0400 Subject: [PATCH 220/225] Tool to test c# api latency --- src/client/sparkcmd/Cmd/OrderStress.cs | 15 ++++++++++-- src/client/sparkcmd/Cmd/ServiceTestCommand.cs | 24 +++++++++++++++++-- .../api/services/ShellLatencyService.proto | 5 ++++ .../sparkd/support/ShellLatencyServer.cpp | 5 ++++ .../sparkd/support/ShellLatencyServer.h | 4 ++++ 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/client/sparkcmd/Cmd/OrderStress.cs b/src/client/sparkcmd/Cmd/OrderStress.cs index 643703155..1a0bd48a5 100644 --- a/src/client/sparkcmd/Cmd/OrderStress.cs +++ b/src/client/sparkcmd/Cmd/OrderStress.cs @@ -54,6 +54,7 @@ namespace bts { var result = relay.requestmd(request); foreach (var ch in result.Channels) { + // if (ch.Platform != Platform.Sim) continue; foreach (var update in ch.Updates) { if (update.Security != null) { var m = new Market() { @@ -129,6 +130,7 @@ namespace bts { } var orders = ctx.locate(); + var factor = TimeSpan.TicksPerMillisecond / 1000; foreach (var m in all_markets(ctx)) { ConsoleEx.WriteLine(m.security.security_desc(), ConsoleColor.White); var tick = m.security.ContractSpec.LowTick; @@ -136,7 +138,12 @@ namespace bts { for (var x = 0; x < o.depth; ++x) { var price = m.ask.Value.price() + (tick * x); ConsoleEx.WriteLine($"Sell {o.quantity} at {price}", ConsoleColor.Red); - orders.create_order_async(mkorder(m.security.Id, price, o.quantity, Side.Sell)); + var sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + var r = orders.create_order(mkorder(m.security.Id, price, o.quantity, Side.Sell)); + sw.Stop(); + // Log.Api.info($"Order: id {r.OrderKey} time {sw.ElapsedTicks/factor}us"); + Log.Api.info($"Order {m.security.security_desc()}: id {r.OrderKey} {r.ErrorCode} time {sw.ElapsedTicks/factor}us"); System.Threading.Thread.Sleep(o.sleep); } } @@ -145,7 +152,11 @@ namespace bts { for (var x=0; x < o.depth; ++x) { var price = m.bid.Value.price() - (tick * x); ConsoleEx.WriteLine($"Buy {o.quantity} at {price}", ConsoleColor.Blue); - orders.create_order_async(mkorder(m.security.Id, price, o.quantity, Side.Buy)); + var sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + var r = orders.create_order(mkorder(m.security.Id, price, o.quantity, Side.Buy)); + sw.Stop(); + Log.Api.info($"Order {m.security.security_desc()}: id {r.OrderKey} {r.ErrorCode} time {sw.ElapsedTicks/factor}us"); System.Threading.Thread.Sleep(o.sleep); } } diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index 52dcee6cd..87a7b5776 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -9,6 +9,7 @@ using System.Threading; namespace bts { + [Verb("servicetest", HelpText="Scratch space for testing services")] public class ServiceTestOptions { [Option(nameof(synthetic))] public bool synthetic { get; set; } @@ -16,10 +17,10 @@ namespace bts { public bool user { get; set; } [Option(nameof(admin))] public bool admin { get; set; } - + [Option(nameof(latency))] + public bool latency { get; set; } } - [Verb("servicetest", HelpText="Scratch space for testing services")] public class ServiceTest { public static int Run(ServiceTestOptions o) { if (o.synthetic) { @@ -31,6 +32,9 @@ namespace bts { if (o.admin) { admin_test(); } + if (o.latency) { + latency_test(); + } return 0; } @@ -114,5 +118,21 @@ namespace bts { Thread.Sleep(100); } } + + private static void latency_test() { + var ctx = new ServiceContext(); + var s = ctx.locate(); + + UInt64 sequence = 0; + var factor = TimeSpan.TicksPerMillisecond / 1000; + while(true) { + var sw = new System.Diagnostics.Stopwatch(); + sw.Start(); + var reply = s.ping(new metrics.BufferMessage() { Sequence = ++sequence }); + sw.Stop(); + Console.WriteLine($"{reply.Sequence} - {sw.ElapsedMilliseconds}ms -- {sw.ElapsedTicks/factor} us"); + System.Threading.Thread.Sleep(1000); + } + } } } diff --git a/src/lib/api/services/ShellLatencyService.proto b/src/lib/api/services/ShellLatencyService.proto index 272310703..8d1a253ae 100644 --- a/src/lib/api/services/ShellLatencyService.proto +++ b/src/lib/api/services/ShellLatencyService.proto @@ -15,8 +15,13 @@ message Report { string user = 3; uint64 timestamp = 10; } +message BufferMessage { + uint64 sequence = 1; + string data = 10; +} service ShellLatencyService { rpc clock(bts.api.VoidMessage) returns (stream Tick); rpc report(Report) returns (bts.api.VoidMessage); + rpc ping(BufferMessage) returns (BufferMessage); } \ No newline at end of file diff --git a/src/server/sparkd/support/ShellLatencyServer.cpp b/src/server/sparkd/support/ShellLatencyServer.cpp index eb5657b87..ba0cb791e 100644 --- a/src/server/sparkd/support/ShellLatencyServer.cpp +++ b/src/server/sparkd/support/ShellLatencyServer.cpp @@ -55,6 +55,11 @@ void ShellLatencyServer::report( } } +void ShellLatencyServer::ping( + const ::bts::metrics::BufferMessage& request, + const api::Response<::bts::metrics::BufferMessage>& reply) { + reply(request); +} }} \ No newline at end of file diff --git a/src/server/sparkd/support/ShellLatencyServer.h b/src/server/sparkd/support/ShellLatencyServer.h index 3c68833ea..d31c302b0 100644 --- a/src/server/sparkd/support/ShellLatencyServer.h +++ b/src/server/sparkd/support/ShellLatencyServer.h @@ -28,6 +28,10 @@ class ShellLatencyServer : public ShellLatencyServiceBase { void report( const ::bts::metrics::Report& request, const api::Response<::bts::api::VoidMessage>& reply) override; + + void ping( + const ::bts::metrics::BufferMessage& request, + const api::Response<::bts::metrics::BufferMessage>& reply) override; }; From 6c3bdbdc3421f45c95f6e4a69d9b5c12124d4920 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 17 Oct 2019 12:09:05 -0400 Subject: [PATCH 221/225] make sim datapaths pretty again --- src/server/sparkd/exchange_sim/ExchangeSim.cpp | 10 ++++++---- .../sparkd/exchange_sim/ExchangeSimApplication.cpp | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index 56bf3f8d5..6333786ef 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -34,8 +35,8 @@ auto cfg = "SocketReuseAddress=Y\n" "StartTime=06:02:00\n" "EndTime=06:01:00\n" - "FileLogPath=$BTS_DATA_PATH/exchange_sim/log\n" - "FileStorePath=$BTS_DATA_PATH/exchange_sim/store\n" + "FileLogPath=$BTS_DATA_PATH/exchange_sim/$SIM_VENUE/log\n" + "FileStorePath=$BTS_DATA_PATH/exchange_sim/$SIM_VENUE/store\n" "HeartBtInt=30\n" "[SESSION]\n" "BeginString=FIX.4.2\n" @@ -131,8 +132,9 @@ int start_exchange_sim(bts::api::Venue venue, md::MBOWriter* mbo) try { auto str_settings = std::string(cfg); - auto venue_string = api::Venue_Name(venue); - boost::replace_all(str_settings,"$BTS_DATA_PATH", os::bts_data_path() + "_" + venue_string); + auto venue_string = boost::to_lower_copy(api::Venue_Name(venue)); + boost::replace_all(str_settings,"$BTS_DATA_PATH", os::bts_data_path()); + boost::replace_all(str_settings,"$SIM_VENUE", venue_string); std::string port_string; switch(venue) { diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index c60b10064..0cfb2998d 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -20,6 +20,7 @@ #include "server/sparkd/exchange_sim/book/book_transform.h" #include +#include #include #include #include @@ -113,7 +114,7 @@ struct ExchangeSimApplication::PImpl { timer(utils::Dispatcher::background(), 200, [=]() { producer.heartbeat(); }), do_merge_with_md(config::get().merge_with_md()), - store(new persistence::SqliteStore("ex_sim_orders_" + api::Venue_Name(venue))), + store( new persistence::SqliteStore("ex_sim_orders_" + boost::to_lower_copy(api::Venue_Name(venue)) )), lock(), mbo(mbo) {} From f3a692bda2d4234a6a6ed97fc14999e831d2aff0 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 17 Oct 2019 13:30:11 -0400 Subject: [PATCH 222/225] Delete ex_sim_orders_venue_sim in system tests --- src/client/spark_test/Utils/SpreaderUtilities.cs | 7 ++++++- src/client/spark_test/system_test_scripts/delete_dbs.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/spark_test/Utils/SpreaderUtilities.cs b/src/client/spark_test/Utils/SpreaderUtilities.cs index 5de24e9a6..6a09b97ca 100644 --- a/src/client/spark_test/Utils/SpreaderUtilities.cs +++ b/src/client/spark_test/Utils/SpreaderUtilities.cs @@ -67,7 +67,12 @@ namespace bts.tests return (s1: sec1.Value, s2: sec2.Value); } - public static async Task<(IEnumerable book, (Security security, ExecutionStrategy strategy) synthetic)> common_setup_one(OrderService order_service, SyntheticSecurityService synthetic_service, (SecurityImmutable? s1, SecurityImmutable? s2) securities, (String name, uint id) account, (String name, uint id) user) { + public static async Task<(IEnumerable book, (Security security, ExecutionStrategy strategy) synthetic)> common_setup_one( + OrderService order_service, + SyntheticSecurityService synthetic_service, + (SecurityImmutable? s1, SecurityImmutable? s2) securities, + (String name, uint id) account, (String name, uint id) user) + { var order_defs = new (OrderDefinition order_def, double price, uint size)[10]; for (int i = 0; i < 4; i ++) { diff --git a/src/client/spark_test/system_test_scripts/delete_dbs.sh b/src/client/spark_test/system_test_scripts/delete_dbs.sh index 423cb3f23..8b1a24f1f 100644 --- a/src/client/spark_test/system_test_scripts/delete_dbs.sh +++ b/src/client/spark_test/system_test_scripts/delete_dbs.sh @@ -11,7 +11,7 @@ if [ -d "$sparkdata_dir/data" ] then [ -d $sparkdata_dir/data/databases/orders ] && rm -rf $sparkdata_dir/data/databases/orders [ -d $sparkdata_dir/data/databases/fills ] && rm -rf $sparkdata_dir/data/databases/fills - [ -d $sparkdata_dir/data/databases/ex_sim_orders ] && rm -rf $sparkdata_dir/data/databases/ex_sim_orders + [ -d $sparkdata_dir/data/databases/ex_sim_orders_venue_sim ] && rm -rf $sparkdata_dir/data/databases/ex_sim_orders_venue_sim [ -d $sparkdata_dir/data/jetfix ] && rm -rf $sparkdata_dir/data/jetfix [ -d $sparkdata_dir/data/exchange_sim ] && rm -rf $sparkdata_dir/data/exchange_sim From a5df3f2da288e97e7f28728d72069fdf1aae6de1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 17 Oct 2019 15:09:10 -0400 Subject: [PATCH 223/225] Dynamic Algos are now loaded only when explicitely enabled by name in Toggles config --- src/lib/config/protos/toggles.proto | 6 ++++++ .../orders/algo/algo_orders/RegisterDorman.cpp | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 5c3c87ee0..787cbf7e0 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -61,4 +61,10 @@ message EnsureOnScreenWithWorkAreaRect { message IgnoreNansInDayPnL { optional bool enabled = 1 [default = true]; +} + +message DynamicAlgos{ + optional bool enable_dorman = 1 [default = false]; + optional bool enable_pyramid = 2 [default = false]; + optional bool enable_tas = 3 [default = false]; } \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 29930db8b..70cecbb4b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -3,6 +3,8 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/config/protos/toggles.pb.h" +#include "lib/config/config.h" #include "DormanAlgo.h" #include "PyramidAlgo.h" #include "TASAlgo.h" @@ -159,8 +161,13 @@ extern "C" void init_tas_plugin(bts::SparkServices& srv) { } extern "C" void init_spark_plugin(bts::SparkServices &srv) { - init_dorman_plugin(srv); - init_tas_plugin(srv); + auto dyn_algo_config = config::get(); + if(dyn_algo_config.enable_dorman()) + init_dorman_plugin(srv); + if(dyn_algo_config.enable_pyramid()) + init_pyramid_plugin(srv); + if(dyn_algo_config.enable_tas()) + init_tas_plugin(srv); } }}} \ No newline at end of file From 9d2f2888bb0a6dcd02a4928980049ebd7e5f2e88 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Oct 2019 09:08:20 -0500 Subject: [PATCH 224/225] updating reference data with latest for RodrigoSGU and CNH --- .../config/defaults/cme_reference_data.conf | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index b0e734abe..8caa2375b 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -3,11 +3,10 @@ # source: tools/cpp_helper/generate-cpps.ps1 # -CppConfig -{ - value +CppConfig +{ + value { - cpp_entry { key: "098" value: 2000 } cpp_entry { key: "0A" value: 100 } cpp_entry { key: "0B" value: 100 } cpp_entry { key: "0C" value: 100 } @@ -459,9 +458,9 @@ CppConfig cpp_entry { key: "DDE" value: 1000 } cpp_entry { key: "DDI" value: 1000 } cpp_entry { key: "DDO" value: 1000 } - cpp_entry { key: "DEB" value: 720 } + cpp_entry { key: "DEB" value: 745 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 252 } + cpp_entry { key: "DEP" value: 276 } cpp_entry { key: "DFL" value: 100 } cpp_entry { key: "DFN" value: 100 } cpp_entry { key: "DG2" value: 100 } @@ -730,8 +729,8 @@ CppConfig cpp_entry { key: "IPO" value: 10 } cpp_entry { key: "IPT" value: 10 } cpp_entry { key: "IS" value: 50 } - cpp_entry { key: "ITB" value: 720 } - cpp_entry { key: "ITP" value: 252 } + cpp_entry { key: "ITB" value: 745 } + cpp_entry { key: "ITP" value: 276 } cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } @@ -809,6 +808,7 @@ CppConfig cpp_entry { key: "LIY" value: 1000 } cpp_entry { key: "LL" value: 42000 } cpp_entry { key: "LLR" value: 1000 } + cpp_entry { key: "LNG" value: 10000 } cpp_entry { key: "LPE" value: 47000 } cpp_entry { key: "LPS" value: 1000 } cpp_entry { key: "LSF" value: 1 } @@ -1146,7 +1146,7 @@ CppConfig cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1600 } + cpp_entry { key: "SDD" value: 1840 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1163,10 +1163,12 @@ CppConfig cpp_entry { key: "SFR" value: 250 } cpp_entry { key: "SG" value: 250 } cpp_entry { key: "SGB" value: 1000 } + cpp_entry { key: "SGC" value: 1000 } cpp_entry { key: "SGE" value: 42000 } cpp_entry { key: "SGF" value: 1000 } cpp_entry { key: "SGG" value: 1000 } cpp_entry { key: "SGT" value: 250 } + cpp_entry { key: "SGU" value: 32.15 } cpp_entry { key: "SI" value: 5000 } cpp_entry { key: "SIL" value: 1000 } cpp_entry { key: "SIR" value: 500 } @@ -1185,7 +1187,7 @@ CppConfig cpp_entry { key: "SR3" value: 2500 } cpp_entry { key: "SR5" value: 1000 } cpp_entry { key: "SRB" value: 1000 } - cpp_entry { key: "SRT" value: 1600 } + cpp_entry { key: "SRT" value: 1840 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1197,31 +1199,31 @@ CppConfig cpp_entry { key: "SU" value: 250 } cpp_entry { key: "SUT" value: 250 } cpp_entry { key: "T01" value: 800 } - cpp_entry { key: "T02" value: 800 } - cpp_entry { key: "T03" value: 800 } cpp_entry { key: "T04" value: 800 } + cpp_entry { key: "T05" value: 800 } + cpp_entry { key: "T06" value: 800 } cpp_entry { key: "T07" value: 800 } cpp_entry { key: "T08" value: 800 } - cpp_entry { key: "T09" value: 800 } - cpp_entry { key: "T10" value: 800 } cpp_entry { key: "T11" value: 800 } cpp_entry { key: "T12" value: 800 } cpp_entry { key: "T13" value: 800 } + cpp_entry { key: "T15" value: 800 } cpp_entry { key: "T16" value: 800 } cpp_entry { key: "T17" value: 800 } cpp_entry { key: "T18" value: 800 } - cpp_entry { key: "T19" value: 800 } cpp_entry { key: "T1U" value: 1000 } - cpp_entry { key: "T20" value: 800 } + cpp_entry { key: "T21" value: 800 } + cpp_entry { key: "T22" value: 800 } cpp_entry { key: "T23" value: 800 } cpp_entry { key: "T24" value: 800 } cpp_entry { key: "T25" value: 800 } - cpp_entry { key: "T26" value: 800 } - cpp_entry { key: "T27" value: 800 } + cpp_entry { key: "T28" value: 800 } + cpp_entry { key: "T29" value: 800 } cpp_entry { key: "T2B" value: 1000 } cpp_entry { key: "T2D" value: 1000 } cpp_entry { key: "T2M" value: 100 } cpp_entry { key: "T30" value: 800 } + cpp_entry { key: "T31" value: 800 } cpp_entry { key: "T3B" value: 1000 } cpp_entry { key: "T3L" value: 80 } cpp_entry { key: "T4B" value: 1000 } @@ -1276,7 +1278,7 @@ CppConfig cpp_entry { key: "TT" value: 50000 } cpp_entry { key: "TTD" value: 24 } cpp_entry { key: "TTE" value: 10000 } - cpp_entry { key: "TTF" value: 720 } + cpp_entry { key: "TTF" value: 745 } cpp_entry { key: "TUB" value: 1000 } cpp_entry { key: "TUF" value: 1000 } cpp_entry { key: "TUL" value: 1000 } @@ -1299,7 +1301,7 @@ CppConfig cpp_entry { key: "UFU" value: 100 } cpp_entry { key: "UFV" value: 100 } cpp_entry { key: "UGG" value: 42000 } - cpp_entry { key: "UKG" value: 300 } + cpp_entry { key: "UKG" value: 310 } cpp_entry { key: "ULB" value: 42000 } cpp_entry { key: "UMB" value: 1000 } cpp_entry { key: "UMD" value: 1000 } @@ -1457,14 +1459,13 @@ CppConfig cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } cpp_entry { key: "ZWT" value: 50 } - } -} + } +} -CmeSymbolMics -{ - value +CmeSymbolMics +{ + value { - cme_mic { key: "098" value: CBT } cme_mic { key: "0A" value: NYMEX } cme_mic { key: "0B" value: NYMEX } cme_mic { key: "0C" value: NYMEX } @@ -2230,6 +2231,7 @@ CmeSymbolMics cme_mic { key: "K5" value: CME } cme_mic { key: "K5K" value: CME } cme_mic { key: "K5N" value: CME } + cme_mic { key: "KC" value: IFU } cme_mic { key: "KE" value: CBT } cme_mic { key: "KET" value: CBT } cme_mic { key: "KQ" value: CME } @@ -2265,6 +2267,7 @@ CmeSymbolMics cme_mic { key: "LIY" value: CBT } cme_mic { key: "LL" value: NYMEX } cme_mic { key: "LLR" value: NYMEX } + cme_mic { key: "LNG" value: NYMEX } cme_mic { key: "LPE" value: NYMEX } cme_mic { key: "LPS" value: NYMEX } cme_mic { key: "LSF" value: COMEX } @@ -2459,6 +2462,7 @@ CmeSymbolMics cme_mic { key: "OAD" value: NYMEX } cme_mic { key: "ODO" value: DME } cme_mic { key: "OFF" value: NYMEX } + cme_mic { key: "OJ" value: IFU } cme_mic { key: "OML" value: NYMEX } cme_mic { key: "OMM" value: NYMEX } cme_mic { key: "OOD" value: NYMEX } @@ -2618,10 +2622,12 @@ CmeSymbolMics cme_mic { key: "SFR" value: CME } cme_mic { key: "SG" value: CME } cme_mic { key: "SGB" value: NYMEX } + cme_mic { key: "SGC" value: COMEX } cme_mic { key: "SGE" value: NYMEX } cme_mic { key: "SGF" value: NYMEX } cme_mic { key: "SGG" value: NYMEX } cme_mic { key: "SGT" value: CME } + cme_mic { key: "SGU" value: COMEX } cme_mic { key: "SI" value: COMEX } cme_mic { key: "SIL" value: COMEX } cme_mic { key: "SIR" value: CME } @@ -2652,31 +2658,31 @@ CmeSymbolMics cme_mic { key: "SU" value: CME } cme_mic { key: "SUT" value: CME } cme_mic { key: "T01" value: NYMEX } - cme_mic { key: "T02" value: NYMEX } - cme_mic { key: "T03" value: NYMEX } cme_mic { key: "T04" value: NYMEX } + cme_mic { key: "T05" value: NYMEX } + cme_mic { key: "T06" value: NYMEX } cme_mic { key: "T07" value: NYMEX } cme_mic { key: "T08" value: NYMEX } - cme_mic { key: "T09" value: NYMEX } - cme_mic { key: "T10" value: NYMEX } cme_mic { key: "T11" value: NYMEX } cme_mic { key: "T12" value: NYMEX } cme_mic { key: "T13" value: NYMEX } + cme_mic { key: "T15" value: NYMEX } cme_mic { key: "T16" value: NYMEX } cme_mic { key: "T17" value: NYMEX } cme_mic { key: "T18" value: NYMEX } - cme_mic { key: "T19" value: NYMEX } cme_mic { key: "T1U" value: CBT } - cme_mic { key: "T20" value: NYMEX } + cme_mic { key: "T21" value: NYMEX } + cme_mic { key: "T22" value: NYMEX } cme_mic { key: "T23" value: NYMEX } cme_mic { key: "T24" value: NYMEX } cme_mic { key: "T25" value: NYMEX } - cme_mic { key: "T26" value: NYMEX } - cme_mic { key: "T27" value: NYMEX } + cme_mic { key: "T28" value: NYMEX } + cme_mic { key: "T29" value: NYMEX } cme_mic { key: "T2B" value: NYMEX } cme_mic { key: "T2D" value: NYMEX } cme_mic { key: "T2M" value: NYMEX } cme_mic { key: "T30" value: NYMEX } + cme_mic { key: "T31" value: NYMEX } cme_mic { key: "T3B" value: NYMEX } cme_mic { key: "T3L" value: NYMEX } cme_mic { key: "T4B" value: NYMEX } @@ -2912,5 +2918,5 @@ CmeSymbolMics cme_mic { key: "ZT" value: CBT } cme_mic { key: "ZW" value: CBT } cme_mic { key: "ZWT" value: CBT } - } + } } From 1b1583abda65d539d3791042516b5b081ba4b418 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Oct 2019 09:24:28 -0500 Subject: [PATCH 225/225] removing OJ and KC IFU entries; regen cme ref data file --- src/lib/config/defaults/cme_reference_data.conf | 4 ---- tools/cpp_helper/ics_spreads.csv | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/lib/config/defaults/cme_reference_data.conf b/src/lib/config/defaults/cme_reference_data.conf index 8caa2375b..ae2a5d4d7 100644 --- a/src/lib/config/defaults/cme_reference_data.conf +++ b/src/lib/config/defaults/cme_reference_data.conf @@ -772,7 +772,6 @@ CppConfig cpp_entry { key: "K5" value: 20 } cpp_entry { key: "K5K" value: 20 } cpp_entry { key: "K5N" value: 20 } - cpp_entry { key: "KC" value: 375 } cpp_entry { key: "KE" value: 50 } cpp_entry { key: "KET" value: 50 } cpp_entry { key: "KQ" value: 20 } @@ -1003,7 +1002,6 @@ CppConfig cpp_entry { key: "OAD" value: 1 } cpp_entry { key: "ODO" value: 1000 } cpp_entry { key: "OFF" value: 5 } - cpp_entry { key: "OJ" value: 150 } cpp_entry { key: "OML" value: 5 } cpp_entry { key: "OMM" value: 80 } cpp_entry { key: "OOD" value: 5 } @@ -2231,7 +2229,6 @@ CmeSymbolMics cme_mic { key: "K5" value: CME } cme_mic { key: "K5K" value: CME } cme_mic { key: "K5N" value: CME } - cme_mic { key: "KC" value: IFU } cme_mic { key: "KE" value: CBT } cme_mic { key: "KET" value: CBT } cme_mic { key: "KQ" value: CME } @@ -2462,7 +2459,6 @@ CmeSymbolMics cme_mic { key: "OAD" value: NYMEX } cme_mic { key: "ODO" value: DME } cme_mic { key: "OFF" value: NYMEX } - cme_mic { key: "OJ" value: IFU } cme_mic { key: "OML" value: NYMEX } cme_mic { key: "OMM" value: NYMEX } cme_mic { key: "OOD" value: NYMEX } diff --git a/tools/cpp_helper/ics_spreads.csv b/tools/cpp_helper/ics_spreads.csv index 266475fd4..26265d4fb 100644 --- a/tools/cpp_helper/ics_spreads.csv +++ b/tools/cpp_helper/ics_spreads.csv @@ -29,5 +29,3 @@ Sym,Mult,Exch "BUB",1000,CBT "FNU",1000,CBT "SOM",500,CBT -"OJ",150,IFU -"KC",375,IFU