From 33eaf6f86d95cb0c3a5da9b60671ce822dd37442 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 26 Mar 2019 18:38:05 -0400 Subject: [PATCH 001/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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/252] 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 fe647044f80daaef6ba735c1e30db1ac3612e820 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 9 Sep 2019 15:03:52 -0400 Subject: [PATCH 087/252] 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 088/252] 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 089/252] 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 c78e6e83152012b2cfe48af44d89431c557b20f3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 10:43:19 -0400 Subject: [PATCH 090/252] 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 091/252] 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 bf8323e79ba8342cbab092c79790bc217d081bc5 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 16 Sep 2019 15:53:50 -0400 Subject: [PATCH 092/252] 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 093/252] 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 094/252] 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 0156bbfc468064aa977093d3764b4f88b4814c7f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 17 Sep 2019 15:06:04 -0400 Subject: [PATCH 095/252] 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 096/252] 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 097/252] 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 098/252] 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 099/252] 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 100/252] 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 101/252] 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 102/252] 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 cf977befd10c00b2b18a0fa02bb128177652217f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 18 Sep 2019 17:22:09 -0400 Subject: [PATCH 103/252] 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 48b62f1cab0684a4950211f3142858b985c757f1 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 19 Sep 2019 13:40:01 -0400 Subject: [PATCH 104/252] 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 105/252] 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 f7184b09499ca6210071c7fa55a323fea5a63baf Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 20 Sep 2019 09:13:01 -0500 Subject: [PATCH 106/252] 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 107/252] 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 108/252] 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 109/252] 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 6b5b517d70626bcf44daab3edbfe5dd5e05c0574 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 12:29:38 -0400 Subject: [PATCH 110/252] 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 8fdab4a510942eec2ddbb02fb49bd126326158c8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 12:47:48 -0400 Subject: [PATCH 111/252] 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 34e7d6a61759ad805a508907b3c90a05b3d4d4fd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 23 Sep 2019 13:57:43 -0400 Subject: [PATCH 112/252] 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 113/252] 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 114/252] 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 5eeb5a534ce15f433fe72fdeebec8dbe7f7543be Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 24 Sep 2019 13:12:16 -0400 Subject: [PATCH 115/252] 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 963a4207e270a6812235c2160cbb183cfc3b8e97 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 26 Sep 2019 19:00:15 -0400 Subject: [PATCH 116/252] 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 58906eb3b64988919aa74974b565e75854023442 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 30 Sep 2019 16:55:35 -0400 Subject: [PATCH 117/252] 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 118/252] 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 119/252] 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 120/252] 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 121/252] [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 122/252] 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 123/252] 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 124/252] 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 125/252] 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 126/252] 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 127/252] 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 128/252] 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 129/252] 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 130/252] 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 131/252] 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 132/252] 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 133/252] 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 562b9419bdd3161859c0a12e04a21f1472f6eee8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 4 Oct 2019 17:32:03 -0400 Subject: [PATCH 134/252] 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 100316b79161d71891ea9ebf814597aeac74d5d2 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 8 Oct 2019 11:06:41 -0400 Subject: [PATCH 135/252] 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 136/252] 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 137/252] 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 c9387a92be6537ebbd38feec5a8fa8575748f368 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 7 Oct 2019 17:22:59 -0400 Subject: [PATCH 138/252] Add docs/api --- doc/api/.gitignore | 1 + doc/api/config.toml | 15 + doc/api/content/_index.md | 5 + doc/api/content/algo/_index.md | 7 + doc/api/content/algo/setup/_index.md | 7 + doc/api/content/algo/setup/installing.md | 3 + doc/api/content/client/_index.md | 5 + doc/api/content/client/index.md | 5 + doc/api/deploy_to_web.sh | 15 + doc/api/sass/_base.scss | 93 ++++ doc/api/sass/_docs.scss | 96 ++++ doc/api/sass/_header.scss | 33 ++ doc/api/sass/_index.scss | 58 +++ doc/api/sass/_layout.scss | 29 ++ doc/api/sass/_normalize.scss | 447 ++++++++++++++++++ doc/api/sass/_search.scss | 47 ++ doc/api/sass/_themes.scss | 79 ++++ doc/api/sass/site.scss | 19 + doc/api/static/favicon.ico | Bin 0 -> 1150 bytes doc/api/static/search.js | 180 +++++++ doc/api/templates/documentation.html | 31 ++ doc/api/templates/index.html | 78 +++ doc/api/templates/page.html | 7 + doc/api/templates/shortcodes/gallery.html | 7 + .../templates/shortcodes/resize_image.html | 1 + 25 files changed, 1268 insertions(+) create mode 100644 doc/api/.gitignore create mode 100644 doc/api/config.toml create mode 100644 doc/api/content/_index.md create mode 100644 doc/api/content/algo/_index.md create mode 100644 doc/api/content/algo/setup/_index.md create mode 100644 doc/api/content/algo/setup/installing.md create mode 100644 doc/api/content/client/_index.md create mode 100644 doc/api/content/client/index.md create mode 100644 doc/api/deploy_to_web.sh create mode 100644 doc/api/sass/_base.scss create mode 100644 doc/api/sass/_docs.scss create mode 100644 doc/api/sass/_header.scss create mode 100644 doc/api/sass/_index.scss create mode 100644 doc/api/sass/_layout.scss create mode 100644 doc/api/sass/_normalize.scss create mode 100644 doc/api/sass/_search.scss create mode 100644 doc/api/sass/_themes.scss create mode 100644 doc/api/sass/site.scss create mode 100644 doc/api/static/favicon.ico create mode 100644 doc/api/static/search.js create mode 100644 doc/api/templates/documentation.html create mode 100644 doc/api/templates/index.html create mode 100644 doc/api/templates/page.html create mode 100644 doc/api/templates/shortcodes/gallery.html create mode 100644 doc/api/templates/shortcodes/resize_image.html diff --git a/doc/api/.gitignore b/doc/api/.gitignore new file mode 100644 index 000000000..ab5e793bc --- /dev/null +++ b/doc/api/.gitignore @@ -0,0 +1 @@ +public diff --git a/doc/api/config.toml b/doc/api/config.toml new file mode 100644 index 000000000..7c49216a4 --- /dev/null +++ b/doc/api/config.toml @@ -0,0 +1,15 @@ +# The URL the site will be built for +base_url = "https://api.bluetradesys.com" + +title = "BTS Spark API" +description = "Documentation for the BTS Spark API" + +compile_sass = true + +highlight_code = true +highlight_theme = "kronuz" +insert_anchor_links = true +build_search_index = true + +[extra] +author = "Blue Trading Systems" diff --git a/doc/api/content/_index.md b/doc/api/content/_index.md new file mode 100644 index 000000000..2af9c9fad --- /dev/null +++ b/doc/api/content/_index.md @@ -0,0 +1,5 @@ ++++ +title = "BTS Spark API" ++++ + +This is index \ No newline at end of file diff --git a/doc/api/content/algo/_index.md b/doc/api/content/algo/_index.md new file mode 100644 index 000000000..0a8d64dff --- /dev/null +++ b/doc/api/content/algo/_index.md @@ -0,0 +1,7 @@ ++++ +title="Algo API" +template="documentation.html" +redirect_to = "algo/installing/" ++++ + +Setup diff --git a/doc/api/content/algo/setup/_index.md b/doc/api/content/algo/setup/_index.md new file mode 100644 index 000000000..0a8d64dff --- /dev/null +++ b/doc/api/content/algo/setup/_index.md @@ -0,0 +1,7 @@ ++++ +title="Algo API" +template="documentation.html" +redirect_to = "algo/installing/" ++++ + +Setup diff --git a/doc/api/content/algo/setup/installing.md b/doc/api/content/algo/setup/installing.md new file mode 100644 index 000000000..a71824be3 --- /dev/null +++ b/doc/api/content/algo/setup/installing.md @@ -0,0 +1,3 @@ ++++ +title = "Installing" ++++ \ No newline at end of file diff --git a/doc/api/content/client/_index.md b/doc/api/content/client/_index.md new file mode 100644 index 000000000..22412f7c0 --- /dev/null +++ b/doc/api/content/client/_index.md @@ -0,0 +1,5 @@ ++++ +title="BTS Client API" ++++ + +Coming soon... diff --git a/doc/api/content/client/index.md b/doc/api/content/client/index.md new file mode 100644 index 000000000..c44f64999 --- /dev/null +++ b/doc/api/content/client/index.md @@ -0,0 +1,5 @@ ++++ +title="BTS Client API" ++++ + +Client API diff --git a/doc/api/deploy_to_web.sh b/doc/api/deploy_to_web.sh new file mode 100644 index 000000000..be529c3e2 --- /dev/null +++ b/doc/api/deploy_to_web.sh @@ -0,0 +1,15 @@ +#/bin/bash +#python -m mkdocs build -d site + +zola build + +scp -r ./public bts@bluetradesys.com:/home/bts/doc/ + +ssh bts@bluetradesys.com << EOF +cd doc +sudo rm -r /var/www/api/* +sudo mv ./public/* /var/www/api/ + +EOF + +rm -r public diff --git a/doc/api/sass/_base.scss b/doc/api/sass/_base.scss new file mode 100644 index 000000000..4805659a9 --- /dev/null +++ b/doc/api/sass/_base.scss @@ -0,0 +1,93 @@ +html, body { + font-size: 16px; + height: 100%; +} + +body { + font-family: "Source Sans Pro", "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; + line-height: 1.6; + // from http://www.heropatterns.com + background-color: #0072a2; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='100' viewBox='0 0 100 100'%3E%3Cg fill-rule='evenodd'%3E%3Cg fill='%234b4b4b' fill-opacity='0.4'%3E%3Cpath opacity='.5' d='M96 95h4v1h-4v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4h-9v4h-1v-4H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15v-9H0v-1h15V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h9V0h1v15h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9h4v1h-4v9zm-1 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm9-10v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-10 0v-9h-9v9h9zm-9-10h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9zm10 0h9v-9h-9v9z'/%3E%3Cpath d='M6 5V0H5v5H0v1h5v94h1V6h94V5H6z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + + color: $foreground; + + // for sticky footer + display: flex; + flex-direction: column; + min-height: 100vh; +} + +a { + color: $link-color; + text-decoration: none; + cursor: pointer; + border-bottom: 1px solid rgba(0, 124, 188, 0.25); + + &:hover { + border-bottom: 1px solid $link-color; + } + + &:visited { + color: $link-color; + } + + // totally taken from stripe + &.button { + outline: none; + white-space: nowrap; + display: inline-block; + height: 40px; + line-height: 40px; + padding: 0 14px; + box-shadow: 0 4px 6px rgba(50, 50, 93, 0.11), 0 1px 3px rgba(0, 0, 0, 0.08); + background: #fff; + border-radius: 4px; + font-size: 15px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: .025em; + color: #191919; + text-decoration: none; + transition: all .15s ease; + border-bottom: none; + + &:hover { + transform: translateY(-1px); + text-decoration: none; + box-shadow: 0 7px 14px rgba(50, 50, 93, 0.1), 0 3px 6px rgba(0, 0, 0, 0.08); + } + + &:active { + background-color: #f6f9fc; + transform: translateY(1px); + } + } + + &.white { + color: white; + border-bottom-color: rgba(255, 255, 255, 0.25); + + &:hover { + border-bottom-color: white; + } + + &:visited { + color: white; + } + } +} + +pre { + padding: 1rem; + overflow: auto; +} + +p code, li code { + background-color: #f5f5f5; + white-space: pre-wrap; + padding: 5px; + border-radius: 5px; + font-size: 0.85rem; + box-shadow: 0 1px 3px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1), 0 2px 1px -1px rgba(0,0,0,.12); +} diff --git a/doc/api/sass/_docs.scss b/doc/api/sass/_docs.scss new file mode 100644 index 000000000..02478b5a6 --- /dev/null +++ b/doc/api/sass/_docs.scss @@ -0,0 +1,96 @@ +.documentation { + padding: 3rem; + display: flex; + + &__sidebar { + margin-right: 2rem; + + ul { + padding-left: 0; + list-style: none; + } + + > ul { + > li { + margin-bottom: 1rem; + } + + .documentation__sidebar__title { + font-size: 1.25rem; + font-weight: bold; + } + + ul { + margin-top: 0.25rem; + + li { + border-left: 1px solid $background; + padding-left: 0.75rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + } + + li.active a { + font-weight: bold; + border-bottom: 1px solid $link-color; + } + } + } + + } + + &__content { + width: 60%; + // Same as the anchor absolute left to not overlap + margin-left: 2rem; + + h1, h2, h3, h4, h5, h6 { + .zola-anchor { + font-size: 1.25rem; + visibility: hidden; + margin-left: -2rem; + text-decoration: none; + border-bottom-color: transparent; + cursor: pointer; + } + + &:hover { + .zola-anchor { + visibility: visible; + } + } + } + + blockquote { + border-left: 10px solid black; + padding: 0.25rem 0.5rem; + margin-left: 0; + font-style: italic; + } + } + + iframe { + width: 100%; + min-height: 400px; + } +} + + +@media only screen and (max-width: 1000px) { + .documentation { + flex-direction: column; + padding: 2rem; + + &__content { + width: 100%; + margin-left: 0; + } + + &__sidebar { + border-top: 1px solid $background; + order: 1; + margin-right: 0; + margin-top: 1rem; + } + } +} diff --git a/doc/api/sass/_header.scss b/doc/api/sass/_header.scss new file mode 100644 index 000000000..699e025aa --- /dev/null +++ b/doc/api/sass/_header.scss @@ -0,0 +1,33 @@ +header { + .header__logo { + border-bottom: none; + } + + nav a { + margin-right: 2rem; + } + + .header__logo { + font-size: 2rem; + font-weight: bold; + + &:hover { + text-decoration: none; + } + } +} + +@media only screen and (max-width: 1000px) { + header { + padding: 1rem 0; + + nav { + text-align: center; + } + + .header__logo { + // to force menu links to be on a line below + display: block; + } + } +} diff --git a/doc/api/sass/_index.scss b/doc/api/sass/_index.scss new file mode 100644 index 000000000..bab799f2f --- /dev/null +++ b/doc/api/sass/_index.scss @@ -0,0 +1,58 @@ +.inverted-colours { + background: $foreground; + color: $background; +} + +.hero { + width: 60%; + margin: 0 auto; + margin-top: 3rem; + margin-bottom: 6rem; + text-align: center; + + &__tagline { + margin-bottom: 2rem; + } +} + +.disabled { + opacity: 0.5; +} + +.selling-points { + padding: 3rem; + + &__content { + display: flex; + flex-wrap: wrap; + } +} + +.selling-point { + // 2 selling points per row on desktop + width: 50%; + padding: 2rem; + padding-top: 1rem; +} + +// and 1 on mobile +@media only screen and (max-width: 1000px) { + .hero { + width: 90%; + margin-top: 2rem; + margin-bottom: 4rem; + } + + .selling-points { + padding: 2rem; + } + + .selling-point { + width: 100%; + padding: 1rem; + + h2 { + text-align: center; + } + } +} diff --git a/doc/api/sass/_layout.scss b/doc/api/sass/_layout.scss new file mode 100644 index 000000000..c917f7fe3 --- /dev/null +++ b/doc/api/sass/_layout.scss @@ -0,0 +1,29 @@ +header { + padding: 2rem 3rem; +} + +.container { + max-width: 1000px; + margin: 0 auto; +} + +@media only screen and (max-width: 1000px) { + .container { + max-width: 90%; + } +} + +.content { + flex-grow: 1; + + &--reversed { + background: $foreground; + color: $background; + } +} + + +footer { + text-align: center; + padding: 2rem 3rem; +} diff --git a/doc/api/sass/_normalize.scss b/doc/api/sass/_normalize.scss new file mode 100644 index 000000000..fa4e73dd4 --- /dev/null +++ b/doc/api/sass/_normalize.scss @@ -0,0 +1,447 @@ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} diff --git a/doc/api/sass/_search.scss b/doc/api/sass/_search.scss new file mode 100644 index 000000000..f1ffb70e8 --- /dev/null +++ b/doc/api/sass/_search.scss @@ -0,0 +1,47 @@ +.search-container { + display: inline-block; + position: relative; + width: 300px; + + input { + width: 100%; + padding: 0.5rem; + } +} + +.search-results { + display: none; + position: absolute; + background: white; + color: black; + padding: 1rem; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.5); + max-height: 500px; + overflow: auto; + width: 150%; + right: 0; + + &__items { + list-style: none; + } + + li { + margin-top: 1rem; + border-bottom: 1px solid #ccc; + font-size: 0.9rem; + + &:first-of-type { + margin-top: 0; + } + } + + &__item { + margin-bottom: 1rem; + + a { + font-size: 1.2rem; + display: inline-block; + margin-bottom: 0.5rem; + } + } +} diff --git a/doc/api/sass/_themes.scss b/doc/api/sass/_themes.scss new file mode 100644 index 000000000..dc495e678 --- /dev/null +++ b/doc/api/sass/_themes.scss @@ -0,0 +1,79 @@ + +.themes-container { + padding: 3rem; + width: 80%; + margin: 0 auto; + + img { + max-width: 100%; + } +} + +@media only screen and (max-width: 1000px) { + .themes-container { + width: 100%; + margin: 0 1rem; + } +} + +.themes { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .theme { + width: 45%; + text-decoration: none; + cursor: pointer; + margin-bottom: 2rem; + border-bottom: none; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); + padding: 10px; + + img { + width: 100%; + height: 90%; + } + + span { + display: block; + text-align: center; + font-size: 1.1rem; + } + } +} + +.theme-info { + display: flex; + align-items: flex-start; + + .thumb { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07); + width: 400px; + margin-right: 2rem; + } + + h1, p { + margin: 0; + } + + padding: 1rem; +} + + +@media only screen and (max-width: 1000px) { + .themes .theme { + width: 100%; + } +} + +@media only screen and (max-width: 1000px) { + .theme-info { + flex-direction: column; + align-items: center; + + img { + margin-bottom: 1rem; + } + } +} diff --git a/doc/api/sass/site.scss b/doc/api/sass/site.scss new file mode 100644 index 000000000..a9e5129ce --- /dev/null +++ b/doc/api/sass/site.scss @@ -0,0 +1,19 @@ +@charset "utf-8"; + +@import "normalize"; + +*, *:before, *:after { + box-sizing: border-box; +} + +$background: #191919; +$foreground: white; +$link-color: #007CBC; + +@import "base"; +@import "layout"; +@import "header"; +@import "index"; +@import "docs"; +@import "themes"; +@import "search"; diff --git a/doc/api/static/favicon.ico b/doc/api/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..72ee404ee580a2eecc49c118b191352cd8c806f7 GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$A1^@s5XBfo;8wUGZ8TRdOXE+ST ztqj`^bun0j;^aU(gXw`bhE@<;+tO0V(8S^Z3>z6+Ox4zQ-~p>^W4O4tg+U&Kfo5a? z&6^Jr-`C3E4Aj3A#74&kCYCdSW_g0d_qQ=z0IKT+(mR0o`rbB%OlX`mY~oVF(1{c7};SH}vdjXK(?!zY^${T_Ew=WEoYUeb@Aj%^eL)EF3@> z=6<012|#sVe6Wq7`Cto!?15IWUbr|=UdPbX(iy0)9)@+y&Bf9EHOj|~Yy4rt08AU0 ZxIK}9VRtP91Bl+7&%n@TkEsTv4*. +function makeTeaser(body, terms) { + var TERM_WEIGHT = 40; + var NORMAL_WORD_WEIGHT = 2; + var FIRST_WORD_WEIGHT = 8; + var TEASER_MAX_WORDS = 30; + + var stemmedTerms = terms.map(function (w) { + return elasticlunr.stemmer(w.toLowerCase()); + }); + var termFound = false; + var index = 0; + var weighted = []; // contains elements of ["word", weight, index_in_document] + + // split in sentences, then words + var sentences = body.toLowerCase().split(". "); + + for (var i in sentences) { + var words = sentences[i].split(" "); + var value = FIRST_WORD_WEIGHT; + + for (var j in words) { + var word = words[j]; + + if (word.length > 0) { + for (var k in stemmedTerms) { + if (elasticlunr.stemmer(word).startsWith(stemmedTerms[k])) { + value = TERM_WEIGHT; + termFound = true; + } + } + weighted.push([word, value, index]); + value = NORMAL_WORD_WEIGHT; + } + + index += word.length; + index += 1; // ' ' or '.' if last word in sentence + } + + index += 1; // because we split at a two-char boundary '. ' + } + + if (weighted.length === 0) { + return body; + } + + var windowWeights = []; + var windowSize = Math.min(weighted.length, TEASER_MAX_WORDS); + // We add a window with all the weights first + var curSum = 0; + for (var i = 0; i < windowSize; i++) { + curSum += weighted[i][1]; + } + windowWeights.push(curSum); + + for (var i = 0; i < weighted.length - windowSize; i++) { + curSum -= weighted[i][1]; + curSum += weighted[i + windowSize][1]; + windowWeights.push(curSum); + } + + // If we didn't find the term, just pick the first window + var maxSumIndex = 0; + if (termFound) { + var maxFound = 0; + // backwards + for (var i = windowWeights.length - 1; i >= 0; i--) { + if (windowWeights[i] > maxFound) { + maxFound = windowWeights[i]; + maxSumIndex = i; + } + } + } + + var teaser = []; + var startIndex = weighted[maxSumIndex][2]; + for (var i = maxSumIndex; i < maxSumIndex + windowSize; i++) { + var word = weighted[i]; + if (startIndex < word[2]) { + // missing text from index to start of `word` + teaser.push(body.substring(startIndex, word[2])); + startIndex = word[2]; + } + + // add around search terms + if (word[1] === TERM_WEIGHT) { + teaser.push(""); + } + startIndex = word[2] + word[0].length; + teaser.push(body.substring(word[2], startIndex)); + + if (word[1] === TERM_WEIGHT) { + teaser.push(""); + } + } + teaser.push("…"); + return teaser.join(""); +} + +function formatSearchResultItem(item, terms) { + return '
' + + `${item.doc.title}` + + `
${makeTeaser(item.doc.body, terms)}
` + + '
'; +} + +function initSearch() { + var $searchInput = document.getElementById("search"); + var $searchResults = document.querySelector(".search-results"); + var $searchResultsItems = document.querySelector(".search-results__items"); + var MAX_ITEMS = 10; + + var options = { + bool: "AND", + fields: { + title: {boost: 2}, + body: {boost: 1}, + } + }; + var currentTerm = ""; + var index = elasticlunr.Index.load(window.searchIndex); + + $searchInput.addEventListener("keyup", debounce(function() { + var term = $searchInput.value.trim(); + if (term === currentTerm || !index) { + return; + } + $searchResults.style.display = term === "" ? "none" : "block"; + $searchResultsItems.innerHTML = ""; + if (term === "") { + return; + } + + var results = index.search(term, options); + if (results.length === 0) { + $searchResults.style.display = "none"; + return; + } + + currentTerm = term; + for (var i = 0; i < Math.min(results.length, MAX_ITEMS); i++) { + var item = document.createElement("li"); + item.innerHTML = formatSearchResultItem(results[i], term.split(" ")); + $searchResultsItems.appendChild(item); + } + }, 150)); +} + + +if (document.readyState === "complete" || + (document.readyState !== "loading" && !document.documentElement.doScroll) +) { + initSearch(); +} else { + document.addEventListener("DOMContentLoaded", initSearch); +} diff --git a/doc/api/templates/documentation.html b/doc/api/templates/documentation.html new file mode 100644 index 000000000..b3adc4df2 --- /dev/null +++ b/doc/api/templates/documentation.html @@ -0,0 +1,31 @@ +{% extends "index.html" %} + +{% block extra_nav_class %}{% endblock extra_nav_class %} +{% block extra_content_class %}content--reversed{% endblock extra_content_class %} + +{% block content %} +{% set section = get_section(path="algo/_index.md") %} +
+ +
+ {% block doc_content %} + {% endblock doc_content %} +
+
+{% endblock content %} diff --git a/doc/api/templates/index.html b/doc/api/templates/index.html new file mode 100644 index 000000000..84253e96b --- /dev/null +++ b/doc/api/templates/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + {% block title %}{{ config.title }}{% endblock title %} + + + + + +
+ +
+ +
+ {% block content %} +
+

Spark SDK

+

+ Spark offers both an ultra-low latency programmable trading engine and a flexible client API +

+
+ +
+
+
+

Algo API

+

+ The Spark voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at. +

+ Get started +
+ +
+

Client API

+

+ Coming soon... + Dolorem voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at. +

+ Get started +
+
+
+ + {% endblock content %} +
+
+ © Blue Trading Systems +
+ + + + + + diff --git a/doc/api/templates/page.html b/doc/api/templates/page.html new file mode 100644 index 000000000..8f6c09b87 --- /dev/null +++ b/doc/api/templates/page.html @@ -0,0 +1,7 @@ +{% extends "documentation.html" %} + +{% block title %}{{ page.title }} | {{ super() }} {% endblock title %} +{% block doc_content %} +

{{page.title}}

+ {{page.content | safe}} +{% endblock doc_content %} diff --git a/doc/api/templates/shortcodes/gallery.html b/doc/api/templates/shortcodes/gallery.html new file mode 100644 index 000000000..91a75f48a --- /dev/null +++ b/doc/api/templates/shortcodes/gallery.html @@ -0,0 +1,7 @@ +{% for asset in page.assets -%} + {%- if asset is matching("[.](jpg|png)$") -%} + + + + {%- endif %} +{%- endfor %} diff --git a/doc/api/templates/shortcodes/resize_image.html b/doc/api/templates/shortcodes/resize_image.html new file mode 100644 index 000000000..f33bc3b5f --- /dev/null +++ b/doc/api/templates/shortcodes/resize_image.html @@ -0,0 +1 @@ + From 28779d333c666eb9e7fcfdaee09598d2e12b3b27 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 8 Oct 2019 16:53:40 -0400 Subject: [PATCH 139/252] api docs "landing page" --- doc/api/templates/index.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/api/templates/index.html b/doc/api/templates/index.html index 84253e96b..3501836d4 100644 --- a/doc/api/templates/index.html +++ b/doc/api/templates/index.html @@ -13,6 +13,7 @@ {% block title %}{{ config.title }}{% endblock title %} + @@ -47,7 +48,10 @@
-

Algo API

+

+ Algo API + +

The Spark voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at.

@@ -55,12 +59,15 @@
-

Client API

+

+ Client API + +

Coming soon... Dolorem voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at.

- Get started + Get started
From 1ebd0be57c96bcd46f6ce2b7c006d02b3e3dd594 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 8 Oct 2019 17:24:01 -0400 Subject: [PATCH 140/252] api docs outline --- doc/api/content/algo/_index.md | 22 +++++++++++++++++-- .../content/algo/getting-started/_index.md | 7 ++++++ .../algo/getting-started/development.md | 6 +++++ .../content/algo/getting-started/download.md | 10 +++++++++ .../content/algo/getting-started/install.md | 10 +++++++++ .../content/algo/getting-started/testing.md | 6 +++++ doc/api/content/algo/ref/_index.md | 7 ++++++ doc/api/content/algo/ref/attaching.md | 6 +++++ doc/api/content/algo/ref/detaching.md | 6 +++++ doc/api/content/algo/ref/orders.md | 7 ++++++ doc/api/content/algo/ref/subscriptions.md | 6 +++++ doc/api/content/algo/samples/_index.md | 7 ++++++ doc/api/content/algo/samples/iceberg.md | 7 ++++++ doc/api/content/algo/setup/_index.md | 7 ------ doc/api/content/algo/setup/installing.md | 3 --- doc/api/content/client/index.md | 3 ++- 16 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 doc/api/content/algo/getting-started/_index.md create mode 100644 doc/api/content/algo/getting-started/development.md create mode 100644 doc/api/content/algo/getting-started/download.md create mode 100644 doc/api/content/algo/getting-started/install.md create mode 100644 doc/api/content/algo/getting-started/testing.md create mode 100644 doc/api/content/algo/ref/_index.md create mode 100644 doc/api/content/algo/ref/attaching.md create mode 100644 doc/api/content/algo/ref/detaching.md create mode 100644 doc/api/content/algo/ref/orders.md create mode 100644 doc/api/content/algo/ref/subscriptions.md create mode 100644 doc/api/content/algo/samples/_index.md create mode 100644 doc/api/content/algo/samples/iceberg.md delete mode 100644 doc/api/content/algo/setup/_index.md delete mode 100644 doc/api/content/algo/setup/installing.md diff --git a/doc/api/content/algo/_index.md b/doc/api/content/algo/_index.md index 0a8d64dff..06f8f2119 100644 --- a/doc/api/content/algo/_index.md +++ b/doc/api/content/algo/_index.md @@ -1,7 +1,25 @@ +++ title="Algo API" template="documentation.html" -redirect_to = "algo/installing/" +redirect_to = "algo/getting-started/install/" +sort_by="weight" +++ -Setup +Getting Started +- Install (docker, editor) +- Downloading +- Write your first algo +- Testing + +Reference +- Subscriptions +- Child Orders +- Detaching +- Attaching +- ... + +Samples +- Iceberg +- Pro-rata + + diff --git a/doc/api/content/algo/getting-started/_index.md b/doc/api/content/algo/getting-started/_index.md new file mode 100644 index 000000000..d0e0e72e1 --- /dev/null +++ b/doc/api/content/algo/getting-started/_index.md @@ -0,0 +1,7 @@ ++++ +title="Getting Started" +template="documentation.html" +sort_by="weight" +weight = 1 ++++ + diff --git a/doc/api/content/algo/getting-started/development.md b/doc/api/content/algo/getting-started/development.md new file mode 100644 index 000000000..e75ef5176 --- /dev/null +++ b/doc/api/content/algo/getting-started/development.md @@ -0,0 +1,6 @@ ++++ +title = "Development" +weight = 3 ++++ + +todo: write some code \ No newline at end of file diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md new file mode 100644 index 000000000..dc385af80 --- /dev/null +++ b/doc/api/content/algo/getting-started/download.md @@ -0,0 +1,10 @@ ++++ +title = "Download SDK" +weight = 2 ++++ + +* Request access + +* Download .tar file + +* unzip and `docker import` diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md new file mode 100644 index 000000000..c1b8f34f2 --- /dev/null +++ b/doc/api/content/algo/getting-started/install.md @@ -0,0 +1,10 @@ ++++ +title = "Install Prerequisites" +weight = 1 ++++ + +* Install Docker + +* Install 7zip? + +* Install an editor \ No newline at end of file diff --git a/doc/api/content/algo/getting-started/testing.md b/doc/api/content/algo/getting-started/testing.md new file mode 100644 index 000000000..033fa787d --- /dev/null +++ b/doc/api/content/algo/getting-started/testing.md @@ -0,0 +1,6 @@ ++++ +title = "Testing" +weight = 4 ++++ + +* Test your algo diff --git a/doc/api/content/algo/ref/_index.md b/doc/api/content/algo/ref/_index.md new file mode 100644 index 000000000..ac7238434 --- /dev/null +++ b/doc/api/content/algo/ref/_index.md @@ -0,0 +1,7 @@ ++++ +title="Reference" +template="documentation.html" +sort_by="weight" +weight = 2 ++++ + diff --git a/doc/api/content/algo/ref/attaching.md b/doc/api/content/algo/ref/attaching.md new file mode 100644 index 000000000..a94f486fe --- /dev/null +++ b/doc/api/content/algo/ref/attaching.md @@ -0,0 +1,6 @@ ++++ +title = "Attaching" +weight = 4 ++++ + +todo diff --git a/doc/api/content/algo/ref/detaching.md b/doc/api/content/algo/ref/detaching.md new file mode 100644 index 000000000..231549b6a --- /dev/null +++ b/doc/api/content/algo/ref/detaching.md @@ -0,0 +1,6 @@ ++++ +title = "Detaching" +weight = 3 ++++ + +todo diff --git a/doc/api/content/algo/ref/orders.md b/doc/api/content/algo/ref/orders.md new file mode 100644 index 000000000..31db4cbc1 --- /dev/null +++ b/doc/api/content/algo/ref/orders.md @@ -0,0 +1,7 @@ ++++ +title = "Child Orders" +weight = 2 ++++ + +child orders + diff --git a/doc/api/content/algo/ref/subscriptions.md b/doc/api/content/algo/ref/subscriptions.md new file mode 100644 index 000000000..2c4d5207f --- /dev/null +++ b/doc/api/content/algo/ref/subscriptions.md @@ -0,0 +1,6 @@ ++++ +title = "Subscriptions" +weight = 1 ++++ + +todo diff --git a/doc/api/content/algo/samples/_index.md b/doc/api/content/algo/samples/_index.md new file mode 100644 index 000000000..b02ad8516 --- /dev/null +++ b/doc/api/content/algo/samples/_index.md @@ -0,0 +1,7 @@ ++++ +title="Samples" +template="documentation.html" +sort_by="weight" +weight = 3 ++++ + diff --git a/doc/api/content/algo/samples/iceberg.md b/doc/api/content/algo/samples/iceberg.md new file mode 100644 index 000000000..6156cf019 --- /dev/null +++ b/doc/api/content/algo/samples/iceberg.md @@ -0,0 +1,7 @@ ++++ +title = "Iceberg" +weight = 1 ++++ + +Annotated iceberg algo + diff --git a/doc/api/content/algo/setup/_index.md b/doc/api/content/algo/setup/_index.md deleted file mode 100644 index 0a8d64dff..000000000 --- a/doc/api/content/algo/setup/_index.md +++ /dev/null @@ -1,7 +0,0 @@ -+++ -title="Algo API" -template="documentation.html" -redirect_to = "algo/installing/" -+++ - -Setup diff --git a/doc/api/content/algo/setup/installing.md b/doc/api/content/algo/setup/installing.md deleted file mode 100644 index a71824be3..000000000 --- a/doc/api/content/algo/setup/installing.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -title = "Installing" -+++ \ No newline at end of file diff --git a/doc/api/content/client/index.md b/doc/api/content/client/index.md index c44f64999..f017b195f 100644 --- a/doc/api/content/client/index.md +++ b/doc/api/content/client/index.md @@ -1,5 +1,6 @@ +++ -title="BTS Client API" +title="Client API" +redirect_to = "/" +++ Client API From 48e6e1e13980cbcf042ed57e942009ce518235f5 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 8 Oct 2019 17:39:51 -0400 Subject: [PATCH 141/252] client sections need work --- doc/api/content/client/_index.md | 8 +++-- .../content/client/getting-started/_index.md | 7 +++++ .../content/client/getting-started/install.md | 7 +++++ doc/api/content/client/index.md | 6 ---- doc/api/templates/client.html | 31 +++++++++++++++++++ 5 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 doc/api/content/client/getting-started/_index.md create mode 100644 doc/api/content/client/getting-started/install.md delete mode 100644 doc/api/content/client/index.md create mode 100644 doc/api/templates/client.html diff --git a/doc/api/content/client/_index.md b/doc/api/content/client/_index.md index 22412f7c0..a73fc5490 100644 --- a/doc/api/content/client/_index.md +++ b/doc/api/content/client/_index.md @@ -1,5 +1,7 @@ +++ -title="BTS Client API" -+++ +title="Client API" +template="client.html" +sort_by="weight" ++++ -Coming soon... +client content? diff --git a/doc/api/content/client/getting-started/_index.md b/doc/api/content/client/getting-started/_index.md new file mode 100644 index 000000000..afbb6f79f --- /dev/null +++ b/doc/api/content/client/getting-started/_index.md @@ -0,0 +1,7 @@ ++++ +title="Getting Started" +template="client.html" +sort_by="weight" +weight = 1 ++++ + diff --git a/doc/api/content/client/getting-started/install.md b/doc/api/content/client/getting-started/install.md new file mode 100644 index 000000000..ef39d20b2 --- /dev/null +++ b/doc/api/content/client/getting-started/install.md @@ -0,0 +1,7 @@ ++++ +title = "Install Prerequisites" +template="client.html" +weight = 1 ++++ +*todo: this would have to be template="clientpage.html" +* Install .net core diff --git a/doc/api/content/client/index.md b/doc/api/content/client/index.md deleted file mode 100644 index f017b195f..000000000 --- a/doc/api/content/client/index.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title="Client API" -redirect_to = "/" -+++ - -Client API diff --git a/doc/api/templates/client.html b/doc/api/templates/client.html new file mode 100644 index 000000000..6cc05c541 --- /dev/null +++ b/doc/api/templates/client.html @@ -0,0 +1,31 @@ +{% extends "index.html" %} + +{% block extra_nav_class %}{% endblock extra_nav_class %} +{% block extra_content_class %}content--reversed{% endblock extra_content_class %} + +{% block content %} +{% set section = get_section(path="client/_index.md") %} +
+ +
+ {% block doc_content %} + {% endblock doc_content %} +
+
+{% endblock content %} From d5225aa75be96e50dfb1bfede09aabb1f1c4573f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 8 Oct 2019 22:45:28 -0400 Subject: [PATCH 142/252] spark sdk Installing --- .../content/algo/getting-started/install.md | 15 ++++++++++++++- doc/api/content/client/_index.md | 2 +- .../content/client/getting-started/install.md | 4 +++- doc/api/templates/documentation.html | 6 ++++++ doc/api/templates/index.html | 2 +- doc/api/templates/page.html | 18 ++++++++++++++++++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md index c1b8f34f2..50d22277e 100644 --- a/doc/api/content/algo/getting-started/install.md +++ b/doc/api/content/algo/getting-started/install.md @@ -3,8 +3,21 @@ title = "Install Prerequisites" weight = 1 +++ +These instructions assume you are using Microsoft Windows but you should be able to follow them on a Linux or Mac with minor modifications. + +The minimum hardware requirements for using the SDK are: +- **8 GB** RAM (preferably 16 GB or more) +- 4 CPU cores +- 20 GB free hard disk space + +The Spark SDK uses a tool called Docker to distribute all of the tools you need to build and test your trading algorithm ("Algo"). Once you have Docker installed you can download and run the latest SDK image. + +To use the Spark SDK you will need to install Docker. You don't need a C++ compiler as one is included in the spark SDK distribution. + +## Docker * Install Docker -* Install 7zip? +[Install Docker](https://www.docker.com/products/docker-desktop) +## Editor * Install an editor \ No newline at end of file diff --git a/doc/api/content/client/_index.md b/doc/api/content/client/_index.md index a73fc5490..d00ac6373 100644 --- a/doc/api/content/client/_index.md +++ b/doc/api/content/client/_index.md @@ -4,4 +4,4 @@ template="client.html" sort_by="weight" +++ -client content? + diff --git a/doc/api/content/client/getting-started/install.md b/doc/api/content/client/getting-started/install.md index ef39d20b2..2cd9902aa 100644 --- a/doc/api/content/client/getting-started/install.md +++ b/doc/api/content/client/getting-started/install.md @@ -3,5 +3,7 @@ title = "Install Prerequisites" template="client.html" weight = 1 +++ -*todo: this would have to be template="clientpage.html" + +## Coming Soon + * Install .net core diff --git a/doc/api/templates/documentation.html b/doc/api/templates/documentation.html index b3adc4df2..c0c4b4fcf 100644 --- a/doc/api/templates/documentation.html +++ b/doc/api/templates/documentation.html @@ -4,7 +4,11 @@ {% block extra_content_class %}content--reversed{% endblock extra_content_class %} {% block content %} +{%if page.extra.section %} +{% set section = get_section(path="{{page.extra.section}}/_index.md") %} +{% else %} {% set section = get_section(path="algo/_index.md") %} +{% endif %}
{% endblock content %} diff --git a/doc/api/templates/index.html b/doc/api/templates/index.html index 3501836d4..dd28c9e1a 100644 --- a/doc/api/templates/index.html +++ b/doc/api/templates/index.html @@ -27,7 +27,7 @@ About Spark
- +
diff --git a/doc/api/templates/page.html b/doc/api/templates/page.html index 8f6c09b87..bdc9d5c4d 100644 --- a/doc/api/templates/page.html +++ b/doc/api/templates/page.html @@ -5,3 +5,21 @@

{{page.title}}

{{page.content | safe}} {% endblock doc_content %} + +{% block next_link %} +

+ {% if page.lighter %} + + + Previous + + {% endif %} +   + {% if page.heavier %} + + Next + + + {% endif %} +

+{% endblock next_link %} From dc8e65923df49f8eb978b6d898be80d0d1f2f3dc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 9 Oct 2019 12:00:08 -0500 Subject: [PATCH 143/252] 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 144/252] 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 145/252] 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 245b5d0f99e0ba3d488ad645ef203ebc8ff3cb88 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 9 Oct 2019 18:56:30 -0400 Subject: [PATCH 146/252] sdk docs - downloading --- .../algo/getting-started/development.md | 11 +++- .../algo/getting-started/docker_config.png | Bin 0 -> 75768 bytes .../algo/getting-started/docker_tray.png | Bin 0 -> 5880 bytes .../content/algo/getting-started/download.md | 62 +++++++++++++++++- .../content/algo/getting-started/install.md | 35 ++++++++-- doc/api/content/algo/ref/lifecycle.md | 6 ++ doc/api/sass/_base.scss | 4 +- doc/api/sass/_layout.scss | 14 ++++ doc/api/templates/shortcodes/linux.html | 3 + 9 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 doc/api/content/algo/getting-started/docker_config.png create mode 100644 doc/api/content/algo/getting-started/docker_tray.png create mode 100644 doc/api/content/algo/ref/lifecycle.md create mode 100644 doc/api/templates/shortcodes/linux.html diff --git a/doc/api/content/algo/getting-started/development.md b/doc/api/content/algo/getting-started/development.md index e75ef5176..1b001a128 100644 --- a/doc/api/content/algo/getting-started/development.md +++ b/doc/api/content/algo/getting-started/development.md @@ -3,4 +3,13 @@ title = "Development" weight = 3 +++ -todo: write some code \ No newline at end of file +# Visual Studio Code + +In this section we're going to use a special feature of Visual Studio Code to do our editing. If you are using a different editor skip to the other editor section. + + + + +# Other Editor + +Good luck. 🦁🐯🐻 \ No newline at end of file diff --git a/doc/api/content/algo/getting-started/docker_config.png b/doc/api/content/algo/getting-started/docker_config.png new file mode 100644 index 0000000000000000000000000000000000000000..d8fb57ac16e8af3a93268bf5c2f3fbc2f15022b5 GIT binary patch literal 75768 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 O0000info@bluetradesys.com or call (919) 913-0850 and we will provide download credentials. -* unzip and `docker import` +## Download + +Download the latest SDK image here: spark_sdk.zip + +Unzip that folder into a working directory. Inside you should see something like this: + +``` +spark_sdk.img +spark_installer.exe +devcontainer.json +algo_template/ +bin/ +``` + +## Import + +Import the spark_sdk image into docker using the `docker load` command. +``` +docker load < spark_sdk.img +``` + +
+

If you see this error it means Docker Desktop is not running:

+error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.40/images/json: open //./pipe/docker_engine: The system cannot find the file specified. In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running. +
+ +Confirm that the image is loaded by running `docker images` which should list the new image. +``` +c:\bts> docker images +REPOSITORY TAG IMAGE ID CREATED SIZE +bluetradingsystems/spark_sdk latest a6dde8add63a 2 weeks ago 2.51GB +``` + +## Run 🏃‍♀️ + +Start the docker container by running +``` +docker run -d -v %CD%:/sdk --name spark_sdk bluetradingsytems/spark_sdk +``` +
+If you are using Linux or Mac replace %CD% with $PWD. +
+ +## Success 🎉 +Docker is now running the spark SDK image. If you are on Windows or Mac it is running inside a virtual Linux machine. You can see that is is running by typing `docker ps` to list running docker containers. If you restart the Docker Desktop application you will need to start the spark_sdk image again using `docker start spark_sdk`. + +## Update + +To update your Spark SDK simply download an unzip a new spark_sdk.zip and use docker load to import the new spark_sdk.img. + +Then stop, remove and restart spark_sdk. +``` +c:\bts> docker stop spark_sdk +c:\bts> docker rm spark_sdk +c:\bts> docker run -d -v %cd%:/sdk --name spark_sdk bluetradingsytems/spark_sdk + +``` diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md index 50d22277e..c4784b85c 100644 --- a/doc/api/content/algo/getting-started/install.md +++ b/doc/api/content/algo/getting-started/install.md @@ -5,19 +5,40 @@ weight = 1 These instructions assume you are using Microsoft Windows but you should be able to follow them on a Linux or Mac with minor modifications. +
+When there is a significant difference on non-Windows platforms it will be called out in a box like this one. +
+ The minimum hardware requirements for using the SDK are: -- **8 GB** RAM (preferably 16 GB or more) +- **12 GB** RAM (preferably 16 GB or more) - 4 CPU cores - 20 GB free hard disk space -The Spark SDK uses a tool called Docker to distribute all of the tools you need to build and test your trading algorithm ("Algo"). Once you have Docker installed you can download and run the latest SDK image. - -To use the Spark SDK you will need to install Docker. You don't need a C++ compiler as one is included in the spark SDK distribution. +The Spark SDK uses a tool called Docker to distribute all of the tools you need to build and test your trading algorithm ("Algo"). Once you have Docker installed you can download and import the Spark SDK image and be ready to start developing your Algo in a few minutes. ## Docker -* Install Docker -[Install Docker](https://www.docker.com/products/docker-desktop) +Download and install Docker Desktop for Windows/Mac. + + + +During the install Docker may ask you to enable virtualization support and reboot. + +Once Docker Desktop is installed and running it will create an icon in your system tray area that looks like the Docker logo. +![](../docker_tray.png) + +Right click on the tray icon and choose 'Settings' and choose the 'Advanced' tab. + +Ensure that the docker image has 8192 MB of memory and at least 2 cores. Memory that you assign to the docker image will not be available to Windows/Mac while Docker is running. CPU cores are shared with the host OS. Since you are going to use this image to compile your Algo it makes sense to allow Docker to use all available cores. + + ## Editor -* Install an editor \ No newline at end of file + +This documentation assumes you are going to use the +Visual Studio Code +editor to develop your Algo. The Spark SDK comes with a complete configuration for C++ development with VSCode so this is the simplest way to get started. However, if you are already familiar with a different editor you are welcome to use it. + + diff --git a/doc/api/content/algo/ref/lifecycle.md b/doc/api/content/algo/ref/lifecycle.md new file mode 100644 index 000000000..7b0b37456 --- /dev/null +++ b/doc/api/content/algo/ref/lifecycle.md @@ -0,0 +1,6 @@ ++++ +title = "Algo Lifecycle" +weight = 0 ++++ + +todo diff --git a/doc/api/sass/_base.scss b/doc/api/sass/_base.scss index 4805659a9..f5ad65103 100644 --- a/doc/api/sass/_base.scss +++ b/doc/api/sass/_base.scss @@ -86,8 +86,8 @@ pre { p code, li code { background-color: #f5f5f5; white-space: pre-wrap; - padding: 5px; - border-radius: 5px; + padding: 3px; + border-radius: 3px; font-size: 0.85rem; box-shadow: 0 1px 3px rgba(0,0,0,.1), 0 1px 1px rgba(0,0,0,.1), 0 2px 1px -1px rgba(0,0,0,.12); } diff --git a/doc/api/sass/_layout.scss b/doc/api/sass/_layout.scss index c917f7fe3..fbd1bc483 100644 --- a/doc/api/sass/_layout.scss +++ b/doc/api/sass/_layout.scss @@ -22,6 +22,20 @@ header { } } +.linux { + padding: 25px 15px; + background: #eff0f1; + border-radius: 5px; + border: 1px solid #0072a2; +} + +.info { + padding: 25px 15px; + background: #ffffe0; + border-radius: 5px; + border: 1px solid #383838; +} + footer { text-align: center; diff --git a/doc/api/templates/shortcodes/linux.html b/doc/api/templates/shortcodes/linux.html new file mode 100644 index 000000000..7c931f3dd --- /dev/null +++ b/doc/api/templates/shortcodes/linux.html @@ -0,0 +1,3 @@ +
+ {{body}} +
\ No newline at end of file From 893aa7a3703f1b4f21910ac999797dbc5597ee69 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 9 Oct 2019 19:42:18 -0400 Subject: [PATCH 147/252] api sdk - development --- .../algo/getting-started/development.md | 15 ++++++++++++- .../content/algo/getting-started/download.md | 20 ++++++++++++++---- .../content/algo/getting-started/install.md | 16 ++++++++++++++ .../getting-started/vscode_notification.png | Bin 0 -> 28751 bytes .../vscode_remote_containers.png | Bin 0 -> 95089 bytes doc/api/templates/documentation.html | 3 +-- 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 doc/api/content/algo/getting-started/vscode_notification.png create mode 100644 doc/api/content/algo/getting-started/vscode_remote_containers.png diff --git a/doc/api/content/algo/getting-started/development.md b/doc/api/content/algo/getting-started/development.md index 1b001a128..7d05c0110 100644 --- a/doc/api/content/algo/getting-started/development.md +++ b/doc/api/content/algo/getting-started/development.md @@ -5,8 +5,21 @@ weight = 3 # Visual Studio Code -In this section we're going to use a special feature of Visual Studio Code to do our editing. If you are using a different editor skip to the other editor section. +In this section we're going to use a special feature of +Visual Studio Code +to do our editing. If you are using a different editor skip to the other editor section. +# Remote - Containers + +Open Visual Studio Code in the folder where you unzipped the Spark SDK. If you opted to add it to your path you can run `code .` from your command prompt. Otherwise use File->Open Folder to select your work folder. + +Next click on the puzzle piece icon on the left hand side and enable the "Remote - Containers" extension. + + + +Once the extension is installed you should get a notification offering to let you re-open the workspace inside the container. + + diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index 49db5a307..8f62b24a7 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -29,7 +29,10 @@ docker load < spark_sdk.img ```
-

