From 743348448453e975b3735de8f7af197650168c14 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 15 Aug 2018 13:12:31 -0400 Subject: [PATCH 1/6] Fix for the condition when the quoter filled price != order price --- .../orders/spreader_orders/SpreaderOrder.cpp | 27 ++++++++++++++----- .../orders/spreader_orders/SpreaderOrder.h | 1 + .../spreader/SpreaderChildOrderState.cpp | 2 ++ .../spreader/SpreaderChildOrderState.h | 7 ++++- .../spreader/quoter/QuoteDriverSetHistory.cpp | 7 ++++- .../SpreaderWorkingStateWorker.cpp | 7 ++--- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index d31427dd8..c04f4fa62 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -110,8 +110,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ #endif Quantity filled_qty = Quantity (ord_ev.state.filled_quantity()); - Price last_price = Price(ord_ev.state.last_price()); - LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {}", key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg ()); + Price last_price = Price(ord_ev.state.last_price()), + order_price=Price(ord_ev.state.price()); if (!SpreaderUtils::order_acknowledged(status)){ LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed callback for key: {} sec_key: {} order_key: {} status: {} ignoring", key(), sec_key, order_key, status); bts_assert(filled_qty.value() == 0); @@ -121,8 +121,14 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ if (leg_data_ptr != nullptr){ SpreaderLegData& leg_data = *leg_data_ptr; ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {} child_order_error: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg (), static_cast(order_error)); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), sec_key, + static_cast(_state_worker->state()), order_key, status, + filled_qty, order_price, last_price, + ord_ev.state.last_msg(), static_cast(order_error)); leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) @@ -138,8 +144,14 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ SingleFillHedger* hedger = _bookkeeping_data().find_hedger_from_orderkey(order_key); if (hedger != nullptr){ ChildOrderError order_error = _get_order_error (ord_ev, hedger->expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger order: key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {} child_order_error: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg (), static_cast(order_error)); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), sec_key, + static_cast(_state_worker->state()), order_key, status, + filled_qty, order_price, last_price, + ord_ev.state.last_msg (), static_cast(order_error)); hedger->order_state().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE) _state_worker->on_hedger_order_update (*hedger); @@ -273,6 +285,7 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, double fill_quantity, + Price quote_order_price, size_t hedge_leg_index, Price& hedge_price, double& hedge_quantity){ @@ -288,7 +301,7 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, computed_hedge_price, hedge_quantity); else{ - const QuoteLegDriver& driver_data = filled_leg_data.quoter().driver_data(fill_price, hedge_leg_index); + const QuoteLegDriver& driver_data = filled_leg_data.quoter().driver_data(quote_order_price, hedge_leg_index); SpreaderUtils::compute_hedge_price_size_n_legs (filled_leg_data.leg_property_data(), fill_price, fill_quantity, diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h index 5498384aa..f80cee486 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h @@ -173,6 +173,7 @@ private: void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, + Price order_price, size_t hedged_leg_index, Price& hedge_price, double& hedge_quantity); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 2a0d2ce88..5eb5926b0 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -19,6 +19,7 @@ _status(src._status), _filled_price(src._filled_price), _filled_quantity(src._filled_quantity), _last_filled_price(src._last_filled_price), +_last_reported_order_price(src._last_reported_order_price), _last_filled_quantity(src._last_filled_quantity) { } SpreaderChildOrderState::SpreaderChildOrderState (bts::orderman::ChildOrder& child_order, @@ -45,6 +46,7 @@ void SpreaderChildOrderState::_init_running_values(){ _filled_price = Price(0); _filled_quantity = Quantity (0); _last_filled_price = Price(0); + _last_reported_order_price=Price(0); _last_filled_quantity = Quantity(0); _out_price = Price(0); _out_quantity = Quantity(0); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index abad4c0cb..316ac66e1 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -29,6 +29,7 @@ private: Price _filled_price; Quantity _filled_quantity; Price _last_filled_price; + Price _last_reported_order_price; Quantity _last_filled_quantity; Price _out_price; Quantity _out_quantity; @@ -54,9 +55,12 @@ public: } // if the last fill was a status change // this will be zero - Price last_update_filled_price () const { + Price last_update_filled_price() const { return _last_filled_price; } + Price last_reported_order_price() const{ + return _last_reported_order_price; + } // if the last fill was a status change // this will be zero Quantity last_update_filled_quantity () const { @@ -109,6 +113,7 @@ public: _status = e.state.status(); _last_filled_quantity = Quantity(e.state.filled_quantity() - _filled_quantity.value()); _last_filled_price = Price(e.state.last_price()); + _last_reported_order_price=Price(e.state.price()); SpreaderUtils::compute_average_price(_filled_price, _filled_quantity, _last_filled_price, diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp index fa544e151..64d249fda 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp @@ -43,7 +43,12 @@ const QuoteDriverSet* QuoteDriverSetHistory::_find_driver_set(Price quote_price) _tick_size)) if (rv==nullptr||d.quote_seq_no()>rv->quote_seq_no()) rv=&d; - return rv!=nullptr ? rv:_latest(); + if (rv==nullptr){ + LOG(OrderMan, Warn, "QuoteDriverSetHistory::_find_driver_set " + "could not find driver:{}",quote_price); + rv=_latest(); + } + return rv; } const QuoteLegDriver* QuoteDriverSetHistory::find_driver(Price quote_price, size_t leg_index) const{ diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index f6c60f95b..305ad44f9 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -92,11 +92,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // ii. not send a hedge on leg_2 since its already filled // however doing the above would mess up the leg ratio's so we are preffering // getting overfilled - SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); - LOG(OrderMan, Info, "SpreaderWorkingStateWorker::on_quoter_order_fill order: key: {} order_key: {} status: {} filled_qty: {} last_price: {}", - _spreader->key(), order_update_message.order_key(), order_update_message.status(), - order_update_message.last_update_filled_quantity(), - order_update_message.last_update_filled_price()); + SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); bts_assert (order_update_message.last_update_filled_quantity().value() > 0); for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ if (q_idx != leg_data.leg_property_data().leg_index()){ @@ -106,6 +102,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), + order_update_message.last_reported_order_price(), q_idx, hedge_price, hedge_qty); From b12fb8c175453e321a2cf048b2aaf9a816aece27 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 15 Aug 2018 17:28:30 +0000 Subject: [PATCH 2/6] Implemented Jake's note on spread leg last px. --- .../orderman/actors/ExecutionGateway.cpp | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp index 97104015c..ef3fb07c7 100644 --- a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp @@ -203,11 +203,10 @@ void ExecutionGateway::on_exe_report( data->side = api::Side(msg.get()); if (msg.has()) data->time_in_force = - api::orderman::TimeInForce(msg.get()); + 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 = @@ -218,14 +217,9 @@ void ExecutionGateway::on_exe_report( : api::orderman::MANUAL_ORDER_INDICATOR_YES; str_to(msg.get(), &data->exchange_order_id); - if (msg.has()) { - if (data->leg_security) - data->price = securities::decode_exchange_price( - *data->leg_security, Price(msg.get())); - else - data->price = securities::decode_exchange_price( - *sec, Price(msg.get())); - } + if (msg.has()) + data->price = securities::decode_exchange_price( + *sec, Price(msg.get())); else data->price = Price(os::nan()); @@ -239,18 +233,19 @@ void ExecutionGateway::on_exe_report( 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( - *sec, Price(msg.get())) + *last_px_sec, Price(msg.get())) : Price(0); data->avg_price = msg.has() ? securities::decode_exchange_price( - *sec, Price(msg.get())) + *last_px_sec, Price(msg.get())) : Price(0); if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); From 11211f463322e3bbb94e3b14101440b5a97733d7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 15 Aug 2018 14:45:32 -0500 Subject: [PATCH 3/6] PnL - Pennies are back --- src/client/spark/view/Spark/PAndL/PAndLView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/PAndL/PAndLView.xaml b/src/client/spark/view/Spark/PAndL/PAndLView.xaml index 6eac65091..1ba3817a1 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLView.xaml +++ b/src/client/spark/view/Spark/PAndL/PAndLView.xaml @@ -19,7 +19,7 @@ - + From d0e0b2088cc69ed26440363a36510f542f868cc9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 16 Aug 2018 10:33:53 -0500 Subject: [PATCH 4/6] cpp maintenance --- src/lib/config/defaults/cpp_config.conf | 51 +++++++++++++++---------- tools/cpp_helper/Generate-Cpps-reqs.ps1 | 2 +- tools/cpp_helper/Generate-Cpps.ps1 | 2 +- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index 1e2f217d6..f33116c61 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -357,9 +357,6 @@ CppConfig cpp_entry { key: "BSW" value: 136 } cpp_entry { key: "BTC" value: 5 } cpp_entry { key: "BTT" value: 50 } - cpp_entry { key: "BU2" value: 20000 } - cpp_entry { key: "BU3" value: 30000 } - cpp_entry { key: "BU5" value: 50000 } cpp_entry { key: "BUC" value: 42000 } cpp_entry { key: "BUS" value: 20 } cpp_entry { key: "BUW" value: 20 } @@ -448,6 +445,7 @@ CppConfig 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 } @@ -461,12 +459,13 @@ CppConfig cpp_entry { key: "DDO" value: 1000 } cpp_entry { key: "DEB" value: 744 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 264 } + cpp_entry { key: "DEP" value: 276 } cpp_entry { key: "DES" value: 1000 } cpp_entry { key: "DFL" value: 100 } cpp_entry { key: "DFT" 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 } @@ -476,11 +475,17 @@ CppConfig cpp_entry { key: "DIH" value: 2500 } 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: "DRS" value: 100 } cpp_entry { key: "DSD" value: 1000 } cpp_entry { key: "DSE" value: 1000 } + cpp_entry { key: "DSG" value: 1000 } cpp_entry { key: "DSI" value: 1000 } cpp_entry { key: "DSM" value: 1000 } + cpp_entry { key: "DUA" value: 6350 } cpp_entry { key: "DUP" value: 1000 } cpp_entry { key: "DVE" value: 200 } cpp_entry { key: "DVT" value: 200 } @@ -498,7 +503,6 @@ CppConfig cpp_entry { key: "EAE" value: 5 } cpp_entry { key: "EAF" value: 1000 } cpp_entry { key: "EAW" value: 80 } - cpp_entry { key: "EB" value: 2500 } cpp_entry { key: "EBE" value: 1000 } cpp_entry { key: "ECD" value: 125000 } cpp_entry { key: "ECK" value: 4000000 } @@ -550,7 +554,6 @@ CppConfig cpp_entry { key: "EWG" value: 1000 } cpp_entry { key: "EWN" value: 1000 } cpp_entry { key: "EXR" value: 350000 } - cpp_entry { key: "F1E" value: 1000 } cpp_entry { key: "F1U" value: 1000 } cpp_entry { key: "F3" value: 1000 } cpp_entry { key: "FAL" value: 5 } @@ -612,6 +615,7 @@ CppConfig cpp_entry { key: "GDK" value: 2000 } cpp_entry { key: "GDL" value: 1000 } cpp_entry { key: "GE" value: 2500 } + cpp_entry { key: "GES" value: 1000 } cpp_entry { key: "GF" value: 500 } cpp_entry { key: "GFC" value: 1000 } cpp_entry { key: "GFT" value: 500 } @@ -621,8 +625,11 @@ CppConfig cpp_entry { key: "GKS" value: 1000 } cpp_entry { key: "GLB" value: 2500 } cpp_entry { key: "GLI" value: 100 } + cpp_entry { key: "GNB" value: 1000 } cpp_entry { key: "GNF" value: 440 } cpp_entry { key: "GNL" value: 80 } + cpp_entry { key: "GNO" value: 1000 } + cpp_entry { key: "GNS" value: 1000 } cpp_entry { key: "GOC" value: 7450 } cpp_entry { key: "GPS" value: 100 } cpp_entry { key: "GSI" value: 42000 } @@ -705,7 +712,7 @@ CppConfig cpp_entry { key: "IPT" value: 10 } cpp_entry { key: "IS" value: 5000 } cpp_entry { key: "ITB" value: 744 } - cpp_entry { key: "ITP" value: 264 } + cpp_entry { key: "ITP" value: 276 } cpp_entry { key: "IW" value: 5000 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } @@ -716,7 +723,7 @@ CppConfig cpp_entry { key: "JFB" value: 1000 } cpp_entry { key: "JFC" value: 1000 } cpp_entry { key: "JKM" value: 10000 } - cpp_entry { key: "JML" value: 40 } + cpp_entry { key: "JML" value: 440 } cpp_entry { key: "JNC" value: 1000 } cpp_entry { key: "JNG" value: 10000 } cpp_entry { key: "JNL" value: 80 } @@ -783,6 +790,7 @@ CppConfig cpp_entry { key: "MAB" value: 1000 } cpp_entry { key: "MAC" value: 833 } cpp_entry { key: "MAE" value: 100 } + cpp_entry { key: "MAF" value: 10 } cpp_entry { key: "MAS" value: 100 } cpp_entry { key: "MB" value: 1000 } cpp_entry { key: "MBB" value: 100000 } @@ -804,6 +812,7 @@ CppConfig cpp_entry { key: "ME" value: 42000 } cpp_entry { key: "MEB" value: 100 } cpp_entry { key: "MEE" value: 100 } + cpp_entry { key: "MEF" value: 10 } cpp_entry { key: "MEL" value: 840 } cpp_entry { key: "MEO" value: 100 } cpp_entry { key: "MEW" value: 100 } @@ -873,7 +882,6 @@ CppConfig cpp_entry { key: "MXL" value: 5 } cpp_entry { key: "MXR" value: 35000 } cpp_entry { key: "N1B" value: 1000 } - cpp_entry { key: "N1E" value: 1000 } cpp_entry { key: "N1U" value: 1000 } cpp_entry { key: "N3L" value: 80 } cpp_entry { key: "N3P" value: 80 } @@ -894,7 +902,7 @@ CppConfig cpp_entry { key: "NFG" value: 1000 } cpp_entry { key: "NFN" value: 2500 } cpp_entry { key: "NFO" value: 5 } - cpp_entry { key: "NG" value: 100 } + cpp_entry { key: "NG" value: 10000 } cpp_entry { key: "NGT" value: 10000 } cpp_entry { key: "NHH" value: 5000 } cpp_entry { key: "NHN" value: 2500 } @@ -1046,6 +1054,7 @@ CppConfig cpp_entry { key: "REB" value: 1000 } cpp_entry { key: "REX" value: 100 } cpp_entry { key: "RF" value: 125000 } + cpp_entry { key: "RGF" value: 349860 } cpp_entry { key: "RGI" value: 1000 } cpp_entry { key: "RGT" value: 50 } cpp_entry { key: "RHB" value: 1000 } @@ -1071,7 +1080,7 @@ CppConfig cpp_entry { key: "SBT" value: 5000 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1680 } + cpp_entry { key: "SDD" value: 1840 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1087,6 +1096,7 @@ CppConfig cpp_entry { key: "SG" value: 250 } cpp_entry { key: "SGB" 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: "SI" value: 5000 } @@ -1103,7 +1113,7 @@ CppConfig cpp_entry { key: "SP" value: 250 } cpp_entry { key: "SR1" value: 4167 } cpp_entry { key: "SR3" value: 2500 } - cpp_entry { key: "SRT" value: 1680 } + cpp_entry { key: "SRT" value: 1840 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1114,28 +1124,27 @@ 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: "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: "T13" value: 800 } - cpp_entry { key: "T1E" value: 1000 } + 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: "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 } diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index bcdf10e21..056fbb24f 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -14,7 +14,7 @@ $known_good = @{ "HO" = 42000 "LE" = 400 "M6E" = 125 - "NG" = 100 + "NG" = 10000 "NQ" = 20 "QM" = 500 "RB" = 42000 diff --git a/tools/cpp_helper/Generate-Cpps.ps1 b/tools/cpp_helper/Generate-Cpps.ps1 index 77ec00238..a7a71a1fe 100644 --- a/tools/cpp_helper/Generate-Cpps.ps1 +++ b/tools/cpp_helper/Generate-Cpps.ps1 @@ -32,4 +32,4 @@ Remove-Item $csv_save_path -Force # You can now copy the output file to defaults assuming all looks good # Copy-Item .\cpp_config.conf ..\..\src\lib\config\defaults\ -Force -# Remove-Item cpp-config.conf \ No newline at end of file +# Remove-Item cpp_config.conf \ No newline at end of file From b4908ac15522662a4407b24bf890dfcb9d65470c Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 16 Aug 2018 14:02:01 -0500 Subject: [PATCH 5/6] the great cpp fixup --- src/lib/config/defaults/cpp_config.conf | 48 ++++++++++++------------ tools/cpp_helper/Generate-Cpps-reqs.ps1 | 49 +++++++++---------------- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index f33116c61..0f4fb61f8 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -62,11 +62,11 @@ CppConfig cpp_entry { key: "5Y" value: 42000 } cpp_entry { key: "5ZN" value: 2500 } cpp_entry { key: "63" value: 1000 } - cpp_entry { key: "6A" value: 1000 } - cpp_entry { key: "6B" value: 625 } + cpp_entry { key: "6A" value: 100000 } + cpp_entry { key: "6B" value: 62500 } cpp_entry { key: "6C" value: 100000 } - cpp_entry { key: "6E" value: 1250 } - cpp_entry { key: "6J" value: 1250 } + cpp_entry { key: "6E" value: 125000 } + cpp_entry { key: "6J" value: 12500000 } cpp_entry { key: "6L" value: 100000 } cpp_entry { key: "6M" value: 500000 } cpp_entry { key: "6N" value: 100000 } @@ -662,7 +662,7 @@ CppConfig cpp_entry { key: "HB" value: 2500 } cpp_entry { key: "HE" value: 400 } cpp_entry { key: "HET" value: 400 } - cpp_entry { key: "HG" value: 5000 } + cpp_entry { key: "HG" value: 25000 } cpp_entry { key: "HG0" value: 25000 } cpp_entry { key: "HGS" value: 25000 } cpp_entry { key: "HGT" value: 25000 } @@ -700,20 +700,20 @@ CppConfig cpp_entry { key: "IBE" value: 1000 } cpp_entry { key: "IBS" value: 1000 } cpp_entry { key: "IBV" value: 1 } - cpp_entry { key: "IC" value: 5000 } + cpp_entry { key: "IC" value: 50 } cpp_entry { key: "ICI" value: 1000 } cpp_entry { key: "IDL" value: 5 } - cpp_entry { key: "IH" value: 5000 } + cpp_entry { key: "IH" value: 50 } cpp_entry { key: "ILB" value: 1750 } cpp_entry { key: "ILS" value: 1000000 } cpp_entry { key: "IN" value: 2500 } - cpp_entry { key: "IP" value: 5000 } + cpp_entry { key: "IP" value: 50 } cpp_entry { key: "IPO" value: 10 } cpp_entry { key: "IPT" value: 10 } - cpp_entry { key: "IS" value: 5000 } + cpp_entry { key: "IS" value: 50 } cpp_entry { key: "ITB" value: 744 } cpp_entry { key: "ITP" value: 276 } - cpp_entry { key: "IW" value: 5000 } + cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } cpp_entry { key: "JA" value: 1000 } @@ -751,8 +751,8 @@ CppConfig cpp_entry { key: "K5" value: 20 } cpp_entry { key: "K5K" value: 20 } cpp_entry { key: "K5N" value: 20 } - cpp_entry { key: "KE" value: 5000 } - cpp_entry { key: "KET" value: 5000 } + cpp_entry { key: "KE" value: 50 } + cpp_entry { key: "KET" value: 50 } cpp_entry { key: "KQ" value: 20 } cpp_entry { key: "KQK" value: 20 } cpp_entry { key: "KQN" value: 20 } @@ -785,7 +785,7 @@ CppConfig cpp_entry { key: "M5F" value: 10 } cpp_entry { key: "M6A" value: 10000 } cpp_entry { key: "M6B" value: 6250 } - cpp_entry { key: "M6E" value: 125 } + cpp_entry { key: "M6E" value: 12500 } cpp_entry { key: "MAA" value: 100 } cpp_entry { key: "MAB" value: 1000 } cpp_entry { key: "MAC" value: 833 } @@ -803,7 +803,7 @@ CppConfig cpp_entry { key: "MCC" value: 1000 } cpp_entry { key: "MCD" value: 10000 } cpp_entry { key: "MCT" value: 80 } - cpp_entry { key: "MCX" value: 5000 } + cpp_entry { key: "MCX" value: 50 } cpp_entry { key: "MDB" value: 100 } cpp_entry { key: "MDD" value: 5 } cpp_entry { key: "MDL" value: 80 } @@ -839,7 +839,7 @@ CppConfig cpp_entry { key: "MJN" value: 100 } cpp_entry { key: "MJP" value: 25 } cpp_entry { key: "MJY" value: 1250000 } - cpp_entry { key: "MKC" value: 1000 } + cpp_entry { key: "MKC" value: 10 } cpp_entry { key: "MLD" value: 80 } cpp_entry { key: "MM" value: 1000 } cpp_entry { key: "MME" value: 100 } @@ -876,7 +876,7 @@ CppConfig cpp_entry { key: "MTI" value: 80 } cpp_entry { key: "MTS" value: 100 } cpp_entry { key: "MUD" value: 100 } - cpp_entry { key: "MWE" value: 5000 } + cpp_entry { key: "MWE" value: 50 } cpp_entry { key: "MX" value: 1000 } cpp_entry { key: "MXB" value: 35000 } cpp_entry { key: "MXL" value: 5 } @@ -1077,7 +1077,7 @@ CppConfig cpp_entry { key: "RY" value: 125000 } cpp_entry { key: "RYA" value: 42000 } cpp_entry { key: "S1U" value: 1000 } - cpp_entry { key: "SBT" value: 5000 } + cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } cpp_entry { key: "SDD" value: 1840 } @@ -1265,7 +1265,7 @@ CppConfig cpp_entry { key: "WHD" value: 1000 } cpp_entry { key: "WMB" value: 1000 } cpp_entry { key: "WMD" value: 1000 } - cpp_entry { key: "WMK" value: 5000 } + cpp_entry { key: "WMK" value: 50 } cpp_entry { key: "WMR" value: 1000 } cpp_entry { key: "WNC" value: 1000 } cpp_entry { key: "WNT" value: 1000 } @@ -1292,13 +1292,13 @@ CppConfig cpp_entry { key: "XAV" value: 100 } cpp_entry { key: "XAY" value: 100 } cpp_entry { key: "XBT" value: 100 } - cpp_entry { key: "XC" value: 1000 } + cpp_entry { key: "XC" value: 10 } cpp_entry { key: "XER" value: 1000 } cpp_entry { key: "XET" value: 100 } cpp_entry { key: "XFT" value: 250 } cpp_entry { key: "XH" value: 2500 } cpp_entry { key: "XIT" value: 100 } - cpp_entry { key: "XK" value: 1000 } + cpp_entry { key: "XK" value: 10 } cpp_entry { key: "XKT" value: 100 } cpp_entry { key: "XPP" value: 80 } cpp_entry { key: "XPT" value: 100 } @@ -1307,7 +1307,7 @@ CppConfig cpp_entry { key: "XRT" value: 250 } cpp_entry { key: "XUT" value: 100 } cpp_entry { key: "XVT" value: 100 } - cpp_entry { key: "XW" value: 1000 } + cpp_entry { key: "XW" value: 10 } cpp_entry { key: "XX" value: 2500 } cpp_entry { key: "XYT" value: 100 } cpp_entry { key: "YF" value: 42000 } @@ -1372,7 +1372,7 @@ CppConfig cpp_entry { key: "ZC9906" value: 1000 } cpp_entry { key: "ZC9909" value: 1000 } cpp_entry { key: "ZC9912" value: 1000 } - cpp_entry { key: "ZCT" value: 5000 } + cpp_entry { key: "ZCT" value: 50 } cpp_entry { key: "ZD0030" value: 1000 } cpp_entry { key: "ZD9112" value: 1000 } cpp_entry { key: "ZD9115" value: 1000 } @@ -1401,12 +1401,12 @@ CppConfig cpp_entry { key: "ZMT" value: 100 } cpp_entry { key: "ZN" value: 1000 } cpp_entry { key: "ZNC" value: 25 } - cpp_entry { key: "ZO" value: 5000 } + cpp_entry { key: "ZO" value: 50 } cpp_entry { key: "ZQ" value: 4167 } cpp_entry { key: "ZR" value: 2000 } cpp_entry { key: "ZS" value: 50 } cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } - cpp_entry { key: "ZWT" value: 5000 } + cpp_entry { key: "ZWT" value: 50 } } } diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index 056fbb24f..07d324706 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -1,36 +1,23 @@ $known_good = @{ - "6A" = 1000 - "6B" = 625 - "6D" = 1000 - "6E" = 1250 - "6J" = 1250 - "CL" = 1000 - "EMD" = 100 - "ES" = 50 - "GC" = 100 - "GE" = 2500 - "HE" = 400 - "HG" = 5000 - "HO" = 42000 - "LE" = 400 - "M6E" = 125 - "NG" = 10000 - "NQ" = 20 - "QM" = 500 - "RB" = 42000 - "RTY" = 50 - "SI" = 5000 - "VX" = 1000 - "YI" = 10 - "YM" = 5 - "ZB" = 1000 + "IC" = 50 + "IH" = 50 + "IP" = 50 + "IS" = 50 + "IW" = 50 + "KE" = 50 + "KET" = 50 + "MCX" = 50 + "MKC" = 10 + "MWE" = 50 + "SBT" = 50 + "WMK" = 50 + "XC" = 10 + "XK" = 10 + "XW" = 10 "ZC" = 50 - "ZF" = 1000 - "ZL" = 600 - "ZM" = 100 - "ZN" = 1000 - "ZQ" = 4167 + "ZO" = 50 "ZS" = 50 - "ZT" = 2000 "ZW" = 50 + "ZCT" = 50 + "ZWT" = 50 } \ No newline at end of file From 3812783b29e4f7c8fdfd094b602953a0d18b356c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 16 Aug 2018 15:36:02 -0400 Subject: [PATCH 6/6] added logs in TriggerOrder to caputure initial md state --- src/server/sparkd/orderman/orders/TriggerOrder.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index c5d1d2721..62098f1a3 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -251,6 +251,12 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(),_state, + trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); + return true; } void TriggerOrder::_report_state(){ @@ -326,6 +332,12 @@ void TriggerOrder::_observe_market_once(){ if(obs_md != nullptr && obs_md->size()>0){ me->market_observed_once=true; me->trigger_above_market=_trigger_price()>=obs_md->price(); + LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(),_state, + obs_md->price(), obs_md->size(), + me->trigger_above_market); } } }