diff --git a/src/data_files/documents/order_flow.txt b/src/data_files/documents/order_flow.txt index 9c6b5e4aa..93ed6a04b 100644 --- a/src/data_files/documents/order_flow.txt +++ b/src/data_files/documents/order_flow.txt @@ -58,12 +58,23 @@ FillStore::on_execution_report(const mercury::Update &) Order/ExecutionReport state: --------------------------- + IEMOrderMuxer::EMOrderState absorbs emumba::order_entry::order_state ExecutionReport copies values directly from EMOrderState (no logic except to check trades) EMNativeOrder::_absorb_fill checks for er.last_shares and copies fill values directly from ExecutionReport +RFQ: +---- +OrderServiceServer::send_rfq -> +ServiceBridge::send_rfq -> + publish(RFQEvent) +OrderManager::on_rfq_send (event callback) -> +IExecutionGateway::send_msgs // iterates through all of them +// for Deribit +EMExecutionGateway::send_msgs -> +EmMDListener::send_rfq + Misc: ----- To search for a publisher for an event search for make_stream, for example make_stream() - diff --git a/src/lib/orderman/OrderMsg.h b/src/lib/orderman/OrderMsg.h index fef9326af..be8f2fbca 100644 --- a/src/lib/orderman/OrderMsg.h +++ b/src/lib/orderman/OrderMsg.h @@ -1,13 +1,15 @@ #pragma once +#include "lib/domain_model/Security.pb.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" +#include "lib/orderman/RFQMsg.h" #include namespace bts::orderman { using OrderMsg = - std::variant; + std::variant; inline std::ostream &operator<<(std::ostream &out, OrderMsg const &msg) { if (std::holds_alternative(msg)) { diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index 8fb58a4dd..f7b8fef07 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -460,11 +460,11 @@ void OrderServiceServer::manually_bust_all_fills( } void OrderServiceServer::send_rfq( - const api::orderman::RFQRequest &rfq_request, + const api::orderman::RFQRequest &rfq, const api::Response &r) { LOG(OrderMan, Info, "OrderServiceServer::send_rfq rfq_request: {}", - utils::pb::to_string(rfq_request)); - me->service_bridge->send_rfq_request(rfq_request); + utils::pb::to_string(rfq)); + me->service_bridge->send_rfq(rfq); api::orderman::Response response; r(response); } diff --git a/src/lib/orderman/RFQMsg.h b/src/lib/orderman/RFQMsg.h new file mode 100644 index 000000000..8c4b11670 --- /dev/null +++ b/src/lib/orderman/RFQMsg.h @@ -0,0 +1,15 @@ +#pragma once +#include "lib/domain_model/Security.pb.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include + +namespace bts::orderman { + +struct RFQMsg { + api::Venue exchange; + std::string instrtument; + std::optional qty; + std::optional side; +}; + +} // namespace bts::orderman diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 0bf8a81ce..b46227682 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -19,7 +19,7 @@ #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" -#include "lib/orderman/events/RFQRequestEvent.h" +#include "lib/orderman/events/RFQEvent.h" #include "lib/orderman/events/StoredFillEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" @@ -69,7 +69,7 @@ struct ServiceBridge::PImpl { mercury::Stream cancel_order_pub; mercury::Stream detach_order_pub; mercury::Stream manually_bust_fills_pub; - mercury::Stream rfq_request_pub; + mercury::Stream rfq_pub; mercury::Stream new_admin_data_pub; mercury::Stream account_pnl_pub; mercury::Stream filled_position_pub; @@ -157,7 +157,7 @@ void ServiceBridge::init() { me->cancel_order_pub = make_stream(); me->detach_order_pub = make_stream(); me->manually_bust_fills_pub = make_stream(); - me->rfq_request_pub = make_stream(); + me->rfq_pub = make_stream(); me->new_admin_data_pub = make_stream(); me->account_pnl_pub = make_stream(); me->filled_position_pub = make_stream(); @@ -299,11 +299,11 @@ void ServiceBridge::manually_bust_all_fills( [this, c]() { publish(me->manually_bust_fills_pub, c.account()); }); } -void ServiceBridge::send_rfq_request(api::orderman::RFQRequest const &rfq) { - LOG(OrderMan, Info, "ServiceBridge::send_rfq_request rfq: {}", +void ServiceBridge::send_rfq(api::orderman::RFQRequest const &rfq) { + LOG(OrderMan, Info, "ServiceBridge::send_rfq rfq: {}", utils::pb::to_string(rfq)); me->service_call_marshaller.schedule_action( - [&]() { publish(me->rfq_request_pub, rfq); }); + [&]() { publish(me->rfq_pub, rfq); }); } void ServiceBridge::update_admin_data( diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 53395d7fb..9b10ab2e6 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -93,7 +93,7 @@ class ServiceBridge : public mercury::Actor { void cancel_order(uint32_t rid, api::orderman::Cancel const &c); void detach_order(uint32_t rid, api::orderman::Detach const &c); void manually_bust_all_fills(api::orderman::ManualBustParameters const &c); - void send_rfq_request(api::orderman::RFQRequest const &r); + void send_rfq(api::orderman::RFQRequest const &r); void update_admin_data( std::shared_ptr const &admin); diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 75f4fe1cc..269c451bb 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -13,6 +13,7 @@ #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" +#include "lib/orderman/events/RFQEvent.h" #include "lib/orderman/events/StoredOrderEvent.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/order_factory/OrderFactory.h" @@ -87,6 +88,7 @@ void OrderManager::init() { subscribe([this](auto const &liq_update) { this->on_excess_liquidity_update(liq_update); }); + subscribe([this](auto const &rfq) { this->on_rfq_send(rfq); }); } void OrderManager::on_admin_data(const mercury::Update &m) { @@ -126,6 +128,21 @@ void OrderManager::on_excess_liquidity_update( ev.account_id, ev.excess_liquidity); } +void OrderManager::on_rfq_send(const mercury::Update &rfq) { + if (rfq.events) { + std::vector msgs = {}; + for (auto ev : *rfq.events) { + RFQMsg rfq_msg = {ev.exchange, ev.instrument, ev.qty, ev.side}; + msgs.emplace_back(rfq_msg); + } + trace::CorID cid = {}; + LOG(OrderMan, Info, "OrderManager::on_rfq_send n_events: {}", + rfq.events->size()); + for (auto &osd : me->services_data.sessions) + osd->gw->send_msgs(msgs, cid); + } +} + void OrderManager::on_securities( const mercury::Update &update) { diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index 47fc3ab96..1df5e8801 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -8,6 +8,7 @@ #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" +#include "lib/orderman/events/RFQEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/utils/inplace_function.h" @@ -91,6 +92,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_pnl_update(const mercury::Update &); void on_excess_liquidity_update( const mercury::Update &); + void on_rfq_send(const mercury::Update &); void on_poll(trace::PerfLog &log) override; // end external events diff --git a/src/lib/orderman/events/RFQRequestEvent.h b/src/lib/orderman/events/RFQEvent.h similarity index 81% rename from src/lib/orderman/events/RFQRequestEvent.h rename to src/lib/orderman/events/RFQEvent.h index 4bc260390..7711d2de9 100644 --- a/src/lib/orderman/events/RFQRequestEvent.h +++ b/src/lib/orderman/events/RFQEvent.h @@ -10,15 +10,15 @@ namespace bts { namespace orderman { -class RFQRequestEvent : public mercury::Event { +class RFQEvent : public mercury::Event { public: // const bts::api::orderman::RFQRequest rfq; bts::api::Venue exchange; std::string instrument; std::optional side; std::optional qty; - using SynopsisPolicy = mercury::CacheAll; - RFQRequestEvent(const bts::api::orderman::RFQRequest &rfq) + using SynopsisPolicy = mercury::CacheAll; + RFQEvent(const bts::api::orderman::RFQRequest &rfq) : exchange(rfq.security().exchange()), instrument(rfq.security().security_txt()), side( diff --git a/src/lib/orderman/gateways/EMExecutionGateway.cpp b/src/lib/orderman/gateways/EMExecutionGateway.cpp index 4e0d066a0..fb8af3a2c 100644 --- a/src/lib/orderman/gateways/EMExecutionGateway.cpp +++ b/src/lib/orderman/gateways/EMExecutionGateway.cpp @@ -11,6 +11,7 @@ #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/OrderMsg.h" +#include "lib/orderman/RFQMsg.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" @@ -294,6 +295,9 @@ void EMExecutionGateway::send_msgs( } else if (std::holds_alternative(m)) { const CancelOrderMsg &cxl_msg = std::get(m); _send_cxl(cxl_msg); + } else if (std::holds_alternative(m)) { + const RFQMsg &rfq_msg = std::get(m); + _send_rfq(rfq_msg); } } } @@ -428,6 +432,12 @@ void EMExecutionGateway::_send_cxl_replace( me->order_mux->update_order(update); } +void EMExecutionGateway::_send_rfq(const RFQMsg &rfq_msg) { + LOG(OrderMan, Info, "EMExecutionGateway::_send_rfq instrument: {}", + rfq_msg.instrtument); + me->order_mux->send_rfq(rfq_msg); +} + void EMExecutionGateway::_send_cxl(const CancelOrderMsg &cxl) { LOG(OrderMan, Info, "EMExecutionGateway::_send_cxl key: {}", cxl.key); auto it = me->key_map.find(cxl.key); diff --git a/src/lib/orderman/gateways/EMExecutionGateway.h b/src/lib/orderman/gateways/EMExecutionGateway.h index eed9c500e..bc249e917 100644 --- a/src/lib/orderman/gateways/EMExecutionGateway.h +++ b/src/lib/orderman/gateways/EMExecutionGateway.h @@ -5,6 +5,7 @@ #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" +#include "lib/orderman/RFQMsg.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include #include @@ -51,6 +52,7 @@ struct EMCallbackMsg; struct EMExchangePositionCallbackMsg; struct EMExchangeOpenOrdersCallbackMsg; class ExecutionReport; +struct RFQMsg; // Wrapper around EM's order gateway. There are fix overtones to this, that // are ignored class EMExecutionGateway : public IExecutionGateway { @@ -80,6 +82,7 @@ class EMExecutionGateway : public IExecutionGateway { void _send_create(const CreateOrderMsg &); void _send_cxl_replace(const CancelReplaceOrderMsg &); void _send_cxl(const CancelOrderMsg &); + void _send_rfq(const RFQMsg &); void _process_cb_and_fire_er(const EMCallbackMsg &); void _fire_leg_er(const EMCallbackMsg &, const ExecutionReport &er); void _process_pos_cb_and_fire(const EMExchangePositionCallbackMsg &); diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 3cdf7e72d..3c9aaf99c 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -439,6 +439,11 @@ bool EmMDListener::cancel_order(const emumba::order_entry::order_key &key) { return it->second->trading_interface->cancel_order(key); } +void EmMDListener::send_rfq(const bts::orderman::RFQMsg &rfq) { + LOG(OrderMan, Info, "IEMOrderMuxer::send_rfq instrument: {}", + rfq.instrtument); +} + orderman::OnEMOrderUpdate &EmMDListener::order_update_cb() { return me->order_update_cb; } diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.h b/src/server/sparkd/md/platforms/emumba/EmMDListener.h index 6af69707f..00dbcc2a6 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.h @@ -40,6 +40,7 @@ class EmMDListener : public emumba::deribit_connector::deribit_listener, const emumba::order_entry::new_order &order) override; bool update_order(const emumba::order_entry::order_update &update) override; bool cancel_order(const emumba::order_entry::order_key &key) override; + void send_rfq(const bts::orderman::RFQMsg &rfq) override; orderman::OnEMOrderUpdate &order_update_cb() override; void get_positions() override; orderman::OnEMExchangePositionUpdate &exchange_position_update_cb() override; diff --git a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h index e595cd57f..838e3ffdc 100644 --- a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h @@ -3,6 +3,7 @@ #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" #include "lib/md/common.h" +#include "lib/orderman/RFQMsg.h" #include "lib/os/os.h" #include #include @@ -244,6 +245,7 @@ class IEMOrderMuxer { virtual bool update_order( const emumba::order_entry::order_update &update) = 0; virtual bool cancel_order(const emumba::order_entry::order_key &key) = 0; + virtual void send_rfq(const RFQMsg &rfq) = 0; virtual OnEMOrderUpdate &order_update_cb() = 0; // Position // ////////////////////////////////////////////////////////////////