diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index b79c891c8..0a3f28489 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -29,7 +29,6 @@ #include "lib/orderman/actors/order_manager/order_gateway_definition.h" #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" -#include "lib/orderman/gateways/execution_gateway_provider.h" #include "lib/orderman/gateways/i_execution_gateway_provider.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orderman_utils/ExchangeOpenOrders.h" @@ -41,7 +40,6 @@ #include "lib/utils/bts_chrono.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" -#include "lib_binance_execution/binance_execution/execution_gateway_provider.h" #include #include diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp index c9438e71b..be70821aa 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.cpp +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.cpp @@ -1,10 +1,6 @@ #include "OrderServicesData.h" -#include "lib/config/config.h" -#include "lib/config/protos/jetfix.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/gateways/ExecutionGatewayFactory.h" -#include "lib/os/spark_data_directory.h" #include "lib/tracing/PerfLog.h" namespace bts { @@ -26,8 +22,6 @@ OrderServicesData::OrderServicesData( for (auto &g : gateways) { sessions.push_back(std::make_unique(std::move(g))); } - // spark::SparkDataDirectory data_dir; - // auto binance_j = data_dir.load_config_json("binance_execution"); } } // namespace orderman diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index e6958415a..dca139f84 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -34,7 +34,6 @@ #include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/orderman/events/TradeSignalEvent.h" #include "lib/orderman/events/UpdateOrderEvent.h" -#include "lib/orderman/gateways/ExecutionGatewayFactory.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_factory/OrderFactory.h" diff --git a/src/lib/orderman/actors/order_manager/session_services_data.h b/src/lib/orderman/actors/order_manager/session_services_data.h index e207a2882..d7ed78cb4 100644 --- a/src/lib/orderman/actors/order_manager/session_services_data.h +++ b/src/lib/orderman/actors/order_manager/session_services_data.h @@ -10,7 +10,6 @@ #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" -#include "lib/orderman/gateways/ExecutionGatewayFactory.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/utils/PBUtils.h" diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp deleted file mode 100644 index 10c7878cd..000000000 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "ExecutionGatewayFactory.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/gateways/CCAPIExecutionGateway.h" -// #include "lib/orderman/gateways/EMExecutionGateway.h" -#include "lib/orderman/gateways/FakeExecutionGateway.h" -#include "lib/orderman/gateways/GeneralExecutionGateway.h" -#include "lib/orderman/gateways/GLBXExecutionGateway.h" -#include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" -#include "lib/orderman/gateways/ICEExecutionGateway.h" -#include "lib/orderman/gateways/IExecutionGenericAdapter.h" -#include "lib/orderman/gateways/OkxExecutionGateway.h" -#include "lib/orderman/gateways/OnixFIXAdapter.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" -#include "lib/tracing/PerfLog.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/ValueWrapper.h" -#include -#include - -namespace bts::orderman { - -std::unique_ptr ExecutionGatewayFactory::create_gateway( - const config::JetFIX::Connection &conn, - trace::PerfLog &pl, - md::SecurityOracle o) { - LOG(OrderMan, Info, "ExecutionGatewayFactory::create_gateway conn: {}", - utils::pb::to_string(conn)); - if (SimExecutionGatewayFactory::is_sim_execution_on(conn.venue())) { - return std::make_unique(conn.venue()); - } - LOG(OrderMan, Info, "ExecutionGatewayFactory::create_gateway NOT SIM conn: {}", - utils::pb::to_string(conn)); - switch(conn.venue()){ - case bts::api::VENUE_ICE: - case bts::api::VENUE_SIMICE: - return std::make_unique(conn, pl, o); - case bts::api::VENUE_GLBX:{ - if (conn.use_ilink3()) - return std::make_unique( conn, pl, o); - return std::make_unique(conn, pl, o); - } - case bts::api::VENUE_DERIBIT: - return std::make_unique(conn.venue(), o); - case bts::api::VENUE_CBOE: - { - std::unique_ptr adapter = std::make_unique(o); - return std::make_unique(conn.venue(),std::move(adapter),o); - } - case bts::api::VENUE_OKX: - { return std::make_unique(o); - } - default: - return std::make_unique(o); - } -} - -} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.h b/src/lib/orderman/gateways/ExecutionGatewayFactory.h deleted file mode 100644 index 122397118..000000000 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -#include "lib/config/protos/jetfix.pb.h" -#include - -namespace bts::trace { -class PerfLog; -} - -namespace bts::md { -class SecurityOracle; -} - -namespace bts::orderman { - -class IExecutionGateway; - -class ExecutionGatewayFactory { - public: - static std::unique_ptr create_gateway( - const config::JetFIX::Connection &, - trace::PerfLog &, - md::SecurityOracle); -}; - -} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/execution_gateway_provider.cpp b/src/lib/orderman/gateways/execution_gateway_provider.cpp deleted file mode 100644 index d1f899bfb..000000000 --- a/src/lib/orderman/gateways/execution_gateway_provider.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "execution_gateway_provider.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/gateways/ExecutionGatewayFactory.h" - -namespace bts::orderman { - -struct ExecutionGatewayProvider::PImpl { - PImpl(trace::PerfLog *l, md::SecurityOracle o) : l(l), o(std::move(o)) {} - - trace::PerfLog *l; - md::SecurityOracle o; -}; - -ExecutionGatewayProvider::ExecutionGatewayProvider( - trace::PerfLog *l, md::SecurityOracle o) - : me_(std::make_unique(l, std::move(o))) {} - -ExecutionGatewayProvider::~ExecutionGatewayProvider() = default; - -std::vector ExecutionGatewayProvider::create() { - auto conns = config::get().connection(); - std::vector gateways; - for (auto c : conns) { - auto &gw = gateways.emplace_back(); - gw.connection = std::move(c); - gw.gateway = ExecutionGatewayFactory::create_gateway(gw.connection, *me_->l, me_->o); - } - return gateways; -} - -} // namespace bts::orderman diff --git a/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp b/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp deleted file mode 100644 index bae9bbd65..000000000 --- a/src/lib_binance_execution/binance_execution/execution_gateway_provider.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "execution_gateway_provider.h" -#include "binance_execution/usds_futures/execution_gateway.h" -#include "binance_execution/usds_futures/execution_gateway_config.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/SecurityOracle.h" -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/gateways/ExecutionGatewayFactory.h" -#include "lib/os/spark_data_directory.h" - -namespace binance_execution { - -using bts::orderman::OrderGatewayDefinition; -using bts::spark::SparkDataDirectory; -using std::vector; - -struct ExecutionGatewayProvider::PImpl { - PImpl(bts::md::SecurityOracle sec_oracle) - : sec_oracle(std::move(sec_oracle)) {} - - bts::md::SecurityOracle sec_oracle; - - bool load_usds_futures(vector &dest) { - SparkDataDirectory data_dir; - auto cfg = - data_dir.load_config_json( - "binance_usds_futures_execution"); - if (!cfg) { - return false; - } - auto &gw = dest.emplace_back(); - *gw.connection.mutable_name() = "binance_usds_futures_1"; - gw.connection.set_venue(bts::api::VENUE_BINANCE_USDS_FUTURES); - gw.gateway = std::make_shared( - sec_oracle, std::move(*cfg), gw.connection.name()); - return true; - } -}; - -ExecutionGatewayProvider::ExecutionGatewayProvider( - bts::md::SecurityOracle sec_oracle) - : me_(std::make_unique(std::move(sec_oracle))) {} - -ExecutionGatewayProvider::~ExecutionGatewayProvider() = default; - -std::vector -ExecutionGatewayProvider::create() { - std::vector gws; - me_->load_usds_futures(gws); - return gws; -} - -} // namespace binance_execution diff --git a/src/lib_binance_execution/binance_execution/execution_gateway_provider.h b/src/lib_binance_execution/binance_execution/execution_gateway_provider.h deleted file mode 100644 index 2086ba5ea..000000000 --- a/src/lib_binance_execution/binance_execution/execution_gateway_provider.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "lib/orderman/actors/order_manager/order_gateway_definition.h" -#include "lib/orderman/gateways/i_execution_gateway_provider.h" - -#include -#include - -namespace binance_execution { - -class ExecutionGatewayProvider - : public bts::orderman::IExecutionGatewayProvider { - public: - explicit ExecutionGatewayProvider(bts::md::SecurityOracle sec_oracle); - ~ExecutionGatewayProvider() override; - - std::vector create() override; - - private: - struct PImpl; - std::unique_ptr me_; -}; - -} // namespace binance_execution diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 5008332fd..734312a67 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -1,7 +1,7 @@ #include "Run.h" -#include "binance_execution/execution_gateway_provider.h" #include "lib/api/public/ServiceContext.h" #include "lib/config/config.h" +#include "lib/config/protos/jetfix.pb.h" #include "lib/config/protos/ports.pb.h" #include "lib/config/protos/quickbus_cfg.pb.h" #include "lib/config/protos/toggles.pb.h" @@ -15,12 +15,12 @@ #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" #include "lib/orderman/OrderServiceServer.h" -#include "lib/orderman/gateways/execution_gateway_provider.h" #include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" #include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" #include "lib/os/os.h" +#include "lib/os/spark_data_directory.h" #include "lib/persistence/PersistenceServiceServer.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" @@ -31,6 +31,7 @@ #include "md/cmds/Run.h" #include "server/sparkd/algo/AlgoDefinitionServiceServer.h" #include "server/sparkd/analytics/AnalyticsServiceServer.h" +#include "server/sparkd/execution/execution_gateway_provider.h" #include "server/sparkd/http/WebServer.h" #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h" @@ -70,10 +71,11 @@ static OrderServiceServer create_order_service_server( TradeSummarySignalDispatcher &tss_dispatcher) { vector> gw_pros; gw_pros.push_back(std::make_unique( - &perf_log, mdclient.oracle())); - gw_pros.push_back( - std::make_unique( - mdclient.oracle())); + &perf_log, mdclient.oracle(), config::get(), + [](const std::string &name) { + const spark::SparkDataDirectory data_dir; + return data_dir.load_config_json(name); + })); return OrderServiceServer( sc, mdclient, dyn_order_registry, std::move(gw_pros), stats, perf_log, tss_dispatcher); diff --git a/src/server/sparkd/execution/execution_gateway_provider.cpp b/src/server/sparkd/execution/execution_gateway_provider.cpp new file mode 100644 index 000000000..d939a0180 --- /dev/null +++ b/src/server/sparkd/execution/execution_gateway_provider.cpp @@ -0,0 +1,127 @@ +#include "execution_gateway_provider.h" +#include "binance_execution/usds_futures/execution_gateway.h" +#include "binance_execution/usds_futures/execution_gateway_config.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/io/JsonReader.h" +#include "lib/orderman/gateways/CCAPIExecutionGateway.h" +#include "lib/orderman/gateways/FakeExecutionGateway.h" +#include "lib/orderman/gateways/GLBXExecutionGateway.h" +#include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" +#include "lib/orderman/gateways/GeneralExecutionGateway.h" +#include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/orderman/gateways/IExecutionGenericAdapter.h" +#include "lib/orderman/gateways/OkxExecutionGateway.h" +#include "lib/orderman/gateways/OnixFIXAdapter.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" + +namespace bts::orderman { + +#define _LOG_FN(level, fn, ...) \ + LOG(OrderMan, level, "ExecutionGatewayProvider::" fn ". " __VA_ARGS__) +#define INFO_FN(fn, ...) _LOG_FN(Info, fn, __VA_ARGS__) +#define WARN_FN(fn, ...) _LOG_FN(Warn, fn, __VA_ARGS__) +#define ERROR_FN(fn, ...) _LOG_FN(Error, fn, __VA_ARGS__) + +using bts::io::JsonReader; +using nlohmann::json; +using std::function; +using std::optional; +using std::string; +using std::vector; + +struct ExecutionGatewayProvider::PImpl { + PImpl( + trace::PerfLog *l, + md::SecurityOracle o, + config::JetFIX config, + function(const string &)> load_config_json) + : l(l), o(std::move(o)), config(std::move(config)), + load_config_json(std::move(load_config_json)) {} + + trace::PerfLog *l; + md::SecurityOracle o; + config::JetFIX config; + function(const string &)> load_config_json; + + template + T parse_config_json(const string &name) { + auto j = load_config_json(name); + bts_assert_msgf( + j, "Failed to load execution gateway config. name: {}", name); + JsonReader jr{&*j}; + T res; + bts_assert_msgf( + jr.read(res), "Failed to parse execution gateway config. name: {}", + name); + return res; + } + + std::unique_ptr create_gateway( + const config::JetFIX::Connection &conn) { + INFO_FN("create_gateway", "conn: {}", utils::pb::to_string(conn)); + if (SimExecutionGatewayFactory::is_sim_execution_on(conn.venue())) { + return std::make_unique( + conn.venue()); + } + switch (conn.venue()) { + case api::VENUE_ICE: + case api::VENUE_SIMICE: + return std::make_unique(conn, *l, o); + case api::VENUE_GLBX: { + if (conn.use_ilink3()) + return std::make_unique( + conn, *l, o); + return std::make_unique(conn, *l, o); + } + case api::VENUE_DERIBIT: + return std::make_unique(conn.venue(), o); + case api::VENUE_CBOE: { + std::unique_ptr adapter = + std::make_unique(o); + return std::make_unique( + conn.venue(), std::move(adapter), o); + } + case api::VENUE_OKX: { + return std::make_unique(o); + } + case api::VENUE_BINANCE_USDS_FUTURES: { + auto cfg = parse_config_json< + binance_execution::usds_futures::ExecutionGatewayConfig>( + conn.name()); + return std::make_unique< + binance_execution::usds_futures::ExecutionGateway>( + o, std::move(cfg), conn.name()); + } + default: + return std::make_unique(o); + } + } + + std::vector create() { + std::vector gateways; + for (auto c : config.connection()) { + auto &gw = gateways.emplace_back(); + gw.connection = std::move(c); + gw.gateway = create_gateway(gw.connection); + } + return gateways; + } +}; + +ExecutionGatewayProvider::ExecutionGatewayProvider( + trace::PerfLog *l, + md::SecurityOracle o, + config::JetFIX config, + std::function(const std::string &)> + load_config_json) + : me_(std::make_unique( + l, std::move(o), std::move(config), std::move(load_config_json))) {} + +ExecutionGatewayProvider::~ExecutionGatewayProvider() = default; + +std::vector ExecutionGatewayProvider::create() { + return me_->create(); +} + +} // namespace bts::orderman diff --git a/src/lib/orderman/gateways/execution_gateway_provider.h b/src/server/sparkd/execution/execution_gateway_provider.h similarity index 60% rename from src/lib/orderman/gateways/execution_gateway_provider.h rename to src/server/sparkd/execution/execution_gateway_provider.h index 9eeb3b1ff..c5f5a30e4 100644 --- a/src/lib/orderman/gateways/execution_gateway_provider.h +++ b/src/server/sparkd/execution/execution_gateway_provider.h @@ -5,11 +5,20 @@ #include #include +namespace bts::spark { +class SparkDataDirectory; +} + namespace bts::orderman { class ExecutionGatewayProvider : public IExecutionGatewayProvider { public: - ExecutionGatewayProvider(trace::PerfLog *l, md::SecurityOracle o); + ExecutionGatewayProvider( + trace::PerfLog *l, + md::SecurityOracle o, + config::JetFIX config, + std::function(const std::string &)> + load_config_json); ~ExecutionGatewayProvider() override; std::vector create() override;