From ff53cf8b4d29844f7ec29300ffffe7252bb9d3db Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 16 Feb 2019 22:33:47 -0500 Subject: [PATCH] QHO working from the spreader --- .../orders/queue_holder/QHOOrderManager.h | 16 +++++++++ .../orders/queue_holder/QueueHolderOrder.h | 33 +++++++++++++++++-- .../spreader/SpreaderUtils.cpp | 20 +++++++---- src/lib/sparkproto/SparkProtos.proto | 5 +++ 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h b/src/lib/orderman/orders/queue_holder/QHOOrderManager.h index 32a97375f..8b6d104b7 100644 --- a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h +++ b/src/lib/orderman/orders/queue_holder/QHOOrderManager.h @@ -133,6 +133,22 @@ public: rv+=o.order.total_fills().value(); return Quantity(rv); } + inline void filled_price(double& filled_price, uint32_t& filled_qty) const{ + double tot_price=0.0; + uint32_t tot_qty=0; + for (const auto& o : _orders){ + Price so_price; Quantity so_qty; + o.order.total_fills(so_qty,so_price); + if(so_qty.value()>0){ + tot_qty+=so_qty.value(); + tot_price+=so_price.value()*so_qty.value(); + } + } + if(tot_qty>0) + tot_price/=tot_qty; + filled_price=tot_price; + filled_qty=tot_qty; + } // filled or overfilled inline bool filled () const{ return filled_qty().value()>=_target_qty.value(); diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h index b533a2dba..b5e363e81 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h +++ b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h @@ -62,7 +62,7 @@ private: return _services!=nullptr; } bool _is_unexpected_child_cancel(const OrderStateUpdateEvent& c) const; - api::orderman::OrderStatus status() const{ + api::orderman::OrderStatus status(std::string& message) const{ QueueHolderOrderState curr_state= _state_worker==nullptr?QueueHolderOrderState::START:_state(); switch (curr_state){ @@ -75,6 +75,17 @@ private: case QueueHolderOrderState::WAITING_FOR_CANCEL_ALL: return api::orderman::OrderStatus::ORDER_STATUS_WORKING; case QueueHolderOrderState::END: + if(_cancelled_externally){ + return bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } + else if(_unexpected_child_cancel){ + message="Queue Holder Order's child order cancelled"; + return bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } + else if(_child_error){ + message="Queue Holder Order's child order error"; + return bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + } return bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; } return api::orderman::OrderStatus::ORDER_STATUS_WORKING; @@ -82,8 +93,24 @@ private: // sends orders for the first time void _report_state(){ if(_activated()){ - _reported_state.set_status(status()); - _reported_state.set_filled_quantity(_order_manager.filled_qty().value()); + std::string err_msg; + _reported_state.set_status(status(err_msg)); + double filled_price; + uint32_t filled_qty; + _order_manager.filled_price(filled_price,filled_qty); + if(filled_qty>_reported_state.filled_quantity()){ + // this means there was a fill reported bw last report + // and this, hence last_price needs to be set + uint32_t last_trade_qty=filled_qty- + _reported_state.filled_quantity(); + double last_trade_price=filled_price*filled_qty- + _reported_state.avg_price()*_reported_state.filled_quantity(); + last_trade_price/=last_trade_qty; + _reported_state.set_last_price(last_trade_price); + } + _reported_state.set_avg_price(filled_price); + _reported_state.set_filled_quantity(filled_qty); + _reported_state.set_last_msg(err_msg); _services->report_state(_reported_state); } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index bdd9ff16b..5763103e2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -45,19 +45,25 @@ bool SpreaderUtils::resolve_synthetic_spread (const SpreaderPreActivationOrderSe quoter_order_def.set_side(leg_order_side); quoter_order_def.set_sub_type(bts::api::orderman::OrderSubType::ORDER_SUB_TYPE_QUOTING_LEG); - // api::orderman::QueueHolderDefinition qho_order_def; - // qho_order_def.set_n_queue_orders(4); - // qho_order_def.mutable_child()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); - // quoter_order_def.mutable_custom_def()->mutable_queue_holder()->MergeFrom(qho_order_def); - - quoter_order_def.mutable_custom_def()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); - + uint32_t n_queue_holder_orders=leg_params.quote_params().n_queue_holder_orders(); + n_queue_holder_orders=4; + if(n_queue_holder_orders){ + api::orderman::QueueHolderDefinition qho_order_def; + qho_order_def.set_n_queue_orders(n_queue_holder_orders); + qho_order_def.mutable_child()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); + quoter_order_def.mutable_custom_def()->mutable_queue_holder()->MergeFrom (qho_order_def); + } + else{ + quoter_order_def.mutable_custom_def()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); + } + if(leg_params.quote_params().has_quote_hidden()) quoter_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_IOC); else quoter_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_DAY); // hedger order def api::orderman::OrderDefinition hedger_order_def = quoter_order_def; + hedger_order_def.mutable_custom_def()->mutable_limit()->MergeFrom (api::orderman::LimitOrderDefinition()); hedger_order_def.set_time_in_force(bts::api::orderman::TimeInForce::TIME_IN_FORCE_DAY); hedger_order_def.set_sub_type(bts::api::orderman::OrderSubType::ORDER_SUB_TYPE_HEDGING_LEG); LegPropertyData leg_property_data(leg_idx, leg, leg_params, leg_order_side); diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 52fdb9ddb..ddc6ffd4b 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -69,6 +69,11 @@ message QuoteParams QuoteMaxOrderMove quote_max_order_move = 1040; QuoteHidden quote_hidden = 1050; ConditionalQuoting conditional_quoting=1060; + // default value 0, 1 means we will have one trailing + // order behind the top level + // (once we have ChildOrder's here, we can reture this + // and the user can embed a QHO here) + uint32 n_queue_holder_orders=2000; } /*************************************Quote MuteZone***********************************