From 70af51e1631868e3ac36854b17ff42b331eeeafd Mon Sep 17 00:00:00 2001 From: taha afzal Date: Thu, 21 Jul 2022 20:36:17 -0400 Subject: [PATCH] ExchangeOpenOrders are now routed all the way to OrderServiceServer --- src/lib/orderman/OrderServiceServer.cpp | 16 +++++++++ src/lib/orderman/OrderServiceServer.h | 2 ++ src/lib/orderman/actors/ServiceBridge.cpp | 27 +++++++++++++- src/lib/orderman/actors/ServiceBridge.h | 5 +++ .../actors/order_manager/OrderManager.cpp | 9 +++++ .../actors/order_manager/OrderServicesData.h | 2 ++ .../orderman/events/ExchangeOpenOrdersEvent.h | 22 ++++++++++++ .../orderman/gateways/EMExecutionGateway.cpp | 35 +++++++++++++++++-- src/lib/orderman/gateways/IExecutionGateway.h | 6 ++-- ...changeOpenOrder.h => ExchangeOpenOrders.h} | 4 +-- 10 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 src/lib/orderman/events/ExchangeOpenOrdersEvent.h rename src/lib/orderman/orderman_utils/{ExchangeOpenOrder.h => ExchangeOpenOrders.h} (91%) diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index 111b65b88..fccbb27f6 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -25,6 +25,7 @@ #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" +#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" #include "lib/utils/PBUtils.h" @@ -250,6 +251,14 @@ OrderServiceServer::OrderServiceServer( exch_pos.total_exchange_positions.size()); ctx.post([this, exch_pos] { this->_on_exchange_position(exch_pos); }); }, + [this, &ctx](const ExchangeOpenOrders &exch_open_orders) { + LOG(OrderMan, Info, + "OrderServiceServer open orders n_open_orders: {} ", + exch_open_orders.all_open_orders.size()); + ctx.post([this, exch_open_orders] { + this->_on_exchange_open_orders(exch_open_orders); + }); + }, me->dyn_order_registry, thread->executor.make_proxy(), mdc.oracle()); thread->executor.activate(me->service_bridge); @@ -472,5 +481,12 @@ void OrderServiceServer::_on_exchange_position( me->exchange_pos_publisher.flush(); } +void OrderServiceServer::_on_exchange_open_orders( + const ExchangeOpenOrdersEvent &ev) { + LOG(OrderMan, Info, + " OrderServiceServer::_on_exchange_open_orders n_open_orders: {}", + ev.open_orders.all_open_orders.size()); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/OrderServiceServer.h b/src/lib/orderman/OrderServiceServer.h index 8241ac52f..9c259cb43 100644 --- a/src/lib/orderman/OrderServiceServer.h +++ b/src/lib/orderman/OrderServiceServer.h @@ -4,6 +4,7 @@ #include "lib/api/services/OrderService.server.pb.h" #include "lib/md/MDClient.h" #include "lib/mercury/actors/IPollableActor.h" +#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" #include namespace bts { @@ -59,6 +60,7 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { void on_fills(std::vector const &); void on_order_op_result(OrderOpResultEvent const &); void _on_exchange_position(const ExchangePositionEvent &); + void _on_exchange_open_orders(const ExchangeOpenOrdersEvent &); }; } // namespace orderman diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 9a43a5e12..6d0c43cad 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -12,6 +12,7 @@ #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" #include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" +#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/FilledPositionEvent.h" #include "lib/orderman/events/ManuallyBustFillsEvent.h" @@ -39,12 +40,14 @@ struct ServiceBridge::PImpl { OnFills const &on_fills, OnOrderOpResult const &on_order_op_result, OnExchangePosition const &on_exchange_position, + OnExchangeOpenOrders const &on_exchange_open_orders, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o) : on_ready(on_ready), on_orders(on_orders), on_fills(on_fills), on_order_op_result(on_order_op_result), - on_exchange_position(on_exchange_position), have_orders(false), + on_exchange_position(on_exchange_position), + on_exchange_open_orders(on_exchange_open_orders), have_orders(false), order_manager_ready(false), sec_db(o), order_router(), order_factory(sec_db, order_router, dyn_order_registry), known_orders(), service_call_marshaller(service_call_marshaller) {} @@ -54,6 +57,7 @@ struct ServiceBridge::PImpl { OnFills on_fills; OnOrderOpResult on_order_op_result; OnExchangePosition on_exchange_position; + OnExchangeOpenOrders on_exchange_open_orders; bool have_orders; bool order_manager_ready; securities::MapSecurityDB sec_db; @@ -80,6 +84,7 @@ ServiceBridge::ServiceBridge( OnFills const &on_fills, OnOrderOpResult const &on_order_op_result, OnExchangePosition const &on_exchange_position, + OnExchangeOpenOrders const &on_exchange_open_orders, DynamicOrderRegistry const &dyn_order_registry, mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o) @@ -89,6 +94,7 @@ ServiceBridge::ServiceBridge( on_fills, on_order_op_result, on_exchange_position, + on_exchange_open_orders, dyn_order_registry, service_call_marshaller, o)) { @@ -124,6 +130,25 @@ void ServiceBridge::init() { return; } }); + subscribe([this](mercury::Update< + ExchangeOpenOrdersEvent> const + &u) { + if (u.events == nullptr) { + LOG(OrderMan, Warn, + "ServiceBridge ExchangeOpenOrdersEvent callback null events"); + return; + } + LOG(OrderMan, Info, + "ServiceBridge ExchangeOpenOrdersEvent callback sz: {}", + u.events->size()); + for (const auto &ev : *(u.events)) { + LOG(OrderMan, Info, + "ServiceBridge received ExchangeOpenOrdersEvent n_open_orders: {}", + ev.open_orders.all_open_orders.size()); + me->on_exchange_open_orders(ev.open_orders); + return; + } + }); me->activate_order_pub = make_stream(); me->update_order_pub = make_stream(); diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index f568b4550..25a868793 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -6,7 +6,9 @@ #include "lib/md/SecurityOracle.h" #include "lib/mercury/actors/Actor.h" #include "lib/mercury/events/Update.h" +#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" #include "lib/orderman/events/ExchangePositionEvent.h" +#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" #include "lib/orderman/orderman_utils/ExchangePosition.h" #include @@ -44,6 +46,7 @@ class NewAdminDataEvent; class OrderOpResultEvent; class DynamicOrderRegistry; class ExchangePositionEvent; +class ExchangeOpenOrdersEvent; } // namespace orderman } // namespace bts // end fwds @@ -65,6 +68,7 @@ class ServiceBridge : public mercury::Actor { std::function const &)>; using OnOrderOpResult = std::function; using OnExchangePosition = std::function; + using OnExchangeOpenOrders = std::function; ServiceBridge( OnReady const &, @@ -72,6 +76,7 @@ class ServiceBridge : public mercury::Actor { OnFills const &, OnOrderOpResult const &, OnExchangePosition const &, + OnExchangeOpenOrders const &, DynamicOrderRegistry const &, mercury::BrokerProxy &service_call_marshaller, md::SecurityOracle o); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 3c59844df..75f4fe1cc 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -7,6 +7,7 @@ #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" +#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/FilledPositionEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" @@ -495,6 +496,14 @@ void OrderManager::init_order_services() { exch_pos.total_exchange_positions.size()); publish(s_ptr->exchange_position_pub, exch_pos); }; + s->exchange_open_ordes_pub = make_stream(); + s->gw->on_exchange_open_orders() = + [s_ptr, this](const ExchangeOpenOrders &open_orders) { + LOG(OrderMan, Info, + "OrderManager on_exchange_open_orders cb n_open_orders: {}", + open_orders.all_open_orders.size()); + publish(s_ptr->exchange_open_ordes_pub, open_orders); + }; s->cancel_reject_pub = make_stream(gw_name); s->gw->on_cancel_reject() = [s_ptr, this](auto const &cr) { publish(s_ptr->cancel_reject_pub, cr); diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index aa6e4c976..4a6c276f7 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -15,6 +15,7 @@ #include "lib/orderman/events/CreateOrderReplyEvent.h" #include "lib/orderman/events/CreateOrderRequestEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" +#include "lib/orderman/events/ExchangeOpenOrdersEvent.h" #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/MDRequestEvent.h" @@ -85,6 +86,7 @@ struct SessionServicesData { mercury::Stream gw_status_change_pub; mercury::Stream cancel_reject_pub; mercury::Stream exchange_position_pub; + mercury::Stream exchange_open_ordes_pub; }; class OrderServicesData { diff --git a/src/lib/orderman/events/ExchangeOpenOrdersEvent.h b/src/lib/orderman/events/ExchangeOpenOrdersEvent.h new file mode 100644 index 000000000..ad7612e6c --- /dev/null +++ b/src/lib/orderman/events/ExchangeOpenOrdersEvent.h @@ -0,0 +1,22 @@ +#pragma once + +#include "lib/api/services/AdminService.pb.h" + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/CacheLast.h" +#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" + +#include + +namespace bts::orderman { + +class ExchangeOpenOrdersEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::CacheLast; + ExchangeOpenOrders open_orders; + ExchangeOpenOrdersEvent(const ExchangeOpenOrders &open_orders) + : open_orders(open_orders){}; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/EMExecutionGateway.cpp b/src/lib/orderman/gateways/EMExecutionGateway.cpp index 4e371abe6..ff56740b0 100644 --- a/src/lib/orderman/gateways/EMExecutionGateway.cpp +++ b/src/lib/orderman/gateways/EMExecutionGateway.cpp @@ -14,6 +14,7 @@ #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/orderman_utils/CancelReject.h" +#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" #include "lib/orderman/orderman_utils/ExchangePosition.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" @@ -84,7 +85,7 @@ struct EMExecutionGateway::PImpl { OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; OnExchangePositionState on_exchange_position_state; - orderman::OnExchangeOpenOrdersState on_exchange_open_orders; + OnExchangeOpenOrdersState on_exchange_open_orders; // orders are sent out and callbacks received via IEMOrderMuxer IEMOrderMuxer *order_mux = nullptr; size_t msg_seq_num = 0; @@ -97,6 +98,7 @@ struct EMExecutionGateway::PImpl { std::unordered_map order_map = {}; // this is updated as we get exchange positions ExchangePosition exchange_position; + ExchangeOpenOrders exchange_open_orders; // since we get callbacks from IEMOrderMuxer in a different thread we // queue them here and then dequeue on the dispatch_incoming_fix_messages // call @@ -288,9 +290,13 @@ OnCancelReject &EMExecutionGateway::on_cancel_reject() { return me->on_cancel_reject; } OnExchangePositionState &EMExecutionGateway::on_exchange_position_state() { + LOG(OrderMan, Info, + "EMExecutionGateway::on_exchange_position_state subscribed"); return me->on_exchange_position_state; } OnExchangeOpenOrdersState &EMExecutionGateway::on_exchange_open_orders() { + LOG(OrderMan, Info, + "EMExecutionGateway::on_exchange_open_orders subscribed"); return me->on_exchange_open_orders; } @@ -522,9 +528,32 @@ void EMExecutionGateway::_process_pos_cb_and_fire( void EMExecutionGateway::_process_open_order_cb_and_fire( const EMExchangeOpenOrdersCallbackMsg &open_order_cb) { + using namespace emumba::market_data; + me->exchange_open_orders.all_open_orders.clear(); + me->exchange_open_orders.exchange = api::VENUE_DERIBIT; + for (const EMOpenOrder &i : open_order_cb.orders) { + const auto &o = i.open_order; + const std::string &exch_sec_desc = + std::get(o.sec_id.value()); + auto sec = _get_security(exch_sec_desc); + auto bts_account_ptr = _get_account(sec, i.sub_account); + Quantity qty = std::get(o.qty.value()); + Quantity filled_qty = std::get(o.filled_qty.value()); + me->exchange_open_orders.all_open_orders.push_back( + {exch_sec_desc, sec, o.exchange_order_id, + bts_account_ptr == nullptr ? "" : bts_account_ptr->name(), + bts_account_ptr == nullptr + ? std::nullopt + : std::optional(bts_account_ptr->id()), + bts::api::orderman::TIME_IN_FORCE_DAY, + o.order_side == side::buy ? bts::api::SIDE_BUY : bts::api::SIDE_SELL, + Price(o.px.to_double()), qty, Price(o.average_price.to_double()), + filled_qty, o.api, o.web}); + } LOG(OrderMan, Info, - "EMExecutionGateway::_process_open_order_cb_and_fire n_orders: {}", - open_order_cb.orders.size()); + "EMExecutionGateway::_process_open_order_cb_and_fire n_open_orders: {}", + me->exchange_open_orders.all_open_orders.size()); + me->on_exchange_open_orders(me->exchange_open_orders); } void EMExecutionGateway::_send_position_request() { diff --git a/src/lib/orderman/gateways/IExecutionGateway.h b/src/lib/orderman/gateways/IExecutionGateway.h index b68786b7b..ba5fb366e 100644 --- a/src/lib/orderman/gateways/IExecutionGateway.h +++ b/src/lib/orderman/gateways/IExecutionGateway.h @@ -6,7 +6,7 @@ #include "lib/md/SecurityOracle.h" #include "lib/mercury/events/Update.h" #include "lib/orderman/OrderMsg.h" -#include "lib/orderman/orderman_utils/ExchangeOpenOrder.h" +#include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" #include "lib/orderman/orderman_utils/ExchangePosition.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_no_copy.h" @@ -33,7 +33,7 @@ using OnExeReport = using OnCancelReject = std::function; using OnExchangePositionState = std::function; using OnExchangeOpenOrdersState = - std::function; + std::function; // fix execution gateway for a single FIX session class IExecutionGateway { @@ -51,7 +51,7 @@ class IExecutionGateway { virtual OnGwStatusChange &on_gw_status_change() = 0; virtual OnCancelReject &on_cancel_reject() = 0; virtual OnExchangePositionState &on_exchange_position_state() = 0; - virtual OnExchangeOpenOrdersState& on_exchange_open_orders() = 0; + virtual OnExchangeOpenOrdersState &on_exchange_open_orders() = 0; private: BTS_NO_COPY(IExecutionGateway); diff --git a/src/lib/orderman/orderman_utils/ExchangeOpenOrder.h b/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h similarity index 91% rename from src/lib/orderman/orderman_utils/ExchangeOpenOrder.h rename to src/lib/orderman/orderman_utils/ExchangeOpenOrders.h index 9cacab727..696ec3fc3 100644 --- a/src/lib/orderman/orderman_utils/ExchangeOpenOrder.h +++ b/src/lib/orderman/orderman_utils/ExchangeOpenOrders.h @@ -14,7 +14,7 @@ namespace bts::orderman { -class ExchangeOpenOrder { +class ExchangeOpenOrders { public: class UnitOrder { public: @@ -33,6 +33,6 @@ class ExchangeOpenOrder { bool web; }; api::Venue exchange; - std::vector total_exchange_positions; + std::vector all_open_orders; }; } // namespace bts::orderman \ No newline at end of file