From edda8ae20c56d4ee3e79f3da84de2ccea43f868d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 26 Aug 2024 02:51:34 +0000 Subject: [PATCH] refactor: Move domain types into new lib_domain Also rename files in snake_case (standard naming convention for protos) https://protobuf.dev/programming-guides/style/ --- CMakeLists.txt | 1 + src/Spark.Admin.WebApp/CMakeLists.txt | 2 +- src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp | 10 +- src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp | 11 +- .../sparkd/md/IMarketDataProvider.h | 4 +- .../sparkd/md/MarketDataGateway.cpp | 2 +- src/app_sparkd/sparkd/md/MarketDataListener.h | 8 +- .../sparkd/md/OnixsMarketDataProvider.cpp | 6 +- .../sparkd/md/OnixsMarketDataProvider.h | 3 +- .../sparkd/md/PyMarketDataProvider.cpp | 28 +- .../sparkd/md/PyMarketDataProvider.h | 2 +- .../sparkd/md/PyMarketDataSubscription.cpp | 43 +- .../sparkd/md/PyMarketDataSubscription.h | 2 +- .../sparkd/md/ReplayMarketDataProvider.cpp | 5 +- .../sparkd/md/ReplayMarketDataProvider.h | 2 +- .../sparkd/md/binance/BinanceLotSizeFilter.h | 1 + .../md/binance/BinanceMiniTickerAdaptor.h | 2 +- .../md/binance/BinanceMiniTickerEventType.h | 2 +- .../md/binance/BinanceMiniTickerUpdate.cpp | 4 +- .../md/binance/BinancePriceStatistics.cpp | 4 +- .../binance/BinancePriceStatisticsAdaptor.cpp | 2 +- .../binance/BinancePriceStatisticsAdaptor.h | 2 +- .../sparkd/md/binance/BinanceQuoteAsset.h | 12 +- .../md/binance/BinanceSecurityRequestor.cpp | 16 +- .../sparkd/md/binance/BinanceSpot.cpp | 10 +- .../sparkd/md/binance/BinanceSpot.h | 4 +- .../sparkd/md/binance/BinanceSubscription.cpp | 10 +- .../binance_us/BinanceUsPriceStatistics.cpp | 4 +- .../BinanceUsPriceStatisticsAdaptor.cpp | 2 +- .../BinanceUsPriceStatisticsAdaptor.h | 2 +- .../binance_us/BinanceUsSecurityRequestor.cpp | 16 +- .../md/binance_us/BinanceUsSubscription.cpp | 8 +- .../BinanceUsdsFuture.cpp | 12 +- .../BinanceUsdsFuturesPriceStatistics.cpp | 4 +- ...nanceUsdsFuturesPriceStatisticsAdaptor.cpp | 2 +- ...BinanceUsdsFuturesPriceStatisticsAdaptor.h | 2 +- .../BinanceUsdsFuturesSecurityRequestor.cpp | 9 +- .../BinanceUsdsFuturesSubscription.cpp | 12 +- .../sparkd/md/cboe/CboeMarketDataHandler.cpp | 8 +- .../sparkd/md/ccapi/CCApiDepthWalker.h | 2 +- .../md/ccapi/CCApiMarketDataProvider.cpp | 49 +- .../sparkd/md/ccapi/CCApiMarketDataProvider.h | 2 +- .../md/ccapi/CCApiMarketDepthAdaptor.cpp | 4 +- .../sparkd/md/ccapi/CCApiMarketDepthAdaptor.h | 2 +- .../sparkd/md/ccapi/CCApiTradeAdaptor.cpp | 2 +- .../sparkd/md/ccapi/CCApiTradeAdaptor.h | 4 +- .../sparkd/md/ccapi/CCApiTradeRecord.cpp | 6 +- .../md/coinbase/CoinbasePriceStatistics.cpp | 4 +- .../CoinbasePriceStatisticsAdaptor.cpp | 2 +- .../coinbase/CoinbasePriceStatisticsAdaptor.h | 2 +- .../md/coinbase/CoinbaseSecurityRequestor.cpp | 16 +- .../sparkd/md/coinbase/CoinbaseSpot.cpp | 15 +- .../sparkd/md/coinbase/CoinbaseSpot.h | 4 +- .../md/coinbase/CoinbaseSubscription.cpp | 4 +- .../md/databento/DatabentoDataHandler.cpp | 17 +- .../md/databento/DatabentoDataHandler.h | 4 +- .../databento/DatabentoMarketDataProvider.cpp | 3 +- .../databento/DatabentoMarketDataProvider.h | 2 +- .../sparkd/md/deribit/DeribitDepthAdaptor.cpp | 7 +- .../sparkd/md/deribit/DeribitDepthAdaptor.h | 2 +- .../sparkd/md/deribit/DeribitInstrumentKind.h | 14 +- .../md/deribit/DeribitInstrumentRequest.h | 4 +- .../md/deribit/DeribitInstrumentStore.cpp | 12 +- .../md/deribit/DeribitInstrumentStore.h | 4 +- .../md/deribit/DeribitSecurityRequestor.cpp | 14 +- .../sparkd/md/deribit/DeribitSubscription.cpp | 10 +- .../md/deribit/DeribitTickerAdaptor.cpp | 2 +- .../sparkd/md/deribit/DeribitTickerAdaptor.h | 2 +- .../sparkd/md/deribit/DeribitTradeAdaptor.cpp | 4 +- .../sparkd/md/deribit/DeribitTradeAdaptor.h | 2 +- .../md/emumba/EmumbaMarketDataProvider.cpp | 7 +- .../md/emumba/EmumbaMarketDataProvider.h | 2 +- src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp | 12 +- .../sparkd/md/ftx/FTXHistoricalPriceAdaptor.h | 2 +- .../sparkd/md/ftx/FTXHistoricalPriceRecord.h | 2 +- src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp | 12 +- .../sparkd/md/ftx/FTXSecurityRequestor.cpp | 16 +- .../sparkd/md/ftx/FTXSecurityType.h | 13 +- .../sparkd/md/ftx/FTXSubscription.cpp | 10 +- .../sparkd/md/glbx/GlbxMarketDataHandler.cpp | 9 +- .../sparkd/md/glbx/OnixsGlbxSubscription.cpp | 31 +- .../sparkd/md/okx/OkxChannelDemuxer.cpp | 9 +- .../sparkd/md/okx/OkxDepthAdaptor.cpp | 6 +- .../sparkd/md/okx/OkxDepthAdaptor.h | 2 +- .../sparkd/md/okx/OkxInstrumentStore.cpp | 10 +- .../sparkd/md/okx/OkxInstrumentStore.h | 4 +- .../sparkd/md/okx/OkxSecuritySubscription.cpp | 17 +- src/app_sparkd/sparkd/md/okx/OkxSide.h | 4 +- .../sparkd/md/okx/OkxSubscription.cpp | 11 +- src/app_sparkd/sparkd/md/okx/OkxTicker.h | 4 +- .../sparkd/md/okx/OkxTickerAdaptor.cpp | 6 +- .../sparkd/md/okx/OkxTickerAdaptor.h | 2 +- src/app_sparkd/sparkd/md/okx/OkxTrade.h | 4 +- .../sparkd/md/okx/OkxTradeAdaptor.cpp | 2 +- .../sparkd/md/okx/OkxTradeAdaptor.h | 2 +- .../sparkd/md/recording/MDReplayer.cpp | 18 +- .../sparkd/md/taifex/TaifexDataHandler.cpp | 13 +- .../md/taifex/TaifexMarketDataProvider.cpp | 3 +- .../md/taifex/TaifexMarketDataProvider.h | 2 +- src/client/spark_api/spark_api.csproj | 54 +- src/lib_domain/CMakeLists.txt | 60 ++ src/lib_domain/Config.cmake.in | 5 + .../spark => lib_domain}/domain/BUY_SELL.h | 3 +- .../domain/account_id.h} | 0 .../domain/aggressor_side.h} | 7 +- .../Book.h => lib_domain/domain/book.h} | 13 +- .../domain/book_level.h} | 12 +- .../domain/book_level_comp.h} | 11 +- .../domain/book_side.h} | 34 +- .../domain/book_side_populated_iterator.h} | 22 +- .../domain/future_security.h} | 8 +- .../domain/leg_definition.h} | 12 +- .../domain/option_security.h} | 14 +- src/lib_domain/domain/price.h | 539 ++++++++++++++++++ .../domain/price_comp.h} | 5 +- src/lib_domain/domain/protobufs/call_put.h | 14 + .../domain/protobufs/call_put.proto | 10 + src/lib_domain/domain/protobufs/currency.h | 14 + .../domain/protobufs/currency.proto | 10 + .../domain/protobufs/security_criteria.proto | 10 + .../protobufs/security_criteria_clause.proto | 17 + .../domain/protobufs/security_metadata.proto | 13 + .../security_metadata_collection.proto | 10 + .../protobufs/security_metadata_item.proto | 12 + .../domain/protobufs/security_type.h} | 26 +- .../domain/protobufs/security_type.proto} | 4 +- .../domain/protobufs/tick_display_rule.proto | 11 + .../protobufs/tick_display_settings.proto} | 8 +- .../domain/protobufs/tick_factors.proto} | 4 +- .../domain/protobufs/venue.h} | 19 +- .../domain/protobufs/venue.proto} | 4 +- .../domain/quantity.h} | 13 +- .../domain/security.cpp} | 45 +- .../domain/security.h} | 31 +- .../domain/security_common.h} | 44 +- .../domain/security_criteria.cpp} | 23 +- .../domain/security_criteria.h} | 30 +- .../domain/security_criteria_clause.cpp} | 53 +- .../domain/security_criteria_clause.h} | 22 +- .../domain/security_id.h} | 2 +- .../domain/security_state.h} | 3 +- .../Side.cpp => lib_domain/domain/side.cpp} | 2 +- .../Side.h => lib_domain/domain/side.h} | 0 .../domain/spot_security.h} | 0 .../domain/spread_security.h} | 8 +- src/lib_spark/CMakeLists.txt | 2 + .../cmake/GetLinuxClientSources.cmake | 2 +- .../cmake/GetLinuxServerLinkLibraries.cmake | 1 + .../cmake/GetLinuxServerSources.cmake | 1 - .../cmake/GetWindowsClientSources.cmake | 2 +- src/lib_spark/spark/api/domain/CallPut.h | 13 - src/lib_spark/spark/api/domain/CallPut.proto | 11 - src/lib_spark/spark/api/domain/Currency.h | 13 - src/lib_spark/spark/api/domain/Currency.proto | 10 - .../spark/api/domain/SecurityCriteria.proto | 10 - .../api/domain/SecurityCriteriaClause.proto | 17 - .../spark/api/domain/SecurityExpiration.proto | 4 +- .../spark/api/domain/SecurityMetadata.proto | 13 - .../domain/SecurityMetadataCollection.proto | 10 - .../api/domain/SecurityMetadataItem.proto | 12 - .../spark/api/domain/TickDisplayRule.proto | 11 - .../api/md/BinanceMarketDataConfig.proto | 4 +- .../api/md/BinanceUsMarketDataConfig.proto | 4 +- .../BinanceUsdsFuturesMarketDataConfig.proto | 4 +- .../spark/api/md/CboeMarketDataConfig.proto | 5 +- .../api/md/CoinbaseMarketDataConfig.proto | 4 +- .../api/md/DeribitMarketDataConfig.proto | 4 +- .../spark/api/md/FTXMarketDataConfig.proto | 4 +- .../spark/api/md/GlbxMarketDataConfig.proto | 4 +- .../spark/api/md/OkxMarketDataConfig.proto | 4 +- .../api/md/PyMarketDataProviderConfig.proto | 4 +- .../spark/api/md/TaifexMarketDataConfig.proto | 4 +- .../api/service_helpers/AdminServiceUtils.cpp | 6 +- .../spark/api/services/AnalyticsService.proto | 4 +- .../spark/config/ConfigurationState.cpp | 3 +- .../spark/domain/DomainSecurityUtils.cpp | 87 ++- .../spark/domain/DomainSecurityUtils.h | 26 +- src/lib_spark/spark/domain/NewOrder.h | 4 +- src/lib_spark/spark/domain/OrderDefinition.h | 11 +- src/lib_spark/spark/domain/OrderState.h | 6 +- src/lib_spark/spark/domain/OrderUpdate.h | 7 +- src/lib_spark/spark/domain/Price.h | 534 +---------------- .../domain/SecurityMarketDataStatistics.h | 8 +- src/lib_spark/spark/domain/TradeRecord.h | 8 +- src/lib_spark/spark/io/http/HttpProtocol.h | 2 +- .../spark/md/GeneralMarketDataListener.cpp | 44 +- .../spark/md/GeneralMarketDataListener.h | 4 +- src/lib_spark/spark/md/IMarketDataListener.h | 2 +- src/lib_spark/spark/md/SecurityStore.cpp | 14 +- src/lib_spark/spark/md/SecurityStore.h | 11 +- src/lib_spark/spark/md/SymbolLoader.h | 55 +- .../spark/md/SyntheticSecurityService.cpp | 8 +- src/lib_spark/spark/md/cme/MDP3Utils.cpp | 4 +- src/lib_spark/spark/md/ice/ICEUtils.cpp | 4 +- .../spark/persistence/IDGenerator.cpp | 4 +- src/lib_spark/spark/persistence/IDGenerator.h | 7 +- tools/py/build_admin_web_app.py | 7 +- 197 files changed, 1617 insertions(+), 1426 deletions(-) create mode 100644 src/lib_domain/CMakeLists.txt create mode 100644 src/lib_domain/Config.cmake.in rename src/{lib_spark/spark => lib_domain}/domain/BUY_SELL.h (73%) rename src/{lib_spark/spark/domain/AccountID.h => lib_domain/domain/account_id.h} (100%) rename src/{lib_spark/spark/domain/AggressorSide.h => lib_domain/domain/aggressor_side.h} (86%) rename src/{lib_spark/spark/domain/Book.h => lib_domain/domain/book.h} (97%) rename src/{lib_spark/spark/domain/BookLevel.h => lib_domain/domain/book_level.h} (93%) rename src/{lib_spark/spark/domain/BookLevelComp.h => lib_domain/domain/book_level_comp.h} (85%) rename src/{lib_spark/spark/domain/BookSide.h => lib_domain/domain/book_side.h} (97%) rename src/{lib_spark/spark/domain/BookSide_PopulatedIterator.h => lib_domain/domain/book_side_populated_iterator.h} (91%) rename src/{lib_spark/spark/domain/FutureSecurity.h => lib_domain/domain/future_security.h} (90%) rename src/{lib_spark/spark/domain/LegDefinition.h => lib_domain/domain/leg_definition.h} (89%) rename src/{lib_spark/spark/domain/OptionSecurity.h => lib_domain/domain/option_security.h} (83%) create mode 100644 src/lib_domain/domain/price.h rename src/{lib_spark/spark/domain/PriceComp.h => lib_domain/domain/price_comp.h} (93%) create mode 100644 src/lib_domain/domain/protobufs/call_put.h create mode 100644 src/lib_domain/domain/protobufs/call_put.proto create mode 100644 src/lib_domain/domain/protobufs/currency.h create mode 100644 src/lib_domain/domain/protobufs/currency.proto create mode 100644 src/lib_domain/domain/protobufs/security_criteria.proto create mode 100644 src/lib_domain/domain/protobufs/security_criteria_clause.proto create mode 100644 src/lib_domain/domain/protobufs/security_metadata.proto create mode 100644 src/lib_domain/domain/protobufs/security_metadata_collection.proto create mode 100644 src/lib_domain/domain/protobufs/security_metadata_item.proto rename src/{lib_spark/spark/api/domain/SecurityType.h => lib_domain/domain/protobufs/security_type.h} (62%) rename src/{lib_spark/spark/api/domain/SecurityType.proto => lib_domain/domain/protobufs/security_type.proto} (73%) create mode 100644 src/lib_domain/domain/protobufs/tick_display_rule.proto rename src/{lib_spark/spark/api/domain/TickDisplaySettings.proto => lib_domain/domain/protobufs/tick_display_settings.proto} (58%) rename src/{lib_spark/spark/api/domain/TickFactors.proto => lib_domain/domain/protobufs/tick_factors.proto} (53%) rename src/{lib_spark/spark/api/domain/Venue.h => lib_domain/domain/protobufs/venue.h} (67%) rename src/{lib_spark/spark/api/domain/Venue.proto => lib_domain/domain/protobufs/venue.proto} (91%) rename src/{lib_spark/spark/domain/Quantity.h => lib_domain/domain/quantity.h} (93%) rename src/{lib_spark/spark/domain/Security.cpp => lib_domain/domain/security.cpp} (54%) rename src/{lib_spark/spark/domain/Security.h => lib_domain/domain/security.h} (85%) rename src/{lib_spark/spark/domain/SecurityCommon.h => lib_domain/domain/security_common.h} (68%) rename src/{lib_spark/spark/domain/SecurityCriteria.cpp => lib_domain/domain/security_criteria.cpp} (76%) rename src/{lib_spark/spark/domain/SecurityCriteria.h => lib_domain/domain/security_criteria.h} (80%) rename src/{lib_spark/spark/domain/SecurityCriteriaClause.cpp => lib_domain/domain/security_criteria_clause.cpp} (82%) rename src/{lib_spark/spark/domain/SecurityCriteriaClause.h => lib_domain/domain/security_criteria_clause.h} (77%) rename src/{lib_spark/spark/domain/SecurityID.h => lib_domain/domain/security_id.h} (95%) rename src/{lib_spark/spark/domain/SecurityState.h => lib_domain/domain/security_state.h} (85%) rename src/{lib_spark/spark/domain/Side.cpp => lib_domain/domain/side.cpp} (89%) rename src/{lib_spark/spark/domain/Side.h => lib_domain/domain/side.h} (100%) rename src/{lib_spark/spark/domain/SpotSecurity.h => lib_domain/domain/spot_security.h} (100%) rename src/{lib_spark/spark/domain/SpreadSecurity.h => lib_domain/domain/spread_security.h} (90%) delete mode 100644 src/lib_spark/spark/api/domain/CallPut.h delete mode 100644 src/lib_spark/spark/api/domain/CallPut.proto delete mode 100644 src/lib_spark/spark/api/domain/Currency.h delete mode 100644 src/lib_spark/spark/api/domain/Currency.proto delete mode 100644 src/lib_spark/spark/api/domain/SecurityCriteria.proto delete mode 100644 src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto delete mode 100644 src/lib_spark/spark/api/domain/SecurityMetadata.proto delete mode 100644 src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto delete mode 100644 src/lib_spark/spark/api/domain/SecurityMetadataItem.proto delete mode 100644 src/lib_spark/spark/api/domain/TickDisplayRule.proto diff --git a/CMakeLists.txt b/CMakeLists.txt index c35ffc75b..c0db32cb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,6 +105,7 @@ else() # subdirs if (BUILD_SPARKD) add_subdirectory(src/lib_system) + add_subdirectory(src/lib_domain) add_subdirectory(src/lib_python_md) add_subdirectory(src/app_sparkd) add_subdirectory(src/data_files) diff --git a/src/Spark.Admin.WebApp/CMakeLists.txt b/src/Spark.Admin.WebApp/CMakeLists.txt index 94fb0bb6f..7c45a850b 100644 --- a/src/Spark.Admin.WebApp/CMakeLists.txt +++ b/src/Spark.Admin.WebApp/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.5) project(Spark.Admin.WebApp) include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake) include(GNUInstallDirs) # dependencies set(PROTO_GLOBS + ../lib_domain/domain/*.proto ../lib_spark/spark/api/*.proto ../lib_spark/spark/api/services/*.proto ../lib_spark/spark/domain_model/*.proto diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp index dd5f4d9c4..b5e8c17b9 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Run.cpp @@ -1,8 +1,8 @@ #include "Run.h" #include "Cleanup.h" +#include "domain/security_criteria.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/config/protos/market_data.pb.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/md/UserSymbol.h" @@ -62,8 +62,8 @@ static void run_onixs( os::get_thread_name()); std::vector> platforms; // get all glbx symbols - auto cme_symbols = - SymbolLoader::load(SecurityCriteria::create({api::domain::VENUE_GLBX})); + auto cme_symbols = SymbolLoader::load( + SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); if (!cme_symbols.empty()) { auto *main = new bts::md::MDP3Main(); main->start( @@ -71,8 +71,8 @@ static void run_onixs( platforms.emplace_back(main); } // ice - const auto ice_symbols = - SymbolLoader::load(SecurityCriteria::create({api::domain::VENUE_ICE})); + const auto ice_symbols = SymbolLoader::load( + SecurityCriteria::create({domain::protobufs::VENUE_ICE})); if (!ice_symbols.empty()) { auto *imain = new bts::md::ice::ICEMain(); imain->start({ice_symbols.begin(), ice_symbols.end()}); diff --git a/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp b/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp index f785803a3..62da4c563 100644 --- a/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp +++ b/src/app_sparkd/sparkd/cmds/md/cmds/Tail.cpp @@ -1,12 +1,9 @@ #include "Tail.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/config/protos/market_data.pb.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/security_criteria.h" #include "spark/md/Diag/MDPeriodicDumper.h" -#include "spark/md/Diag/ShmDumper.h" #include "spark/md/SymbolLoader.h" -#include "spark/md/UserSymbol.h" + #include namespace bts::cmds::md::cmds { @@ -44,7 +41,7 @@ Tail::Tail() callback([&] { const auto products = SymbolLoader::load(SecurityCriteria::create( - {}, {bts::api::domain::SECURITY_TYPE_FUTURE})); + {}, {domain::protobufs::SECURITY_TYPE_FUTURE})); bts::md::run_periodic_dumper( products, _args->mod, _args->format, _args->all, _args->qualifier); }); diff --git a/src/app_sparkd/sparkd/md/IMarketDataProvider.h b/src/app_sparkd/sparkd/md/IMarketDataProvider.h index 7d7bb1072..ec5d4b347 100644 --- a/src/app_sparkd/sparkd/md/IMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/IMarketDataProvider.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" #include "sparkd/md/IMarketDataSource.h" #include @@ -18,7 +18,7 @@ class IMarketDataProvider { virtual ~IMarketDataProvider(); virtual std::vector< - std::pair>> + std::pair>> get_sources() = 0; }; diff --git a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp index e7c4429bd..450104519 100644 --- a/src/app_sparkd/sparkd/md/MarketDataGateway.cpp +++ b/src/app_sparkd/sparkd/md/MarketDataGateway.cpp @@ -1,9 +1,9 @@ #include "MarketDataGateway.h" +#include "domain/security_id.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/api/md/MarketDataConfigUtils.h" #include "spark/core/FMT.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/SecurityID.h" #include "spark/logging/logging.h" #include "spark/md/GeneralMarketDataListener.h" #include "spark/md/GeneralSecurityIndex.h" diff --git a/src/app_sparkd/sparkd/md/MarketDataListener.h b/src/app_sparkd/sparkd/md/MarketDataListener.h index 2541bf483..44f61cc07 100644 --- a/src/app_sparkd/sparkd/md/MarketDataListener.h +++ b/src/app_sparkd/sparkd/md/MarketDataListener.h @@ -1,11 +1,11 @@ #pragma once -#include "spark/md/IMarketDataListener.h" -#include "spark/domain/Book.h" -#include "spark/domain/Security.h" +#include "domain/book.h" +#include "domain/security.h" +#include "domain/security_state.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/domain/SecurityState.h" #include "spark/domain/TradeRecord.h" +#include "spark/md/IMarketDataListener.h" #include "sparkd/md/MarketDataError.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp index 60ce7c4a7..869bb93f7 100644 --- a/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.cpp @@ -1,15 +1,17 @@ #include "OnixsMarketDataProvider.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "spark/config/config.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/glbx/OnixsGlbxSubscription.h" +#include #include #include namespace bts::md { -using bts::api::domain::Venue; using bts::api::md::MarketDataConfig; +using bts::domain::protobufs::Venue; using bts::md::OnixsMarketDataProvider; using bts::persistence::IDGenerator; using std::pair; diff --git a/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h index 519d59a31..2e4f18e12 100644 --- a/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/OnixsMarketDataProvider.h @@ -14,8 +14,7 @@ class OnixsMarketDataProvider : public IMarketDataProvider { explicit OnixsMarketDataProvider(api::md::MarketDataConfig config); ~OnixsMarketDataProvider(); - std::vector< - std::pair>> + std::vector>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/PyMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/PyMarketDataProvider.cpp index d5f91ad0e..19a51fab3 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/PyMarketDataProvider.cpp @@ -35,31 +35,25 @@ PyMarketDataProvider::PyMarketDataProvider( PyMarketDataProvider::~PyMarketDataProvider() = default; -vector>> +vector>> PyMarketDataProvider::get_sources() { - vector>> rv; + vector>> rv; const Path wd{sparkd_wd()}; vector module_paths{ wd.string(), (wd / "python_md_providers").string(), }; for (const auto &py_plugin : me_->config.python_md_providers()) { - try { - vector module_path; - for (const auto &p : py_plugin.module_path()) { - module_path.emplace_back(p); - } - auto source = std::make_shared( - py_plugin.provider_type(), module_path, me_->sec_id_store.get()); - me_->py_md_subs.push_back(source); - rv.push_back( - std::make_pair>( - py_plugin.venue(), source)); - } catch (const std::exception &ex) { - bts_assert_msgf( - false, "PyMarketDataSubscription threw: {}", - std::string{ex.what()}); + vector module_path; + for (const auto &p : py_plugin.module_path()) { + module_path.emplace_back(p); } + auto source = std::make_shared( + py_plugin.provider_type(), module_path, me_->sec_id_store); + me_->py_md_subs.push_back(source); + rv.push_back(std::make_pair< + domain::protobufs::Venue, shared_ptr>( + py_plugin.venue(), source)); } return rv; } diff --git a/src/app_sparkd/sparkd/md/PyMarketDataProvider.h b/src/app_sparkd/sparkd/md/PyMarketDataProvider.h index 2a8dbae26..0fc777997 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/PyMarketDataProvider.h @@ -16,7 +16,7 @@ class PyMarketDataProvider : public IMarketDataProvider { ~PyMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp index 149f58839..ac36d5236 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp +++ b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.cpp @@ -1,18 +1,18 @@ #include "PyMarketDataSubscription.h" +#include "domain/aggressor_side.h" +#include "domain/future_security.h" +#include "domain/protobufs/call_put.pb.h" +#include "domain/protobufs/venue.h" +#include "domain/security.h" +#include "domain/security_id.h" +#include "domain/spot_security.h" #include "python_md/md_sink.h" #include "python_md/py_book.h" #include "python_md/py_md_executor.h" #include "python_md/py_security.h" #include "python_md/py_security_list.h" #include "python_md/py_trade.h" -#include "spark/api/domain/CallPut.pb.h" -#include "spark/api/domain/Venue.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/AggressorSide.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" -#include "spark/domain/SpotSecurity.h" #include "spark/domain/TradeRecord.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" @@ -46,16 +46,18 @@ using Path = boost::filesystem::path; struct TradeTuple { py_interop::PyTrade py_trade; domain::TradeRecord trade; - api::domain::Venue venue; + domain::protobufs::Venue venue; }; struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { PImpl( - string py_plugin, vector module_paths, IDGenerator *sec_id_store) + string py_plugin, + vector module_paths, + std::shared_ptr sec_id_store) : py_plugin_(std::move(py_plugin)), module_paths_(std::move(module_paths)), py_md_exec_(py_plugin_, module_paths_, this), - sec_id_store_(sec_id_store) {} + sec_id_store_(std::move(sec_id_store)) {} void start(shared_ptr listener) { bts_assert(listener != nullptr); @@ -73,7 +75,7 @@ struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { PyMdExecutor py_md_exec_; shared_ptr listener_; - IDGenerator *sec_id_store_; + std::shared_ptr sec_id_store_; // The main store for securities. vector securities_; vector security_ptrs_; @@ -142,11 +144,11 @@ struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { } SecurityID get_sec_id_(const string &venue_name, const string &sec_name) { - api::domain::Venue venue; + domain::protobufs::Venue venue; // Although an overload of 'get_id' accepts a string, we parse `venue_name` to the enum to // normalize different spellings of the same venue. For example, "deribt", "DERIBIT", and // "VENUE_deribit" all represent the VENUE_DERIBIT enum (see `venue_parse_smart` for details). - bts_assert(api::domain::venue_parse_smart(venue_name, &venue)); + bts_assert(domain::protobufs::venue_parse_smart(venue_name, &venue)); auto sec_id = sec_id_store_->get_id(venue, sec_name, true); bts_assert_msgf( sec_id, "Failed to get security id for py_book. venue: {}; name: {}", @@ -161,7 +163,8 @@ struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { bts_assert(py_sec.id() == 0); domain::Security sec; auto &sec_comm = sec.security_common; - if (!api::domain::venue_parse_smart(py_sec.venue(), &sec_comm.venue)) { + if (!domain::protobufs::venue_parse_smart( + py_sec.venue(), &sec_comm.venue)) { LOG(md, Error, "Failed to parse venue from '{}'", py_sec.venue()); return std::nullopt; } @@ -186,8 +189,8 @@ struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { domain::OptionSecurity opt; const auto &py_opt = py_sec.option(); opt.expiration = core::TimeStamp::from_iso_string(py_opt.expiration()); - opt.call_put = py_opt.is_call() ? api::domain::CallPut::CALL - : api::domain::CallPut::PUT; + opt.call_put = py_opt.is_call() ? domain::protobufs::CallPut::CALL + : domain::protobufs::CallPut::PUT; opt.strike = domain::Price::from_double(py_opt.strike()); sec.security = std::move(opt); } else { @@ -232,9 +235,13 @@ struct PyMarketDataSubscription::PImpl : private py_interop::MdSink { }; PyMarketDataSubscription::PyMarketDataSubscription( - string py_plugin, vector module_paths, IDGenerator *sec_id_store) + string py_plugin, + vector module_paths, + shared_ptr sec_id_store) : me_(std::make_unique( - std::move(py_plugin), std::move(module_paths), sec_id_store)) {} + std::move(py_plugin), + std::move(module_paths), + std::move(sec_id_store))) {} PyMarketDataSubscription::~PyMarketDataSubscription() { me_->stop(); } diff --git a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.h b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.h index 08cb99a3f..af5f8454e 100644 --- a/src/app_sparkd/sparkd/md/PyMarketDataSubscription.h +++ b/src/app_sparkd/sparkd/md/PyMarketDataSubscription.h @@ -17,7 +17,7 @@ class PyMarketDataSubscription : public IMarketDataSource { explicit PyMarketDataSubscription( std::string py_plugin, std::vector module_paths, - persistence::IDGenerator *sec_id_store); + std::shared_ptr sec_id_store); ~PyMarketDataSubscription(); void start(std::shared_ptr listener) override; diff --git a/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp index 1284fe71e..d5f4d17ab 100644 --- a/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.cpp @@ -21,7 +21,8 @@ using std::vector; struct ReplayMarketDataProvider::PImpl { MarketDataConfig config; shared_ptr sec_id_store; - vector>> sources; + vector>> + sources; PImpl(MarketDataConfig config, shared_ptr sec_id_store) : config(std::move(config)), sec_id_store(std::move(sec_id_store)) {} @@ -38,7 +39,7 @@ ReplayMarketDataProvider::ReplayMarketDataProvider( ReplayMarketDataProvider::~ReplayMarketDataProvider() = default; -vector>> +vector>> ReplayMarketDataProvider::get_sources() { const auto replay_cfgs = MarketDataConfigUtils::get_effective_replay_config(me_->config); diff --git a/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h index c37e2025f..7e0152ed9 100644 --- a/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/ReplayMarketDataProvider.h @@ -17,7 +17,7 @@ class ReplayMarketDataProvider : public IMarketDataProvider { ~ReplayMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h index fbad53527..745804ae7 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceLotSizeFilter.h @@ -1,6 +1,7 @@ #pragma once #include "spark/io/JsonReader.h" +#include "spark/logging/logging.h" #include "sparkd/md/binance/BinanceFilterType.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h index 0946703e8..122a66283 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h index be42f5414..c479a1ad3 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerEventType.h @@ -1,6 +1,6 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI -#include "spark/api/domain/SecurityType.pb.h" +#include "domain/protobufs/security_type.pb.h" #include #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index 55cd40519..af46a7834 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -1,8 +1,8 @@ #ifdef SPARK_ENABLE_CCAPI #include "BinanceMiniTickerUpdate.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index a38bcc3c8..fda8181ef 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -1,7 +1,7 @@ #include "BinancePriceStatistics.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp index 924a03ace..6135689c0 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.cpp @@ -1,5 +1,5 @@ #include "BinancePriceStatisticsAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h index c8883990e..407755ef1 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatisticsAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h index 477275cdc..f2e9fdb61 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceQuoteAsset.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/Currency.pb.h" +#include "domain/protobufs/currency.pb.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" @@ -60,7 +60,7 @@ class BinanceQuoteAsset { ENUM_BASIC_MEMBERS(BinanceQuoteAsset) - constexpr api::domain::Currency to_currency() const; + constexpr domain::protobufs::Currency to_currency() const; }; ENUM_OUTPUT_OPS(BinanceQuoteAsset) @@ -75,18 +75,18 @@ ENUM_EQUALITY_OPS(BinanceQuoteAsset) // Definition ////////////////////////////////////////////////// -constexpr api::domain::Currency BinanceQuoteAsset::to_currency() const { +constexpr domain::protobufs::Currency BinanceQuoteAsset::to_currency() const { switch (value) { case BTC: - return api::domain::Currency::BTC; + return domain::protobufs::Currency::BTC; case ETH: - return api::domain::Currency::ETH; + return domain::protobufs::Currency::ETH; case USDC: case USDP: case USDS: case USDT: default: - return api::domain::Currency::USD; + return domain::protobufs::Currency::USD; } } diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index 4600e1496..40e7e9bfd 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -1,8 +1,8 @@ #include "BinanceSecurityRequestor.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" @@ -26,12 +26,12 @@ namespace bts::md::binance { -using api::domain::SecurityType; -using api::domain::Venue; -using api::domain::Venue_Name; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::SecurityType; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::persistence::IDGenerator; using std::string; using std::unordered_set; @@ -53,7 +53,7 @@ using std::vector; #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_BINANCE #define BINANCE_MSG_TYPE_NAME(x) \ std::string { BinanceMessageType{x}.name() } -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x static ccapi::Request exchange_info_req() { auto corr_id = CCApiCorrelationID::from_parts( diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp index e1e63f1f6..4cf22f6a6 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.cpp @@ -1,7 +1,7 @@ #include "BinanceSpot.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Security.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/quantity.h" +#include "domain/security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" @@ -12,15 +12,15 @@ namespace bts::md::binance { -using bts::api::domain::Venue; using bts::domain::Quantity; using bts::domain::Security; using bts::domain::SpotSecurity; +using bts::domain::protobufs::Venue; using bts::io::JsonReader; using std::string; using std::vector; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x static std::string deduce_sym_from_name(const std::string &name) { std::regex word_regex("(\\w+)"); diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h index 0721b3434..996218f5f 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSpot.h +++ b/src/app_sparkd/sparkd/md/binance/BinanceSpot.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/Venue.h" +#include "domain/protobufs/venue.h" #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonMacros.h" #include "sparkd/md/binance/BinanceFilterTuple.h" @@ -50,7 +50,7 @@ class BinanceSpot { static void parse( const ccapi::Message &msg, std::vector &securities, - api::domain::Venue venue = api::domain::Venue::VENUE_BINANCE); + domain::protobufs::Venue venue = domain::protobufs::VENUE_BINANCE); }; void from_json(const nlohmann::json &j, BinanceSpot &spot); diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 108729c3e..8c9dbfcfa 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -1,9 +1,9 @@ #include "BinanceSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/BinanceMarketDataConfig.pb.h" #include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -34,12 +34,12 @@ namespace bts::md::binance { -using bts::api::domain::Venue; -using bts::api::domain::Venue_Name; using bts::api::md::BinanceMarketDataConfig; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::io::ProtoPrinter; using bts::io::QueryParams; using bts::persistence::IDGenerator; diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index acdc20d1e..2ed32a7b4 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -1,7 +1,7 @@ #include "BinanceUsPriceStatistics.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp index c2f2f28d0..edc99628f 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp @@ -1,5 +1,5 @@ #include "BinanceUsPriceStatisticsAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h index 6ec518da5..e49d737c4 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatisticsAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index 63dc210a5..e914fcf28 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -1,8 +1,8 @@ #include "BinanceUsSecurityRequestor.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/binance_us/BinanceUsMessageType.h" @@ -25,12 +25,12 @@ namespace bts::md::binance_us { -using api::domain::SecurityType; -using api::domain::Venue; -using api::domain::Venue_Name; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::SecurityType; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::persistence::IDGenerator; using std::string; using std::unordered_set; @@ -41,7 +41,7 @@ using std::vector; #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_BINANCE_US #define BINANCE_US_MSG_TYPE_NAME(x) \ std::string { BinanceUsMessageType{x}.name() } -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x static ccapi::Request exchange_info_req() { auto corr_id = CCApiCorrelationID::from_parts( diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index daee9ac4b..b16b918aa 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -1,5 +1,7 @@ #include "BinanceUsSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/BinanceUsMarketDataConfig.pb.h" #include "spark/core/FMT.h" #include "spark/io/ProtoPrinter.h" @@ -34,12 +36,12 @@ namespace bts::md::binance_us { -using bts::api::domain::Venue; -using bts::api::domain::Venue_Name; using bts::api::md::BinanceUsMarketDataConfig; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::io::ProtoPrinter; using bts::io::QueryParams; using bts::persistence::IDGenerator; diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp index e781e19b7..231239d1c 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuture.cpp @@ -1,7 +1,7 @@ #include "BinanceUsdsFuture.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Security.h" +#include "domain/price.h" +#include "domain/quantity.h" +#include "domain/security.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" @@ -12,18 +12,18 @@ namespace bts::md::binance_usds_futures { -using bts::api::domain::SecurityType; using bts::domain::FutureSecurity; using bts::domain::Price; using bts::domain::Quantity; using bts::domain::Security; +using bts::domain::protobufs::SecurityType; using bts::io::JsonDumper; using bts::io::JsonReader; using std::string; using std::vector; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x -#define VENUE api::domain::Venue::VENUE_BINANCE_USDS_FUTURES; +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define VENUE bts::domain::protobufs::VENUE_BINANCE_USDS_FUTURES; static string deduce_sym_from_name(const string &name) { const std::regex word_regex("(\\w+)"); diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index 659096a85..7468391d5 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -1,6 +1,6 @@ #include "BinanceUsdsFuturesPriceStatistics.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiReader.h" diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp index a546ce3b0..99d7b5386 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp @@ -1,5 +1,5 @@ #include "BinanceUsdsFuturesPriceStatisticsAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h index fa88154fa..7a7b1a82a 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp index 0930c1a4e..3ea925638 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -1,8 +1,9 @@ #include "BinanceUsdsFuturesSecurityRequestor.h" +#include "domain/security.h" +#include "domain/security_criteria.h" +#include "domain/security_id.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" #include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" @@ -24,13 +25,13 @@ namespace bts::md::binance_usds_futures { -using api::domain::Venue; -using api::domain::Venue_Name; using api::md::BinanceUsdsFuturesMarketDataConfig; using bts::collections::UnorderedSetFactory; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::persistence::IDGenerator; using std::string; using std::unordered_set; diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp index 38f3efdbc..9c801f71f 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -1,10 +1,10 @@ #include "BinanceUsdsFuturesSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" +#include "domain/security_id.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" #include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" -#include "spark/domain/SecurityID.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/logging/logging.h" @@ -30,12 +30,12 @@ namespace bts::md::binance_usds_futures { -using bts::api::domain::Venue; -using bts::api::domain::Venue_Name; using bts::api::md::BinanceUsdsFuturesMarketDataConfig; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::io::ProtoPrinter; using bts::io::QueryParams; using bts::persistence::IDGenerator; diff --git a/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp index e922a5a3d..214c2ed94 100644 --- a/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/cboe/CboeMarketDataHandler.cpp @@ -1,5 +1,4 @@ #include "CboeMarketDataHandler.h" -#include "spark/api/domain/Venue.pb.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" #include "sparkd/md/databento/DatabentoDataHandler.h" @@ -10,17 +9,18 @@ namespace bts::md::cboe { +using bts::domain::protobufs::Venue; + void CboeMarketDatahandler::run( bool use_file, std::shared_ptr listner, std::shared_ptr sec_id_store) { - static const api::domain::Venue venue = api::domain::VENUE_CBOE; std::string contratcs_file_name = "/opra-pillar-20240815.definition.dbn.zst"; std::string bbo_file_name = "/opra-pillar-20240815.mbp-1.dbn.zst"; std::string base_path = config::get().data_path(); DatabentoHandler::DatabentoDatahandler::run( - use_file, listner, sec_id_store, venue, base_path + contratcs_file_name, - base_path + bbo_file_name); + use_file, listner, sec_id_store, Venue::VENUE_CBOE, + base_path + contratcs_file_name, base_path + bbo_file_name); } } // namespace bts::md::cboe diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h index 3e758cf13..55bfd6fdc 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/BookSide.h" +#include "domain/book_side.h" #include #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp index f3d3d7f63..a5ffb1f37 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.cpp @@ -1,5 +1,5 @@ #include "CCApiMarketDataProvider.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/config/config.h" #include "spark/io/ProtoPrinter.h" @@ -21,7 +21,10 @@ namespace bts::md { +#define VENUE(x) bts::domain::protobufs::VENUE_##x + using bts::api::md::MarketDataConfig; +using bts::md::binance_usds_futures::BinanceUsdsFuturesSubscription; using bts::persistence::IDGenerator; using std::pair; using std::shared_ptr; @@ -50,7 +53,8 @@ struct CCApiMarketDataProvider::PImpl { ccapi::EventDispatcher dispatcher; shared_ptr sec_id_store; unordered_map> venue_sinks; - vector>> + vector< + std::pair>> sources; PImpl(MarketDataConfig config, shared_ptr sec_id_store) @@ -74,7 +78,7 @@ CCApiMarketDataProvider::CCApiMarketDataProvider( CCApiMarketDataProvider::~CCApiMarketDataProvider() = default; -vector>> +vector>> CCApiMarketDataProvider::get_sources() { auto &cfg = me_->config; vector cfg_errs; @@ -87,52 +91,47 @@ CCApiMarketDataProvider::get_sources() { // Binance for (const auto &binance : cfg.binance()) { me_->sources.emplace_back( - api::domain::VENUE_BINANCE, + VENUE(BINANCE), std::make_shared( &me_->dispatcher, binance, me_->sec_id_store.get())); } // Binance US for (const auto &binance_us : cfg.binance_us()) { me_->sources.emplace_back( - api::domain::VENUE_BINANCE_US, + VENUE(BINANCE_US), std::make_shared( &me_->dispatcher, binance_us, me_->sec_id_store.get())); } // Binance USDS Futures for (const auto &binance_ufs : cfg.binance_usds_futures()) { - me_->sources.emplace_back( - api::domain::VENUE_BINANCE_USDS_FUTURES, - std::make_shared< - binance_usds_futures::BinanceUsdsFuturesSubscription>( - &me_->dispatcher, binance_ufs, me_->sec_id_store.get())); + auto sub = std::make_shared< + binance_usds_futures::BinanceUsdsFuturesSubscription>( + &me_->dispatcher, binance_ufs, me_->sec_id_store.get()); + me_->sources.emplace_back(VENUE(BINANCE_USDS_FUTURES), std::move(sub)); } // Coinbase for (const auto &coinbase : cfg.coinbase()) { - me_->sources.emplace_back( - api::domain::VENUE_COINBASE, - std::make_shared( - &me_->dispatcher, coinbase, me_->sec_id_store.get())); + auto sub = std::make_shared( + &me_->dispatcher, coinbase, me_->sec_id_store.get()); + me_->sources.emplace_back(VENUE(COINBASE), std::move(sub)); } // Deribit for (const auto &deribit : cfg.deribit()) { - me_->sources.emplace_back( - api::domain::VENUE_DERIBIT, - std::make_shared( - &me_->dispatcher, deribit, me_->sec_id_store.get())); + auto sub = std::make_shared( + &me_->dispatcher, deribit, me_->sec_id_store.get()); + me_->sources.emplace_back(VENUE(DERIBIT), std::move(sub)); } // FTX for (const auto &ftx : cfg.ftx()) { - me_->sources.emplace_back( - api::domain::VENUE_FTX, - std::make_shared( - &me_->dispatcher, ftx, me_->sec_id_store.get())); + auto sub = std::make_shared( + &me_->dispatcher, ftx, me_->sec_id_store.get()); + me_->sources.emplace_back(VENUE(FTX), std::move(sub)); } // Okx for (const auto &okx : cfg.okx()) { me_->sources.emplace_back( - api::domain::VENUE_OKX, - std::make_shared( - &me_->dispatcher, okx, me_->sec_id_store.get())); + VENUE(OKX), std::make_shared( + &me_->dispatcher, okx, me_->sec_id_store.get())); } return me_->sources; } diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h index 4fb81eb5c..6f3b443b3 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDataProvider.h @@ -16,7 +16,7 @@ class CCApiMarketDataProvider : public IMarketDataProvider { ~CCApiMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp index 1fd788208..49ec24901 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp @@ -1,6 +1,6 @@ #include "CCApiMarketDepthAdaptor.h" -#include "spark/domain/BUY_SELL.h" -#include "spark/domain/Book.h" +#include "domain/BUY_SELL.h" +#include "domain/book.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiDepthWalker.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h index 9390fa388..9043847a3 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/Book.h" +#include "domain/book.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp index dd441e3af..81fc1674f 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp @@ -1,6 +1,6 @@ #include "CCApiTradeAdaptor.h" +#include "domain/security_id.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/SecurityID.h" #include "spark/domain/TradeRecord.h" #include "spark/utils/bts_fatal.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h index 90245c717..58ca38ad2 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.h @@ -1,9 +1,9 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" +#include "spark/md/IMarketDataListener.h" #include "sparkd/md/ccapi/CCApiTradeRecord.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" -#include "spark/md/IMarketDataListener.h" #include diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp index cabfbfc23..db45f7f32 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeRecord.cpp @@ -1,7 +1,7 @@ #include "CCApiTradeRecord.h" -#include "spark/domain/AggressorSide.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" +#include "domain/aggressor_side.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/domain/TradeRecord.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index 0c53e56b5..b60bd3e46 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -1,7 +1,7 @@ #include "CoinbasePriceStatistics.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonDumper.h" #include "spark/io/JsonReader.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp index 9f349c3f4..ceee18545 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.cpp @@ -1,5 +1,5 @@ #include "CoinbasePriceStatisticsAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/md/IMarketDataListener.h" #include "sparkd/md/coinbase/CoinbasePriceStatistics.h" diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h index abac72b2f..53fda003d 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatisticsAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" #include diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index b8562d3ef..c8400ca1c 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -1,8 +1,8 @@ #include "CoinbaseSecurityRequestor.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" @@ -24,12 +24,12 @@ namespace bts::md::coinbase { -using api::domain::SecurityType; -using api::domain::Venue; -using api::domain::Venue_Name; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::SecurityType; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::persistence::IDGenerator; using std::string; using std::unordered_set; @@ -40,7 +40,7 @@ using std::vector; #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_COINBASE #define COINBASE_MSG_TYPE_NAME(x) \ std::string { CoinbaseMessageType{x}.name() } -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x static ccapi::Request exchange_info_req() { auto corr_id = CCApiCorrelationID::from_parts(VENUE_NAME); diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp index 1ecac7412..d297f3405 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.cpp @@ -1,7 +1,7 @@ #include "CoinbaseSpot.h" -#include "spark/api/domain/Currency.pb.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Security.h" +#include "domain/protobufs/currency.pb.h" +#include "domain/quantity.h" +#include "domain/security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" @@ -12,16 +12,17 @@ namespace bts::md::coinbase { -using bts::api::domain::Venue; using bts::domain::Quantity; using bts::domain::Security; using bts::domain::SpotSecurity; +using bts::domain::protobufs::Venue; using bts::io::JsonReader; using std::string; using std::stringstream; using std::vector; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define CURRENCY(x) bts::domain::protobufs::Currency::##x void CoinbaseSpot::parse( const ccapi::Message &msg, vector &securities, Venue venue) { @@ -43,8 +44,8 @@ void CoinbaseSpot::parse( jr.read("QUANTITY_INCREMENT", scomm.min_quantity_increment); jr.read("QUANTITY_INCREMENT", scomm.min_quantity); scomm.currency = sec_props.at("QUOTE_ASSET") == "BTC" - ? api::domain::Currency::BTC - : api::domain::Currency::USD; + ? bts::domain::protobufs::Currency::BTC + : bts::domain::protobufs::Currency::USD; sec.security.emplace(); LOG(md, Info, "sec el {}", sec.to_string(true)); } diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h index 8ef117f65..45c9884a9 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSpot.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" #include #include @@ -38,7 +38,7 @@ class CoinbaseSpot { static void parse( const ccapi::Message &msg, std::vector &securities, - api::domain::Venue venue = api::domain::Venue::VENUE_COINBASE); + domain::protobufs::Venue venue = domain::protobufs::VENUE_COINBASE); }; std::ostream &operator<<(std::ostream &out, const CoinbaseSpot &spot) noexcept; diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp index 6b474c6e3..862d1fe08 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp @@ -1,7 +1,7 @@ #include "CoinbaseSubscription.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/CoinbaseMarketDataConfig.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/QueryParams.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp index 731c02079..7fe5bf43e 100644 --- a/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.cpp @@ -1,13 +1,12 @@ #include "DatabentoDataHandler.h" #include "databento/datetime.hpp" #include "databento/timeseries.hpp" -#include "spark/api/domain/Venue.pb.h" +#include "domain/book.h" +#include "domain/quantity.h" +#include "domain/security.h" +#include "domain/security_id.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" -#include "spark/domain/Book.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/TimeStamp.h" @@ -22,6 +21,8 @@ namespace bts::md::DatabentoHandler { +using bts::domain::protobufs::Venue; + std::string remove_spaces(const std::string_view &str) { std::string result; result.reserve(str.size()); // Reserve space for better performance @@ -37,7 +38,7 @@ void DatabentoDatahandler::run( bool use_file, std::shared_ptr listener, std::shared_ptr sec_id_store, - bts::api::domain::Venue venue, + Venue venue, const std::string &securities_path, const std::string &books_path, const std::chrono::duration sleep_duration) { @@ -52,10 +53,10 @@ void DatabentoDatahandler::run( std::string symbol; switch (venue) { - case api::domain::Venue::VENUE_CBOE: + case Venue::VENUE_CBOE: symbol = id.substr(0, 3); break; - case api::domain::Venue::VENUE_GLBX: + case Venue::VENUE_GLBX: if (id.length() > 5) return databento::KeepGoing::Continue; symbol = id.substr(0, 2); diff --git a/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h index 1f558c9ed..e61179157 100644 --- a/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h +++ b/src/app_sparkd/sparkd/md/databento/DatabentoDataHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" #include #include @@ -22,7 +22,7 @@ class DatabentoDatahandler { bool use_file, std::shared_ptr listener, std::shared_ptr sec_id_store, - api::domain::Venue venue, + domain::protobufs::Venue venue, const std::string &securities_path, const std::string &books_path, const std::chrono::duration sleep_duration = diff --git a/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp index d5120753d..d27acdd0d 100644 --- a/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.cpp @@ -1,5 +1,4 @@ #include "DatabentoMarketDataProvider.h" -#include "spark/api/domain/Venue.pb.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/IMarketDataSource.h" @@ -11,8 +10,8 @@ namespace bts::md { -using bts::api::domain::Venue; using bts::api::md::MarketDataConfig; +using bts::domain::protobufs::Venue; using bts::persistence::IDGenerator; using std::pair; using std::shared_ptr; diff --git a/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h index 793e90711..31dffc006 100644 --- a/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/databento/DatabentoMarketDataProvider.h @@ -22,7 +22,7 @@ class DatabentoMarketDataProvider : public IMarketDataProvider { ~DatabentoMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp index 781f0aae8..b05f8e4fe 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.cpp @@ -1,9 +1,10 @@ #include "DeribitDepthAdaptor.h" -#include "spark/domain/Book.h" -#include "spark/domain/BookLevelComp.h" -#include "spark/domain/SecurityID.h" +#include "domain/book.h" +#include "domain/book_level_comp.h" +#include "domain/security_id.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" +#include "spark/utils/bts_assert.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h index 0ba1dabcc..d56f9bb1e 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitDepthAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h index 7480438d5..a8dbf2e19 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentKind.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/protobufs/security_type.pb.h" #include "spark/algorithm/StringCaseConverter.h" -#include "spark/api/domain/SecurityType.pb.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" @@ -43,7 +43,7 @@ class DeribitInstrumentKind { bts::api::SecurityType type); static constexpr DeribitInstrumentKind from_security_type( - bts::api::domain::SecurityType type); + domain::protobufs::SecurityType type); static constexpr DeribitInstrumentKind ALL(); @@ -82,15 +82,15 @@ constexpr DeribitInstrumentKind DeribitInstrumentKind::from_security_type( } constexpr DeribitInstrumentKind DeribitInstrumentKind::from_security_type( - bts::api::domain::SecurityType type) { + domain::protobufs::SecurityType type) { switch (type) { - case api::domain::SECURITY_TYPE_SPOT: + case domain::protobufs::SECURITY_TYPE_SPOT: return DeribitInstrumentKind::SPOT; - case api::domain::SECURITY_TYPE_OPTION: + case domain::protobufs::SECURITY_TYPE_OPTION: return DeribitInstrumentKind::OPTION; - case api::domain::SECURITY_TYPE_FUTURE: + case domain::protobufs::SECURITY_TYPE_FUTURE: return DeribitInstrumentKind::FUTURE; - case api::domain::SECURITY_TYPE_SPREAD: { + case domain::protobufs::SECURITY_TYPE_SPREAD: { return FUTURE_COMBO | OPTION_COMBO; } default: diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h index 617621b7e..ff4bed44a 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentRequest.h @@ -1,9 +1,9 @@ #pragma once +#include "domain/security_criteria.h" +#include "domain/security_criteria_clause.h" #include "spark/core/FMT.h" #include "spark/core/FMT_IMPL.h" -#include "spark/domain/SecurityCriteria.h" -#include "spark/domain/SecurityCriteriaClause.h" #include "sparkd/md/deribit/DeribitInstrumentKind.h" #include "system/collections/contains.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp index 7a610c44e..c79ed85cf 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.cpp @@ -1,6 +1,6 @@ #include "DeribitInstrumentStore.h" -#include "spark/api/domain/SecurityType.h" -#include "spark/domain/Security.h" +#include "domain/protobufs/security_type.h" +#include "domain/security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" @@ -18,7 +18,6 @@ namespace bts::md::deribit { -using bts::api::domain::CallPut; using bts::domain::FutureSecurity; using bts::domain::OptionSecurity; using bts::domain::Price; @@ -28,6 +27,7 @@ using bts::domain::SecurityID; using bts::domain::Side; using bts::domain::SpotSecurity; using bts::domain::SpreadSecurity; +using bts::domain::protobufs::CallPut; using bts::persistence::IDGenerator; using nlohmann::json; using std::function; @@ -42,9 +42,9 @@ using std::vector; #define _WARN(...) _LOG(Warn, __VA_ARGS__) #define _ERROR(...) _LOG(Error, __VA_ARGS__) -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x -#define SEC_TYPE_NAME(x) bts::api::domain::SecurityType_Name(x) -#define VENUE bts::api::domain::VENUE_DERIBIT +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define SEC_TYPE_NAME(x) bts::domain::protobufs::SecurityType_Name(x) +#define VENUE bts::domain::protobufs::VENUE_DERIBIT static void instrument_to_sec(const DeribitInstrument &di, Security &sec) { auto &scomm = sec.security_common; diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h index 44cf5956e..6129ab5f2 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitInstrumentStore.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" +#include "domain/security.h" +#include "domain/security_id.h" #include "spark/persistence/IDGenerator.h" #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp index 820358c51..6353e9863 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSecurityRequestor.cpp @@ -56,10 +56,10 @@ */ #include "DeribitSecurityRequestor.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/io/websocket/JsonRpcError.h" #include "spark/io/websocket/JsonRpcHandler.h" #include "spark/io/websocket/JsonRpcRequest.h" @@ -105,12 +105,12 @@ using std::string; using std::unordered_set; using std::vector; -#define VENUE bts::api::domain::VENUE_DERIBIT -#define VENUE_NAME (bts::api::domain::Venue_Name(VENUE)) +#define VENUE bts::domain::protobufs::VENUE_DERIBIT +#define VENUE_NAME (bts::domain::protobufs::Venue_Name(VENUE)) #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_DERIBIT #define DERIBIT_MSG_TYPE_NAME(x) \ std::string { DeribitMessageType{DeribitMessageType::x}.name() } -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x #define CORR_ID(msg_type, ...) \ CCApiCorrelationID::from_parts( \ diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index d2416396e..8231f041f 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -1,10 +1,10 @@ #include "DeribitSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/DeribitMarketDataConfig.pb.h" #include "spark/core/FMT.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/domain_model/Security.pb.h" #include "spark/io/ProtoPrinter.h" #include "spark/io/websocket/JsonRpcError.h" @@ -60,9 +60,9 @@ using std::unordered_set; using std::vector; #define VENUE_NAME \ - (bts::api::domain::Venue_Name(bts::api::domain::VENUE_DERIBIT)) + (bts::domain::protobufs::Venue_Name(bts::domain::protobufs::VENUE_DERIBIT)) #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_DERIBIT -#define SEC_TYPE(t) bts::api::domain::SECURITY_TYPE_##t +#define SEC_TYPE(t) bts::domain::protobufs::SECURITY_TYPE_##t #define _ASSERT_MSGF(condition, ...) \ bts_assert_msgf(condition, "DeribitSubscription::" __VA_ARGS__) diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp index e083b7d56..14cd11e60 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.cpp @@ -1,5 +1,5 @@ #include "DeribitTickerAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h index 1acca7594..0a1bc4b06 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTickerAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp index 5d88c1f23..868baf2f3 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.cpp @@ -1,7 +1,7 @@ #include "DeribitTradeAdaptor.h" +#include "domain/aggressor_side.h" +#include "domain/security_id.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/AggressorSide.h" -#include "spark/domain/SecurityID.h" #include "spark/domain/TradeRecord.h" #include "spark/md/IMarketDataListener.h" #include "spark/utils/bts_fatal.h" diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h index 13b079c04..fddf3b7bf 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/deribit/DeribitTradeAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp index 8645340b5..4005ef028 100644 --- a/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.cpp @@ -17,7 +17,8 @@ using std::vector; struct EmumbaMarketDataProvider::PImpl { MarketDataConfig config; - vector>> deribit_subs; + vector>> + deribit_subs; PImpl(MarketDataConfig config) : config(std::move(config)) {} }; @@ -27,11 +28,11 @@ EmumbaMarketDataProvider::EmumbaMarketDataProvider(MarketDataConfig config) EmumbaMarketDataProvider::~EmumbaMarketDataProvider() = default; -vector>> +vector>> EmumbaMarketDataProvider::get_sources() { for (const auto &cfg : me_->config.emumba_deribit()) { me_->deribit_subs.push_back( - {api::domain::VENUE_DERIBIT, + {domain::protobufs::VENUE_DERIBIT, std::make_shared(cfg)}); } return me_->deribit_subs; diff --git a/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h index ddd60370b..1c4e816a4 100644 --- a/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/emumba/EmumbaMarketDataProvider.h @@ -14,7 +14,7 @@ class EmumbaMarketDataProvider : public IMarketDataProvider { ~EmumbaMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp index a6372c451..2b0db716c 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXFuture.cpp @@ -1,9 +1,9 @@ #include "FTXFuture.h" -#include "spark/api/domain/Currency.pb.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/future_security.h" +#include "domain/protobufs/currency.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" #include "spark/core/TableFormatter.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/Security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" @@ -15,16 +15,16 @@ namespace bts::md::ftx { -using bts::api::domain::Currency; using bts::core::TableFormatter; using bts::domain::FutureSecurity; using bts::domain::Security; +using bts::domain::protobufs::Currency; using bts::io::JsonReader; using std::string; using std::stringstream; using std::vector; -#define VENUE bts::api::domain::VENUE_FTX +#define VENUE bts::domain::protobufs::VENUE_FTX static std::string deduce_sym_from_name(const std::string &name) { std::regex word_regex("(\\w+)"); diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h index 553c15b4c..fbdc72baf 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "sparkd/md/ccapi/ICCApiMessageHandler.h" namespace bts::md { diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h index 7dcf3e8ed..629a7c455 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.h @@ -1,7 +1,7 @@ #pragma once +#include "domain/security_id.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/SecurityID.h" #include diff --git a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp index 48ec4374b..a643c74e9 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXMarket.cpp @@ -1,8 +1,8 @@ #include "FTXMarket.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" #include "spark/core/NaN.h" #include "spark/core/TableFormatter.h" -#include "spark/domain/Security.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/utils/bts_fatal.h" @@ -16,12 +16,12 @@ namespace bts::md::ftx { -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x -using bts::api::domain::Venue; using bts::core::NaN; using bts::core::TableFormatter; using bts::domain::Security; +using bts::domain::protobufs::Venue; using bts::io::JsonReader; using std::ostream; using std::string; @@ -103,8 +103,8 @@ void FTXMarket::parse(const ccapi::Message &msg, vector &securities) { case SEC_TYPE(SYNTHETIC): BTS_FATAL_MSG("Synthetics not supported"); break; - case api::domain::SecurityType_INT_MIN_SENTINEL_DO_NOT_USE_: - case api::domain::SecurityType_INT_MAX_SENTINEL_DO_NOT_USE_: + case domain::protobufs::SecurityType_INT_MIN_SENTINEL_DO_NOT_USE_: + case domain::protobufs::SecurityType_INT_MAX_SENTINEL_DO_NOT_USE_: break; } diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index d50e83a0f..ca1bba1c6 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -1,8 +1,8 @@ #include "FTXSecurityRequestor.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" @@ -26,17 +26,17 @@ namespace bts::md::ftx { -using api::domain::SecurityType; -using api::domain::Venue; -using api::domain::Venue_Name; using bts::domain::Security; using bts::domain::SecurityID; +using bts::domain::protobufs::SecurityType; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using std::string; using std::unordered_set; using std::vector; #define VENUE_NAME (Venue_Name(Venue::VENUE_FTX)) -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x #define FTX_MSG_TYPE_NAME(x) \ std::string { FTXMessageType{x}.name() } diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h index e60394671..c8e7ddbc6 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityType.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/api/domain/SecurityType.pb.h" +#include "domain/protobufs/security_type.pb.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" @@ -33,7 +33,7 @@ class FTXSecurityType { ENUM_BASIC_MEMBERS(FTXSecurityType) - constexpr api::domain::SecurityType to_security_type() const; + constexpr domain::protobufs::SecurityType to_security_type() const; }; ////////////////////////////////////////////////// @@ -46,18 +46,19 @@ ENUM_PARSE_DEF(FTXSecurityType, FOR_ALL_VALUES) ENUM_FROM_JSON(FTXSecurityType) ENUM_EQUALITY_OPS(FTXSecurityType) -constexpr api::domain::SecurityType FTXSecurityType::to_security_type() const { +constexpr domain::protobufs::SecurityType +FTXSecurityType::to_security_type() const { switch (value) { case SPOT: - return api::domain::SECURITY_TYPE_SPOT; + return domain::protobufs::SECURITY_TYPE_SPOT; case FUTURE: case PERPETUAL: case PREDICTION: case MOVE: - return api::domain::SECURITY_TYPE_FUTURE; + return domain::protobufs::SECURITY_TYPE_FUTURE; case NONE: default: - return api::domain::SECURITY_TYPE_UNSPECIFIED; + return domain::protobufs::SECURITY_TYPE_UNSPECIFIED; } } diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp index b955dab7c..7812c63c9 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSubscription.cpp @@ -1,8 +1,8 @@ #include "FTXSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/FTXMarketDataConfig.pb.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" @@ -28,12 +28,12 @@ namespace bts::md::ftx { -using bts::api::domain::Venue; -using bts::api::domain::Venue_Name; using bts::api::md::FTXMarketDataConfig; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using bts::io::ProtoPrinter; using bts::persistence::IDGenerator; using std::shared_ptr; diff --git a/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp index 2c5e63d96..ddf56f52e 100644 --- a/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/glbx/GlbxMarketDataHandler.cpp @@ -1,5 +1,5 @@ #include "GlbxMarketDataHandler.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" #include "sparkd/md/databento/DatabentoDataHandler.h" @@ -13,17 +13,18 @@ namespace bts::md::glbx { +using bts::domain::protobufs::Venue; + void GlbxMarketDatahandler::run( bool use_file, std::shared_ptr listner, std::shared_ptr sec_id_store) { std::string contratcs_file_name = "/glbx-mdp3-20240815.definition.dbn.zst"; std::string bbo_file_name = "/glbx-mdp3-20240815.mbp-1.dbn.zst"; - static const api::domain::Venue venue = api::domain::VENUE_GLBX; std::string base_path = config::get().data_path(); DatabentoHandler::DatabentoDatahandler::run( - use_file, listner, sec_id_store, venue, base_path + contratcs_file_name, - base_path + bbo_file_name); + use_file, listner, sec_id_store, Venue::VENUE_GLBX, + base_path + contratcs_file_name, base_path + bbo_file_name); } } // namespace bts::md::glbx diff --git a/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp index 577bedc40..314d37b05 100644 --- a/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/glbx/OnixsGlbxSubscription.cpp @@ -53,7 +53,7 @@ struct OnixsGlbxSubscription::PImpl { return; } const auto symbols = SymbolLoader::load( - SecurityCriteria::create({api::domain::VENUE_GLBX})); + SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); if (symbols.empty()) { LOG(md, Info, "OnixsGlbxSubscription aborting. No symbols loaded"); return; @@ -66,7 +66,7 @@ struct OnixsGlbxSubscription::PImpl { vector> platforms; auto main = shared_ptr(); main->start({symbols.begin(), symbols.end()}, nullptr, nullptr); - platforms.emplace_back(std::move(main)); + platforms.push_back(std::move(main)); dispatcher = &utils::Dispatcher::current(); heartbeat_timer.emplace(*dispatcher, 250, [&]() { for (auto &p : platforms) { @@ -108,9 +108,30 @@ OnixsGlbxSubscription::~OnixsGlbxSubscription() = default; void OnixsGlbxSubscription::start( shared_ptr /*listener*/) { - std::atomic_thread_fence(std::memory_order_release); - bts_assert(!me_->dispatcher_thread.joinable()); - me_->dispatcher_thread = std::thread{[&]() { me_->run(); }}; + LOG(md, Info, + "OnixsGlbxSubscription::start t_id: {}; t_name: {}; config: {}", + os::get_thread_id(), os::get_thread_name(), me_->config.DebugString()); + bts::md::MBOWriter *mbo = nullptr; + bts::md::TradeSummarySignalDispatcher *tssd = nullptr; + std::vector> platforms; + // get all glbx symbols + auto cme_symbols = SymbolLoader::load( + bts::domain::SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); + if (!cme_symbols.empty()) { + auto *main = new bts::md::MDP3Main(); + main->start({cme_symbols.begin(), cme_symbols.end()}, mbo, tssd); + platforms.emplace_back(main); + } + // Timers + auto &disp = utils::Dispatcher::current(); + utils::DispatcherTimer heartbeat_timer(disp, 250, [&]() { + for (auto &p : platforms) { + p->send_heartbeats(); + } + }); + heartbeat_timer.start(); + + disp.run(); } void OnixsGlbxSubscription::stop() { me_->stop(); } diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp index 59def83f1..42233e268 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp @@ -1,5 +1,5 @@ #include "OkxChannelDemuxer.h" -#include "spark/api/domain/Venue.h" +#include "domain/protobufs/venue.h" #include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiReader.h" @@ -13,7 +13,7 @@ namespace bts::md::okx { #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_OKX -#define VENUE_NAME bts::api::domain::Venue_Name(bts::api::domain::VENUE_OKX) +#define VENUE_NAME bts::domain::Venue_Name(bts::domain::VENUE_OKX) #define _ASSERT_MSGF(condition, ...) \ bts_assert_msgf(condition, "OkxChannelDemuxer::" __VA_ARGS__) @@ -143,8 +143,9 @@ OkxChannelDemuxer::Callback &OkxChannelDemuxer::add_handler( return it->second.callback; } -OkxChannelDemuxer::Callback &OkxChannelDemuxer::operator[](const OkxChannel &channel) { - return me_->handlers[channel].callback; +OkxChannelDemuxer::Callback &OkxChannelDemuxer::operator[]( + const OkxChannel &channel) { + return me_->handlers[channel].callback; } void OkxChannelDemuxer::remove_handler(const OkxChannel &channel) { diff --git a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp index 9ea5d4ce0..dfe4857ca 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.cpp @@ -1,7 +1,7 @@ #include "OkxDepthAdaptor.h" -#include "spark/domain/Book.h" -#include "spark/domain/BookLevelComp.h" -#include "spark/domain/SecurityID.h" +#include "domain/book.h" +#include "domain/book_level_comp.h" +#include "domain/security_id.h" #include "spark/io/JsonReader.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h index 526db41a0..fc47c9fef 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxDepthAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp index 69a3ea38f..35f0d3e97 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.cpp @@ -1,6 +1,6 @@ #include "OkxInstrumentStore.h" -#include "spark/domain/Security.h" -#include "spark/api/domain/SecurityType.h" +#include "domain/protobufs/security_type.h" +#include "domain/security.h" #include "spark/logging/logging.h" #include "spark/persistence/IDGenerator.h" #include "spark/utils/bts_fatal.h" @@ -13,7 +13,6 @@ namespace bts::md::okx { -using bts::api::domain::CallPut; using bts::domain::FutureSecurity; using bts::domain::OptionSecurity; using bts::domain::Price; @@ -21,6 +20,7 @@ using bts::domain::Quantity; using bts::domain::Security; using bts::domain::SecurityID; using bts::domain::SpotSecurity; +using bts::domain::protobufs::CallPut; using bts::persistence::IDGenerator; using nlohmann::json; using std::function; @@ -28,8 +28,8 @@ using std::string; using std::unordered_map; using std::vector; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x -#define VENUE bts::api::domain::VENUE_OKX +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define VENUE bts::domain::protobufs::VENUE_OKX static void instrument_to_sec(const OkxInstrument &oi, Security &sec) { auto &scomm = sec.security_common; diff --git a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h index 8ed02c19d..f7ed7c897 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h +++ b/src/app_sparkd/sparkd/md/okx/OkxInstrumentStore.h @@ -1,7 +1,7 @@ #pragma once -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" +#include "domain/security.h" +#include "domain/security_id.h" #include "spark/persistence/IDGenerator.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index 080fa9191..a149fca1d 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -1,5 +1,5 @@ #include "OkxSecuritySubscription.h" -#include "spark/domain/SecurityCriteria.h" +#include "domain/security_criteria.h" #include "spark/io/JsonReader.h" #include "sparkd/md/ccapi/CCApiCorrelationID.h" #include "sparkd/md/ccapi/CCApiHttpParams.h" @@ -28,9 +28,12 @@ namespace bts::md::okx { -#define VENUE bts::api::domain::VENUE_OKX +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define VENUE bts::domain::protobufs::VENUE_OKX #define VENUE_NAME \ - std::string { bts::api::domain::Venue_Name(bts::api::domain::VENUE_OKX) } + std::string { \ + bts::domain::protobufs::Venue_Name(bts::domain::protobufs::VENUE_OKX) \ + } #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_OKX #define OKX_MSG_TYPE(x) \ OkxMessageType { OkxMessageType::x } @@ -52,13 +55,13 @@ using std::unordered_set; using std::vector; static std::optional to_okx_type( - api::domain::SecurityType type) { + domain::protobufs::SecurityType type) { switch (type) { - case api::domain::SecurityType::SECURITY_TYPE_FUTURE: + case SEC_TYPE(FUTURE): return OkxInstrumentType::FUTURES; - case api::domain::SECURITY_TYPE_SPOT: + case SEC_TYPE(SPOT): return OkxInstrumentType::SPOT; - case api::domain::SECURITY_TYPE_OPTION: + case SEC_TYPE(OPTION): return OkxInstrumentType::OPTION; default: return {}; diff --git a/src/app_sparkd/sparkd/md/okx/OkxSide.h b/src/app_sparkd/sparkd/md/okx/OkxSide.h index 59e894ae3..2443fb7bb 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSide.h +++ b/src/app_sparkd/sparkd/md/okx/OkxSide.h @@ -1,9 +1,9 @@ #pragma once +#include "domain/aggressor_side.h" +#include "domain/side.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" -#include "spark/domain/AggressorSide.h" -#include "spark/domain/Side.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp index 4800db6c6..8964d7baa 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSubscription.cpp @@ -1,9 +1,9 @@ #include "OkxSubscription.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_criteria.h" #include "spark/api/md/OkxMarketDataConfig.pb.h" #include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/io/ProtoPrinter.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" @@ -61,9 +61,10 @@ using std::vector; #define _WARN(...) _LOG(Warn, __VA_ARGS__) #define _ERROR(...) _LOG(Error, __VA_ARGS__) -#define VENUE_NAME (bts::api::domain::Venue_Name(bts::api::domain::VENUE_OKX)) +#define VENUE_NAME \ + (bts::domain::protobufs::Venue_Name(bts::domain::protobufs::VENUE_OKX)) #define CCAPI_VENUE_NAME CCAPI_EXCHANGE_NAME_OKX -#define SEC_TYPE(t) bts::api::domain::SECURITY_TYPE_##t +#define SEC_TYPE(t) bts::domain::protobufs::SECURITY_TYPE_##t /** * @brief Applies overrides from our config to a ccapi::SessionConfigs object diff --git a/src/app_sparkd/sparkd/md/okx/OkxTicker.h b/src/app_sparkd/sparkd/md/okx/OkxTicker.h index 581d2af78..d1bdfe82b 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTicker.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTicker.h @@ -1,8 +1,8 @@ #pragma once +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "sparkd/md/okx/OkxInstrumentType.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp index 7fd3dc318..660c33416 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.cpp @@ -1,6 +1,6 @@ #include "OkxTickerAdaptor.h" -#include "spark/domain/Price.h" -#include "spark/domain/SecurityID.h" +#include "domain/price.h" +#include "domain/security_id.h" #include "spark/domain/SecurityMarketDataStatistics.h" #include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" @@ -27,7 +27,7 @@ using std::vector; #define _WARN(...) _LOG(Warn, __VA_ARGS__) #define _ERROR(...) _LOG(Error, __VA_ARGS__) -#define VENUE bts::api::domain::VENUE_OKX +#define VENUE bts::domain::VENUE_OKX struct OkxTickerAdaptor::PImpl { SecurityID sec_id; diff --git a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h index 22896213c..c51df9246 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTickerAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTrade.h b/src/app_sparkd/sparkd/md/okx/OkxTrade.h index 52cd11881..abb94f833 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTrade.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTrade.h @@ -1,8 +1,8 @@ #pragma once +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" #include "sparkd/md/okx/OkxSide.h" #include diff --git a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp index 895e5db08..5c25c8083 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.cpp @@ -1,5 +1,5 @@ #include "OkxTradeAdaptor.h" -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include "spark/domain/TradeRecord.h" #include "spark/io/JsonReader.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h index ca334759d..77625233b 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h +++ b/src/app_sparkd/sparkd/md/okx/OkxTradeAdaptor.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/SecurityID.h" +#include "domain/security_id.h" #include #include diff --git a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp index 35047bae4..251a949aa 100644 --- a/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp +++ b/src/app_sparkd/sparkd/md/recording/MDReplayer.cpp @@ -1,13 +1,14 @@ #include "MDReplayer.h" +#include "domain/book.h" +#include "domain/price.h" +#include "domain/quantity.h" +#include "domain/security.h" +#include "domain/security_common.h" +#include "domain/security_id.h" +#include "domain/side.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/Book.h" -#include "spark/domain/Price.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCommon.h" -#include "spark/domain/SecurityID.h" +#include "spark/domain/DomainSecurityUtils.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/domain/Side.h" #include "spark/domain/TradeRecord.h" #include "spark/domain_model/Security.pb.h" #include "spark/logging/logging.h" @@ -129,7 +130,8 @@ void MDReplayer::_replay_message(const bts::co2::RecordedMDMessage &m) { case (co2::RecordedMDMessage::MDRecordCase::kSecurity): { LOG(md, Diag, "MDReplayer::_replay_message m: {}", utils::pb::to_string(m)); - bts::domain::Security new_sec = m.security(); + bts::domain::Security new_sec = + domain::DomainSecurityUtils::convert(m.security()); me->sec_keys.insert(m.security().id()); std::vector sec_vec = {}; sec_vec.push_back(&new_sec); diff --git a/src/app_sparkd/sparkd/md/taifex/TaifexDataHandler.cpp b/src/app_sparkd/sparkd/md/taifex/TaifexDataHandler.cpp index ac3032d46..5cb897a8a 100644 --- a/src/app_sparkd/sparkd/md/taifex/TaifexDataHandler.cpp +++ b/src/app_sparkd/sparkd/md/taifex/TaifexDataHandler.cpp @@ -1,10 +1,9 @@ #include "TaifexDataHandler.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/price.h" +#include "domain/security.h" +#include "domain/security_id.h" #include "spark/config/config.h" #include "spark/config/protos/system_config.pb.h" -#include "spark/domain/Price.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" @@ -29,6 +28,8 @@ namespace bts::md::taifex { +using bts::domain::protobufs::Venue; + class SecurityDetailsMapper { struct security_details { double min_increment; @@ -1204,7 +1205,7 @@ bool readBinaryFile( const auto id = remove_spaces(i010_message.prod_id); const auto symbol = id.substr(0, 2); bts::domain::SecurityID sec_id{ - sec_id_store->get_or_add(api::domain::VENUE_TAIFEX, id)}; + sec_id_store->get_or_add(Venue::VENUE_TAIFEX, id)}; security_details->add_i010_mapping( id, sec_id, i010_message.decimal_locator); // std::ostringstream oss; @@ -1214,7 +1215,7 @@ bool readBinaryFile( // LOG(md,Error," map has {}", security_details->to_string()); std::vector complete_security_list; bts::domain::Security &sec = complete_security_list.emplace_back(); - sec.security_common.venue = bts::api::domain::VENUE_TAIFEX; + sec.security_common.venue = Venue::VENUE_TAIFEX; sec.security_common.id = sec_id; sec.security_common.exchange_sec_id = id; // Need to fix this sec.security_common.desc = id; diff --git a/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp index 71988eb40..34dee92b1 100644 --- a/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp +++ b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.cpp @@ -1,5 +1,4 @@ #include "TaifexMarketDataProvider.h" -#include "spark/api/domain/Venue.pb.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/persistence/IDGenerator.h" #include "sparkd/md/taifex/TaifexSubscription.h" @@ -9,8 +8,8 @@ namespace bts::md { -using bts::api::domain::Venue; using bts::api::md::MarketDataConfig; +using bts::domain::protobufs::Venue; using bts::persistence::IDGenerator; using std::pair; using std::shared_ptr; diff --git a/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h index a78352305..f0775684d 100644 --- a/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h +++ b/src/app_sparkd/sparkd/md/taifex/TaifexMarketDataProvider.h @@ -22,7 +22,7 @@ class TaifexMarketDataProvider : public IMarketDataProvider { ~TaifexMarketDataProvider(); std::vector< - std::pair>> + std::pair>> get_sources() override; private: diff --git a/src/client/spark_api/spark_api.csproj b/src/client/spark_api/spark_api.csproj index 4bffea835..679829b73 100644 --- a/src/client/spark_api/spark_api.csproj +++ b/src/client/spark_api/spark_api.csproj @@ -50,45 +50,45 @@ $(ProtoOutputPath)/lib/api - - - $(ProtoOutputPath)/lib/api/domain + + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain - - $(ProtoOutputPath)/lib/api/domain + + $(ProtoOutputPath)/domain diff --git a/src/lib_domain/CMakeLists.txt b/src/lib_domain/CMakeLists.txt new file mode 100644 index 000000000..1e295d1f8 --- /dev/null +++ b/src/lib_domain/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.23) +project(domain) +include(GNUInstallDirs) +include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) + +# Sources +file( + GLOB_RECURSE ${PROJECT_NAME}_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.cpp +) + +# Proto sources +file( + GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.proto +) + +update_deps_file("${${PROJECT_NAME}_PROTO_SOURCES};") + +# Generate proto cpp +message(STATUS "Generating proto cpp") +protobuf_generate_cpp( + CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SOURCES + CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_HEADERS + CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} + PROTO_INCLUDE_DIRS + ${EXTERNALS_INCLUDE} + ${CMAKE_CURRENT_SOURCE_DIR} + PROTO_SOURCES + ${${PROJECT_NAME}_PROTO_SOURCES} +) + +add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_CXX_PROTO_SOURCES} ${${PROJECT_NAME}_SOURCES}) + +target_include_directories( + ${PROJECT_NAME} PUBLIC + $ + $ + $ +) + +target_link_directories( + ${PROJECT_NAME} PUBLIC + $ + $ +) +target_link_libraries(${PROJECT_NAME} PUBLIC + system + protobuf +) + +foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_HEADERS}) + file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) + install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) +endforeach() +include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) +install_basic() diff --git a/src/lib_domain/Config.cmake.in b/src/lib_domain/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/lib_domain/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) diff --git a/src/lib_spark/spark/domain/BUY_SELL.h b/src/lib_domain/domain/BUY_SELL.h similarity index 73% rename from src/lib_spark/spark/domain/BUY_SELL.h rename to src/lib_domain/domain/BUY_SELL.h index 6e7f77469..8d8e6e922 100644 --- a/src/lib_spark/spark/domain/BUY_SELL.h +++ b/src/lib_domain/domain/BUY_SELL.h @@ -1,5 +1,6 @@ #pragma once -#include "spark/domain/Side.h" + +#include "domain/side.h" #define BUY bts::domain::Side::Buy #define SELL bts::domain::Side::Sell diff --git a/src/lib_spark/spark/domain/AccountID.h b/src/lib_domain/domain/account_id.h similarity index 100% rename from src/lib_spark/spark/domain/AccountID.h rename to src/lib_domain/domain/account_id.h diff --git a/src/lib_spark/spark/domain/AggressorSide.h b/src/lib_domain/domain/aggressor_side.h similarity index 86% rename from src/lib_spark/spark/domain/AggressorSide.h rename to src/lib_domain/domain/aggressor_side.h index 2705ba142..b3b9d5747 100644 --- a/src/lib_spark/spark/domain/AggressorSide.h +++ b/src/lib_domain/domain/aggressor_side.h @@ -1,9 +1,10 @@ #pragma once -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" + +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" + #include #include -#include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/Book.h b/src/lib_domain/domain/book.h similarity index 97% rename from src/lib_spark/spark/domain/Book.h rename to src/lib_domain/domain/book.h index 16505b835..24cc73cb1 100644 --- a/src/lib_spark/spark/domain/Book.h +++ b/src/lib_domain/domain/book.h @@ -1,10 +1,9 @@ #pragma once -#include "BookLevel.h" -#include "BookLevelComp.h" -#include "BookSide.h" -#include "SecurityID.h" -#include "Side.h" -#include "spark/io/JsonReader.h" + +#include "domain/book_side.h" +#include "domain/security_id.h" +#include "domain/side.h" +#include "system/json/json_reader.h" #include #include @@ -245,8 +244,10 @@ void from_json(const nlohmann::json &j, BookT &book) { bool success = jr.read("sid", book.security_id()) && jr.read("bids", book.bids()) && jr.read("asks", book.asks()); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to Book:\n{}", j_str); +#endif } } diff --git a/src/lib_spark/spark/domain/BookLevel.h b/src/lib_domain/domain/book_level.h similarity index 93% rename from src/lib_spark/spark/domain/BookLevel.h rename to src/lib_domain/domain/book_level.h index 91936ed0a..fce96f1b6 100644 --- a/src/lib_spark/spark/domain/BookLevel.h +++ b/src/lib_domain/domain/book_level.h @@ -1,7 +1,9 @@ #pragma once -#include "Price.h" -#include "Quantity.h" -#include "spark/io/JsonReader.h" + +#include "domain/price.h" +#include "domain/quantity.h" +#include "system/json/json_reader.h" + #include #include @@ -55,10 +57,14 @@ inline void from_json(const nlohmann::json &j, BookLevel &bl) { jr.read("total_qty", bl.total_quantity) && jr.read("direct_qty", bl.direct_quantity) && jr.read("n_orders", bl.n_orders); +#ifdef LOG if (!success) { const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to BookLevel:\n{}", j_str); } +#else + (void)success; +#endif } inline void to_json(nlohmann::json &j, const BookLevel &bl) { diff --git a/src/lib_spark/spark/domain/BookLevelComp.h b/src/lib_domain/domain/book_level_comp.h similarity index 85% rename from src/lib_spark/spark/domain/BookLevelComp.h rename to src/lib_domain/domain/book_level_comp.h index 924d3d0c4..7f02add33 100644 --- a/src/lib_spark/spark/domain/BookLevelComp.h +++ b/src/lib_domain/domain/book_level_comp.h @@ -1,6 +1,7 @@ #pragma once -#include "BookLevel.h" -#include "Side.h" + +#include "domain/book_level.h" +#include "domain/side.h" namespace bts::domain { @@ -44,13 +45,11 @@ constexpr bool BookLevelComp::operator()( return lhs.is_better(side_, rhs.price); } -inline bool BookLevelComp::operator()( - const BookLevel &lhs, double rhs) const { +inline bool BookLevelComp::operator()(const BookLevel &lhs, double rhs) const { return operator()(lhs, Price::from_double(rhs)); } -inline bool BookLevelComp::operator()( - double lhs, const BookLevel &rhs) const { +inline bool BookLevelComp::operator()(double lhs, const BookLevel &rhs) const { return operator()(Price::from_double(lhs), rhs); } diff --git a/src/lib_spark/spark/domain/BookSide.h b/src/lib_domain/domain/book_side.h similarity index 97% rename from src/lib_spark/spark/domain/BookSide.h rename to src/lib_domain/domain/book_side.h index 6833e3d7a..a8b38372e 100644 --- a/src/lib_spark/spark/domain/BookSide.h +++ b/src/lib_domain/domain/book_side.h @@ -1,18 +1,22 @@ #pragma once -#include "BookLevel.h" -#include "BookLevelComp.h" -#include "BookSide_PopulatedIterator.h" -#include "PriceComp.h" -#include "SecurityID.h" -#include "Side.h" -#include "spark/io/JsonReader.h" + +#include "domain/book_level.h" +#include "domain/book_level_comp.h" +#include "domain/book_side_populated_iterator.h" +#include "domain/price_comp.h" +#include "domain/security_id.h" +#include "domain/side.h" +#include "system/json/json_reader.h" + #include #include +#include #include #include #include #include #include +#include #include namespace bts::domain { @@ -94,7 +98,7 @@ class BookSideT { [[nodiscard]] std::size_t count_populated() const noexcept; - bool trim_quantity_front(Quantity quantity) noexcept; + bool trim_quantity_front(Quantity quantity); // finds the target cummulative quantity and returns the price // level and the cummulative quantity at that level. the return @@ -328,11 +332,13 @@ inline Quantity BookSideT::depth_at_price(Side s, Price p) const { } template -inline bool BookSideT::trim_quantity_front(Quantity quantity) noexcept { +inline bool BookSideT::trim_quantity_front(Quantity quantity) { if (quantity == 0) { return true; } - bts_assert(quantity > 0); + if (quantity < 0) { + throw std::runtime_error{"trim_quantity_front called with quantity < 0"}; + } for (std::size_t i = 0; is_populated_at(i); i++) { if (_book[i].total_quantity <= quantity) { quantity -= _book[i].total_quantity; @@ -636,7 +642,9 @@ bool BookSideT::is_sorted(Side side, bool stop_on_first_empty_level) const { } } // Remember to increment 'i' - bts_assert(j > i); + if (j <= i) { + throw std::runtime_error{"Sort failed (invalid loop state)"}; + } i = j; } return true; @@ -714,10 +722,13 @@ void from_json(const nlohmann::json &j, BookSideT &bs) { io::JsonReader jr{&j}; bool success = jr.read(levels); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to BookSide:\n{}", j_str); +#endif return; } +#ifdef LOG if (levels.size() > BookSideT::max_depth()) { const auto j_str = j.dump(2); LOG(md, Warn, @@ -725,6 +736,7 @@ void from_json(const nlohmann::json &j, BookSideT &bs) { "levels will be truncated", levels.size(), BookSideT::max_depth(), j_str); } +#endif auto src = levels.begin(); auto dst = bs.begin(); while (dst != bs.end() && src != levels.end()) { diff --git a/src/lib_spark/spark/domain/BookSide_PopulatedIterator.h b/src/lib_domain/domain/book_side_populated_iterator.h similarity index 91% rename from src/lib_spark/spark/domain/BookSide_PopulatedIterator.h rename to src/lib_domain/domain/book_side_populated_iterator.h index b6cb42a4b..e7f13c649 100644 --- a/src/lib_spark/spark/domain/BookSide_PopulatedIterator.h +++ b/src/lib_domain/domain/book_side_populated_iterator.h @@ -1,5 +1,7 @@ #pragma once -#include "BookLevel.h" + +#include "domain/book_level.h" + #include #include @@ -53,14 +55,12 @@ class BookSide_PopulatedIterator { BookSide_PopulatedIterator operator-(int value); template - constexpr bool operator==( - const BookSide_PopulatedIterator &other) const - noexcept; + constexpr bool operator==(const BookSide_PopulatedIterator + &other) const noexcept; template - constexpr bool operator!=( - const BookSide_PopulatedIterator &other) const - noexcept; + constexpr bool operator!=(const BookSide_PopulatedIterator + &other) const noexcept; BookSide_PopulatedIterator &operator=( const BookSide_PopulatedIterator &) noexcept = default; @@ -104,25 +104,25 @@ BookSide_PopulatedIterator::end(source_type &source) noexcept { template typename BookSide_PopulatedIterator::reference - BookSide_PopulatedIterator::operator*() { +BookSide_PopulatedIterator::operator*() { return (*_source)[_cursor]; } template typename BookSide_PopulatedIterator::pointer - BookSide_PopulatedIterator::operator->() { +BookSide_PopulatedIterator::operator->() { return &(*_source)[_cursor]; } template typename BookSide_PopulatedIterator::const_reference - BookSide_PopulatedIterator::operator*() const { +BookSide_PopulatedIterator::operator*() const { return (*_source)[_cursor]; } template typename BookSide_PopulatedIterator::const_pointer - BookSide_PopulatedIterator::operator->() const { +BookSide_PopulatedIterator::operator->() const { return &(*_source)[_cursor]; } diff --git a/src/lib_spark/spark/domain/FutureSecurity.h b/src/lib_domain/domain/future_security.h similarity index 90% rename from src/lib_spark/spark/domain/FutureSecurity.h rename to src/lib_domain/domain/future_security.h index e26ad514c..920e66dd9 100644 --- a/src/lib_spark/spark/domain/FutureSecurity.h +++ b/src/lib_domain/domain/future_security.h @@ -1,6 +1,8 @@ #pragma once -#include "spark/core/TimeStamp.h" -#include "spark/io/JsonReader.h" + +#include "system/json/json_reader.h" +#include "system/time_stamp.h" + #include namespace bts::domain { @@ -21,8 +23,10 @@ inline void from_json(const nlohmann::json &j, FutureSecurity &fut) { io::JsonReader jr{&j}; bool success = jr.read("expiration", fut.expiration); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to FutureSecurity:\n{}", j_str); +#endif } } diff --git a/src/lib_spark/spark/domain/LegDefinition.h b/src/lib_domain/domain/leg_definition.h similarity index 89% rename from src/lib_spark/spark/domain/LegDefinition.h rename to src/lib_domain/domain/leg_definition.h index 94d4ef40f..a645a76ac 100644 --- a/src/lib_spark/spark/domain/LegDefinition.h +++ b/src/lib_domain/domain/leg_definition.h @@ -1,8 +1,10 @@ #pragma once -#include "Quantity.h" -#include "SecurityID.h" -#include "Side.h" -#include "spark/io/JsonReader.h" + +#include "domain/quantity.h" +#include "domain/security_id.h" +#include "domain/side.h" +#include "system/json/json_reader.h" + #include #include @@ -33,8 +35,10 @@ inline void from_json(const nlohmann::json &j, LegDefinition &leg) { std::abs(qty)); leg.side = Side::from_contract_flow(qty); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to LegDefinition:\n{}", j_str); +#endif } } diff --git a/src/lib_spark/spark/domain/OptionSecurity.h b/src/lib_domain/domain/option_security.h similarity index 83% rename from src/lib_spark/spark/domain/OptionSecurity.h rename to src/lib_domain/domain/option_security.h index 5477e2618..1fcc74bff 100644 --- a/src/lib_spark/spark/domain/OptionSecurity.h +++ b/src/lib_domain/domain/option_security.h @@ -1,8 +1,10 @@ #pragma once -#include "spark/api/domain/CallPut.h" -#include "spark/core/TimeStamp.h" -#include "spark/domain/Price.h" -#include "spark/io/JsonReader.h" + +#include "domain/price.h" +#include "domain/protobufs/call_put.pb.h" +#include "system/json/json_reader.h" +#include "system/time_stamp.h" + #include namespace bts::domain { @@ -11,7 +13,7 @@ class OptionSecurity { public: core::TimeStamp expiration; domain::Price strike; - api::domain::CallPut call_put; + domain::protobufs::CallPut call_put; }; void from_json(const nlohmann::json &j, OptionSecurity &opt); @@ -26,8 +28,10 @@ inline void from_json(const nlohmann::json &j, OptionSecurity &opt) { bool success = jr.read("exp", opt.expiration) && jr.read("k", opt.strike) && jr.read("cp", opt.call_put); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to OptionSecurity:\n{}", j_str); +#endif } } diff --git a/src/lib_domain/domain/price.h b/src/lib_domain/domain/price.h new file mode 100644 index 000000000..d4fdc40b3 --- /dev/null +++ b/src/lib_domain/domain/price.h @@ -0,0 +1,539 @@ +#pragma once + +#include "side.h" +#include "system/FMT_IMPL.h" +#include "system/json/json_reader.h" + +#include +#include +#include +#include +#include +#include +#include + +#ifdef bts_assert_msg +#define __ASSERT_MSG(EXP, msg) bts_assert_msg(EXP, msg) +#else +#define __ASSERT_MSG(EXP, msg) \ + do { \ + if (!(EXP)) { \ + std::cerr << "Assert failure: " << std::string(#EXP) << " " << msg \ + << std::endl; \ + if (is_debugger_present()) \ + debug_break(); \ + std::abort(); \ + } \ + } while (0) +#endif + +#define __ASSERT(EXP) __ASSERT_MSG(EXP, "") + +#define IS_NAND(x) (x == std::numeric_limits::quiet_NaN()) + +namespace bts::domain { + +class Price { + public: + Price() = default; + explicit constexpr Price( + std::int64_t mantissa, + std::int8_t exponent = Price::exponent()) noexcept; + constexpr Price(Price const &) = default; + Price(Price &&) noexcept = default; + ~Price() = default; + + template + static Price from_float(float price) noexcept; + [[nodiscard]] constexpr float to_float() const noexcept; + + template + static Price from_double(double price) noexcept; + [[nodiscard]] constexpr double to_double() const noexcept; + + static constexpr Price zero() noexcept; + static constexpr Price nan() noexcept; + [[nodiscard]] constexpr Price abs() const noexcept; + [[nodiscard]] Price square() const noexcept; + + [[nodiscard]] constexpr Price improve(Side s, Price by) const noexcept; + [[nodiscard]] constexpr Price worsen(Side s, Price by) const noexcept; + + [[nodiscard]] constexpr bool is_nan() const noexcept; + + [[nodiscard]] constexpr bool is_better(Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_better( + Side s, double p1, double p2) noexcept; + + [[nodiscard]] constexpr bool is_worse(Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_worse( + Side s, double p1, double p2) noexcept; + + [[nodiscard]] constexpr bool is_better_or_equal( + Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_better_or_equal( + Side s, double p1, double p2) noexcept; + + [[nodiscard]] constexpr bool is_worse_or_equal( + Side s, Price p2) const noexcept; + [[nodiscard]] static constexpr bool is_worse_or_equal( + Side s, double p1, double p2) noexcept; + + [[nodiscard]] constexpr Price repl_nan(Price repl) const noexcept; + + [[nodiscard]] constexpr Price get_min(Price other) const noexcept; + [[nodiscard]] constexpr Price get_max(Price other) const noexcept; + + [[nodiscard]] constexpr Price get_better( + Side side, Price other) const noexcept; + + [[nodiscard]] constexpr Price get_worse( + Side side, Price other) const noexcept; + + template + static double get_mean(Iter first, Iter last, bool skip_nan = false); + template + static double get_mean(Range range, bool skip_nan = false); + + static constexpr Price min() noexcept; + static constexpr Price max() noexcept; + + Price &operator=(Price const &) = default; + Price &operator=(Price &&) noexcept = default; + + constexpr Price operator-() const noexcept; + + constexpr bool operator==(Price factor) const noexcept; + constexpr bool operator!=(Price factor) const noexcept; + constexpr bool operator<(Price factor) const noexcept; + constexpr bool operator<=(Price factor) const noexcept; + constexpr bool operator>(Price factor) const noexcept; + constexpr bool operator>=(Price factor) const noexcept; + + constexpr Price operator+(Price factor) const noexcept; + constexpr Price operator-(Price factor) const noexcept; + constexpr Price operator*(Price factor) const noexcept; + constexpr Price operator/(Price factor) const noexcept; + + constexpr Price &operator+=(Price factor) noexcept; + constexpr Price &operator-=(Price factor) noexcept; + constexpr Price &operator*=(Price factor) noexcept; + constexpr Price &operator/=(Price factor) noexcept; + + constexpr bool operator==(std::int64_t factor) const noexcept; + constexpr bool operator!=(std::int64_t factor) const noexcept; + constexpr bool operator<(std::int64_t factor) const noexcept; + constexpr bool operator<=(std::int64_t factor) const noexcept; + constexpr bool operator>(std::int64_t factor) const noexcept; + constexpr bool operator>=(std::int64_t factor) const noexcept; + + constexpr Price operator+(std::int64_t factor) const noexcept; + constexpr Price operator-(std::int64_t factor) const noexcept; + constexpr Price operator*(std::int64_t factor) const noexcept; + constexpr Price operator/(std::int64_t factor) const noexcept; + + constexpr Price &operator+=(std::int64_t factor) noexcept; + constexpr Price &operator-=(std::int64_t factor) noexcept; + constexpr Price &operator*=(std::int64_t factor) noexcept; + constexpr Price &operator/=(std::int64_t factor) noexcept; + + [[nodiscard]] constexpr std::int64_t mantissa() const noexcept; + static constexpr std::int8_t exponent() noexcept; + + private: + std::int64_t _mantissa; + + static double _pow10() noexcept; + static double __pow10() noexcept; // NOLINT +}; + +void from_json(const nlohmann::json &j, Price &price); +void to_json(nlohmann::json &j, const Price &price); + +std::ostream &operator<<(std::ostream &out, Price price) noexcept; + +} // namespace bts::domain + +namespace std { + +template <> +struct hash { // NOLINT + constexpr size_t operator()(const bts::domain::Price &price) const noexcept; +}; + +} // namespace std + +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +namespace bts::domain { + +// NOLINTNEXTLINE +#define NAN_SENTINEL std::numeric_limits::min() +// NOLINTNEXTLINE +#define IS_NAN(x) (x == std::numeric_limits::min()) + +constexpr Price::Price(std::int64_t mantissa, std::int8_t exponent) noexcept + : _mantissa(mantissa) { + if (exponent != Price::exponent()) { + std::cerr << "Invalid price. Exponent is " << exponent << " and must be " + << Price::exponent() << std::endl; + exit(1); + } +} + +template +inline Price Price::from_float(float price) noexcept { + return from_double(price); +} + +constexpr float Price::to_float() const noexcept { + return static_cast(to_double()); +} + +template +inline Price Price::from_double(double price) noexcept { + static_assert(PRECISION == -exponent()); + if (IS_NAND(price)) { + return nan(); + } + double temp; // NOLINT + if (fabs(modf(price, &temp)) != 0.0) { + const double rounding = 0.5 * _pow10(); + price += (price > 0) ? rounding : -rounding; + price *= __pow10(); + return Price{(std::int64_t)price}; + } + return Price{(std::int64_t)(price * __pow10())}; +} + +constexpr double Price::to_double() const noexcept { + return is_nan() ? std::numeric_limits::quiet_NaN() + : _mantissa * _pow10(); // NOLINT +} + +constexpr Price Price::zero() noexcept { return Price(0); } +constexpr Price Price::nan() noexcept { return Price(NAN_SENTINEL); } +constexpr std::int8_t Price::exponent() noexcept { return -9; } +constexpr std::int64_t Price::mantissa() const noexcept { return _mantissa; } + +constexpr Price Price::abs() const noexcept { + if (_mantissa >= 0) { + return *this; + } + return Price{-_mantissa}; +} + +inline Price Price::square() const noexcept { + auto d = to_double(); + return from_double(d * d); +} + +constexpr Price Price::improve(Side s, Price by) const noexcept { + if (s == Side::Buy) { + return *this + by; + } + return *this - by; +} + +constexpr Price Price::worsen(Side s, Price by) const noexcept { + if (s == Side::Buy) { + return *this - by; + } + return *this + by; +} + +constexpr bool Price::is_nan() const noexcept { return IS_NAN(_mantissa); } + +constexpr bool Price::is_better(Side s, Price p2) const noexcept { + if (is_nan()) { + return false; + } + if (p2.is_nan()) { + return true; + } + if (s == Side::Buy) { + return *this > p2; + } + return *this < p2; +} + +constexpr bool Price::is_better(Side s, double p1, double p2) noexcept { + if (IS_NAND(p1)) { + return false; + } + if (IS_NAND(p2)) { + return true; + } + if (s == Side::Buy) { + return p1 > p2; + } + return p1 < p2; +} + +constexpr bool Price::is_worse(Side s, Price p2) const noexcept { + return p2.is_better(s, *this); +} + +constexpr bool Price::is_worse(Side s, double p1, double p2) noexcept { + return is_better(s, p2, p1); +} + +constexpr bool Price::is_better_or_equal(Side s, Price p2) const noexcept { + if (is_nan()) { + // This case is always false (even if p2 is nan), because nan != nan. + return false; + } + if (p2.is_nan()) { + return true; + } + if (s == Side::Buy) { + return *this >= p2; + } + return *this <= p2; +} + +constexpr bool Price::is_better_or_equal( + Side s, double p1, double p2) noexcept { + if (IS_NAND(p1)) { + // This case is always false (even if p2 is nan), because nan != nan. + return false; + } + if (IS_NAND(p2)) { + return true; + } + if (s == Side::Buy) { + return p1 >= p2; + } + return p1 <= p2; +} + +constexpr bool Price::is_worse_or_equal(Side s, Price p2) const noexcept { + return p2.is_better_or_equal(s, *this); +} + +constexpr bool Price::is_worse_or_equal(Side s, double p1, double p2) noexcept { + return is_better_or_equal(s, p2, p1); +} + +constexpr Price Price::repl_nan(Price repl) const noexcept { + if (is_nan()) { + return repl; + } + return *this; +} + +constexpr Price Price::get_min(Price other) const noexcept { + if (is_nan()) { + return other; + } + if (other.is_nan()) { + return *this; + } + if (*this < other) { + return *this; + } + return other; +} + +constexpr Price Price::get_max(Price other) const noexcept { + if (is_nan()) { + return other; + } + if (other.is_nan()) { + return *this; + } + if (*this > other) { + return *this; + } + return other; +} + +constexpr Price Price::get_better(Side side, Price other) const noexcept { + switch (side.value) { + case Side::Buy: + return get_max(other); + case Side::Sell: + return get_min(other); + default: + return nan(); + } +} + +constexpr Price Price::get_worse(Side side, Price other) const noexcept { + return get_better(side.other(), other); +} + +template +inline double Price::get_mean(Iter first, Iter last, bool skip_nan) { + if (first == last) { + return std::numeric_limits::quiet_NaN(); + } + auto sum = zero(); + std::int32_t n = 0; + do { + if (first->is_nan()) { + if (skip_nan) { + continue; + } + return std::numeric_limits::quiet_NaN(); + } + sum += *first; + n++; + first++; + } while (first != last); + if (n == 0) { + return std::numeric_limits::quiet_NaN(); + } + auto dsum = sum.to_double(); + return dsum / n; +} + +template +inline double Price::get_mean(Range range, bool skip_nan) { + return get_mean(range.begin(), range.end(), skip_nan); +} + +constexpr Price Price::min() noexcept { + return Price{std::numeric_limits::min() + 1}; +} + +constexpr Price Price::max() noexcept { + return Price{std::numeric_limits::max()}; +} + +inline double Price::_pow10() noexcept { return std::pow(10.0, exponent()); } +inline double Price::__pow10() noexcept { return std::pow(10.0, -exponent()); } +constexpr Price Price::operator-() const noexcept { + if (is_nan()) { + return *this; + } + return Price{-_mantissa}; +} + +inline void from_json(const nlohmann::json &j, Price &price) { + double d; + price = io::JsonReader{&j}.read(d) ? Price::from_double(d) : Price::nan(); +} + +inline void to_json(nlohmann::json &j, const Price &price) { + j = price.to_double(); +} + +// If a number is nan, all comparisons are false. This is well-established +// behavior; even nan == nan evaluates to false. +// NOLINTNEXTLINE +#define PRICE_PRICE_COMPARISON(op, nan_part) \ + constexpr bool Price::operator op(Price factor) const noexcept { \ + return nan_part _mantissa op factor._mantissa; \ + } + +// NOLINTNEXTLINE +#define PRICE_PRICE_BIN_OP(op) \ + constexpr Price Price::operator op(Price factor) const noexcept { \ + if (is_nan() || factor.is_nan()) { \ + return nan(); \ + } \ + return Price{_mantissa op factor._mantissa}; \ + } + +// NOLINTNEXTLINE +#define PRICE_PRICE_BIN_REF_OP(op) \ + constexpr Price &Price::operator op(Price factor) noexcept { \ + if (factor.is_nan()) { \ + _mantissa = nan()._mantissa; \ + } else if (!is_nan()) { \ + _mantissa op factor._mantissa; \ + } \ + return *this; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_COMPARISON(op, nan_part) \ + constexpr bool Price::operator op(std::int64_t factor) const noexcept { \ + return nan_part _mantissa op factor; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_BIN_OP(op) \ + constexpr Price Price::operator op(std::int64_t factor) const noexcept { \ + if (is_nan()) { \ + return *this; \ + } \ + return Price{_mantissa op factor}; \ + } + +// NOLINTNEXTLINE +#define PRICE_INT64_BIN_REF_OP(op) \ + constexpr Price &Price::operator op(std::int64_t factor) noexcept { \ + if (!is_nan()) { \ + _mantissa op factor; \ + } \ + return *this; \ + } + +PRICE_PRICE_COMPARISON(!=, is_nan() ||) +PRICE_PRICE_COMPARISON(==, !is_nan() &&) +PRICE_PRICE_COMPARISON(<, !is_nan() &&) +PRICE_PRICE_COMPARISON(<=, !is_nan() &&) +PRICE_PRICE_COMPARISON(>, !is_nan() &&) +PRICE_PRICE_COMPARISON(>=, !is_nan() &&) + +PRICE_PRICE_BIN_OP(+) +PRICE_PRICE_BIN_OP(-) +PRICE_PRICE_BIN_OP(*) +PRICE_PRICE_BIN_OP(/) + +PRICE_PRICE_BIN_REF_OP(+=) +PRICE_PRICE_BIN_REF_OP(-=) +PRICE_PRICE_BIN_REF_OP(*=) +PRICE_PRICE_BIN_REF_OP(/=) + +PRICE_INT64_COMPARISON(!=, is_nan() ||) +PRICE_INT64_COMPARISON(==, !is_nan() &&) +PRICE_INT64_COMPARISON(<, !is_nan() &&) +PRICE_INT64_COMPARISON(<=, !is_nan() &&) +PRICE_INT64_COMPARISON(>, !is_nan() &&) +PRICE_INT64_COMPARISON(>=, !is_nan() &&) + +PRICE_INT64_BIN_OP(+) +PRICE_INT64_BIN_OP(-) +PRICE_INT64_BIN_OP(*) +PRICE_INT64_BIN_OP(/) + +PRICE_INT64_BIN_REF_OP(+=) +PRICE_INT64_BIN_REF_OP(-=) +PRICE_INT64_BIN_REF_OP(*=) +PRICE_INT64_BIN_REF_OP(/=) + +inline std::ostream &operator<<(std::ostream &out, Price p) noexcept { + out << p.to_double(); + return out; +} + +#undef NAN_SENTINEL +#undef IS_NAN +#undef PRICE_PRICE_COMPARISON +#undef PRICE_PRICE_BIN_OP +#undef PRICE_PRICE_BIN_REF_OP +#undef PRICE_INT64_COMPARISON +#undef PRICE_INT64_BIN_OP +#undef PRICE_INT64_BIN_REF_OP + +} // namespace bts::domain + +FMT_IMPL(bts::domain::Price, p, "{}", p.to_double()); + +namespace std { // NOLINT + +constexpr size_t hash::operator()( + const bts::domain::Price &price) const noexcept { + return price.mantissa(); +} + +} // namespace std + +#undef IS_NAND +#undef __ASSERT +#undef __ASSERT_MSG diff --git a/src/lib_spark/spark/domain/PriceComp.h b/src/lib_domain/domain/price_comp.h similarity index 93% rename from src/lib_spark/spark/domain/PriceComp.h rename to src/lib_domain/domain/price_comp.h index c27c7fb33..6bf4b2256 100644 --- a/src/lib_spark/spark/domain/PriceComp.h +++ b/src/lib_domain/domain/price_comp.h @@ -1,6 +1,7 @@ #pragma once -#include "Price.h" -#include "Side.h" + +#include "domain/price.h" +#include "domain/side.h" namespace bts::domain { diff --git a/src/lib_domain/domain/protobufs/call_put.h b/src/lib_domain/domain/protobufs/call_put.h new file mode 100644 index 000000000..9bcce6567 --- /dev/null +++ b/src/lib_domain/domain/protobufs/call_put.h @@ -0,0 +1,14 @@ +#pragma once + +#include "domain/protobufs/call_put.pb.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" + +#include + +namespace bts::domain::protobufs { + +PB_ENUM_FROM_JSON(CallPut) +PB_ENUM_TO_JSON(CallPut) + +} // namespace bts::domain::protobufs diff --git a/src/lib_domain/domain/protobufs/call_put.proto b/src/lib_domain/domain/protobufs/call_put.proto new file mode 100644 index 000000000..08b14c906 --- /dev/null +++ b/src/lib_domain/domain/protobufs/call_put.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +option csharp_namespace = "bts.domain.protobufs"; + +enum CallPut { + CALLPUT_NONE = 0; + CALL = 1; + PUT = 3; +} diff --git a/src/lib_domain/domain/protobufs/currency.h b/src/lib_domain/domain/protobufs/currency.h new file mode 100644 index 000000000..a94414bff --- /dev/null +++ b/src/lib_domain/domain/protobufs/currency.h @@ -0,0 +1,14 @@ +#pragma once + +#include "domain/protobufs/currency.pb.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" + +#include + +namespace bts::domain::protobufs { + +PB_ENUM_FROM_JSON(Currency) +PB_ENUM_TO_JSON(Currency) + +} // namespace bts::domain::protobufs diff --git a/src/lib_domain/domain/protobufs/currency.proto b/src/lib_domain/domain/protobufs/currency.proto new file mode 100644 index 000000000..28a3b3087 --- /dev/null +++ b/src/lib_domain/domain/protobufs/currency.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +option csharp_namespace = "bts.domain.protobufs"; + +enum Currency { + BTC = 0; + ETH = 1; + USD = 3; +} diff --git a/src/lib_domain/domain/protobufs/security_criteria.proto b/src/lib_domain/domain/protobufs/security_criteria.proto new file mode 100644 index 000000000..2766bd3ea --- /dev/null +++ b/src/lib_domain/domain/protobufs/security_criteria.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/security_criteria_clause.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message SecurityCriteria { + repeated SecurityCriteriaClause clauses = 1; +} diff --git a/src/lib_domain/domain/protobufs/security_criteria_clause.proto b/src/lib_domain/domain/protobufs/security_criteria_clause.proto new file mode 100644 index 000000000..ebfe8f959 --- /dev/null +++ b/src/lib_domain/domain/protobufs/security_criteria_clause.proto @@ -0,0 +1,17 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/venue.proto"; +import "domain/protobufs/security_type.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message SecurityCriteriaClause { + repeated Venue venues = 1; + repeated SecurityType security_types = 2; + repeated string symbols = 3; + repeated uint32 keys = 4; + repeated string names = 5; + repeated string name_regexps = 6; + repeated string currencies = 7; +} diff --git a/src/lib_domain/domain/protobufs/security_metadata.proto b/src/lib_domain/domain/protobufs/security_metadata.proto new file mode 100644 index 000000000..809f401e4 --- /dev/null +++ b/src/lib_domain/domain/protobufs/security_metadata.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/tick_display_rule.proto"; +import "domain/protobufs/tick_display_settings.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message SecurityMetadata { + TickDisplaySettings price_display = 1; + TickDisplaySettings quantity_display = 2; + repeated TickDisplayRule price_rules = 3; +} diff --git a/src/lib_domain/domain/protobufs/security_metadata_collection.proto b/src/lib_domain/domain/protobufs/security_metadata_collection.proto new file mode 100644 index 000000000..e2c4212c5 --- /dev/null +++ b/src/lib_domain/domain/protobufs/security_metadata_collection.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/security_metadata_item.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message SecurityMetadataCollection { + repeated SecurityMetadataItem items = 1; +} diff --git a/src/lib_domain/domain/protobufs/security_metadata_item.proto b/src/lib_domain/domain/protobufs/security_metadata_item.proto new file mode 100644 index 000000000..16f362af1 --- /dev/null +++ b/src/lib_domain/domain/protobufs/security_metadata_item.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/security_criteria.proto"; +import "domain/protobufs/security_metadata.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message SecurityMetadataItem { + SecurityCriteria scope = 1; + SecurityMetadata value = 2; +} diff --git a/src/lib_spark/spark/api/domain/SecurityType.h b/src/lib_domain/domain/protobufs/security_type.h similarity index 62% rename from src/lib_spark/spark/api/domain/SecurityType.h rename to src/lib_domain/domain/protobufs/security_type.h index 73c786972..259f837c0 100644 --- a/src/lib_spark/spark/api/domain/SecurityType.h +++ b/src/lib_domain/domain/protobufs/security_type.h @@ -1,18 +1,17 @@ #pragma once -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" +#include "domain/protobufs/security_type.pb.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" #include "system/string_utils.h" #include -namespace bts::api::domain { +namespace bts::domain::protobufs { /** - * Parses SecurityType from a string. Unlike `bts::api::domain::SecurityType_Parse`, this + * Parses SecurityType from a string. Unlike `bts::domain::SecurityType_Parse`, this * implementation is case insensitive, and makes the 'SECURITY_TYPE_' prefix optional. */ bool security_type_parse_smart(const std::string &str, SecurityType *result); @@ -23,8 +22,9 @@ std::ostream &operator<<(std::ostream &out, const SecurityType &venue) noexcept; // Definition ////////////////////////////////////////////////// -inline bool security_type_parse_smart(const std::string &str, SecurityType *result) { - if (bts::api::domain::SecurityType_Parse(str, result)) { +inline bool security_type_parse_smart( + const std::string &str, SecurityType *result) { + if (SecurityType_Parse(str, result)) { return true; } std::string s = system::string_utils::copy_to_upper(str); @@ -38,7 +38,6 @@ inline bool security_type_parse_smart(const std::string &str, SecurityType *resu return SecurityType_Parse(s, result); } - PB_ENUM_FROM_JSON(SecurityType) PB_ENUM_TO_JSON(SecurityType) @@ -48,10 +47,7 @@ inline std::ostream &operator<<( return out; } -} // namespace bts::api::domain +} // namespace bts::domain FMT_IMPL( - bts::api::domain::SecurityType, - t, - "{}", - bts::api::domain::SecurityType_Name(t)); + bts::domain::protobufs::SecurityType, t, "{}", bts::domain::protobufs::SecurityType_Name(t)); diff --git a/src/lib_spark/spark/api/domain/SecurityType.proto b/src/lib_domain/domain/protobufs/security_type.proto similarity index 73% rename from src/lib_spark/spark/api/domain/SecurityType.proto rename to src/lib_domain/domain/protobufs/security_type.proto index 7f22ed7a3..c6f8fbd64 100644 --- a/src/lib_spark/spark/api/domain/SecurityType.proto +++ b/src/lib_domain/domain/protobufs/security_type.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package bts.api.domain; +package bts.domain.protobufs; -option csharp_namespace = "bts.api.domain"; +option csharp_namespace = "bts.domain.protobufs"; enum SecurityType { SECURITY_TYPE_UNSPECIFIED = 0; diff --git a/src/lib_domain/domain/protobufs/tick_display_rule.proto b/src/lib_domain/domain/protobufs/tick_display_rule.proto new file mode 100644 index 000000000..9f8c88662 --- /dev/null +++ b/src/lib_domain/domain/protobufs/tick_display_rule.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +package bts.domain.protobufs; + +import "domain/protobufs/tick_display_settings.proto"; + +option csharp_namespace = "bts.domain.protobufs"; + +message TickDisplayRule { + TickDisplaySettings tick_display = 1; + double max_value = 2; +} diff --git a/src/lib_spark/spark/api/domain/TickDisplaySettings.proto b/src/lib_domain/domain/protobufs/tick_display_settings.proto similarity index 58% rename from src/lib_spark/spark/api/domain/TickDisplaySettings.proto rename to src/lib_domain/domain/protobufs/tick_display_settings.proto index 6f536d6a0..0b3995604 100644 --- a/src/lib_spark/spark/api/domain/TickDisplaySettings.proto +++ b/src/lib_domain/domain/protobufs/tick_display_settings.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package bts.api.domain; +package bts.domain.protobufs; -import "spark/api/domain/TickFactors.proto"; +import "domain/protobufs/tick_factors.proto"; -option csharp_namespace = "bts.api.domain"; +option csharp_namespace = "bts.domain.protobufs"; message TickDisplaySettings { bool pad_with_leading_zeros = 1; @@ -12,5 +12,5 @@ message TickDisplaySettings { string nan_text = 4; bool show_decimal_part = 5; bool show_zero_integer = 6; - bts.api.domain.TickFactors tick_factors = 7; + TickFactors tick_factors = 7; } diff --git a/src/lib_spark/spark/api/domain/TickFactors.proto b/src/lib_domain/domain/protobufs/tick_factors.proto similarity index 53% rename from src/lib_spark/spark/api/domain/TickFactors.proto rename to src/lib_domain/domain/protobufs/tick_factors.proto index 821ed5bd8..7402f9b85 100644 --- a/src/lib_spark/spark/api/domain/TickFactors.proto +++ b/src/lib_domain/domain/protobufs/tick_factors.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package bts.api.domain; +package bts.domain.protobufs; -option csharp_namespace = "bts.api.domain"; +option csharp_namespace = "bts.domain.protobufs"; message TickFactors { double tick_unit = 1; diff --git a/src/lib_spark/spark/api/domain/Venue.h b/src/lib_domain/domain/protobufs/venue.h similarity index 67% rename from src/lib_spark/spark/api/domain/Venue.h rename to src/lib_domain/domain/protobufs/venue.h index 6392201eb..3c2743f5a 100644 --- a/src/lib_spark/spark/api/domain/Venue.h +++ b/src/lib_domain/domain/protobufs/venue.h @@ -1,19 +1,18 @@ #pragma once -#include "spark/api/domain/Venue.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" +#include "domain/protobufs/venue.pb.h" +#include "system/FMT_IMPL.h" +#include "system/enum_macros.h" +#include "system/json/json_reader.h" #include "system/string_utils.h" #include #include -namespace bts::api::domain { +namespace bts::domain::protobufs { /** - * Parses Venue from a string. Unlike `bts::api::domain::Venue_Parse`, this implementation is case + * Parses Venue from a string. Unlike `bts::domain::Venue_Parse`, this implementation is case * insensitive, and makes the 'VENUE_' prefix optional. */ bool venue_parse_smart(const std::string &str, Venue *result); @@ -25,7 +24,7 @@ std::ostream &operator<<(std::ostream &out, const Venue &venue) noexcept; ////////////////////////////////////////////////// inline bool venue_parse_smart(const std::string &str, Venue *result) { - if (bts::api::domain::Venue_Parse(str, result)) { + if (Venue_Parse(str, result)) { return true; } std::string s = system::string_utils::copy_to_upper(str); @@ -48,6 +47,6 @@ inline std::ostream &operator<<( return out; } -} // namespace bts::api::domain +} // namespace bts::domain -FMT_IMPL(bts::api::domain::Venue, v, "{}", bts::api::domain::Venue_Name(v)); +FMT_IMPL(bts::domain::protobufs::Venue, v, "{}", bts::domain::protobufs::Venue_Name(v)); diff --git a/src/lib_spark/spark/api/domain/Venue.proto b/src/lib_domain/domain/protobufs/venue.proto similarity index 91% rename from src/lib_spark/spark/api/domain/Venue.proto rename to src/lib_domain/domain/protobufs/venue.proto index d639de109..88ca33974 100644 --- a/src/lib_spark/spark/api/domain/Venue.proto +++ b/src/lib_domain/domain/protobufs/venue.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package bts.api.domain; +package bts.domain.protobufs; -option csharp_namespace = "bts.api.domain"; +option csharp_namespace = "bts.domain.protobufs"; // IMPORTANT: Don't change the int value of any enum entries! The exchange enum // value is encoded in the first 32 bits of our internal security keys. The diff --git a/src/lib_spark/spark/domain/Quantity.h b/src/lib_domain/domain/quantity.h similarity index 93% rename from src/lib_spark/spark/domain/Quantity.h rename to src/lib_domain/domain/quantity.h index 59c6b73dd..1aff94a41 100644 --- a/src/lib_spark/spark/domain/Quantity.h +++ b/src/lib_domain/domain/quantity.h @@ -1,8 +1,7 @@ #pragma once -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" +#include "system/FMT_IMPL.h" +#include "system/json/json_reader.h" #include "system/value_wrapper.h" #include @@ -57,8 +56,10 @@ inline void from_json(const nlohmann::json &j, Quantity &q) { io::JsonReader jr{&j}; bool success = jr.read(q.value()); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to Quantity:\n{}", j_str); +#endif } } @@ -72,7 +73,7 @@ inline void to_json(nlohmann::json &j, const Quantity &sec_id) { } #define QTY_QTY_BIN_REF_OP(op) \ - constexpr Quantity &operator op(Quantity &lhs, Quantity rhs) { \ + constexpr Quantity &operator op(Quantity & lhs, Quantity rhs) { \ lhs.value() op rhs.value(); \ return lhs; \ } @@ -86,11 +87,11 @@ inline void to_json(nlohmann::json &j, const Quantity &sec_id) { } #define QTY_UINT32_BIN_REF_OP(op) \ - inline Quantity &operator op(Quantity &lhs, Quantity::Value rhs) { \ + inline Quantity &operator op(Quantity & lhs, Quantity::Value rhs) { \ lhs.value() op rhs; \ return lhs; \ } \ - inline Quantity::Value &operator op(Quantity::Value &lhs, Quantity rhs) { \ + inline Quantity::Value &operator op(Quantity::Value & lhs, Quantity rhs) { \ lhs op rhs.value(); \ return lhs; \ } diff --git a/src/lib_spark/spark/domain/Security.cpp b/src/lib_domain/domain/security.cpp similarity index 54% rename from src/lib_spark/spark/domain/Security.cpp rename to src/lib_domain/domain/security.cpp index cb068b787..873a62044 100644 --- a/src/lib_spark/spark/domain/Security.cpp +++ b/src/lib_domain/domain/security.cpp @@ -1,41 +1,12 @@ -#include "Security.h" -#include "DomainSecurityUtils.h" -#include "spark/core/TableFormatter.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/OptionSecurity.h" -#include "spark/domain/SpotSecurity.h" -#include "spark/io/JsonDumper.h" -#include "spark/io/JsonReader.h" +#include "security.h" +#include "domain/future_security.h" +#include "domain/option_security.h" +#include "domain/spot_security.h" +#include "system/json/json_dumper.h" +#include "system/json/json_reader.h" namespace bts::domain { -Security::Security(const bts::api::Security &s) : security_common(s) { - switch (DomainSecurityUtils::get_type(s)) { - case (bts::api::SecurityType::SECURITYTYPE_SPOT): { - SpotSecurity spot_security = {}; - security = spot_security; - break; - } - case (bts::api::SecurityType::SECURITYTYPE_FUTURE): { - FutureSecurity future_security = DomainSecurityUtils::convert(s.future()); - security = future_security; - break; - } - case (bts::api::SecurityType::SECURITYTYPE_OPTION): { - OptionSecurity option_security = DomainSecurityUtils::convert(s.option()); - security = option_security; - break; - } - case (bts::api::SecurityType::SECURITYTYPE_SPREAD): { - SpreadSecurity spread_security = DomainSecurityUtils::convert(s.spread()); - security = spread_security; - break; - } - default: - bts_assert(false); - } -} - std::string Security::to_string(bool verbose) const { if (!verbose) { return desc(); @@ -54,8 +25,10 @@ void from_json(const nlohmann::json &j, Security &sec) { [&jr](SpreadSecurity &spd) { return jr.read("spread", spd); }}, sec.security); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to Security:\n{}", j_str); +#endif } } @@ -71,7 +44,7 @@ void to_json(nlohmann::json &j, const Security &sec) { } void to_json(nlohmann::json &j, const Security *sec_ptr) { - bts_assert(sec_ptr != nullptr); + // bts_assert(sec_ptr != nullptr); to_json(j, *sec_ptr); } diff --git a/src/lib_spark/spark/domain/Security.h b/src/lib_domain/domain/security.h similarity index 85% rename from src/lib_spark/spark/domain/Security.h rename to src/lib_domain/domain/security.h index 4d5df25d7..ebfcd8b63 100644 --- a/src/lib_spark/spark/domain/Security.h +++ b/src/lib_domain/domain/security.h @@ -1,35 +1,36 @@ #pragma once -#include "FutureSecurity.h" -#include "OptionSecurity.h" -#include "SecurityCommon.h" -#include "SpotSecurity.h" -#include "SpreadSecurity.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/domain/SecurityID.h" -#include "spark/utils/overloaded.h" + +#include "domain/future_security.h" +#include "domain/option_security.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/security_common.h" +#include "domain/security_id.h" +#include "domain/spot_security.h" +#include "domain/spread_security.h" +#include "system/FMT_IMPL.h" +#include "system/overloaded.h" #include #include namespace bts::domain { -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x class Security { public: SecurityCommon security_common; std::variant security; - Security() {} - Security(const bts::api::Security &s); + Security() = default; constexpr const std::string &asset() const; constexpr const std::string &desc() const; constexpr const std::string &group() const; constexpr SecurityID id() const; - api::domain::SecurityType type() const; + domain::protobufs::SecurityType type() const; constexpr const std::string &symbol() const; - constexpr api::domain::Venue venue() const; + constexpr domain::protobufs::Venue venue() const; constexpr SpotSecurity *spot(); constexpr const SpotSecurity *spot() const; @@ -70,7 +71,7 @@ constexpr const std::string &Security::group() const { constexpr SecurityID Security::id() const { return security_common.id; } -inline api::domain::SecurityType Security::type() const { +inline domain::protobufs::SecurityType Security::type() const { return std::visit( overloaded{ [](const SpotSecurity &) { return SEC_TYPE(SPOT); }, @@ -85,7 +86,7 @@ constexpr const std::string &Security::symbol() const { return security_common.symbol; } -constexpr api::domain::Venue Security::venue() const { +constexpr domain::protobufs::Venue Security::venue() const { return security_common.venue; } diff --git a/src/lib_spark/spark/domain/SecurityCommon.h b/src/lib_domain/domain/security_common.h similarity index 68% rename from src/lib_spark/spark/domain/SecurityCommon.h rename to src/lib_domain/domain/security_common.h index 313250071..b6d0a7039 100644 --- a/src/lib_spark/spark/domain/SecurityCommon.h +++ b/src/lib_domain/domain/security_common.h @@ -1,22 +1,10 @@ #pragma once -#include "DomainSecurityUtils.h" -#include "Price.h" -#include "SecurityID.h" -#include "spark/api/domain/CallPut.pb.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/core/TimeStamp.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/LegDefinition.h" -#include "spark/domain/OptionSecurity.h" -#include "spark/domain/Quantity.h" -#include "spark/domain/Side.h" -#include "spark/domain/SpreadSecurity.h" -#include "spark/domain_model/Security.pb.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" -#include "spark/utils/bts_assert.h" + +#include "domain/price.h" +#include "domain/security_id.h" +#include "domain/protobufs/venue.pb.h" +#include "system/json/json_reader.h" + #include #include #include @@ -26,7 +14,7 @@ namespace bts::domain { // All the security common params, ie regardless of Future, Spot, Spread etc class SecurityCommon { public: - api::domain::Venue venue; + domain::protobufs::Venue venue; std::string exchange_sec_id; SecurityID id{}; std::string currency; @@ -41,13 +29,13 @@ class SecurityCommon { double min_quantity = 0; double max_quantity = std::numeric_limits::max(); - SecurityCommon() {} - SecurityCommon(const bts::api::Security &s) - : venue(DomainSecurityUtils::convert(s.exchange())), - exchange_sec_id(DomainSecurityUtils::get_exchange_id(s)), - id(SecurityID(s.id())), currency(s.currency()), symbol(s.symbol()), - desc(exchange_sec_id), - min_price_increment(s.contract_spec().low_tick()) {} + // SecurityCommon() {} + // SecurityCommon(const bts::api::Security &s) + // : venue(DomainSecurityUtils::convert(s.exchange())), + // exchange_sec_id(DomainSecurityUtils::get_exchange_id(s)), + // id(SecurityID(s.id())), currency(s.currency()), symbol(s.symbol()), + // desc(exchange_sec_id), + // min_price_increment(s.contract_spec().low_tick()) {} }; void from_json(const nlohmann::json &j, SecurityCommon &sc); @@ -77,14 +65,16 @@ inline void from_json(const nlohmann::json &j, SecurityCommon &sc) { jr.read("max_quantity", sc.max_quantity); // clang-format on if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to SecurityCommon:\n{}", j_str); +#endif } } inline void to_json(nlohmann::json &j, const SecurityCommon &sc) { j = nlohmann::json{ - {"venue", api::domain::Venue_Name(sc.venue)}, + {"venue", domain::protobufs::Venue_Name(sc.venue)}, {"exchange_id", sc.exchange_sec_id}, {"id", sc.id.value()}, {"currency", sc.currency}, diff --git a/src/lib_spark/spark/domain/SecurityCriteria.cpp b/src/lib_domain/domain/security_criteria.cpp similarity index 76% rename from src/lib_spark/spark/domain/SecurityCriteria.cpp rename to src/lib_domain/domain/security_criteria.cpp index 4416b6c51..e049c1099 100644 --- a/src/lib_spark/spark/domain/SecurityCriteria.cpp +++ b/src/lib_domain/domain/security_criteria.cpp @@ -1,7 +1,7 @@ -#include "SecurityCriteria.h" -#include "spark/api/domain/SecurityCriteria.pb.h" -#include "spark/core/FMT.h" -#include "spark/domain/DomainSecurityUtils.h" +#include "security_criteria.h" +#include "domain/protobufs/security_criteria.pb.h" +#include "system/FMT.h" + #include namespace bts::domain { @@ -23,23 +23,14 @@ bool SecurityCriteria::includes(const Security &sec) const { } bool SecurityCriteria::includes( - const api::domain::Venue venue, - const api::domain::SecurityType type, + const domain::protobufs::Venue venue, + const domain::protobufs::SecurityType type, const std::string &symbol) const { return std::any_of(clauses.begin(), clauses.end(), [&](const auto &c) { return c.includes(venue, type, symbol); }); } -bool SecurityCriteria::includes( - const api::Venue venue, - const api::SecurityType type, - const std::string &symbol) const { - return includes( - DomainSecurityUtils::convert(venue), DomainSecurityUtils::convert(type), - symbol); -} - std::optional SecurityCriteria::includes(const string &name) const { // Return true if ANY clause returns true // Return false if ALL clauses return false @@ -67,7 +58,7 @@ bool SecurityCriteria::includes_or_undefined(const Security &sec) const { } SecurityCriteria SecurityCriteria::from_proto( - const api::domain::SecurityCriteria &proto) { + const domain::protobufs::SecurityCriteria &proto) { SecurityCriteria rv; for (const auto &pclause : proto.clauses()) { rv.clauses.push_back(SecurityCriteriaClause::from_proto(pclause)); diff --git a/src/lib_spark/spark/domain/SecurityCriteria.h b/src/lib_domain/domain/security_criteria.h similarity index 80% rename from src/lib_spark/spark/domain/SecurityCriteria.h rename to src/lib_domain/domain/security_criteria.h index d48a2142e..076b657b7 100644 --- a/src/lib_spark/spark/domain/SecurityCriteria.h +++ b/src/lib_domain/domain/security_criteria.h @@ -1,10 +1,9 @@ #pragma once -#include "SecurityID.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/Security.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/domain/SecurityCriteriaClause.h" -#include "spark/domain_model/Security.pb.h" + +#include "domain/security.h" +#include "domain/security_criteria_clause.h" +#include "domain/protobufs/venue.pb.h" +#include "system/FMT_IMPL.h" #include #include @@ -12,10 +11,10 @@ #include #include -namespace bts::api::domain { +namespace bts::domain::protobufs { class SecurityCriteria; class SecurityCriteriaClause; -} // namespace bts::api::domain +} // namespace bts::domain::protobufs namespace bts::domain { @@ -28,8 +27,8 @@ class SecurityCriteria { boost::container::small_vector clauses; template < - class Venues = std::vector, - class SecurityTypes = std::vector, + class Venues = std::vector, + class SecurityTypes = std::vector, class Assets = std::vector, class SecurityGroups = std::vector, class SecurityIDs = std::vector, @@ -42,19 +41,14 @@ class SecurityCriteria { const SecurityIDs &security_ids = {}, const SecurityDescs &security_descs = {}); - static SecurityCriteria from_proto( - const api::domain::SecurityCriteria &proto); + static SecurityCriteria from_proto(const domain::protobufs::SecurityCriteria &proto); static SecurityCriteria empty(); bool is_defined() const; bool includes(const Security &sec) const; bool includes( - const api::domain::Venue venue, - const api::domain::SecurityType type, - const std::string &symbol = "") const; - bool includes( - const api::Venue venue, - const api::SecurityType type, + const domain::protobufs::Venue venue, + const domain::protobufs::SecurityType type, const std::string &symbol = "") const; /** diff --git a/src/lib_spark/spark/domain/SecurityCriteriaClause.cpp b/src/lib_domain/domain/security_criteria_clause.cpp similarity index 82% rename from src/lib_spark/spark/domain/SecurityCriteriaClause.cpp rename to src/lib_domain/domain/security_criteria_clause.cpp index baf005c16..9ce391086 100644 --- a/src/lib_spark/spark/domain/SecurityCriteriaClause.cpp +++ b/src/lib_domain/domain/security_criteria_clause.cpp @@ -1,29 +1,26 @@ -#include "SecurityCriteriaClause.h" -#include "spark/api/domain/SecurityCriteria.pb.h" -#include "spark/api/domain/SecurityCriteriaClause.pb.h" -#include "spark/api/domain/SecurityType.h" -#include "spark/api/domain/Venue.h" -#include "spark/collections/Contains.h" -#include "spark/core/FMT.h" -#include "spark/domain/Security.h" -#include "spark/domain_model/Security.pb.h" +#include "security_criteria_clause.h" +#include "domain/protobufs/security_criteria.pb.h" +#include "domain/protobufs/security_criteria_clause.pb.h" +#include "domain/protobufs/security_type.h" +#include "domain/protobufs/venue.h" +#include "domain/security.h" +#include "system/FMT.h" +#include "system/collections/contains.h" #include #include +#include namespace bts::domain { -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x -#define VENUE(x) bts::api::domain::VENUE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define VENUE(x) bts::domain::protobufs::VENUE_##x -using bts::api::domain::SecurityType; +using bts::domain::protobufs::SecurityType; using std::regex_search; using std::smatch; using std::string; -#define CONTAINS(container, value) \ - (std::find(container.begin(), container.end(), value) != container.end()) - bool SecurityCriteriaClause::is_defined() const { return !venues.empty() || !types.empty() || !assets.empty() || !groups.empty() || !ids.empty() || !names.empty() || @@ -65,7 +62,7 @@ bool SecurityCriteriaClause::includes(const Security &sec) const { } bool SecurityCriteriaClause::includes( - const bts::api::domain::Venue venue, + const bts::domain::protobufs::Venue venue, const SecurityType type, const string &asset) const { if (!is_defined()) { @@ -99,7 +96,7 @@ std::optional SecurityCriteriaClause::includes(const string &name) const { } SecurityCriteriaClause SecurityCriteriaClause::from_proto( - const api::domain::SecurityCriteriaClause &api_clause) { + const domain::protobufs::SecurityCriteriaClause &api_clause) { // Assert reasonable params ('SecurityCriteriaClause::include' calls should // be cheap). These limits are somewhat arbitrary. Adjust them as needed. static const int MAX_VENUES_COUNT = 16; @@ -107,18 +104,26 @@ SecurityCriteriaClause SecurityCriteriaClause::from_proto( static const int MAX_SYMBOLS_COUNT = 32; static const int MAX_NAMES_COUNT = 64; static const int MAX_NAME_REGEXPS_COUNT = 16; - bts_assert(api_clause.venues().size() <= MAX_VENUES_COUNT); - bts_assert(api_clause.security_types().size() <= MAX_TYPES_COUNT); - bts_assert(api_clause.symbols().size() <= MAX_SYMBOLS_COUNT); - bts_assert(api_clause.names().size() <= MAX_NAMES_COUNT); - bts_assert(api_clause.name_regexps().size() <= MAX_NAME_REGEXPS_COUNT); +#define ENFORCE_MAX_COUNT(items, max) \ + if (api_clause.items().size() > max) { \ + throw std::runtime_error{fmt::format( \ + "Unable to create SecurityCriteriaClause from proto. Num " #items \ + " ({}) exceeds max ({}).", \ + api_clause.items().size(), max)}; \ + } + ENFORCE_MAX_COUNT(venues, MAX_VENUES_COUNT); + ENFORCE_MAX_COUNT(security_types, MAX_TYPES_COUNT); + ENFORCE_MAX_COUNT(symbols, MAX_SYMBOLS_COUNT); + ENFORCE_MAX_COUNT(names, MAX_NAMES_COUNT); + ENFORCE_MAX_COUNT(name_regexps, MAX_NAME_REGEXPS_COUNT); +#undef ENFORCE_MAX_COUNT SecurityCriteriaClause rv; for (auto venue : api_clause.venues()) { - rv.venues.push_back(static_cast(venue)); + rv.venues.push_back(static_cast(venue)); } for (auto type : api_clause.security_types()) { - rv.types.push_back(static_cast(type)); + rv.types.push_back(static_cast(type)); } for (const auto &sym : api_clause.symbols()) { rv.assets.emplace_back(sym); diff --git a/src/lib_spark/spark/domain/SecurityCriteriaClause.h b/src/lib_domain/domain/security_criteria_clause.h similarity index 77% rename from src/lib_spark/spark/domain/SecurityCriteriaClause.h rename to src/lib_domain/domain/security_criteria_clause.h index ecb4060c5..57788a0d9 100644 --- a/src/lib_spark/spark/domain/SecurityCriteriaClause.h +++ b/src/lib_domain/domain/security_criteria_clause.h @@ -1,8 +1,9 @@ #pragma once -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/domain/SecurityID.h" + +#include "domain/protobufs/venue.pb.h" +#include "domain/security_id.h" +#include "domain/protobufs/security_type.pb.h" +#include "system/FMT_IMPL.h" #include #include @@ -17,7 +18,7 @@ namespace bts::api { class Security; } -namespace bts::api::domain { +namespace bts::domain::protobufs { class SecurityCriteriaClause; } @@ -33,8 +34,8 @@ class Security; * properties that are contained in the [non-empty] discrete set(s). */ struct SecurityCriteriaClause { - boost::container::small_vector venues; - boost::container::small_vector types; + boost::container::small_vector venues; + boost::container::small_vector types; boost::container::small_vector assets; boost::container::small_vector groups; std::unordered_set ids; @@ -45,14 +46,13 @@ struct SecurityCriteriaClause { std::vector currencies; static SecurityCriteriaClause from_proto( - const api::domain::SecurityCriteriaClause &proto); + const domain::protobufs::SecurityCriteriaClause &proto); bool is_defined() const; bool includes(const domain::Security &security) const; - bool includes(const api::Security &security) const; bool includes( - const api::domain::Venue venue, - const api::domain::SecurityType type, + const domain::protobufs::Venue venue, + const domain::protobufs::SecurityType type, const std::string &asset) const; /** diff --git a/src/lib_spark/spark/domain/SecurityID.h b/src/lib_domain/domain/security_id.h similarity index 95% rename from src/lib_spark/spark/domain/SecurityID.h rename to src/lib_domain/domain/security_id.h index ed29cf970..8a1507a18 100644 --- a/src/lib_spark/spark/domain/SecurityID.h +++ b/src/lib_domain/domain/security_id.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/core/FMT_IMPL.h" +#include "system/FMT_IMPL.h" #include "system/value_wrapper.h" #include diff --git a/src/lib_spark/spark/domain/SecurityState.h b/src/lib_domain/domain/security_state.h similarity index 85% rename from src/lib_spark/spark/domain/SecurityState.h rename to src/lib_domain/domain/security_state.h index 5eb3148c0..93d9cb8fe 100644 --- a/src/lib_spark/spark/domain/SecurityState.h +++ b/src/lib_domain/domain/security_state.h @@ -1,5 +1,6 @@ #pragma once -#include "SecurityID.h" + +#include "domain/security_id.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/Side.cpp b/src/lib_domain/domain/side.cpp similarity index 89% rename from src/lib_spark/spark/domain/Side.cpp rename to src/lib_domain/domain/side.cpp index 79ba8ea9d..4aade1ecb 100644 --- a/src/lib_spark/spark/domain/Side.cpp +++ b/src/lib_domain/domain/side.cpp @@ -1,4 +1,4 @@ -#include "Side.h" +#include "side.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/Side.h b/src/lib_domain/domain/side.h similarity index 100% rename from src/lib_spark/spark/domain/Side.h rename to src/lib_domain/domain/side.h diff --git a/src/lib_spark/spark/domain/SpotSecurity.h b/src/lib_domain/domain/spot_security.h similarity index 100% rename from src/lib_spark/spark/domain/SpotSecurity.h rename to src/lib_domain/domain/spot_security.h diff --git a/src/lib_spark/spark/domain/SpreadSecurity.h b/src/lib_domain/domain/spread_security.h similarity index 90% rename from src/lib_spark/spark/domain/SpreadSecurity.h rename to src/lib_domain/domain/spread_security.h index c3493da64..1e7580d2b 100644 --- a/src/lib_spark/spark/domain/SpreadSecurity.h +++ b/src/lib_domain/domain/spread_security.h @@ -1,6 +1,8 @@ #pragma once -#include "LegDefinition.h" -#include "spark/io/JsonReader.h" + +#include "domain/leg_definition.h" +#include "system/json/json_reader.h" + #include #include @@ -22,8 +24,10 @@ inline void from_json(const nlohmann::json &j, SpreadSecurity &spread) { io::JsonReader jr{&j}; bool success = jr.read("legs", spread.legs); if (!success) { +#ifdef LOG const auto j_str = j.dump(2); LOG(md, Error, "Failed to parse json to SpreadSecurity:\n{}", j_str); +#endif } } diff --git a/src/lib_spark/CMakeLists.txt b/src/lib_spark/CMakeLists.txt index 7cca37c77..7a2f5dd88 100644 --- a/src/lib_spark/CMakeLists.txt +++ b/src/lib_spark/CMakeLists.txt @@ -51,6 +51,7 @@ protobuf_generate_cpp( PROTO_INCLUDE_DIRS ${EXTERNALS_INCLUDE} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/lib_domain PROTO_SOURCES ${_non_cfg_protos} ${_cfg_protos} @@ -62,6 +63,7 @@ protobuf_generate_cpp_service( PROTO_INCLUDE_DIRS ${EXTERNALS_INCLUDE} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/lib_domain PROTO_SOURCES ${_service_protos} ) diff --git a/src/lib_spark/cmake/GetLinuxClientSources.cmake b/src/lib_spark/cmake/GetLinuxClientSources.cmake index f45392840..ca3188a53 100644 --- a/src/lib_spark/cmake/GetLinuxClientSources.cmake +++ b/src/lib_spark/cmake/GetLinuxClientSources.cmake @@ -3,7 +3,7 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) GLOB_RECURSE _cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} config/protos/*.proto - api/domain/SecurityMetadataCollection.proto) + ) file( GLOB_RECURSE _service_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index 5cff8b3c5..a160b614f 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -1,6 +1,7 @@ function(get_link_libraries dest) set(${dest} system + domain protobuf double-conversion boost_system diff --git a/src/lib_spark/cmake/GetLinuxServerSources.cmake b/src/lib_spark/cmake/GetLinuxServerSources.cmake index 8d6782219..c0fbbc4fa 100644 --- a/src/lib_spark/cmake/GetLinuxServerSources.cmake +++ b/src/lib_spark/cmake/GetLinuxServerSources.cmake @@ -3,7 +3,6 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) GLOB_RECURSE _cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_NAME}/config/protos/*.proto - ${PROJECT_NAME}/api/domain/SecurityMetadataCollection.proto ${PROJECT_NAME}/api/md/MarketDataConfig.proto) file( GLOB_RECURSE _service_srcs diff --git a/src/lib_spark/cmake/GetWindowsClientSources.cmake b/src/lib_spark/cmake/GetWindowsClientSources.cmake index 9ebcb2a2c..811bd2b32 100644 --- a/src/lib_spark/cmake/GetWindowsClientSources.cmake +++ b/src/lib_spark/cmake/GetWindowsClientSources.cmake @@ -3,7 +3,7 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults) GLOB_RECURSE _cfg_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} config/protos/*.proto - api/domain/SecurityMetadataCollection.proto) + ) file( GLOB_RECURSE _service_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/lib_spark/spark/api/domain/CallPut.h b/src/lib_spark/spark/api/domain/CallPut.h deleted file mode 100644 index 5e4403111..000000000 --- a/src/lib_spark/spark/api/domain/CallPut.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "spark/api/domain/CallPut.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" -#include - -namespace bts::api::domain { - -PB_ENUM_FROM_JSON(CallPut) -PB_ENUM_TO_JSON(CallPut) - -} // namespace bts::api::domain diff --git a/src/lib_spark/spark/api/domain/CallPut.proto b/src/lib_spark/spark/api/domain/CallPut.proto deleted file mode 100644 index 6508fa2b6..000000000 --- a/src/lib_spark/spark/api/domain/CallPut.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -option csharp_namespace = "bts.api.domain"; -option cc_enable_arenas = true; - -enum CallPut { - CALLPUT_NONE = 0; - CALL = 1; - PUT = 3; -} diff --git a/src/lib_spark/spark/api/domain/Currency.h b/src/lib_spark/spark/api/domain/Currency.h deleted file mode 100644 index 827377478..000000000 --- a/src/lib_spark/spark/api/domain/Currency.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "spark/api/domain/Currency.pb.h" -#include "spark/core/EnumMacros.h" -#include "spark/io/JsonReader.h" -#include "spark/logging/logging.h" -#include - -namespace bts::api::domain { - -PB_ENUM_FROM_JSON(Currency) -PB_ENUM_TO_JSON(Currency) - -} // namespace bts::api::domain diff --git a/src/lib_spark/spark/api/domain/Currency.proto b/src/lib_spark/spark/api/domain/Currency.proto deleted file mode 100644 index 88e4356eb..000000000 --- a/src/lib_spark/spark/api/domain/Currency.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -option csharp_namespace = "bts.api.domain"; - -enum Currency { - BTC = 0; - ETH = 1; - USD = 3; -} diff --git a/src/lib_spark/spark/api/domain/SecurityCriteria.proto b/src/lib_spark/spark/api/domain/SecurityCriteria.proto deleted file mode 100644 index 3d6e8ece1..000000000 --- a/src/lib_spark/spark/api/domain/SecurityCriteria.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/SecurityCriteriaClause.proto"; - -option csharp_namespace = "bts.api.domain"; - -message SecurityCriteria { - repeated bts.api.domain.SecurityCriteriaClause clauses = 1; -} diff --git a/src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto b/src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto deleted file mode 100644 index 7e2b1fd2f..000000000 --- a/src/lib_spark/spark/api/domain/SecurityCriteriaClause.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/Venue.proto"; -import "spark/api/domain/SecurityType.proto"; - -option csharp_namespace = "bts.api.domain"; - -message SecurityCriteriaClause { - repeated bts.api.domain.Venue venues = 1; - repeated bts.api.domain.SecurityType security_types = 2; - repeated string symbols = 3; - repeated uint32 keys = 4; - repeated string names = 5; - repeated string name_regexps = 6; - repeated string currencies = 7; -} diff --git a/src/lib_spark/spark/api/domain/SecurityExpiration.proto b/src/lib_spark/spark/api/domain/SecurityExpiration.proto index c900ec440..6f56155cf 100644 --- a/src/lib_spark/spark/api/domain/SecurityExpiration.proto +++ b/src/lib_spark/spark/api/domain/SecurityExpiration.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package bts.api.domain; -import "spark/api/domain/Venue.proto"; +import "domain/protobufs/venue.proto"; import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.domain"; message SecurityExpiration { - bts.api.domain.Venue exchange = 1; + bts.domain.protobufs.Venue exchange = 1; bts.api.SecurityType security_type = 2; string symbol = 3; bts.api.Expiration expiration = 4; diff --git a/src/lib_spark/spark/api/domain/SecurityMetadata.proto b/src/lib_spark/spark/api/domain/SecurityMetadata.proto deleted file mode 100644 index 6ffa57341..000000000 --- a/src/lib_spark/spark/api/domain/SecurityMetadata.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/TickDisplayRule.proto"; -import "spark/api/domain/TickDisplaySettings.proto"; - -option csharp_namespace = "bts.api.domain"; - -message SecurityMetadata { - bts.api.domain.TickDisplaySettings price_display = 1; - bts.api.domain.TickDisplaySettings quantity_display = 2; - repeated bts.api.domain.TickDisplayRule price_rules = 3; -} diff --git a/src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto b/src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto deleted file mode 100644 index d08a4d7ca..000000000 --- a/src/lib_spark/spark/api/domain/SecurityMetadataCollection.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/SecurityMetadataItem.proto"; - -option csharp_namespace = "bts.api.domain"; - -message SecurityMetadataCollection { - repeated bts.api.domain.SecurityMetadataItem items = 1; -} diff --git a/src/lib_spark/spark/api/domain/SecurityMetadataItem.proto b/src/lib_spark/spark/api/domain/SecurityMetadataItem.proto deleted file mode 100644 index fb793d88b..000000000 --- a/src/lib_spark/spark/api/domain/SecurityMetadataItem.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/SecurityCriteria.proto"; -import "spark/api/domain/SecurityMetadata.proto"; - -option csharp_namespace = "bts.api.domain"; - -message SecurityMetadataItem { - bts.api.domain.SecurityCriteria scope = 1; - bts.api.domain.SecurityMetadata value = 2; -} diff --git a/src/lib_spark/spark/api/domain/TickDisplayRule.proto b/src/lib_spark/spark/api/domain/TickDisplayRule.proto deleted file mode 100644 index e70a67a59..000000000 --- a/src/lib_spark/spark/api/domain/TickDisplayRule.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; -package bts.api.domain; - -import "spark/api/domain/TickDisplaySettings.proto"; - -option csharp_namespace = "bts.api.domain"; - -message TickDisplayRule { - TickDisplaySettings tick_display = 1; - double max_value = 2; -} diff --git a/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto index b97ff0738..fd3f441f0 100644 --- a/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -10,7 +10,7 @@ option cc_enable_arenas = true; message BinanceMarketDataConfig { uint32 num_depth_levels = 1; uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto index c125ce5be..3db69b4fb 100644 --- a/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceUsMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -10,7 +10,7 @@ option cc_enable_arenas = true; message BinanceUsMarketDataConfig { uint32 num_depth_levels = 1; uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto b/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto index 205d34c6f..c4f6e977c 100644 --- a/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/BinanceUsdsFuturesMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; import "spark/api/core/RegexFormatting.proto"; package bts.api.md; @@ -11,7 +11,7 @@ option cc_enable_arenas = true; message BinanceUsdsFuturesMarketDataConfig { uint32 num_depth_levels = 1; uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto b/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto index 8d9d0b80c..abeb298c4 100644 --- a/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/CboeMarketDataConfig.proto @@ -1,11 +1,10 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; option csharp_namespace = "bts.api.md"; -option cc_enable_arenas = true; message CboeMarketDataConfig { uint32 unique_check_value = 1; @@ -13,7 +12,7 @@ message CboeMarketDataConfig { bool read_from_file = 20; //uint32 num_depth_levels = 1; //uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto b/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto index 4241ee238..8825093f7 100644 --- a/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/CoinbaseMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -10,7 +10,7 @@ option cc_enable_arenas = true; message CoinbaseMarketDataConfig { uint32 num_depth_levels = 1; uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto b/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto index 105cc6fda..180bbc0a8 100644 --- a/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/DeribitMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -10,7 +10,7 @@ option cc_enable_arenas = true; message DeribitMarketDataConfig { uint32 num_depth_levels = 1; uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; repeated string excluded_securities = 4; repeated string currencies = 5; string url_rest_base = 6; diff --git a/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto b/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto index 01bcc40d8..64ad6cad8 100644 --- a/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/FTXMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -9,5 +9,5 @@ option cc_enable_arenas = true; message FTXMarketDataConfig { uint32 num_depth_levels = 1; - bts.api.domain.SecurityCriteria security_criteria = 2; + bts.domain.protobufs.SecurityCriteria security_criteria = 2; } diff --git a/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto b/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto index 1df4e8022..f9870b9bb 100644 --- a/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/GlbxMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -11,7 +11,7 @@ message GlbxMarketDataConfig { uint32 unique_check_value = 1; bool use_databento = 10; bool read_from_file = 20; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; //uint32 num_depth_levels = 1; //uint32 depth_throttle_ms = 2; // Market data isn't subscribed for securities listed here (even if they are diff --git a/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto b/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto index 15f31dd9a..070d5e91e 100644 --- a/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/OkxMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -9,7 +9,7 @@ option cc_enable_arenas = true; message OkxMarketDataConfig { uint32 num_depth_levels = 1; - bts.api.domain.SecurityCriteria security_criteria = 2; + bts.domain.protobufs.SecurityCriteria security_criteria = 2; repeated string excluded_securities = 3; string url_rest_base = 4; string url_ws_base = 5; diff --git a/src/lib_spark/spark/api/md/PyMarketDataProviderConfig.proto b/src/lib_spark/spark/api/md/PyMarketDataProviderConfig.proto index 7f687cd11..68a500d21 100644 --- a/src/lib_spark/spark/api/md/PyMarketDataProviderConfig.proto +++ b/src/lib_spark/spark/api/md/PyMarketDataProviderConfig.proto @@ -2,12 +2,12 @@ syntax = "proto3"; option csharp_namespace = "bts.api.md"; -import "spark/api/domain/Venue.proto"; +import "domain/protobufs/venue.proto"; package bts.api.md; message PyMarketDataProviderConfig { string provider_type = 1; repeated string module_path = 2; - bts.api.domain.Venue venue = 3; + bts.domain.protobufs.Venue venue = 3; } diff --git a/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto b/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto index 30ce2f981..e66af02b8 100644 --- a/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto +++ b/src/lib_spark/spark/api/md/TaifexMarketDataConfig.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -import "spark/api/domain/SecurityCriteria.proto"; +import "domain/protobufs/security_criteria.proto"; package bts.api.md; @@ -12,7 +12,7 @@ message TaifexMarketDataConfig { bool read_from_file = 20; //uint32 num_depth_levels = 1; //uint32 depth_throttle_ms = 2; - bts.api.domain.SecurityCriteria security_criteria = 3; + bts.domain.protobufs.SecurityCriteria security_criteria = 3; // Market data isn't subscribed for securities listed here (even if they are // included by 'security_criteria'). There are some securities that don't // fit into our system just yet, such as 'BTCBIDR', which trades in prices diff --git a/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp index 67d3f14b1..dbad01557 100644 --- a/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib_spark/spark/api/service_helpers/AdminServiceUtils.cpp @@ -1,11 +1,11 @@ #include "spark/api/service_helpers/AdminServiceUtils.h" +#include "domain/security_criteria.h" #include "spark/api/services/AdminService.server.pb.h" #include "spark/config/config.h" #include "spark/config/protos/cme_reference_data.pb.h" #include "spark/config/protos/deployment_type.pb.h" #include "spark/config/protos/jetfix.pb.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/domain_model/Security.pb.h" #include "spark/md/SymbolLoader.h" @@ -1734,8 +1734,8 @@ void add_product_position_limits( to_account->name(), Venue_Name(venue), SecurityType_Name(sec_type)); const auto filter = SecurityCriteria::create( venue == Venue::VENUE_UNSET - ? vector{} - : vector{DomainSecurityUtils::convert(venue)}, + ? vector{} + : vector{DomainSecurityUtils::convert(venue)}, {DomainSecurityUtils::convert(sec_type)}); const auto symbols = SymbolLoader::load(filter); diff --git a/src/lib_spark/spark/api/services/AnalyticsService.proto b/src/lib_spark/spark/api/services/AnalyticsService.proto index 7377791cb..f998f95b0 100644 --- a/src/lib_spark/spark/api/services/AnalyticsService.proto +++ b/src/lib_spark/spark/api/services/AnalyticsService.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package bts.api.analytics; +import "domain/protobufs/security_criteria.proto"; import "spark/api/apioptions.proto"; import "spark/api/apicore.proto"; import "spark/api/analytics/ExpirationDriver.proto"; import "spark/api/domain/SecurityExpiration.proto"; -import "spark/api/domain/SecurityCriteria.proto"; import "spark/domain_model/Security.proto"; option csharp_namespace = "bts.api.analytics"; @@ -160,7 +160,7 @@ message Report { string option_equivalence_name = 80; bts.api.SecurityType option_equivalence_type = 90; bts.api.Venue option_equivalence_venue = 91; - bts.api.domain.SecurityCriteria security_criteria = 95; + bts.domain.protobufs.SecurityCriteria security_criteria = 95; repeated double handles = 100; repeated double strike_buckets = 110; StrikeGrouping strike_grouping = 120; diff --git a/src/lib_spark/spark/config/ConfigurationState.cpp b/src/lib_spark/spark/config/ConfigurationState.cpp index cf0c0980c..a79ec1ff0 100644 --- a/src/lib_spark/spark/config/ConfigurationState.cpp +++ b/src/lib_spark/spark/config/ConfigurationState.cpp @@ -111,8 +111,7 @@ string ConfigurationState::settings_path() { } void ConfigurationState::initialize_defaults(ConfigLog &log) { - initialize_defaults( - log, {"spark/config/protos/", "spark/api/domain/", "spark/api/md/"}); + initialize_defaults(log, {"spark/config/protos/", "spark/api/md/"}); } void ConfigurationState::initialize_defaults( diff --git a/src/lib_spark/spark/domain/DomainSecurityUtils.cpp b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp index 6792d0f2e..66c56fbd1 100644 --- a/src/lib_spark/spark/domain/DomainSecurityUtils.cpp +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.cpp @@ -1,23 +1,19 @@ #include "DomainSecurityUtils.h" -#include "FutureSecurity.h" -#include "OptionSecurity.h" -#include "SecurityCommon.h" -#include "SpotSecurity.h" -#include "SpreadSecurity.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/future_security.h" +#include "domain/option_security.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/spot_security.h" +#include "domain/spread_security.h" #include "spark/domain_model/Security.pb.h" #include "spark/utils/bts_assert.h" -// #include "spark/domain/SecurityID.h" -// #include "spark/utils/overloaded.h" -// #include -// #include namespace bts::domain { -#define DOMAIN_VENUE(x) bts::api::domain::VENUE_##x -#define DOMAIN_SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define DOMAIN_VENUE(x) bts::domain::protobufs::VENUE_##x +#define DOMAIN_SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x -api::domain::Venue DomainSecurityUtils::convert(bts::api::Venue venue) { +domain::protobufs::Venue DomainSecurityUtils::convert(bts::api::Venue venue) { switch (venue) { case bts::api::Venue::VENUE_GLBX: return DOMAIN_VENUE(GLBX); @@ -51,7 +47,7 @@ api::domain::Venue DomainSecurityUtils::convert(bts::api::Venue venue) { return DOMAIN_VENUE(UNSPECIFIED); } -bts::api::Venue DomainSecurityUtils::convert(api::domain::Venue venue) { +bts::api::Venue DomainSecurityUtils::convert(domain::protobufs::Venue venue) { switch (venue) { case DOMAIN_VENUE(GLBX): return api::Venue::VENUE_GLBX; @@ -61,6 +57,8 @@ bts::api::Venue DomainSecurityUtils::convert(api::domain::Venue venue) { return api::Venue::VENUE_CBOE; case DOMAIN_VENUE(TAIFEX): return api::Venue::VENUE_TAIFEX; + case DOMAIN_VENUE(BTS): + return api::Venue::VENUE_BTS; case DOMAIN_VENUE(FTX): return api::Venue::VENUE_FTX; case DOMAIN_VENUE(BINANCE): @@ -83,7 +81,7 @@ bts::api::Venue DomainSecurityUtils::convert(api::domain::Venue venue) { } } -bts::api::domain::SecurityType DomainSecurityUtils::convert( +bts::domain::protobufs::SecurityType DomainSecurityUtils::convert( bts::api::SecurityType sec_type) { switch (sec_type) { case bts::api::SecurityType::SECURITYTYPE_UNSET: @@ -103,6 +101,26 @@ bts::api::domain::SecurityType DomainSecurityUtils::convert( } } +bts::api::SecurityType DomainSecurityUtils::convert( + bts::domain::protobufs::SecurityType sec_type) { + switch (sec_type) { + case DOMAIN_SEC_TYPE(UNSPECIFIED): + return api::SECURITYTYPE_UNSET; + case DOMAIN_SEC_TYPE(SPOT): + return api::SECURITYTYPE_SPOT; + case DOMAIN_SEC_TYPE(OPTION): + return api::SECURITYTYPE_OPTION; + case DOMAIN_SEC_TYPE(FUTURE): + return api::SECURITYTYPE_FUTURE; + case DOMAIN_SEC_TYPE(SPREAD): + return api::SECURITYTYPE_SPREAD; + case DOMAIN_SEC_TYPE(SYNTHETIC): + return api::SECURITYTYPE_SYNTHETIC; + default: + return api::SECURITYTYPE_UNSET; + } +} + bts::domain::FutureSecurity DomainSecurityUtils::convert( const bts::api::FutureContract &fut) { bts::core::TimeStamp ts( @@ -116,9 +134,8 @@ bts::domain::OptionSecurity DomainSecurityUtils::convert( opt.expiration_year(), opt.expiration_month(), opt.expiration_day()); return { ts, Price::from_double(opt.strike()), - opt.call_put() == bts::api::PUTORCALL_CALL - ? bts::api::domain::CallPut::CALL - : bts::api::domain::CallPut::PUT}; + opt.call_put() == bts::api::PUTORCALL_CALL ? bts::domain::protobufs::CallPut::CALL + : bts::domain::protobufs::CallPut::PUT}; } bts::domain::SpreadSecurity DomainSecurityUtils::convert( @@ -210,4 +227,38 @@ bool DomainSecurityUtils::get_security_desc( return true; } +domain::Security DomainSecurityUtils::convert(const bts::api::Security &sec) { + domain::Security rv; + auto exch_sec_id = DomainSecurityUtils::get_exchange_id(sec); + auto &comm = rv.security_common; + comm.venue = convert(sec.exchange()); + comm.exchange_sec_id = exch_sec_id; + *comm.id = sec.id(); + comm.currency = sec.currency(); + comm.symbol = sec.symbol(); + comm.desc = exch_sec_id; + comm.min_price_increment = sec.contract_spec().low_tick(); + switch (DomainSecurityUtils::get_type(sec)) { + case (api::SECURITYTYPE_SPOT): { + rv.security = SpotSecurity{}; + break; + } + case (api::SECURITYTYPE_FUTURE): { + rv.security = DomainSecurityUtils::convert(sec.future()); + break; + } + case (api::SECURITYTYPE_OPTION): { + rv.security = DomainSecurityUtils::convert(sec.option()); + break; + } + case (api::SECURITYTYPE_SPREAD): { + rv.security = DomainSecurityUtils::convert(sec.spread()); + break; + } + default: + bts_assert(false); + } + return rv; +} + } // namespace bts::domain diff --git a/src/lib_spark/spark/domain/DomainSecurityUtils.h b/src/lib_spark/spark/domain/DomainSecurityUtils.h index ab6ce4bd3..720809a77 100644 --- a/src/lib_spark/spark/domain/DomainSecurityUtils.h +++ b/src/lib_spark/spark/domain/DomainSecurityUtils.h @@ -1,24 +1,22 @@ #pragma once -#include "FutureSecurity.h" -#include "OptionSecurity.h" -#include "SpotSecurity.h" -#include "SpreadSecurity.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/SecurityID.h" + +#include "domain/future_security.h" +#include "domain/option_security.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/spread_security.h" #include "spark/domain_model/Security.pb.h" -#include "spark/utils/overloaded.h" -#include -#include namespace bts::domain { class DomainSecurityUtils { public: - static api::domain::Venue convert(bts::api::Venue venue); - static bts::api::Venue convert(api::domain::Venue venue); - static bts::api::domain::SecurityType convert( - bts::api::SecurityType sec_type); + static domain::Security convert(const bts::api::Security &sec); + static domain::protobufs::Venue convert(bts::api::Venue venue); + static bts::api::Venue convert(domain::protobufs::Venue venue); + static bts::domain::protobufs::SecurityType convert(bts::api::SecurityType sec_type); + static bts::api::SecurityType convert(bts::domain::protobufs::SecurityType sec_type); static bts::domain::FutureSecurity convert( const bts::api::FutureContract &fut); static bts::domain::OptionSecurity convert( diff --git a/src/lib_spark/spark/domain/NewOrder.h b/src/lib_spark/spark/domain/NewOrder.h index e487b3cb5..cf5146de1 100644 --- a/src/lib_spark/spark/domain/NewOrder.h +++ b/src/lib_spark/spark/domain/NewOrder.h @@ -1,7 +1,7 @@ #pragma once #include "OrderDefinition.h" -#include "Price.h" -#include "Quantity.h" +#include "domain/price.h" +#include "domain/quantity.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderDefinition.h b/src/lib_spark/spark/domain/OrderDefinition.h index 72b9e9a3b..3ee68f41a 100644 --- a/src/lib_spark/spark/domain/OrderDefinition.h +++ b/src/lib_spark/spark/domain/OrderDefinition.h @@ -1,11 +1,12 @@ #pragma once -#include "AccountID.h" -#include "Price.h" -#include "Quantity.h" -#include "SecurityID.h" -#include "Side.h" + #include "TimeInForce.h" #include "UserID.h" +#include "domain/account_id.h" +#include "domain/security_id.h" +#include "domain/side.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/domain/cme/GlbxOrderDefinition.h" #include "spark/domain/deribit/DeribitOrderDefinition.h" #include diff --git a/src/lib_spark/spark/domain/OrderState.h b/src/lib_spark/spark/domain/OrderState.h index 866695b49..2385176fd 100644 --- a/src/lib_spark/spark/domain/OrderState.h +++ b/src/lib_spark/spark/domain/OrderState.h @@ -1,9 +1,11 @@ #pragma once + #include "OrderStatus.h" -#include "Price.h" -#include "Quantity.h" +#include "domain/price.h" +#include "domain/quantity.h" #include "spark/domain/cme/GlbxOrderState.h" #include "spark/domain/deribit/DeribitOrderState.h" + #include namespace bts::domain { diff --git a/src/lib_spark/spark/domain/OrderUpdate.h b/src/lib_spark/spark/domain/OrderUpdate.h index 550de6449..25e5f7553 100644 --- a/src/lib_spark/spark/domain/OrderUpdate.h +++ b/src/lib_spark/spark/domain/OrderUpdate.h @@ -1,7 +1,8 @@ #pragma once -#include "OrderKey.h" -#include "Price.h" -#include "Quantity.h" + +#include "domain/price.h" +#include "domain/quantity.h" +#include "spark/domain/OrderKey.h" namespace bts::domain { diff --git a/src/lib_spark/spark/domain/Price.h b/src/lib_spark/spark/domain/Price.h index d0bb1994d..5bcba0a26 100644 --- a/src/lib_spark/spark/domain/Price.h +++ b/src/lib_spark/spark/domain/Price.h @@ -1,535 +1,3 @@ #pragma once -#include "Side.h" -#include "spark/core/FMT_IMPL.h" -#include "spark/io/JsonReader.h" -#include "spark/utils/bts_assert.h" - -#include -#include -#include -#include -#include -#include - -#if bts_assert_msg -#define __ASSERT_MSG(EXP, msg) bts_assert_msg(EXP, msg) -#else -#define __ASSERT_MSG(EXP, msg) \ - do { \ - if (!(EXP)) { \ - std::cerr << "Assert failure: " << std::string(#EXP) << " " << msg \ - << std::endl; \ - if (is_debugger_present()) \ - debug_break(); \ - std::abort(); \ - } \ - } while (0) -#endif - -#define __ASSERT(EXP) __ASSERT_MSG(EXP, "") - -#define IS_NAND(x) (x == std::numeric_limits::quiet_NaN()) - -namespace bts::domain { - -class Price { - public: - Price() = default; - explicit constexpr Price( - std::int64_t mantissa, - std::int8_t exponent = Price::exponent()) noexcept; - constexpr Price(Price const &) = default; - Price(Price &&) noexcept = default; - ~Price() = default; - - template - static Price from_float(float price) noexcept; - [[nodiscard]] constexpr float to_float() const noexcept; - - template - static Price from_double(double price) noexcept; - [[nodiscard]] constexpr double to_double() const noexcept; - - static constexpr Price zero() noexcept; - static constexpr Price nan() noexcept; - [[nodiscard]] constexpr Price abs() const noexcept; - [[nodiscard]] Price square() const noexcept; - - [[nodiscard]] constexpr Price improve(Side s, Price by) const noexcept; - [[nodiscard]] constexpr Price worsen(Side s, Price by) const noexcept; - - [[nodiscard]] constexpr bool is_nan() const noexcept; - - [[nodiscard]] constexpr bool is_better(Side s, Price p2) const noexcept; - [[nodiscard]] static constexpr bool is_better( - Side s, double p1, double p2) noexcept; - - [[nodiscard]] constexpr bool is_worse(Side s, Price p2) const noexcept; - [[nodiscard]] static constexpr bool is_worse( - Side s, double p1, double p2) noexcept; - - [[nodiscard]] constexpr bool is_better_or_equal( - Side s, Price p2) const noexcept; - [[nodiscard]] static constexpr bool is_better_or_equal( - Side s, double p1, double p2) noexcept; - - [[nodiscard]] constexpr bool is_worse_or_equal( - Side s, Price p2) const noexcept; - [[nodiscard]] static constexpr bool is_worse_or_equal( - Side s, double p1, double p2) noexcept; - - [[nodiscard]] constexpr Price repl_nan(Price repl) const noexcept; - - [[nodiscard]] constexpr Price get_min(Price other) const noexcept; - [[nodiscard]] constexpr Price get_max(Price other) const noexcept; - - [[nodiscard]] constexpr Price get_better( - Side side, Price other) const noexcept; - - [[nodiscard]] constexpr Price get_worse( - Side side, Price other) const noexcept; - - template - static double get_mean(Iter first, Iter last, bool skip_nan = false); - template - static double get_mean(Range range, bool skip_nan = false); - - static constexpr Price min() noexcept; - static constexpr Price max() noexcept; - - Price &operator=(Price const &) = default; - Price &operator=(Price &&) noexcept = default; - - constexpr Price operator-() const noexcept; - - constexpr bool operator==(Price factor) const noexcept; - constexpr bool operator!=(Price factor) const noexcept; - constexpr bool operator<(Price factor) const noexcept; - constexpr bool operator<=(Price factor) const noexcept; - constexpr bool operator>(Price factor) const noexcept; - constexpr bool operator>=(Price factor) const noexcept; - - constexpr Price operator+(Price factor) const noexcept; - constexpr Price operator-(Price factor) const noexcept; - constexpr Price operator*(Price factor) const noexcept; - constexpr Price operator/(Price factor) const noexcept; - - constexpr Price &operator+=(Price factor) noexcept; - constexpr Price &operator-=(Price factor) noexcept; - constexpr Price &operator*=(Price factor) noexcept; - constexpr Price &operator/=(Price factor) noexcept; - - constexpr bool operator==(std::int64_t factor) const noexcept; - constexpr bool operator!=(std::int64_t factor) const noexcept; - constexpr bool operator<(std::int64_t factor) const noexcept; - constexpr bool operator<=(std::int64_t factor) const noexcept; - constexpr bool operator>(std::int64_t factor) const noexcept; - constexpr bool operator>=(std::int64_t factor) const noexcept; - - constexpr Price operator+(std::int64_t factor) const noexcept; - constexpr Price operator-(std::int64_t factor) const noexcept; - constexpr Price operator*(std::int64_t factor) const noexcept; - constexpr Price operator/(std::int64_t factor) const noexcept; - - constexpr Price &operator+=(std::int64_t factor) noexcept; - constexpr Price &operator-=(std::int64_t factor) noexcept; - constexpr Price &operator*=(std::int64_t factor) noexcept; - constexpr Price &operator/=(std::int64_t factor) noexcept; - - [[nodiscard]] constexpr std::int64_t mantissa() const noexcept; - static constexpr std::int8_t exponent() noexcept; - - private: - std::int64_t _mantissa; - - static double _pow10() noexcept; - static double __pow10() noexcept; // NOLINT -}; - -void from_json(const nlohmann::json &j, Price &price); -void to_json(nlohmann::json &j, const Price &price); - -std::ostream &operator<<(std::ostream &out, Price price) noexcept; - -} // namespace bts::domain - -namespace std { - -template <> -struct hash { // NOLINT - constexpr size_t operator()(const bts::domain::Price &price) const noexcept; -}; - -} // namespace std - -////////////////////////////////////////////////// -// Definition -////////////////////////////////////////////////// - -namespace bts::domain { - -// NOLINTNEXTLINE -#define NAN_SENTINEL std::numeric_limits::min() -// NOLINTNEXTLINE -#define IS_NAN(x) (x == std::numeric_limits::min()) - -constexpr Price::Price(std::int64_t mantissa, std::int8_t exponent) noexcept - : _mantissa(mantissa) { - __ASSERT(exponent == Price::exponent()); -} - -template -inline Price Price::from_float(float price) noexcept { - return from_double(price); -} - -constexpr float Price::to_float() const noexcept { - return static_cast(to_double()); -} - -template -inline Price Price::from_double(double price) noexcept { - static_assert(PRECISION == -exponent()); - if (IS_NAND(price)) { - return nan(); - } - double temp; // NOLINT - if (fabs(modf(price, &temp)) != 0.0) { - const double rounding = 0.5 * _pow10(); - price += (price > 0) ? rounding : -rounding; - price *= __pow10(); - return Price{(std::int64_t)price}; - } - return Price{(std::int64_t)(price * __pow10())}; -} - -constexpr double Price::to_double() const noexcept { - return is_nan() ? std::numeric_limits::quiet_NaN() - : _mantissa * _pow10(); // NOLINT -} - -constexpr Price Price::zero() noexcept { return Price(0); } -constexpr Price Price::nan() noexcept { return Price(NAN_SENTINEL); } -constexpr std::int8_t Price::exponent() noexcept { return -9; } -constexpr std::int64_t Price::mantissa() const noexcept { return _mantissa; } - -constexpr Price Price::abs() const noexcept { - if (_mantissa >= 0) { - return *this; - } - return Price{-_mantissa}; -} - -inline Price Price::square() const noexcept { - auto d = to_double(); - return from_double(d * d); -} - -constexpr Price Price::improve(Side s, Price by) const noexcept { - if (s == Side::Buy) { - return *this + by; - } - return *this - by; -} - -constexpr Price Price::worsen(Side s, Price by) const noexcept { - if (s == Side::Buy) { - return *this - by; - } - return *this + by; -} - -constexpr bool Price::is_nan() const noexcept { return IS_NAN(_mantissa); } - -constexpr bool Price::is_better(Side s, Price p2) const noexcept { - if (is_nan()) { - return false; - } - if (p2.is_nan()) { - return true; - } - if (s == Side::Buy) { - return *this > p2; - } - return *this < p2; -} - -constexpr bool Price::is_better(Side s, double p1, double p2) noexcept { - if (IS_NAND(p1)) { - return false; - } - if (IS_NAND(p2)) { - return true; - } - if (s == Side::Buy) { - return p1 > p2; - } - return p1 < p2; -} - -constexpr bool Price::is_worse(Side s, Price p2) const noexcept { - return p2.is_better(s, *this); -} - -constexpr bool Price::is_worse(Side s, double p1, double p2) noexcept { - return is_better(s, p2, p1); -} - -constexpr bool Price::is_better_or_equal(Side s, Price p2) const noexcept { - if (is_nan()) { - // This case is always false (even if p2 is nan), because nan != nan. - return false; - } - if (p2.is_nan()) { - return true; - } - if (s == Side::Buy) { - return *this >= p2; - } - return *this <= p2; -} - -constexpr bool Price::is_better_or_equal( - Side s, double p1, double p2) noexcept { - if (IS_NAND(p1)) { - // This case is always false (even if p2 is nan), because nan != nan. - return false; - } - if (IS_NAND(p2)) { - return true; - } - if (s == Side::Buy) { - return p1 >= p2; - } - return p1 <= p2; -} - -constexpr bool Price::is_worse_or_equal(Side s, Price p2) const noexcept { - return p2.is_better_or_equal(s, *this); -} - -constexpr bool Price::is_worse_or_equal(Side s, double p1, double p2) noexcept { - return is_better_or_equal(s, p2, p1); -} - -constexpr Price Price::repl_nan(Price repl) const noexcept { - if (is_nan()) { - return repl; - } - return *this; -} - -constexpr Price Price::get_min(Price other) const noexcept { - if (is_nan()) { - return other; - } - if (other.is_nan()) { - return *this; - } - if (*this < other) { - return *this; - } - return other; -} - -constexpr Price Price::get_max(Price other) const noexcept { - if (is_nan()) { - return other; - } - if (other.is_nan()) { - return *this; - } - if (*this > other) { - return *this; - } - return other; -} - -constexpr Price Price::get_better(Side side, Price other) const noexcept { - switch (side.value) { - case Side::Buy: - return get_max(other); - case Side::Sell: - return get_min(other); - default: - return nan(); - } -} - -constexpr Price Price::get_worse(Side side, Price other) const noexcept { - return get_better(side.other(), other); -} - -template -inline double Price::get_mean(Iter first, Iter last, bool skip_nan) { - if (first == last) { - return std::numeric_limits::quiet_NaN(); - } - auto sum = zero(); - std::int32_t n = 0; - do { - if (first->is_nan()) { - if (skip_nan) { - continue; - } - return std::numeric_limits::quiet_NaN(); - } - sum += *first; - n++; - first++; - } while (first != last); - if (n == 0) { - return std::numeric_limits::quiet_NaN(); - } - auto dsum = sum.to_double(); - return dsum / n; -} - -template -inline double Price::get_mean(Range range, bool skip_nan) { - return get_mean(range.begin(), range.end(), skip_nan); -} - -constexpr Price Price::min() noexcept { - return Price{std::numeric_limits::min() + 1}; -} - -constexpr Price Price::max() noexcept { - return Price{std::numeric_limits::max()}; -} - -inline double Price::_pow10() noexcept { return std::pow(10.0, exponent()); } -inline double Price::__pow10() noexcept { return std::pow(10.0, -exponent()); } -constexpr Price Price::operator-() const noexcept { - if (is_nan()) { - return *this; - } - return Price{-_mantissa}; -} - -inline void from_json(const nlohmann::json &j, Price &price) { - double d; - price = io::JsonReader{&j}.read(d) ? Price::from_double(d) : Price::nan(); -} - -inline void to_json(nlohmann::json &j, const Price &price) { - j = price.to_double(); -} - -// If a number is nan, all comparisons are false. This is well-established -// behavior; even nan == nan evaluates to false. -// NOLINTNEXTLINE -#define PRICE_PRICE_COMPARISON(op, nan_part) \ - constexpr bool Price::operator op(Price factor) const noexcept { \ - return nan_part _mantissa op factor._mantissa; \ - } - -// NOLINTNEXTLINE -#define PRICE_PRICE_BIN_OP(op) \ - constexpr Price Price::operator op(Price factor) const noexcept { \ - if (is_nan() || factor.is_nan()) { \ - return nan(); \ - } \ - return Price{_mantissa op factor._mantissa}; \ - } - -// NOLINTNEXTLINE -#define PRICE_PRICE_BIN_REF_OP(op) \ - constexpr Price &Price::operator op(Price factor) noexcept { \ - if (factor.is_nan()) { \ - _mantissa = nan()._mantissa; \ - } else if (!is_nan()) { \ - _mantissa op factor._mantissa; \ - } \ - return *this; \ - } - -// NOLINTNEXTLINE -#define PRICE_INT64_COMPARISON(op, nan_part) \ - constexpr bool Price::operator op(std::int64_t factor) const noexcept { \ - return nan_part _mantissa op factor; \ - } - -// NOLINTNEXTLINE -#define PRICE_INT64_BIN_OP(op) \ - constexpr Price Price::operator op(std::int64_t factor) const noexcept { \ - if (is_nan()) { \ - return *this; \ - } \ - return Price{_mantissa op factor}; \ - } - -// NOLINTNEXTLINE -#define PRICE_INT64_BIN_REF_OP(op) \ - constexpr Price &Price::operator op(std::int64_t factor) noexcept { \ - if (!is_nan()) { \ - _mantissa op factor; \ - } \ - return *this; \ - } - -PRICE_PRICE_COMPARISON(!=, is_nan() ||) -PRICE_PRICE_COMPARISON(==, !is_nan() &&) -PRICE_PRICE_COMPARISON(<, !is_nan() &&) -PRICE_PRICE_COMPARISON(<=, !is_nan() &&) -PRICE_PRICE_COMPARISON(>, !is_nan() &&) -PRICE_PRICE_COMPARISON(>=, !is_nan() &&) - -PRICE_PRICE_BIN_OP(+) -PRICE_PRICE_BIN_OP(-) -PRICE_PRICE_BIN_OP(*) -PRICE_PRICE_BIN_OP(/) - -PRICE_PRICE_BIN_REF_OP(+=) -PRICE_PRICE_BIN_REF_OP(-=) -PRICE_PRICE_BIN_REF_OP(*=) -PRICE_PRICE_BIN_REF_OP(/=) - -PRICE_INT64_COMPARISON(!=, is_nan() ||) -PRICE_INT64_COMPARISON(==, !is_nan() &&) -PRICE_INT64_COMPARISON(<, !is_nan() &&) -PRICE_INT64_COMPARISON(<=, !is_nan() &&) -PRICE_INT64_COMPARISON(>, !is_nan() &&) -PRICE_INT64_COMPARISON(>=, !is_nan() &&) - -PRICE_INT64_BIN_OP(+) -PRICE_INT64_BIN_OP(-) -PRICE_INT64_BIN_OP(*) -PRICE_INT64_BIN_OP(/) - -PRICE_INT64_BIN_REF_OP(+=) -PRICE_INT64_BIN_REF_OP(-=) -PRICE_INT64_BIN_REF_OP(*=) -PRICE_INT64_BIN_REF_OP(/=) - -inline std::ostream &operator<<(std::ostream &out, Price p) noexcept { - out << p.to_double(); - return out; -} - -#undef NAN_SENTINEL -#undef IS_NAN -#undef PRICE_PRICE_COMPARISON -#undef PRICE_PRICE_BIN_OP -#undef PRICE_PRICE_BIN_REF_OP -#undef PRICE_INT64_COMPARISON -#undef PRICE_INT64_BIN_OP -#undef PRICE_INT64_BIN_REF_OP - -} // namespace bts::domain - -FMT_IMPL(bts::domain::Price, p, "{}", p.to_double()); - -namespace std { // NOLINT - -constexpr size_t hash::operator()( - const bts::domain::Price &price) const noexcept { - return price.mantissa(); -} - -} // namespace std - -#undef IS_NAND -#undef __ASSERT -#undef __ASSERT_MSG +#include "domain/price.h" diff --git a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h index 73cf2c5e0..9864d5523 100644 --- a/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h +++ b/src/lib_spark/spark/domain/SecurityMarketDataStatistics.h @@ -1,11 +1,13 @@ #pragma once -#include "Price.h" -#include "Quantity.h" -#include "Security.h" + +#include "domain/price.h" +#include "domain/quantity.h" +#include "domain/security.h" #include "spark/core/FMT_IMPL.h" #include "spark/io/JsonReader.h" #include "spark/md/IntPrice.h" #include "spark/md/protos/co2.pb.h" + #include #include #include diff --git a/src/lib_spark/spark/domain/TradeRecord.h b/src/lib_spark/spark/domain/TradeRecord.h index dd148f841..44bd4beec 100644 --- a/src/lib_spark/spark/domain/TradeRecord.h +++ b/src/lib_spark/spark/domain/TradeRecord.h @@ -1,8 +1,8 @@ #pragma once -#include "AggressorSide.h" -#include "Price.h" -#include "Quantity.h" -#include "SecurityID.h" +#include "domain/aggressor_side.h" +#include "domain/price.h" +#include "domain/quantity.h" +#include "domain/security_id.h" #include "spark/core/TimeStamp.h" #include "spark/logging/logging.h" #include "spark/md/IntPrice.h" diff --git a/src/lib_spark/spark/io/http/HttpProtocol.h b/src/lib_spark/spark/io/http/HttpProtocol.h index a3bde5a46..814e55b86 100644 --- a/src/lib_spark/spark/io/http/HttpProtocol.h +++ b/src/lib_spark/spark/io/http/HttpProtocol.h @@ -1,8 +1,8 @@ #pragma once #ifdef SPARK_ENABLE_CCAPI +#include "domain/protobufs/security_type.pb.h" #include "spark/algorithm/StringCaseConverter.h" -#include "spark/api/domain/SecurityType.pb.h" #include "spark/core/EnumMacros.h" #include "spark/core/FMT_IMPL.h" #include "spark/domain_model/Security.pb.h" diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp index d060e0065..a52332ded 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.cpp +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.cpp @@ -1,23 +1,23 @@ //#ifdef SPARK_ENABLE_CCAPI #include "GeneralMarketDataListener.h" -#include "spark/api/domain/Currency.pb.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/aggressor_side.h" +#include "domain/book.h" +#include "domain/future_security.h" +#include "domain/option_security.h" +#include "domain/price.h" +#include "domain/protobufs/currency.pb.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security.h" +#include "domain/security_common.h" +#include "domain/security_id.h" +#include "domain/security_state.h" +#include "domain/side.h" +#include "domain/spot_security.h" +#include "domain/spread_security.h" #include "spark/core/TimeStamp.h" -#include "spark/domain/AggressorSide.h" -#include "spark/domain/Book.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/OptionSecurity.h" -#include "spark/domain/Price.h" -#include "spark/domain/Security.h" -#include "spark/domain/SecurityCommon.h" -#include "spark/domain/SecurityID.h" #include "spark/domain/SecurityMarketDataStatistics.h" -#include "spark/domain/SecurityState.h" -#include "spark/domain/Side.h" -#include "spark/domain/SpotSecurity.h" -#include "spark/domain/SpreadSecurity.h" #include "spark/domain/TradeRecord.h" #include "spark/domain_model/Security.pb.h" #include "spark/logging/logging.h" @@ -56,7 +56,7 @@ namespace bts::md { using MDArray = std::array; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x // structs //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -109,7 +109,7 @@ struct GeneralMarketDataListener::PImpl { // stateless util functions /////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// std::string get_logical_key(const bts::domain::Security &sec) { - return bts::api::domain::Venue_Name(sec.security_common.venue) + "_" + + return bts::domain::protobufs::Venue_Name(sec.security_common.venue) + "_" + sec.security_common.exchange_sec_id; } @@ -190,8 +190,8 @@ void GeneralMarketDataListener::on_securities( "GeneralMarketDataListener::on_securities added new security, " "exchange: " "{} type: {} desc: {} id: {} spot: {} fut: {} spr: {} opt: {}", - bts::api::domain::Venue_Name(s_comm.venue), - bts::api::domain::SecurityType_Name(sec.type()), s_comm.desc, + bts::domain::protobufs::Venue_Name(s_comm.venue), + bts::domain::protobufs::SecurityType_Name(sec.type()), s_comm.desc, search_result.key, std::holds_alternative(sec.security), std::holds_alternative(sec.security), @@ -204,8 +204,8 @@ void GeneralMarketDataListener::on_securities( "ignoring it, " "exchange: " "{} type: {} desc: {} id: {}", - bts::api::domain::Venue_Name(s_comm.venue), - bts::api::domain::SecurityType_Name(sec.type()), s_comm.desc, + bts::domain::protobufs::Venue_Name(s_comm.venue), + bts::domain::protobufs::SecurityType_Name(sec.type()), s_comm.desc, search_result.key); continue; } @@ -379,7 +379,7 @@ void GeneralMarketDataListener::_add_option(const bts::domain::Security &sec) { fo_sec.expiration_month = month; fo_sec.expiration_day = day; fo_sec.strike = o_sec.strike.to_double(); - fo_sec.call_put = o_sec.call_put == bts::api::domain::CallPut::CALL + fo_sec.call_put = o_sec.call_put == bts::domain::protobufs::CallPut::CALL ? api::PutOrCall::PUTORCALL_CALL : api::PutOrCall::PUTORCALL_PUT; _commit_security(fo_sec); diff --git a/src/lib_spark/spark/md/GeneralMarketDataListener.h b/src/lib_spark/spark/md/GeneralMarketDataListener.h index 15ea22aa0..08eefb595 100644 --- a/src/lib_spark/spark/md/GeneralMarketDataListener.h +++ b/src/lib_spark/spark/md/GeneralMarketDataListener.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/Security.h" -#include "spark/domain/SecurityID.h" + +#include "domain/security.h" #include "spark/domain_model/Security.pb.h" #include "spark/md/GeneralSecurityIndex.h" #include "spark/md/IMarketDataListener.h" diff --git a/src/lib_spark/spark/md/IMarketDataListener.h b/src/lib_spark/spark/md/IMarketDataListener.h index 268606043..d76d51684 100644 --- a/src/lib_spark/spark/md/IMarketDataListener.h +++ b/src/lib_spark/spark/md/IMarketDataListener.h @@ -1,6 +1,6 @@ #pragma once -#include "spark/domain/Book.h" +#include "domain/book.h" #include "spark/md/PriceSize.h" #include diff --git a/src/lib_spark/spark/md/SecurityStore.cpp b/src/lib_spark/spark/md/SecurityStore.cpp index 3dff4b26d..3b7663aca 100644 --- a/src/lib_spark/spark/md/SecurityStore.cpp +++ b/src/lib_spark/spark/md/SecurityStore.cpp @@ -1,6 +1,6 @@ #include "SecurityStore.h" -#include "spark/domain/FutureSecurity.h" -#include "spark/domain/Security.h" +#include "domain/future_security.h" +#include "domain/security.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/LockBox.h" @@ -11,11 +11,11 @@ namespace bts::md { -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x -#define VENUE(x) bts::api::domain::VENUE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x +#define VENUE(x) bts::domain::protobufs::VENUE_##x static domain::SecurityID create_sec_id( - api::domain::Venue venue, std::uint32_t exch_id) { + domain::protobufs::Venue venue, std::uint32_t exch_id) { auto val = static_cast(exch_id) | (static_cast(venue) >> 31); return domain::SecurityID{val}; @@ -94,8 +94,8 @@ const domain::Security *SecurityStore::add_db_security( } bool SecurityStore::add_security( - api::domain::Venue venue, - api::domain::SecurityType type, + domain::protobufs::Venue venue, + domain::protobufs::SecurityType type, const std::string &symbol) { if (venue == VENUE(UNSPECIFIED) || symbol.empty() || type == SEC_TYPE(UNSPECIFIED)) { diff --git a/src/lib_spark/spark/md/SecurityStore.h b/src/lib_spark/spark/md/SecurityStore.h index 3580f176d..17ad58eb8 100644 --- a/src/lib_spark/spark/md/SecurityStore.h +++ b/src/lib_spark/spark/md/SecurityStore.h @@ -1,9 +1,10 @@ #pragma once #include "MDConsumerHandle.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" -#include "spark/domain/SecurityID.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security_id.h" + #include namespace bts::domain { @@ -31,8 +32,8 @@ class SecurityStore { // returns true if the cache was updated bool add_security( - api::domain::Venue venue, - api::domain::SecurityType type, + domain::protobufs::Venue venue, + domain::protobufs::SecurityType type, const std::string &symbol); const domain::Security *add_db_security(const SecurityPtr &security); void flush_to_disk(); diff --git a/src/lib_spark/spark/md/SymbolLoader.h b/src/lib_spark/spark/md/SymbolLoader.h index 949ce9333..c5e31365d 100644 --- a/src/lib_spark/spark/md/SymbolLoader.h +++ b/src/lib_spark/spark/md/SymbolLoader.h @@ -1,13 +1,13 @@ #pragma once #include "UserSymbol.h" #include "common.h" +#include "domain/security_criteria.h" #include "spark/api/md/MarketDataConfig.pb.h" #include "spark/config/config.h" #include "spark/config/protos/market_data.pb.h" #include "spark/config/protos/symbols.pb.h" #include "spark/core/FMT.h" #include "spark/domain/DomainSecurityUtils.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/domain_model/Security.pb.h" #include @@ -17,8 +17,8 @@ namespace bts::md { // Macro aliases for verbose types/fns. Be sure to undef at end of file. -#define SEC_TYPE(t) bts::api::SECURITYTYPE_##t -#define VENUE(v) bts::api::VENUE_##v +#define SEC_TYPE(t) bts::domain::protobufs::SECURITY_TYPE_##t +#define VENUE(v) bts::domain::protobufs::VENUE_##v class SymbolLoader { public: @@ -37,7 +37,8 @@ class SymbolLoader { SymbolLoader(const SymbolLoader &); SymbolLoader &operator=(const SymbolLoader &); - static constexpr bool venue_has_synths(Venue venue); + static constexpr bool venue_has_synths(api::Venue venue); + static constexpr bool venue_has_synths(domain::protobufs::Venue venue); static void add_symbols( const google::protobuf::RepeatedPtrField &symbols, @@ -45,25 +46,36 @@ class SymbolLoader { SecurityType type, std::set &result); + static void add_symbols( + const google::protobuf::RepeatedPtrField &symbols, + domain::protobufs::Venue exchange, + domain::protobufs::SecurityType type, + std::set &result); + static bool parse_venue(const std::string &str, bts::md::Venue *venue); + static bool parse_venue(const std::string &str, domain::protobufs::Venue *venue); }; ////////////////////////////////////////////////// // Definition ////////////////////////////////////////////////// -constexpr bool SymbolLoader::venue_has_synths(Venue venue) { +constexpr bool SymbolLoader::venue_has_synths(api::Venue venue) { switch (venue) { - case VENUE(SIM): - case VENUE(SIMICE): - case VENUE(ICE): - case VENUE(GLBX): + case api::VENUE_SIM: + case api::VENUE_SIMICE: + case api::VENUE_ICE: + case api::VENUE_GLBX: return true; default: return false; } } +constexpr bool SymbolLoader::venue_has_synths(domain::protobufs::Venue venue) { + return venue_has_synths(domain::DomainSecurityUtils::convert(venue)); +} + inline void SymbolLoader::add_symbols( const google::protobuf::RepeatedPtrField &symbols, Venue exchange, @@ -75,6 +87,16 @@ inline void SymbolLoader::add_symbols( } } +inline void SymbolLoader::add_symbols( + const google::protobuf::RepeatedPtrField &symbols, + domain::protobufs::Venue exchange, + domain::protobufs::SecurityType type, + std::set &result) { + auto api_venue = domain::DomainSecurityUtils::convert(exchange); + auto api_type = domain::DomainSecurityUtils::convert(type); + add_symbols(symbols, api_venue, api_type, result); +} + inline std::set SymbolLoader::load( const bts::domain::SecurityCriteria &filter) { std::set result; @@ -88,7 +110,7 @@ inline std::size_t SymbolLoader::load( const auto &cfg = config::get(); const bool include_all = !filter.is_defined(); for (const auto &vcfg : cfg.venues()) { - Venue venue; + domain::protobufs::Venue venue; if (!parse_venue(vcfg.name(), &venue)) { LOG(md, Error, "Unable to load symbols for unknown venue '{}'", vcfg.name()); @@ -139,6 +161,19 @@ inline bool SymbolLoader::parse_venue( return false; } +inline bool SymbolLoader::parse_venue( + const std::string &str, domain::protobufs::Venue *venue) { + if (domain::protobufs::Venue_Parse(str, venue)) { + return true; + } + if (str.rfind("VENUE_", 0) == 0) { + if (domain::protobufs::Venue_Parse(std::string{"VENUE_"} + str, venue)) { + return true; + } + } + return false; +} + #undef SEC_TYPE #undef VENUE diff --git a/src/lib_spark/spark/md/SyntheticSecurityService.cpp b/src/lib_spark/spark/md/SyntheticSecurityService.cpp index e1fa86aed..fe7416b84 100644 --- a/src/lib_spark/spark/md/SyntheticSecurityService.cpp +++ b/src/lib_spark/spark/md/SyntheticSecurityService.cpp @@ -1,12 +1,12 @@ #ifndef _WIN32 #include "SyntheticSecurityService.h" -#include "spark/api/domain/SecurityType.pb.h" -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/security_type.pb.h" +#include "domain/protobufs/venue.pb.h" +#include "domain/security_criteria.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/services/PersistenceService.pb.h" #include "spark/config/config.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/md/SecurityDB.h" #include "spark/md/SecurityIDRecorder.h" #include "spark/md/SymbolLoader.h" @@ -23,7 +23,7 @@ using bts::domain::SecurityCriteria; using bts::md::SecurityIDRecorder; using bts::md::SymbolLoader; -#define SEC_TYPE(x) bts::api::domain::SECURITY_TYPE_##x +#define SEC_TYPE(x) bts::domain::protobufs::SECURITY_TYPE_##x struct SecurityLess { bool operator()(const api::Security &left, const api::Security &right) { diff --git a/src/lib_spark/spark/md/cme/MDP3Utils.cpp b/src/lib_spark/spark/md/cme/MDP3Utils.cpp index 224f318d1..d79693dac 100644 --- a/src/lib_spark/spark/md/cme/MDP3Utils.cpp +++ b/src/lib_spark/spark/md/cme/MDP3Utils.cpp @@ -1,11 +1,11 @@ #ifndef _WIN32 #include "MDP3Utils.h" +#include "domain/security_criteria.h" #include "spark/config/config.h" #include "spark/config/protos/deployment_type.pb.h" #include "spark/config/protos/market_data.pb.h" #include "spark/config/protos/system_config.pb.h" #include "spark/core/FMT.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/bts_chrono.h" @@ -121,7 +121,7 @@ SecurityType infer_security_type(const string &label) { const std::vector get_configured_cme_channels() { // Get all glbx symbols const auto symbols = - SymbolLoader::load(SecurityCriteria::create({api::domain::VENUE_GLBX})); + SymbolLoader::load(SecurityCriteria::create({domain::protobufs::VENUE_GLBX})); return parse_channels({symbols.begin(), symbols.end()}); } template diff --git a/src/lib_spark/spark/md/ice/ICEUtils.cpp b/src/lib_spark/spark/md/ice/ICEUtils.cpp index 782f13963..b2b0d7be2 100644 --- a/src/lib_spark/spark/md/ice/ICEUtils.cpp +++ b/src/lib_spark/spark/md/ice/ICEUtils.cpp @@ -1,8 +1,8 @@ #ifndef _WIN32 #include "ICEUtils.h" +#include "domain/security_criteria.h" #include "spark/config/config.h" -#include "spark/domain/SecurityCriteria.h" #include "spark/logging/logging.h" #include "spark/md/SymbolLoader.h" #include "spark/utils/bts_chrono.h" @@ -127,7 +127,7 @@ void await_ice_config() { const std::vector get_configured_ice_channels() { // Get all ice symbols const auto symbols = - SymbolLoader::load(SecurityCriteria::create({api::domain::VENUE_ICE})); + SymbolLoader::load(SecurityCriteria::create({domain::protobufs::VENUE_ICE})); return parse_ice_channels({symbols.begin(), symbols.end()}); } diff --git a/src/lib_spark/spark/persistence/IDGenerator.cpp b/src/lib_spark/spark/persistence/IDGenerator.cpp index 5a16c3aa1..540510f25 100644 --- a/src/lib_spark/spark/persistence/IDGenerator.cpp +++ b/src/lib_spark/spark/persistence/IDGenerator.cpp @@ -9,8 +9,8 @@ namespace bts::persistence { -using bts::api::domain::Venue; -using bts::api::domain::Venue_Name; +using bts::domain::protobufs::Venue; +using bts::domain::protobufs::Venue_Name; using std::string; std::shared_ptr IDGenerator::instance_ptr_ = nullptr; diff --git a/src/lib_spark/spark/persistence/IDGenerator.h b/src/lib_spark/spark/persistence/IDGenerator.h index 482abde95..8b5181adc 100644 --- a/src/lib_spark/spark/persistence/IDGenerator.h +++ b/src/lib_spark/spark/persistence/IDGenerator.h @@ -1,6 +1,7 @@ #pragma once -#include "spark/api/domain/Venue.pb.h" +#include "domain/protobufs/venue.pb.h" + #include #include #include @@ -20,7 +21,7 @@ class IDGenerator { static std::shared_ptr instance_ptr(); std::optional get_id( - const api::domain::Venue &venue, + const domain::protobufs::Venue &venue, const std::string &name, bool add_if_new = false); @@ -28,7 +29,7 @@ class IDGenerator { const std::string &ns, const std::string &key, bool add_if_new); std::uint64_t get_or_add( - const api::domain::Venue &venue, const std::string &name); + const domain::protobufs::Venue &venue, const std::string &name); std::uint64_t get_or_add(const std::string &ns, const std::string &key); diff --git a/tools/py/build_admin_web_app.py b/tools/py/build_admin_web_app.py index 7c80ad157..cf3081632 100644 --- a/tools/py/build_admin_web_app.py +++ b/tools/py/build_admin_web_app.py @@ -91,6 +91,7 @@ def _gen_fs_pbufs( f'{protoc_path}', f'--plugin=protoc-gen-service={plugin_script_path}', f'--service_out=lang=fs,strip_out_path=1:{out_path.joinpath("fable")}', + f'-I {os.path.relpath(root_path.joinpath("src", "lib_domain"), os.curdir)}', f'-I {os.path.relpath(root_path.joinpath("src", "lib_spark"), os.curdir)}', f'-I {os.path.relpath(str(root_path.joinpath("externals", "linux", "include")), os.curdir)}', ' '.join(protos_rel) @@ -178,13 +179,13 @@ def _main(): os.chdir(args.src_path) # 1) Build js protobufs - _gen_js_pbufs(args.src_path, args.out_path, args.pbufs_abs) + # _gen_js_pbufs(args.src_path, args.out_path, args.pbufs_abs) # 2) Build fs protobufs - _gen_fs_pbufs(args.root_path, args.src_path, args.out_path, args.pbufs_abs) + # _gen_fs_pbufs(args.root_path, args.src_path, args.out_path, args.pbufs_abs) # 3) Build typescript - _tsc(args.src_path, args.tsconfig) + # _tsc(args.src_path, args.tsconfig) # 4) Generate fs stubs from typescript that was just built _gen_fsts_stubs(args.src_path, args.out_path)