diff --git a/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp index 34ef3ce27..0e7cb48e4 100644 --- a/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp +++ b/src/lib_spark/spark/api/md/MarketDataConfigUtils.cpp @@ -27,12 +27,27 @@ std::set MarketDataConfigUtils::get_live_exchanges( rv.insert(bts::api::VENUE_TWSE); if (cfg.cboe_size()>0) rv.insert(bts::api::VENUE_CBOE); + if (cfg.okx_size() > 0) { + rv.insert(bts::api::VENUE_OKX); + } if (cfg.bybit_size() > 0) { rv.insert(bts::api::VENUE_BYBIT); } if (cfg.gateio_size() > 0) { rv.insert(bts::api::VENUE_GATEIO); } + for (const auto &dex_cfg : cfg.dex()) { + switch (dex_cfg.venue()) { + case bts::api::domain::VENUE_ORCA: + rv.insert(bts::api::VENUE_ORCA); + break; + case bts::api::domain::VENUE_RAYDIUM: + rv.insert(bts::api::VENUE_RAYDIUM); + break; + default: + break; + } + } return rv; } diff --git a/src/lib_spark/spark/config/profiles/default/symbols.conf b/src/lib_spark/spark/config/profiles/default/symbols.conf index f7a2b080f..3b0911225 100644 --- a/src/lib_spark/spark/config/profiles/default/symbols.conf +++ b/src/lib_spark/spark/config/profiles/default/symbols.conf @@ -60,7 +60,15 @@ SymbolLists { list { key: "OKX" symbol: "BTC" - symbol: "ETH" + symbol: "SOL" + } + list { + key: "ORCA" + symbol: "SOL" + } + list { + key: "RAYDIUM" + symbol: "SOL" } list { key: "BYBIT" @@ -199,6 +207,14 @@ Symbols { future: @SymbolLists.list[OKX].symbol option: @SymbolLists.list[OKX].symbol } + venues { + name: "VENUE_ORCA" + spot: @SymbolLists.list[ORCA].symbol + } + venues { + name: "VENUE_RAYDIUM" + spot: @SymbolLists.list[RAYDIUM].symbol + } venues { name: "VENUE_BYBIT" spot: @SymbolLists.list[BYBIT].symbol diff --git a/src/lib_spark/spark/domain_model/Security.h b/src/lib_spark/spark/domain_model/Security.h index 3e7e19e42..290ba7a74 100644 --- a/src/lib_spark/spark/domain_model/Security.h +++ b/src/lib_spark/spark/domain_model/Security.h @@ -88,6 +88,12 @@ void from_json(const nlohmann::json &j, CoinbaseExchangeData &data); void to_json(nlohmann::json &j, const Security &s); void from_json(const nlohmann::json &j, Security &s); +void to_json(nlohmann::json &j, const OrcaExchangeData &data); +void from_json(const nlohmann::json &j, OrcaExchangeData &data); + +void to_json(nlohmann::json &j, const RaydiumExchangeData &data); +void from_json(const nlohmann::json &j, RaydiumExchangeData &data); + PB_ENUM_FROM_JSON(SyntheticContract_PriceCalc); PB_ENUM_TO_JSON(SyntheticContract_PriceCalc); diff --git a/src/lib_spark/spark/orderman/orderman_utils/simple_validation.cpp b/src/lib_spark/spark/orderman/orderman_utils/simple_validation.cpp index 7f51ef5bf..7645792bf 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/simple_validation.cpp +++ b/src/lib_spark/spark/orderman/orderman_utils/simple_validation.cpp @@ -39,6 +39,8 @@ bool validate( VENUE_CASE(BINANCE_US, BinanceUs) VENUE_CASE(COINBASE, Coinbase) VENUE_CASE(OKX, Okx) + VENUE_CASE(ORCA, Orca) + VENUE_CASE(RAYDIUM, Raydium) VENUE_CASE(TAIFEX, Taifex) VENUE_CASE(TWSE, Twse) case api::VENUE_BTS: