RFQ hooked up on the server side

This commit is contained in:
Taha Afzal authored and John Colvin committed 2022-09-28 21:22:47 -05:00
1 parent 49f13755c6
commit 3c511bb177
14 files changed
+83 -15

No files matched your search

+12 -1
View File
@@ -58,12 +58,23 @@ FillStore::on_execution_report(const mercury::Update<NewExecutionReportEvent> &)
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<Event_Name>, for
example make_stream<OrderStateUpdateEvent>()
+3 -1
View File
@@ -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 <variant>
namespace bts::orderman {
using OrderMsg =
std::variant<CreateOrderMsg, CancelReplaceOrderMsg, CancelOrderMsg>;
std::variant<CreateOrderMsg, CancelReplaceOrderMsg, CancelOrderMsg, RFQMsg>;
inline std::ostream &operator<<(std::ostream &out, OrderMsg const &msg) {
if (std::holds_alternative<CreateOrderMsg>(msg)) {
+3 -3
View File
@@ -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<api::orderman::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);
}
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "lib/domain_model/Security.pb.h"
#include "lib/orderman/orderman_utils/orderman_common.h"
#include <optional>
namespace bts::orderman {
struct RFQMsg {
api::Venue exchange;
std::string instrtument;
std::optional<double> qty;
std::optional<api::Side> side;
};
} // namespace bts::orderman
+6 -6
View File
@@ -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<CancelOrderEvent> cancel_order_pub;
mercury::Stream<DetachOrderEvent> detach_order_pub;
mercury::Stream<ManuallyBustFillsEvent> manually_bust_fills_pub;
mercury::Stream<RFQRequestEvent> rfq_request_pub;
mercury::Stream<RFQEvent> rfq_pub;
mercury::Stream<NewAdminDataEvent> new_admin_data_pub;
mercury::Stream<AccountPnLUpdateEvent> account_pnl_pub;
mercury::Stream<FilledPositionEvent> filled_position_pub;
@@ -157,7 +157,7 @@ void ServiceBridge::init() {
me->cancel_order_pub = make_stream<CancelOrderEvent>();
me->detach_order_pub = make_stream<DetachOrderEvent>();
me->manually_bust_fills_pub = make_stream<ManuallyBustFillsEvent>();
me->rfq_request_pub = make_stream<RFQRequestEvent>();
me->rfq_pub = make_stream<RFQEvent>();
me->new_admin_data_pub = make_stream<NewAdminDataEvent>();
me->account_pnl_pub = make_stream<AccountPnLUpdateEvent>();
me->filled_position_pub = make_stream<FilledPositionEvent>();
@@ -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(
+1 -1
View File
@@ -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<api::admin::AdminData const> const &admin);
@@ -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<ExcessLiquidityUpdateEvent>([this](auto const &liq_update) {
this->on_excess_liquidity_update(liq_update);
});
subscribe<RFQEvent>([this](auto const &rfq) { this->on_rfq_send(rfq); });
}
void OrderManager::on_admin_data(const mercury::Update<NewAdminDataEvent> &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<RFQEvent> &rfq) {
if (rfq.events) {
std::vector<OrderMsg> 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<NewSecuritiesEvent> &update) {
@@ -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<AccountPnLUpdateEvent> &);
void on_excess_liquidity_update(
const mercury::Update<ExcessLiquidityUpdateEvent> &);
void on_rfq_send(const mercury::Update<RFQEvent> &);
void on_poll(trace::PerfLog &log) override;
// end external events
@@ -10,15 +10,15 @@
namespace bts {
namespace orderman {
class RFQRequestEvent : public mercury::Event<RFQRequestEvent> {
class RFQEvent : public mercury::Event<RFQEvent> {
public:
// const bts::api::orderman::RFQRequest rfq;
bts::api::Venue exchange;
std::string instrument;
std::optional<api::Side> side;
std::optional<double> qty;
using SynopsisPolicy = mercury::CacheAll<RFQRequestEvent>;
RFQRequestEvent(const bts::api::orderman::RFQRequest &rfq)
using SynopsisPolicy = mercury::CacheAll<RFQEvent>;
RFQEvent(const bts::api::orderman::RFQRequest &rfq)
: exchange(rfq.security().exchange()),
instrument(rfq.security().security_txt()),
side(
@@ -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<CancelOrderMsg>(m)) {
const CancelOrderMsg &cxl_msg = std::get<CancelOrderMsg>(m);
_send_cxl(cxl_msg);
} else if (std::holds_alternative<RFQMsg>(m)) {
const RFQMsg &rfq_msg = std::get<RFQMsg>(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);
@@ -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 <bits/stdint-uintn.h>
#include <cstdint>
@@ -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 &);
@@ -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;
}
@@ -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;
@@ -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 <boost/container/small_vector.hpp>
#include <emumba-deribit-connector/deribit_handler.h>
@@ -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
// ////////////////////////////////////////////////////////////////