From 5dc2cf9bd67682e11fb010b96dfa533583fdf8dd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 14:07:27 +0000 Subject: [PATCH 01/26] Added more ninja builds. --- tools/setup_builds.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/setup_builds.sh b/tools/setup_builds.sh index d8c599fa1..bf3334354 100755 --- a/tools/setup_builds.sh +++ b/tools/setup_builds.sh @@ -27,11 +27,29 @@ cd clang_release cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ ../.. cd .. +rm -rf ninja_debug +mkdir ninja_debug +cd ninja_debug +cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++ ../.. +cd .. + +rm -rf ninja_release +mkdir ninja_release +cd ninja_release +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../.. +cd .. + if hash rtags 2>/dev/null; then rm -rf rtags mkdir rtags cd rtags cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=rtags ../.. cd .. + + rm -rf rtags_ninja + mkdir rtags_ninja + cd rtags_ninja + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=rtags ../.. + cd .. fi From fd52ab809998d62e6aa45e5e980422a43b598967 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 10:49:26 -0400 Subject: [PATCH 02/26] Move SparkProtos to bts_api.dll to fix OrderService build. --- .../spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml | 2 +- src/client/spark_api/spark_api.csproj | 1 + src/client/spark_core/spark_core.csproj | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml b/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml index e2eda42b0..4baa9aac3 100644 --- a/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml @@ -1,6 +1,6 @@  + diff --git a/src/client/spark_core/spark_core.csproj b/src/client/spark_core/spark_core.csproj index 9414c9b63..e69462064 100644 --- a/src/client/spark_core/spark_core.csproj +++ b/src/client/spark_core/spark_core.csproj @@ -17,7 +17,6 @@ - From e8c1a2f597c5914a8e0fa7ce6cdb10e148902da3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 11:17:32 -0400 Subject: [PATCH 03/26] Add -fdiagnostic-color for ninja output --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbff069e6..2b0a7faae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if (WIN32) add_subdirectory(src/lib) else () set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ - -Wall -pedantic -Wextra -Werror -Wno-missing-braces --std=c++14") + -Wall -pedantic -Wextra -Werror -Wno-missing-braces --std=c++14 -fdiagnostics-color") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3") add_subdirectory(src/lib) add_subdirectory(src/server/sparkd) From d9a34e204fc17550e6790f5869ffa6cb7cc1f9f5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 15:20:31 +0000 Subject: [PATCH 04/26] Added lookup of real securities to test. --- src/server/sparkd/cmds/TestOrderman.cpp | 83 ++++++++++----------- src/server/sparkd/securities/ISecurityDB.h | 3 + src/server/sparkd/securities/SecurityDB.cpp | 9 +++ src/server/sparkd/securities/SecurityDB.h | 2 + 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index 065b6ed5e..04bfc7388 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -8,6 +8,7 @@ #include "lib/api/public/ServiceContext.h" #include "lib/api/services/OrderService.client.pb.h" #include "server/sparkd/cmds/Run.h" +#include "server/sparkd/securities/SecurityDB.h" #include "lib/utils/datetime.h" #include "lib/utils/PBUtils.h" @@ -16,8 +17,9 @@ #include "server/sparkd/orderman/events/GatewayBeginReplay.h" #include "server/sparkd/event_grid/events/Init.h" - #include +#include + namespace bts { namespace cmd { @@ -27,53 +29,44 @@ using namespace spark; enum class CurrentOrderType {UNDEFINED,SPREADER,NATIVE}; -void fill_leg_key(Security&, size_t leg_index) +securities::SecurityDB sec_db; + +std::pair get_front_month_es_futures () { - // TODO, fill in the key for the legs - // leg_index=0 ES 12/15/2017 - // leg_index=1 ES 3/16/2018 - bts_assert(leg_index == 0 || leg_index == 1); + std::pair result; + + std::map es_futures; + + for (auto const &kvp : sec_db.retrieve_all()) { + auto sec = *kvp.second; + if (sec.symbol() == "ES" && sec.has_future()) { + auto exp = datetime::make_ptime(sec.future().expiration_year(), + sec.future().expiration_month(), + sec.future().expiration_day()); + if (exp > datetime::now()) + es_futures[exp] = &sec; + } + } + + bts_assert(es_futures.size() >= 2); + auto exp_it = es_futures.begin(); + result = std::make_pair(exp_it->second,(++exp_it)->second); + return result; } Security make_spreader_security() { api::orderman::CreateSpreaderOrder r; - // Specification - api::ContractSpecification spec; - spec.set_low_tick(0.25); - spec.set_high_tick(0.25); - // leg 1 - api::FutureContract leg_1_future_contract; - leg_1_future_contract.set_expiration_day(15); - leg_1_future_contract.set_expiration_month(12); - leg_1_future_contract.set_expiration_year(2017); - Security leg_1_security; - // TODO, set id - leg_1_security.set_symbol("ES"); - leg_1_security.set_exchange(api::VENUE_GLBX); - leg_1_security.mutable_contract_spec()->MergeFrom(spec); - leg_1_security.mutable_future()->MergeFrom(leg_1_future_contract); - fill_leg_key(leg_1_security, 0); + auto leg_secs = get_front_month_es_futures(); + ContractLeg leg_1_contract_leg; - leg_1_contract_leg.mutable_security()->MergeFrom(leg_1_security); + *leg_1_contract_leg.mutable_security() = *leg_secs.first; leg_1_contract_leg.set_quantity(1.0); leg_1_contract_leg.set_side(api::SIDE_BUY); leg_1_contract_leg.set_price_multiplier(1.0); - // leg 2 - api::FutureContract leg_2_future_contract; - leg_2_future_contract.set_expiration_day(16); - leg_2_future_contract.set_expiration_month(3); - leg_2_future_contract.set_expiration_year(2018); - Security leg_2_security; - // TODO, set id - leg_2_security.set_symbol("ES"); - leg_2_security.set_exchange(api::VENUE_GLBX); - leg_2_security.mutable_contract_spec()->MergeFrom(spec); - leg_2_security.mutable_future()->MergeFrom(leg_2_future_contract); - fill_leg_key(leg_2_security, 1); ContractLeg leg_2_contract_leg; - leg_2_contract_leg.mutable_security()->MergeFrom(leg_2_security); + *leg_2_contract_leg.mutable_security() = *leg_secs.second; leg_2_contract_leg.set_quantity(1.0); leg_2_contract_leg.set_side(api::SIDE_SELL); leg_2_contract_leg.set_price_multiplier(1.0); @@ -85,6 +78,10 @@ Security make_spreader_security() synth_contract.mutable_legs()->Add()->MergeFrom(leg_1_contract_leg); synth_contract.mutable_legs()->Add()->MergeFrom(leg_2_contract_leg); + // Specification + api::ContractSpecification spec; + spec.set_low_tick(0.25); + spec.set_high_tick(0.25); Security rv; rv.set_exchange(api::VENUE_GLBX); rv.mutable_contract_spec()->MergeFrom(spec); @@ -122,7 +119,7 @@ ExecutionStrategy create_execution_strategy(uint32_t leg_1_id, uint32_t leg_2_id } api::orderman::CreateSpreaderOrder create_spreader_order_creation(std::string account_name, std::string operator_id, uint32_t security_key, - Price price, Quantity quantity, api::Side side) + Price price, Quantity quantity, api::Side side) { Security sec = make_spreader_security(); uint32_t leg_1_id = sec.synthetic().legs(0).security().id(); @@ -148,11 +145,11 @@ api::orderman::CreateOrderRequest make_spreader_order_create_request(api::Side s api::orderman::CreateSpreaderOrder create_order = create_spreader_order_creation("BTS", "BTS", 0, price, quantity, side); result.mutable_spreader()->MergeFrom(create_order); /*auto &spreader = *result.mutable_spreader(); - spreader.set_account_name("BTS"); - spreader.set_operator_id("BTS"); - spreader.set_side(side); - spreader.set_price(price.value()); - spreader.set_quantity(quantity.value());*/ + spreader.set_account_name("BTS"); + spreader.set_operator_id("BTS"); + spreader.set_side(side); + spreader.set_price(price.value()); + spreader.set_quantity(quantity.value());*/ return result; } @@ -244,7 +241,7 @@ int TestOrderman::execute(std::vector const &) uint32_t sec_key;char side; double price; int quantity; std::cin >> sec_key >> side >> price >> quantity; auto resp = client.create_order(make_native_order_create_request(SecurityKey(sec_key), - side == 'b' ? api::SIDE_BUY : api::SIDE_SELL, + side == 'b' ? api::SIDE_BUY : api::SIDE_SELL, Price(price), Quantity(quantity))); if (resp.success()) { diff --git a/src/server/sparkd/securities/ISecurityDB.h b/src/server/sparkd/securities/ISecurityDB.h index 7324ad38b..d66f78990 100644 --- a/src/server/sparkd/securities/ISecurityDB.h +++ b/src/server/sparkd/securities/ISecurityDB.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "lib/domain_model/common.h" namespace bts { @@ -12,6 +13,8 @@ class ISecurityDB public: virtual ~ISecurityDB() {}; virtual api::Security const *resolve(SecurityKey const&k) = 0; + using SecurityMap = std::map ; + virtual SecurityMap retrieve_all() const = 0; }; }} diff --git a/src/server/sparkd/securities/SecurityDB.cpp b/src/server/sparkd/securities/SecurityDB.cpp index 806d288c0..a6f945cd7 100644 --- a/src/server/sparkd/securities/SecurityDB.cpp +++ b/src/server/sparkd/securities/SecurityDB.cpp @@ -40,6 +40,7 @@ struct SecurityDB::PImpl TimeStamp last_scan; }; + SecurityDB::SecurityDB () : me (new PImpl()) { auto all = me->store->retrieve_all()[sec_ns]; @@ -98,6 +99,14 @@ api::Security const *SecurityDB::resolve(SecurityKey const&k) return nullptr; } +SecurityDB::SecurityMap SecurityDB::retrieve_all() const { + SecurityMap result; + std::lock_guard l(me->lock); + for (auto const &kvp : me->known_securities) + result[kvp.first] = kvp.second.get(); + return result; +} + void SecurityDB::do_work() { auto now = Timer::now(); diff --git a/src/server/sparkd/securities/SecurityDB.h b/src/server/sparkd/securities/SecurityDB.h index 3904ce0be..7565e6f94 100644 --- a/src/server/sparkd/securities/SecurityDB.h +++ b/src/server/sparkd/securities/SecurityDB.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "server/sparkd/securities/ISecurityDB.h" namespace bts { @@ -12,6 +13,7 @@ public: SecurityDB(); ~SecurityDB(); api::Security const *resolve(SecurityKey const&k) override; + SecurityMap retrieve_all() const override; void do_work(); private: void store_if_new(api::Security const&sec); From 297e24ab4e092840191c71f6b2fe9afbcc88bfde Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 16:13:52 +0000 Subject: [PATCH 05/26] Tweaked test setup for taha. --- src/lib/config/defaults/jetfix.conf | 24 +++++++++++++++++++++--- src/server/sparkd/cmds/TestOrderman.cpp | 7 +++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 110741207..cc26450ee 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -16,12 +16,30 @@ JetFIX { sender_subid: "BTS" raw_data: "T4CST" } + connection { + name: "cme_mbx" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61920 + sender_compid: "MBX004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "T8F8F" + } } } SparkConnection { - value { - connection_name: "cme_ans" - } + rule: "System.host_name=='pp-6'" + value {connection_name: "cme_ans"} +} + +SparkConnection { + value {connection_name: "cme_mbx"} } \ No newline at end of file diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index 04bfc7388..d2d0e346c 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -29,15 +29,18 @@ using namespace spark; enum class CurrentOrderType {UNDEFINED,SPREADER,NATIVE}; -securities::SecurityDB sec_db; +securities::SecurityDB *sec_db = nullptr; std::pair get_front_month_es_futures () { + if (!sec_db) + sec_db = new securities::SecurityDB(); + std::pair result; std::map es_futures; - for (auto const &kvp : sec_db.retrieve_all()) { + for (auto const &kvp : sec_db->retrieve_all()) { auto sec = *kvp.second; if (sec.symbol() == "ES" && sec.has_future()) { auto exp = datetime::make_ptime(sec.future().expiration_year(), From 88e06eb4070e5219804f35f4b49f34a899916bb9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 13:12:45 -0400 Subject: [PATCH 06/26] Restore misc fields to md (spark-205) --- .../md/platforms/mdp3_onixs/MDP3Listener.cpp | 118 +++++++++++++++--- .../md/platforms/mdp3_onixs/MDP3Listener.h | 10 ++ 2 files changed, 110 insertions(+), 18 deletions(-) diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index d913ed228..a08449633 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -120,6 +120,10 @@ void MDP3Listener::onInstrumentRecovery(onixs::Handler& h) { void MDP3Listener::onEndOfInstrumentRecovery(onixs::Handler& h, const onixs::RecoveryCompletionArgs&) { LOG(MarketData,Info, "Finished Security definition recovery for channel {}", h.settings().channel()); } +// void MDP3Listener::onGap(onixs::Handler& h, const Security&, unsigned) { +// update_all_status(COCONUTSECURITYSTATUS_PACKET_LOSS); +// LOG(MarketData,Info, "Gap detected on channel {}", h.settings().channel()); +// } // // Gap Recovery @@ -166,8 +170,17 @@ void MDP3Listener::onEndOfPacket(onixs::Handler&, const onixs::PacketArgs&) { // Security discovery template -double double_of_price(const Price& price) { - return price.mantissa() * pow10(price.exponent()); +double double_of_price(const Price& price, int8_t display_factor) { + return price.mantissa() * pow10(price.exponent() + display_factor); +} + +inline PriceSize pricesize_of_price_size(const onixs::PRICE price, int8_t display_factor, Size size) { + PriceSize result(price.mantissa(), price.exponent() + display_factor, size); + return result; +} + +inline datetime::LLDateTime ll_of_timestamp(const onixs::Timestamp& ts) { + return datetime::ll_from_parts(ts.year(), (int)ts.month() - 1, ts.day(), ts.hour(), ts.minute(), ts.second(), ts.millisecond()); } template @@ -185,6 +198,10 @@ datetime::Date date_of_maturity(const Definition& def) { return result; } +datetime::Date date_of_timestamp(const onixs::Timestamp& ts) { + return datetime::Date(ts.year(), (int)ts.month(), ts.day()); +} + template void set_security_common(const Definition& def, FixedSecurity& fsec) { fsec.numeric_id = def.securityId(); @@ -208,14 +225,15 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security& osec, co FixedFutureSecurity fsec; set_security_common(sec, fsec); fsec.price_break = 0; - fsec.low_tick = fsec.high_tick = double_of_price(sec.minPriceIncrement()); + // low/high tick are stored non-premultiplied and multiplied in conversion to api::Secutity + fsec.low_tick = fsec.high_tick = double_of_price(sec.minPriceIncrement(), 0); auto expiration = date_of_maturity(sec); fsec.expiration_year = expiration.year; fsec.expiration_month = expiration.month; fsec.expiration_day = expiration.day; onixs::PRICE price; if (sec.unitOfMeasureQty(price)) { - fsec.cme_unit_of_measure_qty = double_of_price(price); + fsec.cme_unit_of_measure_qty = double_of_price(price, 0); } add_security(fsec); } @@ -234,19 +252,19 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o onixs::PRICE price; if (sec.unitOfMeasureQty(price)) { - fsec.cme_unit_of_measure_qty = double_of_price(price); + fsec.cme_unit_of_measure_qty = double_of_price(price, 0); } onixs::PRICE strike_price; bts_assert(sec.strikePrice(strike_price)); - fsec.strike = double_of_price(strike_price); + fsec.strike = double_of_price(strike_price, fsec.display_factor); onixs::PRICE min_tick; sec.minPriceIncrement(min_tick); int8_t tick_rule; if (sec.tickRule(tick_rule)) { - decode_ticks(tick_rule, double_of_price(min_tick), fsec); + decode_ticks(tick_rule, double_of_price(min_tick, 0), fsec); } fsec.call_put = sec.putOrCall() == onixs::PutOrCall::Call ? api::PUTORCALL_CALL : api::PUTORCALL_PUT; @@ -279,11 +297,11 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o const auto& leg = sec.legs()[x]; onixs::PRICE price; if (leg.legPrice(price)) { - fsec.legs[x].leg_price = double_of_price(price); + fsec.legs[x].leg_price = double_of_price(price, fsec.display_factor); } onixs::DecimalQty qty; if (leg.legOptionDelta(qty)) { - fsec.legs[x].leg_delta = double_of_price(qty); + fsec.legs[x].leg_delta = double_of_price(qty, 0); } fsec.legs[x].leg_quantity = leg.legRatioQty(); fsec.legs[x].leg_side = leg.legSide() == onixs::LegSide::BuySide ? api::SIDE_BUY : api::SIDE_SELL; @@ -293,14 +311,6 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o _index.add_spread_legs(fsec.numeric_id, leg_exchange_ids); } -inline PriceSize pricesize_of_price_size(const onixs::PRICE price, int8_t display_factor, Size size) { - PriceSize result(price.mantissa(), price.exponent() + display_factor, size); - return result; -} - -inline datetime::LLDateTime ll_of_timestamp(const onixs::Timestamp& ts) { - return datetime::ll_from_parts(ts.year(), (int)ts.month() - 1, ts.day(), ts.hour(), ts.minute(), ts.second(), ts.millisecond()); -} // // Book @@ -357,6 +367,8 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on // // RFQ +void MDP3Listener::onQuoteRequest(onixs::Handler&, const onixs::Security&, const onixs::QuoteRequestRelatedSymArgs&) { +} // @@ -374,7 +386,77 @@ void MDP3Listener::onElectronicVolumn(onixs::Handler&, const onixs::Security& se // // Misc - +void MDP3Listener::onSettlementPrice(onixs::Handler&, const onixs::Security& sec, const onixs::DailyStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + onixs::PRICE price; + onixs::Timestamp time; + args.entry().entryPx(price); + args.entry().tradingReferenceDate(time); + auto display_factor = data->handle.security().display_factor; + data->handle.update_settlement( + utils::TimeStamp::now(), + double_of_price(price, display_factor), + date_of_timestamp(time)); + } +} +void MDP3Listener::onOpenInterest(onixs::Handler&, const onixs::Security& sec, const onixs::DailyStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + onixs::PRICE price; + args.entry().entryPx(price); + auto display_factor = data->handle.security().display_factor; + data->handle.update_open_interest(utils::TimeStamp::now(), double_of_price(price, display_factor)); + } +} +void MDP3Listener::onOpeningPrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + onixs::PRICE price = args.entry().entryPx(); + onixs::Timestamp time = args.message().transactTime(); + 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)); + } +} +void MDP3Listener::onHighTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + auto display_factor = data->handle.security().display_factor; + data->handle.update_session_high( + utils::TimeStamp::now(), + double_of_price(args.entry().entryPx(), display_factor)); + } +} +void MDP3Listener::onLowTradePrice(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + auto display_factor = data->handle.security().display_factor; + data->handle.update_session_low( + utils::TimeStamp::now(), + double_of_price(args.entry().entryPx(), display_factor)); + } +} +void MDP3Listener::onHighestBid(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + auto display_factor = data->handle.security().display_factor; + data->handle.update_session_high_bid( + utils::TimeStamp::now(), + double_of_price(args.entry().entryPx(), display_factor)); + } +} +void MDP3Listener::onLowestOffer(onixs::Handler&, const onixs::Security& sec, const onixs::SessionStatisticsArgs& args) { + auto* data = _index.get_security(sec.id()); + if (data != nullptr) { + auto display_factor = data->handle.security().display_factor; + data->handle.update_session_low_offer( + utils::TimeStamp::now(), + double_of_price(args.entry().entryPx(), display_factor)); + } +} // diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h index 16de8c24e..b0e8f5305 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.h @@ -27,6 +27,7 @@ public: void onWarning(onixs::Handler&, const onixs::WarningArgs&) override; void onInstrumentRecovery(onixs::Handler&) override; void onEndOfInstrumentRecovery(onixs::Handler&, const onixs::RecoveryCompletionArgs&) override; + // void onGap(onixs::Handler&, const Security&, unsigned) override; // // Gap Recovery @@ -59,6 +60,7 @@ public: // // RFQ + void onQuoteRequest(onixs::Handler&, const onixs::Security&, const onixs::QuoteRequestRelatedSymArgs&) override; // // Volume @@ -66,6 +68,14 @@ public: // // Misc + void onSettlementPrice(onixs::Handler&, const onixs::Security&, const onixs::DailyStatisticsArgs&) override; + void onOpenInterest(onixs::Handler&, const onixs::Security&, const onixs::DailyStatisticsArgs&) override; + + void onOpeningPrice(onixs::Handler&, const onixs::Security&, const onixs::SessionStatisticsArgs&) override; + void onHighTradePrice(onixs::Handler&, const onixs::Security&, const onixs::SessionStatisticsArgs&) override; + void onLowTradePrice(onixs::Handler&, const onixs::Security&, const onixs::SessionStatisticsArgs&) override; + void onHighestBid(onixs::Handler&, const onixs::Security&, const onixs::SessionStatisticsArgs&) override; + void onLowestOffer(onixs::Handler&, const onixs::Security&, const onixs::SessionStatisticsArgs&) override; // From 88bf97a59b53b1074e39d4886f56b61a5cdf4147 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 11 Oct 2017 13:13:57 -0400 Subject: [PATCH 07/26] Pedro's change to make gdb work on docker --- tools/docker_shell.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker_shell.bat b/tools/docker_shell.bat index 32dce83c1..10c3e91ee 100644 --- a/tools/docker_shell.bat +++ b/tools/docker_shell.bat @@ -6,7 +6,7 @@ call %~dp0\ensure_lhome.cmd cd %~dp0\.. docker run --rm -i ^ -p 8000:8000 -p 8001:8001 -p 2000:22 %* ^ - --security-opt seccomp=unconfined ^ + --cap-add=SYS_PTRACE --security-opt seccomp=unconfined ^ -v %linuxhome%:/root/ ^ -v %cd%:/bts ^ -h %COMPUTERNAME%_spark ^ From 5192e7cea0e7b60ed35809c9402a078c507ce802 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 13:25:02 -0400 Subject: [PATCH 08/26] Add 'docker attach' settings for vscode debugger --- .vscode/launch.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.vscode/launch.json b/.vscode/launch.json index 957a898cc..08d7b39bb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -87,6 +87,23 @@ "/bts/": "${workspaceRoot}" } }, + { + "name": "Docker attach", + "type": "cppdbg", + "request": "attach", + "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", + "processId": "${command:pickRemoteProcess}", + "MIMode": "gdb", + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["-p 2000","root@localhost"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/bts/": "${workspaceRoot}" + } + }, { "name": "eh-3 launch", "type": "cppdbg", From 80384165fa6039fde7562125c46a633480636bfb Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 13:28:05 -0400 Subject: [PATCH 09/26] Fix md replay to not break tick specs --- src/client/spark/mspark/Ladder/LadderView.xaml | 2 +- src/lib/md/Structure/FixedSecurity.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 3df56cd2d..6a9fa0594 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -75,7 +75,7 @@ - + diff --git a/src/lib/md/Structure/FixedSecurity.cpp b/src/lib/md/Structure/FixedSecurity.cpp index 26faa5954..634a41a70 100644 --- a/src/lib/md/Structure/FixedSecurity.cpp +++ b/src/lib/md/Structure/FixedSecurity.cpp @@ -241,9 +241,9 @@ void convert_security(const Security& src, FixedSecurity& dest, bool set_securit default: break; } - dest.price_break = src.contract_spec().price_break(); - dest.low_tick = src.contract_spec().low_tick(); - dest.high_tick = src.contract_spec().high_tick(); + dest.price_break = src.contract_spec().price_break() / src.contract_spec().price_multiplier(); + dest.low_tick = src.contract_spec().low_tick() / src.contract_spec().price_multiplier(); + dest.high_tick = src.contract_spec().high_tick() / src.contract_spec().price_multiplier(); switch(securitytype_of(src)) { case SECURITYTYPE_FUTURE: { From a1eb6caeb1f330fbe53a1b6f227cf31682acb08f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 18:49:12 +0000 Subject: [PATCH 10/26] Cleaned up main.cpp --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/cmds/ConfigCheck.cpp | 21 +++++++++++++++++++++ src/server/sparkd/cmds/ConfigCheck.h | 17 +++++++++++++++++ src/server/sparkd/cmds/Md.cpp | 21 +++++++++++++++++++++ src/server/sparkd/cmds/Md.h | 17 +++++++++++++++++ src/server/sparkd/main.cpp | 23 ++++++++++------------- src/server/sparkd/md/run_md.cpp | 2 +- src/server/sparkd/md/run_md.h | 4 ++-- 8 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 src/server/sparkd/cmds/ConfigCheck.cpp create mode 100644 src/server/sparkd/cmds/ConfigCheck.h create mode 100644 src/server/sparkd/cmds/Md.cpp create mode 100644 src/server/sparkd/cmds/Md.h diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 09bf293c4..25e5cc5dd 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/CmdRegistry.cpp;cmds/Help.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.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/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.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/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SimpleSpreader.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/SpreaderBase.cpp;spreader/SpreaderTests.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/ConfigCheck.cpp b/src/server/sparkd/cmds/ConfigCheck.cpp new file mode 100644 index 000000000..2e1e3a2b0 --- /dev/null +++ b/src/server/sparkd/cmds/ConfigCheck.cpp @@ -0,0 +1,21 @@ +#include "ConfigCheck.h" +#include "lib/config/ConfigCheck.h" + +namespace bts { +namespace cmd { + +int ConfigCheck::execute(std::vector const &args) +{ + std::vector ch_args; + for (auto const &s : args) + ch_args.push_back(s.c_str()); + configcheck(ch_args.size(),&ch_args[0]); + return 0; +} + +std::string ConfigCheck::help () +{ + return "Config check help."; +} + +}} diff --git a/src/server/sparkd/cmds/ConfigCheck.h b/src/server/sparkd/cmds/ConfigCheck.h new file mode 100644 index 000000000..ad0766928 --- /dev/null +++ b/src/server/sparkd/cmds/ConfigCheck.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class ConfigCheck : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help(); +}; + +}} + + diff --git a/src/server/sparkd/cmds/Md.cpp b/src/server/sparkd/cmds/Md.cpp new file mode 100644 index 000000000..2e4f15f78 --- /dev/null +++ b/src/server/sparkd/cmds/Md.cpp @@ -0,0 +1,21 @@ +#include "Md.h" +#include "server/sparkd/cmds/CmdRegistry.h" +#include "server/sparkd/md/run_md.h" +#include + +namespace bts { +namespace cmd { + +int Md::execute(std::vector const &args) +{ + bts::md::md_tool(args); + return 0; +} + +std::string Md::help () +{ + return "Md command"; +} + +}} + diff --git a/src/server/sparkd/cmds/Md.h b/src/server/sparkd/cmds/Md.h new file mode 100644 index 000000000..047da398e --- /dev/null +++ b/src/server/sparkd/cmds/Md.h @@ -0,0 +1,17 @@ +#pragma once + +#include "ICmd.h" + +namespace bts { +namespace cmd { + +class Md : public ICmd +{ +public: + int execute(std::vector const &args); + std::string help (); +}; + +}} + + diff --git a/src/server/sparkd/main.cpp b/src/server/sparkd/main.cpp index 0fd829ed1..1cecded13 100644 --- a/src/server/sparkd/main.cpp +++ b/src/server/sparkd/main.cpp @@ -1,16 +1,17 @@ #include "lib/os/os.h" - #include "lib/utils/init_spark_lib.h" -#include "lib/config/ConfigCheck.h" -#include "server/sparkd/md/run_md.h" -#include "lib/os/os.h" +#include "lib/logging/logging.h" #include "server/sparkd/cmds/CmdRegistry.h" + +// to add a command add the header here and the the REGISTER call below +// don't touch this file except to add commands. #include "server/sparkd/cmds/Test.h" #include "server/sparkd/cmds/Run.h" #include "server/sparkd/cmds/Help.h" #include "server/sparkd/cmds/TestOrderman.h" -#include "lib/logging/logging.h" #include "server/sparkd/cmds/TestCeloxica.h" +#include "server/sparkd/cmds/Md.h" +#include "server/sparkd/cmds/ConfigCheck.h" #define BEGIN_CMD #define REGISTER(CMD) bts::cmd::CmdRegistry::register_cmd (#CMD) @@ -21,22 +22,18 @@ int main( int argc, const char*argv[] ) using namespace bts; os::set_thread_name("main"); - if (argc > 1 && strcmp(argv[1], "configcheck")==0) { - configcheck(argc-2, argv+2); - } - else if (argc > 1 && strcmp(argv[1], "md") == 0) { - std::vector args(argv+2, argv+argc); - bts::md::md_tool(args); - } utils::init_spark_lib(); - LOG(Gen,Warn,"Sparkd launched --------------------------------------------------------------------"); + + LOG(Gen,Warn,"------------------------------------ Sparkd launched --------------------------------"); BEGIN_CMD; REGISTER (Test); REGISTER (Help); REGISTER (Run); + REGISTER (Md); REGISTER (TestOrderman); REGISTER (TestCeloxica); + REGISTER (ConfigCheck); END_CMD; utils::finit_spark_lib(); diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 9e5b39e0c..42554a0da 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -132,7 +132,7 @@ void printhelp() { cout << help() << endl; } -void md_tool(std::vector& args) { +void md_tool(std::vector const &args) { const string& cmd = args.empty() ? "" : args[0]; if (args.empty()) printhelp(); else if (cmd == "record") run_record(args.size() > 1 ? args[1] : ""); diff --git a/src/server/sparkd/md/run_md.h b/src/server/sparkd/md/run_md.h index 3da0be5e7..587a6e0c1 100644 --- a/src/server/sparkd/md/run_md.h +++ b/src/server/sparkd/md/run_md.h @@ -6,6 +6,6 @@ namespace bts { namespace md { void run_market_datapublishers(); -void md_tool(std::vector& args); +void md_tool(std::vector const& args); -}} \ No newline at end of file +}} From a05a00c78b49f419e75e3598b477acee2a9a7543 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 15:13:40 -0400 Subject: [PATCH 11/26] Moved subrepo pointers --- docker/linux | 2 +- externals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/linux b/docker/linux index 8ff762140..d4a32d325 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit 8ff7621408e9be2dcfe53704625859c20db811f3 +Subproject commit d4a32d32592c688c3a1f042750fd3323bcdfd38a diff --git a/externals b/externals index 1884a761e..0a9535b0a 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 1884a761e4a0296b59c6801ec7e62acca4d22997 +Subproject commit 0a9535b0a257ceeb105dc2bb0848223a37f51345 From f7599a83eaf5a5314a290ece874ebb31b501cc60 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 11 Oct 2017 15:19:02 -0400 Subject: [PATCH 12/26] slight change to make intelli-clang work on studio code --- .vscode/c_cpp_properties.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index ef38cd540..51f411bda 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -37,6 +37,8 @@ "${localappdata}/lxss/rootfs/usr/include" ], "defines": [ + "__linux__", + "__x86_64__" ], "browse": { "path": [ @@ -47,7 +49,7 @@ "${localappdata}/lxss/rootfs/usr/local/include", "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu", - "${localappdata}/lxss/rootfs/usr/include" + "${localappdata}/lxss/rootfs/usr/include/*" ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "" From 758dc9e07f89fe8fbc7656f228ea4b6331f6dbcc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 10 Oct 2017 13:54:52 -0400 Subject: [PATCH 13/26] add accounts static placeholder --- src/client/spark/mspark/Ladder/LadderVM.cs | 6 +++--- .../spark/mspark/MarketView/MarketViewVM.cs | 4 +++- src/client/spark/mspark/Orders/OrderParamsVM.cs | 2 +- .../spark/mspark/Utilities/ImportedResources.cs | 1 + .../spark/mspark/Utilities/OrderDataHelper.cs | 17 ++++++++++++++--- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index 1939e7c98..d429530e7 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -22,14 +22,14 @@ namespace mbts.spark { class LadderVM : DisposableViewModelBase, IKeyListener { readonly LadderModel _model; readonly DispatcherTimer _timer; - Order _order_template = new Order(); + Order _order_template; LadderSettings _settings; public const string SAVE_NAME = "SparkLadder"; public LadderVM(LadderModel model, IObservable settings) { _model = model; - _order_template.Security = model.security; + _order_template = OrderDataHelper.Defaults.Order(_model.security); _timer = new DispatcherTimer() { Interval = TimeSpan.FromMilliseconds(100), IsEnabled = true @@ -167,7 +167,7 @@ namespace mbts.spark { Property _revert; public bool revert { get => _revert.Value; set => _revert.set(value); } - public string[] accounts { get; } = new[] { "Account1", "Account2", "Account3", "Account4" }; + public string[] accounts { get; } = ImportedResources.Accounts; public string account { get => _order_template.Account; set => _order_template.Account = value; } public Order.Types.TimeInForce[] order_types => Enum.GetValues(typeof(Order.Types.TimeInForce)).Cast().ToArray(); Property _selected_order_type; diff --git a/src/client/spark/mspark/MarketView/MarketViewVM.cs b/src/client/spark/mspark/MarketView/MarketViewVM.cs index 467a0bda1..5c6a201ba 100644 --- a/src/client/spark/mspark/MarketView/MarketViewVM.cs +++ b/src/client/spark/mspark/MarketView/MarketViewVM.cs @@ -85,7 +85,9 @@ namespace mbts.spark private static Security _get_security(DataGridCellInfo cell) { return (cell.Item as Row)?.security.value; } private static Order _create_order(DataGridCellInfo cell) { return _create_order((Row)cell.Item, (Columns)DataGridEx.GetArgument(cell.Column)); } private static Order _create_order(Row row, Columns col) { - var order = new Order { Security = row.security.value, MarketOrder = new MarketOrder(), Price = 0, Size = 1 }; + var order = OrderDataHelper.Defaults.Order(row.security.value, Order.AlgoOrderTypeOneofCase.MarketOrder); + order.Price = 0; + order.Size = 1; switch(col) { case Columns.Bid: order.Price = row.bid_price.output; break; case Columns.BidSize: order.Price = row.bid_price.output; order.Size = row.bid_size.output; break; diff --git a/src/client/spark/mspark/Orders/OrderParamsVM.cs b/src/client/spark/mspark/Orders/OrderParamsVM.cs index c9c931f63..feb866f16 100644 --- a/src/client/spark/mspark/Orders/OrderParamsVM.cs +++ b/src/client/spark/mspark/Orders/OrderParamsVM.cs @@ -36,7 +36,7 @@ namespace mbts.spark }); } - public string[] accounts { get; } = new[] { "Account1", "Account2", "Account3", "Account4" }; + public string[] accounts { get; } = ImportedResources.Accounts; public string account { get => _order.Account; set => _order.Account = value; } public ObservableCollection algo_types { get; } public OrderTypeVM algo_type { diff --git a/src/client/spark/mspark/Utilities/ImportedResources.cs b/src/client/spark/mspark/Utilities/ImportedResources.cs index 49b31c956..c6df8bb03 100644 --- a/src/client/spark/mspark/Utilities/ImportedResources.cs +++ b/src/client/spark/mspark/Utilities/ImportedResources.cs @@ -13,6 +13,7 @@ namespace mbts.spark.utilities { public static IBus Bus => _instance.bus; public static string UserName => _instance.user_name; + public static readonly string[] Accounts = new[] { "Account1", "Account2", "Account3", "Account4" }; #region Misc Extensions (should put these in a more appropriate place eventually) public static IObservable ToSecurity(this IObservable securityKey) { diff --git a/src/client/spark/mspark/Utilities/OrderDataHelper.cs b/src/client/spark/mspark/Utilities/OrderDataHelper.cs index d11846aa8..493907091 100644 --- a/src/client/spark/mspark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/mspark/Utilities/OrderDataHelper.cs @@ -2,6 +2,7 @@ using bts.spark; using Google.Protobuf; using System; +using System.Linq; namespace mbts.spark.utilities { @@ -38,12 +39,22 @@ namespace mbts.spark.utilities BTSIcebergOrder }; - public static Order Order(Security security) { - return new Order { + public static Order Order(Security security) { return Order(security, bts.spark.Order.AlgoOrderTypeOneofCase.LimitOrder); } + public static Order Order(Security security, Order.AlgoOrderTypeOneofCase algo_type) { + var rv = new Order { + Account = ImportedResources.Accounts.FirstOrDefault(), User = ImportedResources.UserName, Security = security, - LimitOrder = new LimitOrder() }; + switch (algo_type) { + case bts.spark.Order.AlgoOrderTypeOneofCase.LimitOrder: rv.LimitOrder = new LimitOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.MarketOrder: rv.MarketOrder = new MarketOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.StopLimitOrder: rv.StopLimitOrder = new StopLimitOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.StopMarketOrder: rv.StopMarketOrder = new StopMarketOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.BtsStopOrder: rv.BtsStopOrder = BTSStopOrder; break; + case bts.spark.Order.AlgoOrderTypeOneofCase.BtsIcebergOrder: rv.BtsIcebergOrder = BTSIcebergOrder; break; + } + return rv; } } } From 6b4c44c9d619168050ea20a72435f30a6d1f7eec Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 10 Oct 2017 18:48:02 -0400 Subject: [PATCH 14/26] Ladder - put order dropdowns on top of left menu --- src/client/spark/mspark/Ladder/LadderView.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 6a9fa0594..cdd1ad3c2 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -29,6 +29,9 @@ + + + @@ -51,9 +54,6 @@ - - - From 361b15b7fd4e605dc3031fc7db43be6d7279f2c7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 10 Oct 2017 18:49:19 -0400 Subject: [PATCH 15/26] Ladder - hook up show order ticket, modify order --- src/client/spark/mspark/Ladder/LadderVM.cs | 18 ++++-------------- src/client/spark/mspark/Ladder/OrderVM.cs | 2 +- .../spark/mspark/MarketView/MarketViewModel.cs | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index d429530e7..f4a1bbbf9 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -53,6 +53,7 @@ namespace mbts.spark { _selected_order_type = backing(nameof(selected_order_type), Order.Types.TimeInForce.Day); algo_types = OrderDataHelper.Defaults.Algos.SelectMany(wrap_order).ToArray(); _revert = backing(nameof(revert), false); + show_ticket_command = new DelegateCommand(show_ticket); // Orders _internal_orders = new ObservableCollection(); @@ -129,23 +130,12 @@ namespace mbts.spark { public ICommand cancel_command { get; } public ICommand send_order_command { get; } + public ICommand show_ticket_command { get; } - internal void show_ticket(object _) { - var bmp = new System.Windows.Media.Imaging.BitmapImage(); - bmp.BeginInit(); - bmp.UriSource = new Uri("http://edge-qa2/OrderTicket.png"); - bmp.EndInit(); - new System.Windows.Window() { - Width = 255, - Height = 177, - Content = new System.Windows.Controls.Image() { - Source = bmp - } - }.Show(); + internal void show_ticket() { + _model.order_gateway.show_order_ticket(_order_template.Clone()); } - public ICommand show_ticket_command => new DelegateCommand(show_ticket); - public void send_order((double price,Side? side) args) { if (args.side.HasValue) { Order order = _order_template.Clone(); diff --git a/src/client/spark/mspark/Ladder/OrderVM.cs b/src/client/spark/mspark/Ladder/OrderVM.cs index 8512c094a..c7989c580 100644 --- a/src/client/spark/mspark/Ladder/OrderVM.cs +++ b/src/client/spark/mspark/Ladder/OrderVM.cs @@ -85,7 +85,7 @@ namespace mbts.spark { public ICommand shatter_command => new DelegateCommand(_ => model.order_gateway.shatter(_order.order().Id), _ => !has_parent); public ICommand cancel_command => new DelegateCommand(_ => model.order_gateway.cancel_order(new OrderID[] {_order.order().Id}), _ => !has_parent); - public ICommand modify_command => new DelegateCommand(_parent.show_ticket, _ => !has_parent); + public ICommand modify_command => new DelegateCommand(() => model.order_gateway.show_order_modify(_order.order().Clone()), () => !has_parent); public Brush foreground => Brushes.Black; public Brush background { get; private set; } diff --git a/src/client/spark/mspark/MarketView/MarketViewModel.cs b/src/client/spark/mspark/MarketView/MarketViewModel.cs index 6930d7a20..1432aa998 100644 --- a/src/client/spark/mspark/MarketView/MarketViewModel.cs +++ b/src/client/spark/mspark/MarketView/MarketViewModel.cs @@ -37,7 +37,7 @@ namespace mbts.spark public IObservable security_position(SecurityKey key) { return _positions_demuxer.subscribe(key).DistinctUntilChanged(); } public void show_ladder(Security security) { _bus.post(ShowLadderTag, new ShowLadderMessage(security)); } public void show_order_modify(Order order) { _bus.post(ShowOrderModifyTag, new ShowOrderModifyMessage(order)); } - public void show_order_ticket(Order order) { _bus.post(ShowOrderTicketTag, new ShowOrderTicketMessage(order)); } + public void show_order_ticket(Order order) { _orders_model.show_order_ticket(order); } public void set_securities(IEnumerable securities) { _securities_subject.OnNext(new HashSet(securities.Select(s => s.Id))); } public void Dispose() { Disposable.dispose(_subs); From 3d82f28d33d97e70dd9eb40a559fd16cb021273b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 11 Oct 2017 15:13:47 -0400 Subject: [PATCH 16/26] Refactor some tick code --- .../core/GlobalExtensions/TickExtensions.cs | 107 +++++++++++------- src/client/spark/mspark/Core/TickUtils.cs | 34 +++--- 2 files changed, 88 insertions(+), 53 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/TickExtensions.cs b/src/client/spark/core/GlobalExtensions/TickExtensions.cs index e1f893daa..48a32b70c 100644 --- a/src/client/spark/core/GlobalExtensions/TickExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/TickExtensions.cs @@ -7,7 +7,6 @@ namespace mbts public static class TickExtensions { #region Public Extensions (is_valid, format, parse, tick_up, tick_down) - public static bool is_valid(this TickFactors tick) { return tick.tick_unit > 0 && tick.tick_unit <= (tick.tick_base * 0.5); } public static bool is_valid(this RegionalTickFactors regional_tick) { return regional_tick.low_tick.is_valid() && regional_tick.high_tick.is_valid(); /*&& regional_tick.low_tick.tick_base == regional_tick.high_tick.tick_base;*/ } @@ -34,25 +33,74 @@ namespace mbts return _parse(regional_tick, text); } - public static double tick_up(this TickFactors tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !tick.is_valid()) return input; - return _tick(tick, input, true); - } - public static double tick_up(this RegionalTickFactors regional_tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !regional_tick.is_valid()) return input; - return input <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick.tick_up(input) : regional_tick.high_tick.tick_up(input); - } - public static double tick_down(this TickFactors tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !tick.is_valid()) return input; - return _tick(tick, input, false); - } - public static double tick_down(this RegionalTickFactors regional_tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !regional_tick.is_valid()) return input; - return input <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick.tick_down(input) : regional_tick.high_tick.tick_down(input); + public static double tickup(this TickFactors tick, double input) { return tick.tickup(input, 1); } + public static double tickup(this TickFactors tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double tuf = tick.tick_unit_frac(); + input -= input % tuf; + double val = input + tuf * count; + return _round_tick(tuf, val); } + public static double tickup(this RegionalTickFactors regional_tick, double input) { return regional_tick.tickup(input, 1); } + public static double tickup(this RegionalTickFactors regional_tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double val, tuf; + if (input < regional_tick.low_tick_inclusive_end) { + tuf = regional_tick.low_tick.tick_unit_frac(); + input -= input % tuf; + val = input + tuf * count; + if (val > regional_tick.low_tick_inclusive_end) { + count -= (uint)Math.Ceiling((regional_tick.low_tick_inclusive_end - input) / tuf); + tuf = regional_tick.high_tick.tick_unit_frac(); + val = regional_tick.low_tick_inclusive_end + tuf * count; + } + } else { + tuf = regional_tick.high_tick.tick_unit_frac(); + input -= input % tuf; + val = input + tuf * count; + } + return _round_tick(tuf, val); + } + + public static double tickdown(this TickFactors tick, double input) { return tick.tickdown(input, 1); } + public static double tickdown(this TickFactors tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double tuf = tick.tick_unit_frac(); + input += tuf - (input % tuf); + double val = input - tuf * count; + return _round_tick(tuf, val); + } + + public static double tickdown(this RegionalTickFactors regional_tick, double input) { return regional_tick.tickdown(input, 1); } + public static double tickdown(this RegionalTickFactors regional_tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double val, tuf; + if (input > regional_tick.low_tick_inclusive_end) { + tuf = regional_tick.high_tick.tick_unit_frac(); + input += tuf - (input % tuf); + val = input - count * tuf; + if (val < regional_tick.low_tick_inclusive_end) { + count -= (uint)Math.Ceiling((input - regional_tick.low_tick_inclusive_end) / tuf); + tuf = regional_tick.low_tick.tick_unit_frac(); + return regional_tick.low_tick_inclusive_end - tuf * count; + } + } else { + tuf = regional_tick.low_tick.tick_unit_frac(); + val = input - tuf * count; + } + return _round_tick(tuf, val); + } #endregion + #region Private Members + private static decimal tick_unit_frac_dec(this TickFactors tick) { return new decimal(tick.tick_unit / tick.tick_base); } + private static double tick_unit_frac(this TickFactors tick) { return tick.tick_unit / tick.tick_base; } + private static char separator(this TickFactors tick) { + double tb_log10 = Math.Log10(tick.tick_base); + return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-'; + } + private static string _format_no_tick(double value, double display_multiplier, bool show_commas) { if (!double.IsNaN(display_multiplier)) value *= display_multiplier; return value.ToString(show_commas ? "#,0" : "0"); @@ -64,13 +112,6 @@ namespace mbts return double.IsNaN(display_multiplier) || display_multiplier == 0.0 ? result : result / display_multiplier; } - private static decimal tick_unit_frac_dec(this TickFactors tick) { return new decimal(tick.tick_unit / tick.tick_base); } - private static double tick_unit_frac(this TickFactors tick) { return tick.tick_unit / tick.tick_base; } - private static char separator(this TickFactors tick) { - double tb_log10 = Math.Log10(tick.tick_base); - return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-'; - } - private static double _parsed_or_nan(string text) { return double.TryParse(text, out double d) ? d : double.NaN; } private static double _get_integer_part(string integer_text) { return string.IsNullOrEmpty(integer_text) ? 0 : int.TryParse(integer_text, NumberStyles.Any, CultureInfo.CurrentCulture, out int result) ? result : double.NaN; @@ -115,21 +156,6 @@ namespace mbts return integer_part + numerator_part / tick.tick_base; } - private const double _precision_const = 0.000000001; - - private static double _tick(TickFactors tick, double input, bool tick_up) { - if (double.IsNaN(input)) return double.NaN; - if (input < 0) return -(_tick(tick, -input, !tick_up)); - else { - double unit = tick.tick_unit / tick.tick_base; - // IEEERemainder represents the shortest distance to a multiple of the unit, can be negative or positive - // makes it easy to check if the input is ~= unit multiple (within the precision const) - double ieeer = Math.IEEERemainder(input, unit); - if (Math.Abs(ieeer) <= _precision_const) return tick_up ? (input - ieeer) + unit : (input - ieeer) - unit; - else return ieeer < 0 ? (tick_up ? input - ieeer : input + ieeer) : (tick_up ? input - ieeer + unit : input + ieeer - unit); - } - } - private static string _format_tick(TickFactors tick, double value, bool show_commas) { if (value < 0) return "-" + _format_tick(tick, Math.Abs(value), show_commas); int integer_part = (int)Math.Floor(value); @@ -146,11 +172,16 @@ namespace mbts return integer_part_text + tick.separator() + decimal_part.ToString(new string('0', _n_display_digits(tick.tick_base))); } + private static double _round_tick(double tick_unit_frac, double input) { + return input + Math.IEEERemainder(input, tick_unit_frac); + } + private static int _n_display_digits(double tick_base) { double log_tick_base = Math.Log10(tick_base); int floor = (int)Math.Floor(log_tick_base); double dec = log_tick_base - floor; return Math.Max(1, dec > 0 ? ++floor : floor); } + #endregion } } \ No newline at end of file diff --git a/src/client/spark/mspark/Core/TickUtils.cs b/src/client/spark/mspark/Core/TickUtils.cs index 47b82aa73..7f679bd42 100644 --- a/src/client/spark/mspark/Core/TickUtils.cs +++ b/src/client/spark/mspark/Core/TickUtils.cs @@ -1,7 +1,7 @@ using bts.api; -using mbts.collections.extensions; using mbts.user.settings; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -34,18 +34,11 @@ namespace mbts.spark { return mid; } - - public static double tickup(this ContractSpecification contract, double value) { return tick(contract, value, true, 1); } - public static double tickup(this ContractSpecification contract, double value, int count) { return tick(contract, value, true, count); } - public static double tickdown(this ContractSpecification contract, double value) { return tick(contract, value, false, 1); } - public static double tickdown(this ContractSpecification contract, double value, int count) { return tick(contract, value, false, count); } - static double tick(ContractSpecification spec, double value, bool up, int count) { - double factor = up ? 1 : -1; - for (int x = 0; x < count; ++x) { - value += spec.ticksize(value) * factor; - } - return value; - } + + public static double tickup(this ContractSpecification contract, double value) { return _get_regional_ticks(contract).tickup(value); } + public static double tickup(this ContractSpecification contract, double value, int count) { return _get_regional_ticks(contract).tickup(value, (uint)count); } + public static double tickdown(this ContractSpecification contract, double value) { return _get_regional_ticks(contract).tickdown(value); } + public static double tickdown(this ContractSpecification contract, double value, int count) { return _get_regional_ticks(contract).tickdown(value, (uint)count); } public static double round_to_tick(this ContractSpecification spec, double value) { double intpart = (long)value; @@ -66,9 +59,20 @@ namespace mbts.spark { return count; } - public static int[] get_tick_jump_quantities(ContractSpecification spec) { return _ticks_cache.TryGetValue(spec.LowTick, out (TickFactors tf, int[] jumps) result) ? result.jumps : new[] { 1, 5, 10, 25, 50, 100 }; } - private static TickFactors _get_tick_factors(double tick) { return _ticks_cache.TryGetValue(tick, out (TickFactors tick_factors, int[] preset_price_ticks) result) ? result.tick_factors : _default_tick; } + public static int[] get_tick_jump_quantities(ContractSpecification spec) { + return _ticks_cache.TryGetValue(spec.LowTick, out (TickFactors tf, int[] jumps) result) ? result.jumps : new[] { 1, 5, 10, 25, 50, 100 }; + } + public static RegionalTickFactors _get_regional_ticks(ContractSpecification spec) { + return _regional_ticks_cache.GetOrAdd((spec.LowTick, spec.HighTick, spec.PriceBreak), _create_regional_ticks); + } + private static RegionalTickFactors _create_regional_ticks((double low_tick, double high_tick, double price_break) def) { + return new RegionalTickFactors { low_tick = _get_tick_factors(def.low_tick), high_tick = _get_tick_factors(def.high_tick), low_tick_inclusive_end = def.price_break }; + } + private static TickFactors _get_tick_factors(double tick) { + return _ticks_cache.TryGetValue(tick, out (TickFactors tick_factors, int[] preset_price_ticks) result) ? result.tick_factors : _default_tick; + } private static readonly TickFactors _default_tick = new TickFactors(100, 1); + private static readonly ConcurrentDictionary<(double low_tick, double high_tick, double price_break), RegionalTickFactors> _regional_ticks_cache = new ConcurrentDictionary<(double low_tick, double high_tick, double price_break), RegionalTickFactors>(); private static readonly IReadOnlyDictionary _ticks_cache = new ReadOnlyDictionary(new[] { new { tick_unit = 0.05, tick_factors = new TickFactors(100, 5), jump_quantities = new[] { 1, 5, 10, 20, 100, 200 } }, new { tick_unit = 0.10, tick_factors = new TickFactors(100, 10), jump_quantities = new[] { 1, 5, 10, 20, 100, 200 } }, From 8325d77cefbf741fbe29345c7525310ed15a6597 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 19:40:50 +0000 Subject: [PATCH 17/26] Added a fix connection config for cert for taha. --- src/lib/config/defaults/jetfix.conf | 67 ++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index cc26450ee..1ff1d2ad4 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -2,6 +2,55 @@ JetFIX { value { connection { + # cert + name: "cme_mbx" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61920 + sender_compid: "MBX004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "T8F8F" + } + connection { + # cert + name: "cme_mc1" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61921 + sender_compid: "MC1004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "S4PMA" + } + connection { + # cert + name: "cme_m5y" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61880 + sender_compid: "M5Y004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "TOAN4" + } + connection { + # new release name: "cme_ans" platform: GLBX socket_connect_host_ip: "69.50.112.177" @@ -16,12 +65,13 @@ JetFIX { sender_subid: "BTS" raw_data: "T4CST" } - connection { - name: "cme_mbx" + connection { + # new release + name: "cme_t39" platform: GLBX socket_connect_host_ip: "69.50.112.177" - socket_connect_port: 61920 - sender_compid: "MBX004N" + socket_connect_port: 23761 + sender_compid: "T39004N" target_compid: "CME" target_subid: "64" start_time: "00:30:00" @@ -29,7 +79,7 @@ JetFIX { start_day: "sunday" end_day: "friday" sender_subid: "BTS" - raw_data: "T8F8F" + raw_data: "1JE9X" } } } @@ -40,6 +90,11 @@ SparkConnection { value {connection_name: "cme_ans"} } +SparkConnection { + rule: "System.host_name=='TAHA-SUPER_spark' + value {connection_name: "cme_mc1"} +} + SparkConnection { value {connection_name: "cme_mbx"} -} \ No newline at end of file +} From 857aa5ce215fb5c9e1dae5c86a1cd7006151cabd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 19:44:38 +0000 Subject: [PATCH 18/26] Fixed bad config. --- src/lib/config/defaults/jetfix.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 1ff1d2ad4..8994ae48c 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -91,7 +91,7 @@ SparkConnection { } SparkConnection { - rule: "System.host_name=='TAHA-SUPER_spark' + rule: "System.host_name=='TAHA-SUPER_spark'" value {connection_name: "cme_mc1"} } From df1d344eeddf7c1b09f6c756db1736e1682034e6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 11 Oct 2017 15:47:35 -0400 Subject: [PATCH 19/26] Fix tick down --- src/client/spark/core/GlobalExtensions/TickExtensions.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/TickExtensions.cs b/src/client/spark/core/GlobalExtensions/TickExtensions.cs index 48a32b70c..775de1783 100644 --- a/src/client/spark/core/GlobalExtensions/TickExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/TickExtensions.cs @@ -67,7 +67,8 @@ namespace mbts public static double tickdown(this TickFactors tick, double input, uint count) { if (DoubleHelper.IsNaNOrInfinity(input)) return input; double tuf = tick.tick_unit_frac(); - input += tuf - (input % tuf); + double remainder = input % tuf; + if (remainder > 0) input += tuf - remainder; double val = input - tuf * count; return _round_tick(tuf, val); } @@ -78,7 +79,8 @@ namespace mbts double val, tuf; if (input > regional_tick.low_tick_inclusive_end) { tuf = regional_tick.high_tick.tick_unit_frac(); - input += tuf - (input % tuf); + double remainder = input % tuf; + if (remainder > 0) input += tuf - remainder; val = input - count * tuf; if (val < regional_tick.low_tick_inclusive_end) { count -= (uint)Math.Ceiling((input - regional_tick.low_tick_inclusive_end) / tuf); From 64c1ac6550a141e047a2fa4ceb159a458e78bb2b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Oct 2017 19:49:46 +0000 Subject: [PATCH 20/26] Added all iLink sessions allocated to BTS --- src/lib/config/defaults/jetfix.conf | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index 8994ae48c..adbf296c5 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -34,6 +34,54 @@ JetFIX { raw_data: "S4PMA" } connection { + # cert + name: "cme_mc5" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61922 + sender_compid: "MC5004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "TOL92" + } + connection { + # cert + name: "cme_mc7" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61923 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "QDQ16" + } + connection { + # cert + name: "cme_mc8" + platform: GLBX + socket_connect_host_ip: "69.50.112.177" + socket_connect_port: 61924 + sender_compid: "MC7004N" + target_compid: "CME" + target_subid: "64" + start_time: "00:30:00" + end_time: "23:30:00" + start_day: "sunday" + end_day: "friday" + sender_subid: "BTS" + raw_data: "QE9DB" + } + connection { # cert name: "cme_m5y" platform: GLBX From 9e917d8783013413938300887f3fe33c2e06d8b2 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 11 Oct 2017 16:04:31 -0400 Subject: [PATCH 21/26] spark-199 button contrasts --- src/client/spark/view/Resources/Buttons.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Resources/Buttons.xaml b/src/client/spark/view/Resources/Buttons.xaml index 287beacd4..cf39c0f74 100644 --- a/src/client/spark/view/Resources/Buttons.xaml +++ b/src/client/spark/view/Resources/Buttons.xaml @@ -234,7 +234,7 @@