If you see this error it means Docker Desktop is not running:

+💡 +If you see this error it means Docker Desktop is not running: + + error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.40/images/json: open //./pipe/docker_engine: The system cannot find the file specified. In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.
@@ -40,23 +43,31 @@ REPOSITORY TAG IMAGE ID CREATED bluetradingsystems/spark_sdk latest a6dde8add63a 2 weeks ago 2.51GB ``` -## Run 🏃‍♀️ + + ## Update -To update your Spark SDK simply download an unzip a new spark_sdk.zip and use docker load to import the new spark_sdk.img. +To update your Spark SDK simply download an unzip a new spark_sdk.zip and use `docker load < spark_sdk.img` to overwrite the old image with the new one. + diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md index c4784b85c..7c0ddcd79 100644 --- a/doc/api/content/algo/getting-started/install.md +++ b/doc/api/content/algo/getting-started/install.md @@ -6,8 +6,12 @@ weight = 1 These instructions assume you are using Microsoft Windows but you should be able to follow them on a Linux or Mac with minor modifications.
+ When there is a significant difference on non-Windows platforms it will be called out in a box like this one.
+
+💡 Tips or solutions to common problems will be highlighted in a box like this. +
The minimum hardware requirements for using the SDK are: - **12 GB** RAM (preferably 16 GB or more) @@ -21,6 +25,7 @@ The Spark SDK uses a tool called Docker to distribute all of the tools you need Download and install Docker Desktop for Windows/Mac. @@ -35,6 +40,17 @@ Ensure that the docker image has 8192 MB of memory and at least 2 cores. Memory +## Sharing + +You need to give Docker access to the Windows drive where your source code is kept. + +Open Settings -> Shared Drives and check the drive where you intend to keep your Algo source code. + +
+💡 +If you run into trouble with drive sharing, see Docker Desktop for Windows tips on avoiding common problems. +
+ ## Editor This documentation assumes you are going to use the diff --git a/doc/api/content/algo/getting-started/vscode_notification.png b/doc/api/content/algo/getting-started/vscode_notification.png new file mode 100644 index 0000000000000000000000000000000000000000..38674d111b5a4a3d9984c96ab1f9fa2ad5a1efdb GIT binary patch literal 28751 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

wxm_L02 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 literal 0 HcmV?d00001 diff --git a/doc/api/templates/documentation.html b/doc/api/templates/documentation.html index c0c4b4fcf..0b675126d 100644 --- a/doc/api/templates/documentation.html +++ b/doc/api/templates/documentation.html @@ -30,8 +30,7 @@

{% block doc_content %} {% endblock doc_content %} - {% block next_link %} - {% endblock next_link %} + {% block next_link %} {% endblock next_link %}
{% endblock content %} From 6b30c42c0d97afc5be6c8a0d5244c829482f590b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 10 Oct 2019 14:56:32 -0400 Subject: [PATCH 148/252] 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 04f165b1a39ac58c198a83c94783b0d24d20feaf Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 10 Oct 2019 17:12:25 -0400 Subject: [PATCH 149/252] api docs: change info icon --- doc/api/content/algo/getting-started/download.md | 12 +++++++----- doc/api/content/algo/getting-started/install.md | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index 8f62b24a7..76a01d2e6 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -29,7 +29,7 @@ docker load < spark_sdk.img ```
-💡 + If you see this error it means Docker Desktop is not running: @@ -43,7 +43,7 @@ REPOSITORY TAG IMAGE ID CREATED bluetradingsystems/spark_sdk latest a6dde8add63a 2 weeks ago 2.51GB ``` - ## Update To update your Spark SDK simply download an unzip a new spark_sdk.zip and use `docker load < spark_sdk.img` to overwrite the old image with the new one. +If you want to preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image. + +``` --> + diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md index 7c0ddcd79..4edffa53c 100644 --- a/doc/api/content/algo/getting-started/install.md +++ b/doc/api/content/algo/getting-started/install.md @@ -10,7 +10,8 @@ These instructions assume you are using Microsoft Windows but you should be able When there is a significant difference on non-Windows platforms it will be called out in a box like this one.
-💡 Tips or solutions to common problems will be highlighted in a box like this. + +Tips or solutions to common problems will be highlighted in a box like this.
The minimum hardware requirements for using the SDK are: @@ -47,7 +48,7 @@ You need to give Docker access to the Windows drive where your source code is ke Open Settings -> Shared Drives and check the drive where you intend to keep your Algo source code.
-💡 + If you run into trouble with drive sharing, see Docker Desktop for Windows tips on avoiding common problems.
From 2677144bfa1bb4537c231c98bcdfbf0d16918f03 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 10 Oct 2019 17:43:28 -0400 Subject: [PATCH 150/252] 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 151/252] 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 152/252] 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 153/252] 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 c53f6ad906a2224248b21c726ee203d7ab065605 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 14 Oct 2019 16:01:24 -0500 Subject: [PATCH 154/252] finally remove mutable members from LadderSettings GetHashCode impl --- .../Modules/Trading/Ladder/LadderSettings.cs | 95 +++++-------------- 1 file changed, 22 insertions(+), 73 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index e1222b5af..f6942ccc0 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -23,6 +23,10 @@ namespace mbts.spark { // TODO: somehow allow windows that are using the default settings to still have individual column widths. [ProtoContract] class LadderColumnSettings : IEquatable { + // this class is 100% mutable (there are literally 0 readonly members), + // so GetHashCode must return the same hash for every instance. + static readonly int _type_hash = typeof(LadderColumnSettings).GetHashCode(); + public static LadderColumnSettings Default => new LadderColumnSettings { show = true, width = 50, @@ -74,14 +78,7 @@ namespace mbts.spark { other.show == show; public override bool Equals(object obj) => Equals(obj as LadderColumnSettings); - - public override int GetHashCode() => - width.GetHashCode() + - background.GetHashCode() + - foreground.GetHashCode() + - font_family.GetHashCode() + - font_size.GetHashCode() + - font_weight.GetHashCode(); + public override int GetHashCode() => _type_hash; public static bool operator ==(LadderColumnSettings x, LadderColumnSettings y) => x.safe_equals(y); public static bool operator !=(LadderColumnSettings x, LadderColumnSettings y) => !(x == y); @@ -89,6 +86,9 @@ namespace mbts.spark { [ProtoContract] class HistogramBarAnimation : IEquatable { + // this class is 100% mutable (there are literally 0 readonly members), + // so GetHashCode must return the same hash for every instance. + static readonly int _type_hash = typeof(HistogramBarAnimation).GetHashCode(); [ProtoMember(1)] public ColorShowProto bars { get; set; } [ProtoMember(2)] @@ -102,14 +102,14 @@ namespace mbts.spark { show_numbers == other.show_numbers; public override bool Equals(object obj) => Equals(obj as HistogramBarAnimation); - public override int GetHashCode() => - EqualityComparer.aggregate_hash( - bars.GetHashCode(), - show_numbers.GetHashCode()); + public override int GetHashCode() => _type_hash; } [ProtoContract] class VolumeColumnSettings : IEquatable { + // this class is 100% mutable (there are literally 0 readonly members), + // so GetHashCode must return the same hash for every instance. + static readonly int _type_hash = typeof(VolumeColumnSettings).GetHashCode(); public static VolumeColumnSettings Default { get { var gen = LadderColumnSettings.Default; @@ -149,19 +149,14 @@ namespace mbts.spark { show_ltq.Equals(other.show_ltq); public override bool Equals(object obj) => Equals(obj as VolumeColumnSettings); - - public override int GetHashCode() => - EqualityComparer.aggregate_hash( - general.GetHashCode(), - buy.GetHashCode(), - sell.GetHashCode(), - passive.GetHashCode(), - total.GetHashCode(), - show_ltq.GetHashCode()); + public override int GetHashCode() => _type_hash; } [ProtoContract] class LadderMarketBreakLine : IEquatable { + // this class is 100% mutable (there are literally 0 readonly members), + // so GetHashCode must return the same hash for every instance. + static readonly int _type_hash = typeof(LadderMarketBreakLine).GetHashCode(); [ProtoMember(1)] public bool show { get; set; } [ProtoMember(2)] @@ -184,8 +179,7 @@ namespace mbts.spark { Equals(obj as LadderMarketBreakLine); public override int GetHashCode() => - show.GetHashCode() + - (int)color; + _type_hash; } [ProtoContract] @@ -255,6 +249,9 @@ namespace mbts.spark { const double _default_order_entry_panel_width = 110.0; const double _default_zoom_factor = 1.0; const bool _default_show_warn_on_cross = true; + // this class is 100% mutable (there are literally 0 readonly members), + // so GetHashCode must return the same hash for every instance. + static readonly int _type_hash = typeof(LadderSettings).GetHashCode(); // Default proto constructor // Added this so that when clients upgrade to a version with new settings, @@ -590,55 +587,7 @@ namespace mbts.spark { public override bool Equals(object obj) => Equals(obj as LadderSettings); - // TODO: remove mutable props from hash logic (or conversely, make them immutable). - public override int GetHashCode() => - EqualityComparer.aggregate_hash( - row_height.GetHashCode(), - grid_line_color.GetHashCode(), - EqualityComparer.safe_get_hash_code(orders_column), - EqualityComparer.safe_get_hash_code(bid_column), - EqualityComparer.safe_get_hash_code(ask_column), - EqualityComparer.safe_get_hash_code(price_column), - EqualityComparer.safe_get_hash_code(last_column), - EqualityComparer.safe_get_hash_code(piq_column), - EqualityComparer.safe_get_hash_code(calculator_buttons), - scroll_bar_visible.GetHashCode(), - default_time_in_force.GetHashCode(), - size.GetHashCode(), - animate_recenter.GetHashCode(), - badge_style.GetHashCode(), - EqualityComparer.safe_get_hash_code(bid_break_line), - EqualityComparer.safe_get_hash_code(ask_break_line), - EqualityComparer.safe_get_hash_code(mid_break_line), - alternate_order_size.GetHashCode(), - EqualityComparer.safe_get_hash_code(session_low_line), - EqualityComparer.safe_get_hash_code(session_high_line), - EqualityComparer.safe_get_hash_code(session_range_fill), - EqualityComparer.safe_get_hash_code(volume_column), - EqualityComparer.safe_get_hash_code(size_display), - day_visible.GetHashCode(), - high_visible.GetHashCode(), - low_visible.GetHashCode(), - open_visible.GetHashCode(), - settle_visible.GetHashCode(), - volume_visible.GetHashCode(), - account_visible.GetHashCode(), - tif_visible.GetHashCode(), - order_type_visible.GetHashCode(), - account_position_visible.GetHashCode(), - size_presets_visible.GetHashCode(), - cancel_buys_visible.GetHashCode(), - cancel_sells_visible.GetHashCode(), - cancel_all_visible.GetHashCode(), - auto_clear_visible.GetHashCode(), - clear_visible.GetHashCode(), - order_entry_panel_initial_width.GetHashCode(), - zoom_slider_visible.GetHashCode(), - zoom_factor.GetHashCode(), - use_defaults.GetHashCode(), - favorite_algos.GetHashCode(), - net_change.GetHashCode(), - show_warn_on_cross.GetHashCode()); + public override int GetHashCode() => _type_hash; public struct WindowSpecifics { public readonly double order_entry_panel_width, zoom_factor; @@ -693,4 +642,4 @@ namespace mbts.spark { return source; } } -} +} \ No newline at end of file From 0772a13b09d09e3ef1859887647dd63b5f638320 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 14 Oct 2019 18:05:18 -0500 Subject: [PATCH 155/252] introduce ladder settings 'profile-equivalent' logic to avoid disconnecting ladders from profiles due to trivial settings changes --- .../Modules/Trading/Ladder/LadderSettings.cs | 124 ++++++++++-------- .../Trading/Ladder/LadderWindowFactory.cs | 13 +- .../Shell/Settings/ShellSettingsDialogVM.cs | 17 ++- 3 files changed, 90 insertions(+), 64 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index f6942ccc0..cc53844a7 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -249,6 +249,8 @@ namespace mbts.spark { const double _default_order_entry_panel_width = 110.0; const double _default_zoom_factor = 1.0; const bool _default_show_warn_on_cross = true; + public static readonly IEqualityComparer profile_equality_comparer = + EqualityComparer.Create(profile_equals); // this class is 100% mutable (there are literally 0 readonly members), // so GetHashCode must return the same hash for every instance. static readonly int _type_hash = typeof(LadderSettings).GetHashCode(); @@ -530,60 +532,76 @@ namespace mbts.spark { return s; } + /// + /// Determines whether or not the specified LadderSettings are 'profile equivalent.' + /// This means that 2 ladders, each with a different one of the specified settings, could share the same profile. + /// + /// + /// Note: the impetus for this version of equality is to avoid disconnecting a ladder from its profile due to 'trivial' settings changes. + /// Consider the '' property: + /// If a ladder is using a settings profile with Limit as the default algo, and the user decides to send a 'Market' order, + /// the ladder would suddenly be disconnected from the profile, because it's settings state would no longer be equal to the profile's settings, + /// since they changed the selected algo type to 'Market.' + /// To avoid such travesties, a separate equals logic is needed: this is called 'profile-equivalent' and is implemented in . + /// Devs: be sure to account for properties that are excluded in the 'profile-equals' logic in the [regular]'equals' logic. + public static bool profile_equals(LadderSettings a, LadderSettings b) => + a == null ? b == null : + b != null && + a.row_height == b.row_height && + a.grid_line_color == b.grid_line_color && + a.orders_column.safe_equals(b.orders_column) && + a.bid_column.safe_equals(b.bid_column) && + a.ask_column.safe_equals(b.ask_column) && + a.price_column.safe_equals(b.price_column) && + a.last_column.safe_equals(b.last_column) && + a.piq_column.safe_equals(b.piq_column) && + a.calculator_buttons.safe_equals(b.calculator_buttons, Enumerable.SequenceEqual) && + a.scroll_bar_visible == b.scroll_bar_visible && + a.default_account == b.default_account && + a.default_time_in_force == b.default_time_in_force && + a.size == b.size && + a.animate_recenter == b.animate_recenter && + a.badge_style == b.badge_style && + a.auto_clear == b.auto_clear && + a.bid_break_line.safe_equals(b.bid_break_line) && + a.ask_break_line.safe_equals(b.ask_break_line) && + a.mid_break_line.safe_equals(b.mid_break_line) && + a.alternate_order_size == b.alternate_order_size && + a.session_low_line.safe_equals(b.session_low_line) && + a.session_high_line.safe_equals(b.session_high_line) && + a.session_range_fill.safe_equals(b.session_range_fill) && + a.volume_column.safe_equals(b.volume_column) && + a.size_display.safe_equals(b.size_display) && + a.day_visible == b.day_visible && + a.high_visible == b.high_visible && + a.low_visible == b.low_visible && + a.open_visible == b.open_visible && + a.settle_visible == b.settle_visible && + a.volume_visible == b.volume_visible && + a.account_visible == b.account_visible && + a.tif_visible == b.tif_visible && + a.order_type_visible == b.order_type_visible && + a.account_position_visible == b.account_position_visible && + a.day_position_visible == b.day_position_visible && + a.raw_day_position_visible == b.raw_day_position_visible && + a.size_presets_visible == b.size_presets_visible && + a.cancel_buys_visible == b.cancel_buys_visible && + a.cancel_sells_visible == b.cancel_sells_visible && + a.cancel_all_visible == b.cancel_all_visible && + a.auto_clear_visible == b.auto_clear_visible && + a.clear_visible == b.clear_visible && + a.order_entry_panel_initial_width == b.order_entry_panel_initial_width && + a.zoom_slider_visible == b.zoom_slider_visible && + a.zoom_factor == b.zoom_factor && + a.use_defaults == b.use_defaults && + a.favorite_algos == b.favorite_algos && + a.net_change == b.net_change && + a.show_warn_on_cross == b.show_warn_on_cross && + a.mini_ob == b.mini_ob; + public bool Equals(LadderSettings other) => - other != null && - row_height == other.row_height && - grid_line_color == other.grid_line_color && - orders_column.safe_equals(other.orders_column) && - bid_column.safe_equals(other.bid_column) && - ask_column.safe_equals(other.ask_column) && - price_column.safe_equals(other.price_column) && - last_column.safe_equals(other.last_column) && - piq_column.safe_equals(other.piq_column) && - calculator_buttons.safe_equals(other.calculator_buttons, (a, b) => a.SequenceEqual(b)) && - scroll_bar_visible == other.scroll_bar_visible && - default_account == other.default_account && - default_algo == other.default_algo && - default_time_in_force == other.default_time_in_force && - size == other.size && - animate_recenter == other.animate_recenter && - badge_style == other.badge_style && - auto_clear == other.auto_clear && - bid_break_line.safe_equals(other.bid_break_line) && - ask_break_line.safe_equals(other.ask_break_line) && - mid_break_line.safe_equals(other.mid_break_line) && - alternate_order_size == other.alternate_order_size && - session_low_line.safe_equals(other.session_low_line) && - session_high_line.safe_equals(other.session_high_line) && - session_range_fill.safe_equals(other.session_range_fill) && - volume_column.safe_equals(other.volume_column) && - size_display.safe_equals(other.size_display) && - day_visible == other.day_visible && - high_visible == other.high_visible && - low_visible == other.low_visible && - open_visible == other.open_visible && - settle_visible == other.settle_visible && - volume_visible == other.volume_visible && - account_visible == other.account_visible && - tif_visible == other.tif_visible && - order_type_visible == other.order_type_visible && - account_position_visible == other.account_position_visible && - day_position_visible == other.day_position_visible && - raw_day_position_visible == other.raw_day_position_visible && - size_presets_visible == other.size_presets_visible && - cancel_buys_visible == other.cancel_buys_visible && - cancel_sells_visible == other.cancel_sells_visible && - cancel_all_visible == other.cancel_all_visible && - auto_clear_visible == other.auto_clear_visible && - clear_visible == other.clear_visible && - order_entry_panel_initial_width == other.order_entry_panel_initial_width && - zoom_slider_visible == other.zoom_slider_visible && - zoom_factor == other.zoom_factor && - use_defaults == other.use_defaults && - favorite_algos == other.favorite_algos && - net_change == other.net_change && - show_warn_on_cross == other.show_warn_on_cross && - mini_ob == other.mini_ob; + profile_equals(this, other) && + default_algo == other.default_algo; public override bool Equals(object obj) => Equals(obj as LadderSettings); diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index 0d1b3ac40..2f3b64e92 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -81,11 +81,9 @@ namespace bts.shell { if (!_settings_hub.current.ladder_profiles.TryGetFirst(lp => lp.id == id, out var result)) { // profile was deleted id = 0; - } else { - if (!s.Equals(result.value)) { - // ladder's settings diverged from the profile (this happens when the user changes settings outside of the settings dialog, such as column widths, left panel width, etc.) - id = 0; - } + } else if (!LadderSettings.profile_equals(s, result.value)) { + // ladder's settings diverged from the profile (this happens when the user changes settings outside of the settings dialog, such as column widths, left panel width, etc.) + id = 0; } } return new LadderSaveState { security_key = vm.security.Id, settings = s, settings_id = id }; @@ -149,7 +147,7 @@ namespace bts.shell { var curr = vm.get_save_state(); if (settings_id == 0) { last_value = curr; - } else if (!curr.Equals(last_value)) { + } else if (!LadderSettings.profile_equals(curr, last_value)) { settings_id = 0; last_value = curr; } @@ -163,7 +161,7 @@ namespace bts.shell { // not on a profile, don't respond to default settings changes return; } else if (us.ladder_profiles.TryGetFirst(p => p.id == settings_id, out var profile)) { - if (!last_value.Equals(vm.get_save_state())) { + if (!LadderSettings.profile_equals(last_value, vm.get_save_state())) { settings_id = 0; } else { settings_subject.OnNext(last_value = profile.value); @@ -211,6 +209,7 @@ namespace bts.shell { _ => _, vm.get_save_state(), UserSettings.FileExtensions.LADDER, + LadderSettings.profile_equals, settings_id); dialog_vm.applied += apply; // dialog diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs index b51a4989a..6cc76049e 100644 --- a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs +++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs @@ -130,8 +130,10 @@ namespace mbts.spark { DialogSkirtItem _apply_item, _ok_item, _cancel_item; MenuItemVM _import_item, _export_item, _load_factory_item; - public ProfiledShellSettingsDialogVM(ISettingsProfileService profile_service, Func get_fallback, Func vm_factory, Func normalize, T init, string file_ext, uint settings_id = 0) { + public ProfiledShellSettingsDialogVM(ISettingsProfileService profile_service, Func get_fallback, Func vm_factory, Func normalize, T init, string file_ext, Func profile_equals = null, uint settings_id = 0) { _vm_factory = vm_factory; + if (profile_equals == null) + profile_equals = EqualityComparer.Default.Equals; // profile collections var skip_local = profiles.WrapSkip(1); var skip_local_wrapper = skip_local.WrapSelector( @@ -185,12 +187,19 @@ namespace mbts.spark { continue; i = ~i; var temp = ns.with(value: normalize(ns.value)); - skip_local_wrapper.Insert(i, temp); if (settings_id == temp.id) { - if (temp.value.Equals(init)) - selected_profile = skip_local[i]; settings_id = 0; + if (profile_equals(temp.value, init)) { + if (!temp.value.Equals(init)) { + // they aren't exactly equal (don't overwrite any props in 'init' - use it to create the vm) + temp = temp.with(value: init); + } + skip_local_wrapper.Insert(i, temp); + selected_profile = skip_local[i]; + continue; + } } + skip_local_wrapper.Insert(i, temp); } })); From c9da022c58215a76f5b4955f63edf3c946c05358 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 14 Oct 2019 22:54:23 -0500 Subject: [PATCH 156/252] SP-248 Ladder left panel scroll --- .../Modules/Trading/Ladder/LadderSettings.cs | 8 ++- .../Modules/Trading/Ladder/VM/LadderVM.cs | 42 ++++++++++++- .../Trading/Ladder/View/LadderView.xaml | 9 ++- .../Trading/Ladder/View/LadderView.xaml.cs | 40 +++++++++++- .../core/GlobalExtensions/DoubleHelper.cs | 31 +++++++++- .../spark/view/Controls/DIYGrid/DoubleUtil.cs | 2 + .../Converters/AnonymousValueConverter.cs | 3 + .../Extensions/FrameworkElementExtensions.cs | 23 +++++++ .../view/Extensions/ScrollViewerBehavior.cs | 61 +++++++++++++++++++ .../view/Extensions/UIElementExtensions.cs | 8 +++ 10 files changed, 221 insertions(+), 6 deletions(-) create mode 100644 src/client/spark/view/Extensions/ScrollViewerBehavior.cs diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index cc53844a7..c025e90ed 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -496,6 +496,9 @@ namespace mbts.spark { [ProtoMember(55)] public LadderMiniOrderBookSettings mini_ob { get; set; } + [ProtoMember(57)] + public double left_panel_scroll_position { get; set; } + public void sanitize() => sanitize(this); @@ -601,7 +604,8 @@ namespace mbts.spark { public bool Equals(LadderSettings other) => profile_equals(this, other) && - default_algo == other.default_algo; + default_algo == other.default_algo && + left_panel_scroll_position == other.left_panel_scroll_position; public override bool Equals(object obj) => Equals(obj as LadderSettings); @@ -660,4 +664,4 @@ namespace mbts.spark { return source; } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index d5d1c38da..174a14b69 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -35,7 +35,14 @@ namespace mbts.spark { _show_cancel_sells, _show_cancel_all, _show_zoom; readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground; readonly HashSet _sticky_algos = new HashSet(); - double _position, _day_position, _raw_day_position; + double + _position, + _day_position, + _raw_day_position, + _left_panel_extent_height, + _left_panel_view_port_height, + _left_panel_scroll_position, + _left_panel_scroll_position_target; bool _show_account_position, _show_day_position, _show_raw_day_position; ulong _misc_time = 0; ulong _last_trade_time = 0; @@ -76,6 +83,7 @@ namespace mbts.spark { _volume_column_width = backing(nameof(volume_column_width), ws.volume_column_width); _left_panel_width = backing(nameof(left_panel_width), ws.order_entry_panel_width); _zoom_factor = backing(nameof(zoom_factor), ws.zoom_factor); + _left_panel_scroll_position_target = init.left_panel_scroll_position; // remember: account_positions needs to subscribe to selected_account; both the sub and account_positions need to be disposed _volume = backing(nameof(volume), 0ul); _auto_clear = backing(nameof(auto_clear), init.auto_clear); @@ -333,6 +341,33 @@ namespace mbts.spark { public bool show_cancel_sells => _show_cancel_sells.view; public bool show_cancel_all => _show_cancel_all.view; public bool show_zoom => _show_zoom.view; + // left panel scroll props + public double left_panel_view_port_height { + get => _left_panel_view_port_height; + set { + using (detect_property_changes(nameof(left_panel_scroll_position))) + _left_panel_view_port_height = value; + } + } + public double left_panel_scroll_position { + get { + if (!_left_panel_scroll_position_target.is_nan()) { + if (_left_panel_scroll_position_target < _max_left_panel_scroll_position) { + _left_panel_scroll_position = _left_panel_scroll_position_target; + _left_panel_scroll_position_target = double.NaN; + } + } + return Math.Min(_left_panel_scroll_position, _left_panel_extent_height); + } + set => Set(ref _left_panel_scroll_position, value); + } + public double left_panel_extent_height { + get => _left_panel_extent_height; + set { + using (detect_property_changes(nameof(left_panel_scroll_position))) + Set(ref _left_panel_extent_height, value); + } + } public double left_panel_width { get => _left_panel_width.Value; set => _left_panel_width.set(value); } public double zoom_factor { get => _zoom_factor.Value; set => _zoom_factor.set(value); } public string position_display_text { @@ -364,6 +399,10 @@ namespace mbts.spark { public bool show_warn_on_cross_from_settings => current_settings.show_warn_on_cross; internal LadderModel model => _model; internal IObservable settings { get; } + + double _max_left_panel_scroll_position => + Math.Max(0, _left_panel_extent_height - _left_panel_view_port_height); + internal OrderRecordImmutable get_root_at_price((OrderRecordImmutable order, uint? _, AlgoData? __, AlgoDefinitionMetadata? meta) op) { var order = op.order; double p = order.price(); @@ -394,6 +433,7 @@ namespace mbts.spark { zoom_factor, piq_column_width)); rv.auto_clear = auto_clear; + rv.left_panel_scroll_position = left_panel_scroll_position; if (order_properties_vm != null) { rv.default_time_in_force = order_properties_vm.selected_time_in_force; if (order_properties_vm.selected_account.HasValue) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml index b761e9b75..c0275583a 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml @@ -301,7 +301,14 @@ - + diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs index 015680d5c..5a6dced1a 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs @@ -1,11 +1,16 @@ using bts; using bts.collections; using bts.utils; +using mbts.ui; using mbts.ui.converters; +using mbts.ui.extensions; using mbts.utils; +using System; +using System.Collections.Generic; using System.Linq; using System.Windows; using System.Windows.Controls; +using System.Windows.Controls.Primitives; using System.Windows.Data; using System.Windows.Input; @@ -80,6 +85,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; + vm.SubscribeDisposed(_connect_left_panel_scroll()); DataContext = vm; DataContextChanged += datacontext_changed; _ui_scaler.MouseDoubleClick += _ui_scaler_MouseDoubleClick; @@ -87,7 +93,39 @@ namespace mbts.spark { this.PreviewMouseDown += LadderView_PreviewMouseDown; } - + IDisposable _connect_left_panel_scroll() { + // extent height + bool busy = false; + var extent_height_hook = _left_panel_scroll.ObserveProperty(ScrollViewer.ExtentHeightProperty, (s, e) => { + if (!busy) { + double scroll_pos = vm.left_panel_scroll_position; + busy = true; + Dispatcher.InvokeAsync(() => { + vm.left_panel_extent_height = _left_panel_scroll.ExtentHeight; + if (_left_panel_scroll.VerticalOffset != scroll_pos) + _left_panel_scroll.TryScrollToVerticalOffset(scroll_pos); + busy = false; + }, System.Windows.Threading.DispatcherPriority.ApplicationIdle); + } + }); + // view port height + _left_panel_scroll.Loaded += on_loaded; + var dispose = Disposable.CreateDisposeOnce(dispose_impl); + return Disposable.Create(dispose, vm.SubscribeDisposed(dispose)); + // local methods + void on_loaded(object sender, RoutedEventArgs e) { + if (_left_panel_scroll.descendants_of_type().TryGetFirst(sb => sb.Orientation == Orientation.Vertical, out var vscroll)) { + vscroll.SetBinding(ScrollBar.ViewportSizeProperty, new Binding(nameof(LadderVM.left_panel_view_port_height)) { + Converter = ValueConverter.create(d => new Size(0, d), sz => sz.Height), + Mode = BindingMode.OneWayToSource + }); + } + } + void dispose_impl() { + Disposable.dispose(ref extent_height_hook); + _left_panel_scroll.Loaded -= on_loaded; + } + } // (Left|Right) CTRL + Wheel to zoom // This is neat b/c the user doesn't even need to have the slider visible to zoom diff --git a/src/client/spark/core/GlobalExtensions/DoubleHelper.cs b/src/client/spark/core/GlobalExtensions/DoubleHelper.cs index 747747963..4b9292936 100644 --- a/src/client/spark/core/GlobalExtensions/DoubleHelper.cs +++ b/src/client/spark/core/GlobalExtensions/DoubleHelper.cs @@ -1,7 +1,36 @@ -using System.Linq; +using System; +using System.Linq; namespace mbts { public static class DoubleHelper { + public static bool any_nan_or_infinity(params double[] values) { + for (int i = 0; i < values.Length; i++) { + if (double.IsNaN(values[i]) || double.IsInfinity(values[i])) + return true; + } + return false; + } + + public static bool are_close(double v1, double v2, double threshold) => + !any_nan_or_infinity(v1, v2, threshold) && Math.Abs(threshold) > Math.Abs(v1 - v2); + + // bc double.IsNaN gets annoying write, and a lazy programmer is a happy programmer ;) + public static bool is_nan(this double value) => + double.IsNaN(value); + + /// + /// If the specified value is a , , or , returns the equivalent ; otherwise, returns . + /// + /// The value to convert to a . + /// The equivalent value if the cast succeeds, otherwise . + public static double nan_cast(object value) { + // devs: add numeric type checks as needed + if (value is double d) return d; + if (value is int i) return i; + if (value is uint u) return u; + return double.NaN; + } + public static bool IsNaNOrInfinity(double d) => double.IsNaN(d) || double.IsInfinity(d); public static bool IsNaNOrInfinityOr(double d, params double[] values) => IsNaNOrInfinity(d) || values.Contains(d); public static bool IsOneOf(double d, params double[] values) => values.Contains(d); diff --git a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs index aa2019135..cce6cb9bc 100644 --- a/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs +++ b/src/client/spark/view/Controls/DIYGrid/DoubleUtil.cs @@ -4,6 +4,8 @@ using System.Linq; namespace mbts.ui.controls { static class DoubleUtil { public const int API_DECIMAL_PRECISION = 9; + // arbitrary small number that can be used to determine whether or not scroll changes are significant + public const double MIN_SCROLL_DELTA = 0.000015; /* smallest such that 1.0+DBL_EPSILON != 1.0 */ private const double EPSILON = 2.2204460492503131e-016; private const double BIG_EPSILON = EPSILON * 10; diff --git a/src/client/spark/view/Converters/AnonymousValueConverter.cs b/src/client/spark/view/Converters/AnonymousValueConverter.cs index 29ba7db43..20a67cbc9 100644 --- a/src/client/spark/view/Converters/AnonymousValueConverter.cs +++ b/src/client/spark/view/Converters/AnonymousValueConverter.cs @@ -11,6 +11,9 @@ namespace mbts.ui.converters { public static IValueConverter create(Func convert) => new AnonymousValueConverter(convert); + public static IValueConverter create(Func convert, Func convert_back) => + new AnonymousValueConverter(convert, convert_back); + public static IMultiValueConverter create(Func convert) => new AnonymousMultiValueConverter(convert); diff --git a/src/client/spark/view/Extensions/FrameworkElementExtensions.cs b/src/client/spark/view/Extensions/FrameworkElementExtensions.cs index 5e1fca80f..56bc99d47 100644 --- a/src/client/spark/view/Extensions/FrameworkElementExtensions.cs +++ b/src/client/spark/view/Extensions/FrameworkElementExtensions.cs @@ -9,6 +9,29 @@ using CompositeDisposable = System.Reactive.Disposables.CompositeDisposable; namespace mbts.ui.extensions { static class FrameworkElementHelper { + /// + /// Invokes the specified action immediately if the element is already loaded, otherwise hooks up to the event, + /// and [conditionally]invokes the specified action if returns true. + /// + /// The element that must be loaded before the specified action is invoked. + /// The action to invoke when the element is loaded. + /// If the element is not already loaded, this delegate determines whether or not to invoke the action in the Loaded event callback. + /// + public static void InvokeOnLoaded(this FrameworkElement element, Action action, Func should_still_execute) { + if (action == null) + throw new ArgumentNullException(nameof(action)); + if (element.IsLoaded) { + action(); + } else { + element.Loaded += on_loaded; + void on_loaded(object sender, RoutedEventArgs e) { + element.Loaded -= on_loaded; + if (should_still_execute()) + action(); + } + } + } + public static Point GetCenter(this FrameworkElement element) => new Point(element.ActualWidth * 0.5, element.ActualHeight * 0.5); diff --git a/src/client/spark/view/Extensions/ScrollViewerBehavior.cs b/src/client/spark/view/Extensions/ScrollViewerBehavior.cs new file mode 100644 index 000000000..e9db14fd4 --- /dev/null +++ b/src/client/spark/view/Extensions/ScrollViewerBehavior.cs @@ -0,0 +1,61 @@ +using mbts.ui.controls; +using mbts.ui.extensions; +using System.Windows; +using System.Windows.Controls; + +namespace mbts.ui { + static class ScrollViewerBehavior { + public static readonly DependencyProperty VerticalOffsetProperty = + DependencyProperty.RegisterAttached("VerticalOffset", typeof(double), typeof(ScrollViewerBehavior), new PropertyMetadata(double.NaN, OnVerticalOffsetChanged)); + + static void OnVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { + if (d is ScrollViewer scroll) { + double voff = DoubleHelper.nan_cast(e.NewValue); + // Ignore small deltas to prevent strange layout rounding issues/loops. + // Be mindful that small deltas are not accumulated into a single larger delta. + if (!double.IsNaN(voff) && !DoubleHelper.are_close(DoubleHelper.nan_cast(e.OldValue), voff, DoubleUtil.MIN_SCROLL_DELTA)) { + scroll.InvokeOnLoaded(() => scroll.ScrollToVerticalOffset(voff), + () => scroll.GetValue(VerticalOffsetProperty) is double curr_voff && curr_voff == voff); + } + } + } + + public static double GetVerticalOffset(DependencyObject d) => (double)d.GetValue(VerticalOffsetProperty); + public static void SetVerticalOffset(DependencyObject d, double value) => d.SetValue(VerticalOffsetProperty, value); + + public static readonly DependencyProperty EnableTwoWayVerticalOffsetBindingProperty = + DependencyProperty.RegisterAttached("EnableTwoWayVerticalOffsetBinding", typeof(bool), typeof(ScrollViewerBehavior), new PropertyMetadata(false, OnEnableTwoWayVerticalOffsetBindingChanged)); + + static void OnEnableTwoWayVerticalOffsetBindingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { + if (d is ScrollViewer scroll) { + if ((bool)e.NewValue) { + scroll.ScrollChanged += EnableTwoWayVerticalOffsetBindingUtils.on_scroll_changed; + } else { + scroll.ScrollChanged -= EnableTwoWayVerticalOffsetBindingUtils.on_scroll_changed; + } + } + } + + public static bool GetEnableTwoWayVerticalOffsetBinding(DependencyObject d) => (bool)d.GetValue(EnableTwoWayVerticalOffsetBindingProperty); + public static void SetEnableTwoWayVerticalOffsetBinding(DependencyObject d, bool value) => d.SetValue(EnableTwoWayVerticalOffsetBindingProperty, value); + + public static readonly DependencyProperty VerticalOffsetMirrorBusyProperty = + DependencyProperty.RegisterAttached("VerticalOffsetMirrorBusy", typeof(bool), typeof(ScrollViewerBehavior), new PropertyMetadata(false)); + + static class EnableTwoWayVerticalOffsetBindingUtils { + public static void on_scroll_changed(object sender, ScrollChangedEventArgs e) { + if (e.VerticalChange != 0 && sender is ScrollViewer scroll) { + if (!(bool)scroll.GetValue(VerticalOffsetMirrorBusyProperty)) { + scroll.SetValue(VerticalOffsetMirrorBusyProperty, true); + // scroll changes could get noisy while layouts are being processed; + // let everything settle down before updating the VerticalOffset binding sources/targets. + scroll.Dispatcher.InvokeAsync(() => { + scroll.SetCurrentValue(VerticalOffsetProperty, scroll.VerticalOffset); + scroll.SetValue(VerticalOffsetMirrorBusyProperty, false); + }, System.Windows.Threading.DispatcherPriority.ApplicationIdle); + } + } + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Extensions/UIElementExtensions.cs b/src/client/spark/view/Extensions/UIElementExtensions.cs index 0e5924fd2..3b48769a0 100644 --- a/src/client/spark/view/Extensions/UIElementExtensions.cs +++ b/src/client/spark/view/Extensions/UIElementExtensions.cs @@ -236,6 +236,14 @@ namespace mbts.ui.extensions { target.ScrollChanged += callback; return Disposable.Create(() => target.ScrollChanged -= callback); } + + public static bool TryScrollToVerticalOffset(this ScrollViewer scroll_viewer, double vertical_offset) { + if (vertical_offset >= 0 && scroll_viewer.IsLoaded && vertical_offset < scroll_viewer.ExtentHeight - scroll_viewer.ViewportHeight) { + scroll_viewer.ScrollToVerticalOffset(vertical_offset); + return true; + } + return false; + } } public static class TextBoxExtensions { From 93b954ce46fa3354aaccb3b7dde4fcf7f12e0c21 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 16 Oct 2019 11:37:32 -0400 Subject: [PATCH 157/252] 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 158/252] 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 159/252] 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 160/252] 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 161/252] 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 162/252] 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 163/252] 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 164/252] 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 f03a41385562ac8ddd2f6a6c93c5a6c861e4b590 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 17 Oct 2019 13:13:16 -0500 Subject: [PATCH 165/252] SP-247 Order Entry Sounds --- .../Data/Events/OrderSentEventPredicate.cs | 80 +++++++++++++++++++ .../Data/OrderRecordTuplePredicate.cs | 16 ++-- src/lib/config/protos/UI.proto | 7 ++ 3 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs diff --git a/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs new file mode 100644 index 000000000..f1c98817c --- /dev/null +++ b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs @@ -0,0 +1,80 @@ +using bts.api; +using bts.api.orderman; +using bts.shell; +using bts.utils; +using mbts.spark; +using mbts.ui.settings; +using ProtoBuf; +using System; +using System.Collections.Generic; +using System.ComponentModel; + +namespace mbts { + static class OrderSentEventPredicateVMFactory { + public static Dictionary> get_oneofs(IBus bus) => + new Dictionary> { + { OrderSentEventPredicate.PredicateTypeOneofCase.AnyOrder, PredicateVMWrapper.create(p => p.security = null) }, + { OrderSentEventPredicate.PredicateTypeOneofCase.SecurityOrder, SecurityCriteriaVMFactory.create(bus, o => o.security?.is_value ?? new SecurityCriteria(), + (p, s) => { + if (p.security == null) { + p.security = new SecurityPredicate(); + } + p.security.is_value = s; + }) + } + }; + } + + [ProtoContract] + class OrderSentEventPredicate : IEquatable { + static readonly int _type_hash = typeof(OrderSentEventPredicate).GetHashCode(); + // arbitrary short time period (can override in config) + static readonly TimeSpan _stale_order_threshold = TimeSpan.FromSeconds(config.Configuration.get().stale_order_threshold_seconds); + + public enum PredicateTypeOneofCase { + [Description("(any order)")] + AnyOrder, + [Description("choose securities")] + SecurityOrder + } + + [ProtoMember(1)] + public SecurityPredicate security { get; set; } + + public PredicateTypeOneofCase predicate_type_case { + get { + if (security != null) + return PredicateTypeOneofCase.SecurityOrder; + return PredicateTypeOneofCase.AnyOrder; + } + } + + public IPredicate create(object obj) => + create_predicate((INotificationServiceDataCache)obj); + + public IPredicate create_predicate(INotificationServiceDataCache data_cache) { + var sec_pred = security?.create(); + return PredicateBuilder.create(os => + // verify security + (sec_pred == null || (os.security.HasValue && sec_pred.trigger(os.security.Value))) && + // verify not stale + ((os.order.created() - DateTime.Now) < _stale_order_threshold) && + // verify order hasn't been added yet + // Note: the notification service should offer a way to connect predicates so that they only receive items in TableUpdate.added, + // however, the notification service predated TableUpdate.Changes, so for now, just check that the history.Count == 1) + (data_cache.order_history.TryGetValue(os.order.Key, out var hist) && hist.Count == 1)); + } + + public INotificationPredicate create_toast(INotificationServiceDataCache data_cache) => + throw new NotImplementedException(); + + public bool Equals(OrderSentEventPredicate other) => + other != null && other.security.safe_equals(other.security); + + public override bool Equals(object obj) => + Equals(obj as OrderSentEventPredicate); + + public override int GetHashCode() => + EqualityComparer.auto_phase(_type_hash, security?.GetHashCode() ?? 0); + } +} \ No newline at end of file diff --git a/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs b/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs index c137f7d0b..be4a346fb 100644 --- a/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs +++ b/src/client/spark/Predicates/Data/OrderRecordTuplePredicate.cs @@ -5,14 +5,9 @@ using bts.utils; using mbts.spark; using mbts.ui; using mbts.ui.settings; -using mbts.ui.utility; -using mbts.utils; using ProtoBuf; using System; using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using OrderType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; using PTOC = mbts.OrderRecordTuplePredicate.PredicateTypeOneofCase; namespace mbts { @@ -20,6 +15,7 @@ namespace mbts { // TODO: uncomment the remaining cases when ready public static Dictionary> get_oneofs(IBus bus, OrdersModel orders_model) { return new Dictionary> { + { PTOC.SentEvent, wrap(rp => rp.sent_event, (rp, p) => rp.sent_event = p, p => p.predicate_type_case, OrderSentEventPredicateVMFactory.get_oneofs(bus)) }, { PTOC.FilledEvent, wrap(rp => rp.filled_event, (rp, p) => rp.filled_event = p, p => p.predicate_type_case, OrderFilledEventPredicateVMFactory.get_oneofs(bus)) }, { PTOC.CompletedEvent, wrap(rp => rp.completed_event, (rp, p) => rp.completed_event = p, p => p.predicate_type_case, OrderCompletedEventPredicateVMFactory.get_oneofs(bus)) }, { PTOC.CanceledEvent, wrap(rp => rp.canceled_event, (rp, p) => rp.canceled_event = p, p => p.predicate_type_case, OrderCanceledEventPredicateVMFactory.get_oneofs(bus)) }, @@ -77,6 +73,7 @@ namespace mbts { OrderFilledEventPredicate _filled_event; OrderCompletedEventPredicate _completed_event; OrderCanceledEventPredicate _canceled_event; + OrderSentEventPredicate _sent_event; public enum PredicateTypeOneofCase { None, @@ -120,6 +117,8 @@ namespace mbts { OrderKey, [PredicateCase(is_toastable:false)] ParentKey, + [PredicateCase("When order is sent", PredicateCategory.Event)] + SentEvent, [PredicateCase("When order gets a fill", PredicateCategory.Event)] FilledEvent, [PredicateCase("When order is completed", PredicateCategory.Event)] @@ -176,6 +175,8 @@ namespace mbts { public OrderCompletedEventPredicate completed_event { get => _completed_event; set => _set(ref _completed_event, value); } [ProtoMember(23)] public OrderCanceledEventPredicate canceled_event { get => _canceled_event; set => _set(ref _canceled_event, value); } + [ProtoMember(26)] + public OrderSentEventPredicate sent_event { get => _sent_event; set => _set(ref _sent_event, value); } [ProtoMember(24)] public bool is_toast_enabled { get; set; } [ProtoMember(25)] @@ -206,6 +207,7 @@ namespace mbts { if (_filled_event != null) return PTOC.FilledEvent; if (_completed_event != null) return PTOC.CompletedEvent; if (_canceled_event != null) return PTOC.CanceledEvent; + if (_sent_event != null) return PTOC.SentEvent; if (_attached_target_order_key != null) return PTOC.AttachedTargetOrderKey; return PTOC.None; } @@ -236,6 +238,7 @@ namespace mbts { case PTOC.FilledEvent: return _filled_event.create_predicate(data_cache); case PTOC.CompletedEvent: return _completed_event.create_predicate(data_cache); case PTOC.CanceledEvent: return _canceled_event.create(data_cache); + case PTOC.SentEvent: return _sent_event.create(data_cache); case PTOC.AttachedTargetOrderKey: return wrap(_attached_target_order_key.create(), r => r.order.attached_target_order_key()); default: return null; } @@ -285,6 +288,7 @@ namespace mbts { case PTOC.FilledEvent: return _filled_event.Equals(other._filled_event); case PTOC.CompletedEvent: return _completed_event.Equals(other._completed_event); case PTOC.CanceledEvent: return _canceled_event.Equals(other._canceled_event); + case PTOC.SentEvent: return _sent_event.Equals(other._sent_event); case PTOC.AttachedTargetOrderKey: return _attached_target_order_key.Equals(other._attached_target_order_key); case PTOC.None: return true; default: throw ExceptionHelper.unexpected_oneof_case(ptoc); @@ -320,6 +324,7 @@ namespace mbts { case PTOC.FilledEvent: raw_hash = _filled_event.GetHashCode(); break; case PTOC.CompletedEvent: raw_hash = _completed_event.GetHashCode(); break; case PTOC.CanceledEvent: raw_hash = _canceled_event.GetHashCode(); break; + case PTOC.SentEvent: raw_hash = _sent_event.GetHashCode(); break; case PTOC.AttachedTargetOrderKey: raw_hash = _attached_target_order_key.GetHashCode(); break; case PTOC.None: raw_hash = 0; break; default: throw ExceptionHelper.unexpected_oneof_case(ptoc); @@ -355,6 +360,7 @@ namespace mbts { _filled_event = null; _completed_event = null; _canceled_event = null; + _sent_event = null; _attached_target_order_key = null; } field = value; diff --git a/src/lib/config/protos/UI.proto b/src/lib/config/protos/UI.proto index e926428e4..0a557f5bb 100644 --- a/src/lib/config/protos/UI.proto +++ b/src/lib/config/protos/UI.proto @@ -78,6 +78,13 @@ message OrderBookOptions { optional double status_color_opacity_when_selected = 2 [default = 0.35]; } +message OrderAlerts { + // when the client sees an order for the first time, + // this time period is used to determine if the order is actually new, + // or [presumably]just arrived bc shell is still initializing, or the server restarted. + optional int32 stale_order_threshold_seconds = 1 [default = 60]; +} + message ShellPingOptions { optional bool shell_ping_is_enabled = 1 [default = true]; optional int32 workloop_milliseconds_interval = 2 [default = 5000]; From a5df3f2da288e97e7f28728d72069fdf1aae6de1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 17 Oct 2019 15:09:10 -0400 Subject: [PATCH 166/252] 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 3b8a4f89cc8964d1f9f1c6d800edc486eae2ef68 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 17 Oct 2019 17:25:20 -0400 Subject: [PATCH 167/252] Rename Log subsystem ClientSdk to just Sdk --- src/client/spark_api/utils/Log.cs | 4 ++-- src/client/spark_sdk/samples/SDKMain.cs | 2 +- src/lib/logging/logging.cpp | 2 +- src/lib/logging/logging.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/spark_api/utils/Log.cs b/src/client/spark_api/utils/Log.cs index 649f7d202..891548cf1 100644 --- a/src/client/spark_api/utils/Log.cs +++ b/src/client/spark_api/utils/Log.cs @@ -34,7 +34,7 @@ namespace bts { Latency, DataFlow, Plugin, - ClientSdk, + Sdk, Http, // Please keep this list in sync with logging.h/logging.cpp } @@ -103,7 +103,7 @@ namespace bts { internal static Logger Ui => new Logger(Subsystem.Ui); internal static Logger Testing => new Logger(Subsystem.Testing); internal static Logger DataFlow => new Logger(Subsystem.DataFlow); - public static Logger ClientSdk => new Logger(Subsystem.ClientSdk); + public static Logger Sdk => new Logger(Subsystem.Sdk); public static Logger Http => new Logger(Subsystem.Http); internal static void log_at(this Logger logger, Level level, string message) { diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs index 9f48e2e54..857db8664 100644 --- a/src/client/spark_sdk/samples/SDKMain.cs +++ b/src/client/spark_sdk/samples/SDKMain.cs @@ -23,7 +23,7 @@ namespace bts.sdk public static void Main(string[] args) { BTS.init(); - Log.ClientSdk.info("Welcome to the BTS Client Side SDK example"); + Log.Sdk.info("Welcome to the BTS Client Side SDK example"); var ctx = new ServiceContext(); string u = args.FirstOrDefault(x => x.Contains("--user=")); diff --git a/src/lib/logging/logging.cpp b/src/lib/logging/logging.cpp index 46d575b2a..e2cd92a96 100644 --- a/src/lib/logging/logging.cpp +++ b/src/lib/logging/logging.cpp @@ -118,7 +118,7 @@ void configure_logging(bts::config::Logging const&cfg, bts::config::ThreadGroupC {log::Latency,"Latency"}, {log::DataFlow,"DataFlow"}, {log::Plugin,"Plugin"}, - {log::ClientSdk,"ClientSdk"}, + {log::Sdk,"Sdk"}, {log::Http,"Http"}, }; diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index 0bfea9935..a2829d224 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -44,8 +44,8 @@ constexpr log::Subsystem Testing {Mercury.ordinal+1 }; constexpr log::Subsystem Latency {Testing.ordinal+1 }; constexpr log::Subsystem DataFlow {Latency.ordinal+1 }; constexpr log::Subsystem Plugin {DataFlow.ordinal+1 }; -constexpr log::Subsystem ClientSdk {Plugin.ordinal+1 }; -constexpr log::Subsystem Http {ClientSdk.ordinal+1 }; +constexpr log::Subsystem Sdk {Plugin.ordinal+1 }; +constexpr log::Subsystem Http {Sdk.ordinal+1 }; struct LoggerHandle { LoggerHandle(LoggerHandle const&) = delete; From 7cbd5adcccbadf3d4c4b4a24e8ca57d773eaeef6 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 17 Oct 2019 17:28:38 -0400 Subject: [PATCH 168/252] Advance linux docker to include 'zip' executable --- docker/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux b/docker/linux index c40e6eba4..68f43cef8 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit c40e6eba4ba72480a68cf784b6ffbcacc3fbf4af +Subproject commit 68f43cef8d3edbda05a9517421092ada3c392aff From c0a2c6a24a257aef764c7b57a873d9f67f0a5b9e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 17 Oct 2019 17:42:30 -0400 Subject: [PATCH 169/252] Split examples into separate directories and add devcontainer --- .../dynamic_join_order/.devcontainer.json | 21 ++++++++++++++ .../dynamic_join_order/.vscode/tasks.json | 28 +++++++++++++++++++ src/sdk/examples/dynamic_join_order/build.sh | 18 ++++++++++++ .../order_plugin_example.cpp | 0 .../build.sh} | 12 -------- .../md_publisher_example.cpp | 0 6 files changed, 67 insertions(+), 12 deletions(-) create mode 100644 src/sdk/examples/dynamic_join_order/.devcontainer.json create mode 100644 src/sdk/examples/dynamic_join_order/.vscode/tasks.json create mode 100644 src/sdk/examples/dynamic_join_order/build.sh rename src/sdk/examples/{ => dynamic_join_order}/order_plugin_example.cpp (100%) rename src/sdk/examples/{build_examples.sh => md_publisher/build.sh} (51%) mode change 100755 => 100644 rename src/sdk/examples/{ => md_publisher}/md_publisher_example.cpp (100%) diff --git a/src/sdk/examples/dynamic_join_order/.devcontainer.json b/src/sdk/examples/dynamic_join_order/.devcontainer.json new file mode 100644 index 000000000..160bbb644 --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/.devcontainer.json @@ -0,0 +1,21 @@ +{ + "name": "Spark sdk container", + "image": "spark_sdk", + "runArgs": [ + "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", + "--name", "spark" + "-u", "bts" + ], + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + // use 9000 to avoid conflict with typical bts dev setup + "appPort": [9000,9001], + // Run commands after container is created + // todo: Run start/stop spark daemon? + "postCreateCommand": "" + "extensions": [ + "ms-vscode.cpptools" + ] +} + diff --git a/src/sdk/examples/dynamic_join_order/.vscode/tasks.json b/src/sdk/examples/dynamic_join_order/.vscode/tasks.json new file mode 100644 index 000000000..2b1b4b56b --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/.vscode/tasks.json @@ -0,0 +1,28 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + // variables: ${workspaceRoot} + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "shell", + "command": "./build.sh", + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Start Sparkd", + "type": "shell", + "command": "cd /sparkbin; ./sparkd run", + "isBackground": true + }, + { + "label": "Stop Sparkd", + "type": "shell", + "command": "pkill -f sparkd" + }, + ] +} diff --git a/src/sdk/examples/dynamic_join_order/build.sh b/src/sdk/examples/dynamic_join_order/build.sh new file mode 100644 index 000000000..559b928f2 --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/build.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +SDK_ROOT=${SDK_ROOT:-..} +echo $SDK_ROOT + +g++ -isystem $SDK_ROOT/externals/include \ + -I $SDK_ROOT/include \ + -I $SDK_ROOT/include/spark \ + -std=c++1z \ + -fPIC \ + -g \ + -shared \ + -o order_plugin_example.so \ + order_plugin_example.cpp \ + -Wl,-rpath,$SDK_ROOT/ \ + -L $SDK_ROOT/lib \ + -l spark + diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/dynamic_join_order/order_plugin_example.cpp similarity index 100% rename from src/sdk/examples/order_plugin_example.cpp rename to src/sdk/examples/dynamic_join_order/order_plugin_example.cpp diff --git a/src/sdk/examples/build_examples.sh b/src/sdk/examples/md_publisher/build.sh old mode 100755 new mode 100644 similarity index 51% rename from src/sdk/examples/build_examples.sh rename to src/sdk/examples/md_publisher/build.sh index 3625e12d8..eac45215c --- a/src/sdk/examples/build_examples.sh +++ b/src/sdk/examples/md_publisher/build.sh @@ -12,15 +12,3 @@ g++ -isystem ../externals/include \ -llttng-ust \ -ldl -g++ -isystem ../externals/include \ - -I ../include \ - -I ../include/spark \ - -std=c++1z \ - -fPIC \ - -g \ - -shared \ - -o order_plugin_example.so \ - order_plugin_example.cpp \ - -Wl,-rpath,.. \ - -L ../lib \ - -l spark diff --git a/src/sdk/examples/md_publisher_example.cpp b/src/sdk/examples/md_publisher/md_publisher_example.cpp similarity index 100% rename from src/sdk/examples/md_publisher_example.cpp rename to src/sdk/examples/md_publisher/md_publisher_example.cpp From fb19dd8ce5c4f043c45e52eeba2830a6d872f050 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 17 Oct 2019 17:43:19 -0400 Subject: [PATCH 170/252] Add sdk dockerfile and create it on build --- .../content/algo/getting-started/download.md | 4 +- .../content/algo/getting-started/overview.md | 10 +++ src/client/spark_sdk/spark_sdk.csproj | 4 -- src/sdk/CMakeLists.txt | 2 + src/sdk/Dockerfile | 28 ++++++++ src/sdk/make_sdk.sh | 6 +- src/sdk/sdk_spark.conf | 28 ++++++++ src/sdk/update_github.cmd | 67 ------------------- src/sdk/update_github.sh | 17 +++++ 9 files changed, 90 insertions(+), 76 deletions(-) create mode 100644 doc/api/content/algo/getting-started/overview.md create mode 100644 src/sdk/Dockerfile create mode 100644 src/sdk/sdk_spark.conf delete mode 100644 src/sdk/update_github.cmd diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index 76a01d2e6..cc28835c0 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -16,9 +16,7 @@ Unzip that folder into a working directory. Inside you should see something like ``` spark_sdk.img spark_installer.exe -devcontainer.json -algo_template/ -bin/ +examples/ ``` ## Import diff --git a/doc/api/content/algo/getting-started/overview.md b/doc/api/content/algo/getting-started/overview.md new file mode 100644 index 000000000..5905ba6c7 --- /dev/null +++ b/doc/api/content/algo/getting-started/overview.md @@ -0,0 +1,10 @@ ++++ +title = "Overview" +weight = 0 ++++ + +- Why should you use BTS algo api? + +Installing the client: +8000:127.0.0.1 + diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index e2f93fec3..9ee2d2b4a 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -71,10 +71,6 @@ - - - - diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index e4a38178e..53841ee2b 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -7,6 +7,8 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk COMMENT "Building SDK" DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh + ${CMAKE_CURRENT_SOURCE_DIR}/Dockerfile + ${CMAKE_CURRENT_SOURCE_DIR}/spark.conf ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/sdk_shell.sh ${CMAKE_CURRENT_SOURCE_DIR}/examples/build_examples.sh diff --git a/src/sdk/Dockerfile b/src/sdk/Dockerfile new file mode 100644 index 000000000..a95d00adc --- /dev/null +++ b/src/sdk/Dockerfile @@ -0,0 +1,28 @@ +from bluetradingsystems/linux_docker + +# configure build_examples +env SDK_ROOT=/sdk + +# Set version with --build-arg VERSION=X +# This lets us query an image to see when it was built +ARG SDK_VERSION=0 +ARG SDK_BUILD_DATE=0 +ARG USERNAME=bts + +# copy sdk +COPY include/ /sdk/include/ +COPY lib/ /sparkbin/ +COPY externals /sdk/externals/ +COPY sdk_spark.conf /sparkdata/conf/ + +# add user bts +RUN groupadd --gid 1000 $USERNAME && \ + useradd -s /bin/bash --uid 1000 --gid 1000 -m $USERNAME && \ + ln -s /sparkbin/ sdk/lib && \ + echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \ + chmod 0440 /etc/sudoers.d/$USERNAME && \ + echo 👍 + + + + diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 945b69c2e..79f3a6ce9 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -21,15 +21,17 @@ mkdir -p $1/sdk/externals/ ln -sf $2/../../externals/linux/include $1/sdk/externals/include ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib -ln -sf $1/server $1/sdk/lib +#ln -sf $1/server $1/sdk/lib +rsync -avzL $1/server/ $1/sdk/lib/ mkdir $1/sdk/examples cp $2/examples/* $1/sdk/examples cp $2/sdk_shell.sh $1/sdk/sdk_shell.sh cp $2/update_github.sh $1/sdk/update_github.sh +cp $2/Dockerfile $1/sdk/ +cp $2/spark.conf $1/sdk/spark.conf cp $2/README.md $1/sdk/README.md -# ln -sf $1/sdk/lib/defaults $1/sdk/examples/defaults chmod +x $1/sdk/examples/build_examples.sh chmod +x $1/sdk/sdk_shell.sh chmod +x $1/sdk/update_github.sh diff --git a/src/sdk/sdk_spark.conf b/src/sdk/sdk_spark.conf new file mode 100644 index 000000000..3c8a13826 --- /dev/null +++ b/src/sdk/sdk_spark.conf @@ -0,0 +1,28 @@ +Logging { + value { + console { + default_level: "Warn" + subsystem { + name: "Sdk" + level: "Info" + } + } + syslog { default_level: "Info" } + file { default_level: "Info" } + } +} + +MarketDataConfig { + value { + use_onixs: false + use_sim: true + } +} + +Ports { + value { + config_port: 9000 + qbus_port: 9001 + exchange_sim_fix_port: 9002 + } +} diff --git a/src/sdk/update_github.cmd b/src/sdk/update_github.cmd deleted file mode 100644 index 16ed85929..000000000 --- a/src/sdk/update_github.cmd +++ /dev/null @@ -1,67 +0,0 @@ -@echo off -setlocal - -set STAGE="c:\temp\bts_staging" -set SDK="spark_client_sdk" -set SRC=%1 -set GH=%2 -set TG=%3 -set OPP=%4 - -if "%SRC%" == "" goto :help -if "%GH%" == "" goto :help -if "%TG%" == "" goto :help - -if "%TG%" == "stage" echo "STAGE ONLY" - -if exist %STAGE% rmdir /s /q %STAGE% -mkdir %STAGE% -git clone --recurse-submodules "%GH%" %STAGE%\\%SDK% - -del /q "%STAGE%\\%SDK%\\*" -FOR /D %%p IN ("%STAGE%\\%SDK%\*.*") DO ( - REM this skips git - if NOT "%%p" == ".git" ( - rmdir /s /q "%%p" - ) -) - -FOR %%i IN ("%src%") DO ( - set filedrive=%%~di - set filepath=%%~pi - set filename=%%~ni - set fileextension=%%~xi - if "%%~xi" == ".nupkg" ( - rem unzip -o %%i -d %STAGE%\\%SDK%\\ - 7z x -o%STAGE%\\%SDK%\\ -y -spe %%i - rmdir /Q /S %STAGE%\\%SDK%\\_rels - rmdir /Q /S %STAGE%\\%SDK%\\package - del /Q %STAGE%\\%SDK%\\spark_sdk.nuspec - del /Q %STAGE%\\%SDK%\\[Content_Types].xml - ) else ( - copy /Y /E %%i %STAGE%\\%SDK%\\ - ) -) -pushd %STAGE%\%SDK%\ - -if NOT "%TG%" == "stage" ( - git status - git add . - git commit -m "%SDK% update %TG%" - git tag "%TG%" - git push origin master --tags %OPP% - - popd - rmdir /s /q %STAGE% -) - -goto :eof - -:help -echo. -echo update_github.cmd ^ ^ [tag] [-push_params] -echo. -echo source can be a nupkg file or a folder -echo. -echo set tag to 'stage' if you don't want to push -goto :eof diff --git a/src/sdk/update_github.sh b/src/sdk/update_github.sh index b81b8ae48..691204c91 100644 --- a/src/sdk/update_github.sh +++ b/src/sdk/update_github.sh @@ -1,5 +1,11 @@ #!/bin/bash +# This script used to only update github +# it shoudl be called "publish_sdk" but +# it gets called from the ops repo and there's +# no way to atomically change both repos +# so we keep the name + SDK="spark_sdk" STAGE="/tmp/bts_staging" SRC=$1 @@ -47,3 +53,14 @@ if [ "$TG" != "stage" ]; then rm -rf $STAGE fi +# Build SDK docker +docker build . --build-arg SDK_VERSION=$TG --build-arg SDK_BUILD_DATE="$(date)" -t spark_sdk +# Save it to disk +docker save spark_sdk > spark_sdk.img +docker rmi spark_sdk +# add it to zip file +zip -rm spark_sdk.zip spark_sdk.img examples +# upload zip file to api.bluetradesys.com + + + From 0d8252e131ac130c3c2bae606c40045796f3cc8d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 21 Oct 2019 12:58:21 -0500 Subject: [PATCH 171/252] SP-252 Parent spreader badge should show the spreader name as well --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 3 +-- .../spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 2 +- src/client/spark/Orders/FillTuple.cs | 4 +++- src/client/spark/Orders/OrderUtils.cs | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 75a876716..e370685ea 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -285,7 +285,6 @@ namespace mbts.spark { public DateTime fill_time => _fill.Timestamp.to_local_time(); public TimeInForce time_in_force => _order.time_in_force(); public OrderType order_type => _order.order_type(); - //public OrderType root_algo_type => _or public string display_name => OrderUtils.display_name(_order, fill_tuple.algo); public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase)); public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(fill_tuple.algo_meta, order_metadata)); @@ -304,7 +303,7 @@ namespace mbts.spark { public OrderType root_algo_order_type => _root_algo.HasValue ? _root_algo.Value.value.CustomCase : OrderType.None; public OrderMetadata root_algo_order_metadata => _model.factory.get_metadata(root_algo_order_type); public Color root_algo_badge_color => _root_algo_badge_color ?? (_root_algo_badge_color = OrderUtils.badge_color(_root_algo_meta, root_algo_order_metadata)).Value; - public string root_algo_display_name => _root_algo?.name ?? root_algo_order_type.display_name(); + public string root_algo_display_name => fill_tuple.root_order_security?.display_name() ?? OrderType.None.display_name(); public bool Equals(Row other) => other != null && other._fill.Equals(_fill) && other._order.Equals(_order); public override bool Equals(object obj) => Equals(obj as Row); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 44fee4c18..8644745b1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -108,7 +108,7 @@ namespace mbts.spark { public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root.algo.value.CustomCase; public OrderMetadata root_algo_order_metadata => _owner.get_metadata(root_algo_order_type); public Brush root_algo_badge_fill => _root_algo_badge_fill ?? (_root_algo_badge_fill = new SolidColorBrush(_root_algo_badge_color)); - public string root_algo_display_name => order_tuple.root.algo.name; + public string root_algo_display_name => order_tuple.root.display_name(); // Tree public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); } diff --git a/src/client/spark/Orders/FillTuple.cs b/src/client/spark/Orders/FillTuple.cs index 87d4bb38c..a639fe575 100644 --- a/src/client/spark/Orders/FillTuple.cs +++ b/src/client/spark/Orders/FillTuple.cs @@ -36,6 +36,8 @@ namespace mbts.spark { public AlgoDefinitionMetadata? root_algo_meta => _order_tuple.HasValue ? _order_tuple.Value.root.meta : null; + public OrderSecurityAlgo? root_order_security => _order_tuple?.root; + public string account { get { var account_string = string.Empty; @@ -85,4 +87,4 @@ namespace mbts.spark { public static string user(this FillTuple fill_tuple) => fill_tuple.order.HasValue ? fill_tuple.order.Value.user() : string.Empty; } -} +} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index 2b4773a67..3c78d22b7 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -158,7 +158,9 @@ namespace mbts.spark { public static string display_name(this OrderSecurity order_tuple) => display_name(order_tuple.order, order_tuple.algo); - public static string display_name(OrderRecordImmutable order, AlgoData? algo) { + public static string display_name(OrderRecordImmutable order, AlgoData? algo, SecurityImmutable? security = null) { + if (order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader && security.HasValue) + return security.Value.ToString(); if (algo.HasValue) { return algo.Value.name; } else if (order.HasDef && order.Def.HasCustomDef) { @@ -250,7 +252,7 @@ namespace mbts.spark { order_type.ToString().ToUpper(); public static string display_name(this OrderSecurityAlgo order_sec_algo) => - display_name(order_sec_algo.order, order_sec_algo.algo); + display_name(order_sec_algo.order, order_sec_algo.algo, order_sec_algo.security); public static string display_name(this CustomOrderDefinitionImmutable algo) => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic ? algo.Dynamic.DynamicOrderType : algo.CustomCase.display_name(); From e97e6b93c7a561cb1ad1ca6d3fef62ba96497f46 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 21 Oct 2019 16:44:00 -0400 Subject: [PATCH 172/252] Adding proto --- src/lib/sparkproto/SparkProtos.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index d0f4c7675..17c5adada 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -174,7 +174,8 @@ THEN message QuoteInsideMarketDistance { RulePriority priority = 1; - uint32 ticks_from_inside = 10; + uint32 on_toward_distance = 10; + uint32 on_away_distance = 20; } /******************************Quote InsideMarketDistanceWithTravel****************************** From c3674888449188c2db5127d41855bca7cf50bfb7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 22 Oct 2019 13:02:10 -0400 Subject: [PATCH 173/252] sdk: refactor example build --- src/sdk/CMakeLists.txt | 6 +++--- src/sdk/Dockerfile | 2 +- src/sdk/examples/build_examples.sh | 15 ++++++++++++++ .../.vscode/c_cpp_properties.json | 20 +++++++++++++++++++ src/sdk/examples/dynamic_join_order/build.sh | 11 ++++++++-- src/sdk/examples/md_publisher/build.sh | 14 ++++++++----- src/sdk/make_sdk.sh | 13 +++++++----- 7 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 src/sdk/examples/build_examples.sh create mode 100644 src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt index 53841ee2b..f7c6200cc 100644 --- a/src/sdk/CMakeLists.txt +++ b/src/sdk/CMakeLists.txt @@ -8,12 +8,12 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/sdk DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_sdk.sh ${CMAKE_CURRENT_SOURCE_DIR}/Dockerfile - ${CMAKE_CURRENT_SOURCE_DIR}/spark.conf + ${CMAKE_CURRENT_SOURCE_DIR}/sdk_spark.conf ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/sdk_shell.sh ${CMAKE_CURRENT_SOURCE_DIR}/examples/build_examples.sh - ${CMAKE_CURRENT_SOURCE_DIR}/examples/md_publisher_example.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/examples/order_plugin_example.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/examples/md_publisher/md_publisher_example.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/examples/dynamic_join_order/order_plugin_example.cpp server_layout) add_custom_target(sdk_dir ALL DEPENDS ${CMAKE_BINARY_DIR}/sdk) diff --git a/src/sdk/Dockerfile b/src/sdk/Dockerfile index a95d00adc..a53476ea8 100644 --- a/src/sdk/Dockerfile +++ b/src/sdk/Dockerfile @@ -13,7 +13,7 @@ ARG USERNAME=bts COPY include/ /sdk/include/ COPY lib/ /sparkbin/ COPY externals /sdk/externals/ -COPY sdk_spark.conf /sparkdata/conf/ +COPY spark.conf /sparkdata/conf/ # add user bts RUN groupadd --gid 1000 $USERNAME && \ diff --git a/src/sdk/examples/build_examples.sh b/src/sdk/examples/build_examples.sh new file mode 100644 index 000000000..135bcc4d3 --- /dev/null +++ b/src/sdk/examples/build_examples.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# exit when the first build fails +set -e + +for e in *; do + if [ -d $e ] + then + pushd $e > /dev/null + if [ -f ./build.sh ]; then + ./build.sh + fi + popd > /dev/null + fi +done diff --git a/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json b/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json new file mode 100644 index 000000000..83bcf23eb --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json @@ -0,0 +1,20 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "/usr/include", + "/usr/local/include", + "${SDK_ROOT}/include", + "${SDK_ROOT}/external/include", + "${workspaceFolder}/**" + ], + "defines": [], + "compilerPath": "/usr/bin/clang", + "cStandard": "c11", + "cppStandard": "c++17", + "intelliSenseMode": "clang-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/src/sdk/examples/dynamic_join_order/build.sh b/src/sdk/examples/dynamic_join_order/build.sh index 559b928f2..5a0670620 100644 --- a/src/sdk/examples/dynamic_join_order/build.sh +++ b/src/sdk/examples/dynamic_join_order/build.sh @@ -1,7 +1,7 @@ #!/bin/bash +set -e -SDK_ROOT=${SDK_ROOT:-..} -echo $SDK_ROOT +SDK_ROOT=${SDK_ROOT:-../..} g++ -isystem $SDK_ROOT/externals/include \ -I $SDK_ROOT/include \ @@ -16,3 +16,10 @@ g++ -isystem $SDK_ROOT/externals/include \ -L $SDK_ROOT/lib \ -l spark +# If we're in the sdk docker copy to /sparkbin +if [ "${SDK_VERSION}" != "" ]; then + mkdir -p /sparkbin/plugins/ + cp order_plugin_example.so /sparkbin/plugins/ +fi + + diff --git a/src/sdk/examples/md_publisher/build.sh b/src/sdk/examples/md_publisher/build.sh index eac45215c..bd9a7d3cc 100644 --- a/src/sdk/examples/md_publisher/build.sh +++ b/src/sdk/examples/md_publisher/build.sh @@ -1,13 +1,17 @@ #!/bin/bash -g++ -isystem ../externals/include \ - -I ../include \ - -I ../include/spark \ +set -e + +SDK_ROOT=${SDK_ROOT:-../..} + +g++ -isystem $SDK_ROOT/externals/include \ + -I $SDK_ROOT/include \ + -I $SDK_ROOT/include/spark \ -std=c++1z \ -o md_publisher_example \ md_publisher_example.cpp \ - -Wl,-rpath,../lib \ - -L ../lib \ + -Wl,-rpath,$SDK_ROOT/lib \ + -L $SDK_ROOT/lib \ -l spark \ -llttng-ust \ -ldl diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index 79f3a6ce9..b9346c501 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -21,19 +21,22 @@ mkdir -p $1/sdk/externals/ ln -sf $2/../../externals/linux/include $1/sdk/externals/include ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib -#ln -sf $1/server $1/sdk/lib -rsync -avzL $1/server/ $1/sdk/lib/ +ln -sf $1/server $1/sdk/lib +# rsync -aL $2/../../externals/linux/include/ $1/sdk/externals/include/ +# rsync -aL $2/../../externals/linux/lib/Release $1/sdk/externals/lib +# rsync -aL $1/server/ $1/sdk/lib/ mkdir $1/sdk/examples -cp $2/examples/* $1/sdk/examples +cp -r $2/examples/* $1/sdk/examples cp $2/sdk_shell.sh $1/sdk/sdk_shell.sh cp $2/update_github.sh $1/sdk/update_github.sh cp $2/Dockerfile $1/sdk/ -cp $2/spark.conf $1/sdk/spark.conf +cp $2/sdk_spark.conf $1/sdk/spark.conf cp $2/README.md $1/sdk/README.md chmod +x $1/sdk/examples/build_examples.sh +chmod +x $1/sdk/examples/*/build.sh chmod +x $1/sdk/sdk_shell.sh chmod +x $1/sdk/update_github.sh -(cd $1/sdk/examples && ./build_examples.sh && ./md_publisher_example >/dev/null) +(cd $1/sdk/examples && ./build_examples.sh) From 26816f004827c9b133d3da843a05c73127e3fb95 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 22 Oct 2019 12:12:17 -0500 Subject: [PATCH 174/252] SP-249 New spreader quoting throttle parameter --- .../QuoteInsideMarketDistanceAwayModel.cs | 40 +++++++++++++++++++ .../QuoteInsideMarketDistanceEnabledModel.cs | 38 ++++++++++++++++++ .../QuoteInsideMarketDistanceTowardModel.cs | 40 +++++++++++++++++++ .../Spreader/VM/ParameterRows/RowModel.cs | 4 ++ .../Modules/Spreader/VM/SyntheticEditorVM.cs | 6 +++ 5 files changed, 128 insertions(+) create mode 100644 src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs create mode 100644 src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs create mode 100644 src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs new file mode 100644 index 000000000..d0a79431c --- /dev/null +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs @@ -0,0 +1,40 @@ +using bts.shell; +using bts.spark; +using mbts.ui.spark; +using System.Collections.Generic; + +namespace mbts.spark { + partial class SyntheticEditorVM { + class QuoteInsideMarketDistanceAwayModel : RowModelBase { + IDictionary _value_store = new Dictionary(); + + public override string display_name { get; } = "Away Distance"; + public override string help_text { get; } = string.Empty; + public override string man_page { get; } = string.Empty; + public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; + + public void apply_value(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup).OnAwayDistance = _value_from_store(leg_tup); + + public override uint get_value(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? + inside_market_distance.OnAwayDistance : + _value_from_store(leg_tup); + + public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { + _value_store[leg_tup.SecurityKey] = value; + if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) + inside_market_distance.OnAwayDistance = value; + } + + protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup) != null; + + QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; + + uint _value_from_store(LegSpreaderParamsTuple leg_tup) => + _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnAwayDistance); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs new file mode 100644 index 000000000..aaf5a198c --- /dev/null +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs @@ -0,0 +1,38 @@ +using bts.shell; +using mbts.ui.spark; + +namespace mbts.spark { + partial class SyntheticEditorVM { + class QuoteInsideMarketDistanceEnabledModel : RowModelBase { + readonly QuoteInsideMarketDistanceAwayModel _away; + readonly QuoteInsideMarketDistanceTowardModel _toward; + + public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceAwayModel away, QuoteInsideMarketDistanceTowardModel toward) { + _away = away; + _toward = toward; + } + + public override string display_name { get; } = string.Empty; + public override string help_text { get; } = string.Empty; + public override string man_page { get; } = string.Empty; + public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; + + public override bool get_value(LegSpreaderParamsTuple leg_tup) => + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance != null; + + public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) { + if (value) { + if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance == null) { + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = SyntheticDataHelper.Defaults.QuoteInsideMarketDistance; + _away.apply_value(leg_tup); + _toward.apply_value(leg_tup); + } + } else { + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = null; + } + _away.set_enabled(leg_tup, value); + _toward.set_enabled(leg_tup, value); + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs new file mode 100644 index 000000000..17f967e02 --- /dev/null +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs @@ -0,0 +1,40 @@ +using bts.shell; +using bts.spark; +using mbts.ui.spark; +using System.Collections.Generic; + +namespace mbts.spark { + partial class SyntheticEditorVM { + class QuoteInsideMarketDistanceTowardModel : RowModelBase { + IDictionary _value_store = new Dictionary(); + + public override string display_name { get; } = "Toward Distance"; + public override string help_text { get; } = string.Empty; + public override string man_page { get; } = string.Empty; + public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; + + public void apply_value(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup).OnTowardDistance = _value_from_store(leg_tup); + + public override uint get_value(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? + inside_market_distance.OnTowardDistance : + _value_from_store(leg_tup); + + public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { + _value_store[leg_tup.SecurityKey] = value; + if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) + inside_market_distance.OnTowardDistance = value; + } + + protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => + _get_inside_market_distance(leg_tup) != null; + + QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; + + uint _value_from_store(LegSpreaderParamsTuple leg_tup) => + _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnTowardDistance); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs index acb145abb..336b506fe 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs @@ -115,6 +115,10 @@ namespace mbts.spark { "dictates if this logic applies to the quoting market or to the synthetic spread " + "market"); + public static ParameterSection InsideMarketDistance => + new ParameterSection("Inside Market Distance", true, + "TODO: add tooltip text here"); + public static ParameterSection InsideMarketThrottleThresholds => new ParameterSection("Inside Market Throttle Thresholds", true, "Reduces re-quoting for quotes that are moving toward the inside market. " + diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 143ead545..9392ef2d2 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -190,6 +190,9 @@ namespace mbts.spark { var quote_inside_market_throttle_ticks = new QuoteInsideMarketThrottleTicksModel(); var quote_inside_market_throttle_min_move = new QuoteInsideMarketThrottleMinMoveModel(); + var quote_inside_market_distance_away = new QuoteInsideMarketDistanceAwayModel(); + var quote_inside_market_distance_toward = new QuoteInsideMarketDistanceTowardModel(); + var pre_hedge_payless_threshold = new PreHedgePaylessThresholdModel(); var pre_hedge_payless_ticks = new PreHedgePaylessTicksModel(); @@ -227,6 +230,9 @@ namespace mbts.spark { //quote_inside_market_throttle_ticks, //quote_inside_market_throttle_min_move, //new MaxTicksInsideMarketModel(), + new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_away, quote_inside_market_distance_toward), + quote_inside_market_distance_away, + quote_inside_market_distance_toward, new PreHedgePaylessEnabledModel(pre_hedge_payless_threshold, pre_hedge_payless_ticks), pre_hedge_payless_threshold, pre_hedge_payless_ticks, From c2ea5aa36f5edf8932c3a1d4a1d3ab3228b0ad41 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 22 Oct 2019 16:35:00 -0400 Subject: [PATCH 175/252] ServiceContext needs to include port when deciding to connect to sparkvm:8000 for debuggin --- src/web/api/src/ServiceContext.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/api/src/ServiceContext.ts b/src/web/api/src/ServiceContext.ts index cd448ec86..4769e5b6a 100644 --- a/src/web/api/src/ServiceContext.ts +++ b/src/web/api/src/ServiceContext.ts @@ -4,7 +4,7 @@ import { assert, assertValid } from 'bts_assert' function default_ws_uri() { if (typeof window == 'undefined') return 'ws://sparkvm:8000/' const loc = window.location - if (loc.hostname === "localhost") { + if (loc.hostname === "localhost" && loc.port === '8000') { return "ws://sparkvm:8000/" } let ws_uri = "ws:"; From 504d09eb6c4290c497812a0e5cbb0c0759f8f71c Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 22 Oct 2019 16:57:43 -0400 Subject: [PATCH 176/252] SP-230 devcontainers are pretty neat --- src/sdk/Dockerfile | 15 +-- .../examples/algo_template/.devcontainer.json | 20 ++++ src/sdk/examples/algo_template/.gitignore | 1 + .../.vscode/c_cpp_properties.json | 21 ++++ .../examples/algo_template/.vscode/tasks.json | 28 +++++ .../examples/algo_template/algo_template.cpp | 107 ++++++++++++++++++ src/sdk/examples/algo_template/build.sh | 29 +++++ .../dynamic_join_order/.devcontainer.json | 13 +-- .../examples/dynamic_join_order/.gitignore | 1 + .../.vscode/c_cpp_properties.json | 7 +- src/sdk/examples/dynamic_join_order/build.sh | 12 +- 11 files changed, 233 insertions(+), 21 deletions(-) create mode 100644 src/sdk/examples/algo_template/.devcontainer.json create mode 100644 src/sdk/examples/algo_template/.gitignore create mode 100644 src/sdk/examples/algo_template/.vscode/c_cpp_properties.json create mode 100644 src/sdk/examples/algo_template/.vscode/tasks.json create mode 100644 src/sdk/examples/algo_template/algo_template.cpp create mode 100644 src/sdk/examples/algo_template/build.sh create mode 100644 src/sdk/examples/dynamic_join_order/.gitignore diff --git a/src/sdk/Dockerfile b/src/sdk/Dockerfile index a53476ea8..d2057b4c6 100644 --- a/src/sdk/Dockerfile +++ b/src/sdk/Dockerfile @@ -1,14 +1,17 @@ from bluetradingsystems/linux_docker -# configure build_examples -env SDK_ROOT=/sdk -# Set version with --build-arg VERSION=X +# Set version with --build-arg SDK_VERSION=X # This lets us query an image to see when it was built ARG SDK_VERSION=0 ARG SDK_BUILD_DATE=0 ARG USERNAME=bts +# configure build_examples +env SDK_ROOT=/sdk \ + SDK_VERSION=$SDK_VERSION \ + SDK_BUILD_DATE=$SDK_BUILD_DATE + # copy sdk COPY include/ /sdk/include/ COPY lib/ /sparkbin/ @@ -21,8 +24,6 @@ RUN groupadd --gid 1000 $USERNAME && \ ln -s /sparkbin/ sdk/lib && \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \ chmod 0440 /etc/sudoers.d/$USERNAME && \ - echo 👍 - - - + chown -R bts.bts /sparkbin/plugins && \ + chown -R bts.bts /sparkdata diff --git a/src/sdk/examples/algo_template/.devcontainer.json b/src/sdk/examples/algo_template/.devcontainer.json new file mode 100644 index 000000000..3aee1e407 --- /dev/null +++ b/src/sdk/examples/algo_template/.devcontainer.json @@ -0,0 +1,20 @@ +{ + "name": "Spark sdk container", + "image": "spark_sdk", + "runArgs": [ + "--shm-size", "1024m", + "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", + "-u", "bts" + ], + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "C_Cpp.default.cppStandard": "c++20" + }, + // use 9000 to avoid conflict with typical bts dev setup + "appPort": [9000,9001], + "postCreateCommand": "", + "extensions": [ + "ms-vscode.cpptools" + ] +} + diff --git a/src/sdk/examples/algo_template/.gitignore b/src/sdk/examples/algo_template/.gitignore new file mode 100644 index 000000000..e1af70fe4 --- /dev/null +++ b/src/sdk/examples/algo_template/.gitignore @@ -0,0 +1 @@ +algo_template.so diff --git a/src/sdk/examples/algo_template/.vscode/c_cpp_properties.json b/src/sdk/examples/algo_template/.vscode/c_cpp_properties.json new file mode 100644 index 000000000..5fea8714c --- /dev/null +++ b/src/sdk/examples/algo_template/.vscode/c_cpp_properties.json @@ -0,0 +1,21 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "/usr/include", + "/usr/local/include", + "${workspaceFolder}/**", + "/sdk/include/", + "/sdk/include/spark", + "/sdk/externals/include" + ], + "defines": [], + "compilerPath": "/usr/bin/clang", + "cStandard": "c11", + "cppStandard": "c++17", + "intelliSenseMode": "clang-x64" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/src/sdk/examples/algo_template/.vscode/tasks.json b/src/sdk/examples/algo_template/.vscode/tasks.json new file mode 100644 index 000000000..2b1b4b56b --- /dev/null +++ b/src/sdk/examples/algo_template/.vscode/tasks.json @@ -0,0 +1,28 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + // variables: ${workspaceRoot} + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "shell", + "command": "./build.sh", + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Start Sparkd", + "type": "shell", + "command": "cd /sparkbin; ./sparkd run", + "isBackground": true + }, + { + "label": "Stop Sparkd", + "type": "shell", + "command": "pkill -f sparkd" + }, + ] +} diff --git a/src/sdk/examples/algo_template/algo_template.cpp b/src/sdk/examples/algo_template/algo_template.cpp new file mode 100644 index 000000000..a7b5c52cb --- /dev/null +++ b/src/sdk/examples/algo_template/algo_template.cpp @@ -0,0 +1,107 @@ +#include "spark/lib/config/config.h" +#include "spark/lib/config/protos/system.pb.h" +#include "spark/lib/domain_model/Security.h" +#include "spark/lib/orderman/orders/algo/IAlgoOrder.h" +#include "spark/lib/orderman/orders/algo/IAlgoServices.h" +#include "spark/lib/plugin/SparkServices.h" + +#include "spark/lib/orderman/order_factory/IOrderFactory.h" +#include "spark/lib/orderman/orderman_utils/Book.h" +#include "spark/lib/utils/PBUtils.h" + +using namespace bts::api::orderman; +using namespace bts::orderman; + +namespace bts { +namespace order_example { + +// Join starts working N ticks away from the market (usually) and then +// watches for the opposite inside to become same side inside market; +// if there is then enough size on that market, it will join. +class MyAlgo : public IAlgoOrder { + public: + MyAlgo(); + ~MyAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_book(SecurityKey, Book const &) override; + void on_child_change(OrderKey, ChildState const &) override; + + private: + enum class Status; + struct PImpl; + std::unique_ptr me; + IAlgoServices &algo_services() const; +}; + + +// All state information needed for this algo +struct MyAlgo::PImpl { + IAlgoServices *algo_services; +}; + +MyAlgo::MyAlgo() : me(new PImpl()) {} +MyAlgo::~MyAlgo() {} +IAlgoServices &MyAlgo::algo_services() const { return *me->algo_services; } + +// This is called outside of the latency sensitive path +// once. Expensive initialization should be done here, rather than +// in do_launch() +OrderOpResult MyAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { +} + +// Called in the latency sensitive path, once, when the algo is first +// launched. +void MyAlgo::do_launch(IAlgoServices &services) { +} + +// Called in the latency sensitive path, once, when the algo is first +// launched. In this case the algo is provided with an existing order +// it is now responsible for managing. +void MyAlgo::do_launch_attached(IAlgoServices &services, + OrderKey attached_order, ChildState st) { +} + +// Called when a human (or a supervising algo) updates a parameter for +// this algo. The implementation validates the update and depending on +// the validation outcome either applies the update or terminates the +// algo. +void MyAlgo::do_update(api::orderman::Update const &update) { +} + +// Called when the book for the specified security has changed +void MyAlgo::on_book(SecurityKey, Book const &b) { +} + +// Our child reported a change +void MyAlgo::on_child_change(OrderKey, ChildState const &st) { +} + +// This is called by the spark daemon at startup. In this call we +// describe our algo's parameters and register a factory function to +// create an instance of the algo. +extern "C" void init_spark_plugin(bts::SparkServices &serv) { + using namespace bts; + + DynamicOrderDescriptor join_desc; + + // Start by naming our order type + join_desc.set_dynamic_order_type("My Algo"); + + // Associate the descriptor with a builder function and register + // that with the Spark server. + auto result = + serv.register_dynamic_algo_order( + join_desc, []() { return std::make_unique(); }); + + if (result != bts::AlgoRegistrationResult::SUCCESS) { + // The join_desc has errors + // Check the error log (/sparkdata/data/logging/log) for more details + } +} + +} // namespace order_example +} // namespace bts diff --git a/src/sdk/examples/algo_template/build.sh b/src/sdk/examples/algo_template/build.sh new file mode 100644 index 000000000..445e5154c --- /dev/null +++ b/src/sdk/examples/algo_template/build.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +SDK_ROOT=${SDK_ROOT:-../..} +PLUGIN_NAME=algo_template + +g++ -isystem $SDK_ROOT/externals/include \ + -I $SDK_ROOT/include \ + -I $SDK_ROOT/include/spark \ + -std=c++1z \ + -fPIC \ + -g \ + -shared \ + -o $PLUGIN_NAME.so \ + $PLUGIN_NAME.cpp \ + -Wl,-rpath,$SDK_ROOT/ \ + -L $SDK_ROOT/lib \ + -l spark + +# If we're in the sdk docker copy to /sparkbin +yellow=$'\e[1;33m' +end=$'\e[0m' +if [ "${SDK_VERSION}" != "" ]; then + cp $PLUGIN_NAME.so /sparkbin/plugins/ + echo $PLUGIN_NAME.so copied to /sparkbin/plugins/ + echo ${yellow}Restart sparkd to see changes.${end} +fi + + diff --git a/src/sdk/examples/dynamic_join_order/.devcontainer.json b/src/sdk/examples/dynamic_join_order/.devcontainer.json index 160bbb644..3aee1e407 100644 --- a/src/sdk/examples/dynamic_join_order/.devcontainer.json +++ b/src/sdk/examples/dynamic_join_order/.devcontainer.json @@ -2,18 +2,17 @@ "name": "Spark sdk container", "image": "spark_sdk", "runArgs": [ + "--shm-size", "1024m", "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", - "--name", "spark" "-u", "bts" ], - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, + "settings": { + "terminal.integrated.shell.linux": "/bin/bash", + "C_Cpp.default.cppStandard": "c++20" + }, // use 9000 to avoid conflict with typical bts dev setup "appPort": [9000,9001], - // Run commands after container is created - // todo: Run start/stop spark daemon? - "postCreateCommand": "" + "postCreateCommand": "", "extensions": [ "ms-vscode.cpptools" ] diff --git a/src/sdk/examples/dynamic_join_order/.gitignore b/src/sdk/examples/dynamic_join_order/.gitignore new file mode 100644 index 000000000..e4eea9277 --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/.gitignore @@ -0,0 +1 @@ +order_plugin_example.so diff --git a/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json b/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json index 83bcf23eb..5fea8714c 100644 --- a/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json +++ b/src/sdk/examples/dynamic_join_order/.vscode/c_cpp_properties.json @@ -5,9 +5,10 @@ "includePath": [ "/usr/include", "/usr/local/include", - "${SDK_ROOT}/include", - "${SDK_ROOT}/external/include", - "${workspaceFolder}/**" + "${workspaceFolder}/**", + "/sdk/include/", + "/sdk/include/spark", + "/sdk/externals/include" ], "defines": [], "compilerPath": "/usr/bin/clang", diff --git a/src/sdk/examples/dynamic_join_order/build.sh b/src/sdk/examples/dynamic_join_order/build.sh index 5a0670620..f80c06d68 100644 --- a/src/sdk/examples/dynamic_join_order/build.sh +++ b/src/sdk/examples/dynamic_join_order/build.sh @@ -2,6 +2,7 @@ set -e SDK_ROOT=${SDK_ROOT:-../..} +PLUGIN_NAME=order_plugin_example g++ -isystem $SDK_ROOT/externals/include \ -I $SDK_ROOT/include \ @@ -10,16 +11,19 @@ g++ -isystem $SDK_ROOT/externals/include \ -fPIC \ -g \ -shared \ - -o order_plugin_example.so \ - order_plugin_example.cpp \ + -o $PLUGIN_NAME.so \ + $PLUGIN_NAME.cpp \ -Wl,-rpath,$SDK_ROOT/ \ -L $SDK_ROOT/lib \ -l spark # If we're in the sdk docker copy to /sparkbin +yellow=$'\e[1;33m' +end=$'\e[0m' if [ "${SDK_VERSION}" != "" ]; then - mkdir -p /sparkbin/plugins/ - cp order_plugin_example.so /sparkbin/plugins/ + cp $PLUGIN_NAME.so /sparkbin/plugins/ + echo $PLUGIN_NAME.so copied to /sparkbin/plugins/ + echo ${yellow}Restart sparkd to see changes.${end} fi From 9d2f2888bb0a6dcd02a4928980049ebd7e5f2e88 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 23 Oct 2019 09:08:20 -0500 Subject: [PATCH 177/252] 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 178/252] 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 From 950073703f568e411285003f166d118bef8e6865 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 23 Oct 2019 19:40:11 -0400 Subject: [PATCH 179/252] SP-230 Scripts to deploy to api.bluetradesys.com --- doc/api/content/algo/getting-started/download.md | 2 +- doc/api/deploy_to_web.sh | 14 +++----------- src/sdk/make_sdk.sh | 2 ++ src/sdk/update_github.sh | 1 + 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index cc28835c0..5aebdbca3 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -9,7 +9,7 @@ To start using the BTS Spark SDK you will need to request access though our sale ## Download -Download the latest SDK image here: spark_sdk.zip +Download the latest SDK image here: spark_sdk.zip Unzip that folder into a working directory. Inside you should see something like this: diff --git a/doc/api/deploy_to_web.sh b/doc/api/deploy_to_web.sh index be529c3e2..97afc5360 100644 --- a/doc/api/deploy_to_web.sh +++ b/doc/api/deploy_to_web.sh @@ -1,15 +1,7 @@ #/bin/bash -#python -m mkdocs build -d site -zola build +# ../../externals/linux/bin/zola/zola build +zola.exe build -scp -r ./public bts@bluetradesys.com:/home/bts/doc/ +rsync -avzL public/ bts@api.bluetradesys.com:/data/sdk/public/ -ssh bts@bluetradesys.com << EOF -cd doc -sudo rm -r /var/www/api/* -sudo mv ./public/* /var/www/api/ - -EOF - -rm -r public diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index b9346c501..a2fe8f87d 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -19,6 +19,8 @@ mkdir -p $1/sdk/externals/ (cd $1/src && find lib -type f -name "*.h" -exec cp --parents \{\} $1/sdk/include/spark/ \;) (cd $1/src && find lib -type f -name "*.cc" -exec cp --parents \{\} $1/sdk/include/spark/ \;) +# To build the docker image locally swap the next 3 'ln' for the 3 'rsync' +# Docker will refuse to follow the symlinks during docker build ln -sf $2/../../externals/linux/include $1/sdk/externals/include ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib ln -sf $1/server $1/sdk/lib diff --git a/src/sdk/update_github.sh b/src/sdk/update_github.sh index 691204c91..df7f9af90 100644 --- a/src/sdk/update_github.sh +++ b/src/sdk/update_github.sh @@ -61,6 +61,7 @@ docker rmi spark_sdk # add it to zip file zip -rm spark_sdk.zip spark_sdk.img examples # upload zip file to api.bluetradesys.com +scp spark_sdk.zip bts@api.bluetradesys.com:/data/sdk/download/ From dc4453e51014bfc562aaae96ac9a37d96d276f17 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 24 Oct 2019 08:32:38 -0500 Subject: [PATCH 180/252] SP-256 - hide deleted accounts --- 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 2bbf79243..77a6829d6 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -25,7 +25,7 @@ namespace mbts.spark { usr.UserData.AccountPermissions.AccountPermissions .Where(kv => (kv.Value.TradingPermission != null && kv.Value.TradingPermission.HasPermissions) || kv.Value.AdminPermission.HasPermissions) .Select(kv => ad.Accounts.Where(a => a.Id == kv.Key).TryGetSingle(out var acc) ? acc : (BTSAccountImmutable?)null) - .Where(acc => acc.HasValue) + .Where(acc => acc.HasValue && acc.Value.IsPresent) .Select(acc => acc.Value) .ToDictionary(acc => acc.Id, acc => acc.Name) : new Dictionary(0)) From 88e17743efdc1367ebaed53d7a5dc62a4fd28b1e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 24 Oct 2019 11:28:04 -0400 Subject: [PATCH 181/252] Disable onixs for sdk sparkd --- src/sdk/disable_onixs.py | 13 +++++++++++++ src/sdk/make_sdk.sh | 1 + src/sdk/update_github.sh | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 src/sdk/disable_onixs.py diff --git a/src/sdk/disable_onixs.py b/src/sdk/disable_onixs.py new file mode 100644 index 000000000..413488411 --- /dev/null +++ b/src/sdk/disable_onixs.py @@ -0,0 +1,13 @@ +#!/usr/bin/python + +import sys +f = open(sys.argv[1], 'rb+') +license = '5E50A1DACD94D7C1BECD316EEAE5AB02' +data = f.read() +match = data.find(license) +if match > 0: + f.seek(match) + f.write('DEAD'*8) + exit(0) +exit(-1) + diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index a2fe8f87d..d3f22ceac 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -35,6 +35,7 @@ cp $2/update_github.sh $1/sdk/update_github.sh cp $2/Dockerfile $1/sdk/ cp $2/sdk_spark.conf $1/sdk/spark.conf cp $2/README.md $1/sdk/README.md +cp $2/disable_onixs.py $1/sdk/disable_onixs.py chmod +x $1/sdk/examples/build_examples.sh chmod +x $1/sdk/examples/*/build.sh diff --git a/src/sdk/update_github.sh b/src/sdk/update_github.sh index df7f9af90..bea15ae93 100644 --- a/src/sdk/update_github.sh +++ b/src/sdk/update_github.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # This script used to only update github # it shoudl be called "publish_sdk" but @@ -37,6 +38,7 @@ pushd $STAGE/$SDK rm ./examples/md_publisher_example rm ./examples/order_plugin_example.so rm ./lib/data_files/cert_secure_logon.txt +./disable_onixs.py ./lib/libspar.so rm -r ./externals/lib/libonixs* rm -r ./externals/include/OnixS/ rm -r ./externals/lib/celoxica/ From d433368795c7dd1aec6e4c96577371f4997101dc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 11:51:39 -0500 Subject: [PATCH 182/252] fix typo in 'order sent alert' predicate (creation time comparison was backwards) --- .../spark/Predicates/Data/Events/OrderSentEventPredicate.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs index f1c98817c..f16dc8ed8 100644 --- a/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs +++ b/src/client/spark/Predicates/Data/Events/OrderSentEventPredicate.cs @@ -58,7 +58,7 @@ namespace mbts { // verify security (sec_pred == null || (os.security.HasValue && sec_pred.trigger(os.security.Value))) && // verify not stale - ((os.order.created() - DateTime.Now) < _stale_order_threshold) && + ((DateTime.Now - os.order.created()) < _stale_order_threshold) && // verify order hasn't been added yet // Note: the notification service should offer a way to connect predicates so that they only receive items in TableUpdate.added, // however, the notification service predated TableUpdate.Changes, so for now, just check that the history.Count == 1) From ec0d5d22f10607dd374d9ce11b5ed5883322f409 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 12:37:13 -0500 Subject: [PATCH 183/252] SyntheticEditor - disable Quote Throttle/Inside Market Distance by default --- src/client/spark/Modules/Spreader/SyntheticDataHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs index 2b35df0f2..13a3321f3 100644 --- a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs +++ b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs @@ -81,9 +81,9 @@ namespace bts.shell { #region QuoteParams public static QuoteParams QuoteParams => new QuoteParams { LeanQuantityRatio = 1, - QuoteInsideMarketDistance = QuoteInsideMarketDistance, + //QuoteInsideMarketDistance = QuoteInsideMarketDistance, QuoteMaxOrderMove = QuoteMaxOrderMove, - QuoteMuteZone = QuoteMuteZone, + //QuoteMuteZone = QuoteMuteZone, QuoteRepriceThrottle = QuoteRepriceThrottle, QuoteInsideMarketDistanceWithTravel = QuoteInsideMarketDistanceWithTravel, }; From 5826a083c0d707c75ab0e1163273b089307c9a95 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 12:44:47 -0500 Subject: [PATCH 184/252] SyntheticEditor - remove Quote Inside Market Away Distance param --- .../QuoteInsideMarketDistanceEnabledModel.cs | 7 +------ src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs index aaf5a198c..a09a86e10 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs @@ -4,13 +4,10 @@ using mbts.ui.spark; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteInsideMarketDistanceEnabledModel : RowModelBase { - readonly QuoteInsideMarketDistanceAwayModel _away; readonly QuoteInsideMarketDistanceTowardModel _toward; - public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceAwayModel away, QuoteInsideMarketDistanceTowardModel toward) { - _away = away; + public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceTowardModel toward) => _toward = toward; - } public override string display_name { get; } = string.Empty; public override string help_text { get; } = string.Empty; @@ -24,13 +21,11 @@ namespace mbts.spark { if (value) { if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance == null) { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = SyntheticDataHelper.Defaults.QuoteInsideMarketDistance; - _away.apply_value(leg_tup); _toward.apply_value(leg_tup); } } else { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = null; } - _away.set_enabled(leg_tup, value); _toward.set_enabled(leg_tup, value); } } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 9392ef2d2..d6e81bb99 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -190,7 +190,6 @@ namespace mbts.spark { var quote_inside_market_throttle_ticks = new QuoteInsideMarketThrottleTicksModel(); var quote_inside_market_throttle_min_move = new QuoteInsideMarketThrottleMinMoveModel(); - var quote_inside_market_distance_away = new QuoteInsideMarketDistanceAwayModel(); var quote_inside_market_distance_toward = new QuoteInsideMarketDistanceTowardModel(); var pre_hedge_payless_threshold = new PreHedgePaylessThresholdModel(); @@ -230,8 +229,7 @@ namespace mbts.spark { //quote_inside_market_throttle_ticks, //quote_inside_market_throttle_min_move, //new MaxTicksInsideMarketModel(), - new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_away, quote_inside_market_distance_toward), - quote_inside_market_distance_away, + new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_toward), quote_inside_market_distance_toward, new PreHedgePaylessEnabledModel(pre_hedge_payless_threshold, pre_hedge_payless_ticks), pre_hedge_payless_threshold, From 7531cf5eb49aa0593909002b3f64a82a32ddfc1e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 15:38:15 -0500 Subject: [PATCH 185/252] remove unused synth param 'QuoteInsideMarketDistanceAwayModel' --- .../QuoteInsideMarketDistanceAwayModel.cs | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs deleted file mode 100644 index d0a79431c..000000000 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs +++ /dev/null @@ -1,40 +0,0 @@ -using bts.shell; -using bts.spark; -using mbts.ui.spark; -using System.Collections.Generic; - -namespace mbts.spark { - partial class SyntheticEditorVM { - class QuoteInsideMarketDistanceAwayModel : RowModelBase { - IDictionary _value_store = new Dictionary(); - - public override string display_name { get; } = "Away Distance"; - public override string help_text { get; } = string.Empty; - public override string man_page { get; } = string.Empty; - public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; - - public void apply_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup).OnAwayDistance = _value_from_store(leg_tup); - - public override uint get_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? - inside_market_distance.OnAwayDistance : - _value_from_store(leg_tup); - - public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; - if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) - inside_market_distance.OnAwayDistance = value; - } - - protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) != null; - - QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; - - uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnAwayDistance); - } - } -} \ No newline at end of file From 7fef7d88ce80f753b0a0a0ca9fd02f9fe8d05097 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 15:40:30 -0500 Subject: [PATCH 186/252] refactor QuoteInsideMarketDistance to new proto type (cannot recycle old type bc it must be null in existing synths) --- .../spark/Modules/Spreader/SyntheticDataHelper.cs | 1 + .../QuoteInsideMarketDistanceEnabledModel.cs | 8 ++++---- .../QuoteInsideMarketDistanceTowardModel.cs | 13 ++++++------- src/lib/sparkproto/SparkProtos.proto | 5 +++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs index 13a3321f3..3d68bd7a8 100644 --- a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs +++ b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs @@ -113,6 +113,7 @@ namespace bts.shell { }; public static QuoteInsideMarketDistanceWithTravel QuoteInsideMarketDistanceWithTravel => new QuoteInsideMarketDistanceWithTravel { Priority = RulePriority }; public static QuoteInsideMarketDistance QuoteInsideMarketDistance => new QuoteInsideMarketDistance { Priority = RulePriority }; + public static QuoteInsideMarketDistanceThrottle QuoteInsideMarketDistanceThrottle => new QuoteInsideMarketDistanceThrottle(); #endregion #region PreHedge diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs index a09a86e10..15ebf0481 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs @@ -15,16 +15,16 @@ namespace mbts.spark { public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; public override bool get_value(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance != null; + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle != null; public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) { if (value) { - if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance == null) { - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = SyntheticDataHelper.Defaults.QuoteInsideMarketDistance; + if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle == null) { + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceThrottle; _toward.apply_value(leg_tup); } } else { - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = null; + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = null; } _toward.set_enabled(leg_tup, value); } diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs index 17f967e02..f38365209 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs @@ -1,5 +1,4 @@ -using bts.shell; -using bts.spark; +using bts.spark; using mbts.ui.spark; using System.Collections.Generic; @@ -17,24 +16,24 @@ namespace mbts.spark { _get_inside_market_distance(leg_tup).OnTowardDistance = _value_from_store(leg_tup); public override uint get_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? + _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance ? inside_market_distance.OnTowardDistance : _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { _value_store[leg_tup.SecurityKey] = value; - if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) + if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance) inside_market_distance.OnTowardDistance = value; } protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => _get_inside_market_distance(leg_tup) != null; - QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; + QuoteInsideMarketDistanceThrottle _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnTowardDistance); + _value_store.GetValueOrDefault(leg_tup.SecurityKey); } } } \ No newline at end of file diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 17c5adada..5d07a3b12 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -65,6 +65,7 @@ message QuoteParams QuoteRepriceThrottle quote_reprice_throttle = 1010; QuoteInsideMarketDistance quote_inside_market_distance = 1020; QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; + QuoteInsideMarketDistanceThrottle quote_inside_market_distance_throttle = 1070; QuoteMaxOrderMove quote_max_order_move = 1040; QuoteHidden quote_hidden = 1050; ConditionalQuoting conditional_quoting=1060; @@ -218,6 +219,10 @@ message QuoteInsideMarketDistanceWithTravel uint32 limit = 20; } +message QuoteInsideMarketDistanceThrottle { + uint32 on_toward_distance = 10; +} + /*******************************Quote MaxOrderMove (unused)************************************** (TT) Max Order Move [Pre-Quote] This rule sets a restriction on how far a quoting order can move in one action. If triggered, From 3544eac81565db94e85fed46c2df382ae53e1426 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 24 Oct 2019 17:09:24 -0400 Subject: [PATCH 187/252] Cleaned up the quote throttling code --- src/lib/domain_model/Security.h | 26 +++++- .../spreader_orders/spreader/SpreaderUtils.h | 88 +++++++++++++------ .../QuoterWorkingStateWorker.cpp | 30 +++++-- src/lib/sparkproto/SparkProtos.proto | 6 ++ 4 files changed, 110 insertions(+), 40 deletions(-) diff --git a/src/lib/domain_model/Security.h b/src/lib/domain_model/Security.h index 80444d860..697678f5b 100644 --- a/src/lib/domain_model/Security.h +++ b/src/lib/domain_model/Security.h @@ -43,6 +43,8 @@ inline api::Side other_side(api::Side side) { inline double market_epislon() { return 1e-10; } +// better == p1 more aggressive than p1 ie for a buy order p1 is higher +// than p2, and for a sell order p1 is lower than p2 inline bool is_better(api::Side side, Price p1, Price p2) { switch (side) { case api::SIDE_BUY: @@ -54,6 +56,7 @@ inline bool is_better(api::Side side, Price p1, Price p2) { } } +// like the above function inline Price improve_price(api::Side side, Price p, Price offset) { switch (side) { case api::SIDE_BUY: @@ -169,13 +172,30 @@ inline Price tick_size(api::Security const &sec) { // Looking to round md::IntPrice? Look in IntPrice.h -// computes the difference between 2 prices in ticks. -// the result is an a signed int so the order of args -// matter, its second price - first price +// computes price_2 - price_1 in ticks inline int price_diff_to_ticks(double price_1, double price_2, double tick_size) { return static_cast(std::round((price_2 - price_1) / tick_size)); } +// returns the difference (in ticks) bw and order and a market. +// if the order has crossed the market, returns -ve ticks +// (ie the buy order price > market_price or +// sell_order_price < market_price) +inline int order_diff_market(double order_price, + double market_price, + api::Side side, + double tick_size){ + switch (side) { + case api::SIDE_BUY: + return price_diff_to_ticks(order_price,market_price,tick_size); + case api::SIDE_SELL: + return price_diff_to_ticks(market_price,order_price,tick_size); + default: + bts_assert(false); + break; + } + return 0; +} // because of prices not being completely rounded to the tick, // simple double equality can not be used to compare prices. // this function deems 2 prices to be equal if they are within diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 559fa2c96..d4f543b14 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -9,6 +9,7 @@ #include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" +#include "lib/os/os.h" #include namespace bts { @@ -284,35 +285,66 @@ public: //////////////////////////////////////////////////// // quoting params ////////////////////////////////// //////////////////////////////////////////////////// - // given the new price, applies the quoting parameters (mute etc) - // to see if quote needs to be repriced - static bool reprice_quote_mute_zone(double current_price, - double new_price, - api::Side quote_side, - double tick_size, - const bts::spark::QuoteMuteZone& quote_mute_zone){ - int price_change_ticks = bts::securities::price_diff_to_ticks (current_price, new_price, tick_size); - if (price_change_ticks != 0){ - bool price_increasing = price_change_ticks > 0; - uint32_t abs_price_change_ticks = static_cast(std::abs(price_change_ticks)); - LOG(OrderMan, Diag, "SpreaderUtils::reprice_quote_mute_zone current_price: {} new_price: {} price_change_ticks: {} abs_price_change_ticks: {} inside_limit_ticks: {} outside_limit_ticks: {}", - current_price, new_price, price_change_ticks, abs_price_change_ticks, quote_mute_zone.inside_ticks(), quote_mute_zone.outside_ticks()); - if (quote_side == api::SIDE_BUY){ - if (price_increasing) // moving toward inside market - return abs_price_change_ticks > quote_mute_zone.inside_ticks(); - else - return abs_price_change_ticks > quote_mute_zone.outside_ticks(); - } - else{ - if (!price_increasing) // moving toward inside market - return abs_price_change_ticks > quote_mute_zone.inside_ticks(); - else - return abs_price_change_ticks > quote_mute_zone.outside_ticks(); - } - } - else - return false; + static bool is_throttle_reject(double current_price, + double new_price, + const Book& qbook, + api::Side quote_side, + double tick_size, + const bts::spark::QuoteParams& quote_params){ + + bool reject = + (quote_params.has_quote_mute_zone() && + is_quote_mute_zone_reject(current_price, + new_price, + quote_side, + tick_size, + quote_params.quote_mute_zone())) || + (quote_params.has_quote_inside_market_distance() && + is_quote_inside_market_reject(current_price, + new_price, + qbook.side(quote_side)[0].price(), + quote_side, + tick_size, + quote_params.quote_inside_market_distance())); + return reject; } + + // returns true is quote mute zone rejects the price change + static bool is_quote_mute_zone_reject(double current_price, + double new_price, + api::Side quote_side, + double tick_size, + const bts::spark::QuoteMuteZone& quote_mute_zone){ + int ticks_moved = bts::securities::price_diff_to_ticks(current_price, new_price, tick_size); + bool toward_inside = quote_side==api::Side::SIDE_BUY ? ticks_moved >=0 : ticks_moved <= 0; + uint32_t throttle = toward_inside ? quote_mute_zone.inside_ticks() : + quote_mute_zone.outside_ticks(); + uint32_t abs_ticks_moved = static_cast(std::abs(ticks_moved)); + // has to move outside of the zone + return abs_ticks_moved <= throttle; + } + // returns false if the param surpresses the quote + static bool is_quote_inside_market_reject( + double current_price, + double new_price, + double inside_market, + api::Side quote_side, + double tick_size, + const bts::spark::QuoteInsideMarketDistance& imd){ + bool toward = bts::securities::is_equal_or_better(quote_side, + Price(new_price), + Price(current_price)); + if(toward && !os::is_nan(inside_market)){ + int new_order_diff_market = bts::securities::order_diff_market( + new_price, + inside_market, + quote_side, + tick_size); + return new_order_diff_market > static_cast(imd.on_toward_distance()); + } + return false; + } + static bool conditional_quoting(Price quoting_price, Quantity quoting_qty, size_t leg_idx, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp index 14c5d30f4..12ace9abf 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp @@ -73,19 +73,31 @@ void QuoterWorkingStateWorker::_longpath_analyze_and_act () } else{ // to adjust for what has already been filled - Quantity order_quantity = Quantity (computed_quantity.value() + _quoter->_price_quantity_state.aggregated_filled_quantity().value()); - if (order_quantity.value() != _quoter->_price_quantity_state.out_quantity().value()) + Quantity order_quantity = Quantity ( + computed_quantity.value() + + _quoter->_price_quantity_state.aggregated_filled_quantity().value() + ); + if (order_quantity != _quoter->_price_quantity_state.out_quantity()) // this is a size change, size changes always go through regardless of the // quoting parameters _modify_order (computed_price, order_quantity); else{ - bool reprice = true; - if (_quoter->_this_leg_data.leg_params().quote_params().has_quote_mute_zone()) - reprice = SpreaderUtils::reprice_quote_mute_zone(_quoter->_price_quantity_state.out_price().value(), computed_price.value(), _quoter->_this_leg_data.trading_side(), - _quoter->_this_leg_data.tick_size(), _quoter->_this_leg_data.leg_params().quote_params().quote_mute_zone()); - reprice=reprice && !(_quoter->_spreader.in_cache_warming_cycle()); - if (reprice) - _modify_order (computed_price, order_quantity); + Price curr_price = _quoter->_price_quantity_state.out_price(); + if(!bts::securities::is_same(curr_price,computed_price)){ + const Book& book = + _quoter->_spreader.get_book(_quoter->_this_leg_data.leg_index()); + bool throttle_reject = SpreaderUtils::is_throttle_reject( + curr_price.value(), + computed_price.value(), + book, + _quoter->_this_leg_data.trading_side(), + _quoter->_this_leg_data.tick_size(), + _quoter->_this_leg_data.leg_params().quote_params()); + bool reprice = !throttle_reject; + reprice = reprice && !(_quoter->_spreader.in_cache_warming_cycle()); + if (reprice) + _modify_order (computed_price, order_quantity); + } } } } diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 17c5adada..e1b14e4fa 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -68,6 +68,7 @@ message QuoteParams QuoteMaxOrderMove quote_max_order_move = 1040; QuoteHidden quote_hidden = 1050; ConditionalQuoting conditional_quoting=1060; + QuoteInsideMarketDistanceThrottle quote_inside_market_distance_throttle = 1070; // default value 0, 1 means we will have one trailing // order behind the top level // (once we have ChildOrder's here, we can reture this @@ -129,6 +130,11 @@ message ConditionalQuoting{ PriceType price_type=10; } +message QuoteInsideMarketDistanceThrottle +{ + uint32 on_toward_distance = 10; +} + /*************************************Quote RepriceThrottled (unused)******************************* (Stellar's sensitivity) This parameter defines regions (wrt their distance from the inside market) From cf2bc03dd1b844dda52604137aabdb955f1e544a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 24 Oct 2019 17:36:27 -0400 Subject: [PATCH 188/252] SP-230 Editing --- doc/api/content/algo/_index.md | 2 +- .../content/algo/getting-started/install.md | 14 +++++------- .../content/algo/getting-started/overview.md | 22 ++++++++++++++++--- doc/api/templates/index.html | 18 +++++++++++---- doc/api/templates/shortcodes/info.html | 4 ++++ doc/api/templates/shortcodes/linux.html | 1 + 6 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 doc/api/templates/shortcodes/info.html diff --git a/doc/api/content/algo/_index.md b/doc/api/content/algo/_index.md index 06f8f2119..2e46b73a9 100644 --- a/doc/api/content/algo/_index.md +++ b/doc/api/content/algo/_index.md @@ -1,7 +1,7 @@ +++ title="Algo API" template="documentation.html" -redirect_to = "algo/getting-started/install/" +redirect_to = "algo/getting-started/overview/" sort_by="weight" +++ diff --git a/doc/api/content/algo/getting-started/install.md b/doc/api/content/algo/getting-started/install.md index 4edffa53c..08d5f9ddf 100644 --- a/doc/api/content/algo/getting-started/install.md +++ b/doc/api/content/algo/getting-started/install.md @@ -5,14 +5,12 @@ weight = 1 These instructions assume you are using Microsoft Windows but you should be able to follow them on a Linux or Mac with minor modifications. -
- +{% linux() %} When there is a significant difference on non-Windows platforms it will be called out in a box like this one. -
-
- +{% end %} +{% info() %} Tips or solutions to common problems will be highlighted in a box like this. -
+{% end %} The minimum hardware requirements for using the SDK are: - **12 GB** RAM (preferably 16 GB or more) @@ -54,8 +52,6 @@ If you run into trouble with drive sharing, see Visual Studio Code -editor to develop your Algo. The Spark SDK comes with a complete configuration for C++ development with VSCode so this is the simplest way to get started. However, if you are already familiar with a different editor you are welcome to use it. +The Algo SDK includes a complete configuration for C++ development with the Visual Studio Code editor. If you are a new to C++ development on a Linux system we recommend you give this a try as it's the easiest way to get up and running quickly. Of course, If you have a different editor that you prefer we fully support that as well. diff --git a/doc/api/content/algo/getting-started/overview.md b/doc/api/content/algo/getting-started/overview.md index 5905ba6c7..5d46de180 100644 --- a/doc/api/content/algo/getting-started/overview.md +++ b/doc/api/content/algo/getting-started/overview.md @@ -3,8 +3,24 @@ title = "Overview" weight = 0 +++ -- Why should you use BTS algo api? +Spark consists of a client UI ([Spark Client](https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen)), a high performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols (typically FIX/TCP for execution and some proprietary protocol over UDP multicast for market data). + + + +## What is the Spark Algo SDK? + +The Spark platform offers a sub-10 microsecond socket to socket response times for algorithmic trading. With the **Spark Algo SDK** you can create your order types ("Algos) in high-performance C++ and load them into the Spark server. Since your order is loaded directly into the Spark Server, there is no performance difference between your Algo and the in-box algorithms. + + + +## Control + +Once loaded into the Spark server, your order type shows up in the Spark ladder, just like the in-box order types. + +If you are interested in sending orders to or otherwise controlling a Spark server remotely, please see the BTS [Spark Client SDK](/client/). + + + -Installing the client: -8000:127.0.0.1 diff --git a/doc/api/templates/index.html b/doc/api/templates/index.html index dd28c9e1a..075572955 100644 --- a/doc/api/templates/index.html +++ b/doc/api/templates/index.html @@ -41,7 +41,7 @@

Spark SDK

- Spark offers both an ultra-low latency programmable trading engine and a flexible client API + Spark offers both an ultra-low latency programmable trading engine and a flexible control API.

@@ -53,7 +53,7 @@

- The Spark voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at. + Leverage the ultra-low latency Spark C++ API to develop and run your custom Algo. Have your first sub-10 microsecond trading algorithm running in under an hour.

Get started
@@ -64,11 +64,21 @@

- Coming soon... - Dolorem voluptatem ut quam. Voluptatum atque corporis rerum pariatur aperiam suscipit magni voluptas. Voluptas deleniti et et sint est. Sed illo natus molestiae mollitia. Nam qui illo id soluta nobis corrupti at. + The Spark client API allows you to integrate and control spark with your existing ecosystem. The Spark desktop client is built entirely on this simple, powerful API.

Get started + + diff --git a/doc/api/templates/shortcodes/info.html b/doc/api/templates/shortcodes/info.html new file mode 100644 index 000000000..920e99473 --- /dev/null +++ b/doc/api/templates/shortcodes/info.html @@ -0,0 +1,4 @@ +
+ + {{body}} +
\ No newline at end of file diff --git a/doc/api/templates/shortcodes/linux.html b/doc/api/templates/shortcodes/linux.html index 7c931f3dd..ee42c83ca 100644 --- a/doc/api/templates/shortcodes/linux.html +++ b/doc/api/templates/shortcodes/linux.html @@ -1,3 +1,4 @@
+ {{body}}
\ No newline at end of file From 548611b44fa0e7bcf52ea515287cb8b1b2693222 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 24 Oct 2019 18:04:54 -0400 Subject: [PATCH 189/252] Adding tooltips, and hooking to the right proto --- .../spark/Modules/Spreader/VM/ParameterRows/RowModel.cs | 3 ++- .../orders/spreader_orders/spreader/SpreaderUtils.h | 6 +++--- src/lib/sparkproto/SparkProtos.proto | 5 ----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs index 336b506fe..3d516614f 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs @@ -117,7 +117,8 @@ namespace mbts.spark { public static ParameterSection InsideMarketDistance => new ParameterSection("Inside Market Distance", true, - "TODO: add tooltip text here"); + "Reduces re-quoting by throttling quotes that are moving toward the inside market " + + "but are more than 'Toward Distance' away from the inside market"); public static ParameterSection InsideMarketThrottleThresholds => new ParameterSection("Inside Market Throttle Thresholds", true, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index d4f543b14..683a75832 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -299,13 +299,13 @@ public: quote_side, tick_size, quote_params.quote_mute_zone())) || - (quote_params.has_quote_inside_market_distance() && + (quote_params.has_quote_inside_market_distance_throttle() && is_quote_inside_market_reject(current_price, new_price, qbook.side(quote_side)[0].price(), quote_side, tick_size, - quote_params.quote_inside_market_distance())); + quote_params.quote_inside_market_distance_throttle())); return reject; } @@ -330,7 +330,7 @@ public: double inside_market, api::Side quote_side, double tick_size, - const bts::spark::QuoteInsideMarketDistance& imd){ + const bts::spark::QuoteInsideMarketDistanceThrottle& imd){ bool toward = bts::securities::is_equal_or_better(quote_side, Price(new_price), Price(current_price)); diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 352214ae6..e1b14e4fa 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -65,7 +65,6 @@ message QuoteParams QuoteRepriceThrottle quote_reprice_throttle = 1010; QuoteInsideMarketDistance quote_inside_market_distance = 1020; QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; - QuoteInsideMarketDistanceThrottle quote_inside_market_distance_throttle = 1070; QuoteMaxOrderMove quote_max_order_move = 1040; QuoteHidden quote_hidden = 1050; ConditionalQuoting conditional_quoting=1060; @@ -225,10 +224,6 @@ message QuoteInsideMarketDistanceWithTravel uint32 limit = 20; } -message QuoteInsideMarketDistanceThrottle { - uint32 on_toward_distance = 10; -} - /*******************************Quote MaxOrderMove (unused)************************************** (TT) Max Order Move [Pre-Quote] This rule sets a restriction on how far a quoting order can move in one action. If triggered, From f2621da4234bbb5ace6adb3529517642f6216e66 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 25 Oct 2019 12:19:38 -0400 Subject: [PATCH 190/252] SP-230 Development with VScode --- .../content/algo/getting-started/compiled.png | Bin 0 -> 54789 bytes .../algo/getting-started/development.md | 40 ++++++++++++++---- .../content/algo/getting-started/download.md | 8 ++-- .../algo/getting-started/gdb_launch.png | Bin 0 -> 6113 bytes .../content/algo/getting-started/myalgo.png | Bin 0 -> 12037 bytes doc/api/content/algo/samples/iceberg.md | 7 --- doc/api/content/algo/samples/join.md | 7 +++ doc/api/sass/_base.scss | 7 ++- doc/api/templates/index.html | 12 +++--- src/sdk/disable_onixs.py | 26 ++++++------ .../algo_template/.vscode/launch.json | 27 ++++++++++++ .../examples/algo_template/algo_template.cpp | 18 +++----- .../dynamic_join_order/.vscode/launch.json | 27 ++++++++++++ src/sdk/make_sdk.sh | 13 +++--- src/sdk/update_github.sh | 5 +-- 15 files changed, 137 insertions(+), 60 deletions(-) create mode 100644 doc/api/content/algo/getting-started/compiled.png create mode 100644 doc/api/content/algo/getting-started/gdb_launch.png create mode 100644 doc/api/content/algo/getting-started/myalgo.png delete mode 100644 doc/api/content/algo/samples/iceberg.md create mode 100644 doc/api/content/algo/samples/join.md create mode 100644 src/sdk/examples/algo_template/.vscode/launch.json create mode 100644 src/sdk/examples/dynamic_join_order/.vscode/launch.json diff --git a/doc/api/content/algo/getting-started/compiled.png b/doc/api/content/algo/getting-started/compiled.png new file mode 100644 index 0000000000000000000000000000000000000000..d81c5b1af638913018e4e9955be2eebe451b676e GIT binary patch literal 54789 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 Studio Code -to do our editing. If you are using a different editor skip to the other editor section. +In this section we're going to use the Remote - Containers feature of Visual Studio Code to simplify the development experience. If you are using a different editor skip to the other editor section below. -# Remote - Containers +## Remote - Containers -Open Visual Studio Code in the folder where you unzipped the Spark SDK. If you opted to add it to your path you can run `code .` from your command prompt. Otherwise use File->Open Folder to select your work folder. +The Visual Studio Code Remote containers extension allows it to run a complete development environment inside the Spark SDK Docker container. The editor UI runs as a thin client on your desktop and connects to a headless instance running inside the Spark SDK Docker environment. This configuration allows us to ship a pre-configured set of [Tasks](https://code.visualstudio.com/Docs/editor/tasks) for building and testing your code. -Next click on the puzzle piece icon on the left hand side and enable the "Remote - Containers" extension. +Start Visual Studio Code and click on the puzzle piece icon on the left-hand side to open the extensions panel. Use the search box at the top to find the "Remote - Containers" extension and install it. -Once the extension is installed you should get a notification offering to let you re-open the workspace inside the container. +## Into the Code + +Open the examples/algo_template directory using the File->Open Folder menu option. If you opted to add it to your path during install, you could run `code .` from your command prompt. + +When the workspace opens, you should see a notification offering to let you re-open the workspace inside the container. +The first time you open the workspace inside the container it will take a few seconds to configure the spark_sdk docker container. While the workspace is open in Visual Studio Code the docker image will also be running in the background. The container will stop automatically when you close the editor. +Open algo_template.cpp from the file browser on the left or by pressing ctrl-p and typing the name. Each Algo is a standard C++ class which implements **IAlgoOrder**. Placing your cursor on IAlgoOrder and pressing F12 will take you to the IAlgoOrder.h header file where you can browse the API. To learn more about how an Algo is instantiated see the [Algo Lifecycle](/algo/ref/lifecycle). + +## Compiling + +To build press "Ctrl+Shift+B". You should see the build output at the bottom of your screen. If the build was successful the resulting algo_template.so will be automatically copied to the plugins directory where it will be loaded by the Spark server process on start. + + + +## Debugging + +To debug your Algo set a breakpoint (F9) and open the Debug panel (Ctrl+Shift+D) and choose "(gdb) Launch". This will launch the Spark Server inside the container with the debugger attached. + + + +Now you can launch the Spark Client (spark_client.cmd) and it will connect to the running server. Log in with the user "bts" and no password and open a ladder. You can now select your Algo on the order type dropdown. + + + +## Starting Spark Server + +To start the Spark Server without attaching a debugger press "Ctrl+Shift+P" and select "Tasks: Run Task" and then "Start Sparkd" and "Never scan task output" This will open a new terminal where you can see any messages logged with the **Sdk** subsystem as well as any warnings or errors. To stop the Spark server simply kill the terminal (trash can icon) or run the "Stop Sparkd" task. # Other Editor - -Good luck. 🦁🐯🐻 \ No newline at end of file diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index 5aebdbca3..8d612700e 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -5,17 +5,17 @@ weight = 2 ## Request Access 🔑 -To start using the BTS Spark SDK you will need to request access though our sales department. Please email info@bluetradesys.com or call (919) 913-0850 and we will provide download credentials. +To start using the Algo SDK you will need to request access though our sales department. Please email info@bluetradesys.com or call (919) 913-0850 and we will provide download credentials. ## Download -Download the latest SDK image here: spark_sdk.zip +Download the latest SDK image here: [spark_sdk.zip](https://api.bluetradesys.com/download/spark_sdk.zip) Unzip that folder into a working directory. Inside you should see something like this: ``` spark_sdk.img -spark_installer.exe +client/ examples/ ``` @@ -63,7 +63,7 @@ You should now be able to access an admin interface at http://localhost:8008/ wh ## Update -To update your Spark SDK simply download an unzip a new spark_sdk.zip and use `docker load < spark_sdk.img` to overwrite the old image with the new one. +To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://api.bluetradesys.com/download/spark_sdk.zip) and use `docker load < spark_sdk.img` to overwrite the old image with the new one. If you want to preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image. diff --git a/doc/api/content/algo/getting-started/gdb_launch.png b/doc/api/content/algo/getting-started/gdb_launch.png new file mode 100644 index 0000000000000000000000000000000000000000..878d96820add0cf0a5bcacec21116d96b1425450 GIT binary patch literal 6113 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 literal 0 HcmV?d00001 diff --git a/doc/api/content/algo/getting-started/myalgo.png b/doc/api/content/algo/getting-started/myalgo.png new file mode 100644 index 0000000000000000000000000000000000000000..331f204df2f1247c6415c55435170260bf11421e GIT binary patch literal 12037 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 - + {% block title %}{{ config.title }}{% endblock title %} @@ -22,8 +22,8 @@ - Algo API - Client API + Algo SDK + Client SDK About Spark
@@ -49,7 +49,7 @@

- Algo API + Algo SDK

@@ -60,11 +60,11 @@

- Client API + Client SDK

- The Spark client API allows you to integrate and control spark with your existing ecosystem. The Spark desktop client is built entirely on this simple, powerful API. + The Spark client SDK allows you to integrate and control spark with your existing ecosystem. The Spark desktop client is built entirely on this simple, powerful API.

Get started
diff --git a/src/sdk/disable_onixs.py b/src/sdk/disable_onixs.py index 413488411..e9a64ff9e 100644 --- a/src/sdk/disable_onixs.py +++ b/src/sdk/disable_onixs.py @@ -1,13 +1,13 @@ -#!/usr/bin/python - -import sys -f = open(sys.argv[1], 'rb+') -license = '5E50A1DACD94D7C1BECD316EEAE5AB02' -data = f.read() -match = data.find(license) -if match > 0: - f.seek(match) - f.write('DEAD'*8) - exit(0) -exit(-1) - +#!/usr/bin/python + +import sys +f = open(sys.argv[1], 'rb+') +license = '5E50A1DACD94D7C1BECD316EEAE5AB02' +data = f.read() +match = data.find(license) +if match > 0: + f.seek(match) + f.write('DEAD'*8) + exit(0) +exit(-1) + diff --git a/src/sdk/examples/algo_template/.vscode/launch.json b/src/sdk/examples/algo_template/.vscode/launch.json new file mode 100644 index 000000000..c78882e49 --- /dev/null +++ b/src/sdk/examples/algo_template/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "/sparkbin/sparkd", + "args": ["run"], + "stopAtEntry": false, + "cwd": "/sparkbin", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/src/sdk/examples/algo_template/algo_template.cpp b/src/sdk/examples/algo_template/algo_template.cpp index a7b5c52cb..f252c4557 100644 --- a/src/sdk/examples/algo_template/algo_template.cpp +++ b/src/sdk/examples/algo_template/algo_template.cpp @@ -31,31 +31,25 @@ class MyAlgo : public IAlgoOrder { void on_child_change(OrderKey, ChildState const &) override; private: - enum class Status; - struct PImpl; - std::unique_ptr me; - IAlgoServices &algo_services() const; + IAlgoServices* algo_services; }; -// All state information needed for this algo -struct MyAlgo::PImpl { - IAlgoServices *algo_services; -}; - -MyAlgo::MyAlgo() : me(new PImpl()) {} +MyAlgo::MyAlgo() : algo_services(nullptr) {} MyAlgo::~MyAlgo() {} -IAlgoServices &MyAlgo::algo_services() const { return *me->algo_services; } // This is called outside of the latency sensitive path // once. Expensive initialization should be done here, rather than // in do_launch() OrderOpResult MyAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { + LOG(Sdk,Info, "MyAlgo: do_before_launch"); } // Called in the latency sensitive path, once, when the algo is first // launched. void MyAlgo::do_launch(IAlgoServices &services) { + algo_services = &services; + LOG(Sdk,Info, "MyAlgo: do_launch"); } // Called in the latency sensitive path, once, when the algo is first @@ -63,6 +57,8 @@ void MyAlgo::do_launch(IAlgoServices &services) { // it is now responsible for managing. void MyAlgo::do_launch_attached(IAlgoServices &services, OrderKey attached_order, ChildState st) { + algo_services = &services; + LOG(Sdk,Info, "MyAlgo: do_launch_attached"); } // Called when a human (or a supervising algo) updates a parameter for diff --git a/src/sdk/examples/dynamic_join_order/.vscode/launch.json b/src/sdk/examples/dynamic_join_order/.vscode/launch.json new file mode 100644 index 000000000..c78882e49 --- /dev/null +++ b/src/sdk/examples/dynamic_join_order/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "/sparkbin/sparkd", + "args": ["run"], + "stopAtEntry": false, + "cwd": "/sparkbin", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/src/sdk/make_sdk.sh b/src/sdk/make_sdk.sh index d3f22ceac..4fef60745 100755 --- a/src/sdk/make_sdk.sh +++ b/src/sdk/make_sdk.sh @@ -21,12 +21,12 @@ mkdir -p $1/sdk/externals/ # To build the docker image locally swap the next 3 'ln' for the 3 'rsync' # Docker will refuse to follow the symlinks during docker build -ln -sf $2/../../externals/linux/include $1/sdk/externals/include -ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib -ln -sf $1/server $1/sdk/lib -# rsync -aL $2/../../externals/linux/include/ $1/sdk/externals/include/ -# rsync -aL $2/../../externals/linux/lib/Release $1/sdk/externals/lib -# rsync -aL $1/server/ $1/sdk/lib/ +# ln -sf $2/../../externals/linux/include $1/sdk/externals/include +# ln -sf $2/../../externals/linux/lib/Release $1/sdk/externals/lib +# ln -sf $1/server $1/sdk/lib +rsync -aL $2/../../externals/linux/include/ $1/sdk/externals/include/ +rsync -aL $2/../../externals/linux/lib/Release $1/sdk/externals/lib +rsync -aL $1/server/ $1/sdk/lib/ mkdir $1/sdk/examples cp -r $2/examples/* $1/sdk/examples @@ -41,5 +41,6 @@ chmod +x $1/sdk/examples/build_examples.sh chmod +x $1/sdk/examples/*/build.sh chmod +x $1/sdk/sdk_shell.sh chmod +x $1/sdk/update_github.sh +chmod +x $1/sdk/disable_onixs.py (cd $1/sdk/examples && ./build_examples.sh) diff --git a/src/sdk/update_github.sh b/src/sdk/update_github.sh index bea15ae93..7af2ced29 100644 --- a/src/sdk/update_github.sh +++ b/src/sdk/update_github.sh @@ -35,10 +35,9 @@ cp -L -r -f "$SRC"/** $STAGE/$SDK/ pushd $STAGE/$SDK #clean all the stuff we don't want in github -rm ./examples/md_publisher_example -rm ./examples/order_plugin_example.so +rm ./examples/*/*.so rm ./lib/data_files/cert_secure_logon.txt -./disable_onixs.py ./lib/libspar.so +./disable_onixs.py ./lib/libspark.so rm -r ./externals/lib/libonixs* rm -r ./externals/include/OnixS/ rm -r ./externals/lib/celoxica/ From 69512726336df4a0d07de46c53a236700894838a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 25 Oct 2019 13:05:44 -0400 Subject: [PATCH 191/252] Just has to update the last_price --- src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 32d552e99..262f70c87 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -463,6 +463,7 @@ void SpreaderOrder::_comp_and_report_state (){ reported_state.set_quantity(bookkeeping_data.quantity().value()); reported_state.set_filled_quantity(filled_qty.value()); reported_state.set_avg_price(avg_filled_price.value()); + reported_state.set_last_price(avg_filled_price.value()); } // if order is cons'ed from disc, with inited_new==false, // we just publish what was given to us From 78323d09e8ea8c4597dbed031d4f8dca4407102b Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 25 Oct 2019 17:40:10 -0400 Subject: [PATCH 192/252] SP-230 Development with other editor --- .../algo/getting-started/development.md | 93 ++++++++++++++++++- .../content/algo/getting-started/download.md | 11 ++- .../content/algo/getting-started/overview.md | 4 +- doc/api/templates/shortcodes/clipable.html | 15 +++ 4 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 doc/api/templates/shortcodes/clipable.html diff --git a/doc/api/content/algo/getting-started/development.md b/doc/api/content/algo/getting-started/development.md index ae1b1d84a..1ffca3750 100644 --- a/doc/api/content/algo/getting-started/development.md +++ b/doc/api/content/algo/getting-started/development.md @@ -5,7 +5,7 @@ weight = 3 # Visual Studio Code -In this section we're going to use the Remote - Containers feature of Visual Studio Code to simplify the development experience. If you are using a different editor skip to the other editor section below. +In this section we're going to use the Remote - Containers feature of Visual Studio Code to simplify the development experience. If you are using a different editor skip to the other editor section below. ## Remote - Containers @@ -39,12 +39,99 @@ To debug your Algo set a breakpoint (F9) and open the Debug panel (Ctrl+Shift+D) -Now you can launch the Spark Client (spark_client.cmd) and it will connect to the running server. Log in with the user "bts" and no password and open a ladder. You can now select your Algo on the order type dropdown. +With sparkd running you can launch the Spark Client (spark_client.cmd) and it will connect to the running server. Log in with the user "bts" and no password and open a ladder. You can now select your Algo on the order type dropdown and activate it by clicking on a price on the ladder. +While sparkd is running you can also access the Spark Server Admin interface on [http://localhost:9000](http://localhost:9000). Use the same "bts" login to access the admin interface. Here you can manage user and account permissions and risk limits. + ## Starting Spark Server To start the Spark Server without attaching a debugger press "Ctrl+Shift+P" and select "Tasks: Run Task" and then "Start Sparkd" and "Never scan task output" This will open a new terminal where you can see any messages logged with the **Sdk** subsystem as well as any warnings or errors. To stop the Spark server simply kill the terminal (trash can icon) or run the "Stop Sparkd" task. -# Other Editor +## Next Steps + +If you would like to understand more about how Docker is working behind the scenes continue to the [next section](#other-editors). + +Otherwise, head over to the [Algo Lifecycle](/algo/ref/lifecycle/) section to understand how the IAlgoOrder can respond to events. + +
+ +# Other Editors + +In this section you will be more exposed to the details of how Docker works and how to compile and test your Algo using the command line. + +## Docker + +Spark Server is built and runs only on Linux so you need a Linux development environment to effectively develop plug-ins for it. Docker lets you take the spark_sdk.img disk image and run it inside a virtual Linux machine running on your Windows desktop. + +First, some terminology. A Docker "image" is a disk image containing a complete filesystem. The spark_sdk.img file you imported earlier is an image. A Docker "container" is what you get when you get when you attach this image to a running Linux system. You can connect to a running container and use it to run commands like the C++ compiler or the Spark server. Directories from your local filesystem can be mapped into the Docker container when it starts so you can easily share files. + +### Start + +The first step is to start the spark_sdk Docker container with the examples directory mapped so we can compile the examples inside the container. In your command prompt cd to the *examples* directory that you unzipped from the spark_sdk.zip file. Then run the following command to start the container. + +Windows Command Prompt: +{% clipable() %} +docker run --rm -it -v %CD%:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash +{% end %} + +**Powershell** / Linux / Mac: +{% clipable() %} +docker run --rm -it -v ${PWD}:/examples -u bts -w /examples --shm-size 1024m --name spark_sdk -h spark_sdk --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 9000:9000 -p 9001:9001 spark_sdk bash +{% end %} + +### Attach + +The container will remain as long as this prompt is open. You can attach an additional to the running container with the following command: +{% clipable() %} +docker exec -it spark_sdk bash +{% end %} + +## Compiling + +Let's look at the algo_template sample first. All of the samples are laid out similarly with a `build.sh` script for compiling. As long as you are running build.sh inside the spark Docker container, it automatically copies the build output to /sparkbin/plugins/ where it needs to be to get loaded by the Spark server. + +``` +bts@spark_sdk:/examples$ cd algo_template/ +bts@spark_sdk:/examples/algo_template$ ./build.sh +algo_template.so copied to /sparkbin/plugins/ +Restart sparkd to see changes. +``` + +## Starting Spark Server + +To start the Spark server `cd /sparkbin/` and run `./sparkd run`. Press Ctrl+C to stop it. +``` +bts@spark_sdk:/sparkbin$ ./sparkd run +2019-10-25 16:21:09.383626|262552152803600|Gen|Warn |1 |main|132 |Run.cpp:53 |dev| +------------------------------------ Sparkd launched -------------------------------- +``` + +You will see any Sdk log messages as well as any log messages at or above Warning level from other parts of the system. If you need additional diagnostic information more details logs are stored in /sparkdata/data/logging/log. These logs will be automatically deleted when you stop the Docker container. + +With sparkd running you can launch the Spark Client (spark_client.cmd) and it will connect to the running server. Log in with the user "bts" and no password and open a ladder. You can now select your Algo on the order type dropdown and activate it by clicking on a price on the ladder. + + + +While sparkd is running you can also access the Spark Server Admin interface on [http://localhost:9000](http://localhost:9000). Use the same "bts" login to access the admin interface. Here you can manage user and account permissions and risk limits. + +## Debugging + +You can debug your algo using gdb from the bash command prompt. + +```bts@spark_sdk:/sparkbin$ gdb --args ./sparkd run +GNU gdb (Ubuntu 8.1-0ubuntu3) 8.1.0.20180409-git +Copyright (C) 2018 Free Software Foundation, Inc. +... +Reading symbols from ./sparkd...done. +(gdb) break algo_template.cpp:45 +No source file named algo_template.cpp. +Make breakpoint pending on future shared library load? (y or [n]) y +Breakpoint 1 (algo_template.cpp:45) pending. +(gdb) run +Starting program: /sparkbin/sparkd run +``` + +If your editor supports debugging over the ssh protocol you can configure and start sshd from inside the container. + diff --git a/doc/api/content/algo/getting-started/download.md b/doc/api/content/algo/getting-started/download.md index 8d612700e..d1df3af0d 100644 --- a/doc/api/content/algo/getting-started/download.md +++ b/doc/api/content/algo/getting-started/download.md @@ -16,15 +16,16 @@ Unzip that folder into a working directory. Inside you should see something like ``` spark_sdk.img client/ +spark_client.cmd examples/ ``` ## Import Import the spark_sdk image into docker using the `docker load` command. -``` +{% clipable() %} docker load < spark_sdk.img -``` +{% end %}
@@ -34,11 +35,11 @@ docker load < spark_sdk.img error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.40/images/json: open //./pipe/docker_engine: The system cannot find the file specified. In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.
-Confirm that the image is loaded by running `docker images` which should list the new image. +Confirm that the import worked by running `docker images` which should list the new image. ``` c:\bts> docker images REPOSITORY TAG IMAGE ID CREATED SIZE -bluetradingsystems/spark_sdk latest a6dde8add63a 2 weeks ago 2.51GB +bluetradingsystems/spark_sdk latest e2be89436e73 4 hours ago 3.89GB ``` -## Control +## Activating the Algo Once loaded into the Spark server, your order type shows up in the Spark ladder, just like the in-box order types. @@ -22,5 +22,3 @@ If you are interested in sending orders to or otherwise controlling a Spark serv - - diff --git a/doc/api/templates/shortcodes/clipable.html b/doc/api/templates/shortcodes/clipable.html new file mode 100644 index 000000000..201b4fb75 --- /dev/null +++ b/doc/api/templates/shortcodes/clipable.html @@ -0,0 +1,15 @@ +
+ {{body}}
+
From 5fc6ff4c00ec18dbd0f0ced5482fea9c3e954393 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 26 Oct 2019 16:40:32 -0500 Subject: [PATCH 193/252] SP-204 Local fills UI erroneously shows admin fills too --- src/client/spark/Orders/OrdersModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index ffeceeb34..ccc189f82 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -210,6 +210,7 @@ namespace mbts.spark { // manual fills on_manual_fills_securities = _position_service.subscribei_manual_fills() .Naggle(interval, scheduler) + .Filter(f => f.FillType == ManualFill.Types.FillType.Local) .join(sstore, mf => mf.SecurityKey) .Table().Cache(); var manual_fill_tuples_account_join = on_manual_fills_securities.LeftJoin( From 75e98d353f58ed3396b45082c30a792d8de64b12 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 28 Oct 2019 15:41:39 -0500 Subject: [PATCH 194/252] adding left panel test steps --- testing/manual/settings/UserSettingsTest.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/testing/manual/settings/UserSettingsTest.txt b/testing/manual/settings/UserSettingsTest.txt index 573a14106..f1caf69c8 100644 --- a/testing/manual/settings/UserSettingsTest.txt +++ b/testing/manual/settings/UserSettingsTest.txt @@ -96,6 +96,16 @@ NOTES: 17) In dialog[A] select [DTab], then click "Copy from Custom" - [DTab] should now have the same settings as [CTab] +------------------------------------------------------------------------------- +Left Panel Scroll test +------------------------------------------------------------------------------- +The scroll position of the left-panel area is now remembered as part of the ladder settings + +Resize your ladder window to make it vertically small so that the left panel displays a scrollviewer. +Scroll the left panel down so that the qty box is the top-most visible control in the panel +Exit and relaunch Spark, loading your last saved workspace +Verify that the restored ladder window's left panel has been vertically scrolled so the the qty box is one again the top-most visble control + DONE!!! From f7fb5ed4000c275c4d38b0615ceb46ab97962c10 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 28 Oct 2019 15:48:47 -0500 Subject: [PATCH 195/252] adding test for deleted accounts --- testing/manual/admin/user_account_deletion.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 testing/manual/admin/user_account_deletion.txt diff --git a/testing/manual/admin/user_account_deletion.txt b/testing/manual/admin/user_account_deletion.txt new file mode 100644 index 000000000..21aa67b82 --- /dev/null +++ b/testing/manual/admin/user_account_deletion.txt @@ -0,0 +1,13 @@ +This test verifies that users can only see accounts that are not marked as deleted + +1. Start a client and the admin gui, choose a user other than bts + +2. In the admin gui, create an account whose name is Prada + +3. For the designated user, add permission to see the Prada account + +4. Verify the you can see the account in the client + +5. In the admin gui, delete the account + +6. Verify the gui no longer shows the Prada (or DELETED_Prada, etc) account From e7890a459cf0fcac8ddd9d39043ffa2ddac75030 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 28 Oct 2019 15:57:27 -0500 Subject: [PATCH 196/252] test for order sent sound --- testing/manual/settings/SoundAndNotificationsTest.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testing/manual/settings/SoundAndNotificationsTest.txt b/testing/manual/settings/SoundAndNotificationsTest.txt index 5690657f3..d3b6d1377 100644 --- a/testing/manual/settings/SoundAndNotificationsTest.txt +++ b/testing/manual/settings/SoundAndNotificationsTest.txt @@ -82,8 +82,15 @@ Prepare: open a ladder for a security that has steady market data activity (in t - enter a limit order ACROSS the market to trigger an immediate fill. - this time, the "When order is filled" sound should play; the "When order is canceled" sound should not be heard. +7) "Any Order" sent sounds: + Description: + You will be verifying that the order sent sound trigger works + + - in the settings dialog, change "When order is filled" to "When order is sent", then click apply + - in the ladder, enter a limit order away from the market, so it is NOT liable to get filled. + - you should hear the sound you selected for "When order is sent" -7) Saved with workspace: +8) Saved with workspace: ----Note---------------------------------------------------------------------------------------------------------------------- - you have completed the sound-functionality testing, don't be alarmed by the 4 sound triggers you are about to add. - this step just requires comparing 2 images of the settings dialog to confirm that they were retained with the workspace. @@ -99,7 +106,7 @@ Prepare: open a ladder for a security that has steady market data activity (in t - close the shell, then restart it with the "Where I left off on" workspace. - open the OWSD to verify that the sound triggers were saved with the workspace. -8) Test shell does not crash when no sound card present +9) Test shell does not crash when no sound card present - use a machine that does not have a sound card, such as eh-2 (check with Eric first) - update config to turn off sounds From a0f1d116922ff9b297bbf38a85a715a889e18870 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 28 Oct 2019 16:15:01 -0500 Subject: [PATCH 197/252] adding manual fills don't show admin fills test --- testing/manual/forms2/manual_fills.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 testing/manual/forms2/manual_fills.txt diff --git a/testing/manual/forms2/manual_fills.txt b/testing/manual/forms2/manual_fills.txt new file mode 100644 index 000000000..8c831096d --- /dev/null +++ b/testing/manual/forms2/manual_fills.txt @@ -0,0 +1,16 @@ +Manual Fills Test* + +Manual fills should now show Admin fills +- Open the Trading -> Manual fills form + - Verify the form is completely empty as there should be no manual fills yet + +- In the Admin UI, click on Accounts -> Position Management + - Add a fill for the bts user with a qty of 100 + - Click Save + +- Back in the Manual fills form, verify the form is still empty +- Open up Trading -> PnL + - Verify the PnL shows a row for the trade you entered + + +* = We need to flesh out this test as it currently only tests 1 narrow piece of functionality \ No newline at end of file From c03d05285be8e2bb6f3d7ac97b7a69ea4e3fb942 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 28 Oct 2019 11:10:19 -0400 Subject: [PATCH 198/252] Copy images locally so Michael doesn't steal them --- .../algo/getting-started/development.md | 5 +++- .../content/algo/getting-started/overview.md | 2 +- .../content/algo/getting-started/testing.md | 6 ---- doc/api/content/algo/ref/lifecycle.md | 28 +++++++++++++++++- doc/api/static/images/API.png | Bin 0 -> 56260 bytes doc/api/static/images/logo.svg | 2 ++ doc/api/templates/index.html | 2 +- 7 files changed, 35 insertions(+), 10 deletions(-) delete mode 100644 doc/api/content/algo/getting-started/testing.md create mode 100644 doc/api/static/images/API.png create mode 100644 doc/api/static/images/logo.svg diff --git a/doc/api/content/algo/getting-started/development.md b/doc/api/content/algo/getting-started/development.md index 1ffca3750..934d28424 100644 --- a/doc/api/content/algo/getting-started/development.md +++ b/doc/api/content/algo/getting-started/development.md @@ -133,5 +133,8 @@ Breakpoint 1 (algo_template.cpp:45) pending. Starting program: /sparkbin/sparkd run ``` -If your editor supports debugging over the ssh protocol you can configure and start sshd from inside the container. +If your editor supports debugging over the ssh protocol you can start sshd from inside the container. +## Next + +Continue to [Algo Lifecycle](/algo/ref/lifecycle) to learn how Algos are created and respond to external evens in Spark. diff --git a/doc/api/content/algo/getting-started/overview.md b/doc/api/content/algo/getting-started/overview.md index 87875f3a0..3b23e7f4d 100644 --- a/doc/api/content/algo/getting-started/overview.md +++ b/doc/api/content/algo/getting-started/overview.md @@ -5,7 +5,7 @@ weight = 0 Spark consists of a client UI ([Spark Client](https://www.bluetradingsystems.com/bts-spark#ladder-algo-screen)), a high performance professional futures front end, connected via our proprietary protocol over TCP to our Spark Server, which in turn connects to execution venues via their native protocols (typically FIX/TCP for execution and some proprietary protocol over UDP multicast for market data). - + ## What is the Spark Algo SDK? diff --git a/doc/api/content/algo/getting-started/testing.md b/doc/api/content/algo/getting-started/testing.md deleted file mode 100644 index 033fa787d..000000000 --- a/doc/api/content/algo/getting-started/testing.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title = "Testing" -weight = 4 -+++ - -* Test your algo diff --git a/doc/api/content/algo/ref/lifecycle.md b/doc/api/content/algo/ref/lifecycle.md index 7b0b37456..9533aec5e 100644 --- a/doc/api/content/algo/ref/lifecycle.md +++ b/doc/api/content/algo/ref/lifecycle.md @@ -3,4 +3,30 @@ title = "Algo Lifecycle" weight = 0 +++ -todo +Spark Algos are registered when Spark Server starts and move though several states as they are activated and become live on the market. + +## Load and Register + +On startup Spark Server loads all plugins listed in the /sparkbin/plugins directory and calls an exported function named `init_spark_plugin` with the following signature. + +```cpp +extern "C" void init_spark_plugin(bts::SparkServices &serv) { } +``` + +Your Algo must export this function and use the bts::SparkServices instance to register your Algos. You can define more than one Algo type in a single plugin. In that case your init_spark_plugin function should register all available Algos. + +To register an Algo construct an instance of `DynamicOrderDescriptor` + +## Construction + + +## Before Launch +optional but suggested + +## Launch / Launch Attached +required, latency sensitive + +## Update + + +Every Spark Algo implements diff --git a/doc/api/static/images/API.png b/doc/api/static/images/API.png new file mode 100644 index 0000000000000000000000000000000000000000..e53f95aaf1b8676b7813f52bdbf15cd6ffa3df00 GIT binary patch literal 56260 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 literal 0 HcmV?d00001 diff --git a/doc/api/static/images/logo.svg b/doc/api/static/images/logo.svg new file mode 100644 index 000000000..d9d0f4b0c --- /dev/null +++ b/doc/api/static/images/logo.svg @@ -0,0 +1,2 @@ + + diff --git a/doc/api/templates/index.html b/doc/api/templates/index.html index 41d5a54c8..561dde3cd 100644 --- a/doc/api/templates/index.html +++ b/doc/api/templates/index.html @@ -20,7 +20,7 @@