diff --git a/src/app_sparkd/sparkd/execution/py_execution_gateway_adapter.cpp b/src/app_sparkd/sparkd/execution/py_execution_gateway_adapter.cpp index 76a8ad402..2220285ee 100644 --- a/src/app_sparkd/sparkd/execution/py_execution_gateway_adapter.cpp +++ b/src/app_sparkd/sparkd/execution/py_execution_gateway_adapter.cpp @@ -443,6 +443,8 @@ struct PyExecutionGatewayAdapter::PImpl { py_req.set_key(msg.key.value()); py_req.set_exchange_security_id(msg.security_name()); py_req.set_venue(bts::api::venue_name_pretty(msg.venue())); + py_req.set_security_type( + bts::api::security_type_name_pretty(msg.security_type())); py_req.set_is_buy(msg.side == bts::api::SIDE_BUY); py_req.set_price(msg.price.value()); py_req.set_quantity(msg.quantity.full_value_float()); @@ -461,6 +463,8 @@ struct PyExecutionGatewayAdapter::PImpl { std::to_string(msg.exchange_order_id.value())); py_req.set_exchange_security_id(cf.security_name()); py_req.set_venue(bts::api::venue_name_pretty(cf.venue())); + py_req.set_security_type( + bts::api::security_type_name_pretty(cf.security_type())); py_req.set_is_buy(cf.side == bts::api::SIDE_BUY); py_req.set_price(cf.price.value()); py_req.set_quantity(cf.quantity.full_value_float()); @@ -472,6 +476,8 @@ struct PyExecutionGatewayAdapter::PImpl { std::to_string(msg.exchange_order_id.value())); py_req.set_exchange_security_id(msg.security_name()); py_req.set_venue(bts::api::venue_name_pretty(msg.venue())); + py_req.set_security_type( + bts::api::security_type_name_pretty(msg.security_type())); py_req.set_is_buy(msg.side == bts::api::SIDE_BUY); } diff --git a/src/lib_python_interop/python_interop/execution/py_cancel_order_request.cpp b/src/lib_python_interop/python_interop/execution/py_cancel_order_request.cpp index 7ade575d9..630253b63 100644 --- a/src/lib_python_interop/python_interop/execution/py_cancel_order_request.cpp +++ b/src/lib_python_interop/python_interop/execution/py_cancel_order_request.cpp @@ -31,6 +31,13 @@ void PyCancelOrderRequest::set_venue(string value) { venue_ = std::move(value); } +const string &PyCancelOrderRequest::security_type() const { + return security_type_; +} +void PyCancelOrderRequest::set_security_type(string value) { + security_type_ = std::move(value); +} + bool PyCancelOrderRequest::is_buy() const { return is_buy_; } void PyCancelOrderRequest::set_is_buy(bool value) { is_buy_ = std::move(value); @@ -41,6 +48,7 @@ void to_json(nlohmann::json &j, const PyCancelOrderRequest &req) { j["eoid"] = req.exchange_order_id(); j["esid"] = req.exchange_security_id(); j["venue"] = req.venue(); + j["styp"] = req.security_type(); j["side"] = req.is_buy() ? 'B' : 'S'; } @@ -49,6 +57,7 @@ void from_json(const nlohmann::json &j, PyCancelOrderRequest &req) { j.at("eoid").get_to(req.exchange_order_id_); j.at("esid").get_to(req.exchange_security_id_); j.at("venue").get_to(req.venue_); + j.at("styp").get_to(req.security_type_); const auto str = j.at("side").get(); if (!str.empty()) { switch (str[0]) { diff --git a/src/lib_python_interop/python_interop/execution/py_cancel_order_request.h b/src/lib_python_interop/python_interop/execution/py_cancel_order_request.h index 7ff5de6ed..6d008b623 100644 --- a/src/lib_python_interop/python_interop/execution/py_cancel_order_request.h +++ b/src/lib_python_interop/python_interop/execution/py_cancel_order_request.h @@ -26,6 +26,9 @@ class PyCancelOrderRequest { const std::string &venue() const; void set_venue(std::string value); + const std::string &security_type() const; + void set_security_type(std::string value); + bool is_buy() const; void set_is_buy(bool value); @@ -34,6 +37,7 @@ class PyCancelOrderRequest { std::string exchange_order_id, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy); std::string to_string() const; @@ -43,6 +47,7 @@ class PyCancelOrderRequest { std::string exchange_order_id_; std::string exchange_security_id_; std::string venue_; + std::string security_type_; bool is_buy_; friend void from_json(const nlohmann::json &j, PyCancelOrderRequest &req); @@ -73,11 +78,13 @@ inline void PyCancelOrderRequest::set_data( std::string exchange_order_id, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy) { key_ = key; exchange_order_id_ = std::move(exchange_order_id); exchange_security_id_ = std::move(exchange_security_id); venue_ = std::move(venue); + security_type_ = std::move(security_type); is_buy_ = is_buy; } diff --git a/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.cpp b/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.cpp index dc8566fd5..1cc55df8d 100644 --- a/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.cpp +++ b/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.cpp @@ -31,6 +31,13 @@ void PyCancelReplaceOrderRequest::set_venue(string value) { venue_ = std::move(value); } +const string &PyCancelReplaceOrderRequest::security_type() const { + return security_type_; +} +void PyCancelReplaceOrderRequest::set_security_type(string value) { + security_type_ = std::move(value); +} + bool PyCancelReplaceOrderRequest::is_buy() const { return is_buy_; } void PyCancelReplaceOrderRequest::set_is_buy(bool value) { is_buy_ = std::move(value); @@ -49,6 +56,7 @@ void to_json(nlohmann::json &j, const PyCancelReplaceOrderRequest &req) { j["eoid"] = req.exchange_order_id(); j["esid"] = req.exchange_security_id(); j["venue"] = req.venue(); + j["styp"] = req.security_type(); j["side"] = req.is_buy() ? 'B' : 'S'; j["px"] = req.price(); j["qty"] = req.quantity(); @@ -59,6 +67,7 @@ void from_json(const nlohmann::json &j, PyCancelReplaceOrderRequest &req) { j.at("eoid").get_to(req.exchange_order_id_); j.at("esid").get_to(req.exchange_security_id_); j.at("venue").get_to(req.venue_); + j.at("styp").get_to(req.security_type_); const auto str = j.at("side").get(); if (!str.empty()) { switch (str[0]) { diff --git a/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.h b/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.h index 7cae98b5f..cd267b8f9 100644 --- a/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.h +++ b/src/lib_python_interop/python_interop/execution/py_cancel_replace_order_request.h @@ -27,6 +27,9 @@ class PyCancelReplaceOrderRequest { const std::string &venue() const; void set_venue(std::string value); + const std::string &security_type() const; + void set_security_type(std::string value); + bool is_buy() const; void set_is_buy(bool value); @@ -41,6 +44,7 @@ class PyCancelReplaceOrderRequest { std::string exchange_order_id, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy, double price, double quantity); @@ -52,6 +56,7 @@ class PyCancelReplaceOrderRequest { std::string exchange_order_id_; std::string exchange_security_id_; std::string venue_; + std::string security_type_; float price_; float quantity_; bool is_buy_; @@ -85,6 +90,7 @@ inline void PyCancelReplaceOrderRequest::set_data( std::string exchange_order_id, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy, double price, double quantity) { @@ -92,6 +98,7 @@ inline void PyCancelReplaceOrderRequest::set_data( exchange_order_id_ = std::move(exchange_order_id); exchange_security_id_ = std::move(exchange_security_id); venue_ = std::move(venue); + security_type_ = std::move(security_type); is_buy_ = is_buy; price_ = price; quantity_ = quantity; diff --git a/src/lib_python_interop/python_interop/execution/py_create_order_request.cpp b/src/lib_python_interop/python_interop/execution/py_create_order_request.cpp index 6a9cd755a..393a9cef3 100644 --- a/src/lib_python_interop/python_interop/execution/py_create_order_request.cpp +++ b/src/lib_python_interop/python_interop/execution/py_create_order_request.cpp @@ -2,6 +2,7 @@ #include "spark/api/services/native_order_type.h" #include "spark/api/services/time_in_force.h" #include "spark/domain_model/Security.pb.h" +#include "spark/domain_model/SecurityType.h" #include "spark/domain_model/Venue.h" #include "spark/orderman/CreateOrderMsg.h" @@ -27,6 +28,13 @@ void PyCreateOrderRequest::set_venue(string value) { venue_ = std::move(value); } +const string &PyCreateOrderRequest::security_type() const { + return security_type_; +} +void PyCreateOrderRequest::set_security_type(string value) { + security_type_ = std::move(value); +} + float PyCreateOrderRequest::price() const { return price_; } void PyCreateOrderRequest::set_price(float value) { price_ = value; } @@ -54,6 +62,7 @@ void to_json(nlohmann::json &j, const PyCreateOrderRequest &req) { j["key"] = req.key(); j["esid"] = req.exchange_security_id(); j["venue"] = req.venue(); + j["styp"] = req.security_type(); j["side"] = req.is_buy() ? "B" : "S"; j["px"] = req.price(); j["qty"] = req.quantity(); @@ -65,6 +74,7 @@ void from_json(const nlohmann::json &j, PyCreateOrderRequest &req) { j.at("key").get_to(req.key_); j.at("eid").get_to(req.exchange_security_id_); j.at("venue").get_to(req.venue_); + j.at("styp").get_to(req.security_type_); const auto str = j.at("side").get(); if (!str.empty()) { switch (str[0]) { diff --git a/src/lib_python_interop/python_interop/execution/py_create_order_request.h b/src/lib_python_interop/python_interop/execution/py_create_order_request.h index c82e5e398..4526d3593 100644 --- a/src/lib_python_interop/python_interop/execution/py_create_order_request.h +++ b/src/lib_python_interop/python_interop/execution/py_create_order_request.h @@ -24,6 +24,9 @@ class PyCreateOrderRequest { const std::string &venue() const; void set_venue(std::string value); + const std::string &security_type() const; + void set_security_type(std::string value); + bool is_buy() const; void set_is_buy(bool value); @@ -43,6 +46,7 @@ class PyCreateOrderRequest { std::uint32_t key, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy, double price, double quantity, @@ -57,6 +61,7 @@ class PyCreateOrderRequest { float quantity_; std::string exchange_security_id_; std::string venue_; + std::string security_type_; std::string order_type_; std::string time_in_force_; bool is_buy_; @@ -88,6 +93,7 @@ inline void PyCreateOrderRequest::set_data( std::uint32_t key, std::string exchange_security_id, std::string venue, + std::string security_type, bool is_buy, double price, double quantity, @@ -96,6 +102,7 @@ inline void PyCreateOrderRequest::set_data( key_ = key; exchange_security_id_ = std::move(exchange_security_id); venue_ = std::move(venue); + security_type_ = std::move(security_type); is_buy_ = is_buy; price_ = price; quantity_ = quantity; diff --git a/src/lib_python_interop/python_interop/python_interop_module.cpp b/src/lib_python_interop/python_interop/python_interop_module.cpp index e80ce193a..ae764621f 100644 --- a/src/lib_python_interop/python_interop/python_interop_module.cpp +++ b/src/lib_python_interop/python_interop/python_interop_module.cpp @@ -213,6 +213,7 @@ PYBIND11_MODULE(python_interop_module, m) { .PROP(PyCreateOrderRequest, key) .PROP(PyCreateOrderRequest, exchange_security_id) .PROP(PyCreateOrderRequest, venue) + .PROP(PyCreateOrderRequest, security_type) .PROP(PyCreateOrderRequest, is_buy) .PROP(PyCreateOrderRequest, price) .PROP(PyCreateOrderRequest, quantity) @@ -226,6 +227,7 @@ PYBIND11_MODULE(python_interop_module, m) { .PROP(PyCancelOrderRequest, exchange_order_id) .PROP(PyCancelOrderRequest, exchange_security_id) .PROP(PyCancelOrderRequest, venue) + .PROP(PyCancelOrderRequest, security_type) .PROP(PyCancelOrderRequest, is_buy) .def("__str__", &PyCancelOrderRequest::to_string); py::class_< @@ -236,6 +238,7 @@ PYBIND11_MODULE(python_interop_module, m) { .PROP(PyCancelReplaceOrderRequest, exchange_order_id) .PROP(PyCancelReplaceOrderRequest, exchange_security_id) .PROP(PyCancelReplaceOrderRequest, venue) + .PROP(PyCancelReplaceOrderRequest, security_type) .PROP(PyCancelReplaceOrderRequest, is_buy) .PROP(PyCancelReplaceOrderRequest, price) .PROP(PyCancelReplaceOrderRequest, quantity) diff --git a/src/lib_python_interop/python_interop_plugins/bybit_execution_gateway.py b/src/lib_python_interop/python_interop_plugins/bybit_execution_gateway.py index c6574205b..97b185112 100644 --- a/src/lib_python_interop/python_interop_plugins/bybit_execution_gateway.py +++ b/src/lib_python_interop/python_interop_plugins/bybit_execution_gateway.py @@ -381,7 +381,7 @@ class BybitExecutionGateway(ExecutionGateway): bts_id=bts_id, exch_id=exch_ord_id, exch_sec_id=req.exchange_security_id(), - sec_type=SecurityType.FUTURE, + sec_type=SecurityType.parse(req.security_type()), is_buy=req.is_buy(), order_type=OrderType.parse(req.order_type()), time_in_force=TimeInForce.parse(req.time_in_force()), diff --git a/src/lib_python_interop/python_interop_plugins/spark_enums.py b/src/lib_python_interop/python_interop_plugins/spark_enums.py index ef51b7a2d..5c242b3c3 100644 --- a/src/lib_python_interop/python_interop_plugins/spark_enums.py +++ b/src/lib_python_interop/python_interop_plugins/spark_enums.py @@ -18,6 +18,7 @@ class ExecType(Enum): CANCELED = 5 REJECTED = 6 + class OrderType(Enum): LIMIT = 1 MARKET = 2 @@ -37,7 +38,12 @@ class TimeInForce(Enum): def parse(s: str): return TimeInForce.__members__[s] + class SecurityType(Enum): SPOT = 1 FUTURE = 2 OPTION = 3 + + @staticmethod + def parse(s: str): + return SecurityType.__members__[s] diff --git a/src/lib_spark/spark/domain_model/SecurityType.h b/src/lib_spark/spark/domain_model/SecurityType.h index 0ca4327f7..af95937cf 100644 --- a/src/lib_spark/spark/domain_model/SecurityType.h +++ b/src/lib_spark/spark/domain_model/SecurityType.h @@ -16,6 +16,7 @@ namespace bts::api { * insensitive, and makes the 'SECURITYTYPE_' prefix optional. */ bool security_type_parse_smart(const std::string &str, SecurityType *result); +std::string security_type_name_pretty(SecurityType type); PB_ENUM_FROM_JSON(SecurityType) PB_ENUM_TO_JSON(SecurityType) @@ -42,6 +43,14 @@ inline bool security_type_parse_smart( return SecurityType_Parse(s, result); } +inline std::string security_type_name_pretty(SecurityType type) { + auto name = SecurityType_Name(type); + if (name.starts_with("SECURITYTYPE_")) { + return name.substr(strlen("SECURITYTYPE_")); + } + return name; +} + inline std::ostream &operator<<( std::ostream &out, const SecurityType &type) noexcept { out << SecurityType_Name(type); diff --git a/src/lib_spark/spark/orderman/CancelOrderMsg.cpp b/src/lib_spark/spark/orderman/CancelOrderMsg.cpp index 8a285dfdb..dc299a1be 100644 --- a/src/lib_spark/spark/orderman/CancelOrderMsg.cpp +++ b/src/lib_spark/spark/orderman/CancelOrderMsg.cpp @@ -7,6 +7,12 @@ api::Venue CancelOrderMsg::venue() const { return security == nullptr ? api::VENUE_UNSET : security->exchange(); } +api::SecurityType CancelOrderMsg::security_type() const { + return security == nullptr + ? api::SECURITYTYPE_UNSET + : bts::securities::security_type(security->Contract_case()); +} + std::uint32_t CancelOrderMsg::security_id() const { return security == nullptr ? 0 : security->id(); } diff --git a/src/lib_spark/spark/orderman/CancelOrderMsg.h b/src/lib_spark/spark/orderman/CancelOrderMsg.h index c6a4be226..751464be9 100644 --- a/src/lib_spark/spark/orderman/CancelOrderMsg.h +++ b/src/lib_spark/spark/orderman/CancelOrderMsg.h @@ -17,6 +17,7 @@ struct CancelOrderMsg { api::Side side; api::Venue venue() const; + api::SecurityType security_type() const; std::uint32_t security_id() const; const std::string &security_name() const; }; diff --git a/src/lib_spark/spark/orderman/CreateOrderMsg.cpp b/src/lib_spark/spark/orderman/CreateOrderMsg.cpp index b4ce4739e..c864c7776 100644 --- a/src/lib_spark/spark/orderman/CreateOrderMsg.cpp +++ b/src/lib_spark/spark/orderman/CreateOrderMsg.cpp @@ -13,6 +13,12 @@ api::Venue CreateOrderMsg::venue() const { return security == nullptr ? api::VENUE_UNSET : security->exchange(); } +api::SecurityType CreateOrderMsg::security_type() const { + return security == nullptr + ? api::SECURITYTYPE_UNSET + : bts::securities::security_type(security->Contract_case()); +} + std::uint32_t CreateOrderMsg::security_id() const { return security == nullptr ? 0 : security->id(); } diff --git a/src/lib_spark/spark/orderman/CreateOrderMsg.h b/src/lib_spark/spark/orderman/CreateOrderMsg.h index 8826922fc..dfce25a10 100644 --- a/src/lib_spark/spark/orderman/CreateOrderMsg.h +++ b/src/lib_spark/spark/orderman/CreateOrderMsg.h @@ -24,6 +24,7 @@ struct CreateOrderMsg { api::orderman::RoutingRecord const *routing_record; api::Venue venue() const; + api::SecurityType security_type() const; std::uint32_t security_id() const; const std::string &security_name() const; };