diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index b828b0249..25c4d2cc7 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -41,8 +41,8 @@ class LimitStore { public: const bts::api::admin::BTSUser *user; std::vector accounts; - const bts::api::admin::BTSAccount * - find_account(AccountID account_id) const { + const bts::api::admin::BTSAccount *find_account( + AccountID account_id) const { for (const auto &account : accounts) { if (account->id() == account_id.value()) return account; @@ -159,8 +159,8 @@ class LimitStore { // ii. user should be activated // iii. user should be permitted to trade in the account // iv. account should be activated - Limiter::LimiterQueryResult - can_trade(UserID user_id, AccountID account_id) const { + Limiter::LimiterQueryResult can_trade( + UserID user_id, AccountID account_id) const { Limiter::LimiterQueryResult result; result.result = Limiter::OK; auto user_it = _user_data_map.find(user_id.value()); @@ -206,6 +206,11 @@ class LimitStore { if (!rv.ok()) return rv; const SecurityLimitTree *sec_tree = _find_security(security.id()); + if (sec_tree == nullptr) { + rv.result = Limiter::LimiterErrorCode::NO_SUCH_SECURITY; + rv.error_msg = "Risk system could not locate the security"; + return rv; + } bts_assert(sec_tree != nullptr); rv = sec_tree->can_send_new_order( account_id, side, quantity, enforce_clip); diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 4f18f7ba8..cc5397dca 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -440,6 +441,22 @@ bool EmMDListener::cancel_order(const emumba::order_entry::order_key &key) { } void EmMDListener::send_rfq(const bts::orderman::RFQMsg &rfq) { + auto get_side = [&rfq]() { + if (rfq.rfq.has_side()) { + switch (rfq.rfq.side().side()) { + case api::Side::SIDE_BUY: + return emumba::market_data::side::buy; + case api::Side::SIDE_SELL: + return emumba::market_data::side::sell; + case api::Side::SIDE_UNDEFINED: + return emumba::market_data::side::none; + case api::Side::Side_INT_MAX_SENTINEL_DO_NOT_USE_: + case api::Side::Side_INT_MIN_SENTINEL_DO_NOT_USE_: + return emumba::market_data::side::none; + } + } + return emumba::market_data::side::none; + }; LOG(OrderMan, Info, "IEMOrderMuxer::send_rfq rfq: {}", utils::pb::to_string(rfq.rfq)); if (me->trading_sessions.empty()) { @@ -458,11 +475,17 @@ void EmMDListener::send_rfq(const bts::orderman::RFQMsg &rfq) { exch_desc); auto ti = me->trading_sessions.at(0); emumba::market_data::quantity qty = {}; - qty.value() = 1.0; + qty.value() = + rfq.rfq.has_quantity() ? rfq.rfq.quantity().qty() : 1.0; emumba::order_entry::rfq_request em_rfq = {}; em_rfq.sec_id = sud->security.sec_common.sec_id; em_rfq.qty = qty; - em_rfq.rfq_side = emumba::market_data::side::buy; + em_rfq.rfq_side = get_side(); + LOG(OrderMan, Info, + "IEMOrderMuxer::send_rfq finally sending rfq sec: {} side: {} " + "qty: {}", + extract_security_desc(em_rfq.sec_id), + static_cast(em_rfq.rfq_side), extract_qty(em_rfq.qty)); ti.trading_interface->send_rfq(em_rfq); } else { LOG(OrderMan, Error, @@ -472,6 +495,23 @@ void EmMDListener::send_rfq(const bts::orderman::RFQMsg &rfq) { } } else if (sec.has_spread()) { LOG(OrderMan, Info, "IEMOrderMuxer::send_rfq creating combo"); + std::vector combos = {}; + for (const auto &leg : sec.spread().legs()) { + auto c = _convert_combo_trade(leg); + if (!c.has_value()) { + LOG(OrderMan, Error, + "IEMOrderMuxer::send_rfq could not find security for " + "spread leg"); + return; + } + combos.push_back(c.value()); + } + std::vector combos_ptr = {}; + for (const auto &c : combos) { + combos_ptr.push_back(&c); + } + auto ti = me->trading_sessions.at(0); + ti.trading_interface->create_combo(combos_ptr); } else { LOG(OrderMan, Error, "IEMOrderMuxer::send_rfq could not send RFQ security does not " @@ -855,6 +895,18 @@ void EmMDListener::on_request_for_quote( rfq_response.error.message()); } +void EmMDListener::on_create_combo(const emumba::order_entry::combo_detail &d) { + std::string sec_id = "no-id"; + if (std::holds_alternative(d.sec_id.value())) { + sec_id = extract_security_desc(d.sec_id); + } + LOG(OrderMan, Info, + "EmMDListener::on_create_combo err_value: {} err_message: {} " + "err_details: {} sec_id: {} n_legs: {}", + d.error.value(), d.error.message(), d.error.details(), sec_id, + d.legs.size()); +} + void EmMDListener::set_handler( emumba::deribit_connector::deribit_handler *handler, const std::vector &trading_sessions) { @@ -1208,6 +1260,24 @@ double EmMDListener::_estimate_leg_fill(security_key key, api::Side side) { return sud->settle_price; } +std::optional +EmMDListener::_convert_combo_trade(const bts::api::ContractLeg &l) { + if (!l.has_security()) { + return std::nullopt; + } + bts::md::SecurityAuxData *sud = _find_sud(l.security().id()); + if (sud == nullptr) { + return std::nullopt; + } + emumba::order_entry::combo_trade rv = {}; + rv.sec_id = sud->security.sec_common.sec_id; + rv.side = l.side() == api::SIDE_BUY ? emumba::market_data::side::buy + : emumba::market_data::side::sell; + rv.qty = std::abs(l.quantity()); + std::optional rv_o = rv; + return rv_o; +} + /* #endregion */ } // namespace bts::md \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.h b/src/server/sparkd/md/platforms/emumba/EmMDListener.h index d58c67168..c8c8a300d 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.h @@ -8,6 +8,7 @@ #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include #include +#include #include #include @@ -139,6 +140,9 @@ class EmMDListener : public emumba::deribit_connector::deribit_listener, void on_request_for_quote( const emumba::order_entry::rfq_response &rfq_response) override; + virtual void on_create_combo(__attribute__(( + unused)) const emumba::order_entry::combo_detail &combo_detail) override; + virtual ~EmMDListener(); private: @@ -169,6 +173,8 @@ class EmMDListener : public emumba::deribit_connector::deribit_listener, const emumba::market_data::trade_record &fill, boost::container::small_vector &rv); double _estimate_leg_fill(security_key key, api::Side side); + std::optional _convert_combo_trade( + const bts::api::ContractLeg &leg); public: // the handler and the listener both need each other, however the handler