From bef84d6dc32d5a8448c0e92afbbde022e95e251c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Mar 2026 15:17:51 +0000 Subject: [PATCH] build: Install boost via vcpkg on linux, update ccapi Old ccapi wasn't compatible with new boost --- externals | 2 +- .../md/binance/BinanceMiniTickerUpdate.cpp | 3 +- .../md/binance/BinancePriceStatistics.cpp | 3 +- .../md/binance/BinanceSecurityRequestor.cpp | 4 +- .../binance_coin_futures_price_statistics.cpp | 3 +- ..._coin_futures_price_statistics_adaptor.cpp | 2 +- ...inance_coin_futures_security_requestor.cpp | 4 +- .../binance_us/BinanceUsPriceStatistics.cpp | 3 +- .../binance_us/BinanceUsSecurityRequestor.cpp | 8 ++-- .../BinanceUsdsFuturesPriceStatistics.cpp | 3 +- ...nanceUsdsFuturesPriceStatisticsAdaptor.cpp | 2 +- .../BinanceUsdsFuturesSecurityRequestor.cpp | 4 +- .../sparkd/md/ccapi/CCApiDepthWalker.cpp | 2 +- .../sparkd/md/ccapi/CCApiDepthWalker.h | 2 +- .../sparkd/md/ccapi/CCApiEventDemuxer.cpp | 3 +- .../sparkd/md/ccapi/CCApiEventDemuxer.h | 2 +- .../sparkd/md/ccapi/CCApiEventLogger.h | 2 +- .../sparkd/md/ccapi/CCApiJsonRpcRequest.h | 2 +- .../sparkd/md/ccapi/CCApiJsonRpcRouter.cpp | 2 +- .../md/ccapi/CCApiMarketDepthAdaptor.cpp | 2 +- .../sparkd/md/ccapi/CCApiMessageLogger.cpp | 2 +- src/app_sparkd/sparkd/md/ccapi/CCApiReader.h | 2 +- .../sparkd/md/ccapi/CCApiTradeAdaptor.cpp | 4 +- .../md/coinbase/CoinbasePriceStatistics.cpp | 3 +- .../md/coinbase/CoinbaseSecurityRequestor.cpp | 8 ++-- .../sparkd/md/deribit/DeribitSubscription.cpp | 2 +- .../md/ftx/FTXHistoricalPriceRecord.cpp | 3 +- .../sparkd/md/ftx/FTXSecurityRequestor.cpp | 10 ++-- .../sparkd/md/okx/OkxChannelDemuxer.cpp | 2 +- .../sparkd/md/okx/OkxSecuritySubscription.cpp | 4 +- .../cmake/GetLinuxClientLinkLibraries.cmake | 42 ++++++++++++++--- .../cmake/GetLinuxServerLinkLibraries.cmake | 46 ++++++++++++++++--- .../spark/expression/BooleanGrammar.h | 4 +- .../orderman/ccapi/CCAPIDeribitOrderMux.cpp | 9 ++-- .../orderman/ccapi/CCAPIOrderCallbackMsgs.cpp | 2 +- .../orderman/ccapi/CCAPIOrderCallbackMsgs.h | 12 ++--- .../orderman/tests/CCApiExecutionTests.cpp | 5 +- vcpkg.json | 8 ++++ 38 files changed, 149 insertions(+), 77 deletions(-) diff --git a/externals b/externals index dfae8ce68..9fa7a9898 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit dfae8ce6828aa1db8eeaaabdda1b254bddd306ab +Subproject commit 9fa7a9898e0712303846010c6bd787e7d29a1c57 diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index 41e378d50..6c50e261e 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -21,10 +21,11 @@ using bts::domain::SecurityMarketDataStatistics; using bts::io::JsonReader; using std::map; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &ticker_upds) { auto it = name_values.find(CCAPI_HTTP_BODY); if (it == name_values.end()) { diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index 12675e502..5da0bc125 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -21,10 +21,11 @@ using bts::domain::SecurityMarketDataStatistics; using bts::io::JsonReader; using std::map; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &result) { CCApiReader ccapi_reader{&name_values}; nlohmann::json js; diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp index d9e24d67f..c185d860b 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSecurityRequestor.cpp @@ -180,7 +180,7 @@ struct BinanceSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GENERIC_PUBLIC_REQUEST, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, types, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -214,7 +214,7 @@ struct BinanceSecurityRequestor::PImpl { _FATAL_MSGF( "on_exchange_info. {} event was unexpected:\n{}", ccapi::Event::typeToString(event.getType()), - event.toStringPretty()); + event.toPrettyString()); break; } return true; diff --git a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp index 063ee03cd..736e48fa0 100644 --- a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics.cpp @@ -21,10 +21,11 @@ using std::map; using std::pair; using std::size_t; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &result) { CCApiReader ccapi_reader{&name_values}; nlohmann::json js; diff --git a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp index 5a92f3fe0..55da2878d 100644 --- a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_price_statistics_adaptor.cpp @@ -60,7 +60,7 @@ void BinanceCoinFuturesPriceStatisticsAdaptor::on_messages( const auto n_total = n_hits + n_misses; _ERROR( "on_messages. Parse failed on {}/{} elements:\n{}", n_misses, - n_total, event.toStringPretty()); + n_total, event.toPrettyString()); continue; } for (const auto &bsr : binance_stats_recs) { diff --git a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp index 3fae4d06a..fe454d051 100644 --- a/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_coin_futures/binance_coin_futures_security_requestor.cpp @@ -177,7 +177,7 @@ struct BinanceCoinFuturesSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GENERIC_PUBLIC_REQUEST, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -211,7 +211,7 @@ struct BinanceCoinFuturesSecurityRequestor::PImpl { _FATAL_MSGF( "on_exchange_info. {} event was unexpected:\n{}", ccapi::Event::typeToString(event.getType()), - event.toStringPretty()); + event.toPrettyString()); break; } return true; diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index 47437938b..6f8af14c1 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -23,10 +23,11 @@ using std::int64_t; using std::map; using std::ostream; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &result) { CCApiReader ccapi_reader{&name_values}; nlohmann::json js; diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp index b141ba66a..a3a8bcd99 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSecurityRequestor.cpp @@ -69,10 +69,10 @@ static vector get_sec_descs(const vector &sec_ptrs) { static void validate_response(const ccapi::Event &event, bool is_expected) { bts_assert_msgf( event.getType() == ccapi::Event::Type::RESPONSE, - "Received event w/ unexpected type:\n{}", event.toStringPretty()); + "Received event w/ unexpected type:\n{}", event.toPrettyString()); bts_assert_msgf( is_expected, "Received unexpected response from Binance US:\n{}", - event.toStringPretty()); + event.toPrettyString()); } struct BinanceUsSecurityRequestor::PImpl { @@ -181,7 +181,7 @@ struct BinanceUsSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GENERIC_PUBLIC_REQUEST, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, types, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -200,7 +200,7 @@ struct BinanceUsSecurityRequestor::PImpl { const CCApiCorrelationID & /*corr_id*/) { validate_response(event, exch_info_req_pending); LOG(md, Diag, "Received Binance US exchange info (spots):\n{}", - event.toStringPretty()); + event.toPrettyString()); update_securities(msgs, {SEC_TYPE(SPOT)}); exch_info_req_pending = false; if (external_req_pending && !is_busy()) { 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 051c7e7b5..4bd0367dc 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -21,10 +21,11 @@ using std::map; using std::pair; using std::size_t; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &result) { CCApiReader ccapi_reader{&name_values}; nlohmann::json js; 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..b5d749829 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp @@ -60,7 +60,7 @@ void BinanceUsdsFuturesPriceStatisticsAdaptor::on_messages( const auto n_total = n_hits + n_misses; _ERROR( "on_messages. Parse failed on {}/{} elements:\n{}", n_misses, - n_total, event.toStringPretty()); + n_total, event.toPrettyString()); continue; } for (const auto &bsr : binance_stats_recs) { 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 6479bcc73..64b907ce8 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp @@ -178,7 +178,7 @@ struct BinanceUsdsFuturesSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GENERIC_PUBLIC_REQUEST, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -212,7 +212,7 @@ struct BinanceUsdsFuturesSecurityRequestor::PImpl { _FATAL_MSGF( "on_exchange_info. {} event was unexpected:\n{}", ccapi::Event::typeToString(event.getType()), - event.toStringPretty()); + event.toPrettyString()); break; } return true; diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp index 4211bde41..7e6a36b1e 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.cpp @@ -8,7 +8,7 @@ namespace bts::md { using bts::domain::Quantity; bool CCApiDepthWalker::parse_field( - const std::string &name, const std::string &value) { + const std::string_view &name, const std::string &value) { bts_assert(depth_ptr); auto &depth = *depth_ptr; if (name == price_key) { diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h index 3e758cf13..bd0adac4e 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiDepthWalker.h @@ -15,7 +15,7 @@ class CCApiDepthWalker { std::size_t price_idx = 0; std::size_t qty_idx = 0; - bool parse_field(const std::string &name, const std::string &value); + bool parse_field(const std::string_view &name, const std::string &value); }; } // namespace bts::md diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp index 0441c4d3e..c3ed7d2ec 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.cpp @@ -57,7 +57,7 @@ CCApiEventDemuxer::CCApiEventDemuxer(std::size_t corr_id_len) CCApiEventDemuxer::~CCApiEventDemuxer() = default; -bool CCApiEventDemuxer::processEvent( +void CCApiEventDemuxer::processEvent( const ccapi::Event &event, ccapi::Session *session) { unordered_map> demuxed_msgs; @@ -91,7 +91,6 @@ bool CCApiEventDemuxer::processEvent( hnd.on_messages(event, session, msgs, hnd_corr_id); } } - return true; } void CCApiEventDemuxer::on_messages( diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h index 43276976c..6173d5f21 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventDemuxer.h @@ -19,7 +19,7 @@ class CCApiEventDemuxer : public ccapi::EventHandler, explicit CCApiEventDemuxer(std::size_t corr_id_len = 0); ~CCApiEventDemuxer() override; - bool processEvent( + void processEvent( const ccapi::Event &event, ccapi::Session *session) override; void on_messages( diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h index 2d514493f..4c190b370 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiEventLogger.h @@ -10,7 +10,7 @@ class CCApiRequestor_Handler : public ccapi::EventHandler { public: bool processEvent( const ccapi::Event &event, ccapi::Session * /*session*/) override { - LOG(md, Info, "on ccapi event: {}", event.toStringPretty(2, 2)); + LOG(md, Info, "on ccapi event: {}", event.toPrettyString(2, 2)); return true; } }; diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h index b6494975e..9f95514da 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRequest.h @@ -40,7 +40,7 @@ inline ccapi::Subscription CCApiJsonRpcRequest::rpc_sub( const io::websocket::JsonRpcRequest &req, std::string venue_name, const CCApiCorrelationID &corr_id) { - return { + return ccapi::Subscription{ std::move(venue_name), "", CCAPI_GENERIC_PUBLIC_SUBSCRIPTION, req.to_string(), corr_id.to_string()}; } diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp index f9fa0cf28..fd8d6aace 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiJsonRpcRouter.cpp @@ -38,7 +38,7 @@ void CCApiJsonRpcRouter::on_messages( BTS_FATAL_MSGF( "Exception occurred handling rpc " "message.\n***ex***:{}\n***event***:\n{}", - msg, event.toStringPretty()); + msg, event.toPrettyString()); }); } diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp index f7e71d2c7..d2bd0430b 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMarketDepthAdaptor.cpp @@ -45,7 +45,7 @@ static bool parse(const ccapi::Message &msg, domain::Book &book) { ask_walker.parse_field(name, value); } catch (const std::exception &ex) { LOG(md, Fatal, "Error parsing depth update: {}\nmsg:\n{}", - std::string{ex.what()}, msg.toStringPretty()); + std::string{ex.what()}, msg.toPrettyString()); bts_assert_msg(false, "Fatal error parsing depth update."); } } diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp index f84b36cb1..0e3ba0fec 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiMessageLogger.cpp @@ -22,7 +22,7 @@ void CCApiMessageLogger::on_messages( const CCApiCorrelationID &corr_id) { auto msg_strs = msgs | ranges::views::transform([](const ccapi::Message *m) { - return m->toStringPretty(); + return m->toPrettyString(); }); auto msgs_str = join(msg_strs.begin(), msg_strs.end(), "\n"); LOG(md, Info, "Received CCApi messages. name: {}; corr_id: {}; msgs:\n{}", diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h b/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h index 7ccdf8df7..0e38b49ef 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiReader.h @@ -15,7 +15,7 @@ namespace bts::md { class CCApiReader { public: - using NameValues = std::map; + using NameValues = std::map; explicit CCApiReader(const NameValues *name_values); diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp index cdefd9db5..1b31c4027 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiTradeAdaptor.cpp @@ -39,7 +39,7 @@ void CCApiTradeAdaptor::on_messages( ccapi::Message::typeToString(msg->getType())); return; } - LOG(md, Diag, "Received CCApi trade msg:\n{}", msg->toStringPretty()); + LOG(md, Diag, "Received CCApi trade msg:\n{}", msg->toPrettyString()); auto ts = TimeStamp::from_int64( msg->getTimeReceived().time_since_epoch().count()); auto sec_desc = corr_id.peek_string(); @@ -54,7 +54,7 @@ void CCApiTradeAdaptor::on_messages( } if (trades.empty()) { LOG(md, Warn, "Received ccapi trade msg with no trades:\n{}", - event.toStringPretty()); + event.toPrettyString()); return; } std::vector trade_ptrs; diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp index 8c178dc8a..c10cc2ab9 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbasePriceStatistics.cpp @@ -21,10 +21,11 @@ using std::int64_t; using std::map; using std::ostream; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, vector &result) { auto it = name_values.find(CCAPI_HTTP_BODY); const auto &body = it->second; diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp index 26773a27e..d5622e6ac 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSecurityRequestor.cpp @@ -62,10 +62,10 @@ static vector get_sec_descs(const vector &sec_ptrs) { static void validate_response(const ccapi::Event &event, bool is_expected) { bts_assert_msgf( event.getType() == ccapi::Event::Type::RESPONSE, - "Received event w/ unexpected type:\n{}", event.toStringPretty()); + "Received event w/ unexpected type:\n{}", event.toPrettyString()); bts_assert_msgf( is_expected, "Received unexpected response from Coinbase:\n{}", - event.toStringPretty()); + event.toPrettyString()); } struct CoinbaseSecurityRequestor::PImpl { @@ -172,7 +172,7 @@ struct CoinbaseSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GET_INSTRUMENTS, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, types, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -191,7 +191,7 @@ struct CoinbaseSecurityRequestor::PImpl { const CCApiCorrelationID & /*corr_id*/) { validate_response(event, exch_info_req_pending); LOG(md, Diag, "Received Coinbase exchange info (spots):\n{}", - event.toStringPretty()); + event.toPrettyString()); std::cout << msgs.size(); update_securities(msgs, {SEC_TYPE(SPOT)}); exch_info_req_pending = false; diff --git a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp index 180efac93..3f7be89a8 100644 --- a/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp +++ b/src/app_sparkd/sparkd/md/deribit/DeribitSubscription.cpp @@ -99,7 +99,7 @@ static ccapi::Subscription mk_deribit_sub(Channels channels, size_t sub_id) { "public/subscribe", {{"channels", vector{channels.begin(), channels.end()}}}, JsonRpcId::create()}; - return { + return ccapi::Subscription{ CCAPI_VENUE_NAME, "", CCAPI_GENERIC_PUBLIC_SUBSCRIPTION, req.to_string(), FMT("{}.SUBSCRIPTION_{}", VENUE_NAME, sub_id)}; } diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index a2473f252..8767baecf 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -19,10 +19,11 @@ using bts::domain::SecurityMarketDataStatistics; using bts::io::JsonReader; using std::map; using std::string; +using std::string_view; using std::vector; static bool parse( - const map &name_values, + const map &name_values, std::vector &price_recs) { CCApiReader ccapi_reader{&name_values}; nlohmann::json js; diff --git a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp index 4e174dd21..e23b0932c 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXSecurityRequestor.cpp @@ -84,10 +84,10 @@ static vector get_sec_descs(const vector &sec_ptrs) { static void validate_response(const ccapi::Event &event, bool is_expected) { bts_assert_msgf( event.getType() == ccapi::Event::Type::RESPONSE, - "Received event w/ unexpected type:\n{}", event.toStringPretty()); + "Received event w/ unexpected type:\n{}", event.toPrettyString()); bts_assert_msgf( is_expected, "Received unexpected response from FTX:\n{}", - event.toStringPretty()); + event.toPrettyString()); } struct FTXSecurityRequestor::PImpl { @@ -200,7 +200,7 @@ struct FTXSecurityRequestor::PImpl { for (const auto *msg : msgs) { bts_assert_msgf( msg->getType() == ccapi::Message::Type::GENERIC_PUBLIC_REQUEST, - "Received msg w/ unexpected type:\n{}", msg->toStringPretty()); + "Received msg w/ unexpected type:\n{}", msg->toPrettyString()); parse_secs(*msg, types, added_secs); } auto added_sec_descs = get_sec_descs(added_secs); @@ -218,7 +218,7 @@ struct FTXSecurityRequestor::PImpl { const vector &msgs, const CCApiCorrelationID & /*corr_id*/) { validate_response(event, mkts_req_pending); - LOG(md, Diag, "Received FTX markets:\n{}", event.toStringPretty()); + LOG(md, Diag, "Received FTX markets:\n{}", event.toPrettyString()); update_securities(msgs, {SEC_TYPE(SPOT)}); mkts_req_pending = false; if (external_req_pending && !is_busy()) { @@ -236,7 +236,7 @@ struct FTXSecurityRequestor::PImpl { const vector &msgs, const CCApiCorrelationID & /*corr_id*/) { validate_response(event, futs_req_pending); - LOG(md, Diag, "Received FTX futures:\n{}", event.toStringPretty()); + LOG(md, Diag, "Received FTX futures:\n{}", event.toPrettyString()); update_securities(msgs, {SEC_TYPE(FUTURE)}); futs_req_pending = false; if (external_req_pending && !is_busy()) { diff --git a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp index 59def83f1..45ad46771 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxChannelDemuxer.cpp @@ -131,7 +131,7 @@ void OkxChannelDemuxer::on_messages( if (me_->process_subscription_error(payload_j)) { continue; } - _ERROR("on_messages. Unknown payload type:\n{}", event.toStringPretty()); + _ERROR("on_messages. Unknown payload type:\n{}", event.toPrettyString()); } me_->flush(); } diff --git a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp index bc455611e..80fefdccd 100644 --- a/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp +++ b/src/app_sparkd/sparkd/md/okx/OkxSecuritySubscription.cpp @@ -281,7 +281,7 @@ struct OkxSecuritySubscription::PImpl { } catch (const std::exception &ex) { _ERROR( "on_underlying_. Parse error: {}\n***Event***:\n{}", - string{ex.what()}, event.toStringPretty()); + string{ex.what()}, event.toPrettyString()); return true; } option_ulys = {unds.begin(), unds.end()}; @@ -306,7 +306,7 @@ struct OkxSecuritySubscription::PImpl { _ERROR( "on_instruments_snapshot_. Failed to read instruments. Exception: " "{}.\n***Event***\n{}", - string{ex.what()}, event.toStringPretty()); + string{ex.what()}, event.toPrettyString()); } return true; } diff --git a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake index 73c06db4d..b63e0bbf1 100644 --- a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake @@ -1,16 +1,44 @@ function(get_link_libraries dest) + find_package( + Boost + REQUIRED + COMPONENTS + asio + atomic + chrono + circular_buffer + date_time + filesystem + format + interprocess + lockfree + regex + signals2 + spirit + system + thread + variant + ) find_package(fmt CONFIG REQUIRED) find_package(Catch2 CONFIG REQUIRED) set(${dest} + Boost::asio + Boost::atomic + Boost::chrono + Boost::circular_buffer + Boost::date_time + Boost::filesystem + Boost::format + Boost::interprocess + Boost::lockfree + Boost::regex + Boost::signals2 + Boost::spirit + Boost::system + Boost::thread + Boost::variant curl tbb - boost_system - boost_thread - boost_filesystem - boost_regex - boost_chrono - boost_date_time - boost_atomic Catch2::Catch2 protobuf protoc diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index 8e494e915..2b8512667 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -1,17 +1,49 @@ function(get_link_libraries dest) + find_package( + Boost + REQUIRED + COMPONENTS + asio + atomic + beast + chrono + circular_buffer + date_time + dll + filesystem + format + interprocess + lockfree + regex + signals2 + spirit + system + thread + variant + ) find_package(fmt CONFIG REQUIRED) find_package(nlohmann_json CONFIG REQUIRED) find_package(Catch2 CONFIG REQUIRED) set(${dest} + Boost::asio + Boost::atomic + Boost::beast + Boost::chrono + Boost::circular_buffer + Boost::date_time + Boost::dll + Boost::filesystem + Boost::format + Boost::interprocess + Boost::lockfree + Boost::regex + Boost::signals2 + Boost::spirit + Boost::system + Boost::thread + Boost::variant protobuf double-conversion - boost_system - boost_thread - boost_filesystem - boost_regex - boost_chrono - boost_date_time - boost_atomic Catch2::Catch2 SQLiteCpp sqlite3 diff --git a/src/lib_spark/spark/expression/BooleanGrammar.h b/src/lib_spark/spark/expression/BooleanGrammar.h index 54e689442..9e39114ff 100644 --- a/src/lib_spark/spark/expression/BooleanGrammar.h +++ b/src/lib_spark/spark/expression/BooleanGrammar.h @@ -4,8 +4,8 @@ #include "spark/utils/bts_no_copy.h" #include -#include -#include +#include +#include #include #include diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp index f106173c1..c0d2495bd 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -61,7 +61,7 @@ class OrderEventHandler : public ccapi::EventHandler { : dispatch_queue(dispatch_queue), event_types(event_types.begin(), event_types.end()), nolog_corrids(nolog_corrids_arg) {} - bool processEvent( + void processEvent( const ccapi::Event &event, ccapi::Session *session) override { bts_assert(session != nullptr); bool interested = event_types.find(event.getType()) != event_types.end(); @@ -70,10 +70,9 @@ class OrderEventHandler : public ccapi::EventHandler { "CCAPIDeribitOrderMux::OrderEventHandler::processEvent tid: {} " "interested: {} " "event: {}", - os::get_thread_id(), interested, event.toStringPretty(2, 2)); + os::get_thread_id(), interested, event.toPrettyString(2, 2)); if (interested) dispatch_queue.push(event); - return true; } bool should_log_event(const ccapi::Event &event) const { for (const auto &msg : event.messageList) { @@ -697,7 +696,7 @@ void log_unhandled_msg( const std::string &log) { LOG(OrderMan, Error, "CCAPIDeribitOrderMux::log_unhandled_msg {} msg: {} element: {}", log, - ccapi::Message::typeToString(msg_type), element.toStringPretty()); + ccapi::Message::typeToString(msg_type), element.toPrettyString()); } // There are only 3 types of events we handle @@ -732,7 +731,7 @@ void CCAPIDeribitOrderMux::_handle_event(const ccapi::Event &event) { // assert LOG(OrderMan, Fatal, "CCAPIDeribitOrderMux::_handle_event Unhandled event: {}", - event.toStringPretty()); + event.toPrettyString()); break; } } diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp index c8cb29a9c..a750de946 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp @@ -5,7 +5,7 @@ namespace bts::orderman { const std::string &getm( - const std::map &map, char const *key_name) { + const std::map &map, char const *key_name) { auto it = map.find(key_name); bts_assert_msg( it != map.end(), "Could not find key_name" + std::string(key_name)); diff --git a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h index 70d08bd9a..dfe9c0f22 100644 --- a/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h +++ b/src/lib_spark/spark/orderman/ccapi/CCAPIOrderCallbackMsgs.h @@ -15,7 +15,7 @@ namespace bts::orderman { const std::string &getm( - const std::map &map, char const *key_name); + const std::map &map, char const *key_name); bts::api::orderman::OrderStatus convert_ccapi_status(const std::string &status); // 1. @@ -58,7 +58,7 @@ struct CCAPICreateOrderMsg { bts::api::orderman::OrderStatus status; std::string corr_id; CCAPICreateOrderMsg( - const std::map &map, + const std::map &map, const std::string &corr_id) : order_id(getm(map, CCAPI_EM_ORDER_ID)), instrument(getm(map, CCAPI_INSTRUMENT)), @@ -70,7 +70,7 @@ struct CCAPICreateOrderMsg { price(std::stod(getm(map, CCAPI_EM_ORDER_LIMIT_PRICE))), qty(std::stod(getm(map, CCAPI_EM_ORDER_QUANTITY))), cumm_filled_price(std::stod( - getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_PRICE_TIMES_QUANTITY))), + getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_QUOTE_QUANTITY))), cumm_filled_qty( std::stod(getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_QUANTITY))), status(convert_ccapi_status(getm(map, CCAPI_EM_ORDER_STATUS))), @@ -152,7 +152,7 @@ struct CCAPIOrderUpdateMsg { double cumm_filled_price; double cumm_filled_qty; api::orderman::OrderStatus status; - CCAPIOrderUpdateMsg(const std::map &map) + CCAPIOrderUpdateMsg(const std::map &map) : order_id(getm(map, CCAPI_EM_ORDER_ID)), side( getm(map, CCAPI_EM_ORDER_SIDE) == CCAPI_EM_ORDER_SIDE_BUY @@ -162,7 +162,7 @@ struct CCAPIOrderUpdateMsg { price(std::stod(getm(map, CCAPI_EM_ORDER_LIMIT_PRICE))), qty(std::stod(getm(map, CCAPI_EM_ORDER_QUANTITY))), cumm_filled_price(std::stod( - getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_PRICE_TIMES_QUANTITY))), + getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_QUOTE_QUANTITY))), cumm_filled_qty( std::stod(getm(map, CCAPI_EM_ORDER_CUMULATIVE_FILLED_QUANTITY))), status(convert_ccapi_status(getm(map, CCAPI_EM_ORDER_STATUS))) {} @@ -204,7 +204,7 @@ struct CCAPITradeMsg { double last_exec_price; double last_exec_qty; std::string trade_id; - CCAPITradeMsg(const std::map &map) + CCAPITradeMsg(const std::map &map) : order_id(getm(map, CCAPI_EM_ORDER_ID)), side( getm(map, CCAPI_EM_ORDER_SIDE) == CCAPI_EM_ORDER_SIDE_BUY diff --git a/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp index 75734c9de..ad97e2c59 100644 --- a/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp +++ b/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp @@ -22,10 +22,10 @@ namespace bts::orderman { class MyEventHandler : public ccapi::EventHandler { public: std::string order_id = ""; - bool processEvent( + void processEvent( const ccapi::Event &event, ccapi::Session *session) override { bts_assert(session != nullptr); - std::cout << "Received an event:\n" + event.toStringPretty(2, 2) + std::cout << "Received an event:\n" + event.toPrettyString(2, 2) << std::endl; const auto &msg_list = event.getMessageList(); for (const auto &m : msg_list) { @@ -41,7 +41,6 @@ class MyEventHandler : public ccapi::EventHandler { } } } - return true; } }; diff --git a/vcpkg.json b/vcpkg.json index aea91b7c2..f35363937 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,9 +2,17 @@ "dependencies": [ "boost-asio", "boost-atomic", + { + "name": "boost-beast", + "platform": "linux" + }, "boost-chrono", "boost-circular-buffer", "boost-date-time", + { + "name": "boost-dll", + "platform": "linux" + }, "boost-filesystem", "boost-format", "boost-interprocess",