From dde8524ecb6350793035b8724ed038e180746460 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 26 Jan 2023 23:22:36 -0500 Subject: [PATCH 01/23] Renaming some general classes and moving them out of cc --- src/lib/CMakeDeps.cmake | 2 +- ...ener.cpp => GeneralMarketDataListener.cpp} | 82 ++++++++++--------- ...Listener.h => GeneralMarketDataListener.h} | 13 +-- ...SecurityIndex.h => GeneralSecurityIndex.h} | 7 +- src/lib/md/ccApi/CCMain.cpp | 10 +-- src/lib/md/recording/MDReplayData.h | 4 +- src/lib/md/recording/MDReplayer.cpp | 8 +- src/lib/md/recording/MDReplayer.h | 4 +- src/lib/md/vendor/emumba/EmumbaDeribitData.h | 10 +-- src/web/CMakeDeps.cmake | 2 +- 10 files changed, 76 insertions(+), 66 deletions(-) rename src/lib/md/{ccApi/CCMarketDataListener.cpp => GeneralMarketDataListener.cpp} (84%) rename src/lib/md/{ccApi/CCMarketDataListener.h => GeneralMarketDataListener.h} (82%) rename src/lib/md/{ccApi/CCSecurityIndex.h => GeneralSecurityIndex.h} (50%) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index a9d4495d0..42c2d3146 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/analytics/ExpirationDriver.proto;api/analytics/TimeWeightedInterpolatedDriver.proto;api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/core/RegexFormatting.proto;api/domain/CallPut.proto;api/domain/Currency.proto;api/domain/SecurityCriteria.proto;api/domain/SecurityCriteriaClause.proto;api/domain/SecurityExpiration.proto;api/domain/SecurityMetadata.proto;api/domain/SecurityMetadataCollection.proto;api/domain/SecurityMetadataItem.proto;api/domain/SecurityType.proto;api/domain/TickDisplaySettings.proto;api/domain/TickFactors.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/BinanceMarketDataConfig.proto;api/md/BinanceUsMarketDataConfig.proto;api/md/BinanceUsdsFuturesMarketDataConfig.proto;api/md/FTXMarketDataConfig.proto;api/md/MarketDataConfig.proto;api/md/MarketDataRecordingConfig.proto;api/md/MarketDataReplayConfig.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/extensions/extensions.proto;config/invalid/invalid.proto;config/profiles/default/MarketData.conf;config/profiles/default/Ports.conf;config/profiles/default/SecurityMetadataCollection.conf;config/profiles/default/Symbols.conf;config/profiles/default/cme_reference_data.conf;config/profiles/default/edge.conf;config/profiles/default/jetfix.conf;config/profiles/default/keycode.conf;config/profiles/default/logging.conf;config/profiles/default/orderman_cfg.conf;config/profiles/default/orders_fills_cleanup.conf;config/profiles/default/position_cfg.conf;config/profiles/default/span.conf;config/profiles/default/spreader.conf;config/profiles/default/testkeys.conf;config/profiles/default/threads.conf;config/profiles/default/toggles.conf;config/protos/algo_types.proto;config/protos/cme_reference_data.proto;config/protos/exchange_sim_cfg.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/market_data.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/ports.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/symbols.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/protos/ui.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;core/TimeStamp.cpp;domain/DomainSecurityUtils.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Security.cpp;domain/SecurityCriteria.cpp;domain/SecurityCriteriaClause.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/JsonReader.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/CCApiCompositeMessageHandler.cpp;md/CCApiDepthWalker.cpp;md/CCApiEventDemuxer.cpp;md/CCApiMarketDepthAdaptor.cpp;md/CCApiMessageLogger.cpp;md/CCApiSession.cpp;md/CCApiTradeAdaptor.cpp;md/CCApiTradeRecord.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/ICCApiMessageHandler.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MarketDataSubscription.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceMiniTickerAdaptor.cpp;md/binance/BinanceMiniTickerUpdate.cpp;md/binance/BinancePriceStatistics.cpp;md/binance/BinancePriceStatisticsAdaptor.cpp;md/binance/BinanceSecurityRequestor.cpp;md/binance/BinanceSpot.cpp;md/binance/BinanceSubscription.cpp;md/binance_us/BinanceUsPriceStatistics.cpp;md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp;md/binance_us/BinanceUsSecurityRequestor.cpp;md/binance_us/BinanceUsSubscription.cpp;md/binance_usds_futures/BinanceUsdsFuture.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp;md/ccApi/CCDemoListener.cpp;md/ccApi/CCMain.cpp;md/ccApi/CCMarketDataListener.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ftx/FTXFuture.cpp;md/ftx/FTXHistoricalPriceAdaptor.cpp;md/ftx/FTXHistoricalPriceRecord.cpp;md/ftx/FTXMarket.cpp;md/ftx/FTXSecurityRequestor.cpp;md/ftx/FTXSubscription.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/recording/MDRecorder.cpp;md/recording/MDReplayer.cpp;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/calculations/TheoCalculator.cpp;orderman/ccapi/CCAPIDeribitOrderMux.cpp;orderman/ccapi/CCAPIOrderCallbackMsgs.cpp;orderman/ccapi/CCAPIOrderState.cpp;orderman/ccapi/CCAPISingleOrderManager.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/CCAPIExecutionGateway.cpp;orderman/gateways/EMExecutionGateway.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/FakeExecutionGateway.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/gateways/SimExecutionGateway.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/ExecutionReport.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/EMNativeOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/CCApiExecutionTests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/FileUtils.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/analytics/ExpirationDriver.proto;api/analytics/TimeWeightedInterpolatedDriver.proto;api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/core/RegexFormatting.proto;api/domain/CallPut.proto;api/domain/Currency.proto;api/domain/SecurityCriteria.proto;api/domain/SecurityCriteriaClause.proto;api/domain/SecurityExpiration.proto;api/domain/SecurityMetadata.proto;api/domain/SecurityMetadataCollection.proto;api/domain/SecurityMetadataItem.proto;api/domain/SecurityType.proto;api/domain/TickDisplaySettings.proto;api/domain/TickFactors.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/BinanceMarketDataConfig.proto;api/md/BinanceUsMarketDataConfig.proto;api/md/BinanceUsdsFuturesMarketDataConfig.proto;api/md/DeribitMarketDataConfig.proto;api/md/FTXMarketDataConfig.proto;api/md/MarketDataConfig.proto;api/md/MarketDataConfigUtils.cpp;api/md/MarketDataRecordingConfig.proto;api/md/MarketDataReplayConfig.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/extensions/extensions.proto;config/invalid/invalid.proto;config/profiles/default/MarketData.conf;config/profiles/default/Ports.conf;config/profiles/default/SecurityMetadataCollection.conf;config/profiles/default/Symbols.conf;config/profiles/default/cme_reference_data.conf;config/profiles/default/edge.conf;config/profiles/default/jetfix.conf;config/profiles/default/keycode.conf;config/profiles/default/logging.conf;config/profiles/default/orderman_cfg.conf;config/profiles/default/orders_fills_cleanup.conf;config/profiles/default/position_cfg.conf;config/profiles/default/span.conf;config/profiles/default/spreader.conf;config/profiles/default/testkeys.conf;config/profiles/default/threads.conf;config/profiles/default/toggles.conf;config/protos/algo_types.proto;config/protos/cme_reference_data.proto;config/protos/exchange_sim_cfg.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/market_data.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/ports.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/symbols.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/protos/ui.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;core/TimeStamp.cpp;domain/DomainSecurityUtils.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Security.cpp;domain/SecurityCriteria.cpp;domain/SecurityCriteriaClause.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/JsonReader.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/CCApiCompositeMessageHandler.cpp;md/CCApiDepthWalker.cpp;md/CCApiEventDemuxer.cpp;md/CCApiMarketDepthAdaptor.cpp;md/CCApiMessageLogger.cpp;md/CCApiSession.cpp;md/CCApiTradeAdaptor.cpp;md/CCApiTradeRecord.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/GeneralMarketDataListener.cpp;md/ICCApiMessageHandler.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MarketDataSubscription.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceMiniTickerAdaptor.cpp;md/binance/BinanceMiniTickerUpdate.cpp;md/binance/BinancePriceStatistics.cpp;md/binance/BinancePriceStatisticsAdaptor.cpp;md/binance/BinanceSecurityRequestor.cpp;md/binance/BinanceSpot.cpp;md/binance/BinanceSubscription.cpp;md/binance_us/BinanceUsPriceStatistics.cpp;md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp;md/binance_us/BinanceUsSecurityRequestor.cpp;md/binance_us/BinanceUsSubscription.cpp;md/binance_usds_futures/BinanceUsdsFuture.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp;md/ccApi/CCDemoListener.cpp;md/ccApi/CCMain.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ftx/FTXFuture.cpp;md/ftx/FTXHistoricalPriceAdaptor.cpp;md/ftx/FTXHistoricalPriceRecord.cpp;md/ftx/FTXMarket.cpp;md/ftx/FTXSecurityRequestor.cpp;md/ftx/FTXSubscription.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/recording/MDRecorder.cpp;md/recording/MDReplayer.cpp;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/calculations/TheoCalculator.cpp;orderman/ccapi/CCAPIDeribitOrderMux.cpp;orderman/ccapi/CCAPIOrderCallbackMsgs.cpp;orderman/ccapi/CCAPIOrderState.cpp;orderman/ccapi/CCAPISingleOrderManager.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/CCAPIExecutionGateway.cpp;orderman/gateways/EMExecutionGateway.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/FakeExecutionGateway.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGatewayFactory.cpp;orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/ExecutionReport.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/EMNativeOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/CCApiExecutionTests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/FileUtils.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/md/ccApi/CCMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp similarity index 84% rename from src/lib/md/ccApi/CCMarketDataListener.cpp rename to src/lib/md/GeneralMarketDataListener.cpp index c0c9db318..7c7a1dbca 100644 --- a/src/lib/md/ccApi/CCMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -3,7 +3,7 @@ #include "lib/domain/SpreadSecurity.h" #include #ifdef SPARK_ENABLE_CCAPI -#include "CCMarketDataListener.h" +#include "GeneralMarketDataListener.h" #include "lib/api/domain/Currency.pb.h" #include "lib/api/domain/SecurityType.pb.h" #include "lib/api/domain/Venue.pb.h" @@ -67,7 +67,7 @@ struct CCSecSearchResult { bool exists_now; }; -struct CCMarketDataListener::PImpl { +struct GeneralMarketDataListener::PImpl { // if this is set to true, then the security key passed on in the // on_securities function is used. If this is not set to true, then a new key // is generated @@ -76,7 +76,7 @@ struct CCMarketDataListener::PImpl { size_t n_bk_updates = 0; bts::persistence::IDGenerator &id_gen = bts::persistence::IDGenerator::instance(); - CCSecurityIndex &index; + GeneralSecurityIndex &index; MDProducer &md_producer; // map of logical key (venue + exchange key) to id // std::unordered_map sec_map = {}; @@ -86,7 +86,7 @@ struct CCMarketDataListener::PImpl { std::unordered_map cc_sec_id_map = {}; MDArray bids = {}; MDArray asks = {}; - explicit PImpl(CCSecurityIndex &index, MDProducer &md_producer) + explicit PImpl(GeneralSecurityIndex &index, MDProducer &md_producer) : index(index), md_producer(md_producer) {} }; @@ -144,22 +144,23 @@ void copy_books( // interface functions //////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -CCMarketDataListener::CCMarketDataListener( - CCSecurityIndex &index, MDProducer &md_producer) +GeneralMarketDataListener::GeneralMarketDataListener( + GeneralSecurityIndex &index, MDProducer &md_producer) : me(std::make_unique(index, md_producer)) {} -CCMarketDataListener::~CCMarketDataListener() {} +GeneralMarketDataListener::~GeneralMarketDataListener() {} -void CCMarketDataListener::on_securities( +void GeneralMarketDataListener::on_securities( const std::vector &complete_security_list) { - LOG(md, Info, "CCMarketDataListener::on_securities n_secs: {}", + LOG(md, Info, "GeneralMarketDataListener::on_securities n_secs: {}", complete_security_list.size()); for (auto s_ptr : complete_security_list) { domain::Security sec = *s_ptr; const auto &s_comm = sec.security_common; CCSecSearchResult search_result = _find_sec(sec, true); LOG(md, Info, - "CCMarketDataListener::on_securities added new security, exchange: " + "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, @@ -170,7 +171,8 @@ void CCMarketDataListener::on_securities( std::holds_alternative(sec.security)); if (search_result.existed_before) { LOG(md, Warn, - "CCMarketDataListener::on_securities security already exists, " + "GeneralMarketDataListener::on_securities security already " + "exists, " "ignoring it, " "exchange: " "{} type: {} desc: {} id: {}", @@ -199,16 +201,17 @@ void CCMarketDataListener::on_securities( } } -void CCMarketDataListener::on_security_state(const domain::SecurityState &) { +void GeneralMarketDataListener::on_security_state( + const domain::SecurityState &) { // TODO } -void CCMarketDataListener::on_security_statistics( +void GeneralMarketDataListener::on_security_statistics( const domain::SecurityMarketDataStatistics &sec_stats) { auto handle = _find_handle(sec_stats.security_id); bts_assert_msg( handle != nullptr, - "CCMarketDataListener::on_security_statistics null handle"); + "GeneralMarketDataListener::on_security_statistics null handle"); auto now = utils::TimeStamp::now(); bts::datetime::Date date_temp = {}; handle->handle.update_session_low(now, sec_stats.low.to_double()); @@ -236,27 +239,29 @@ void print_books(const domain::Book &book, size_t n_updates) { std::cout << "-----------------" << std::endl; } -void CCMarketDataListener::on_book(const bts::domain::Book &book) { - LOG(md, Diag, "CCMarketDataListener::on_book sec_id: {}", +void GeneralMarketDataListener::on_book(const bts::domain::Book &book) { + LOG(md, Diag, "GeneralMarketDataListener::on_book sec_id: {}", book.security_id()); me->n_bk_updates++; auto handle = _find_handle(book.security_id()); if (handle == nullptr) { - LOG(md, Error, "CCMarketDataListener::on_book, could not find sec_id: {}", + LOG(md, Error, + "GeneralMarketDataListener::on_book, could not find sec_id: {}", book.security_id()); return; } copy_books(book, me->bids, bts::domain::Side::Value::Buy); copy_books(book, me->asks, bts::domain::Side::Value::Sell); LOG(md, Diag, - "CCMarketDataListener::on_book post id: {} bid: {}/{}/{} ask: {}/{}/{}", + "GeneralMarketDataListener::on_book post id: {} bid: {}/{}/{} ask: " + "{}/{}/{}", handle->id, me->bids.at(0).price(), me->bids.at(0).direct_size(), me->bids.at(0).size(), me->asks.at(0).price(), me->asks.at(0).direct_size(), me->asks.at(0).size()); handle->handle.update_direct(utils::TimeStamp::now(), me->bids, me->asks); } -void CCMarketDataListener::on_trades( +void GeneralMarketDataListener::on_trades( const std::vector &trades) { for (auto tp : trades) { auto handle = _find_handle(tp->sec_id); @@ -271,14 +276,15 @@ void CCMarketDataListener::on_trades( } } -void CCMarketDataListener::on_rfqs(const std::vector &) {} +void GeneralMarketDataListener::on_rfqs( + const std::vector &) {} -void CCMarketDataListener::on_error(const MarketDataError &) {} +void GeneralMarketDataListener::on_error(const MarketDataError &) {} // private members //////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -CCSecSearchResult CCMarketDataListener::_find_sec( +CCSecSearchResult GeneralMarketDataListener::_find_sec( const bts::domain::Security &sec, bool add_if_absent) { auto cc_id = sec.security_common.id; auto sec_it = me->cc_sec_id_map.find(cc_id); @@ -299,7 +305,8 @@ CCSecSearchResult CCMarketDataListener::_find_sec( } me->cc_sec_id_map.insert({cc_id, {bts_id}}); LOG(md, Info, - "CCMarketDataListener::_find_sec adding new sec desc: {} cc_id: " + "GeneralMarketDataListener::_find_sec adding new sec desc: {} " + "cc_id: " "{} bts_id: {}", sec.security_common.desc, cc_id, bts_id); return {bts_id, false, true}; @@ -309,7 +316,7 @@ CCSecSearchResult CCMarketDataListener::_find_sec( } } -CCSecurityData *CCMarketDataListener::_find_handle( +SecurityIndexData *GeneralMarketDataListener::_find_handle( bts::domain::SecurityID cc_id) { // TODO: temp // cc_id = me->cc_sec_id_map.begin()->first; @@ -321,7 +328,7 @@ CCSecurityData *CCMarketDataListener::_find_handle( return nullptr; } -void CCMarketDataListener::_add_future(const bts::domain::Security &sec) { +void GeneralMarketDataListener::_add_future(const bts::domain::Security &sec) { bts_assert(sec.type() == bts::api::domain::SecurityType::FUTURE); auto search_result = _find_sec(sec, false); bts_assert(search_result.existed_before); @@ -332,7 +339,7 @@ void CCMarketDataListener::_add_future(const bts::domain::Security &sec) { const auto &f_sec = std::get(sec.security); get_date_from_epoch_nanos(f_sec.expiration.nanos(), year, month, day); LOG(md, Info, - "CCMarketDataListener::_add_future nanos: {} yy: {} mm: {} dd: {}", + "GeneralMarketDataListener::_add_future nanos: {} yy: {} mm: {} dd: {}", f_sec.expiration.nanos(), year, month, day); ff_sec.expiration_year = year; ff_sec.expiration_month = month; @@ -340,7 +347,7 @@ void CCMarketDataListener::_add_future(const bts::domain::Security &sec) { _commit_security(ff_sec); } -void CCMarketDataListener::_add_option(const bts::domain::Security &sec) { +void GeneralMarketDataListener::_add_option(const bts::domain::Security &sec) { bts_assert(sec.type() == bts::api::domain::SecurityType::OPTION); auto search_result = _find_sec(sec, false); bts_assert(search_result.existed_before); @@ -349,8 +356,8 @@ void CCMarketDataListener::_add_option(const bts::domain::Security &sec) { uint32_t year, month, day; const auto &o_sec = std::get(sec.security); get_date_from_epoch_nanos(o_sec.expiration.nanos(), year, month, day); - LOG(md, Info, "CCMarketDataListener::_add_option yy: {} mm: {} dd: {}", year, - month, day); + LOG(md, Info, "GeneralMarketDataListener::_add_option yy: {} mm: {} dd: {}", + year, month, day); fo_sec.expiration_year = year; fo_sec.expiration_month = month; fo_sec.expiration_day = day; @@ -361,7 +368,7 @@ void CCMarketDataListener::_add_option(const bts::domain::Security &sec) { _commit_security(fo_sec); } -void CCMarketDataListener::_add_spread(const bts::domain::Security &sec) { +void GeneralMarketDataListener::_add_spread(const bts::domain::Security &sec) { bts_assert(sec.type() == bts::api::domain::SecurityType::SPREAD); auto search_result = _find_sec(sec, false); bts_assert(search_result.existed_before); @@ -375,7 +382,8 @@ void CCMarketDataListener::_add_spread(const bts::domain::Security &sec) { auto it = me->cc_sec_id_map.find(l.security_id); if (it == me->cc_sec_id_map.end()) { LOG(md, Error, - "CCMarketDataListener::_add_spread, could not resolve leg: {}", + "GeneralMarketDataListener::_add_spread, could not resolve leg: " + "{}", l.security_id); } // assining values ot leg @@ -392,8 +400,8 @@ void CCMarketDataListener::_add_spread(const bts::domain::Security &sec) { _commit_security(fspr_sec); } -void CCMarketDataListener::_add_spot(const bts::domain::Security &sec) { - LOG(md, Info, "CCMarketDataListener::_add_spot spot: {}", +void GeneralMarketDataListener::_add_spot(const bts::domain::Security &sec) { + LOG(md, Info, "GeneralMarketDataListener::_add_spot spot: {}", sec.security_common.desc); bts_assert(sec.type() == bts::api::domain::SecurityType::SPOT); auto search_result = _find_sec(sec, false); @@ -403,20 +411,20 @@ void CCMarketDataListener::_add_spot(const bts::domain::Security &sec) { _commit_security(fs_sec); } -void CCMarketDataListener::_commit_security(const FixedSecurity &sec) { +void GeneralMarketDataListener::_commit_security(const FixedSecurity &sec) { // Set up the shared memory for this security bts_assert(sec.numeric_id != 0); auto handle = me->md_producer.add_security(sec); // Add it to the index so it can receive messages auto kp = me->index.add_security(sec.numeric_id, handle); LOG(md, Info, - "CCMarketDataListener::_add_security_to_shm added sec: {} id: {} " + "GeneralMarketDataListener::_add_security_to_shm added sec: {} id: {} " "num_id: {} n_secs: {}", std::string(handle.security().security_desc()), kp->id, handle.security().numeric_id, me->index.n_secs()); } -void CCMarketDataListener::_copy_security_common( +void GeneralMarketDataListener::_copy_security_common( const bts::domain::Security &from, uint64_t key, FixedSecurity &to) const { to.key = key; to.numeric_id = key; @@ -429,7 +437,7 @@ void CCMarketDataListener::_copy_security_common( to.low_tick = to.high_tick = from.security_common.min_price_increment; } -uint64_t CCMarketDataListener::_generate_security_key( +uint64_t GeneralMarketDataListener::_generate_security_key( const bts::domain::Security &sec) { auto logical_key = get_logical_key(sec); // if (me->use_given_sec_key) diff --git a/src/lib/md/ccApi/CCMarketDataListener.h b/src/lib/md/GeneralMarketDataListener.h similarity index 82% rename from src/lib/md/ccApi/CCMarketDataListener.h rename to src/lib/md/GeneralMarketDataListener.h index 1e868773f..569730aef 100644 --- a/src/lib/md/ccApi/CCMarketDataListener.h +++ b/src/lib/md/GeneralMarketDataListener.h @@ -1,20 +1,21 @@ #pragma once #include "lib/domain/Security.h" #include "lib/domain/SecurityID.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" -#include "lib/md/ccApi/CCSecurityIndex.h" namespace bts::md { class MDProducer; struct CCSecSearchResult; -struct CCSecurityData; +struct SecurityIndexData; } // namespace bts::md namespace bts::md { -class CCMarketDataListener : public IMarketDataListener { +class GeneralMarketDataListener : public IMarketDataListener { public: - CCMarketDataListener(CCSecurityIndex &index, MDProducer &md_producer); - virtual ~CCMarketDataListener(); + GeneralMarketDataListener( + GeneralSecurityIndex &index, MDProducer &md_producer); + virtual ~GeneralMarketDataListener(); void on_securities(const std::vector &complete_security_list) override; void on_security_state(const domain::SecurityState &security_state) override; @@ -34,7 +35,7 @@ class CCMarketDataListener : public IMarketDataListener { CCSecSearchResult _find_sec( const bts::domain::Security &sec, bool add_if_absent); // given a cc id, returns the bts persisted id, if it can find one - CCSecurityData *_find_handle(bts::domain::SecurityID cc_id); + SecurityIndexData *_find_handle(bts::domain::SecurityID cc_id); void _add_future(const bts::domain::Security &); void _add_option(const bts::domain::Security &); void _add_spread(const bts::domain::Security &); diff --git a/src/lib/md/ccApi/CCSecurityIndex.h b/src/lib/md/GeneralSecurityIndex.h similarity index 50% rename from src/lib/md/ccApi/CCSecurityIndex.h rename to src/lib/md/GeneralSecurityIndex.h index dc9f2a9bc..9b9042022 100644 --- a/src/lib/md/ccApi/CCSecurityIndex.h +++ b/src/lib/md/GeneralSecurityIndex.h @@ -5,12 +5,13 @@ namespace bts::md { -struct CCSecurityData { - CCSecurityData(uint64_t id, MDProducerHandle &h) : id(id), handle(h) {} +struct SecurityIndexData { + SecurityIndexData(uint64_t id, MDProducerHandle &h) : id(id), handle(h) {} uint64_t id; // exchange id MDProducerHandle handle; }; -using CCSecurityIndex = ConcurrentSecurityIndex; +using GeneralSecurityIndex = + ConcurrentSecurityIndex; } // namespace bts::md diff --git a/src/lib/md/ccApi/CCMain.cpp b/src/lib/md/ccApi/CCMain.cpp index 23f6398ae..71280a97d 100644 --- a/src/lib/md/ccApi/CCMain.cpp +++ b/src/lib/md/ccApi/CCMain.cpp @@ -5,6 +5,8 @@ #include "lib/config/config.h" #include "lib/config/protos/market_data.pb.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralMarketDataListener.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDProducer.h" #include "lib/md/MarketDataGateway.h" #include "lib/md/MarketDataRegistration.h" @@ -12,8 +14,6 @@ #include "lib/md/SecurityDB.h" #include "lib/md/SecurityIDRecorder.h" #include "lib/md/ccApi/CCDemoListener.h" -#include "lib/md/ccApi/CCMarketDataListener.h" -#include "lib/md/ccApi/CCSecurityIndex.h" #include "lib/md/coconut2.h" #include "lib/md/common.h" #include "lib/md/protos/co2.pb.h" @@ -27,7 +27,7 @@ #include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" #include -#include "lib/md/ccApi/CCSecurityIndex.h" +#include "lib/md/GeneralSecurityIndex.h" #include #include #include @@ -38,11 +38,11 @@ using namespace std; namespace bts::md { struct CCMain::PImpl { - CCSecurityIndex sec_index; + GeneralSecurityIndex sec_index; SecurityIDRecorder recorder; MDProducer producer; bts::md::MarketDataGateway gw; - CCMarketDataListener cc_listener; + GeneralMarketDataListener cc_listener; PImpl() : sec_index(), recorder( {utils::Dispatcher::current(), diff --git a/src/lib/md/recording/MDReplayData.h b/src/lib/md/recording/MDReplayData.h index c68d6d857..b45cef86d 100644 --- a/src/lib/md/recording/MDReplayData.h +++ b/src/lib/md/recording/MDReplayData.h @@ -6,9 +6,9 @@ #include "lib/domain/SecurityID.h" #include "lib/domain/SpotSecurity.h" #include "lib/domain_model/Security.pb.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" #include "lib/md/MDProducer.h" -#include "lib/md/ccApi/CCSecurityIndex.h" #include "lib/md/recording/MDReplayer.h" #include #include @@ -17,7 +17,7 @@ namespace bts::md::recording { struct MDReplayData { bts::api::md::MarketDataReplayConfig replay_conf; bts::api::Venue venue; - bts::md::CCSecurityIndex sec_index; + bts::md::GeneralSecurityIndex sec_index; bts::md::MDProducer md_producer; bts::md::recording::MDReplayer md_replayer; diff --git a/src/lib/md/recording/MDReplayer.cpp b/src/lib/md/recording/MDReplayer.cpp index 0167da016..6c1c53397 100644 --- a/src/lib/md/recording/MDReplayer.cpp +++ b/src/lib/md/recording/MDReplayer.cpp @@ -14,8 +14,8 @@ #include "lib/domain/TradeRecord.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralMarketDataListener.h" #include "lib/md/MDProducer.h" -#include "lib/md/ccApi/CCMarketDataListener.h" #include "lib/md/protos/co2.pb.h" #include "lib/md/recording/MDRecorder.h" #include "lib/os/os.h" @@ -54,16 +54,16 @@ struct MDReplayer ::PImpl { bts::api::Venue venue; std::set sec_keys = {}; uint64_t start_time = bts::core::TimeStamp::now_ns(); - CCMarketDataListener listener; + GeneralMarketDataListener listener; PImpl( bts::api::Venue venue, - bts::md::CCSecurityIndex &index, + bts::md::GeneralSecurityIndex &index, bts::md::MDProducer &md_producer) : venue(venue), listener(index, md_producer) {} }; MDReplayer::MDReplayer( bts::api::Venue venue, - bts::md::CCSecurityIndex &index, + bts::md::GeneralSecurityIndex &index, bts::md::MDProducer &md_producer) : me(new PImpl(venue, index, md_producer)) { LOG(md, Info, "MDReplayer::MDReplayer venue: {}", Venue_Name(venue)); diff --git a/src/lib/md/recording/MDReplayer.h b/src/lib/md/recording/MDReplayer.h index b1a2ae57e..116328da8 100644 --- a/src/lib/md/recording/MDReplayer.h +++ b/src/lib/md/recording/MDReplayer.h @@ -6,8 +6,8 @@ #include "lib/domain/SecurityID.h" #include "lib/domain/SpotSecurity.h" #include "lib/domain_model/Security.pb.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" -#include "lib/md/ccApi/CCSecurityIndex.h" #include namespace bts::md { @@ -24,7 +24,7 @@ class MDReplayer { public: MDReplayer( bts::api::Venue venue, - bts::md::CCSecurityIndex &index, + bts::md::GeneralSecurityIndex &index, bts::md::MDProducer &md_producer); ~MDReplayer(); void run(); diff --git a/src/lib/md/vendor/emumba/EmumbaDeribitData.h b/src/lib/md/vendor/emumba/EmumbaDeribitData.h index ba008dd7d..4128fd8e4 100644 --- a/src/lib/md/vendor/emumba/EmumbaDeribitData.h +++ b/src/lib/md/vendor/emumba/EmumbaDeribitData.h @@ -1,8 +1,8 @@ #pragma once +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDProducer.h" #include "lib/md/SecurityIDRecorder.h" -#include "lib/md/ccApi/CCSecurityIndex.h" #include "server/sparkd/md/platforms/emumba/EMTradingSession.h" #include "server/sparkd/md/platforms/emumba/EmMDListener.h" #include "server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h" @@ -19,10 +19,10 @@ struct EmumbaDeribitData { EmumbaDeribitData() : sec_index(), recorder( - {utils::Dispatcher::current(), - [=](ExchangeKey k) { - return SecurityKey(sec_index.get_key(k.value())); - }}), + {utils::Dispatcher::current(), + [=](ExchangeKey k) { + return SecurityKey(sec_index.get_key(k.value())); + }}), md_producer(bts::co2::PLATFORM_SIM, recorder), listener(sec_index, md_producer) {} }; diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 23185b1f8..0043a33be 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.release-gcc.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/DeribitMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.debug-clang.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From cc8c1817289db690cdc22bb298e0e53d9c388538 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 27 Jan 2023 17:13:06 -0500 Subject: [PATCH 02/23] Establishign the connection bw listener and sim execution --- src/lib/config/protos/jetfix.proto | 2 + src/lib/md/GeneralMarketDataListener.cpp | 38 ++++++++++--------- src/lib/md/GeneralMarketDataListener.h | 2 + .../gateways/ExecutionGatewayFactory.cpp | 1 + .../gateways/sim/SimExecutionGateway.cpp | 10 ++++- .../gateways/sim/SimExecutionGateway.h | 9 ++++- .../sim/SimExecutionGatewayFactory.cpp | 2 + 7 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index 0c6077513..a00eeadc0 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -1,5 +1,6 @@ syntax = 'proto2'; package bts.config; +import "lib/domain_model/Security.proto"; message JetFIX { message Connection { @@ -92,6 +93,7 @@ message JetFIX { optional uint32 max_connection_attempts = 346 [ default = 3 ]; optional bool auto_fix_seq_num = 347 [ default = false ]; optional bool use_ilink3 = 348 [ default = false ]; + optional bts.api.Venue venue = 350; } repeated Connection connection = 10; diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp index 7c7a1dbca..83b39e67c 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -1,7 +1,10 @@ #include "lib/core/TimeStamp.h" #include "lib/domain/DomainSecurityUtils.h" #include "lib/domain/SpreadSecurity.h" +#include "lib/md/SecurityIDRecorder.h" +#include "lib/orderman/gateways/sim/SimExecutionGateway.h" #include +#include #ifdef SPARK_ENABLE_CCAPI #include "GeneralMarketDataListener.h" #include "lib/api/domain/Currency.pb.h" @@ -68,6 +71,8 @@ struct CCSecSearchResult { }; struct GeneralMarketDataListener::PImpl { + const std::shared_ptr sim_ex_gwy = + nullptr; // if this is set to true, then the security key passed on in the // on_securities function is used. If this is not set to true, then a new key // is generated @@ -87,7 +92,12 @@ struct GeneralMarketDataListener::PImpl { MDArray bids = {}; MDArray asks = {}; explicit PImpl(GeneralSecurityIndex &index, MDProducer &md_producer) - : index(index), md_producer(md_producer) {} + : index(index), md_producer(md_producer) { + // SimExecutionGatewayFactory should see i + if (sim_ex_gwy != nullptr) { + sim_ex_gwy->set_producer(md_producer); + } + } }; // stateless util functions /////////////////////////////////////////////////// @@ -222,23 +232,6 @@ void GeneralMarketDataListener::on_security_statistics( handle->handle.set_total_volume(sec_stats.volume.value()); } -void print_books(const domain::Book &book, size_t n_updates) { - auto bids = book[domain::Side::Buy]; - auto asks = book[domain::Side::Sell]; - size_t idx = 0; - std::cout << "Book no: " << n_updates - << " sec_id: " << book.security_id().value() << std::endl; - for (const auto &b : bids) { - std::cout << "idx: " << idx++ << " pr: " << b.price - << " sz: " << b.total_quantity << std::endl; - } - for (const auto &a : asks) { - std::cout << "idx: " << idx++ << " pr: " << a.price - << " sz: " << a.total_quantity << std::endl; - } - std::cout << "-----------------" << std::endl; -} - void GeneralMarketDataListener::on_book(const bts::domain::Book &book) { LOG(md, Diag, "GeneralMarketDataListener::on_book sec_id: {}", book.security_id()); @@ -252,6 +245,8 @@ void GeneralMarketDataListener::on_book(const bts::domain::Book &book) { } copy_books(book, me->bids, bts::domain::Side::Value::Buy); copy_books(book, me->asks, bts::domain::Side::Value::Sell); + _possibly_match_with_sim_orders( + bts::md::SecurityKey(book.security_id().value())); LOG(md, Diag, "GeneralMarketDataListener::on_book post id: {} bid: {}/{}/{} ask: " "{}/{}/{}", @@ -447,5 +442,12 @@ uint64_t GeneralMarketDataListener::_generate_security_key( return rv.value(); } +void GeneralMarketDataListener::_possibly_match_with_sim_orders( + bts::md::SecurityKey key) { + if (me->sim_ex_gwy != nullptr) { + me->sim_ex_gwy->get_matched_book(key, me->bids, me->asks); + } +} + } // namespace bts::md #endif diff --git a/src/lib/md/GeneralMarketDataListener.h b/src/lib/md/GeneralMarketDataListener.h index 569730aef..d4b817ce0 100644 --- a/src/lib/md/GeneralMarketDataListener.h +++ b/src/lib/md/GeneralMarketDataListener.h @@ -3,6 +3,7 @@ #include "lib/domain/SecurityID.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" +#include "lib/md/Shm/FixedSecurity.h" namespace bts::md { class MDProducer; @@ -46,5 +47,6 @@ class GeneralMarketDataListener : public IMarketDataListener { uint64_t key, FixedSecurity &to) const; uint64_t _generate_security_key(const bts::domain::Security &sec); + void _possibly_match_with_sim_orders(bts::md::SecurityKey key); }; } // namespace bts::md diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp index 25f12d604..c9bfa53c1 100644 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp @@ -17,6 +17,7 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( const config::JetFIX::Connection &conn, trace::PerfLog &pl, md::SecurityOracle o) { + // check which exchanges are set to Sim LOG(OrderMan, Info, "ExecutionGatewayFactory::create_gateway conn: {}", utils::pb::to_string(conn)); if (conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index c605af6d4..f334b9c8d 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -198,11 +198,17 @@ OnExchangeOpenOrdersState &SimExecutionGateway::on_exchange_open_orders() { return me->on_exchange_open_orders; } -void SimExecutionGateway::set_producer( - bts::api::Venue, bts::md::MDProducer &md_producer) { +void SimExecutionGateway::set_producer(bts::md::MDProducer &md_producer) { me->md_producer = &md_producer; } void SimExecutionGateway::do_work() {} +bool SimExecutionGateway::get_matched_book( + bts::md::SecurityKey, + std::array &, + std::array &) { + return false; +} + } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 7fa2a2782..0344011bb 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -3,6 +3,8 @@ #include "lib/domain_model/Security.pb.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" +#include "lib/md/Shm/FixedSecurity.h" +#include "lib/md/protos/co2.pb.h" #include "lib/orderman/gateways/IExecutionGateway.h" namespace bts::md { @@ -31,9 +33,12 @@ class SimExecutionGateway : public IExecutionGateway { OnExchangePositionState &on_exchange_position_state() override; OnExchangeOpenOrdersState &on_exchange_open_orders() override; - void set_producer(bts::api::Venue venue, bts::md::MDProducer &md_producer); + void set_producer(bts::md::MDProducer &md_producer); void do_work(); - + bool get_matched_book( + bts::md::SecurityKey key, + std::array &bids, + std::array &asks); private: struct PImpl; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index b3bcb2c95..c87f885ac 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -24,6 +24,8 @@ SimExecutionGatewayFactory::SimExecutionGatewayFactory( std::shared_ptr SimExecutionGatewayFactory::get_getayeway( api::Venue venue) { + // This needs to look at config, to check if an exchange is set to sim or + // not. If it is not to set to sim, it should return a nullptr std::shared_ptr rv = nullptr; gateway_map.lock( [&, venue](std::map> From 4dc675eb9cce92f02143ee290ae4c6dfed13ea75 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 5 Feb 2023 20:24:29 -0500 Subject: [PATCH 03/23] Getting rid of Jetfix's platform, using Security.proto's exchange --- .../api/service_helpers/AdminServiceUtils.cpp | 16 +++++++++------- src/lib/config/protos/jetfix.proto | 9 --------- src/lib/jetfix/gateway/Session.cpp | 7 +++---- .../gateways/ExecutionGatewayFactory.cpp | 16 ++++++++++------ 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index 946adaad4..d7790b73d 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -200,8 +200,8 @@ void AdminServiceUtils::fill_connections_from_config( connection.set_id(new_id); connection.set_name(c.name()); - switch (c.platform()) { - case config::JetFIX::Connection::GLBX: + switch (c.venue()) { + case bts::api::VENUE_GLBX: if (c.cme_market_segment_id() == 0) connection.mutable_cme_connection()->mutable_cgw_connection(); else @@ -210,18 +210,20 @@ void AdminServiceUtils::fill_connections_from_config( ->set_market_segment_id(c.cme_market_segment_id()); add_connection(admin_data, connection); break; - case config::JetFIX::Connection::CBOE: + case bts::api::VENUE_CBOE: break; - case config::JetFIX::Connection::SIM: - case config::JetFIX::Connection::SIMICE: + // /case bts::api::VENUE_ICE: + case bts::api::VENUE_SIMICE: connection.mutable_sim_connection(); add_connection(admin_data, connection); break; - case config::JetFIX::Connection::ICE: + case bts::api::VENUE_ICE: connection.mutable_ice_connection()->set_sender_compid( c.sender_compid()); add_connection(admin_data, connection); break; + default: + break; } } for (int i = 0; i < admin_data.accounts_size(); i++) @@ -698,7 +700,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record( rv.set_customer_or_firm(sim_account_data->origin()); return rv; } break; - case api::VENUE_FTX: // TODO + case api::VENUE_FTX: // TODO case api::VENUE_BINANCE: // TODO case api::VENUE_BINANCE_US: case api::VENUE_BINANCE_USDS_FUTURES: diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index a00eeadc0..b0c984621 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -7,15 +7,6 @@ message JetFIX { // a friendly name used to represent this session in the UI required string name = 10; - enum JetFIXPlatform { - GLBX = 1; - CBOE = 6; - SIM = 2; - ICE = 3; - SIMICE = 4; - } - optional JetFIXPlatform platform = 15 [ default = GLBX ]; - // the ip address to connect to required string socket_connect_host_ip = 30; diff --git a/src/lib/jetfix/gateway/Session.cpp b/src/lib/jetfix/gateway/Session.cpp index 1c6b29550..c0dff4416 100644 --- a/src/lib/jetfix/gateway/Session.cpp +++ b/src/lib/jetfix/gateway/Session.cpp @@ -1,6 +1,7 @@ #include "Session.h" #include "lib/config/config.h" +#include "lib/domain_model/Security.pb.h" #include "lib/jetfix/codec/FIXEncodingStream.h" #include "lib/jetfix/codec/FieldDefinitions.h" #include "lib/jetfix/codec/MessageTypes.h" @@ -801,10 +802,8 @@ OutFIXPtr make_logon( const char *application = "O2"; #endif - if (session_cfg.platform() == - bts::config::JetFIX_Connection_JetFIXPlatform_ICE || - session_cfg.platform() == - bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) { + if (session_cfg.venue() == bts::api::VENUE_ICE || + session_cfg.venue() == bts::api::VENUE_SIMICE) { std::string sender_comp_id = session_cfg.sender_subid(); buffer.add(sender_comp_id); buffer.add(std::string_view{"1.0"}); diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp index c9bfa53c1..3203af658 100644 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp @@ -1,4 +1,5 @@ #include "ExecutionGatewayFactory.h" +#include "lib/domain_model/Security.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/orderman/gateways/CCAPIExecutionGateway.h" #include "lib/orderman/gateways/EMExecutionGateway.h" @@ -6,9 +7,11 @@ #include "lib/orderman/gateways/GLBXExecutionGateway.h" #include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" #include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" #include "lib/utils/ValueWrapper.h" +#include #include namespace bts::orderman { @@ -20,17 +23,18 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( // check which exchanges are set to Sim LOG(OrderMan, Info, "ExecutionGatewayFactory::create_gateway conn: {}", utils::pb::to_string(conn)); - if (conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_ICE || - conn.platform() == bts::config::JetFIX_Connection_JetFIXPlatform_SIMICE) + if (conn.venue() == bts::api::VENUE_ICE || + conn.venue() == bts::api::VENUE_SIMICE) return std::make_unique(conn, pl, o); - else if (conn.platform() == bts::config::JetFIX::Connection::GLBX) { + else if (conn.venue() == bts::api::VENUE_GLBX) { if (conn.use_ilink3()) return std::make_unique( conn, pl, o); return std::make_unique(conn, pl, o); - } else - //return std::make_unique(o); - return std::make_unique(o); + } else if (conn.venue() == bts::api::VENUE_DERIBIT) + return std::make_unique(conn.venue()); + //return std::make_unique(o); + return std::make_unique(o); // return std::make_unique(o); // return std::make_unique(conn, pl, o); } From 3039df56a09212c98caa1d3891f6864728c469d8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 6 Feb 2023 14:04:57 -0500 Subject: [PATCH 04/23] Hooking up SimExecutionGateway to GeneralMarketDataListener --- src/lib/api/md/MarketDataConfigUtils.cpp | 4 +++- src/lib/md/GeneralMarketDataListener.cpp | 22 +++++++++++++++------- src/lib/md/GeneralMarketDataListener.h | 5 ++++- src/server/sparkd/cmds/Run.cpp | 2 ++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/lib/api/md/MarketDataConfigUtils.cpp b/src/lib/api/md/MarketDataConfigUtils.cpp index 7d01544a1..07793bafe 100644 --- a/src/lib/api/md/MarketDataConfigUtils.cpp +++ b/src/lib/api/md/MarketDataConfigUtils.cpp @@ -2,6 +2,7 @@ #include "lib/api/md/MarketDataConfig.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" +#if !defined(_WIN32) && defined(SPARK_ENABLE_CCAPI) namespace bts::md { std::set MarketDataConfigUtils::get_live_exchanges( @@ -65,4 +66,5 @@ MarketDataConfigUtils::get_effective_recording_config( return rv; } -} // namespace bts::md \ No newline at end of file +} // namespace bts::md +#endif \ No newline at end of file diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp index 83b39e67c..8b3bed85e 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -3,6 +3,7 @@ #include "lib/domain/SpreadSecurity.h" #include "lib/md/SecurityIDRecorder.h" #include "lib/orderman/gateways/sim/SimExecutionGateway.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include #include #ifdef SPARK_ENABLE_CCAPI @@ -71,8 +72,6 @@ struct CCSecSearchResult { }; struct GeneralMarketDataListener::PImpl { - const std::shared_ptr sim_ex_gwy = - nullptr; // if this is set to true, then the security key passed on in the // on_securities function is used. If this is not set to true, then a new key // is generated @@ -83,6 +82,8 @@ struct GeneralMarketDataListener::PImpl { bts::persistence::IDGenerator::instance(); GeneralSecurityIndex &index; MDProducer &md_producer; + const std::shared_ptr sim_ex_gwy = + nullptr; // map of logical key (venue + exchange key) to id // std::unordered_map sec_map = {}; // this is the map of cc api transient sec id's to bts permenant id's @@ -91,9 +92,11 @@ struct GeneralMarketDataListener::PImpl { std::unordered_map cc_sec_id_map = {}; MDArray bids = {}; MDArray asks = {}; - explicit PImpl(GeneralSecurityIndex &index, MDProducer &md_producer) - : index(index), md_producer(md_producer) { - // SimExecutionGatewayFactory should see i + explicit PImpl( + GeneralSecurityIndex &index, + MDProducer &md_producer, + std::shared_ptr sim_ex_gwy) + : index(index), md_producer(md_producer), sim_ex_gwy(sim_ex_gwy) { if (sim_ex_gwy != nullptr) { sim_ex_gwy->set_producer(md_producer); } @@ -155,8 +158,13 @@ void copy_books( // interface functions //////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// GeneralMarketDataListener::GeneralMarketDataListener( - GeneralSecurityIndex &index, MDProducer &md_producer) - : me(std::make_unique(index, md_producer)) {} + GeneralSecurityIndex &index, MDProducer &md_producer, api::Venue /*venue*/) + : me(std::make_unique( + index, + md_producer, + /*bts::orderman::SimExecutionGatewayFactory::get()->get_getayeway( + venue)*/ + nullptr)) {} GeneralMarketDataListener::~GeneralMarketDataListener() {} diff --git a/src/lib/md/GeneralMarketDataListener.h b/src/lib/md/GeneralMarketDataListener.h index d4b817ce0..bb8646c0a 100644 --- a/src/lib/md/GeneralMarketDataListener.h +++ b/src/lib/md/GeneralMarketDataListener.h @@ -1,6 +1,7 @@ #pragma once #include "lib/domain/Security.h" #include "lib/domain/SecurityID.h" +#include "lib/domain_model/Security.pb.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" #include "lib/md/Shm/FixedSecurity.h" @@ -15,7 +16,9 @@ namespace bts::md { class GeneralMarketDataListener : public IMarketDataListener { public: GeneralMarketDataListener( - GeneralSecurityIndex &index, MDProducer &md_producer); + GeneralSecurityIndex &index, + MDProducer &md_producer, + api::Venue venue = api::VENUE_GLBX); virtual ~GeneralMarketDataListener(); void on_securities(const std::vector &complete_security_list) override; diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 31ab6d692..a8d3e994a 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -16,6 +16,7 @@ #include "lib/metrics/metrics.h" #include "lib/metrics/system_metrics.h" #include "lib/orderman/OrderServiceServer.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" #include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" @@ -116,6 +117,7 @@ static void execute() { bg_health->increment(); }); timer.start(); + bts::orderman::SimExecutionGatewayFactory::init_once(mdclient); utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, [&]() { perf_log.store_log_entries(); From 5122038d21a0b8e1aa6ce4937d70bc6739d2e83a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 6 Feb 2023 15:21:51 -0500 Subject: [PATCH 05/23] Fixing windows side build --- src/lib/config/protos/jetfix.proto | 2 +- src/lib/md/GeneralMarketDataListener.cpp | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index b0c984621..31b93fe9b 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -84,7 +84,7 @@ message JetFIX { optional uint32 max_connection_attempts = 346 [ default = 3 ]; optional bool auto_fix_seq_num = 347 [ default = false ]; optional bool use_ilink3 = 348 [ default = false ]; - optional bts.api.Venue venue = 350; + required bts.api.Venue venue = 350; } repeated Connection connection = 10; diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp index 8b3bed85e..c6ef6e0db 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -1,11 +1,3 @@ -#include "lib/core/TimeStamp.h" -#include "lib/domain/DomainSecurityUtils.h" -#include "lib/domain/SpreadSecurity.h" -#include "lib/md/SecurityIDRecorder.h" -#include "lib/orderman/gateways/sim/SimExecutionGateway.h" -#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" -#include -#include #ifdef SPARK_ENABLE_CCAPI #include "GeneralMarketDataListener.h" #include "lib/api/domain/Currency.pb.h" @@ -14,6 +6,7 @@ #include "lib/core/TimeStamp.h" #include "lib/domain/AggressorSide.h" #include "lib/domain/Book.h" +#include "lib/domain/DomainSecurityUtils.h" #include "lib/domain/FutureSecurity.h" #include "lib/domain/OptionSecurity.h" #include "lib/domain/Price.h" @@ -32,11 +25,14 @@ #include "lib/md/MDProducer.h" #include "lib/md/MDProducerHandle.h" #include "lib/md/PriceSize.h" +#include "lib/md/SecurityIDRecorder.h" #include "lib/md/SecurityIndex.h" #include "lib/md/Shm/FixedSecurity.h" #include "lib/md/Shm/MDStructure.h" #include "lib/md/protos/co2.pb.h" #include "lib/orderman/actors/SODPosition.h" +#include "lib/orderman/gateways/sim/SimExecutionGateway.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/os/os.h" #include "lib/persistence/IDGenerator.h" @@ -44,6 +40,8 @@ #include "lib/utils/TimeStamp.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_fatal.h" +#include +#include #include #include From c20f017069c2440484181b5fdce13af8d3194ebe Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 6 Feb 2023 21:27:41 -0500 Subject: [PATCH 06/23] Simplified MarketDataGateway to deal with multiple market data producers as start-and-forget --- src/lib/md/GeneralMarketDataListener.h | 4 +- src/lib/md/MarketDataGateway.cpp | 76 +++++++++++++------ src/lib/md/MarketDataGateway.h | 3 +- src/lib/md/MarketDataListenerData.h | 2 - src/lib/md/ccApi/CCMain.cpp | 6 +- src/lib/md/recording/MDReplayData.h | 29 ------- src/lib/md/recording/MDReplayer.cpp | 2 +- .../sparkd/cmds/crypto/LiveLadderDemo.cpp | 2 +- 8 files changed, 60 insertions(+), 64 deletions(-) delete mode 100644 src/lib/md/recording/MDReplayData.h diff --git a/src/lib/md/GeneralMarketDataListener.h b/src/lib/md/GeneralMarketDataListener.h index bb8646c0a..46fd199d5 100644 --- a/src/lib/md/GeneralMarketDataListener.h +++ b/src/lib/md/GeneralMarketDataListener.h @@ -16,9 +16,7 @@ namespace bts::md { class GeneralMarketDataListener : public IMarketDataListener { public: GeneralMarketDataListener( - GeneralSecurityIndex &index, - MDProducer &md_producer, - api::Venue venue = api::VENUE_GLBX); + GeneralSecurityIndex &index, MDProducer &md_producer, api::Venue venue); virtual ~GeneralMarketDataListener(); void on_securities(const std::vector &complete_security_list) override; diff --git a/src/lib/md/MarketDataGateway.cpp b/src/lib/md/MarketDataGateway.cpp index 3b0361708..fa4068faa 100644 --- a/src/lib/md/MarketDataGateway.cpp +++ b/src/lib/md/MarketDataGateway.cpp @@ -2,13 +2,20 @@ #include "MarketDataGateway.h" #include "lib/api/md/MarketDataConfig.pb.h" #include "lib/api/md/MarketDataConfigUtils.h" +#include "lib/api/md/MarketDataReplayConfig.pb.h" #include "lib/collections/Contains.h" +#include "lib/domain/FutureSecurity.h" +#include "lib/domain/OptionSecurity.h" #include "lib/domain/Security.h" #include "lib/domain/SecurityID.h" +#include "lib/domain/SpotSecurity.h" #include "lib/domain_model/Security.pb.h" #include "lib/io/ProtoPrinter.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralMarketDataListener.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" +#include "lib/md/MDProducer.h" #include "lib/md/MarketDataListenerData.h" #include "lib/md/MarketDataListenerID.h" #include "lib/md/MarketDataRegistration.h" @@ -19,12 +26,14 @@ #include "lib/md/binance_us/BinanceUsSubscription.h" #include "lib/md/binance_usds_futures/BinanceUsdsFuturesSubscription.h" #include "lib/md/ftx/FTXSubscription.h" -#include "lib/md/recording/MDReplayData.h" +#include "lib/md/recording/MDReplayer.h" #include "lib/persistence/IDGenerator.h" #include "lib/utils/PBUtils.h" #include "lib/utils/bts_assert.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/md/platforms/emumba/EmumbaMain.h" +#include +#include #include "lib/md/vendor/emumba/EmumbaDeribitData.h" #include @@ -52,15 +61,38 @@ static bool validate(const MarketDataConfig & /*cfg*/, vector &errs) { return errs.size() == orig_n_errs; } +struct MDReplayData { + bts::api::md::MarketDataReplayConfig replay_conf; + bts::api::Venue venue; + bts::md::GeneralSecurityIndex sec_index; + bts::md::MDProducer md_producer; + bts::md::recording::MDReplayer md_replayer; + + MDReplayData(const bts::api::md::MarketDataReplayConfig &replay_conf) + : replay_conf(replay_conf), venue(replay_conf.venue()), sec_index(), + md_producer(bts::co2::PLATFORM_SIM), + md_replayer(replay_conf.venue(), sec_index, md_producer) {} +}; + +struct CCMDSourceData { + bts::md::GeneralSecurityIndex sec_index; + bts::md::MDProducer md_producer; + bts::md::GeneralMarketDataListener listener; + + CCMDSourceData(bts::api::Venue venue) + : sec_index(), md_producer(bts::co2::PLATFORM_SIM), + listener(sec_index, md_producer, venue) {} +}; + struct MarketDataGateway::PImpl { ccapi::EventDispatcher dispatcher; MarketDataRegistrationFactory registration_factory; IDGenerator &sec_id_store = IDGenerator::instance(); unordered_map listeners; - unordered_map> securities; - std::vector> replays = {}; - //std::unique_ptr emumba_deribit_data = nullptr; + std::vector> replays = {}; + // we create these and pass them to the cc md sources + std::vector> cc_md_listeners = {}; }; MarketDataGateway::MarketDataGateway() @@ -68,8 +100,10 @@ MarketDataGateway::MarketDataGateway() MarketDataGateway::~MarketDataGateway() = default; -MarketDataRegistration MarketDataGateway::subscribe( - const MarketDataConfig &cfg, IMarketDataListener *listener) noexcept { +// CCAPI ////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +MarketDataRegistration MarketDataGateway::start_cc( + const MarketDataConfig &cfg) noexcept { auto reg = me_->registration_factory.create(); bts_assert(reg.listener_id.has_value()); bts_assert(!CONTAINS_KEY(me_->listeners, *reg.listener_id)); @@ -85,35 +119,39 @@ MarketDataRegistration MarketDataGateway::subscribe( MarketDataListenerData &listener_data = me_->listeners[*reg.listener_id]; listener_data.id = *reg.listener_id; - listener_data.listener = listener; - listener_data.cfg = cfg; // FTX for (const auto &ftx : cfg.ftx()) { + auto p = me_->cc_md_listeners.emplace_back( + std::make_shared(bts::api::VENUE_FTX)); listener_data.subscription.add(ftx::FTXSubscription{ - &me_->dispatcher, ftx, &me_->sec_id_store, listener_data.listener}); + &me_->dispatcher, ftx, &me_->sec_id_store, &p->listener}); } // Binance for (const auto &binance : cfg.binance()) { + auto p = me_->cc_md_listeners.emplace_back( + std::make_shared(bts::api::VENUE_BINANCE)); listener_data.subscription.add(binance::BinanceSubscription{ - &me_->dispatcher, binance, &me_->sec_id_store, - listener_data.listener}); + &me_->dispatcher, binance, &me_->sec_id_store, &p->listener}); } // Binance US for (const auto &binance_us : cfg.binance_us()) { + auto p = me_->cc_md_listeners.emplace_back( + std::make_shared(bts::api::VENUE_BINANCE_US)); listener_data.subscription.add(binance_us::BinanceUsSubscription{ - &me_->dispatcher, binance_us, &me_->sec_id_store, - listener_data.listener}); + &me_->dispatcher, binance_us, &me_->sec_id_store, &p->listener}); } // Binance USDS Futures for (const auto &binance_ufs : cfg.binance_usds_futures()) { + auto p = + me_->cc_md_listeners.emplace_back(std::make_shared( + bts::api::VENUE_BINANCE_USDS_FUTURES)); listener_data.subscription.add( binance_usds_futures::BinanceUsdsFuturesSubscription{ - &me_->dispatcher, binance_ufs, &me_->sec_id_store, - listener_data.listener}); + &me_->dispatcher, binance_ufs, &me_->sec_id_store, &p->listener}); } _start_deribit(cfg); _start_replays(cfg); @@ -128,12 +166,6 @@ void MarketDataGateway::unsubscribe(MarketDataListenerID id) { // deribit //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -// void run_emumba() { -// LOG(md, Info, "Run::run_emumba t_id: {}", os::get_thread_id()); -// bts::md::EmumbaMain em_main = {}; -// em_main.run(); -// } - void MarketDataGateway::_start_deribit( const bts::api::md::MarketDataConfig &cfg) { //threading::make_thread("Emumba", []() { run_emumba(); }).detach(); @@ -188,7 +220,7 @@ void MarketDataGateway::_start_replays( const bts::api::md::MarketDataConfig &cfg) { for (const auto &r : MarketDataConfigUtils::get_effective_replay_config(cfg)) { - me_->replays.emplace_back(std::make_unique(r)); + me_->replays.emplace_back(std::make_unique(r)); } for (const auto &replayer : me_->replays) { std::string tid_name = "MDReplayer_" + Venue_Name(replayer->venue); diff --git a/src/lib/md/MarketDataGateway.h b/src/lib/md/MarketDataGateway.h index b88cf1da6..b808383c8 100644 --- a/src/lib/md/MarketDataGateway.h +++ b/src/lib/md/MarketDataGateway.h @@ -21,8 +21,7 @@ class MarketDataGateway { * @brief Connects a market data listener to a market data source * @return MarketDataRegistration */ - MarketDataRegistration subscribe( - const api::md::MarketDataConfig &, IMarketDataListener *) noexcept; + MarketDataRegistration start_cc(const api::md::MarketDataConfig &) noexcept; void unsubscribe(MarketDataListenerID id); diff --git a/src/lib/md/MarketDataListenerData.h b/src/lib/md/MarketDataListenerData.h index 083e61077..e191d141b 100644 --- a/src/lib/md/MarketDataListenerData.h +++ b/src/lib/md/MarketDataListenerData.h @@ -19,8 +19,6 @@ struct MarketDataListenerData { ~MarketDataListenerData() = default; MarketDataListenerID id; - IMarketDataListener *listener; - api::md::MarketDataConfig cfg; MarketDataSubscription subscription; }; diff --git a/src/lib/md/ccApi/CCMain.cpp b/src/lib/md/ccApi/CCMain.cpp index 71280a97d..22dde3362 100644 --- a/src/lib/md/ccApi/CCMain.cpp +++ b/src/lib/md/ccApi/CCMain.cpp @@ -42,15 +42,13 @@ struct CCMain::PImpl { SecurityIDRecorder recorder; MDProducer producer; bts::md::MarketDataGateway gw; - GeneralMarketDataListener cc_listener; PImpl() : sec_index(), recorder( {utils::Dispatcher::current(), [=](ExchangeKey k) { return SecurityKey(sec_index.get_key(k.value())); }}), - producer(bts::co2::PLATFORM_SIM, recorder), - cc_listener(sec_index, producer) {} + producer(bts::co2::PLATFORM_SIM, recorder) {} }; CCMain::CCMain() @@ -68,7 +66,7 @@ void CCMain::run() { LOG(md, Info, "Run::run_ccapi t_id:{} t_name:{}", os::get_thread_id(), os::get_thread_name()); const auto &md_config = config::get(); - me->gw.subscribe(md_config, &me->cc_listener); + me->gw.start_cc(md_config); while (true) { std::this_thread::sleep_for(std::chrono::seconds(1)); diff --git a/src/lib/md/recording/MDReplayData.h b/src/lib/md/recording/MDReplayData.h deleted file mode 100644 index b45cef86d..000000000 --- a/src/lib/md/recording/MDReplayData.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#include "lib/api/md/MarketDataReplayConfig.pb.h" -#include "lib/domain/FutureSecurity.h" -#include "lib/domain/OptionSecurity.h" -#include "lib/domain/Security.h" -#include "lib/domain/SecurityID.h" -#include "lib/domain/SpotSecurity.h" -#include "lib/domain_model/Security.pb.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/MDProducer.h" -#include "lib/md/recording/MDReplayer.h" -#include -#include - -namespace bts::md::recording { -struct MDReplayData { - bts::api::md::MarketDataReplayConfig replay_conf; - bts::api::Venue venue; - bts::md::GeneralSecurityIndex sec_index; - bts::md::MDProducer md_producer; - bts::md::recording::MDReplayer md_replayer; - - MDReplayData(const bts::api::md::MarketDataReplayConfig &replay_conf) - : replay_conf(replay_conf), sec_index(), - md_producer(bts::co2::PLATFORM_SIM), - md_replayer(replay_conf.venue(), sec_index, md_producer) {} -}; -} // namespace bts::md::recording diff --git a/src/lib/md/recording/MDReplayer.cpp b/src/lib/md/recording/MDReplayer.cpp index 6c1c53397..57364d585 100644 --- a/src/lib/md/recording/MDReplayer.cpp +++ b/src/lib/md/recording/MDReplayer.cpp @@ -59,7 +59,7 @@ struct MDReplayer ::PImpl { bts::api::Venue venue, bts::md::GeneralSecurityIndex &index, bts::md::MDProducer &md_producer) - : venue(venue), listener(index, md_producer) {} + : venue(venue), listener(index, md_producer, venue) {} }; MDReplayer::MDReplayer( bts::api::Venue venue, diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp b/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp index 5d72b4e4f..c6dcb0d52 100644 --- a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp +++ b/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp @@ -14,7 +14,7 @@ LiveLadderDemo::LiveLadderDemo(const api::md::MarketDataConfig &cfg) { md::MarketDataGateway gw; md::listeners::LiveLadderPrinter ladder_printer; - gw.subscribe(cfg, &ladder_printer); + gw.start_cc(cfg); const std::size_t n_loops = 16; for (std::size_t n = 0; n < n_loops; n++) { From 60cde0712f5c7d8d41ce91e08bb608819e852b88 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 7 Feb 2023 11:59:11 -0500 Subject: [PATCH 07/23] Streamlining MarketDataGateway further - all sources are started independently of each other now, with their own GeneralMarketDataListener --- src/lib/md/CCApiMarketDepthAdaptor.cpp | 1 - src/lib/md/CCApiTradeAdaptor.cpp | 1 - src/lib/md/MarketDataGateway.cpp | 49 ++++++++++++++++--- src/lib/md/MarketDataGateway.h | 4 +- src/lib/md/MarketDataListenerData.h | 26 ---------- src/lib/md/ccApi/CCMain.cpp | 4 +- src/lib/md/ftx/FTXSubscription.cpp | 1 - .../sparkd/cmds/crypto/LiveLadderDemo.cpp | 4 +- src/server/sparkd/cmds/md/cmds/Run.cpp | 22 ++++++--- 9 files changed, 63 insertions(+), 49 deletions(-) delete mode 100644 src/lib/md/MarketDataListenerData.h diff --git a/src/lib/md/CCApiMarketDepthAdaptor.cpp b/src/lib/md/CCApiMarketDepthAdaptor.cpp index 5ee549d06..7a0d150ad 100644 --- a/src/lib/md/CCApiMarketDepthAdaptor.cpp +++ b/src/lib/md/CCApiMarketDepthAdaptor.cpp @@ -5,7 +5,6 @@ #include "lib/md/CCApiCorrelationID.h" #include "lib/md/CCApiDepthWalker.h" #include "lib/md/ICCApiMessageHandler.h" -#include "lib/md/MarketDataListenerData.h" #include #include diff --git a/src/lib/md/CCApiTradeAdaptor.cpp b/src/lib/md/CCApiTradeAdaptor.cpp index d18958052..30c54cd68 100644 --- a/src/lib/md/CCApiTradeAdaptor.cpp +++ b/src/lib/md/CCApiTradeAdaptor.cpp @@ -6,7 +6,6 @@ #include "lib/md/CCApiCorrelationID.h" #include "lib/md/CCApiTradeRecord.h" #include "lib/md/ICCApiMessageHandler.h" -#include "lib/md/MarketDataListenerData.h" #include "lib/utils/bts_fatal.h" #include diff --git a/src/lib/md/MarketDataGateway.cpp b/src/lib/md/MarketDataGateway.cpp index fa4068faa..93b828a5c 100644 --- a/src/lib/md/MarketDataGateway.cpp +++ b/src/lib/md/MarketDataGateway.cpp @@ -16,7 +16,6 @@ #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IMarketDataListener.h" #include "lib/md/MDProducer.h" -#include "lib/md/MarketDataListenerData.h" #include "lib/md/MarketDataListenerID.h" #include "lib/md/MarketDataRegistration.h" #include "lib/md/MarketDataRegistrationError.h" @@ -61,6 +60,20 @@ static bool validate(const MarketDataConfig & /*cfg*/, vector &errs) { return errs.size() == orig_n_errs; } +struct MarketDataListenerData { + MarketDataListenerData() = default; + MarketDataListenerData(const MarketDataListenerData &) noexcept = delete; + MarketDataListenerData(MarketDataListenerData &&) noexcept = default; + MarketDataListenerData &operator=(const MarketDataListenerData &) noexcept = + delete; + MarketDataListenerData &operator=(MarketDataListenerData &&) noexcept = + default; + ~MarketDataListenerData() = default; + + MarketDataListenerID id; + MarketDataSubscription subscription; +}; + struct MDReplayData { bts::api::md::MarketDataReplayConfig replay_conf; bts::api::Venue venue; @@ -85,8 +98,9 @@ struct CCMDSourceData { }; struct MarketDataGateway::PImpl { + api::md::MarketDataConfig md_config = + config::get(); ccapi::EventDispatcher dispatcher; - MarketDataRegistrationFactory registration_factory; IDGenerator &sec_id_store = IDGenerator::instance(); unordered_map listeners; @@ -100,10 +114,26 @@ MarketDataGateway::MarketDataGateway() MarketDataGateway::~MarketDataGateway() = default; +// starts the market data sources and then keeps the function going +void MarketDataGateway::run() { + LOG(md, Info, "MarketDataGateway::run starting t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); + _start_cc(me_->md_config); + _start_deribit(me_->md_config); + _start_replays(me_->md_config); + while (true) { + std::this_thread::sleep_for(std::chrono::seconds(1)); + } + LOG(md, Info, "MarketDataGateway::run ending t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); +} + // CCAPI ////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -MarketDataRegistration MarketDataGateway::start_cc( +MarketDataRegistration MarketDataGateway::_start_cc( const MarketDataConfig &cfg) noexcept { + LOG(md, Info, "MarketDataGateway::_start_cc starting t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); auto reg = me_->registration_factory.create(); bts_assert(reg.listener_id.has_value()); bts_assert(!CONTAINS_KEY(me_->listeners, *reg.listener_id)); @@ -153,8 +183,8 @@ MarketDataRegistration MarketDataGateway::start_cc( binance_usds_futures::BinanceUsdsFuturesSubscription{ &me_->dispatcher, binance_ufs, &me_->sec_id_store, &p->listener}); } - _start_deribit(cfg); - _start_replays(cfg); + LOG(md, Info, "MarketDataGateway::_start_cc ending t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); return reg; } @@ -168,7 +198,8 @@ void MarketDataGateway::unsubscribe(MarketDataListenerID id) { void MarketDataGateway::_start_deribit( const bts::api::md::MarketDataConfig &cfg) { - //threading::make_thread("Emumba", []() { run_emumba(); }).detach(); + LOG(md, Info, "MarketDataGateway::_start_deribit starting t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); auto start_deribit_thr = [&]() { const auto &deribit_conf_items = cfg.deribit(); if (deribit_conf_items.size() != 1) @@ -212,12 +243,16 @@ void MarketDataGateway::_start_deribit( ddata->real_handler->run(); }; threading::make_thread("Emumba", [&]() { start_deribit_thr(); }).detach(); + LOG(md, Info, "MarketDataGateway::_start_deribit ending t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); } // replays //////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// void MarketDataGateway::_start_replays( const bts::api::md::MarketDataConfig &cfg) { + LOG(md, Info, "MarketDataGateway::_start_replays starting t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); for (const auto &r : MarketDataConfigUtils::get_effective_replay_config(cfg)) { me_->replays.emplace_back(std::make_unique(r)); @@ -228,6 +263,8 @@ void MarketDataGateway::_start_replays( replayer->md_replayer.run(); }).detach(); } + LOG(md, Info, "MarketDataGateway::_start_replays ending t_id:{} t_name:{}", + os::get_thread_id(), os::get_thread_name()); } } // namespace bts::md diff --git a/src/lib/md/MarketDataGateway.h b/src/lib/md/MarketDataGateway.h index b808383c8..59ad1cd05 100644 --- a/src/lib/md/MarketDataGateway.h +++ b/src/lib/md/MarketDataGateway.h @@ -21,13 +21,13 @@ class MarketDataGateway { * @brief Connects a market data listener to a market data source * @return MarketDataRegistration */ - MarketDataRegistration start_cc(const api::md::MarketDataConfig &) noexcept; - + void run(); void unsubscribe(MarketDataListenerID id); private: struct PImpl; std::unique_ptr me_; + MarketDataRegistration _start_cc(const api::md::MarketDataConfig &) noexcept; void _start_deribit(const bts::api::md::MarketDataConfig &cfg); void _start_replays(const bts::api::md::MarketDataConfig &cfg); }; diff --git a/src/lib/md/MarketDataListenerData.h b/src/lib/md/MarketDataListenerData.h deleted file mode 100644 index e191d141b..000000000 --- a/src/lib/md/MarketDataListenerData.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#ifndef _WIN32 -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/md/IMarketDataListener.h" -#include "lib/md/MarketDataListenerID.h" -#include "lib/md/MarketDataSubscription.h" -#include - -namespace bts::md { - -struct MarketDataListenerData { - MarketDataListenerData() = default; - MarketDataListenerData(const MarketDataListenerData &) noexcept = delete; - MarketDataListenerData(MarketDataListenerData &&) noexcept = default; - MarketDataListenerData &operator=(const MarketDataListenerData &) noexcept = - delete; - MarketDataListenerData &operator=(MarketDataListenerData &&) noexcept = - default; - ~MarketDataListenerData() = default; - - MarketDataListenerID id; - MarketDataSubscription subscription; -}; - -} // namespace bts::md -#endif diff --git a/src/lib/md/ccApi/CCMain.cpp b/src/lib/md/ccApi/CCMain.cpp index 22dde3362..db8c21624 100644 --- a/src/lib/md/ccApi/CCMain.cpp +++ b/src/lib/md/ccApi/CCMain.cpp @@ -65,9 +65,7 @@ CCMain::~CCMain() {} void CCMain::run() { LOG(md, Info, "Run::run_ccapi t_id:{} t_name:{}", os::get_thread_id(), os::get_thread_name()); - const auto &md_config = config::get(); - me->gw.start_cc(md_config); - + me->gw.run(); while (true) { std::this_thread::sleep_for(std::chrono::seconds(1)); } diff --git a/src/lib/md/ftx/FTXSubscription.cpp b/src/lib/md/ftx/FTXSubscription.cpp index 5cb4b23e7..33954169f 100644 --- a/src/lib/md/ftx/FTXSubscription.cpp +++ b/src/lib/md/ftx/FTXSubscription.cpp @@ -16,7 +16,6 @@ #include "lib/md/CCApiTradeAdaptor.h" #include "lib/md/ICCApiMessageHandler.h" #include "lib/md/IMarketDataListener.h" -#include "lib/md/MarketDataListenerData.h" #include "lib/md/ftx/FTXHistoricalPriceAdaptor.h" #include "lib/md/ftx/FTXHistoricalPriceRecord.h" #include "lib/md/ftx/FTXMessageType.h" diff --git a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp b/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp index c6dcb0d52..c0df3d6a7 100644 --- a/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp +++ b/src/server/sparkd/cmds/crypto/LiveLadderDemo.cpp @@ -8,13 +8,13 @@ namespace bts::cmds { -LiveLadderDemo::LiveLadderDemo(const api::md::MarketDataConfig &cfg) { +LiveLadderDemo::LiveLadderDemo(const api::md::MarketDataConfig &) { char ssl_cert_file[] = "SSL_CERT_FILE=/etc/ssl/cert/ca-certificates.crt"; putenv(ssl_cert_file); md::MarketDataGateway gw; md::listeners::LiveLadderPrinter ladder_printer; - gw.start_cc(cfg); + gw.run(); const std::size_t n_loops = 16; for (std::size_t n = 0; n < n_loops; n++) { diff --git a/src/server/sparkd/cmds/md/cmds/Run.cpp b/src/server/sparkd/cmds/md/cmds/Run.cpp index d54d35252..f1cc5bff2 100644 --- a/src/server/sparkd/cmds/md/cmds/Run.cpp +++ b/src/server/sparkd/cmds/md/cmds/Run.cpp @@ -2,10 +2,12 @@ #include "Cleanup.h" #include "lib/config/protos/market_data.pb.h" #include "lib/logging/logging.h" +#include "lib/md/MarketDataGateway.h" #include "lib/md/UserSymbol.h" #include "lib/md/ccApi/CCMain.h" #include "lib/md/relay/RelayRecorder.h" #include "lib/os/os.h" +#include "lib/utils/bts_assert.h" #include "lib/utils/thread_manager.h" #include "server/sparkd/exchange_sim/ExchangeSim.h" #include "server/sparkd/md/platforms/IMDPlatform.h" @@ -92,17 +94,21 @@ static void run_onixs( } static void run_emumba() { + bts_assert(false); LOG(md, Info, "Run::run_emumba t_id:{} t_name:{}", os::get_thread_id(), get_thread_name()); bts::md::EmumbaMain em_main = {}; em_main.run(); } -static void run_ccapi() { - LOG(md, Info, "Run::run_ccapi t_id:{} t_name:{}", os::get_thread_id(), +static void run_md_gwy() { + LOG(md, Info, "Run::run_md_gwy t_id:{} t_name:{}", os::get_thread_id(), get_thread_name()); - bts::md::CCMain cc_main = {}; - cc_main.run(); + // bts::md::CCMain cc_main = {}; + // cc_main.run(); + bts::md::MarketDataGateway gwy = {}; + // this keeps going in a loop + gwy.run(); } void Run::run( @@ -160,9 +166,11 @@ void Run::run( sim::start_exchange_sim(api::Venue::VENUE_SIM, mbo_writer); }).detach(); } - bool is_run_ccapi = true; - if (is_run_ccapi) { - threading::make_thread("CCAPI", []() { run_ccapi(); }).detach(); + bool is_run_md_gwy = true; + if (is_run_md_gwy) { + threading::make_thread("MarketDataGateway", []() { + run_md_gwy(); + }).detach(); } boot_sleep(); } else { From ac31deed5bd6d09a62ce3b00c80439a466033e32 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 8 Feb 2023 14:08:38 -0500 Subject: [PATCH 08/23] Fixed Jetfix conf, and added some logs to SimExecutionGateway --- .../api/service_helpers/AdminServiceUtils.cpp | 2 +- src/lib/config/profiles/default/jetfix.conf | 418 +++++++++--------- src/lib/orderman/CancelOrderMsg.h | 6 + src/lib/orderman/CancelReplaceOrderMsg.h | 7 + src/lib/orderman/OrderMsg.h | 14 +- .../gateways/ExecutionGatewayFactory.cpp | 3 +- .../gateways/sim/SimExecutionGateway.cpp | 48 +- .../sim/SimExecutionGatewayFactory.cpp | 8 +- .../sim/SimExecutionGatewayUniqueWrapper.cpp | 44 +- src/server/sparkd/cmds/Run.cpp | 3 +- 10 files changed, 311 insertions(+), 242 deletions(-) diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index d7790b73d..e57672b1f 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -212,7 +212,7 @@ void AdminServiceUtils::fill_connections_from_config( break; case bts::api::VENUE_CBOE: break; - // /case bts::api::VENUE_ICE: + case bts::api::VENUE_SIM: case bts::api::VENUE_SIMICE: connection.mutable_sim_connection(); add_connection(admin_data, connection); diff --git a/src/lib/config/profiles/default/jetfix.conf b/src/lib/config/profiles/default/jetfix.conf index 00f4fc155..0059b9b9e 100644 --- a/src/lib/config/profiles/default/jetfix.conf +++ b/src/lib/config/profiles/default/jetfix.conf @@ -3,7 +3,7 @@ JetFIXSimConnection { value { sim { name: "sim" - platform: SIM + venue: VENUE_SIM socket_connect_host_ip: "127.0.0.1" socket_connect_port: @Ports.glbx_sim_fix_port sender_compid: "SPARK" # this is the FIX session name @@ -20,7 +20,7 @@ JetFIXSimConnection { } sim_ice { name: "sim_ice" - platform: SIMICE + venue: VENUE_SIMICE socket_connect_host_ip: "127.0.0.1" socket_connect_port: @Ports.ice_sim_fix_port sender_compid: "51239" # this is the FIX session name @@ -43,7 +43,7 @@ JetFIX { #connection: @JetFIXSimConnection.sim_ice connection { name: "ice_cert" - platform: ICE + venue: VENUE_ICE use_cme_secure_logon: false log_fix_stream: true socket_connect_host_ip: "63.247.113.154" @@ -65,7 +65,7 @@ JetFIX { connection { name: "cme_mc5_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -82,7 +82,7 @@ JetFIX { } connection { name: "cme_mc5_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -99,7 +99,7 @@ JetFIX { } connection { name: "cme_mc5_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -116,7 +116,7 @@ JetFIX { } connection { name: "cme_mc5_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -133,7 +133,7 @@ JetFIX { } connection { name: "cme_mc5_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -150,7 +150,7 @@ JetFIX { } connection { name: "cme_mc5_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -167,7 +167,7 @@ JetFIX { } connection { name: "cme_mc5_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -190,7 +190,7 @@ JetFIX { value { connection { name: "ice_cert" - platform: ICE + venue: VENUE_ICE use_cme_secure_logon: false log_fix_stream: true socket_connect_host_ip: "63.247.113.154" @@ -210,7 +210,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mc7_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -227,7 +227,7 @@ JetFIX { } connection { name: "cme_mc7_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -244,7 +244,7 @@ JetFIX { } connection { name: "cme_mc7_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -261,7 +261,7 @@ JetFIX { } connection { name: "cme_mc7_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -278,7 +278,7 @@ JetFIX { } connection { name: "cme_mc7_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -295,7 +295,7 @@ JetFIX { } connection { name: "cme_mc7_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -312,7 +312,7 @@ JetFIX { } connection { name: "cme_mc7_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -329,7 +329,7 @@ JetFIX { } connection { name: "cme_mc7_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -346,7 +346,7 @@ JetFIX { } connection { name: "cme_mc7_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -363,7 +363,7 @@ JetFIX { } connection { name: "cme_mc7_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -380,7 +380,7 @@ JetFIX { } connection { name: "cme_mc7_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -397,7 +397,7 @@ JetFIX { } connection { name: "cme_mc7_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -414,7 +414,7 @@ JetFIX { } connection { name: "cme_mc7_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -431,7 +431,7 @@ JetFIX { } connection { name: "cme_mc7_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -448,7 +448,7 @@ JetFIX { } connection { name: "cme_mc7_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -465,7 +465,7 @@ JetFIX { } connection { name: "cme_mc7_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -482,7 +482,7 @@ JetFIX { } connection { name: "cme_mc7_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -499,7 +499,7 @@ JetFIX { } connection { name: "cme_mc7_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -524,7 +524,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mc7_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -541,7 +541,7 @@ JetFIX { } connection { name: "cme_mc7_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -558,7 +558,7 @@ JetFIX { } connection { name: "cme_mc7_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -575,7 +575,7 @@ JetFIX { } connection { name: "cme_mc7_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -592,7 +592,7 @@ JetFIX { } connection { name: "cme_mc7_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -609,7 +609,7 @@ JetFIX { } connection { name: "cme_mc7_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -626,7 +626,7 @@ JetFIX { } connection { name: "cme_mc7_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -643,7 +643,7 @@ JetFIX { } connection { name: "cme_mc7_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -660,7 +660,7 @@ JetFIX { } connection { name: "cme_mc7_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -677,7 +677,7 @@ JetFIX { } connection { name: "cme_mc7_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -694,7 +694,7 @@ JetFIX { } connection { name: "cme_mc7_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -711,7 +711,7 @@ JetFIX { } connection { name: "cme_mc7_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -728,7 +728,7 @@ JetFIX { } connection { name: "cme_mc7_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -745,7 +745,7 @@ JetFIX { } connection { name: "cme_mc7_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -762,7 +762,7 @@ JetFIX { } connection { name: "cme_mc7_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -779,7 +779,7 @@ JetFIX { } connection { name: "cme_mc7_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -796,7 +796,7 @@ JetFIX { } connection { name: "cme_mc7_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -813,7 +813,7 @@ JetFIX { } connection { name: "cme_mc7_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 61923 sender_compid: "MC7004N" @@ -836,7 +836,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mc5_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -853,7 +853,7 @@ JetFIX { } connection { name: "cme_mc5_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -870,7 +870,7 @@ JetFIX { } connection { name: "cme_mc5_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -887,7 +887,7 @@ JetFIX { } connection { name: "cme_mc5_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -904,7 +904,7 @@ JetFIX { } connection { name: "cme_mc5_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -921,7 +921,7 @@ JetFIX { } connection { name: "cme_mc5_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -938,7 +938,7 @@ JetFIX { } connection { name: "cme_mc5_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61922 sender_compid: "MC5004N" @@ -955,7 +955,7 @@ JetFIX { } # connection { # name: "cme_mc5_60" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.195" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -972,7 +972,7 @@ JetFIX { # } # connection { # name: "cme_mc5_76" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.204" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -989,7 +989,7 @@ JetFIX { # } # connection { # name: "cme_mc5_88" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.169" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1006,7 +1006,7 @@ JetFIX { # } # connection { # name: "cme_mc5_74" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.197" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1023,7 +1023,7 @@ JetFIX { # } # connection { # name: "cme_mc5_64" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.177" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1040,7 +1040,7 @@ JetFIX { # } # connection { # name: "cme_mc5_72" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.189" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1057,7 +1057,7 @@ JetFIX { # } # connection { # name: "cme_mc5_70" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.183" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1074,7 +1074,7 @@ JetFIX { # } # connection { # name: "cme_mc5_68" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.168" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1091,7 +1091,7 @@ JetFIX { # } # connection { # name: "cme_mc5_80" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.187" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1108,7 +1108,7 @@ JetFIX { # } # connection { # name: "cme_mc5_84" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.198" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1125,7 +1125,7 @@ JetFIX { # } # connection { # name: "cme_mc5_78" - # platform: GLBX + # venue: VENUE_GLBX # socket_connect_host_ip: "69.50.112.167" # socket_connect_port: 61922 # sender_compid: "MC5004N" @@ -1148,7 +1148,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mbx_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1165,7 +1165,7 @@ JetFIX { } connection { name: "cme_mbx_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1182,7 +1182,7 @@ JetFIX { } connection { name: "cme_mbx_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1199,7 +1199,7 @@ JetFIX { } connection { name: "cme_mbx_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1216,7 +1216,7 @@ JetFIX { } connection { name: "cme_mbx_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1233,7 +1233,7 @@ JetFIX { } connection { name: "cme_mbx_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1250,7 +1250,7 @@ JetFIX { } connection { name: "cme_mbx_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1267,7 +1267,7 @@ JetFIX { } connection { name: "cme_mbx_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1284,7 +1284,7 @@ JetFIX { } connection { name: "cme_mbx_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1301,7 +1301,7 @@ JetFIX { } connection { name: "cme_mbx_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1318,7 +1318,7 @@ JetFIX { } connection { name: "cme_mbx_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1335,7 +1335,7 @@ JetFIX { } connection { name: "cme_mbx_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1352,7 +1352,7 @@ JetFIX { } connection { name: "cme_mbx_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1369,7 +1369,7 @@ JetFIX { } connection { name: "cme_mbx_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1386,7 +1386,7 @@ JetFIX { } connection { name: "cme_mbx_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1403,7 +1403,7 @@ JetFIX { } connection { name: "cme_mbx_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1420,7 +1420,7 @@ JetFIX { } connection { name: "cme_mbx_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1437,7 +1437,7 @@ JetFIX { } connection { name: "cme_mbx_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 61920 sender_compid: "MBX004N" @@ -1460,7 +1460,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mc1_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1477,7 +1477,7 @@ JetFIX { } connection { name: "cme_mc1_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1494,7 +1494,7 @@ JetFIX { } connection { name: "cme_mc1_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1511,7 +1511,7 @@ JetFIX { } connection { name: "cme_mc1_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1528,7 +1528,7 @@ JetFIX { } connection { name: "cme_mc1_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1545,7 +1545,7 @@ JetFIX { } connection { name: "cme_mc1_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1562,7 +1562,7 @@ JetFIX { } connection { name: "cme_mc1_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1579,7 +1579,7 @@ JetFIX { } connection { name: "cme_mc1_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1596,7 +1596,7 @@ JetFIX { } connection { name: "cme_mc1_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1613,7 +1613,7 @@ JetFIX { } connection { name: "cme_mc1_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1630,7 +1630,7 @@ JetFIX { } connection { name: "cme_mc1_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1647,7 +1647,7 @@ JetFIX { } connection { name: "cme_mc1_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1664,7 +1664,7 @@ JetFIX { } connection { name: "cme_mc1_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1681,7 +1681,7 @@ JetFIX { } connection { name: "cme_mc1_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1698,7 +1698,7 @@ JetFIX { } connection { name: "cme_mc1_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1715,7 +1715,7 @@ JetFIX { } connection { name: "cme_mc1_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1732,7 +1732,7 @@ JetFIX { } connection { name: "cme_mc1_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1749,7 +1749,7 @@ JetFIX { } connection { name: "cme_mc1_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 61921 sender_compid: "MC1004N" @@ -1772,7 +1772,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_mc8_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1789,7 +1789,7 @@ JetFIX { } connection { name: "cme_mc8_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1806,7 +1806,7 @@ JetFIX { } connection { name: "cme_mc8_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1823,7 +1823,7 @@ JetFIX { } connection { name: "cme_mc8_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1840,7 +1840,7 @@ JetFIX { } connection { name: "cme_mc8_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1857,7 +1857,7 @@ JetFIX { } connection { name: "cme_mc8_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1874,7 +1874,7 @@ JetFIX { } connection { name: "cme_mc8_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1891,7 +1891,7 @@ JetFIX { } connection { name: "cme_mc8_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1908,7 +1908,7 @@ JetFIX { } connection { name: "cme_mc8_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1925,7 +1925,7 @@ JetFIX { } connection { name: "cme_mc8_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1942,7 +1942,7 @@ JetFIX { } connection { name: "cme_mc8_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1959,7 +1959,7 @@ JetFIX { } connection { name: "cme_mc8_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1976,7 +1976,7 @@ JetFIX { } connection { name: "cme_mc8_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -1993,7 +1993,7 @@ JetFIX { } connection { name: "cme_mc8_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -2010,7 +2010,7 @@ JetFIX { } connection { name: "cme_mc8_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -2027,7 +2027,7 @@ JetFIX { } connection { name: "cme_mc8_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -2044,7 +2044,7 @@ JetFIX { } connection { name: "cme_mc8_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -2061,7 +2061,7 @@ JetFIX { } connection { name: "cme_mc8_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 61924 sender_compid: "MC8004N" @@ -2085,7 +2085,7 @@ JetFIX { connection: @JetFIXSimConnection.sim connection { name: "cme_m4d_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.199" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2102,7 +2102,7 @@ JetFIX { } connection { name: "cme_m4d_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.172" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2119,7 +2119,7 @@ JetFIX { } connection { name: "cme_m4d_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.191" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2136,7 +2136,7 @@ JetFIX { } connection { name: "cme_m4d_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.179" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2153,7 +2153,7 @@ JetFIX { } connection { name: "cme_m4d_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.174" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2170,7 +2170,7 @@ JetFIX { } connection { name: "cme_m4d_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.202" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2187,7 +2187,7 @@ JetFIX { } connection { name: "cme_m4d_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.181" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2204,7 +2204,7 @@ JetFIX { } connection { name: "cme_m4d_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.195" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2221,7 +2221,7 @@ JetFIX { } connection { name: "cme_m4d_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.204" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2238,7 +2238,7 @@ JetFIX { } connection { name: "cme_m4d_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.169" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2255,7 +2255,7 @@ JetFIX { } connection { name: "cme_m4d_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.197" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2272,7 +2272,7 @@ JetFIX { } connection { name: "cme_m4d_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.177" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2289,7 +2289,7 @@ JetFIX { } connection { name: "cme_m4d_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.189" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2306,7 +2306,7 @@ JetFIX { } connection { name: "cme_m4d_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.183" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2323,7 +2323,7 @@ JetFIX { } connection { name: "cme_m4d_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.168" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2340,7 +2340,7 @@ JetFIX { } connection { name: "cme_m4d_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.187" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2357,7 +2357,7 @@ JetFIX { } connection { name: "cme_m4d_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.198" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2374,7 +2374,7 @@ JetFIX { } connection { name: "cme_m4d_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "69.50.112.167" socket_connect_port: 63993 sender_compid: "M4D004N" @@ -2424,7 +2424,7 @@ JetFIX { value { connection { name: "cme_ngg_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64580 #Original IP and Port @@ -2443,7 +2443,7 @@ JetFIX { } connection { name: "cme_ngg_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64582 #Original IP and Port @@ -2462,7 +2462,7 @@ JetFIX { } connection { name: "cme_ngg_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64584 #Original IP and Port @@ -2481,7 +2481,7 @@ JetFIX { } connection { name: "cme_ngg_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64586 #Original IP and Port @@ -2500,7 +2500,7 @@ JetFIX { } connection { name: "cme_ngg_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64588 #Original IP and Port @@ -2519,7 +2519,7 @@ JetFIX { } connection { name: "cme_ngg_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64590 #Original IP and Port @@ -2539,7 +2539,7 @@ JetFIX { # ES connection { name: "cme_ngg_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64594 #Original IP and Port @@ -2558,7 +2558,7 @@ JetFIX { } connection { name: "cme_ngg_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64598 #Original IP and Port @@ -2577,7 +2577,7 @@ JetFIX { } connection { name: "cme_ngg_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64600 #Original IP and Port @@ -2596,7 +2596,7 @@ JetFIX { } connection { name: "cme_ngg_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64602 #Original IP and Port @@ -2615,7 +2615,7 @@ JetFIX { } connection { name: "cme_ngg_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64604 #Original IP and Port @@ -2634,7 +2634,7 @@ JetFIX { } connection { name: "cme_ngg_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64606 #Original IP and Port @@ -2653,7 +2653,7 @@ JetFIX { } connection { name: "cme_ngg_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64608 #Original IP and Port @@ -2673,7 +2673,7 @@ JetFIX { # CL connection { name: "cme_ngg_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64610 #Original IP and Port @@ -2692,7 +2692,7 @@ JetFIX { } connection { name: "cme_ngg_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64612 #Original IP and Port @@ -2711,7 +2711,7 @@ JetFIX { } connection { name: "cme_ngg_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64614 #Original IP and Port @@ -2730,7 +2730,7 @@ JetFIX { } connection { name: "cme_ngg_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64618 #Original IP and Port @@ -2749,7 +2749,7 @@ JetFIX { } connection { name: "cme_ngg_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 64629 #Original IP and Port @@ -2774,7 +2774,7 @@ JetFIX { value { connection { name: "cme_vae_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60221 #Original IP and Port @@ -2793,7 +2793,7 @@ JetFIX { } connection { name: "cme_vae_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60223 #Original IP and Port @@ -2812,7 +2812,7 @@ JetFIX { } connection { name: "cme_vae_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60225 #Original IP and Port @@ -2831,7 +2831,7 @@ JetFIX { } connection { name: "cme_vae_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60227 #Original IP and Port @@ -2850,7 +2850,7 @@ JetFIX { } connection { name: "cme_vae_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60229 #Original IP and Port @@ -2869,7 +2869,7 @@ JetFIX { } connection { name: "cme_vae_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60231 #Original IP and Port @@ -2889,7 +2889,7 @@ JetFIX { # ES connection { name: "cme_vae_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60235 #Original IP and Port @@ -2908,7 +2908,7 @@ JetFIX { } connection { name: "cme_vae_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60239 #Original IP and Port @@ -2927,7 +2927,7 @@ JetFIX { } connection { name: "cme_vae_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60241 #Original IP and Port @@ -2946,7 +2946,7 @@ JetFIX { } connection { name: "cme_vae_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60243 #Original IP and Port @@ -2965,7 +2965,7 @@ JetFIX { } connection { name: "cme_vae_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60245 #Original IP and Port @@ -2984,7 +2984,7 @@ JetFIX { } connection { name: "cme_vae_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60247 #Original IP and Port @@ -3003,7 +3003,7 @@ JetFIX { } connection { name: "cme_vae_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60249 #Original IP and Port @@ -3023,7 +3023,7 @@ JetFIX { # CL connection { name: "cme_vae_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60251 #Original IP and Port @@ -3042,7 +3042,7 @@ JetFIX { } connection { name: "cme_vae_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60253 #Original IP and Port @@ -3061,7 +3061,7 @@ JetFIX { } connection { name: "cme_vae_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60255 #Original IP and Port @@ -3080,7 +3080,7 @@ JetFIX { } connection { name: "cme_vae_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60259 #Original IP and Port @@ -3099,7 +3099,7 @@ JetFIX { } connection { name: "cme_vae_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60270 #Original IP and Port @@ -3124,7 +3124,7 @@ JetFIX { value { connection { name: "cme_uze_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60220 #Original IP and Port @@ -3143,7 +3143,7 @@ JetFIX { } connection { name: "cme_uze_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60222 #Original IP and Port @@ -3162,7 +3162,7 @@ JetFIX { } connection { name: "cme_uze_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60224 #Original IP and Port @@ -3181,7 +3181,7 @@ JetFIX { } connection { name: "cme_uze_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60226 #Original IP and Port @@ -3200,7 +3200,7 @@ JetFIX { } connection { name: "cme_uze_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60228 #Original IP and Port @@ -3219,7 +3219,7 @@ JetFIX { } connection { name: "cme_uze_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60230 #Original IP and Port @@ -3239,7 +3239,7 @@ JetFIX { # ES connection { name: "cme_uze_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60234 #Original IP and Port @@ -3258,7 +3258,7 @@ JetFIX { } connection { name: "cme_uze_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60238 #Original IP and Port @@ -3277,7 +3277,7 @@ JetFIX { } connection { name: "cme_uze_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60240 #Original IP and Port @@ -3296,7 +3296,7 @@ JetFIX { } connection { name: "cme_uze_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60242 #Original IP and Port @@ -3315,7 +3315,7 @@ JetFIX { } connection { name: "cme_uze_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60244 #Original IP and Port @@ -3334,7 +3334,7 @@ JetFIX { } connection { name: "cme_uze_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60246 #Original IP and Port @@ -3353,7 +3353,7 @@ JetFIX { } connection { name: "cme_uze_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60248 #Original IP and Port @@ -3373,7 +3373,7 @@ JetFIX { # CL connection { name: "cme_uze_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60250 #Original IP and Port @@ -3392,7 +3392,7 @@ JetFIX { } connection { name: "cme_uze_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60252 #Original IP and Port @@ -3411,7 +3411,7 @@ JetFIX { } connection { name: "cme_uze_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60254 #Original IP and Port @@ -3430,7 +3430,7 @@ JetFIX { } connection { name: "cme_uze_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60258 #Original IP and Port @@ -3449,7 +3449,7 @@ JetFIX { } connection { name: "cme_uze_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60269 #Original IP and Port @@ -3474,7 +3474,7 @@ JetFIX { value { connection { name: "cme_mjf_50" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60882 #Original IP and Port @@ -3493,7 +3493,7 @@ JetFIX { } connection { name: "cme_mjf_52" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60884 #Original IP and Port @@ -3512,7 +3512,7 @@ JetFIX { } connection { name: "cme_mjf_54" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60886 #Original IP and Port @@ -3531,7 +3531,7 @@ JetFIX { } connection { name: "cme_mjf_56" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60888 #Original IP and Port @@ -3550,7 +3550,7 @@ JetFIX { } connection { name: "cme_mjf_58" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60890 #Original IP and Port @@ -3569,7 +3569,7 @@ JetFIX { } connection { name: "cme_mjf_60" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60892 #Original IP and Port @@ -3589,7 +3589,7 @@ JetFIX { # ES connection { name: "cme_mjf_64" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60896 #Original IP and Port @@ -3608,7 +3608,7 @@ JetFIX { } connection { name: "cme_mjf_68" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60900 #Original IP and Port @@ -3627,7 +3627,7 @@ JetFIX { } connection { name: "cme_mjf_70" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60902 #Original IP and Port @@ -3646,7 +3646,7 @@ JetFIX { } connection { name: "cme_mjf_72" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60904 #Original IP and Port @@ -3665,7 +3665,7 @@ JetFIX { } connection { name: "cme_mjf_74" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60906 #Original IP and Port @@ -3684,7 +3684,7 @@ JetFIX { } connection { name: "cme_mjf_76" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60908 #Original IP and Port @@ -3703,7 +3703,7 @@ JetFIX { } connection { name: "cme_mjf_78" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60910 #Original IP and Port @@ -3723,7 +3723,7 @@ JetFIX { # CL connection { name: "cme_mjf_80" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60912 #Original IP and Port @@ -3742,7 +3742,7 @@ JetFIX { } connection { name: "cme_mjf_82" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60914 #Original IP and Port @@ -3761,7 +3761,7 @@ JetFIX { } connection { name: "cme_mjf_84" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60916 #Original IP and Port @@ -3780,7 +3780,7 @@ JetFIX { } connection { name: "cme_mjf_88" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60920 #Original IP and Port @@ -3799,7 +3799,7 @@ JetFIX { } connection { name: "cme_mjf_99" - platform: GLBX + venue: VENUE_GLBX socket_connect_host_ip: "10.3.10.16" socket_connect_port: 60931 #Original IP and Port diff --git a/src/lib/orderman/CancelOrderMsg.h b/src/lib/orderman/CancelOrderMsg.h index 97b13c899..ab8991f57 100644 --- a/src/lib/orderman/CancelOrderMsg.h +++ b/src/lib/orderman/CancelOrderMsg.h @@ -13,4 +13,10 @@ struct CancelOrderMsg { api::Side side; }; +inline std::ostream &operator<<(std::ostream &out, CancelOrderMsg const &msg) { + out << "key: " << msg.key + << " exchange_order_id: " << msg.exchange_order_id.value(); + return out; +} + } // namespace bts::orderman diff --git a/src/lib/orderman/CancelReplaceOrderMsg.h b/src/lib/orderman/CancelReplaceOrderMsg.h index b3b314e02..f1b3936d5 100644 --- a/src/lib/orderman/CancelReplaceOrderMsg.h +++ b/src/lib/orderman/CancelReplaceOrderMsg.h @@ -9,4 +9,11 @@ struct CancelReplaceOrderMsg { ExchangeOrderID64 exchange_order_id; }; +inline std::ostream &operator<<( + std::ostream &out, CancelReplaceOrderMsg const &msg) { + out << "exchange_order_id: " << msg.exchange_order_id.value() + << "create: " << msg.create_fields; + return out; +} + } // namespace bts::orderman diff --git a/src/lib/orderman/OrderMsg.h b/src/lib/orderman/OrderMsg.h index be8f2fbca..ca4d361bd 100644 --- a/src/lib/orderman/OrderMsg.h +++ b/src/lib/orderman/OrderMsg.h @@ -14,20 +14,14 @@ using OrderMsg = inline std::ostream &operator<<(std::ostream &out, OrderMsg const &msg) { if (std::holds_alternative(msg)) { const CreateOrderMsg &cr_msg = std::get(msg); - out << "Create Msg sec_id: " << cr_msg.security->id() - << " p: " << cr_msg.price.value() - << " q: " << cr_msg.quantity.full_value(); + out << "Create: " << cr_msg; } else if (std::holds_alternative(msg)) { const CancelReplaceOrderMsg &cxlr_msg = std::get(msg); - const CreateOrderMsg &cr_msg = cxlr_msg.create_fields; - out << "CancelReplace Msg sec_id: " << cr_msg.security->id() - << " p: " << cr_msg.price.value() - << " q: " << cr_msg.quantity.full_value(); - - } else if (std::holds_alternative(msg)) { + out << "CancelReplace : " << cxlr_msg; + } else if (std::holds_alternative(msg)) { const CancelOrderMsg &cxl_msg = std::get(msg); - out << "Cancel Msg okey: " << cxl_msg.key.value(); + out << "Cancel: : " << cxl_msg; } return out; } diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp index 3203af658..b9e61753e 100644 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp @@ -34,7 +34,8 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( } else if (conn.venue() == bts::api::VENUE_DERIBIT) return std::make_unique(conn.venue()); //return std::make_unique(o); - return std::make_unique(o); + return std::make_unique(conn.venue()); + //return std::make_unique(o); // return std::make_unique(o); // return std::make_unique(conn, pl, o); } diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index f334b9c8d..e152314b6 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -18,6 +18,7 @@ #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/os/os.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/Dispatcher.h" #include "lib/utils/TimeStamp.h" @@ -64,29 +65,40 @@ struct SimExecutionGateway::PImpl { SimExecutionGateway::SimExecutionGateway( md::SecurityOracle o, bts::md::MDClient &md_client) : IExecutionGateway(), me(new PImpl(o, md_client)) { - LOG(OrderMan, Info, "SimExecutionGateway::SimExecutionGateway constructor"); + LOG(OrderMan, Info, + "SimExecutionGateway::SimExecutionGateway constructor tid: {} tname: {}", + bts::os::get_thread_id(), bts::os::get_thread_name()); } SimExecutionGateway::~SimExecutionGateway() {} void SimExecutionGateway::start() { - LOG(OrderMan, Info, "SimExecutionGateway::start"); + LOG(OrderMan, Info, "SimExecutionGateway::start tid: {} tname: {}", + bts::os::get_thread_id(), bts::os::get_thread_name()); } -// this is a periodic timer +// this is a periodic timer, to process the messages we got from the +// exchange and send the resulting execution reports up by calling +// on_exe_report void SimExecutionGateway::dispatch_incoming_fix_messages() { if (me->buffered_msgs.size() == 0) { return; } + // if there are nessages, we simply generate an execution report reflecting + // the action and send it back via on_exe_report std::vector aux_msgs = me->buffered_msgs; me->buffered_msgs.clear(); + LOG(OrderMan, Info, + "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " + "{} n_msgs: {}", + bts::os::get_thread_id(), bts::os::get_thread_name(), aux_msgs.size()); for (OrderMsg m : aux_msgs) { + LOG(OrderMan, Diag, + "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " + "{} m: {}", + bts::os::get_thread_id(), bts::os::get_thread_name(), m); if (std::holds_alternative(m)) { CreateOrderMsg cr_msg = std::get(m); - LOG(OrderMan, Info, - "SimExecutionGateway::dispatch_incoming_fix_message key: {} sec: " - "{} p: {} q: {}", - cr_msg.key, cr_msg.security->id(), cr_msg.price, cr_msg.quantity); ExecutionReport er = {}; std::string account_name = "ACCA1"; std::array an_array = {}; @@ -120,7 +132,7 @@ void SimExecutionGateway::dispatch_incoming_fix_messages() { trace::CorID cid = {}; me->exe_reports.push_back(er); const auto &er_pheap = me->exe_reports.back(); - LOG(OrderMan, Info, + LOG(OrderMan, Diag, "SimExecutionGateway::dispatch_incoming_fix_messages er: {}", er_pheap.to_string()); me->on_exe_report(er_pheap, cid); @@ -131,7 +143,7 @@ void SimExecutionGateway::dispatch_incoming_fix_messages() { er.order_status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; er.msg = "Cancelled"; me->on_exe_report(er, {}); - LOG(OrderMan, Info, + LOG(OrderMan, Diag, "SimExecutionGateway::dispatch_incoming_fix_messages er: " "{}", er.to_string()); @@ -157,12 +169,14 @@ void SimExecutionGateway::dispatch_incoming_fix_messages() { void SimExecutionGateway::on_securities( const mercury::Update &) { - LOG(OrderMan, Info, "SimExecutionGateway::on_securities"); + LOG(OrderMan, Info, "SimExecutionGateway::on_securities tid: {} tname: {}", + bts::os::get_thread_id(), bts::os::get_thread_name()); } void SimExecutionGateway::on_admin_data( const mercury::Update &update) { - LOG(OrderMan, Info, "SimExecutionGateway::on_admin_data"); + LOG(OrderMan, Info, "SimExecutionGateway::on_admin_data tid: {} tname: {}", + bts::os::get_thread_id(), bts::os::get_thread_name()); if (update.events) { for (auto const &ev : *(update.events)) me->admin_data.CopyFrom(*ev.admin_data); @@ -176,10 +190,16 @@ void SimExecutionGateway::send_fix(const jetfix::OutFIXPtr &, trace::CorID) { void SimExecutionGateway::send_msgs( std::vector const &msg_vec, trace::CorID) { - // this is where it will be sent to the exchange - LOG(OrderMan, Info, "SimExecutionGateway::send_msgs count: {}", - msg_vec.size()); + // this is where it will be sent to the exchange (to simulate we'll just put + // in the buffer and generate execution reports from it in the + // dispatch_incoming_fix_messages call + LOG(OrderMan, Info, + "SimExecutionGateway::send_msgs tid: {} tname: {} count: {}", + bts::os::get_thread_id(), bts::os::get_thread_name(), msg_vec.size()); for (auto &m : msg_vec) { + LOG(OrderMan, Diag, + "SimExecutionGateway::send_msgs tid: {} tname: {} m: {}", + bts::os::get_thread_id(), bts::os::get_thread_name(), m); me->buffered_msgs.emplace_back(m); } } diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index c87f885ac..52dfb2018 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -49,8 +49,12 @@ SimExecutionGatewayFactory::~SimExecutionGatewayFactory() {} /////////////////////////////////////////////////////////////////////////////// void SimExecutionGatewayFactory::init_once(bts::md::MDClient &md_client) { - std::call_once( - flag, [&]() { instance = new SimExecutionGatewayFactory(md_client); }); + LOG(OrderMan, Info, "SimExecutionGatewayFactory::init_once"); + std::call_once(flag, [&]() { + LOG(OrderMan, Info, + "SimExecutionGatewayFactory::init_once, initializing instance"); + instance = new SimExecutionGatewayFactory(md_client); + }); } SimExecutionGatewayFactory *SimExecutionGatewayFactory::get() { bts_assert(instance != nullptr); diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp index 2c473838a..79e9f184d 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp @@ -1,32 +1,49 @@ #include "SimExecutionGatewayUniqueWrapper.h" #include "SimExecutionGateway.h" #include "SimExecutionGatewayFactory.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/logging/logging.h" #include namespace bts::orderman { struct SimExecutionGatewayUniqueWrapper::PImpl { + api::Venue venue; std::shared_ptr gateway; - PImpl(std::shared_ptr gateway_ptr) - : gateway(gateway_ptr) {} + PImpl(api::Venue venue, std::shared_ptr gateway_ptr) + : venue(venue), gateway(gateway_ptr) {} }; SimExecutionGatewayUniqueWrapper::SimExecutionGatewayUniqueWrapper( bts::api::Venue venue) - : me(new PImpl(SimExecutionGatewayFactory::get()->get_getayeway(venue))) {} + : me(new PImpl( + venue, SimExecutionGatewayFactory::get()->get_getayeway(venue))) { + LOG(OrderMan, Info, "SimExecutionGatewayUniqueWrapper::cons venue: {}", + bts::api::Venue_Name(venue)); +} SimExecutionGatewayUniqueWrapper::~SimExecutionGatewayUniqueWrapper() {} // all these functions -void SimExecutionGatewayUniqueWrapper::start() { me->gateway->start(); } +void SimExecutionGatewayUniqueWrapper::start() { + LOG(OrderMan, Info, "SimExecutionGatewayUniqueWrapper::start venue: {}", + bts::api::Venue_Name(me->venue)); + me->gateway->start(); +} void SimExecutionGatewayUniqueWrapper::dispatch_incoming_fix_messages() { me->gateway->dispatch_incoming_fix_messages(); } void SimExecutionGatewayUniqueWrapper::on_securities( const mercury::Update &u) { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_securities venue: {}", + bts::api::Venue_Name(me->venue)); me->gateway->on_securities(u); } void SimExecutionGatewayUniqueWrapper::on_admin_data( const mercury::Update &u) { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_admin_data venue: {}", + bts::api::Venue_Name(me->venue)); me->gateway->on_admin_data(u); } void SimExecutionGatewayUniqueWrapper::send_fix( @@ -35,24 +52,43 @@ void SimExecutionGatewayUniqueWrapper::send_fix( } void SimExecutionGatewayUniqueWrapper::send_msgs( std::vector const &msgs, trace::CorID cid) { + for (const auto &m : msgs) { + LOG(OrderMan, Info, "SimExecutionGatewayUniqueWrapper::send_msgs m: {}", + m); + } me->gateway->send_msgs(msgs, cid); } OnExeReport &SimExecutionGatewayUniqueWrapper::on_exe_report() { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_exe_report venue: {}", + bts::api::Venue_Name(me->venue)); return me->gateway->on_exe_report(); } OnGwStatusChange &SimExecutionGatewayUniqueWrapper::on_gw_status_change() { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_gw_status_change venue: {}", + bts::api::Venue_Name(me->venue)); return me->gateway->on_gw_status_change(); } OnCancelReject &SimExecutionGatewayUniqueWrapper::on_cancel_reject() { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_cancel_reject venue: {}", + bts::api::Venue_Name(me->venue)); return me->gateway->on_cancel_reject(); } OnExchangePositionState & SimExecutionGatewayUniqueWrapper::on_exchange_position_state() { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_exchange_position_state venue: {}", + bts::api::Venue_Name(me->venue)); return me->gateway->on_exchange_position_state(); } OnExchangeOpenOrdersState & SimExecutionGatewayUniqueWrapper::on_exchange_open_orders() { + LOG(OrderMan, Info, + "SimExecutionGatewayUniqueWrapper::on_exchange_open_orders venue: {}", + bts::api::Venue_Name(me->venue)); return me->gateway->on_exchange_open_orders(); } } // namespace bts::orderman \ No newline at end of file diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index a8d3e994a..84a45a264 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -89,6 +89,8 @@ static void execute() { sc, utils::Dispatcher::background(), mdclient); bts::md::MarketDataService mdserver(mdclient, sc, stats); + // starting sim executiop + bts::orderman::SimExecutionGatewayFactory::init_once(mdclient); // initialize order plugins orderman::DynamicOrderRegistry dyn_order_registry; SparkServices plugin_services(dyn_order_registry); @@ -117,7 +119,6 @@ static void execute() { bg_health->increment(); }); timer.start(); - bts::orderman::SimExecutionGatewayFactory::init_once(mdclient); utils::DispatcherTimer timer2(utils::Dispatcher::background(), 1000, [&]() { perf_log.store_log_entries(); From db344656e5294913dacbb226a258ad5433e758e3 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Feb 2023 22:45:58 -0500 Subject: [PATCH 09/23] Adding matching logic to SimExecutionGateway --- .../gateways/sim/SimExecutionGateway.cpp | 329 +++++++++++++----- .../gateways/sim/SimExecutionGateway.h | 30 ++ src/web/CMakeDeps.cmake | 2 +- 3 files changed, 267 insertions(+), 94 deletions(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index e152314b6..999a76a95 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -2,8 +2,10 @@ #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" +#include "lib/domain_model/SecurityKey.h" #include "lib/domain_model/common.h" #include "lib/logging/logging.h" +#include "lib/md/IntPrice.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" #include "lib/orderman/CancelOrderMsg.h" @@ -16,8 +18,11 @@ #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/gateways/IExecutionGateway.h" +#include "lib/orderman/limiter/SecurityLimitNode.h" +#include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/Dispatcher.h" @@ -27,39 +32,99 @@ #include "lib/utils/helper_macros.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" +#include #include +#include #include #include #include #include +#include +#include #include +#include #include #include namespace bts::orderman { +void to_book( + const std::array &bids, + const std::array &asks, + bts::orderman::Book &book) { + auto copy_side = + [](const std::array &from, + BookSide &bk_to) { + for (size_t i = 0; i < std::min(from.size(), bk_to.size()); i++) { + bk_to[i] = from[i]; + } + }; + copy_side(bids, book.bid()); + copy_side(asks, book.ask()); +} + +void from_book( + const bts::orderman::Book &book, + std::array &bids, + std::array &asks) { + auto copy_side = [](const BookSide &bk_from, + std::array &to) { + for (size_t i = 0; i < std::min(to.size(), bk_from.size()); i++) { + to[i] = bk_from[i]; + } + }; + copy_side(book.bid(), bids); + copy_side(book.ask(), asks); +} + +struct SEGOrderState { + OrderKey ord_key; + bts::SecurityKey sec_key; + // going out + md::IntPrice price; + bts::Quantity qty; + api::Side side; + // coming in + bts::Quantity filled_qty; + md::IntPrice avg_filled_price; + bts::Quantity last_filled_qty; + md::IntPrice last_filled_price; + bool active = true; +}; + +struct SEGBook { + bts::SecurityKey key; + bts::orderman::Book real_book; + std::vector orders; + // merges the real book with the orders + bts::orderman::Book get_matched_book() { + bts::orderman::Book rv; + return rv; + } +}; + struct SimExecutionGateway::PImpl { PImpl(md::SecurityOracle o, bts::md::MDClient &md_client) - : admin_data(), connection_time(), sec_oracle(o), md_client(md_client) { + : admin_data(), sec_oracle(o), md_client(md_client) { LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor"); } std::unordered_map securities; - std::unordered_map securities_by_exchange_id; OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; orderman::OnExchangePositionState on_exchange_position_state; orderman::OnExchangeOpenOrdersState on_exchange_open_orders; api::admin::AdminData admin_data; - TimeStamp connection_time; md::SecurityOracle sec_oracle; bts::md::MDClient &md_client; bts::md::MDProducer *md_producer = nullptr; - std::vector buffered_msgs = {}; - unsigned long exchange_oid = 0; - std::vector exe_reports = {}; - IEMOrderMuxer *_order_mux = nullptr; + // send_msgs is sent on the order_man thread, its dequeued in the market data + // thread, and execution reports are queued to buffered_ers + tbb::concurrent_queue buffered_order_ops; + tbb::concurrent_queue buffered_exec_reps; + std::unordered_map books = {}; + tbb::concurrent_hash_map sec_map = {}; }; SimExecutionGateway::SimExecutionGateway( @@ -81,96 +146,107 @@ void SimExecutionGateway::start() { // exchange and send the resulting execution reports up by calling // on_exe_report void SimExecutionGateway::dispatch_incoming_fix_messages() { - if (me->buffered_msgs.size() == 0) { + if (me->buffered_exec_reps.empty()) { return; } + ExecutionReport er; + while (me->buffered_exec_reps.try_pop(er)) { + trace::CorID cid = {}; + LOG(OrderMan, Info, + "ESimExecutionGateway::dispatch_incoming_fix_messages er: {} ", + er.to_string()); + me->on_exe_report(er, cid); + } // if there are nessages, we simply generate an execution report reflecting // the action and send it back via on_exe_report - std::vector aux_msgs = me->buffered_msgs; - me->buffered_msgs.clear(); - LOG(OrderMan, Info, - "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " - "{} n_msgs: {}", - bts::os::get_thread_id(), bts::os::get_thread_name(), aux_msgs.size()); - for (OrderMsg m : aux_msgs) { - LOG(OrderMan, Diag, - "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " - "{} m: {}", - bts::os::get_thread_id(), bts::os::get_thread_name(), m); - if (std::holds_alternative(m)) { - CreateOrderMsg cr_msg = std::get(m); - ExecutionReport er = {}; - std::string account_name = "ACCA1"; - std::array an_array = {}; - size_t i = 0; - for (const char c : account_name) { - an_array[i++] = c; - } - er.account_name = AccountName(an_array); - to_array(cr_msg.routing_record->account(), &er.account_name.value()); - to_array( - cr_msg.routing_record->operator_id(), &er.operator_id.value()); - er.order_key = cr_msg.key; - er.msg_seq_num = 0; - er.security = cr_msg.security; - er.leg_security = nullptr; - er.side = cr_msg.side; - er.time_in_force = cr_msg.time_in_force; - er.order_type = cr_msg.order_type; - er.exec_type = api::orderman::EXEC_TYPE_NEW; - er.order_status = api::orderman::NATIVE_ORDER_STATUS_NEW; - er.manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; - ExchangeOrderID64 eoid = ExchangeOrderID64(me->exchange_oid++); - ExchangeOrderIDVar oid = eoid; - er.exchange_order_id = oid; - er.price = cr_msg.price; - er.quantity = cr_msg.quantity; - er.filled_quantity = Quantity(0); - er.last_shares = Quantity(0); - er.msg = "Message Placed"; - er.exchange = api::VENUE_SIM; - trace::CorID cid = {}; - me->exe_reports.push_back(er); - const auto &er_pheap = me->exe_reports.back(); - LOG(OrderMan, Diag, - "SimExecutionGateway::dispatch_incoming_fix_messages er: {}", - er_pheap.to_string()); - me->on_exe_report(er_pheap, cid); - } else if (std::holds_alternative(m)) { - CancelOrderMsg cxl_m = std::get(m); - for (auto &er : me->exe_reports) { - if (er.order_key == cxl_m.key) { - er.order_status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; - er.msg = "Cancelled"; - me->on_exe_report(er, {}); - LOG(OrderMan, Diag, - "SimExecutionGateway::dispatch_incoming_fix_messages er: " - "{}", - er.to_string()); - return; - } - } - } else if (std::holds_alternative(m)) { - CancelReplaceOrderMsg cxl_r_msg = std::get(m); - CreateOrderMsg cr_msg = cxl_r_msg.create_fields; - for (auto &er : me->exe_reports) { - if (er.order_key == cr_msg.key) { - er.order_status = api::orderman::NATIVE_ORDER_STATUS_REPLACED; - er.msg = "Replaced"; - er.price = cr_msg.price; - er.quantity = cr_msg.quantity; - me->on_exe_report(er, {}); - return; - } - } - } - } + // std::vector aux_msgs = me->buffered_msgs; + // me->buffered_msgs.clear(); + // LOG(OrderMan, Info, + // "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " + // "{} n_msgs: {}", + // bts::os::get_thread_id(), bts::os::get_thread_name(), aux_msgs.size()); + // for (OrderMsg m : aux_msgs) { + // LOG(OrderMan, Diag, + // "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " + // "{} m: {}", + // bts::os::get_thread_id(), bts::os::get_thread_name(), m); + // if (std::holds_alternative(m)) { + // CreateOrderMsg cr_msg = std::get(m); + // ExecutionReport er = {}; + // std::string account_name = "ACCA1"; + // std::array an_array = {}; + // size_t i = 0; + // for (const char c : account_name) { + // an_array[i++] = c; + // } + // er.account_name = AccountName(an_array); + // to_array(cr_msg.routing_record->account(), &er.account_name.value()); + // to_array( + // cr_msg.routing_record->operator_id(), &er.operator_id.value()); + // er.order_key = cr_msg.key; + // er.msg_seq_num = 0; + // er.security = cr_msg.security; + // er.leg_security = nullptr; + // er.side = cr_msg.side; + // er.time_in_force = cr_msg.time_in_force; + // er.order_type = cr_msg.order_type; + // er.exec_type = api::orderman::EXEC_TYPE_NEW; + // er.order_status = api::orderman::NATIVE_ORDER_STATUS_NEW; + // er.manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; + // ExchangeOrderID64 eoid = ExchangeOrderID64(me->exchange_oid++); + // ExchangeOrderIDVar oid = eoid; + // er.exchange_order_id = oid; + // er.price = cr_msg.price; + // er.quantity = cr_msg.quantity; + // er.filled_quantity = Quantity(0); + // er.last_shares = Quantity(0); + // er.msg = "Message Placed"; + // er.exchange = api::VENUE_SIM; + // trace::CorID cid = {}; + // me->exe_reports.push_back(er); + // const auto &er_pheap = me->exe_reports.back(); + // LOG(OrderMan, Diag, + // "SimExecutionGateway::dispatch_incoming_fix_messages er: {}", + // er_pheap.to_string()); + // me->on_exe_report(er_pheap, cid); + // } else if (std::holds_alternative(m)) { + // CancelOrderMsg cxl_m = std::get(m); + // for (auto &er : me->exe_reports) { + // if (er.order_key == cxl_m.key) { + // er.order_status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; + // er.msg = "Cancelled"; + // me->on_exe_report(er, {}); + // LOG(OrderMan, Diag, + // "SimExecutionGateway::dispatch_incoming_fix_messages er: " + // "{}", + // er.to_string()); + // return; + // } + // } + // } else if (std::holds_alternative(m)) { + // CancelReplaceOrderMsg cxl_r_msg = std::get(m); + // CreateOrderMsg cr_msg = cxl_r_msg.create_fields; + // for (auto &er : me->exe_reports) { + // if (er.order_key == cr_msg.key) { + // er.order_status = api::orderman::NATIVE_ORDER_STATUS_REPLACED; + // er.msg = "Replaced"; + // er.price = cr_msg.price; + // er.quantity = cr_msg.quantity; + // me->on_exe_report(er, {}); + // return; + // } + // } + // } + // } } void SimExecutionGateway::on_securities( - const mercury::Update &) { + const mercury::Update &u) { LOG(OrderMan, Info, "SimExecutionGateway::on_securities tid: {} tname: {}", bts::os::get_thread_id(), bts::os::get_thread_name()); + for (const auto &s : *u.events) { + me->sec_map.insert(std::make_pair(s.security->id(), s.security)); + } } void SimExecutionGateway::on_admin_data( @@ -200,7 +276,7 @@ void SimExecutionGateway::send_msgs( LOG(OrderMan, Diag, "SimExecutionGateway::send_msgs tid: {} tname: {} m: {}", bts::os::get_thread_id(), bts::os::get_thread_name(), m); - me->buffered_msgs.emplace_back(m); + me->buffered_order_ops.push(m); } } @@ -225,10 +301,77 @@ void SimExecutionGateway::set_producer(bts::md::MDProducer &md_producer) { void SimExecutionGateway::do_work() {} bool SimExecutionGateway::get_matched_book( - bts::md::SecurityKey, - std::array &, - std::array &) { - return false; + bts::md::SecurityKey k, + std::array &bids, + std::array &asks) { + bts::SecurityKey key = k; + SEGBook &seg_book = me->books[key]; + to_book(bids, asks, seg_book.real_book); + if (seg_book.orders.empty() && me->buffered_order_ops.empty()) + return false; + // integrate the orders + bts::orderman::Book book = seg_book.real_book; + for (SEGOrderState &seg_os : seg_book.orders) { + book = _process_book_change(book, seg_os); + } + // handle buffered operations + OrderMsg ord_msg; + while (me->buffered_order_ops.try_pop(ord_msg)) { + if (std::holds_alternative(ord_msg)) { + const CreateOrderMsg &cr_msg = std::get(ord_msg); + _process_new_order(book, cr_msg); + } else if (std::holds_alternative(ord_msg)) { + const CancelOrderMsg &cxl_msg = std::get(ord_msg); + _process_cxl_order(book, cxl_msg); + } else if (std::holds_alternative(ord_msg)) { + const CancelReplaceOrderMsg &cxl_repl_msg = + std::get(ord_msg); + _process_modify_order(book, cxl_repl_msg); + } + } + from_book(book, bids, asks); + return true; +} + +bts::orderman::Book SimExecutionGateway::_process_book_change( + const bts::orderman::Book &book, SEGOrderState &seg_os) { + tbb::concurrent_hash_map::const_accessor + accessor; + if (!me->sec_map.find(accessor, seg_os.sec_key.value())) { + LOG(OrderMan, Error, + "SimExecutionGateway::_process_book_change could not find key: {}", + seg_os.sec_key.value()); + } + auto sec_ptr = accessor->second; + double tick_sz = sec_ptr->contract_spec().low_tick(); + auto crosses_opp_side = SpreaderUtils::crosses_book( + book, seg_os.side, bts::Price(seg_os.price.price()), tick_sz); + if (crosses_opp_side) { + return _cross_order(book, seg_os); + } else { + return _work_order(book, seg_os); + } +} + +bts::orderman::Book SimExecutionGateway::_process_new_order( + const bts::orderman::Book &book, const CreateOrderMsg &) { + return book; +} +bts::orderman::Book SimExecutionGateway::_process_cxl_order( + const bts::orderman::Book &book, const CancelOrderMsg &) { + return book; +} +bts::orderman::Book SimExecutionGateway::_process_modify_order( + const bts::orderman::Book &book, const CancelReplaceOrderMsg &) { + return book; +} +bts::orderman::Book SimExecutionGateway::_cross_order( + const bts::orderman::Book &book, SEGOrderState &) { + return book; +} +bts::orderman::Book SimExecutionGateway::_work_order( + const bts::orderman::Book &book, SEGOrderState &) { + return book; } } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 0344011bb..2cde5fab0 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -1,10 +1,15 @@ #pragma once #include "lib/domain_model/Security.pb.h" +#include "lib/domain_model/SecurityKey.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" #include "lib/md/Shm/FixedSecurity.h" #include "lib/md/protos/co2.pb.h" +#include "lib/orderman/CancelOrderMsg.h" +#include "lib/orderman/CancelReplaceOrderMsg.h" +#include "lib/orderman/CreateOrderMsg.h" +#include "lib/orderman/OrderMsg.h" #include "lib/orderman/gateways/IExecutionGateway.h" namespace bts::md { @@ -12,9 +17,18 @@ class MDClient; class MDProducer; } // namespace bts::md +namespace bts::orderman { +class Book; +struct CreateOrderMsg; +struct CancelOrderMsg; +struct CancelReplaceOrderMsg; +} // namespace bts::orderman + namespace bts { namespace orderman { +struct SEGOrderState; + class SimExecutionGateway : public IExecutionGateway { public: SimExecutionGateway(md::SecurityOracle, bts::md::MDClient &md_client); @@ -40,6 +54,22 @@ class SimExecutionGateway : public IExecutionGateway { std::array &bids, std::array &asks); + private: + bts::orderman::Book _process_book_change( + const bts::orderman::Book &book, SEGOrderState &seg_ord); + bts::orderman::Book _process_new_order( + const bts::orderman::Book &book, const CreateOrderMsg &cr_ord); + bts::orderman::Book _process_cxl_order( + const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord); + bts::orderman::Book _process_modify_order( + const bts::orderman::Book &book, + const CancelReplaceOrderMsg &cxl_repl_ord); + + bts::orderman::Book _cross_order( + const bts::orderman::Book &book, SEGOrderState &seg_ord); + bts::orderman::Book _work_order( + const bts::orderman::Book &book, SEGOrderState &seg_ord); + private: struct PImpl; PImpl *me; diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 0043a33be..2e63d493d 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/DeribitMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.debug-clang.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/DeribitMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.release-gcc.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From ae9366f44abcaad24599f34684d8418c8d5d7378 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 12 Feb 2023 21:27:54 -0500 Subject: [PATCH 10/23] Adding comments and cleaning SimExecutionGateway --- .../gateways/sim/SimExecutionGateway.cpp | 219 +++++++++--------- .../gateways/sim/SimExecutionGateway.h | 2 + 2 files changed, 107 insertions(+), 114 deletions(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 999a76a95..0db9582f4 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -48,6 +48,8 @@ namespace bts::orderman { +// book conversions /////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// void to_book( const std::array &bids, const std::array &asks, @@ -77,30 +79,31 @@ void from_book( copy_side(book.ask(), asks); } +// Every order send to sim is represented here. struct SEGOrderState { - OrderKey ord_key; - bts::SecurityKey sec_key; + CreateOrderMsg crt_msg; + SEGOrderState(const CreateOrderMsg &crt_msg) : crt_msg(crt_msg) {} + + OrderKey ord_key() const { return crt_msg.key; } + bts::SecurityKey sec_key() const { + return bts::SecurityKey(crt_msg.security->id()); + } // going out - md::IntPrice price; - bts::Quantity qty; - api::Side side; + bts::Price price() const { return crt_msg.price; } + bts::Quantity qty() const { return crt_msg.quantity; } + api::Side side() const { return crt_msg.side; } // coming in - bts::Quantity filled_qty; - md::IntPrice avg_filled_price; - bts::Quantity last_filled_qty; - md::IntPrice last_filled_price; + bts::Quantity filled_qty = 0; + bts::Price avg_filled_price = bts::Price(os::nan()); + bts::Quantity last_filled_qty = 0; + bts::Price last_filled_price = bts::Price(os::nan()); bool active = true; }; -struct SEGBook { +struct SEGSecurityData { bts::SecurityKey key; bts::orderman::Book real_book; std::vector orders; - // merges the real book with the orders - bts::orderman::Book get_matched_book() { - bts::orderman::Book rv; - return rv; - } }; struct SimExecutionGateway::PImpl { @@ -109,7 +112,7 @@ struct SimExecutionGateway::PImpl { LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor"); } - std::unordered_map securities; + // interface functions OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; @@ -120,11 +123,20 @@ struct SimExecutionGateway::PImpl { bts::md::MDClient &md_client; bts::md::MDProducer *md_producer = nullptr; // send_msgs is sent on the order_man thread, its dequeued in the market data - // thread, and execution reports are queued to buffered_ers + // thread, and execution reports are queued to buffered_exec_reps tbb::concurrent_queue buffered_order_ops; tbb::concurrent_queue buffered_exec_reps; - std::unordered_map books = {}; + std::unordered_map books = {}; tbb::concurrent_hash_map sec_map = {}; + api::Security const* find_sec(uint32_t key) const { + tbb::concurrent_hash_map::const_accessor + accessor; + if (!sec_map.find(accessor, key)) { + return nullptr; + } + return accessor->second; + + } }; SimExecutionGateway::SimExecutionGateway( @@ -157,87 +169,6 @@ void SimExecutionGateway::dispatch_incoming_fix_messages() { er.to_string()); me->on_exe_report(er, cid); } - // if there are nessages, we simply generate an execution report reflecting - // the action and send it back via on_exe_report - // std::vector aux_msgs = me->buffered_msgs; - // me->buffered_msgs.clear(); - // LOG(OrderMan, Info, - // "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " - // "{} n_msgs: {}", - // bts::os::get_thread_id(), bts::os::get_thread_name(), aux_msgs.size()); - // for (OrderMsg m : aux_msgs) { - // LOG(OrderMan, Diag, - // "SimExecutionGateway::dispatch_incoming_fix_messages tid: {} tname: " - // "{} m: {}", - // bts::os::get_thread_id(), bts::os::get_thread_name(), m); - // if (std::holds_alternative(m)) { - // CreateOrderMsg cr_msg = std::get(m); - // ExecutionReport er = {}; - // std::string account_name = "ACCA1"; - // std::array an_array = {}; - // size_t i = 0; - // for (const char c : account_name) { - // an_array[i++] = c; - // } - // er.account_name = AccountName(an_array); - // to_array(cr_msg.routing_record->account(), &er.account_name.value()); - // to_array( - // cr_msg.routing_record->operator_id(), &er.operator_id.value()); - // er.order_key = cr_msg.key; - // er.msg_seq_num = 0; - // er.security = cr_msg.security; - // er.leg_security = nullptr; - // er.side = cr_msg.side; - // er.time_in_force = cr_msg.time_in_force; - // er.order_type = cr_msg.order_type; - // er.exec_type = api::orderman::EXEC_TYPE_NEW; - // er.order_status = api::orderman::NATIVE_ORDER_STATUS_NEW; - // er.manual_order_indicator = api::orderman::MANUAL_ORDER_INDICATOR_NO; - // ExchangeOrderID64 eoid = ExchangeOrderID64(me->exchange_oid++); - // ExchangeOrderIDVar oid = eoid; - // er.exchange_order_id = oid; - // er.price = cr_msg.price; - // er.quantity = cr_msg.quantity; - // er.filled_quantity = Quantity(0); - // er.last_shares = Quantity(0); - // er.msg = "Message Placed"; - // er.exchange = api::VENUE_SIM; - // trace::CorID cid = {}; - // me->exe_reports.push_back(er); - // const auto &er_pheap = me->exe_reports.back(); - // LOG(OrderMan, Diag, - // "SimExecutionGateway::dispatch_incoming_fix_messages er: {}", - // er_pheap.to_string()); - // me->on_exe_report(er_pheap, cid); - // } else if (std::holds_alternative(m)) { - // CancelOrderMsg cxl_m = std::get(m); - // for (auto &er : me->exe_reports) { - // if (er.order_key == cxl_m.key) { - // er.order_status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; - // er.msg = "Cancelled"; - // me->on_exe_report(er, {}); - // LOG(OrderMan, Diag, - // "SimExecutionGateway::dispatch_incoming_fix_messages er: " - // "{}", - // er.to_string()); - // return; - // } - // } - // } else if (std::holds_alternative(m)) { - // CancelReplaceOrderMsg cxl_r_msg = std::get(m); - // CreateOrderMsg cr_msg = cxl_r_msg.create_fields; - // for (auto &er : me->exe_reports) { - // if (er.order_key == cr_msg.key) { - // er.order_status = api::orderman::NATIVE_ORDER_STATUS_REPLACED; - // er.msg = "Replaced"; - // er.price = cr_msg.price; - // er.quantity = cr_msg.quantity; - // me->on_exe_report(er, {}); - // return; - // } - // } - // } - // } } void SimExecutionGateway::on_securities( @@ -305,7 +236,7 @@ bool SimExecutionGateway::get_matched_book( std::array &bids, std::array &asks) { bts::SecurityKey key = k; - SEGBook &seg_book = me->books[key]; + SEGSecurityData &seg_book = me->books[key]; to_book(bids, asks, seg_book.real_book); if (seg_book.orders.empty() && me->buffered_order_ops.empty()) return false; @@ -332,20 +263,15 @@ bool SimExecutionGateway::get_matched_book( from_book(book, bids, asks); return true; } - +// f(book, existing_order) -> new_book. Also the side affects are +// bts::orderman::Book SimExecutionGateway::_process_book_change( const bts::orderman::Book &book, SEGOrderState &seg_os) { - tbb::concurrent_hash_map::const_accessor - accessor; - if (!me->sec_map.find(accessor, seg_os.sec_key.value())) { - LOG(OrderMan, Error, - "SimExecutionGateway::_process_book_change could not find key: {}", - seg_os.sec_key.value()); - } - auto sec_ptr = accessor->second; + auto sec_ptr = me->find_sec(seg_os.sec_key().value()); + bts_assert(sec_ptr != nullptr); double tick_sz = sec_ptr->contract_spec().low_tick(); auto crosses_opp_side = SpreaderUtils::crosses_book( - book, seg_os.side, bts::Price(seg_os.price.price()), tick_sz); + book, seg_os.side(), bts::Price(seg_os.price()), tick_sz); if (crosses_opp_side) { return _cross_order(book, seg_os); } else { @@ -354,24 +280,89 @@ bts::orderman::Book SimExecutionGateway::_process_book_change( } bts::orderman::Book SimExecutionGateway::_process_new_order( - const bts::orderman::Book &book, const CreateOrderMsg &) { - return book; + const bts::orderman::Book &book, const CreateOrderMsg &crt_ord_msg) { + // we can treat this case of an existing order with a book change + SEGSecurityData &seg_sec_state = + me->books[bts::SecurityKey(crt_ord_msg.security->id())]; + // this is where a new order is added to a security's state + SEGOrderState &seg_ord_state = + seg_sec_state.orders.emplace_back(crt_ord_msg); + // TODO: generate new order execution report + auto rv = _process_book_change(book, seg_ord_state); + return rv; } bts::orderman::Book SimExecutionGateway::_process_cxl_order( - const bts::orderman::Book &book, const CancelOrderMsg &) { + const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord) { + // first thing we need to check is if the order is working (it could have + // been already filled) + if (!_is_working_order( + cxl_ord.key, bts::SecurityKey(cxl_ord.security->id()))) { + LOG(OrderMan, Warn, + "Order ok: {} can not be cancelled because it is no longer a working " + "order", + cxl_ord.key); + return book; + } + // TODO: + // 1. substract the order from the book + // 2. generate a cxl execution report return book; } bts::orderman::Book SimExecutionGateway::_process_modify_order( - const bts::orderman::Book &book, const CancelReplaceOrderMsg &) { + const bts::orderman::Book &book, + const CancelReplaceOrderMsg &cxl_repl_ord) { + const auto &crt_msg = cxl_repl_ord.create_fields; + if (!_is_working_order( + crt_msg.key, bts::SecurityKey(crt_msg.security->id()))) { + LOG(OrderMan, Warn, + "Order ok: {} can not be modified because it is no longer a working " + "order", + crt_msg.key); + return book; + } + // TODO: + // this is the hard one + // if qty changed, since this is a resting order just update the book + // if price change, check if it crosses the market + // if not, make it a resting order + // ... etc + // can we deal with it as cxl, new order ? return book; } + +// Given an order that is crossing (we know that from the callee), this +// function does 3 things +// 1. Generates a new book +// 2. Adjust SEGOrderState's filled qty, status etc +// 3. Generate execution report +// 4. Generate trades and writes it to the MDProducer bts::orderman::Book SimExecutionGateway::_cross_order( const bts::orderman::Book &book, SEGOrderState &) { return book; } + +// Given an order that becomes a resting order (we know that from the callee), +// this function does the following: +// 1. Generates a new book +// (Unlike the above, SEGOrderState's status does not need changing, neither +// do we need to generate execution reports) bts::orderman::Book SimExecutionGateway::_work_order( const bts::orderman::Book &book, SEGOrderState &) { + // iterate the book, find the level and add return book; } +bool SimExecutionGateway::_is_working_order( + OrderKey order_key, SecurityKey security_key) const { + auto it = me->books.find(security_key); + if (it == me->books.end()) + return false; + for (const auto &o : it->second.orders) { + if (o.active && o.ord_key() == order_key) { + return true; + } + } + return false; +} + } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 2cde5fab0..4bd528270 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -11,6 +11,7 @@ #include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/OrderMsg.h" #include "lib/orderman/gateways/IExecutionGateway.h" +#include "lib/orderman/orderman_utils/orderman_common.h" namespace bts::md { class MDClient; @@ -69,6 +70,7 @@ class SimExecutionGateway : public IExecutionGateway { const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _work_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); + bool _is_working_order(OrderKey order_key, SecurityKey security_key) const; private: struct PImpl; From 2dc823a6ac62b7a3f2ec61583380fd0c5e70ae43 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 13 Feb 2023 20:09:47 -0500 Subject: [PATCH 11/23] Added all the stateless book/order matching functions, and a few test cases --- src/lib/domain_model/common.h | 1 + .../gateways/sim/SimExecutionGateway.cpp | 21 +-- .../spreader/SpreaderUtils.cpp | 84 ++++++++++- .../spreader_orders/spreader/SpreaderUtils.h | 136 +++++++++++++++--- .../spreader_orders/tests/spreader_tests.cpp | 85 ++++++++++- 5 files changed, 292 insertions(+), 35 deletions(-) diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 4ab7472fd..832c363df 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -24,6 +24,7 @@ struct CQuantity { } uint32_t value() const { return static_cast(qty); } double full_value() const { return qty; } + float full_value_float() const { return static_cast(full_value()); } uint32_t int_part() { return static_cast(qty); } double fractional_part() { return full_value() - int_part(); } static bool equal_d(double d1, double d2) { diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 0db9582f4..9ab6ad3d1 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -128,14 +128,13 @@ struct SimExecutionGateway::PImpl { tbb::concurrent_queue buffered_exec_reps; std::unordered_map books = {}; tbb::concurrent_hash_map sec_map = {}; - api::Security const* find_sec(uint32_t key) const { - tbb::concurrent_hash_map::const_accessor - accessor; - if (!sec_map.find(accessor, key)) { - return nullptr; - } - return accessor->second; - + api::Security const *find_sec(uint32_t key) const { + tbb::concurrent_hash_map::const_accessor + accessor; + if (!sec_map.find(accessor, key)) { + return nullptr; + } + return accessor->second; } }; @@ -347,8 +346,12 @@ bts::orderman::Book SimExecutionGateway::_cross_order( // (Unlike the above, SEGOrderState's status does not need changing, neither // do we need to generate execution reports) bts::orderman::Book SimExecutionGateway::_work_order( - const bts::orderman::Book &book, SEGOrderState &) { + const bts::orderman::Book &book, SEGOrderState &seg_os) { // iterate the book, find the level and add + auto sec_ptr = me->find_sec(seg_os.sec_key().value()); + bts_assert(sec_ptr != nullptr); + double tick_size = sec_ptr->contract_spec().low_tick(); + bts_assert(tick_size > 0); return book; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index edb1f44dd..046c55c7a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -192,9 +192,87 @@ void SpreaderUtils::transform_spread_price_mults(api::Security &sec) { } } } -std::string -SpreaderUtils::book_to_str(const bts::orderman::Book &book, api::Side side, - size_t n_levels) { + +// Order matching / book generation /////////////////////////////////////////// + +SpreaderUtils::PriceSearchResult SpreaderUtils::find_working_order_level( + const BookSide &in_book, api::Side ord_side, bts::Price ord_price) { + for (size_t i = 0; i < in_book.size(); i++) { + Price l_price = Price{in_book.at(i).price()}; + if (securities::is_same(ord_price, l_price)) { + return {PriceSearchResult::PriceSearchLocation::EXACT_MATCH, i}; + } else if (securities::is_better(ord_side, ord_price, l_price)) { + return {PriceSearchResult::PriceSearchLocation::NEW_LEVEL, i}; + } + } + return {}; +} + +bts::orderman::BookSide SpreaderUtils::apply_working_order( + const BookSide &in_book, + api::Side side, + std::tuple order) { + auto [ord_pr, ord_qty] = order; + auto ins_pt = find_working_order_level(in_book, side, ord_pr); + switch (ins_pt.price_location) { + case PriceSearchResult::PriceSearchLocation::EXACT_MATCH: { + // just increase the qty at the level + BookSide rv = in_book; + const md::PriceSize &in_pz = in_book.at(ins_pt.index); + rv.at(ins_pt.index) = { + in_pz.int_price(), in_pz.size() + ord_qty.full_value_float()}; + return rv; + } + case PriceSearchResult::PriceSearchLocation::NEW_LEVEL: { + BookSide rv = insert_order( + in_book, + {md::IntPrice_from_double<7>(ord_pr.value()), + ord_qty.full_value_float()}, + ins_pt.index); + return rv; + } + case PriceSearchResult::PriceSearchLocation::NO_OP: { + return in_book; + } + } + bts_assert(false); + return in_book; +} + +bts::orderman::Book SpreaderUtils::apply_crossing_order( + const Book &in_book, + api::Side side, + std::tuple order, + std::vector> &out_fills) { + auto [ord_pr, ord_rem_ord_qty] = order; + api::Side opp_side = bts::securities::other_side(side); + BookSide rv_opp_bk_side = in_book.side(opp_side); + size_t i_out = 0; + for (const auto &l_ps : in_book.side(opp_side)) { + Price l_pr = Price{l_ps.price()}; + Quantity l_qty = Quantity::create_new(l_ps.size()); + bool is_cross = securities::is_equal_or_better(side, ord_pr, l_pr); + if (l_qty == 0.0 || ord_rem_ord_qty == 0.0 || !is_cross) { + break; + } + auto crossed_qty = cross_qtys(ord_rem_ord_qty, l_qty); + out_fills.push_back({l_pr, crossed_qty}); + if (l_qty > 0.0) { + rv_opp_bk_side.at(i_out++) = create_price_level(l_pr, l_qty); + } + } + Book rv = in_book; + rv.side(opp_side) = rv_opp_bk_side; + if (ord_rem_ord_qty > 0.0) { + auto new_level = create_price_level(ord_pr, ord_rem_ord_qty); + rv.side(side) = insert_order(rv.side(side), new_level, 0); + } + return rv; +} + +// logging / text conversions ///////////////////////////////////////////////// +std::string SpreaderUtils::book_to_str( + const bts::orderman::Book &book, api::Side side, size_t n_levels) { std::ostringstream oss; oss << "side:" << side; n_levels = std::min(n_levels, book.n_levels()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 6495a1db1..07dcc8b8a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -2,15 +2,21 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/domain_model/common.h" +#include "lib/md/IntPrice.h" #include "lib/md/PriceSize.h" #include "lib/orderman/OrderBuilder.h" #include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orderman_utils/fix_order_codec.h" #include "lib/orderman/orders/spreader_orders/spreader/ISpreaderManager.h" #include "lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h" #include "lib/orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.h" #include "lib/os/os.h" +#include "lib/utils/bts_assert.h" #include "lib/utils/bts_chrono.h" #include +#include namespace bts { namespace orderman { @@ -87,8 +93,8 @@ class SpreaderUtils { // orders ////////////////////////////////////////// //////////////////////////////////////////////////// // checks for the 3 states that are designated error states - static bool - order_in_error_state(bts::api::orderman::OrderStatus order_status) { + static bool order_in_error_state( + bts::api::orderman::OrderStatus order_status) { return order_status == api::orderman::OrderStatus::ORDER_STATUS_ERROR || order_status == api::orderman::OrderStatus::ORDER_STATUS_DISCONNECTED || @@ -97,32 +103,32 @@ class SpreaderUtils { } // this function checks for the order status (above) or // for the message size (todo:this is a temporary fix) - static bool - order_in_error_state(const bts::orderman::OrderStateUpdateEvent &ord_ev) { + static bool order_in_error_state( + const bts::orderman::OrderStateUpdateEvent &ord_ev) { bts::api::orderman::OrderStatus order_status = ord_ev.status; return order_in_error_state(order_status) || (!order_in_terminal_state(order_status) && ord_ev.last_msg.length() > 0); } // checks for the 4 states that are designated error states - static bool - order_in_terminal_state(bts::api::orderman::OrderStatus order_status) { + static bool order_in_terminal_state( + bts::api::orderman::OrderStatus order_status) { return orderman::in_terminal_state(order_status); } - static bool - order_acknowledged(bts::api::orderman::OrderStatus order_status) { + static bool order_acknowledged( + bts::api::orderman::OrderStatus order_status) { bool un_acked = order_status == api::orderman::OrderStatus::ORDER_STATUS_INACTIVE || order_status == api::orderman::OrderStatus::ORDER_STATUS_PENDING_WORKING; return !un_acked; } - static bool - order_in_completed_state(bts::api::orderman::OrderStatus order_status) { + static bool order_in_completed_state( + bts::api::orderman::OrderStatus order_status) { return order_status == api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; } - static bool - order_in_cancelled_state(bts::api::orderman::OrderStatus order_status) { + static bool order_in_cancelled_state( + bts::api::orderman::OrderStatus order_status) { return order_status == api::orderman::OrderStatus::ORDER_STATUS_CANCELED; } //////////////////////////////////////////////////// @@ -296,8 +302,8 @@ class SpreaderUtils { } // if return quantity in the tuiple is 0, then the price was not found - static std::tuple - locate_price(const Book &book, api::Side side, Price price) { + static std::tuple locate_price( + const Book &book, api::Side side, Price price) { const size_t n_levels = book.n_levels(); const BookSide &book_side = book.side(side); for (size_t lv = 0; lv < n_levels; lv++) { @@ -319,6 +325,15 @@ class SpreaderUtils { Quantity qty_at_deepest_price, // resultant book Book &out_book); + + // gets the total qty across all levels on one side of the book + static md::Size get_book_size(const BookSide &book_side) { + double rv = 0; + for (const auto &ps : book_side) { + rv += ps.size(); + } + return Quantity::create_new(rv).full_value_float(); + } //////////////////////////////////////////////////// // quoting params ////////////////////////////////// //////////////////////////////////////////////////// @@ -848,7 +863,7 @@ class SpreaderUtils { out_hedge_price = Price(bts::securities::raw_round_to_quote_price( out_hedge_price_d, hedge_leg.tick_size(), hedge_leg.trading_side())); } - ////////////////////////N legged case + //////////////////////// N legged case ///////////////////////////////////// static void compute_quoting_price_size_n_legs( Price target_spread_price, Quantity quoting_leg_target_quantity, @@ -988,14 +1003,91 @@ class SpreaderUtils { return securities::is_equal_or_better( spr_side, spr_price, Price(spr_cross_price)); } + //////////////////////////////////////////////////////////////////////////// + /// Matching functions ///////////////////////////////////////////////////// + // These functions are not directly used by the spreader, but have the same + // kind of logic + + // working ///////////////////////////////////////////////////////////////// + struct PriceSearchResult { + enum PriceSearchLocation { NO_OP, EXACT_MATCH, NEW_LEVEL }; + PriceSearchLocation price_location = NO_OP; + size_t index = 0; + }; + + // Finds the level that a working order will occupy in a book. + static PriceSearchResult find_working_order_level( + const BookSide &in_book, api::Side ord_side, bts::Price ord_price); + + // Inserts an order at a given position in the book (by pushing the + // other price levels down if need be) + static bts::orderman::BookSide insert_order( + const BookSide &in_book, + const md::PriceSize &new_order, + size_t new_order_level) { + BookSide rv; + for (size_t i = 0; i < new_order_level; i++) { + rv.at(i) = in_book.at(i); + } + rv.at(new_order_level) = new_order; + for (size_t i = new_order_level; i < in_book.size() - 1; i++) { + rv.at(i + 1) = in_book.at(i); + } + return rv; + } + + // Fits a working order into a book + static bts::orderman::BookSide apply_working_order( + const BookSide &in_book, + api::Side side, + std::tuple order); + + // crossing //////////////////////////////////////////////////////////////// + + // just a convertor function + static md::PriceSize create_price_level(bts::Price price, Quantity qty) { + return md::PriceSize( + md::IntPrice_from_double<7>(price.value()), qty.full_value_float()); + } + + static md::PriceSize create_price_level(double price, double qty) { + return create_price_level(Price(price), Quantity::create_new(qty)); + } + + // Crosses qtys of 2 orders, adjusts the qty and returns the + // crossed qty + static Quantity cross_qtys(Quantity &q1, Quantity &q2) { + bts_assert(q1 >= 0.0); + bts_assert(q2 >= 0.0); + auto cross_qtys_d = [](double &d1, double &d2) { + auto rv = std::min(d1, d2); + d1 -= rv; + d2 -= rv; + return rv; + }; + double d1 = q1.full_value(), d2 = q2.full_value(); + auto rv = cross_qtys_d(d1, d2); + q1 = d1; + q2 = d2; + return Quantity::create_new(rv); + } + + // Takes an order that crosses into the other side, and returns the + // resulting book. Also adds the fills to the last arg + static bts::orderman::Book apply_crossing_order( + const Book &in_book, + api::Side side, + std::tuple order, + std::vector> &out_fills); + //////////////////////////////////////////////////// // Rounding functions ////////////////////////////// //////////////////////////////////////////////////// // rounds a double to a whole number if its too close // to it (this is ued in the case of rounding errors // when 0.9999999 or 1.0000001 is really 1) - inline static double - round_if_near_whole(double qty, double vicinity = 0.000000001) { + inline static double round_if_near_whole( + double qty, double vicinity = 0.000000001) { double round_qty = std::round(qty); if (std::abs(round_qty - qty) <= vicinity) return round_qty; @@ -1040,10 +1132,10 @@ class SpreaderUtils { /**********************************************************************/ /**************************debugging helpers***************************/ /**********************************************************************/ - static std::string - book_to_str(const bts::orderman::Book &book, api::Side side, size_t n_levels=10); - static std::string - book_ev_to_str(const bts::orderman::BookUpdateEvent &book_event); -}; + static std::string book_to_str( + const bts::orderman::Book &book, api::Side side, size_t n_levels = 10); + static std::string book_ev_to_str( + const bts::orderman::BookUpdateEvent &book_event); +}; // namespace orderman } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 8789fbff0..5691740f0 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,5 +1,9 @@ -#include "lib/md/IMarketDataListener.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/domain_model/common.h" #include "lib/io/websocket/WebsocketClient.h" +#include "lib/md/IMarketDataListener.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" #include "lib/utils/helper_macros.h" #include @@ -5234,5 +5238,84 @@ TEST_CASE("sniper", "[spreader_broken]") { } } +// uint16_t sizes[] = {11, 13, 17, 19, 23}; +// double prices[] = {2500.25, 2500.50, 2501, 2502, 2503}; + +TEST_CASE("matching", "[spreader_matching]") { + SECTION("working_order_level") { + // working order level + auto match = [](const BookSide &bside, Price price, api::Side side, + SpreaderUtils::PriceSearchResult ex_res) { + SpreaderUtils::PriceSearchResult res = + SpreaderUtils::find_working_order_level(bside, side, price); + REQUIRE(res.price_location == ex_res.price_location); + REQUIRE(res.index == ex_res.index); + }; + auto exact_match = SpreaderUtils::PriceSearchResult::EXACT_MATCH; + auto new_level = SpreaderUtils::PriceSearchResult::NEW_LEVEL; + auto no_op = SpreaderUtils::PriceSearchResult::NO_OP; + // BUY ////////////////////////////////////////////////////////////////// + { + BookSide bside = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + // EXACT_MATCH + match(bside, Price{2500}, api::SIDE_BUY, {exact_match, 0}); + match(bside, Price{2498}, api::SIDE_BUY, {exact_match, 2}); + match(bside, Price{2492}, api::SIDE_BUY, {exact_match, 4}); + // NEW_LEVEL, top + match(bside, Price{2500.5}, api::SIDE_BUY, {new_level, 0}); + match(bside, Price{2500.01}, api::SIDE_BUY, {new_level, 0}); + match(bside, Price{25000}, api::SIDE_BUY, {new_level, 0}); + // NO_OP + match(bside, Price{2491}, api::SIDE_BUY, {no_op, 0}); + match(bside, Price{2491.99}, api::SIDE_BUY, {no_op, 0}); + match(bside, Price{0.00}, api::SIDE_BUY, {no_op, 0}); + // NEW_LEVEL, in between + match(bside, Price{2499.5}, api::SIDE_BUY, {new_level, 1}); + match(bside, Price{2498.95}, api::SIDE_BUY, {new_level, 2}); + match(bside, Price{2494.00}, api::SIDE_BUY, {new_level, 4}); + } + + // SELL ///////////////////////////////////////////////////////////////// + { + BookSide sside = { + SpreaderUtils::create_price_level(2500.5, 10), + SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2505, 13.8), + SpreaderUtils::create_price_level(2506.25, 15.2)}; + // EXACT_MATCH + match(sside, Price{2500.5}, api::SIDE_SELL, {exact_match, 0}); + match(sside, Price{2502}, api::SIDE_SELL, {exact_match, 2}); + match(sside, Price{2506.25}, api::SIDE_SELL, {exact_match, 4}); + // NEW_LEVEL, top + match(sside, Price{2500.25}, api::SIDE_SELL, {new_level, 0}); + match(sside, Price{2500.49}, api::SIDE_SELL, {new_level, 0}); + match(sside, Price{0.01}, api::SIDE_SELL, {new_level, 0}); + // NO_OP + match(sside, Price{2506.26}, api::SIDE_SELL, {no_op, 0}); + match(sside, Price{2506.75}, api::SIDE_SELL, {no_op, 0}); + match(sside, Price{25000}, api::SIDE_SELL, {no_op, 0}); + // NEW_LEVEL, in between + match(sside, Price{2500.75}, api::SIDE_SELL, {new_level, 1}); + match(sside, Price{2501.95}, api::SIDE_SELL, {new_level, 2}); + match(sside, Price{2505.50}, api::SIDE_SELL, {new_level, 4}); + } + } + SECTION("crossing_order_reduction") { + // crossing orders + Quantity q1 = Quantity::create_new(12.5); + Quantity q2 = Quantity::create_new(33.9); + auto fills = SpreaderUtils::cross_qtys(q1, q2); + REQUIRE(q1 == Quantity::create_new(0.0)); + REQUIRE(q2 == Quantity::create_new(21.4)); + REQUIRE(fills == Quantity::create_new(12.5)); + } +} + } // namespace orderman } // namespace bts From fc9519cde36d459fd09d236a813a0f73429baf73 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 14 Feb 2023 10:06:53 -0500 Subject: [PATCH 12/23] Tests completed for working orders in the book (for SimExecution) --- .../spreader_orders/spreader/SpreaderUtils.h | 2 + .../spreader_orders/tests/spreader_tests.cpp | 197 +++++++++++++++++- 2 files changed, 195 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 07dcc8b8a..ddbfb28a6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1025,6 +1025,8 @@ class SpreaderUtils { const BookSide &in_book, const md::PriceSize &new_order, size_t new_order_level) { + if (new_order_level >= in_book.max_size()) + return in_book; BookSide rv; for (size_t i = 0; i < new_order_level; i++) { rv.at(i) = in_book.at(i); diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 5691740f0..6470e5c19 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace bts { namespace orderman { @@ -5238,11 +5239,17 @@ TEST_CASE("sniper", "[spreader_broken]") { } } -// uint16_t sizes[] = {11, 13, 17, 19, 23}; -// double prices[] = {2500.25, 2500.50, 2501, 2502, 2503}; +void match_bks(const BookSide &b1, const BookSide &b2) { + for (size_t i = 0; i < b1.max_size(); i++) { + REQUIRE(b1.at(i).price() == b2.at(i).price()); + REQUIRE( + Quantity::create_new(b1.at(i).direct_size()) == + Quantity::create_new(b2.at(i).direct_size())); + } +} TEST_CASE("matching", "[spreader_matching]") { - SECTION("working_order_level") { + SECTION("find_working_order_level") { // working order level auto match = [](const BookSide &bside, Price price, api::Side side, SpreaderUtils::PriceSearchResult ex_res) { @@ -5306,6 +5313,188 @@ TEST_CASE("matching", "[spreader_matching]") { match(sside, Price{2505.50}, api::SIDE_SELL, {new_level, 4}); } } + SECTION("insert_order") { + BookSide bside = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + // insert at top + BookSide bside_out = SpreaderUtils::insert_order( + bside, SpreaderUtils::create_price_level(2501, 13.3), 0); + BookSide bside_ex = { + SpreaderUtils::create_price_level(2501, 13.3), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}; + match_bks(bside_out, bside_ex); + // insert in middle + bside_out = SpreaderUtils::insert_order( + bside, SpreaderUtils::create_price_level(2496.25, 13.3), 3); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2496.25, 13.3), + SpreaderUtils::create_price_level(2495, 13.8)}; + match_bks(bside_out, bside_ex); + // insert another in the middle + bside_out = SpreaderUtils::insert_order( + bside, SpreaderUtils::create_price_level(2498.25, 14.7), 2); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498.25, 14.7), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}; + match_bks(bside_out, bside_ex); + // insert at the end + bside_out = SpreaderUtils::insert_order( + bside, SpreaderUtils::create_price_level(2494.25, 16.8), 4); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2494.25, 16.8)}; + match_bks(bside_out, bside_ex); + // insert outside the range + bside_out = SpreaderUtils::insert_order( + bside, SpreaderUtils::create_price_level(2490.25, 16.8), 5); + match_bks(bside_out, bside); + } + SECTION("apply_working_order") { + // BUY ////////////////////////////////////////////////////////////////// + { + BookSide bside = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + // outside the range + BookSide bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_BUY, + std::make_tuple(Price(2490), Quantity::create_new(10.0))); + match_bks(bside_out, bside); + // existing level + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_BUY, + std::make_tuple(Price(2498), Quantity::create_new(10.2))); + BookSide bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 22.7), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + match_bks(bside_out, bside_ex); + // top level insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_BUY, + std::make_tuple(Price(2501), Quantity::create_new(11.3))); + bside_ex = { + SpreaderUtils::create_price_level(2501, 11.3), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}; + match_bks(bside_out, bside_ex); + // end level insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_BUY, + std::make_tuple(Price(2494), Quantity::create_new(11.3))); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2494, 11.3)}; + match_bks(bside_out, bside_ex); + // mid insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_BUY, + std::make_tuple(Price(2497), Quantity::create_new(117.9))); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2497, 117.9), + SpreaderUtils::create_price_level(2495, 13.8)}; + match_bks(bside_out, bside_ex); + } + // SELL ////////////////////////////////////////////////////////////////// + { + BookSide bside = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2)}; + // outside the range + BookSide bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2507), Quantity::create_new(10.0))); + match_bks(bside_out, bside); + // existing level + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2503.75), Quantity::create_new(11.9))); + BookSide bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 25.7), + SpreaderUtils::create_price_level(2504, 15.2)}; + match_bks(bside_out, bside_ex); + // top level insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2499), Quantity::create_new(101.3))); + bside_ex = { + SpreaderUtils::create_price_level(2499, 101.3), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8)}; + match_bks(bside_out, bside_ex); + // end level insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2503.99), Quantity::create_new(12.3))); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2503.99, 12.3)}; + match_bks(bside_out, bside_ex); + // mid insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2502.5), Quantity::create_new(100))); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2502.5, 100), + SpreaderUtils::create_price_level(2503.75, 13.8)}; + match_bks(bside_out, bside_ex); + // another mid insert + bside_out = SpreaderUtils::apply_working_order( + bside, api::SIDE_SELL, + std::make_tuple(Price(2500.75), Quantity::create_new(99))); + bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2500.5, 3), + SpreaderUtils::create_price_level(2500.75, 99), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8)}; + match_bks(bside_out, bside_ex); + } + } + SECTION("crossing_order_reduction") { // crossing orders Quantity q1 = Quantity::create_new(12.5); @@ -5315,7 +5504,7 @@ TEST_CASE("matching", "[spreader_matching]") { REQUIRE(q2 == Quantity::create_new(21.4)); REQUIRE(fills == Quantity::create_new(12.5)); } -} +} // namespace orderman } // namespace orderman } // namespace bts From 5904bab03ef02b4bc63420c89b6ec7dbf19434c0 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 14 Feb 2023 16:21:57 -0500 Subject: [PATCH 13/23] Fixing bug with order crossing market in SimExecutionGateway --- src/lib/domain_model/common.h | 1 + .../spreader/SpreaderUtils.cpp | 23 +++- .../spreader_orders/tests/spreader_tests.cpp | 114 +++++++++++++++++- src/web/CMakeDeps.cmake | 2 +- 4 files changed, 127 insertions(+), 13 deletions(-) diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 832c363df..7e9d44b15 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -92,6 +92,7 @@ struct CQuantity { CQuantity operator+(const CQuantity &rhs) const { return create_new(qty + rhs.qty); } + bool is_zero() const { return *this == create_new(0.0); } }; inline std::ostream &operator<<(std::ostream &out, CQuantity const &qty) { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 046c55c7a..5e1832632 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -1,5 +1,8 @@ #include "SpreaderUtils.h" +#include "lib/domain_model/common.h" +#include "lib/md/PriceSize.h" #include "lib/orderman/events/BookUpdateEvent.h" +#include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/PreActivationOrderServices.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.h" @@ -244,23 +247,31 @@ bts::orderman::Book SpreaderUtils::apply_crossing_order( api::Side side, std::tuple order, std::vector> &out_fills) { + auto remove_0qtys = [](const BookSide &bside) { + BookSide rv = {}; + size_t i = 0; + for (const md::PriceSize &ps : bside) { + if (!Quantity::create_new(ps.size()).is_zero()) { + rv.at(i++) = ps; + } + } + return rv; + }; auto [ord_pr, ord_rem_ord_qty] = order; api::Side opp_side = bts::securities::other_side(side); BookSide rv_opp_bk_side = in_book.side(opp_side); - size_t i_out = 0; - for (const auto &l_ps : in_book.side(opp_side)) { + for (md::PriceSize &l_ps : rv_opp_bk_side) { Price l_pr = Price{l_ps.price()}; Quantity l_qty = Quantity::create_new(l_ps.size()); bool is_cross = securities::is_equal_or_better(side, ord_pr, l_pr); - if (l_qty == 0.0 || ord_rem_ord_qty == 0.0 || !is_cross) { + if (l_qty.is_zero() || ord_rem_ord_qty.is_zero() || !is_cross) { break; } auto crossed_qty = cross_qtys(ord_rem_ord_qty, l_qty); out_fills.push_back({l_pr, crossed_qty}); - if (l_qty > 0.0) { - rv_opp_bk_side.at(i_out++) = create_price_level(l_pr, l_qty); - } + l_ps = md::PriceSize(l_ps.int_price(), l_qty.full_value_float()); } + rv_opp_bk_side = remove_0qtys(rv_opp_bk_side); Book rv = in_book; rv.side(opp_side) = rv_opp_bk_side; if (ord_rem_ord_qty > 0.0) { diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 6470e5c19..3c466f762 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -1,3 +1,4 @@ +#include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/common.h" #include "lib/io/websocket/WebsocketClient.h" @@ -5,6 +6,7 @@ #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/orderman/orders/spreader_orders/tests/tests_common.h" +#include "lib/os/os.h" #include "lib/utils/helper_macros.h" #include #include @@ -5241,14 +5243,18 @@ TEST_CASE("sniper", "[spreader_broken]") { void match_bks(const BookSide &b1, const BookSide &b2) { for (size_t i = 0; i < b1.max_size(); i++) { - REQUIRE(b1.at(i).price() == b2.at(i).price()); - REQUIRE( - Quantity::create_new(b1.at(i).direct_size()) == - Quantity::create_new(b2.at(i).direct_size())); + // we convert these to Quantity type since it knows how to compare + // fractional qtys + Quantity q1 = Quantity::create_new(b1.at(i).size()); + Quantity q2 = Quantity::create_new(b2.at(i).size()); + REQUIRE(q1 == q2); + if (q1.is_zero()) + return; + REQUIRE(b1.at(i).int_price() == b2.at(i).int_price()); } } -TEST_CASE("matching", "[spreader_matching]") { +TEST_CASE("working_orders", "[spreader_matching]") { SECTION("find_working_order_level") { // working order level auto match = [](const BookSide &bside, Price price, api::Side side, @@ -5494,7 +5500,21 @@ TEST_CASE("matching", "[spreader_matching]") { match_bks(bside_out, bside_ex); } } +} +void match_trades( + const std::vector> &v1, + const std::vector> &v2) { + REQUIRE(v1.size() == v2.size()); + for (size_t i = 0; i < v1.size(); i++) { + auto [p1, q1] = v1.at(i); + auto [p2, q2] = v2.at(i); + REQUIRE(bts::securities::is_same(p1, p2)); + REQUIRE(q1 == q2); + } +} + +TEST_CASE("crossing_orders", "[spreader_matching]") { SECTION("crossing_order_reduction") { // crossing orders Quantity q1 = Quantity::create_new(12.5); @@ -5503,8 +5523,90 @@ TEST_CASE("matching", "[spreader_matching]") { REQUIRE(q1 == Quantity::create_new(0.0)); REQUIRE(q2 == Quantity::create_new(21.4)); REQUIRE(fills == Quantity::create_new(12.5)); + + q1 = Quantity::create_new(51.7); + q2 = Quantity::create_new(45.2); + fills = SpreaderUtils::cross_qtys(q1, q2); + REQUIRE(q1 == Quantity::create_new(6.5)); + REQUIRE(q2 == Quantity::create_new(0)); + REQUIRE(fills == Quantity::create_new(45.2)); } -} // namespace orderman + Book bk; + bk.bid() = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + bk.ask() = { + SpreaderUtils::create_price_level(2500.5, 10), + SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2)}; + std::vector> out_fills = {}; + + SECTION("crossing_first_level_partial") { + // buy order nibbles the first offer level + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2500.5}, Quantity::create_new(2.5)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2500.5, 7.5), + SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2)}); + match_trades(out_fills, {{{Price{2500.5}, Quantity::create_new(2.5)}}}); + } + SECTION("crossing_first_level_exact") { + // buy order completely takes the first offer level + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2500.5}, Quantity::create_new(10)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(bts::os::nan(), 0)}); + match_trades(out_fills, {{{Price{2500.5}, Quantity::create_new(10)}}}); + } + SECTION("crossing_first_level_leftover") { + // buy order completely takes the first offer level and becomes + // a resting order + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2500.5}, Quantity::create_new(100)}, + out_fills); + match_bks( + bk_out.bid(), {SpreaderUtils::create_price_level(2500.5, 90), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(bts::os::nan(), 0)}); + match_trades(out_fills, {{{Price{2500.5}, Quantity::create_new(10)}}}); + } + + SECTION("crossing_mid_level_partial") {} + SECTION("crossing_mid_level_exact") {} + SECTION("crossing_mid_level_leftover") {} + + SECTION("crossing_last_level_partial") {} + SECTION("crossing_last_level_exact") {} + SECTION("crossing_last_level_leftover") {} + + SECTION("crossing_through_partial") {} + SECTION("crossing_through_exact") {} + SECTION("crossing_through_leftover") {} +} } // namespace orderman } // namespace bts diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 2e63d493d..261a4a319 100644 --- a/src/web/CMakeDeps.cmake +++ b/src/web/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/DeribitMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.release-gcc.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file +set(sources ../../externals/linux/include/google/protobuf/descriptor.proto;../../externals/linux/include/google/protobuf/timestamp.proto;../lib/api/analytics/ExpirationDriver.proto;../lib/api/analytics/TimeWeightedInterpolatedDriver.proto;../lib/api/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/core/RegexFormatting.proto;../lib/api/domain/CallPut.proto;../lib/api/domain/Currency.proto;../lib/api/domain/SecurityCriteria.proto;../lib/api/domain/SecurityCriteriaClause.proto;../lib/api/domain/SecurityExpiration.proto;../lib/api/domain/SecurityMetadata.proto;../lib/api/domain/SecurityMetadataCollection.proto;../lib/api/domain/SecurityMetadataItem.proto;../lib/api/domain/SecurityType.proto;../lib/api/domain/TickDisplaySettings.proto;../lib/api/domain/TickFactors.proto;../lib/api/domain/Venue.proto;../lib/api/io/URL.proto;../lib/api/md/BinanceMarketDataConfig.proto;../lib/api/md/BinanceUsMarketDataConfig.proto;../lib/api/md/BinanceUsdsFuturesMarketDataConfig.proto;../lib/api/md/DeribitMarketDataConfig.proto;../lib/api/md/FTXMarketDataConfig.proto;../lib/api/md/MarketDataConfig.proto;../lib/api/md/MarketDataRecordingConfig.proto;../lib/api/md/MarketDataReplayConfig.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/AnalyticsService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/BasePositionService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarginService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.proto;../lib/api/services/MarketDataService.proto;../lib/api/services/MoneyFileService.proto;../lib/api/services/OrderService.proto;../lib/api/services/OutOfProcessURLListener.proto;../lib/api/services/PersistenceService.proto;../lib/api/services/PositionService.proto;../lib/api/services/ShellDiagnosticService.proto;../lib/api/services/ShellLatencyService.proto;../lib/api/services/SyntheticSecurityService.proto;../lib/domain_model/Security.proto;../lib/md/protos/co2.proto;../lib/sparkproto/SparkProtos.proto;/home/taha/spark/.venv/bin/python;/home/taha/spark/src/lib/api/service_compiler/templates/fs/fable.fs;/home/taha/spark/src/web/api/package-lock.json;/home/taha/spark/src/web/api/tsconfig.debug-gcc.g.json;/home/taha/spark/src/web/ui/src/ui.fsproj;/home/taha/spark/src/web/ui/webpack.config.js;/home/taha/spark/tools/py/build_web.py;/home/taha/spark/tools/venv_exec.sh;api/src/DynamicService.ts;api/src/ServiceContext.ts;api/src/bts_assert.ts;ui/src/Access.fs;ui/src/Accounts/ClipLimits.fs;ui/src/Accounts/ProductLimits.fs;ui/src/Accounts/SecurityLimits.fs;ui/src/Accounts/State.fs;ui/src/Accounts/Types.fs;ui/src/Accounts/View.fs;ui/src/App.fs;ui/src/Cmd.fs;ui/src/Controls/Button.fs;ui/src/Controls/DataGrid.fs;ui/src/Controls/Fields.fs;ui/src/Controls/Modal.fs;ui/src/Controls/ReactGrid.fs;ui/src/Controls/Table.fs;ui/src/Controls/nbsp.fs;ui/src/Global.fs;ui/src/Imports.fs;ui/src/Lens.fs;ui/src/Login/Login.fs;ui/src/Nav.fs;ui/src/State.fs;ui/src/Types.fs;ui/src/Users/State.fs;ui/src/Users/Types.fs;ui/src/Users/View.fs;ui/src/Util/EnumUtils.fs;ui/src/Util/JSMap.fs;ui/src/Util/StreamUtils.fs;ui/src/obj/Debug/net6.0/ui.AssemblyInfo.fs;ui/src/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From d508d34a3a709190437221e3b4a743a10065c222 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 14 Feb 2023 23:17:49 -0500 Subject: [PATCH 14/23] Completed books/order matching tests for SimExecutionGateway --- src/lib/domain_model/common.h | 11 +- .../spreader/SpreaderUtils.cpp | 2 + .../spreader_orders/tests/spreader_tests.cpp | 194 +++++++++++++++++- 3 files changed, 197 insertions(+), 10 deletions(-) diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 7e9d44b15..2894d4eba 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -1,5 +1,6 @@ #pragma once +#include #ifndef _WIN32 #include #endif @@ -12,7 +13,8 @@ namespace bts { struct CQuantity { double qty = 0; - constexpr static double err = 0.0000001; + constexpr static double precision_digits =6; + constexpr static double err = 1/precision_digits; CQuantity() {} CQuantity(uint32_t whole_qty) : qty(whole_qty) {} CQuantity(uint32_t int_qty, double fractional_qty) @@ -22,6 +24,12 @@ struct CQuantity { rv.qty = v; return rv; } + + +static double round_to_decimal_places(double value, int decimal_places) { + double factor = pow(10, decimal_places); + return std::round(value * factor) / factor; +} uint32_t value() const { return static_cast(qty); } double full_value() const { return qty; } float full_value_float() const { return static_cast(full_value()); } @@ -93,6 +101,7 @@ struct CQuantity { return create_new(qty + rhs.qty); } bool is_zero() const { return *this == create_new(0.0); } + void round() { qty = round_to_decimal_places(qty, 6); } }; inline std::ostream &operator<<(std::ostream &out, CQuantity const &qty) { diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 5e1832632..e08b4d585 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -268,6 +268,8 @@ bts::orderman::Book SpreaderUtils::apply_crossing_order( break; } auto crossed_qty = cross_qtys(ord_rem_ord_qty, l_qty); + ord_rem_ord_qty.round(); + crossed_qty.round(); out_fills.push_back({l_pr, crossed_qty}); l_ps = md::PriceSize(l_ps.int_price(), l_qty.full_value_float()); } diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 3c466f762..d9a300695 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -5595,17 +5595,193 @@ TEST_CASE("crossing_orders", "[spreader_matching]") { match_trades(out_fills, {{{Price{2500.5}, Quantity::create_new(10)}}}); } - SECTION("crossing_mid_level_partial") {} - SECTION("crossing_mid_level_exact") {} - SECTION("crossing_mid_level_leftover") {} + SECTION("crossing_mid_level_partial") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2502.00}, Quantity::create_new(16.25)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2502, 9.25), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(3.25)}, + }}); + } + SECTION("crossing_mid_level_exact") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2502.00}, Quantity::create_new(25.5)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + }}); + } + SECTION("crossing_mid_level_leftover") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2502.00}, Quantity::create_new(100.9)}, + out_fills); + match_bks( + bk_out.bid(), {SpreaderUtils::create_price_level(2502, 75.4), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + }}); + } - SECTION("crossing_last_level_partial") {} - SECTION("crossing_last_level_exact") {} - SECTION("crossing_last_level_leftover") {} + SECTION("crossing_last_level_partial") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2504.00}, Quantity::create_new(50.00)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2504, 4.5), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + {Price{2503.75}, Quantity::create_new(13.8)}, + {Price{2504}, Quantity::create_new(10.7)}, + }}); + } + SECTION("crossing_last_level_exact") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2504.00}, Quantity::create_new(54.50)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + {Price{2503.75}, Quantity::create_new(13.8)}, + {Price{2504}, Quantity::create_new(15.2)}, + }}); + } + SECTION("crossing_last_level_leftover") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2504.00}, Quantity::create_new(999.9)}, + out_fills); + match_bks( + bk_out.bid(), {SpreaderUtils::create_price_level(2504, 945.4), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + {Price{2503.75}, Quantity::create_new(13.8)}, + {Price{2504}, Quantity::create_new(15.2)}, + }}); + } - SECTION("crossing_through_partial") {} - SECTION("crossing_through_exact") {} - SECTION("crossing_through_leftover") {} + SECTION("crossing_through_partial") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2510.5}, Quantity::create_new(20)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(2502, 5.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{{Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(7)}}}); + } + SECTION("crossing_through_exact") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2510.5}, Quantity::create_new(54.5)}, + out_fills); + match_bks(bk_out.bid(), bk.bid()); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + {Price{2503.75}, Quantity::create_new(13.8)}, + {Price{2504}, Quantity::create_new(15.2)}, + }}); + } + SECTION("crossing_through_leftover") { + Book bk_out = SpreaderUtils::apply_crossing_order( + bk, api::SIDE_BUY, {Price{2510.00}, Quantity::create_new(999.9)}, + out_fills); + match_bks( + bk_out.bid(), {SpreaderUtils::create_price_level(2510.00, 945.4), + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8)}); + match_bks( + bk_out.ask(), {SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0), + SpreaderUtils::create_price_level(os::nan(), 0.0)}); + match_trades( + out_fills, {{ + {Price{2500.5}, Quantity::create_new(10)}, + {Price{2501.5}, Quantity::create_new(3)}, + {Price{2502}, Quantity::create_new(12.5)}, + {Price{2503.75}, Quantity::create_new(13.8)}, + {Price{2504}, Quantity::create_new(15.2)}, + }}); + } } } // namespace orderman From bed6feae3f19c0339be9008fc51a79a814f613c6 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 19 Feb 2023 00:49:30 -0500 Subject: [PATCH 15/23] Simplified SimExecutionGateway by combining order actions and matching into one --- src/lib/md/GeneralMarketDataListener.cpp | 2 +- .../gateways/sim/SimExecutionGateway.cpp | 417 +++++++++++++++--- .../gateways/sim/SimExecutionGateway.h | 32 +- .../spreader/SpreaderUtils.cpp | 10 - .../spreader_orders/spreader/SpreaderUtils.h | 30 ++ 5 files changed, 396 insertions(+), 95 deletions(-) diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp index c6ef6e0db..2c5325d35 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -96,7 +96,7 @@ struct GeneralMarketDataListener::PImpl { std::shared_ptr sim_ex_gwy) : index(index), md_producer(md_producer), sim_ex_gwy(sim_ex_gwy) { if (sim_ex_gwy != nullptr) { - sim_ex_gwy->set_producer(md_producer); + sim_ex_gwy->set_producers(&index); } } }; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 9ab6ad3d1..f60bab615 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -1,10 +1,12 @@ #include "SimExecutionGateway.h" #include "lib/api/services/AdminService.pb.h" +#include "lib/api/services/ApiUnitTestService.pb.h" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" #include "lib/domain_model/common.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IntPrice.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" @@ -26,7 +28,9 @@ #include "lib/os/os.h" #include "lib/tracing/bts_trace.h" #include "lib/utils/Dispatcher.h" +#include "lib/utils/Puid.h" #include "lib/utils/TimeStamp.h" +#include "lib/utils/Uuid.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" @@ -37,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -78,6 +83,8 @@ void from_book( copy_side(book.bid(), bids); copy_side(book.ask(), asks); } +void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er); +SecurityKey get_sec_key(const OrderMsg &msg); // Every order send to sim is represented here. struct SEGOrderState { @@ -97,13 +104,105 @@ struct SEGOrderState { bts::Price avg_filled_price = bts::Price(os::nan()); bts::Quantity last_filled_qty = 0; bts::Price last_filled_price = bts::Price(os::nan()); - bool active = true; -}; + //bool active = true; + bts::Quantity working_qty() const { return qty() - filled_qty; } + std::vector> trades; + bts::api::orderman::NativeOrderStatus status = + bts::api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_NEW; + void add_fill(Price lf_pr, Quantity lf_qty) { + trades.push_back({lf_pr, lf_qty}); + } + void apply_fill(Price lf_pr, Quantity lf_qty) { + last_filled_price = lf_pr; + last_filled_qty = lf_qty; + avg_filled_price = Price( + (avg_filled_price.value() * filled_qty.full_value() + + lf_pr.value() * lf_qty.full_value()) / + (filled_qty.full_value() + lf_qty.full_value())); + filled_qty = + Quantity::create_new(filled_qty.full_value() + lf_qty.full_value()); + status = api::orderman::NATIVE_ORDER_STATUS_PARTIALLY_FILLED; + if (filled_qty >= qty()) { + status = api::orderman::NATIVE_ORDER_STATUS_FILLED; + //active = false; + } + } + void apply_change(const CancelReplaceOrderMsg &cxl_repl_msg) { + if (status == api::orderman::NATIVE_ORDER_STATUS_CANCELED) + // already cancelled, further changes will be rejected + return; + crt_msg = cxl_repl_msg.create_fields; + // if qty is reduced, it can result in a cancel + if (working_qty() <= Quantity::create_new(0.0)) { + status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; + } + } + void apply_cxl(const CancelOrderMsg &) { + status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; + } + void clear_after_transaction() { + last_filled_qty = 0; + last_filled_price = Price(os::nan()); + trades.clear(); + } + bool active() const { + bool final_state = + status == api::orderman::NATIVE_ORDER_STATUS_CANCELED || + status == + api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_FILLED; + return !final_state; + } +}; // namespace bts::orderman struct SEGSecurityData { bts::SecurityKey key; bts::orderman::Book real_book; + std::map previous_snapshot; std::vector orders; + std::queue pending_actions; + SEGOrderState *find_order(OrderKey key) { + for (auto &seg_os : orders) { + if (seg_os.ord_key() == key) { + return &seg_os; + } + } + return nullptr; + } + void enqueue_action(const OrderMsg &ord_msg) { + pending_actions.push(ord_msg); + } + void take_snapshot() { + previous_snapshot.clear(); + for (const auto &seg_os : orders) { + previous_snapshot.insert({seg_os.ord_key(), seg_os}); + } + } + void apply_order_action(const OrderMsg &msg) { + // create results in a new order entry, otherwise apply_change or + // apply_cxl are called on an existing entry + if (std::holds_alternative(msg)) { + const CreateOrderMsg &cr_msg = std::get(msg); + orders.emplace_back(cr_msg); + } else if (std::holds_alternative(msg)) { + const CancelReplaceOrderMsg &cxlr_msg = + std::get(msg); + SEGOrderState *seg_os = find_order(cxlr_msg.create_fields.key); + bts_assert(seg_os != nullptr); + seg_os->apply_change(cxlr_msg); + } else if (std::holds_alternative(msg)) { + const CancelOrderMsg &cxl_msg = std::get(msg); + SEGOrderState *seg_os = find_order(cxl_msg.key); + bts_assert(seg_os != nullptr); + seg_os->apply_cxl(cxl_msg); + } + } + void clear_after_transaction() { + previous_snapshot.clear(); + bts_assert(pending_actions.empty()); + for (auto &seg_os : orders) { + seg_os.clear_after_transaction(); + } + } }; struct SimExecutionGateway::PImpl { @@ -122,12 +221,16 @@ struct SimExecutionGateway::PImpl { md::SecurityOracle sec_oracle; bts::md::MDClient &md_client; bts::md::MDProducer *md_producer = nullptr; + md::GeneralSecurityIndex *producer_map = nullptr; // send_msgs is sent on the order_man thread, its dequeued in the market data // thread, and execution reports are queued to buffered_exec_reps tbb::concurrent_queue buffered_order_ops; tbb::concurrent_queue buffered_exec_reps; std::unordered_map books = {}; tbb::concurrent_hash_map sec_map = {}; + boost::object_pool exe_report_pool; + size_t msg_seq_num = 0; + std::set cached_action_secs; api::Security const *find_sec(uint32_t key) const { tbb::concurrent_hash_map::const_accessor accessor; @@ -142,7 +245,8 @@ SimExecutionGateway::SimExecutionGateway( md::SecurityOracle o, bts::md::MDClient &md_client) : IExecutionGateway(), me(new PImpl(o, md_client)) { LOG(OrderMan, Info, - "SimExecutionGateway::SimExecutionGateway constructor tid: {} tname: {}", + "SimExecutionGateway::SimExecutionGateway constructor tid: {} tname: " + "{}", bts::os::get_thread_id(), bts::os::get_thread_name()); } @@ -224,8 +328,9 @@ OnExchangeOpenOrdersState &SimExecutionGateway::on_exchange_open_orders() { return me->on_exchange_open_orders; } -void SimExecutionGateway::set_producer(bts::md::MDProducer &md_producer) { - me->md_producer = &md_producer; +void SimExecutionGateway::set_producers( + md::GeneralSecurityIndex *producer_map) { + me->producer_map = producer_map; } void SimExecutionGateway::do_work() {} @@ -240,6 +345,7 @@ bool SimExecutionGateway::get_matched_book( if (seg_book.orders.empty() && me->buffered_order_ops.empty()) return false; // integrate the orders + me->cached_action_secs.insert(key); bts::orderman::Book book = seg_book.real_book; for (SEGOrderState &seg_os : seg_book.orders) { book = _process_book_change(book, seg_os); @@ -247,23 +353,67 @@ bool SimExecutionGateway::get_matched_book( // handle buffered operations OrderMsg ord_msg; while (me->buffered_order_ops.try_pop(ord_msg)) { - if (std::holds_alternative(ord_msg)) { - const CreateOrderMsg &cr_msg = std::get(ord_msg); - _process_new_order(book, cr_msg); - } else if (std::holds_alternative(ord_msg)) { - const CancelOrderMsg &cxl_msg = std::get(ord_msg); - _process_cxl_order(book, cxl_msg); - } else if (std::holds_alternative(ord_msg)) { - const CancelReplaceOrderMsg &cxl_repl_msg = - std::get(ord_msg); - _process_modify_order(book, cxl_repl_msg); + auto sec_data = _find_security(get_sec_key(ord_msg)); + if (sec_data != nullptr) { + sec_data->enqueue_action(ord_msg); + me->cached_action_secs.insert(sec_data->key); } + // if (std::holds_alternative(ord_msg)) { + // const CreateOrderMsg &cr_msg = std::get(ord_msg); + // _process_new_order(book, cr_msg); + // } else if (std::holds_alternative(ord_msg)) { + // const CancelOrderMsg &cxl_msg = std::get(ord_msg); + // _process_cxl_order(book, cxl_msg); + // } else if (std::holds_alternative(ord_msg)) { + // const CancelReplaceOrderMsg &cxl_repl_msg = + // std::get(ord_msg); + // _process_modify_order(book, cxl_repl_msg); + // } } + _process_transaction(); from_book(book, bids, asks); return true; } -// f(book, existing_order) -> new_book. Also the side affects are -// + +void SimExecutionGateway::_process_transaction() { + // goes through all the actions and applies it to the orders + for (SecurityKey key : me->cached_action_secs) { + SEGSecurityData *sec_data_ptr = _find_security(key); + bts_assert(sec_data_ptr != nullptr); + SEGSecurityData &sec_data = *sec_data_ptr; + sec_data.take_snapshot(); + auto &pending_actions = sec_data.pending_actions; + while (!pending_actions.empty()) { + OrderMsg ord_msg = sec_data.pending_actions.front(); + pending_actions.pop(); + sec_data.apply_order_action(ord_msg); + } + } + // now apply all the orders to the book + for (SecurityKey key : me->cached_action_secs) { + SEGSecurityData &sec_data = *_find_security(key); + Book sec_bk = sec_data.real_book; + for (SEGOrderState &seg_os : sec_data.orders) { + _match_order(sec_bk, seg_os); + } + } + // now fire execution reports (and write trades) + for (SecurityKey key : me->cached_action_secs) { + SEGSecurityData &sec_data = *_find_security(key); + for (const SEGOrderState &seg_os : sec_data.orders) { + const auto it = sec_data.previous_snapshot.find(seg_os.ord_key()); + SEGOrderState const *prev = + it == sec_data.previous_snapshot.end() ? nullptr : &it->second; + _compute_and_fire_execution_report(prev, &seg_os); + } + } + for (SecurityKey key : me->cached_action_secs) { + SEGSecurityData *sec_data_ptr = _find_security(key); + sec_data_ptr->clear_after_transaction(); + } +} +// f(book, existing_order) -> new_book. Also the side affects +// could be execution reports and trades bts::orderman::Book SimExecutionGateway::_process_book_change( const bts::orderman::Book &book, SEGOrderState &seg_os) { auto sec_ptr = me->find_sec(seg_os.sec_key().value()); @@ -278,57 +428,82 @@ bts::orderman::Book SimExecutionGateway::_process_book_change( } } -bts::orderman::Book SimExecutionGateway::_process_new_order( - const bts::orderman::Book &book, const CreateOrderMsg &crt_ord_msg) { - // we can treat this case of an existing order with a book change - SEGSecurityData &seg_sec_state = - me->books[bts::SecurityKey(crt_ord_msg.security->id())]; - // this is where a new order is added to a security's state - SEGOrderState &seg_ord_state = - seg_sec_state.orders.emplace_back(crt_ord_msg); - // TODO: generate new order execution report - auto rv = _process_book_change(book, seg_ord_state); - return rv; -} -bts::orderman::Book SimExecutionGateway::_process_cxl_order( - const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord) { - // first thing we need to check is if the order is working (it could have - // been already filled) - if (!_is_working_order( - cxl_ord.key, bts::SecurityKey(cxl_ord.security->id()))) { - LOG(OrderMan, Warn, - "Order ok: {} can not be cancelled because it is no longer a working " - "order", - cxl_ord.key); +// We take an order and apply it to the book. As +bts::orderman::Book SimExecutionGateway::_match_order( + const bts::orderman::Book &book, SEGOrderState &seg_os) { + if (!seg_os.active()) return book; + auto sec_ptr = me->find_sec(seg_os.sec_key().value()); + bts_assert(sec_ptr != nullptr); + double tick_sz = sec_ptr->contract_spec().low_tick(); + auto crosses_opp_side = SpreaderUtils::crosses_book( + book, seg_os.side(), bts::Price(seg_os.price()), tick_sz); + if (crosses_opp_side) { + return _cross_order(book, seg_os); + } else { + return _work_order(book, seg_os); } - // TODO: - // 1. substract the order from the book - // 2. generate a cxl execution report - return book; -} -bts::orderman::Book SimExecutionGateway::_process_modify_order( - const bts::orderman::Book &book, - const CancelReplaceOrderMsg &cxl_repl_ord) { - const auto &crt_msg = cxl_repl_ord.create_fields; - if (!_is_working_order( - crt_msg.key, bts::SecurityKey(crt_msg.security->id()))) { - LOG(OrderMan, Warn, - "Order ok: {} can not be modified because it is no longer a working " - "order", - crt_msg.key); - return book; - } - // TODO: - // this is the hard one - // if qty changed, since this is a resting order just update the book - // if price change, check if it crosses the market - // if not, make it a resting order - // ... etc - // can we deal with it as cxl, new order ? - return book; } +// bts::orderman::Book SimExecutionGateway::_process_new_order( +// const bts::orderman::Book &book, const CreateOrderMsg &crt_ord_msg) { +// // we can treat this case of an existing order with a book change +// SEGSecurityData &seg_sec_state = +// me->books[bts::SecurityKey(crt_ord_msg.security->id())]; +// // this is where a new order is added to a security's state +// SEGOrderState &seg_ord_state = +// seg_sec_state.orders.emplace_back(crt_ord_msg); +// _push_execution_report(seg_ord_state); +// auto rv = _process_book_change(book, seg_ord_state); +// return rv; +// } +// bts::orderman::Book SimExecutionGateway::_process_cxl_order( +// const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord) { +// SEGOrderState *ord_ptr = +// _find_order(cxl_ord.key, bts::SecurityKey(cxl_ord.security->id())); +// if (ord_ptr == nullptr || !ord_ptr->active) { +// LOG(OrderMan, Warn, +// "Order ok: {} can not be cancelled because it is no longer a " +// "working " +// "order", +// cxl_ord.key); +// return book; +// } +// ord_ptr->last_filled_qty = 0; +// ord_ptr->status = +// bts::api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_CANCELED; +// ord_ptr->active = false; +// _push_execution_report(*ord_ptr); +// BookSide bside = SpreaderUtils::cxl_working_order( +// book.side(ord_ptr->side()), {ord_ptr->price(), ord_ptr->working_qty()}); +// // 2. generate a cxl execution report +// Book rv = book; +// rv.side(ord_ptr->side()) = bside; +// return rv; +// } +// bts::orderman::Book SimExecutionGateway::_process_modify_order( +// const bts::orderman::Book &book, +// const CancelReplaceOrderMsg &cxl_repl_ord) { +// const auto &crt_msg = cxl_repl_ord.create_fields; +// if (!_is_working_order( +// crt_msg.key, bts::SecurityKey(crt_msg.security->id()))) { +// LOG(OrderMan, Warn, +// "Order ok: {} can not be modified because it is no longer a " +// "working " +// "order", +// crt_msg.key); +// return book; +// } +// // TODO: +// // this is the hard one +// // if qty changed, since this is a resting order just update the book +// // if price change, check if it crosses the market +// // if not, make it a resting order +// // ... etc +// // can we deal with it as cxl, new order ? +// return book; +// } + // Given an order that is crossing (we know that from the callee), this // function does 3 things // 1. Generates a new book @@ -336,7 +511,15 @@ bts::orderman::Book SimExecutionGateway::_process_modify_order( // 3. Generate execution report // 4. Generate trades and writes it to the MDProducer bts::orderman::Book SimExecutionGateway::_cross_order( - const bts::orderman::Book &book, SEGOrderState &) { + const bts::orderman::Book &book, SEGOrderState &seg_os) { + std::vector> fills = {}; + SpreaderUtils::apply_crossing_order( + book, seg_os.side(), {seg_os.price(), seg_os.working_qty()}, fills); + // this is where we need to do 2-4 + for (const auto &[f_pr, f_qty] : fills) { + seg_os.add_fill(f_pr, f_qty); + // 3, 4 are done later + } return book; } @@ -347,12 +530,11 @@ bts::orderman::Book SimExecutionGateway::_cross_order( // do we need to generate execution reports) bts::orderman::Book SimExecutionGateway::_work_order( const bts::orderman::Book &book, SEGOrderState &seg_os) { - // iterate the book, find the level and add - auto sec_ptr = me->find_sec(seg_os.sec_key().value()); - bts_assert(sec_ptr != nullptr); - double tick_size = sec_ptr->contract_spec().low_tick(); - bts_assert(tick_size > 0); - return book; + const BookSide &bside = book.side(seg_os.side()); + Book rv = book; + rv.side(seg_os.side()) = SpreaderUtils::apply_working_order( + bside, seg_os.side(), {seg_os.price(), seg_os.qty()}); + return rv; } bool SimExecutionGateway::_is_working_order( @@ -361,11 +543,102 @@ bool SimExecutionGateway::_is_working_order( if (it == me->books.end()) return false; for (const auto &o : it->second.orders) { - if (o.active && o.ord_key() == order_key) { + if (o.active() && o.ord_key() == order_key) { return true; } } return false; } +SEGOrderState *SimExecutionGateway::_find_order( + OrderKey order_key, SecurityKey security_key) { + auto it = me->books.find(security_key); + if (it == me->books.end()) + return nullptr; + for (auto &o : it->second.orders) { + if (o.ord_key() == order_key) { + return &o; + } + } + return nullptr; +} + +SEGSecurityData *SimExecutionGateway::_find_security(SecurityKey sec_key) { + auto it = me->books.find(sec_key); + return it == me->books.end() ? nullptr : &it->second; +} + +void SimExecutionGateway::_push_execution_report(const SEGOrderState &seg_os) { + ExecutionReport *er_p = me->exe_report_pool.construct(); + ExecutionReport &er = *er_p; + fill_execution_report(seg_os, er); + me->buffered_exec_reps.push(er); +} + +// it looks at the now vs prev and computes all the execution reports +void SimExecutionGateway::_compute_and_fire_execution_report( + SEGOrderState const *prev, SEGOrderState const *now) { + bts_assert(now != nullptr); + if (prev == nullptr) { + _push_execution_report(*now); + } +} + +void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { + const auto &cr_msg = seg_os.crt_msg; + to_array(cr_msg.routing_record->account(), &er.account_name.value()); + to_array(cr_msg.routing_record->operator_id(), &er.operator_id.value()); + er.order_key = cr_msg.key; + er.msg_seq_num = 0; + er.security = cr_msg.security; + er.leg_security = nullptr; + er.side = cr_msg.side; + er.time_in_force = cr_msg.time_in_force; + er.order_type = cr_msg.order_type; + er.exec_type = api::orderman::ExecType::EXEC_TYPE_NEW; + er.order_status = seg_os.status; + er.manual_order_indicator = + api::orderman::ManualOrderIndicator::MANUAL_ORDER_INDICATOR_NO; + std::string exch_oid = std::to_string(cr_msg.key.value()); + auto &er_exch_oid = std::get(er.exchange_order_id).value(); + to_array(exch_oid, &er_exch_oid); + er.price.value() = seg_os.price().value(); + er.quantity = seg_os.qty(); + // fractional qty + // fills + er.avg_price.value() = seg_os.avg_filled_price.value(); + er.filled_quantity = seg_os.filled_qty; + er.last_shares = seg_os.last_filled_qty; + er.last_price = seg_os.last_filled_price; + if (!seg_os.last_filled_qty.is_zero()) { + bts::utils::Uuid guid; + std::string fill_id = guid.to_text_string(); + to_array(fill_id, &er.exchange_fill_id.value()); + } + er.max_show = Quantity(0); + er.exchange = cr_msg.security->exchange(); + ExchangeTimeStamp64 now = ExchangeTimeStamp64(datetime::unix_nano_now()); + er.transact_time = now; + LOG(OrderMan, Info, + "EMExecutionGateway::_process_cb_and_fire_er firing er: {}", + er.to_string()); +} + +SecurityKey get_sec_key(const OrderMsg &msg) { + if (std::holds_alternative(msg)) { + const CreateOrderMsg &cr_msg = std::get(msg); + return SecurityKey(cr_msg.security->id()); + } else if (std::holds_alternative(msg)) { + const CancelReplaceOrderMsg &cxlr_msg = + std::get(msg); + return SecurityKey(cxlr_msg.create_fields.security->id()); + } else if (std::holds_alternative(msg)) { + const CancelOrderMsg &cxl_msg = std::get(msg); + return SecurityKey(cxl_msg.security->id()); + } else if (std::holds_alternative(msg)) { + const RFQMsg &rfq_msg = std::get(msg); + return SecurityKey(rfq_msg.rfq.security().security_id()); + } + return SecurityKey(0); +} } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 4bd528270..5dbe4ac3f 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -2,6 +2,7 @@ #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" #include "lib/md/Shm/FixedSecurity.h" @@ -25,10 +26,10 @@ struct CancelOrderMsg; struct CancelReplaceOrderMsg; } // namespace bts::orderman -namespace bts { -namespace orderman { +namespace bts::orderman { struct SEGOrderState; +struct SEGSecurityData; class SimExecutionGateway : public IExecutionGateway { public: @@ -48,7 +49,7 @@ class SimExecutionGateway : public IExecutionGateway { OnExchangePositionState &on_exchange_position_state() override; OnExchangeOpenOrdersState &on_exchange_open_orders() override; - void set_producer(bts::md::MDProducer &md_producer); + void set_producers(md::GeneralSecurityIndex *producer_map); void do_work(); bool get_matched_book( bts::md::SecurityKey key, @@ -58,24 +59,31 @@ class SimExecutionGateway : public IExecutionGateway { private: bts::orderman::Book _process_book_change( const bts::orderman::Book &book, SEGOrderState &seg_ord); - bts::orderman::Book _process_new_order( - const bts::orderman::Book &book, const CreateOrderMsg &cr_ord); - bts::orderman::Book _process_cxl_order( - const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord); - bts::orderman::Book _process_modify_order( - const bts::orderman::Book &book, - const CancelReplaceOrderMsg &cxl_repl_ord); + bts::orderman::Book _match_order( + const bts::orderman::Book &book, SEGOrderState &seg_ord); + // bts::orderman::Book _process_new_order( + // const bts::orderman::Book &book, const CreateOrderMsg &cr_ord); + // bts::orderman::Book _process_cxl_order( + // const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord); + // bts::orderman::Book _process_modify_order( + // const bts::orderman::Book &book, + // const CancelReplaceOrderMsg &cxl_repl_ord); bts::orderman::Book _cross_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _work_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); bool _is_working_order(OrderKey order_key, SecurityKey security_key) const; + SEGOrderState *_find_order(OrderKey order_key, SecurityKey security_key); + SEGSecurityData *_find_security(SecurityKey security_key); + void _push_execution_report(const SEGOrderState &seg_os); + void _process_transaction(); + void _compute_and_fire_execution_report( + SEGOrderState const *prev, SEGOrderState const *now); private: struct PImpl; PImpl *me; }; -} // namespace orderman -} // namespace bts +} // namespace bts::orderman diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index e08b4d585..1ebe6d616 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -247,16 +247,6 @@ bts::orderman::Book SpreaderUtils::apply_crossing_order( api::Side side, std::tuple order, std::vector> &out_fills) { - auto remove_0qtys = [](const BookSide &bside) { - BookSide rv = {}; - size_t i = 0; - for (const md::PriceSize &ps : bside) { - if (!Quantity::create_new(ps.size()).is_zero()) { - rv.at(i++) = ps; - } - } - return rv; - }; auto [ord_pr, ord_rem_ord_qty] = order; api::Side opp_side = bts::securities::other_side(side); BookSide rv_opp_bk_side = in_book.side(opp_side); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index ddbfb28a6..51dcd7c94 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -15,6 +15,7 @@ #include "lib/os/os.h" #include "lib/utils/bts_assert.h" #include "lib/utils/bts_chrono.h" +#include #include #include @@ -255,6 +256,17 @@ class SpreaderUtils { book_side[i] = empty_ps; } } + // not in the critical path, creates copy + static BookSide remove_0qtys(const BookSide &bside) { + BookSide rv = {}; + size_t i = 0; + for (const md::PriceSize &ps : bside) { + if (!Quantity::create_new(ps.size()).is_zero()) { + rv.at(i++) = ps; + } + } + return rv; + } // CRITICAL PATH (for hedging) // travserses the book to locate the target_price, // and finds the cumm qty up to that level (last our arg) @@ -1038,6 +1050,24 @@ class SpreaderUtils { return rv; } + // Fits a working order into a book + static bts::orderman::BookSide cxl_working_order( + const BookSide &in_book, std::tuple order) { + BookSide rv = in_book; + auto [ord_pr, ord_qty] = order; + size_t i = 0; + for (const auto &ps : in_book) { + if (securities::is_same(ord_pr, Price(ps.price()))) { + Quantity l_qty = Quantity::create_new(ps.size()); + bts_assert(l_qty >= ord_qty); + l_qty -= ord_qty; + rv.at(i) = {ps.int_price(), l_qty.full_value_float()}; + } + i++; + } + return remove_0qtys(rv); + } + // Fits a working order into a book static bts::orderman::BookSide apply_working_order( const BookSide &in_book, From 7e5c71f337444532eadbfc50295a81ec8ecbbd37 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 23 Feb 2023 13:43:09 -0500 Subject: [PATCH 16/23] SimExecutionGateway almost working --- src/data_files/documents/order_flow.txt | 4 + src/lib/CMakeDeps.cmake | 2 +- .../api/service_helpers/AdminServiceUtils.cpp | 18 +- src/lib/api/services/AdminService.proto | 5 + src/lib/core/TimeStamp.h | 1 + src/lib/md/GeneralMarketDataListener.cpp | 11 +- src/lib/md/ccApi/CCMain.cpp | 76 --- src/lib/md/ccApi/CCMain.h | 23 - src/lib/md/recording/MDReplayer.cpp | 2 +- .../actors/order_manager/OrderServicesData.h | 4 + .../actors/order_manager/SessionServices.h | 7 +- .../gateways/sim/SimExecutionGateway.cpp | 495 ++++++++++-------- .../gateways/sim/SimExecutionGateway.h | 29 +- .../sim/SimExecutionGatewayFactory.cpp | 9 +- src/lib/orderman/orders/EMNativeOrder.cpp | 2 +- .../spreader/SpreaderUtils.cpp | 12 +- .../spreader_orders/spreader/SpreaderUtils.h | 10 +- .../spreader_orders/tests/spreader_tests.cpp | 69 +++ src/server/sparkd/cmds/md/cmds/Run.cpp | 11 +- 19 files changed, 422 insertions(+), 368 deletions(-) delete mode 100644 src/lib/md/ccApi/CCMain.cpp delete mode 100644 src/lib/md/ccApi/CCMain.h diff --git a/src/data_files/documents/order_flow.txt b/src/data_files/documents/order_flow.txt index 3e11a102b..312955fea 100644 --- a/src/data_files/documents/order_flow.txt +++ b/src/data_files/documents/order_flow.txt @@ -88,6 +88,10 @@ AlgoWrapperOrder::me->services->subscribe_to_child_updates AlgoWrapperOrder::on_child_order_update TaskingEyeAlgo::on_child_change +ORDER ROUTING (JetFix connections) +------------- +EMNativeOrder::SessionServices = OrderServices::get_session_services("deribit_1"); + MARKET DATA REPLAY: ------------------ main.cpp -> diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 42c2d3146..6e35aa44c 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/analytics/ExpirationDriver.proto;api/analytics/TimeWeightedInterpolatedDriver.proto;api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/core/RegexFormatting.proto;api/domain/CallPut.proto;api/domain/Currency.proto;api/domain/SecurityCriteria.proto;api/domain/SecurityCriteriaClause.proto;api/domain/SecurityExpiration.proto;api/domain/SecurityMetadata.proto;api/domain/SecurityMetadataCollection.proto;api/domain/SecurityMetadataItem.proto;api/domain/SecurityType.proto;api/domain/TickDisplaySettings.proto;api/domain/TickFactors.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/BinanceMarketDataConfig.proto;api/md/BinanceUsMarketDataConfig.proto;api/md/BinanceUsdsFuturesMarketDataConfig.proto;api/md/DeribitMarketDataConfig.proto;api/md/FTXMarketDataConfig.proto;api/md/MarketDataConfig.proto;api/md/MarketDataConfigUtils.cpp;api/md/MarketDataRecordingConfig.proto;api/md/MarketDataReplayConfig.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/extensions/extensions.proto;config/invalid/invalid.proto;config/profiles/default/MarketData.conf;config/profiles/default/Ports.conf;config/profiles/default/SecurityMetadataCollection.conf;config/profiles/default/Symbols.conf;config/profiles/default/cme_reference_data.conf;config/profiles/default/edge.conf;config/profiles/default/jetfix.conf;config/profiles/default/keycode.conf;config/profiles/default/logging.conf;config/profiles/default/orderman_cfg.conf;config/profiles/default/orders_fills_cleanup.conf;config/profiles/default/position_cfg.conf;config/profiles/default/span.conf;config/profiles/default/spreader.conf;config/profiles/default/testkeys.conf;config/profiles/default/threads.conf;config/profiles/default/toggles.conf;config/protos/algo_types.proto;config/protos/cme_reference_data.proto;config/protos/exchange_sim_cfg.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/market_data.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/ports.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/symbols.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/protos/ui.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;core/TimeStamp.cpp;domain/DomainSecurityUtils.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Security.cpp;domain/SecurityCriteria.cpp;domain/SecurityCriteriaClause.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/JsonReader.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/CCApiCompositeMessageHandler.cpp;md/CCApiDepthWalker.cpp;md/CCApiEventDemuxer.cpp;md/CCApiMarketDepthAdaptor.cpp;md/CCApiMessageLogger.cpp;md/CCApiSession.cpp;md/CCApiTradeAdaptor.cpp;md/CCApiTradeRecord.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/GeneralMarketDataListener.cpp;md/ICCApiMessageHandler.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MarketDataSubscription.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceMiniTickerAdaptor.cpp;md/binance/BinanceMiniTickerUpdate.cpp;md/binance/BinancePriceStatistics.cpp;md/binance/BinancePriceStatisticsAdaptor.cpp;md/binance/BinanceSecurityRequestor.cpp;md/binance/BinanceSpot.cpp;md/binance/BinanceSubscription.cpp;md/binance_us/BinanceUsPriceStatistics.cpp;md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp;md/binance_us/BinanceUsSecurityRequestor.cpp;md/binance_us/BinanceUsSubscription.cpp;md/binance_usds_futures/BinanceUsdsFuture.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp;md/ccApi/CCDemoListener.cpp;md/ccApi/CCMain.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ftx/FTXFuture.cpp;md/ftx/FTXHistoricalPriceAdaptor.cpp;md/ftx/FTXHistoricalPriceRecord.cpp;md/ftx/FTXMarket.cpp;md/ftx/FTXSecurityRequestor.cpp;md/ftx/FTXSubscription.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/recording/MDRecorder.cpp;md/recording/MDReplayer.cpp;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/calculations/TheoCalculator.cpp;orderman/ccapi/CCAPIDeribitOrderMux.cpp;orderman/ccapi/CCAPIOrderCallbackMsgs.cpp;orderman/ccapi/CCAPIOrderState.cpp;orderman/ccapi/CCAPISingleOrderManager.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/CCAPIExecutionGateway.cpp;orderman/gateways/EMExecutionGateway.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/FakeExecutionGateway.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGatewayFactory.cpp;orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/ExecutionReport.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/EMNativeOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/CCApiExecutionTests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/FileUtils.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/analytics/ExpirationDriver.proto;api/analytics/TimeWeightedInterpolatedDriver.proto;api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/core/RegexFormatting.proto;api/domain/CallPut.proto;api/domain/Currency.proto;api/domain/SecurityCriteria.proto;api/domain/SecurityCriteriaClause.proto;api/domain/SecurityExpiration.proto;api/domain/SecurityMetadata.proto;api/domain/SecurityMetadataCollection.proto;api/domain/SecurityMetadataItem.proto;api/domain/SecurityType.proto;api/domain/TickDisplaySettings.proto;api/domain/TickFactors.proto;api/domain/Venue.proto;api/io/URL.proto;api/md/BinanceMarketDataConfig.proto;api/md/BinanceUsMarketDataConfig.proto;api/md/BinanceUsdsFuturesMarketDataConfig.proto;api/md/DeribitMarketDataConfig.proto;api/md/FTXMarketDataConfig.proto;api/md/MarketDataConfig.proto;api/md/MarketDataConfigUtils.cpp;api/md/MarketDataRecordingConfig.proto;api/md/MarketDataReplayConfig.proto;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/AnalyticsService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;communincation/websockets/tests/WebsocketSyncClientTests.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/extensions/extensions.proto;config/invalid/invalid.proto;config/profiles/default/MarketData.conf;config/profiles/default/Ports.conf;config/profiles/default/SecurityMetadataCollection.conf;config/profiles/default/Symbols.conf;config/profiles/default/cme_reference_data.conf;config/profiles/default/edge.conf;config/profiles/default/jetfix.conf;config/profiles/default/keycode.conf;config/profiles/default/logging.conf;config/profiles/default/orderman_cfg.conf;config/profiles/default/orders_fills_cleanup.conf;config/profiles/default/position_cfg.conf;config/profiles/default/span.conf;config/profiles/default/spreader.conf;config/profiles/default/testkeys.conf;config/profiles/default/threads.conf;config/profiles/default/toggles.conf;config/protos/algo_types.proto;config/protos/cme_reference_data.proto;config/protos/exchange_sim_cfg.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/market_data.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/ports.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spartan.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/symbols.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/protos/ui.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;core/TimeStamp.cpp;domain/DomainSecurityUtils.cpp;domain/NewOrder.cpp;domain/OrderDefinition.cpp;domain/OrderStatus.cpp;domain/OrderUpdate.cpp;domain/Security.cpp;domain/SecurityCriteria.cpp;domain/SecurityCriteriaClause.cpp;domain/Side.cpp;domain/TimeInForce.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;io/JsonReader.cpp;io/QueryParams.cpp;io/URL.cpp;io/http/CurlHandle.cpp;io/http/HTTPClient.cpp;io/http/HTTPHeaders.cpp;io/http/HTTPRequest.cpp;io/http/HTTPResponse.cpp;io/websocket/WebsocketClient.cpp;io/websocket/WebsocketClientConfiguration.cpp;io/websocket/WebsocketError.cpp;io/websocket/WebsocketMessage.cpp;io/websocket/WebsocketSSLClientInternal.cpp;io/websocket/tests/WebsocketClientTests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/CCApiCompositeMessageHandler.cpp;md/CCApiDepthWalker.cpp;md/CCApiEventDemuxer.cpp;md/CCApiMarketDepthAdaptor.cpp;md/CCApiMessageLogger.cpp;md/CCApiSession.cpp;md/CCApiTradeAdaptor.cpp;md/CCApiTradeRecord.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/GeneralMarketDataListener.cpp;md/ICCApiMessageHandler.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MarketDataError.cpp;md/MarketDataGateway.cpp;md/MarketDataRegistrationFactory.cpp;md/MarketDataSubscription.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityMarketState.cpp;md/SecurityOracle.cpp;md/SecurityStore.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/binance/BinanceMiniTickerAdaptor.cpp;md/binance/BinanceMiniTickerUpdate.cpp;md/binance/BinancePriceStatistics.cpp;md/binance/BinancePriceStatisticsAdaptor.cpp;md/binance/BinanceSecurityRequestor.cpp;md/binance/BinanceSpot.cpp;md/binance/BinanceSubscription.cpp;md/binance_us/BinanceUsPriceStatistics.cpp;md/binance_us/BinanceUsPriceStatisticsAdaptor.cpp;md/binance_us/BinanceUsSecurityRequestor.cpp;md/binance_us/BinanceUsSubscription.cpp;md/binance_usds_futures/BinanceUsdsFuture.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp;md/binance_usds_futures/BinanceUsdsFuturesPriceStatisticsAdaptor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSecurityRequestor.cpp;md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp;md/ccApi/CCDemoListener.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ftx/FTXFuture.cpp;md/ftx/FTXHistoricalPriceAdaptor.cpp;md/ftx/FTXHistoricalPriceRecord.cpp;md/ftx/FTXMarket.cpp;md/ftx/FTXSecurityRequestor.cpp;md/ftx/FTXSubscription.cpp;md/ice/ICEUtils.cpp;md/listeners/LiveLadderPrinter.cpp;md/protos/co2.proto;md/recording/MDRecorder.cpp;md/recording/MDReplayer.cpp;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;orderman/Governor.cpp;orderman/OrderBuilder.cpp;orderman/OrderRouter.cpp;orderman/OrderServiceServer.cpp;orderman/OrderServices.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/FillStore.cpp;orderman/actors/MDSupplementarySource.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SODPosition.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/actors/order_manager/PositionIndex.cpp;orderman/calculations/TheoCalculator.cpp;orderman/ccapi/CCAPIDeribitOrderMux.cpp;orderman/ccapi/CCAPIOrderCallbackMsgs.cpp;orderman/ccapi/CCAPIOrderState.cpp;orderman/ccapi/CCAPISingleOrderManager.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/FilledPositionEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/events/TradeSignalEvent.cpp;orderman/gateways/CCAPIExecutionGateway.cpp;orderman/gateways/EMExecutionGateway.cpp;orderman/gateways/ExecutionGatewayFactory.cpp;orderman/gateways/FakeExecutionGateway.cpp;orderman/gateways/GLBXExecutionGateway.cpp;orderman/gateways/GLBXiLink3ExecutionGateway.cpp;orderman/gateways/ICEExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGateway.cpp;orderman/gateways/sim/SimExecutionGatewayFactory.cpp;orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.cpp;orderman/ilink3/IL3ConnectionHandler.cpp;orderman/ilink3/IL3GW.cpp;orderman/ilink3/IL3Parser.cpp;orderman/ilink3/IL3Reactor.cpp;orderman/ilink3/ILink3Utils.cpp;orderman/ilink3/SessionStore.cpp;orderman/ilink3/test/ILinkGWTests.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/DynamicOrderRegistry.cpp;orderman/order_factory/OrderFactory.cpp;orderman/orderman_utils/BookUtils.cpp;orderman/orderman_utils/ExecutionReport.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/EMNativeOrder.cpp;orderman/orders/GLBXNativeOrder.cpp;orderman/orders/ICENativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/DynamicHelpers.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/PositionUpdate.cpp;orderman/orders/algo/algo_orders/CoverAlgo.cpp;orderman/orders/algo/algo_orders/DeleteAndCoverAlgo.cpp;orderman/orders/algo/algo_orders/DormanAlgo.cpp;orderman/orders/algo/algo_orders/IcebergAlgo.cpp;orderman/orders/algo/algo_orders/JoinAlgo.cpp;orderman/orders/algo/algo_orders/LeanAlgo.cpp;orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp;orderman/orders/algo/algo_orders/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/OnSignalAlgo.cpp;orderman/orders/algo/algo_orders/ProRataAlgo.cpp;orderman/orders/algo/algo_orders/PyramidAlgo.cpp;orderman/orders/algo/algo_orders/RegisterDorman.cpp;orderman/orders/algo/algo_orders/ScratchAlgo.cpp;orderman/orders/algo/algo_orders/SniperAlgo.cpp;orderman/orders/algo/algo_orders/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TASAlgo.cpp;orderman/orders/algo/algo_orders/TASCounterAlgo.cpp;orderman/orders/algo/algo_orders/TaskingEyeAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp;orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp;orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp;orderman/orders/algo/algo_orders/tests/dorman_tests.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp;orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp;orderman/orders/algo/algo_orders/tests/splitter_tests.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/PricerOrder.cpp;orderman/orders/glbx/IGLBXOrderEncoder.cpp;orderman/orders/glbx/iLink2OrderEncoder.cpp;orderman/orders/glbx/iLink3OrderEncoder.cpp;orderman/orders/queue_holder/QueueHolderOrder.cpp;orderman/orders/queue_holder/state_workers/QHOEndStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForAckStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWaitingForCancelAllStateWorker.cpp;orderman/orders/queue_holder/state_workers/QHOWorkingStateWorker.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegFillState.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/NLegsHedgeRecompData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/HedgerManager.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForInitialDataStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/tests/CCApiExecutionTests.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;persistence/IDGenerator.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/persistence_utils.cpp;persistence/tests/PersistenceServiceTests.cpp;plugin/SparkServices.cpp;plugin/plugin.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;tracing/PerfLog.cpp;tracing/bts_trace.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/FileUtils.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/MathUtils.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/crypto/CipherType.cpp;utils/crypto/CryptoInit.cpp;utils/crypto/Digest.cpp;utils/crypto/KeyCodeHelper.cpp;utils/crypto/PasswordCallback.cpp;utils/crypto/PrivateKey.cpp;utils/crypto/PublicKey.cpp;utils/crypto/iostreambio.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/sftp.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/IDGeneratorTests.cpp;utils/tests/MathUtilsTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index e57672b1f..756fa9253 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -168,9 +168,17 @@ AdminServiceUtils::resolve_connection( case api::Venue::VENUE_FTX: case api::Venue::VENUE_BINANCE: case api::Venue::VENUE_BINANCE_US: - case api::Venue::VENUE_BINANCE_USDS_FUTURES: - rv = resolve_sim_connection(data, account, sec); - break; + case api::Venue::VENUE_BINANCE_USDS_FUTURES:{ + if (account.has_connections()) + for (const std::string &conn_name : + account.connections().exchange_connection_names()) { + const bts::api::admin::ExchangeConnection *conn = + find_connection(data, conn_name); + if (conn != nullptr && conn->has_general_connection()) + return conn; + } + return nullptr; + } case api::Venue::VENUE_CBOE: case api::Venue::VENUE_CBOECFE: case api::Venue::Venue_INT_MIN_SENTINEL_DO_NOT_USE_: @@ -223,6 +231,8 @@ void AdminServiceUtils::fill_connections_from_config( add_connection(admin_data, connection); break; default: + connection.mutable_general_connection()->set_exchange(c.venue()); + add_connection(admin_data, connection); break; } } @@ -539,7 +549,7 @@ bts::api::orderman::RoutingRecord AdminServiceUtils::get_routing_record( } switch (sec.exchange()) { case api::Venue::VENUE_DERIBIT: { - rv.set_session("sim"); + rv.set_session("deribit_1"); rv.set_account(account_ptr->name()); rv.set_operator_id(user_ptr->name()); AdminServiceUtils::ExchangeSubAccountResolver resolver; diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 1a1f57fff..eb1aa1491 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -238,6 +238,7 @@ message ExchangeConnection{ CMEConnection cme_connection = 30; ICEConnection ice_connection = 40; SIMConnection sim_connection = 50; + GeneralExchangeConnection general_connection = 60; } } @@ -263,6 +264,10 @@ message CMECGWConnection{ message SIMConnection { } +message GeneralExchangeConnection{ + api.Venue exchange = 10; +} + message CMEMSGWConnection{ uint32 port = 10; string session_and_firm_id = 20; diff --git a/src/lib/core/TimeStamp.h b/src/lib/core/TimeStamp.h index 030854cd2..4e42478cc 100644 --- a/src/lib/core/TimeStamp.h +++ b/src/lib/core/TimeStamp.h @@ -55,6 +55,7 @@ struct TimeStamp { return ns; #endif } + static TimeStamp now() { return from_nanos(now_ns()); } private: // posix time diff --git a/src/lib/md/GeneralMarketDataListener.cpp b/src/lib/md/GeneralMarketDataListener.cpp index 2c5325d35..32a779cb3 100644 --- a/src/lib/md/GeneralMarketDataListener.cpp +++ b/src/lib/md/GeneralMarketDataListener.cpp @@ -156,13 +156,16 @@ void copy_books( // interface functions //////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// GeneralMarketDataListener::GeneralMarketDataListener( - GeneralSecurityIndex &index, MDProducer &md_producer, api::Venue /*venue*/) + GeneralSecurityIndex &index, MDProducer &md_producer, api::Venue venue) : me(std::make_unique( index, md_producer, - /*bts::orderman::SimExecutionGatewayFactory::get()->get_getayeway( - venue)*/ - nullptr)) {} + bts::orderman::SimExecutionGatewayFactory::get()->get_getayeway( + venue))) { + LOG(md, Info, + "GeneralMarketDataListener::GeneralMarketDataListener venue: {}", + bts::api::Venue_Name(venue)); +} GeneralMarketDataListener::~GeneralMarketDataListener() {} diff --git a/src/lib/md/ccApi/CCMain.cpp b/src/lib/md/ccApi/CCMain.cpp deleted file mode 100644 index db8c21624..000000000 --- a/src/lib/md/ccApi/CCMain.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#ifdef SPARK_ENABLE_CCAPI - -#include "CCMain.h" -#include "lib/api/md/MarketDataConfig.pb.h" -#include "lib/config/config.h" -#include "lib/config/protos/market_data.pb.h" -#include "lib/logging/logging.h" -#include "lib/md/GeneralMarketDataListener.h" -#include "lib/md/GeneralSecurityIndex.h" -#include "lib/md/MDProducer.h" -#include "lib/md/MarketDataGateway.h" -#include "lib/md/MarketDataRegistration.h" -#include "lib/md/MarketDataSubscription.h" -#include "lib/md/SecurityDB.h" -#include "lib/md/SecurityIDRecorder.h" -#include "lib/md/ccApi/CCDemoListener.h" -#include "lib/md/coconut2.h" -#include "lib/md/common.h" -#include "lib/md/protos/co2.pb.h" -#include "lib/os/os.h" -#include "lib/utils/Dispatcher.h" -#include "lib/utils/PBUtils.h" -#include "lib/utils/bts_assert.h" -#include "lib/utils/bts_chrono.h" -#include "lib/utils/proto_helper.h" -#include "lib/utils/thread_manager.h" -#include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h" -#include - -#include "lib/md/GeneralSecurityIndex.h" -#include -#include -#include -#include - -using namespace std; - -namespace bts::md { - -struct CCMain::PImpl { - GeneralSecurityIndex sec_index; - SecurityIDRecorder recorder; - MDProducer producer; - bts::md::MarketDataGateway gw; - PImpl() - : sec_index(), recorder( - {utils::Dispatcher::current(), - [=](ExchangeKey k) { - return SecurityKey(sec_index.get_key(k.value())); - }}), - producer(bts::co2::PLATFORM_SIM, recorder) {} -}; - -CCMain::CCMain() - : // me(std::make_unique()) { - me(new PImpl()) { - LOG(md, Info, "CCMain::CCMain constructed on t_id: {} t_name: {}", - bts::os::get_thread_id(), bts::os::get_thread_name()); -} - -void CCMain::send_heartbeats() {} - -CCMain::~CCMain() {} - -void CCMain::run() { - LOG(md, Info, "Run::run_ccapi t_id:{} t_name:{}", os::get_thread_id(), - os::get_thread_name()); - me->gw.run(); - while (true) { - std::this_thread::sleep_for(std::chrono::seconds(1)); - } - std::cout << "Exiting run_ccapi" << std::endl; -} - -} // namespace bts::md -#endif diff --git a/src/lib/md/ccApi/CCMain.h b/src/lib/md/ccApi/CCMain.h deleted file mode 100644 index 15d866030..000000000 --- a/src/lib/md/ccApi/CCMain.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifdef SPARK_ENABLE_CCAPI - -#include "server/sparkd/md/platforms/IMDPlatform.h" -#include - -namespace bts::md { - -class CCMain : public IMDPlatform { - public: - CCMain(); - virtual ~CCMain(); - // IMDPlatform implementation - void send_heartbeats() override; - void run(); - - private: - struct PImpl; - std::unique_ptr me; -}; - -} // namespace bts::md -#endif \ No newline at end of file diff --git a/src/lib/md/recording/MDReplayer.cpp b/src/lib/md/recording/MDReplayer.cpp index 57364d585..1b90ee640 100644 --- a/src/lib/md/recording/MDReplayer.cpp +++ b/src/lib/md/recording/MDReplayer.cpp @@ -123,7 +123,7 @@ void MDReplayer::_replay_file_once(const std::string &file_name) { void MDReplayer::_replay_message(const bts::co2::RecordedMDMessage &m) { switch (m.MDRecord_case()) { case (co2::RecordedMDMessage::MDRecordCase::kSecurity): { - LOG(md, Info, "MDReplayer::_replay_message m: {}", + LOG(md, Diag, "MDReplayer::_replay_message m: {}", utils::pb::to_string(m)); bts::domain::Security new_sec = m.security(); me->sec_keys.insert(m.security().id()); diff --git a/src/lib/orderman/actors/order_manager/OrderServicesData.h b/src/lib/orderman/actors/order_manager/OrderServicesData.h index 4df9a24cd..9b0083f71 100644 --- a/src/lib/orderman/actors/order_manager/OrderServicesData.h +++ b/src/lib/orderman/actors/order_manager/OrderServicesData.h @@ -1,4 +1,5 @@ #pragma once +#include "lib/logging/logging.h" #include "lib/md/SecurityOracle.h" #include "lib/mercury/actors/ContentSubscription.h" #include "lib/mercury/events/Stream.h" @@ -35,6 +36,7 @@ #include "lib/orderman/limiter/Limiter.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/securities/MapSecurityDB.h" +#include "lib/utils/PBUtils.h" #include "lib/utils/Puid.h" #include "lib/utils/datetime.h" @@ -60,6 +62,8 @@ struct SessionServicesData { governor(cfg.max_order_msgs_per_window(), cfg.window_duration_msecs()), gw(ExecutionGatewayFactory::create_gateway(cfg, log, o)) { buffered_order_msgs.reserve(1000); + LOG(OrderMan, Info, "SessionServicesData::SessionServicesData cfg: {}", + utils::pb::to_string(cfg)); } std::string session; diff --git a/src/lib/orderman/actors/order_manager/SessionServices.h b/src/lib/orderman/actors/order_manager/SessionServices.h index 36ca69440..14ad8a667 100644 --- a/src/lib/orderman/actors/order_manager/SessionServices.h +++ b/src/lib/orderman/actors/order_manager/SessionServices.h @@ -3,10 +3,10 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/jetfix/common/OutFIX.h" #include "lib/logging/logging.h" +#include "lib/orderman/Governor.h" #include "lib/orderman/actors/order_manager/OrderManager.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/TickerUpdateEvent.h" -#include "lib/orderman/Governor.h" #include "lib/orderman/orderman_utils/EventStream.h" #include "lib/orderman/orders/Order.h" @@ -78,6 +78,8 @@ class SessionServices { template void queue_order_msg(const OP &order_op, trace::CorID const &corid) { + LOG(OrderMan, Info, "SessionServices::queue_order_msg order_op: {}", + order_op); auto &buffer = _session_data->buffered_order_msgs; buffer.emplace_back(OrderMsg{order_op}); if (buffer.size() == 1) @@ -107,7 +109,8 @@ class SessionServices { _cancel_rejects.unsub(sid); } - template void subscribe_to_gateway_status(CB &&cb) { + template + void subscribe_to_gateway_status(CB &&cb) { _gateway_status_sub = _gateway_status.sub(std::forward(cb)); } void unsubscribe_from_gateway_status() { diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index f60bab615..9682815b6 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -2,6 +2,8 @@ #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/ApiUnitTestService.pb.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/core/TimeStamp.h" +#include "lib/domain_model/Security.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" #include "lib/domain_model/common.h" @@ -10,6 +12,8 @@ #include "lib/md/IntPrice.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" +#include "lib/md/PriceSize.h" +#include "lib/md/Shm/MDStructure.h" #include "lib/orderman/CancelOrderMsg.h" #include "lib/orderman/CancelReplaceOrderMsg.h" #include "lib/orderman/CreateOrderMsg.h" @@ -37,10 +41,12 @@ #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include +#include #include #include #include #include +#include #include #include #include @@ -83,9 +89,22 @@ void from_book( copy_side(book.bid(), bids); copy_side(book.ask(), asks); } -void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er); -SecurityKey get_sec_key(const OrderMsg &msg); +bts::md::IntPrice convert_price(Price p) { + return bts::md::IntPrice_from_double<7>(p.value()); +} +bts::md::SecurityIndexData *find_handle( + bts::md::GeneralSecurityIndex &idx_map, SecurityKey sec_key) { + return idx_map.get_security(sec_key.value()); +} +void log_ord_msg(std::string /*log_prefix*/, const OrderMsg & /*ord_msg*/) { + // auto sleep_period = std::chrono::milliseconds(500); + // std::this_thread::sleep_for(sleep_period); + // LOG(OrderMan, Info, "{} {}", log_prefix, ord_msg); + //std::this_thread::sleep_for(sleep_period); +} +void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er); +enum class ActionResult { NewOrder, OrderModification, NoOp }; // Every order send to sim is represented here. struct SEGOrderState { CreateOrderMsg crt_msg; @@ -106,13 +125,16 @@ struct SEGOrderState { bts::Price last_filled_price = bts::Price(os::nan()); //bool active = true; bts::Quantity working_qty() const { return qty() - filled_qty; } - std::vector> trades; bts::api::orderman::NativeOrderStatus status = bts::api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_NEW; - void add_fill(Price lf_pr, Quantity lf_qty) { - trades.push_back({lf_pr, lf_qty}); - } + bts::core::TimeStamp last_touched = + bts::core::TimeStamp::from_nanos(bts::core::TimeStamp::now_ns()); + void apply_fill(Price lf_pr, Quantity lf_qty) { + if (!active()) { + LOG(OrderMan, Error, + "SEGOrderState::apply_fill called on an inactive order"); + } last_filled_price = lf_pr; last_filled_qty = lf_qty; avg_filled_price = Price( @@ -124,42 +146,44 @@ struct SEGOrderState { status = api::orderman::NATIVE_ORDER_STATUS_PARTIALLY_FILLED; if (filled_qty >= qty()) { status = api::orderman::NATIVE_ORDER_STATUS_FILLED; - //active = false; } } - void apply_change(const CancelReplaceOrderMsg &cxl_repl_msg) { - if (status == api::orderman::NATIVE_ORDER_STATUS_CANCELED) + ActionResult apply_change(const CancelReplaceOrderMsg &cxl_repl_msg) { + last_touched = + bts::core::TimeStamp::from_nanos(bts::core::TimeStamp::now_ns()); + if (!active()) // already cancelled, further changes will be rejected - return; + return ActionResult::NoOp; crt_msg = cxl_repl_msg.create_fields; // if qty is reduced, it can result in a cancel if (working_qty() <= Quantity::create_new(0.0)) { status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; } + return ActionResult::OrderModification; } - void apply_cxl(const CancelOrderMsg &) { + ActionResult apply_cxl(const CancelOrderMsg &) { + if (!active()) + return ActionResult::NoOp; status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; + return ActionResult::OrderModification; } void clear_after_transaction() { last_filled_qty = 0; last_filled_price = Price(os::nan()); - trades.clear(); } bool active() const { - bool final_state = - status == api::orderman::NATIVE_ORDER_STATUS_CANCELED || - status == - api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_FILLED; - return !final_state; + auto int_status = bts::orderman::get_external_status(status); + bool terminal = bts::orderman::in_terminal_state(int_status); + return !terminal; } }; // namespace bts::orderman struct SEGSecurityData { - bts::SecurityKey key; - bts::orderman::Book real_book; - std::map previous_snapshot; - std::vector orders; - std::queue pending_actions; + bts::SecurityKey key = SecurityKey{0}; + bts::orderman::Book real_book = {}; + bts::orderman::Book matched_book = {}; + std::vector orders = {}; + std::queue pending_actions = {}; SEGOrderState *find_order(OrderKey key) { for (auto &seg_os : orders) { if (seg_os.ord_key() == key) { @@ -170,48 +194,59 @@ struct SEGSecurityData { } void enqueue_action(const OrderMsg &ord_msg) { pending_actions.push(ord_msg); + log_ord_msg("SEGSecurityData::enqueue_action", ord_msg); } - void take_snapshot() { - previous_snapshot.clear(); - for (const auto &seg_os : orders) { - previous_snapshot.insert({seg_os.ord_key(), seg_os}); - } - } - void apply_order_action(const OrderMsg &msg) { + std::tuple apply_order_action( + const OrderMsg &msg) { // create results in a new order entry, otherwise apply_change or // apply_cxl are called on an existing entry if (std::holds_alternative(msg)) { const CreateOrderMsg &cr_msg = std::get(msg); - orders.emplace_back(cr_msg); + auto &it = orders.emplace_back(cr_msg); + return {ActionResult::NewOrder, &it}; } else if (std::holds_alternative(msg)) { const CancelReplaceOrderMsg &cxlr_msg = std::get(msg); SEGOrderState *seg_os = find_order(cxlr_msg.create_fields.key); bts_assert(seg_os != nullptr); - seg_os->apply_change(cxlr_msg); + auto action_result = seg_os->apply_change(cxlr_msg); + return {action_result, seg_os}; } else if (std::holds_alternative(msg)) { const CancelOrderMsg &cxl_msg = std::get(msg); SEGOrderState *seg_os = find_order(cxl_msg.key); bts_assert(seg_os != nullptr); - seg_os->apply_cxl(cxl_msg); + auto action_result = seg_os->apply_cxl(cxl_msg); + return {action_result, seg_os}; } + return {ActionResult::NoOp, nullptr}; } void clear_after_transaction() { - previous_snapshot.clear(); bts_assert(pending_actions.empty()); for (auto &seg_os : orders) { seg_os.clear_after_transaction(); } } + void remove_inactive_orders() { + orders.erase( + std::remove_if( + orders.begin(), orders.end(), + [](const auto &ord) { return !ord.active(); }), + orders.end()); + } }; struct SimExecutionGateway::PImpl { - PImpl(md::SecurityOracle o, bts::md::MDClient &md_client) - : admin_data(), sec_oracle(o), md_client(md_client) { - LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor"); + PImpl( + bts::api::Venue venue, + md::SecurityOracle o, + bts::md::MDClient &md_client) + : venue(venue), admin_data(), sec_oracle(o), md_client(md_client) { + LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor venue: {}", + bts::api::Venue_Name(venue)); } // interface functions + bts::api::Venue venue; OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; @@ -225,12 +260,12 @@ struct SimExecutionGateway::PImpl { // send_msgs is sent on the order_man thread, its dequeued in the market data // thread, and execution reports are queued to buffered_exec_reps tbb::concurrent_queue buffered_order_ops; - tbb::concurrent_queue buffered_exec_reps; + tbb::concurrent_queue buffered_exec_reps; std::unordered_map books = {}; tbb::concurrent_hash_map sec_map = {}; boost::object_pool exe_report_pool; size_t msg_seq_num = 0; - std::set cached_action_secs; + std::set touched_secs; api::Security const *find_sec(uint32_t key) const { tbb::concurrent_hash_map::const_accessor accessor; @@ -242,19 +277,22 @@ struct SimExecutionGateway::PImpl { }; SimExecutionGateway::SimExecutionGateway( - md::SecurityOracle o, bts::md::MDClient &md_client) - : IExecutionGateway(), me(new PImpl(o, md_client)) { + bts::api::Venue venue, md::SecurityOracle o, bts::md::MDClient &md_client) + : IExecutionGateway(), me(new PImpl(venue, o, md_client)) { LOG(OrderMan, Info, - "SimExecutionGateway::SimExecutionGateway constructor tid: {} tname: " + "SimExecutionGateway::SimExecutionGateway constructor venue: {} tid: {} " + "tname: " "{}", - bts::os::get_thread_id(), bts::os::get_thread_name()); + bts::api::Venue_Name(venue), bts::os::get_thread_id(), + bts::os::get_thread_name()); } SimExecutionGateway::~SimExecutionGateway() {} void SimExecutionGateway::start() { - LOG(OrderMan, Info, "SimExecutionGateway::start tid: {} tname: {}", - bts::os::get_thread_id(), bts::os::get_thread_name()); + LOG(OrderMan, Info, "SimExecutionGateway::start venue: {} tid: {} tname: {}", + bts::api::Venue_Name(me->venue), bts::os::get_thread_id(), + bts::os::get_thread_name()); } // this is a periodic timer, to process the messages we got from the @@ -264,20 +302,26 @@ void SimExecutionGateway::dispatch_incoming_fix_messages() { if (me->buffered_exec_reps.empty()) { return; } - ExecutionReport er; + ExecutionReport *er; while (me->buffered_exec_reps.try_pop(er)) { trace::CorID cid = {}; LOG(OrderMan, Info, "ESimExecutionGateway::dispatch_incoming_fix_messages er: {} ", - er.to_string()); - me->on_exe_report(er, cid); + er->to_string()); + me->on_exe_report(*er, cid); } } void SimExecutionGateway::on_securities( const mercury::Update &u) { - LOG(OrderMan, Info, "SimExecutionGateway::on_securities tid: {} tname: {}", - bts::os::get_thread_id(), bts::os::get_thread_name()); + LOG(OrderMan, Info, + "SimExecutionGateway::on_securities venue: {} n_secs: {} tid: {} tname: " + "{}", + bts::api::Venue_Name(me->venue), + u.events == nullptr ? 0 : u.events->size(), bts::os::get_thread_id(), + bts::os::get_thread_name()); + if (u.events == nullptr) + return; for (const auto &s : *u.events) { me->sec_map.insert(std::make_pair(s.security->id(), s.security)); } @@ -285,8 +329,10 @@ void SimExecutionGateway::on_securities( void SimExecutionGateway::on_admin_data( const mercury::Update &update) { - LOG(OrderMan, Info, "SimExecutionGateway::on_admin_data tid: {} tname: {}", - bts::os::get_thread_id(), bts::os::get_thread_name()); + LOG(OrderMan, Info, + "SimExecutionGateway::on_admin_data venue: {} tid: {} tname: {}", + bts::api::Venue_Name(me->venue), bts::os::get_thread_id(), + bts::os::get_thread_name()); if (update.events) { for (auto const &ev : *(update.events)) me->admin_data.CopyFrom(*ev.admin_data); @@ -307,7 +353,7 @@ void SimExecutionGateway::send_msgs( "SimExecutionGateway::send_msgs tid: {} tname: {} count: {}", bts::os::get_thread_id(), bts::os::get_thread_name(), msg_vec.size()); for (auto &m : msg_vec) { - LOG(OrderMan, Diag, + LOG(OrderMan, Info, "SimExecutionGateway::send_msgs tid: {} tname: {} m: {}", bts::os::get_thread_id(), bts::os::get_thread_name(), m); me->buffered_order_ops.push(m); @@ -330,6 +376,8 @@ OnExchangeOpenOrdersState &SimExecutionGateway::on_exchange_open_orders() { void SimExecutionGateway::set_producers( md::GeneralSecurityIndex *producer_map) { + LOG(OrderMan, Info, "SimExecutionGateway::set_producers exchange: {}", + bts::api::Venue_Name(me->venue)); me->producer_map = producer_map; } @@ -340,91 +388,91 @@ bool SimExecutionGateway::get_matched_book( std::array &bids, std::array &asks) { bts::SecurityKey key = k; - SEGSecurityData &seg_book = me->books[key]; - to_book(bids, asks, seg_book.real_book); - if (seg_book.orders.empty() && me->buffered_order_ops.empty()) + SEGSecurityData &seg_sec = *_find_add_security_entry(key, true, true); + // this is where the book is updated + to_book(bids, asks, seg_sec.real_book); + if (seg_sec.orders.empty() && me->buffered_order_ops.empty()) return false; // integrate the orders - me->cached_action_secs.insert(key); - bts::orderman::Book book = seg_book.real_book; - for (SEGOrderState &seg_os : seg_book.orders) { - book = _process_book_change(book, seg_os); - } + core::TimeStamp t1 = core::TimeStamp::now(); + LOG(OrderMan, Info, + "SimExecutionGateway::get_matched_book this will result in a book " + "calculation for key: {}", + key.value()); + me->touched_secs.insert(key); // handle buffered operations OrderMsg ord_msg; + // all ord_msgs are popped and enqueued in the security's SEGSecurityData while (me->buffered_order_ops.try_pop(ord_msg)) { - auto sec_data = _find_security(get_sec_key(ord_msg)); - if (sec_data != nullptr) { - sec_data->enqueue_action(ord_msg); - me->cached_action_secs.insert(sec_data->key); + log_ord_msg("Right after popping from buffered_order_ops", ord_msg); + std::optional op_sec_key = _extract_sec_key(ord_msg); + if (!op_sec_key.has_value()) { + LOG(OrderMan, Error, + "SimExecutionGateway::get_matched_book could not extract security " + "from op: {}", + ord_msg); + continue; } - // if (std::holds_alternative(ord_msg)) { - // const CreateOrderMsg &cr_msg = std::get(ord_msg); - // _process_new_order(book, cr_msg); - // } else if (std::holds_alternative(ord_msg)) { - // const CancelOrderMsg &cxl_msg = std::get(ord_msg); - // _process_cxl_order(book, cxl_msg); - // } else if (std::holds_alternative(ord_msg)) { - // const CancelReplaceOrderMsg &cxl_repl_msg = - // std::get(ord_msg); - // _process_modify_order(book, cxl_repl_msg); - // } + // we could have used get_matched_book as the only source + // of adding SEGSecurityData, but the line below adds it too + // so both user operations and get_matched_book trigger + // SEGSecurityData additions + SEGSecurityData &op_seg_sec = + *_find_add_security_entry(*op_sec_key, true, true); + op_seg_sec.enqueue_action(ord_msg); + me->touched_secs.insert(op_seg_sec.key); } _process_transaction(); - from_book(book, bids, asks); + from_book(seg_sec.matched_book, bids, asks); + // cleanup + for (SecurityKey key : me->touched_secs) { + SEGSecurityData &t_seg_sec = *_find_add_security_entry(key, false, true); + t_seg_sec.clear_after_transaction(); + t_seg_sec.remove_inactive_orders(); + } + me->touched_secs.clear(); + core::TimeStamp t2 = core::TimeStamp::now(); + auto time_diff = t2.nanos() - t1.nanos(); + LOG(OrderMan, Info, "SimExecutionGateway::get_matched_book time: {} key: {}", + time_diff, key); return true; } void SimExecutionGateway::_process_transaction() { - // goes through all the actions and applies it to the orders - for (SecurityKey key : me->cached_action_secs) { - SEGSecurityData *sec_data_ptr = _find_security(key); - bts_assert(sec_data_ptr != nullptr); - SEGSecurityData &sec_data = *sec_data_ptr; - sec_data.take_snapshot(); - auto &pending_actions = sec_data.pending_actions; - while (!pending_actions.empty()) { + // goes through all the actions and applies it to the orders (actions + // take priority) + for (SecurityKey key : me->touched_secs) { + SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); + while (!sec_data.pending_actions.empty()) { OrderMsg ord_msg = sec_data.pending_actions.front(); - pending_actions.pop(); - sec_data.apply_order_action(ord_msg); + sec_data.pending_actions.pop(); + log_ord_msg( + "Right after dequeueing from SEGSecurityData's pending_actions", + ord_msg); + auto [action_res, seg_os] = sec_data.apply_order_action(ord_msg); + log_ord_msg( + "Right after sec_data.apply_order_action", seg_os->crt_msg); + // any cxl and mods that affected the order, result in an er, + // which is fired here + if (action_res != ActionResult::NoOp) { + _push_execution_report(*seg_os); + } } } // now apply all the orders to the book - for (SecurityKey key : me->cached_action_secs) { - SEGSecurityData &sec_data = *_find_security(key); + for (SecurityKey key : me->touched_secs) { + SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); Book sec_bk = sec_data.real_book; + // TODO: apply working orders first (or sort it by time) for (SEGOrderState &seg_os : sec_data.orders) { - _match_order(sec_bk, seg_os); + // if it was cancelled by the actions above, + if (seg_os.active()) { + // trades and execution reports are written along side + sec_bk = _match_order(sec_bk, seg_os); + } } - } - // now fire execution reports (and write trades) - for (SecurityKey key : me->cached_action_secs) { - SEGSecurityData &sec_data = *_find_security(key); - for (const SEGOrderState &seg_os : sec_data.orders) { - const auto it = sec_data.previous_snapshot.find(seg_os.ord_key()); - SEGOrderState const *prev = - it == sec_data.previous_snapshot.end() ? nullptr : &it->second; - _compute_and_fire_execution_report(prev, &seg_os); - } - } - for (SecurityKey key : me->cached_action_secs) { - SEGSecurityData *sec_data_ptr = _find_security(key); - sec_data_ptr->clear_after_transaction(); - } -} -// f(book, existing_order) -> new_book. Also the side affects -// could be execution reports and trades -bts::orderman::Book SimExecutionGateway::_process_book_change( - const bts::orderman::Book &book, SEGOrderState &seg_os) { - auto sec_ptr = me->find_sec(seg_os.sec_key().value()); - bts_assert(sec_ptr != nullptr); - double tick_sz = sec_ptr->contract_spec().low_tick(); - auto crosses_opp_side = SpreaderUtils::crosses_book( - book, seg_os.side(), bts::Price(seg_os.price()), tick_sz); - if (crosses_opp_side) { - return _cross_order(book, seg_os); - } else { - return _work_order(book, seg_os); + sec_data.matched_book = sec_bk; + _write_book(key); } } @@ -433,9 +481,7 @@ bts::orderman::Book SimExecutionGateway::_match_order( const bts::orderman::Book &book, SEGOrderState &seg_os) { if (!seg_os.active()) return book; - auto sec_ptr = me->find_sec(seg_os.sec_key().value()); - bts_assert(sec_ptr != nullptr); - double tick_sz = sec_ptr->contract_spec().low_tick(); + double tick_sz = securities::market_epsilon(); auto crosses_opp_side = SpreaderUtils::crosses_book( book, seg_os.side(), bts::Price(seg_os.price()), tick_sz); if (crosses_opp_side) { @@ -445,65 +491,6 @@ bts::orderman::Book SimExecutionGateway::_match_order( } } -// bts::orderman::Book SimExecutionGateway::_process_new_order( -// const bts::orderman::Book &book, const CreateOrderMsg &crt_ord_msg) { -// // we can treat this case of an existing order with a book change -// SEGSecurityData &seg_sec_state = -// me->books[bts::SecurityKey(crt_ord_msg.security->id())]; -// // this is where a new order is added to a security's state -// SEGOrderState &seg_ord_state = -// seg_sec_state.orders.emplace_back(crt_ord_msg); -// _push_execution_report(seg_ord_state); -// auto rv = _process_book_change(book, seg_ord_state); -// return rv; -// } -// bts::orderman::Book SimExecutionGateway::_process_cxl_order( -// const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord) { -// SEGOrderState *ord_ptr = -// _find_order(cxl_ord.key, bts::SecurityKey(cxl_ord.security->id())); -// if (ord_ptr == nullptr || !ord_ptr->active) { -// LOG(OrderMan, Warn, -// "Order ok: {} can not be cancelled because it is no longer a " -// "working " -// "order", -// cxl_ord.key); -// return book; -// } -// ord_ptr->last_filled_qty = 0; -// ord_ptr->status = -// bts::api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_CANCELED; -// ord_ptr->active = false; -// _push_execution_report(*ord_ptr); -// BookSide bside = SpreaderUtils::cxl_working_order( -// book.side(ord_ptr->side()), {ord_ptr->price(), ord_ptr->working_qty()}); -// // 2. generate a cxl execution report -// Book rv = book; -// rv.side(ord_ptr->side()) = bside; -// return rv; -// } -// bts::orderman::Book SimExecutionGateway::_process_modify_order( -// const bts::orderman::Book &book, -// const CancelReplaceOrderMsg &cxl_repl_ord) { -// const auto &crt_msg = cxl_repl_ord.create_fields; -// if (!_is_working_order( -// crt_msg.key, bts::SecurityKey(crt_msg.security->id()))) { -// LOG(OrderMan, Warn, -// "Order ok: {} can not be modified because it is no longer a " -// "working " -// "order", -// crt_msg.key); -// return book; -// } -// // TODO: -// // this is the hard one -// // if qty changed, since this is a resting order just update the book -// // if price change, check if it crosses the market -// // if not, make it a resting order -// // ... etc -// // can we deal with it as cxl, new order ? -// return book; -// } - // Given an order that is crossing (we know that from the callee), this // function does 3 things // 1. Generates a new book @@ -513,14 +500,17 @@ bts::orderman::Book SimExecutionGateway::_match_order( bts::orderman::Book SimExecutionGateway::_cross_order( const bts::orderman::Book &book, SEGOrderState &seg_os) { std::vector> fills = {}; - SpreaderUtils::apply_crossing_order( + auto rv = SpreaderUtils::apply_crossing_order( book, seg_os.side(), {seg_os.price(), seg_os.working_qty()}, fills); + // TODO: if one (or more) of our orders was a passive order in this fill + // it needs to be accounted for // this is where we need to do 2-4 for (const auto &[f_pr, f_qty] : fills) { - seg_os.add_fill(f_pr, f_qty); - // 3, 4 are done later + seg_os.apply_fill(f_pr, f_qty); + _push_execution_report(seg_os); + _write_trade(seg_os, f_pr, f_qty); } - return book; + return rv; } // Given an order that becomes a resting order (we know that from the callee), @@ -537,19 +527,6 @@ bts::orderman::Book SimExecutionGateway::_work_order( return rv; } -bool SimExecutionGateway::_is_working_order( - OrderKey order_key, SecurityKey security_key) const { - auto it = me->books.find(security_key); - if (it == me->books.end()) - return false; - for (const auto &o : it->second.orders) { - if (o.active() && o.ord_key() == order_key) { - return true; - } - } - return false; -} - SEGOrderState *SimExecutionGateway::_find_order( OrderKey order_key, SecurityKey security_key) { auto it = me->books.find(security_key); @@ -563,29 +540,115 @@ SEGOrderState *SimExecutionGateway::_find_order( return nullptr; } -SEGSecurityData *SimExecutionGateway::_find_security(SecurityKey sec_key) { - auto it = me->books.find(sec_key); - return it == me->books.end() ? nullptr : &it->second; +SEGSecurityData *SimExecutionGateway::_find_add_security_entry( + SecurityKey security_key, bool add_if_absent, bool assert_for_presence) { + auto find_add = [&]() -> SEGSecurityData * { + auto it = me->books.find(security_key); + if (it == me->books.end()) { + if (!add_if_absent) { + return nullptr; + } + LOG(OrderMan, Info, + "SimExecutionGateway::_find_add_security_entry adding entry for " + "sec: " + "{}", + security_key); + me->books.insert({security_key, {security_key}}); + it = me->books.find(security_key); + } + return &it->second; + }; + SEGSecurityData *rv = find_add(); + if (assert_for_presence) + bts_assert(rv != nullptr); + return rv; } void SimExecutionGateway::_push_execution_report(const SEGOrderState &seg_os) { ExecutionReport *er_p = me->exe_report_pool.construct(); ExecutionReport &er = *er_p; fill_execution_report(seg_os, er); - me->buffered_exec_reps.push(er); + me->buffered_exec_reps.push(er_p); } -// it looks at the now vs prev and computes all the execution reports -void SimExecutionGateway::_compute_and_fire_execution_report( - SEGOrderState const *prev, SEGOrderState const *now) { - bts_assert(now != nullptr); - if (prev == nullptr) { - _push_execution_report(*now); +void SimExecutionGateway::_write_book(SecurityKey key) { + SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); + const Book &book = sec_data.matched_book; + if (me->producer_map->has_security(key.value())) { + auto idx_data = me->producer_map->get_security(key.value()); + bts_assert(idx_data != nullptr); + std::array bids, asks; + from_book(book, bids, asks); + idx_data->handle.update_direct(utils::TimeStamp::now(), bids, asks); + } else { + LOG(OrderMan, Error, + "SimExecutionGateway::_write_book could not find handle for key: {}", + key); } } +void SimExecutionGateway::_write_trade( + const SEGOrderState &seg_ord, Price price, Quantity qty) { + auto key = seg_ord.sec_key().value(); + if (me->producer_map->has_security(key)) { + auto idx_data = me->producer_map->get_security(key); + bts_assert(idx_data != nullptr); + auto now = utils::TimeStamp::now(); + auto trade_ts = + datetime::ll_from_unix_epoch_ms(core::TimeStamp::now().millis()); + idx_data->handle.add_trade( + now, md::PriceSize(convert_price(price), qty.value()), trade_ts, + // TODO + co2::AggressorSide::AGGRESSOR_SIDE_BUY, 0, false); + } else { + LOG(OrderMan, Error, + "SimExecutionGateway::_write_trade could not find handle for key: {}", + key); + } +} + +std::tuple +SimExecutionGateway::_find_order(OrderKey key) const { + for (const auto &kv : me->books) { + for (const auto &ord : kv.second.orders) { + if (ord.ord_key() == key) { + return {&kv.second, &ord}; + } + } + } + return std::tuple( + nullptr, nullptr); +} + +std::optional SimExecutionGateway::_extract_sec_key( + const OrderMsg &msg) { + if (std::holds_alternative(msg)) { + const CreateOrderMsg &cr_msg = std::get(msg); + return SecurityKey(cr_msg.security->id()); + } else if (std::holds_alternative(msg)) { + const CancelReplaceOrderMsg &cxlr_msg = + std::get(msg); + return SecurityKey(cxlr_msg.create_fields.security->id()); + } else if (std::holds_alternative(msg)) { + const CancelOrderMsg &cxl_msg = std::get(msg); + if (cxl_msg.security != nullptr) { + return SecurityKey(cxl_msg.security->id()); + } + auto [sec, ord] = _find_order(cxl_msg.key); + if (sec == nullptr || ord == nullptr) { + return std::nullopt; + } + return sec->key; + } else if (std::holds_alternative(msg)) { + const RFQMsg &rfq_msg = std::get(msg); + return SecurityKey(rfq_msg.rfq.security().security_id()); + } + return SecurityKey(0); +} + void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { const auto &cr_msg = seg_os.crt_msg; + log_ord_msg("fill_execution_report", cr_msg); to_array(cr_msg.routing_record->account(), &er.account_name.value()); to_array(cr_msg.routing_record->operator_id(), &er.operator_id.value()); er.order_key = cr_msg.key; @@ -623,22 +686,4 @@ void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { "EMExecutionGateway::_process_cb_and_fire_er firing er: {}", er.to_string()); } - -SecurityKey get_sec_key(const OrderMsg &msg) { - if (std::holds_alternative(msg)) { - const CreateOrderMsg &cr_msg = std::get(msg); - return SecurityKey(cr_msg.security->id()); - } else if (std::holds_alternative(msg)) { - const CancelReplaceOrderMsg &cxlr_msg = - std::get(msg); - return SecurityKey(cxlr_msg.create_fields.security->id()); - } else if (std::holds_alternative(msg)) { - const CancelOrderMsg &cxl_msg = std::get(msg); - return SecurityKey(cxl_msg.security->id()); - } else if (std::holds_alternative(msg)) { - const RFQMsg &rfq_msg = std::get(msg); - return SecurityKey(rfq_msg.rfq.security().security_id()); - } - return SecurityKey(0); -} } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 5dbe4ac3f..041aba8ff 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -2,6 +2,7 @@ #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" +#include "lib/domain_model/common.h" #include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDClient.h" #include "lib/md/MDProducer.h" @@ -13,6 +14,7 @@ #include "lib/orderman/OrderMsg.h" #include "lib/orderman/gateways/IExecutionGateway.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include namespace bts::md { class MDClient; @@ -33,9 +35,10 @@ struct SEGSecurityData; class SimExecutionGateway : public IExecutionGateway { public: - SimExecutionGateway(md::SecurityOracle, bts::md::MDClient &md_client); + SimExecutionGateway( + bts::api::Venue venue, md::SecurityOracle, bts::md::MDClient &md_client); virtual ~SimExecutionGateway(); - + // IExecutionGateway void start() override; void dispatch_incoming_fix_messages() override; void on_securities(const mercury::Update &) override; @@ -49,6 +52,7 @@ class SimExecutionGateway : public IExecutionGateway { OnExchangePositionState &on_exchange_position_state() override; OnExchangeOpenOrdersState &on_exchange_open_orders() override; + // SimExecutionGateway void set_producers(md::GeneralSecurityIndex *producer_map); void do_work(); bool get_matched_book( @@ -57,29 +61,22 @@ class SimExecutionGateway : public IExecutionGateway { std::array &asks); private: - bts::orderman::Book _process_book_change( - const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _match_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); - // bts::orderman::Book _process_new_order( - // const bts::orderman::Book &book, const CreateOrderMsg &cr_ord); - // bts::orderman::Book _process_cxl_order( - // const bts::orderman::Book &book, const CancelOrderMsg &cxl_ord); - // bts::orderman::Book _process_modify_order( - // const bts::orderman::Book &book, - // const CancelReplaceOrderMsg &cxl_repl_ord); - bts::orderman::Book _cross_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _work_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); - bool _is_working_order(OrderKey order_key, SecurityKey security_key) const; SEGOrderState *_find_order(OrderKey order_key, SecurityKey security_key); - SEGSecurityData *_find_security(SecurityKey security_key); + SEGSecurityData *_find_add_security_entry( + SecurityKey security_key, bool add_if_absent, bool assert_for_presence); void _push_execution_report(const SEGOrderState &seg_os); void _process_transaction(); - void _compute_and_fire_execution_report( - SEGOrderState const *prev, SEGOrderState const *now); + void _write_book(SecurityKey); + void _write_trade(const SEGOrderState &seg_ord, Price price, Quantity qty); + std::tuple _find_order( + OrderKey key) const; + std::optional _extract_sec_key(const OrderMsg &msg); private: struct PImpl; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index 52dfb2018..f13c33902 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -6,6 +6,7 @@ #include "lib/md/common.h" #include "lib/utils/LockBox.h" #include "lib/utils/bts_assert.h" +#include #include #include @@ -24,6 +25,8 @@ SimExecutionGatewayFactory::SimExecutionGatewayFactory( std::shared_ptr SimExecutionGatewayFactory::get_getayeway( api::Venue venue) { + LOG(OrderMan, Info, "SimExecutionGatewayFactory::get_getayeway venue: {}", + bts::api::Venue_Name(venue)); // This needs to look at config, to check if an exchange is set to sim or // not. If it is not to set to sim, it should return a nullptr std::shared_ptr rv = nullptr; @@ -34,7 +37,7 @@ std::shared_ptr SimExecutionGatewayFactory::get_getayeway( if (it == data.end()) { data.insert( {venue, std::make_shared( - md_client.oracle(), md_client)}); + venue, md_client.oracle(), md_client)}); it = data.find(venue); } rv = it->second; @@ -57,6 +60,10 @@ void SimExecutionGatewayFactory::init_once(bts::md::MDClient &md_client) { }); } SimExecutionGatewayFactory *SimExecutionGatewayFactory::get() { + auto sleep_period = std::chrono::milliseconds(100); + while (instance == nullptr) { + std::this_thread::sleep_for(sleep_period); + } bts_assert(instance != nullptr); return instance; } diff --git a/src/lib/orderman/orders/EMNativeOrder.cpp b/src/lib/orderman/orders/EMNativeOrder.cpp index 12e7cbe16..9413b58f0 100644 --- a/src/lib/orderman/orders/EMNativeOrder.cpp +++ b/src/lib/orderman/orders/EMNativeOrder.cpp @@ -505,7 +505,7 @@ OrderOpResult EMNativeOrder::_on_activate( me->session_services = &me->services->get_session_services( get_native_state(me->state).routing_record().session()); // TODO: just to get going - me->session_services = &me->services->get_session_services("sim"); + me->session_services = &me->services->get_session_services("deribit_1"); // Checks for the following: // 1. Gateway connection diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index 1ebe6d616..1f7d8b60a 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -201,10 +201,16 @@ void SpreaderUtils::transform_spread_price_mults(api::Security &sec) { SpreaderUtils::PriceSearchResult SpreaderUtils::find_working_order_level( const BookSide &in_book, api::Side ord_side, bts::Price ord_price) { for (size_t i = 0; i < in_book.size(); i++) { - Price l_price = Price{in_book.at(i).price()}; - if (securities::is_same(ord_price, l_price)) { + const md::PriceSize &ps_lev = in_book.at(i); + Price l_price = Price{ps_lev.price()}; + Quantity l_qty = Quantity::create_new(ps_lev.size()); + if (l_qty.is_zero()) { // empty level + return {PriceSearchResult::PriceSearchLocation::NEW_LEVEL, i}; + } + if (securities::is_same(ord_price, l_price)) { // add to this level return {PriceSearchResult::PriceSearchLocation::EXACT_MATCH, i}; - } else if (securities::is_better(ord_side, ord_price, l_price)) { + } + if (securities::is_better(ord_side, ord_price, l_price)) { // insert return {PriceSearchResult::PriceSearchLocation::NEW_LEVEL, i}; } } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 51dcd7c94..dee518524 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -299,13 +299,13 @@ class SpreaderUtils { // false. static bool crosses_book( const Book &book, api::Side side, Price price, double tick_size) { - const auto &book_side = book.side(side); - return (side == api::SIDE_BUY && book_side[0].size() > 0 && + const auto &opp_side = book.side(securities::other_side(side)); + return (side == api::SIDE_BUY && opp_side[0].size() > 0 && securities::gr_than_eq( - book_side[0].price(), price.value(), tick_size)) || - (side == api::SIDE_SELL && book_side[0].size() > 0 && + price.value(), opp_side[0].price(), tick_size)) || + (side == api::SIDE_SELL && opp_side[0].size() > 0 && securities::gr_than_eq( - price.value(), book_side[0].price(), tick_size)); + opp_side[0].price(), price.value(), tick_size)); } // find the top of the synthetic book static Price top_of_book_price(const ISpreaderManager &, api::Side) { diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index d9a300695..1e9a2b4b4 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -193,6 +193,49 @@ TEST_CASE("quoter price quantity state", "[spreader]") { // } } } +TEST_CASE("general_utilities", "[spreader]") { + SECTION("crosses_book") { + Book bk; + bk.bid() = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2499, 3), + SpreaderUtils::create_price_level(2498, 12.5), + SpreaderUtils::create_price_level(2495, 13.8), + SpreaderUtils::create_price_level(2492, 15.2)}; + bk.ask() = { + SpreaderUtils::create_price_level(2500.5, 10), + SpreaderUtils::create_price_level(2501.5, 3), + SpreaderUtils::create_price_level(2502, 12.5), + SpreaderUtils::create_price_level(2503.75, 13.8), + SpreaderUtils::create_price_level(2504, 15.2)}; + // buy orders + auto res = SpreaderUtils::crosses_book( + bk, api::SIDE_BUY, Price(2501), securities::market_epsilon()); + REQUIRE(res == true); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_BUY, Price(2500.5), securities::market_epsilon()); + REQUIRE(res == true); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_BUY, Price(2500.25), securities::market_epsilon()); + REQUIRE(res == false); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_BUY, Price(2499), securities::market_epsilon()); + REQUIRE(res == false); + // sell orders + res = SpreaderUtils::crosses_book( + bk, api::SIDE_SELL, Price(2499), securities::market_epsilon()); + REQUIRE(res == true); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_SELL, Price(2500), securities::market_epsilon()); + REQUIRE(res == true); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_SELL, Price(2500.25), securities::market_epsilon()); + REQUIRE(res == false); + res = SpreaderUtils::crosses_book( + bk, api::SIDE_SELL, Price(2500.5), securities::market_epsilon()); + REQUIRE(res == false); + } +} // tests spread_qty -> leg_qty and leg_2_qty -> leg_1_qty TEST_CASE("test_leg_quantity_normalization", "[spreader]") { int n_runs = 20; @@ -5500,6 +5543,32 @@ TEST_CASE("working_orders", "[spreader_matching]") { match_bks(bside_out, bside_ex); } } + SECTION("apply_multiple_working_orders") { + BookSide bside = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(os::nan(), 0), + SpreaderUtils::create_price_level(os::nan(), 0), + SpreaderUtils::create_price_level(os::nan(), 0), + SpreaderUtils::create_price_level(os::nan(), 0)}; + // outside the range + BookSide bside_out = bside; + // add 10 orders + for (size_t i = 0; i < 10; i++) { + bside_out = SpreaderUtils::apply_working_order( + bside_out, api::SIDE_BUY, {Price(2495), 10}); + } + for (size_t i = 0; i < 100; i++) { + bside_out = SpreaderUtils::apply_working_order( + bside_out, api::SIDE_BUY, {Price(2497), 2}); + } + BookSide bside_ex = { + SpreaderUtils::create_price_level(2500, 10), + SpreaderUtils::create_price_level(2497, 200), + SpreaderUtils::create_price_level(2495, 100), + SpreaderUtils::create_price_level(os::nan(), 0), + SpreaderUtils::create_price_level(os::nan(), 0)}; + match_bks(bside_out, bside_ex); + } } void match_trades( diff --git a/src/server/sparkd/cmds/md/cmds/Run.cpp b/src/server/sparkd/cmds/md/cmds/Run.cpp index f1cc5bff2..de7f0c3d2 100644 --- a/src/server/sparkd/cmds/md/cmds/Run.cpp +++ b/src/server/sparkd/cmds/md/cmds/Run.cpp @@ -4,7 +4,6 @@ #include "lib/logging/logging.h" #include "lib/md/MarketDataGateway.h" #include "lib/md/UserSymbol.h" -#include "lib/md/ccApi/CCMain.h" #include "lib/md/relay/RelayRecorder.h" #include "lib/os/os.h" #include "lib/utils/bts_assert.h" @@ -161,11 +160,11 @@ void Run::run( if (is_run_emumba) { threading::make_thread("Emumba", []() { run_emumba(); }).detach(); } - if (bts::config::get().use_sim()) { - threading::make_thread("ExchangeSimGLBX", [&mbo_writer]() { - sim::start_exchange_sim(api::Venue::VENUE_SIM, mbo_writer); - }).detach(); - } + // if (bts::config::get().use_sim()) { + // threading::make_thread("ExchangeSimGLBX", [&mbo_writer]() { + // sim::start_exchange_sim(api::Venue::VENUE_SIM, mbo_writer); + // }).detach(); + // } bool is_run_md_gwy = true; if (is_run_md_gwy) { threading::make_thread("MarketDataGateway", []() { From a7f24e84e494e460866a93ea896ad1ca10113ff1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 23 Feb 2023 14:21:07 -0500 Subject: [PATCH 17/23] Fills are now generated for SimExecutionGateway --- src/lib/orderman/gateways/sim/SimExecutionGateway.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 9682815b6..c88c1080a 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -120,7 +120,7 @@ struct SEGOrderState { api::Side side() const { return crt_msg.side; } // coming in bts::Quantity filled_qty = 0; - bts::Price avg_filled_price = bts::Price(os::nan()); + bts::Price avg_filled_price = bts::Price(0); bts::Quantity last_filled_qty = 0; bts::Price last_filled_price = bts::Price(os::nan()); //bool active = true; @@ -677,6 +677,10 @@ void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { bts::utils::Uuid guid; std::string fill_id = guid.to_text_string(); to_array(fill_id, &er.exchange_fill_id.value()); + er.exec_type = api::orderman::EXEC_TYPE_PARTIAL_FILL; + if (!seg_os.active()) { + er.exec_type = api::orderman::EXEC_TYPE_FILL; + } } er.max_show = Quantity(0); er.exchange = cr_msg.security->exchange(); From fdb7bbdac2f610f58d9cea9290ac43aa455e06a9 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 23 Feb 2023 15:51:36 -0500 Subject: [PATCH 18/23] SimExecutionGateway can now deal with books with 0 qty levels --- src/lib/orderman/gateways/sim/SimExecutionGateway.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index c88c1080a..08444e3eb 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -68,8 +68,14 @@ void to_book( auto copy_side = [](const std::array &from, BookSide &bk_to) { - for (size_t i = 0; i < std::min(from.size(), bk_to.size()); i++) { - bk_to[i] = from[i]; + size_t to_idx = 0; + for (const auto &l : from) { + if (Quantity::create_new(l.size()).is_zero()) { + continue; + } + bk_to[to_idx++] = l; + if (to_idx >= bk_to.size()) + break; } }; copy_side(bids, book.bid()); From 09958eb333c230751fc3c04e77bfed64bc1e6e3a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 24 Feb 2023 11:06:26 -0500 Subject: [PATCH 19/23] SimExecutionGateway can not reflect the trades permenantly in the books --- .../gateways/sim/SimExecutionGateway.cpp | 65 ++++++++++++------- .../spreader_orders/spreader/SpreaderUtils.h | 13 +++- 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 08444e3eb..e142ac995 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -184,12 +184,21 @@ struct SEGOrderState { } }; // namespace bts::orderman +struct SEGTradeEntry { + api::Side side; + Price price; + Quantity qty; +}; + struct SEGSecurityData { bts::SecurityKey key = SecurityKey{0}; bts::orderman::Book real_book = {}; bts::orderman::Book matched_book = {}; std::vector orders = {}; std::queue pending_actions = {}; + // these are all the trades that our orders crossed against the real market. + // they are recorded here and then later subtracted from the real book + std::vector trades = {}; SEGOrderState *find_order(OrderKey key) { for (auto &seg_os : orders) { if (seg_os.ord_key() == key) { @@ -239,20 +248,19 @@ struct SEGSecurityData { [](const auto &ord) { return !ord.active(); }), orders.end()); } + void record_trade(const SEGTradeEntry &seg_te) { trades.push_back(seg_te); } }; struct SimExecutionGateway::PImpl { - PImpl( - bts::api::Venue venue, - md::SecurityOracle o, - bts::md::MDClient &md_client) - : venue(venue), admin_data(), sec_oracle(o), md_client(md_client) { + PImpl(bts::api::Venue venue, md::SecurityOracle o) + : venue(venue), admin_data(), sec_oracle(o) { LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor venue: {}", bts::api::Venue_Name(venue)); } // interface functions - bts::api::Venue venue; + const bts::api::Venue venue; + const bool perm_reduce_book_by_trades = true; OnExeReport on_exe_report; OnGwStatusChange on_gw_status_change; OnCancelReject on_cancel_reject; @@ -260,7 +268,6 @@ struct SimExecutionGateway::PImpl { orderman::OnExchangeOpenOrdersState on_exchange_open_orders; api::admin::AdminData admin_data; md::SecurityOracle sec_oracle; - bts::md::MDClient &md_client; bts::md::MDProducer *md_producer = nullptr; md::GeneralSecurityIndex *producer_map = nullptr; // send_msgs is sent on the order_man thread, its dequeued in the market data @@ -283,8 +290,8 @@ struct SimExecutionGateway::PImpl { }; SimExecutionGateway::SimExecutionGateway( - bts::api::Venue venue, md::SecurityOracle o, bts::md::MDClient &md_client) - : IExecutionGateway(), me(new PImpl(venue, o, md_client)) { + bts::api::Venue venue, md::SecurityOracle o, bts::md::MDClient &) + : IExecutionGateway(), me(new PImpl(venue, o)) { LOG(OrderMan, Info, "SimExecutionGateway::SimExecutionGateway constructor venue: {} tid: {} " "tname: " @@ -397,7 +404,8 @@ bool SimExecutionGateway::get_matched_book( SEGSecurityData &seg_sec = *_find_add_security_entry(key, true, true); // this is where the book is updated to_book(bids, asks, seg_sec.real_book); - if (seg_sec.orders.empty() && me->buffered_order_ops.empty()) + if (seg_sec.orders.empty() && seg_sec.trades.empty() && + me->buffered_order_ops.empty()) return false; // integrate the orders core::TimeStamp t1 = core::TimeStamp::now(); @@ -439,11 +447,21 @@ bool SimExecutionGateway::get_matched_book( me->touched_secs.clear(); core::TimeStamp t2 = core::TimeStamp::now(); auto time_diff = t2.nanos() - t1.nanos(); - LOG(OrderMan, Info, "SimExecutionGateway::get_matched_book time: {} key: {}", - time_diff, key); + LOG(OrderMan, Info, + "SimExecutionGateway::get_matched_book time: {} ns key: {}", time_diff, + key); return true; } +bts::orderman::Book reduce_book_by_trades(SEGSecurityData &seg_sec) { + bts::orderman::Book rv = seg_sec.real_book; + for (const auto &tr : seg_sec.trades) { + rv = SpreaderUtils::remove_order(rv, {tr.price, tr.qty}); + } + return rv; +} + +// this is where all the processing happens void SimExecutionGateway::_process_transaction() { // goes through all the actions and applies it to the orders (actions // take priority) @@ -452,12 +470,7 @@ void SimExecutionGateway::_process_transaction() { while (!sec_data.pending_actions.empty()) { OrderMsg ord_msg = sec_data.pending_actions.front(); sec_data.pending_actions.pop(); - log_ord_msg( - "Right after dequeueing from SEGSecurityData's pending_actions", - ord_msg); auto [action_res, seg_os] = sec_data.apply_order_action(ord_msg); - log_ord_msg( - "Right after sec_data.apply_order_action", seg_os->crt_msg); // any cxl and mods that affected the order, result in an er, // which is fired here if (action_res != ActionResult::NoOp) { @@ -465,19 +478,24 @@ void SimExecutionGateway::_process_transaction() { } } } - // now apply all the orders to the book + // now apply all the orders to the book (match) for (SecurityKey key : me->touched_secs) { SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); - Book sec_bk = sec_data.real_book; + // this is (optionally) done so that the trades that happened in the past permenantly + // have an affect on the book. + bts::orderman::Book matched_bk = me->perm_reduce_book_by_trades + ? reduce_book_by_trades(sec_data) + : sec_data.real_book; // TODO: apply working orders first (or sort it by time) + // (orders should be sorted) for (SEGOrderState &seg_os : sec_data.orders) { // if it was cancelled by the actions above, if (seg_os.active()) { // trades and execution reports are written along side - sec_bk = _match_order(sec_bk, seg_os); + matched_bk = _match_order(matched_bk, seg_os); } } - sec_data.matched_book = sec_bk; + sec_data.matched_book = matched_bk; _write_book(key); } } @@ -508,6 +526,8 @@ bts::orderman::Book SimExecutionGateway::_cross_order( std::vector> fills = {}; auto rv = SpreaderUtils::apply_crossing_order( book, seg_os.side(), {seg_os.price(), seg_os.working_qty()}, fills); + SEGSecurityData *seg_sec = + _find_add_security_entry(seg_os.sec_key(), false, true); // TODO: if one (or more) of our orders was a passive order in this fill // it needs to be accounted for // this is where we need to do 2-4 @@ -515,6 +535,7 @@ bts::orderman::Book SimExecutionGateway::_cross_order( seg_os.apply_fill(f_pr, f_qty); _push_execution_report(seg_os); _write_trade(seg_os, f_pr, f_qty); + seg_sec->record_trade({seg_os.side(), f_pr, f_qty}); } return rv; } @@ -529,7 +550,7 @@ bts::orderman::Book SimExecutionGateway::_work_order( const BookSide &bside = book.side(seg_os.side()); Book rv = book; rv.side(seg_os.side()) = SpreaderUtils::apply_working_order( - bside, seg_os.side(), {seg_os.price(), seg_os.qty()}); + bside, seg_os.side(), {seg_os.price(), seg_os.working_qty()}); return rv; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index dee518524..461f14295 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1051,7 +1051,7 @@ class SpreaderUtils { } // Fits a working order into a book - static bts::orderman::BookSide cxl_working_order( + static bts::orderman::BookSide remove_order( const BookSide &in_book, std::tuple order) { BookSide rv = in_book; auto [ord_pr, ord_qty] = order; @@ -1059,8 +1059,9 @@ class SpreaderUtils { for (const auto &ps : in_book) { if (securities::is_same(ord_pr, Price(ps.price()))) { Quantity l_qty = Quantity::create_new(ps.size()); - bts_assert(l_qty >= ord_qty); + //bts_assert(l_qty >= ord_qty); l_qty -= ord_qty; + l_qty = Quantity::create_new(std::max(l_qty.full_value(), 0.0)); rv.at(i) = {ps.int_price(), l_qty.full_value_float()}; } i++; @@ -1068,6 +1069,14 @@ class SpreaderUtils { return remove_0qtys(rv); } + static bts::orderman::Book remove_order( + const Book &in_book, std::tuple order) { + auto rv = in_book; + rv.bid() = remove_order(in_book.bid(), order); + rv.ask() = remove_order(in_book.ask(), order); + return rv; + } + // Fits a working order into a book static bts::orderman::BookSide apply_working_order( const BookSide &in_book, From 77408c8c5e38d2c927209f036328319f48e1610e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 26 Feb 2023 22:29:10 -0500 Subject: [PATCH 20/23] Fixed Self matching --- src/lib/domain_model/common.h | 14 +- .../gateways/sim/SimExecutionGateway.cpp | 187 +++++++++++------- .../gateways/sim/SimExecutionGateway.h | 2 +- .../spreader_orders/spreader/SpreaderUtils.h | 3 +- 4 files changed, 121 insertions(+), 85 deletions(-) diff --git a/src/lib/domain_model/common.h b/src/lib/domain_model/common.h index 2894d4eba..528c35e72 100644 --- a/src/lib/domain_model/common.h +++ b/src/lib/domain_model/common.h @@ -13,8 +13,8 @@ namespace bts { struct CQuantity { double qty = 0; - constexpr static double precision_digits =6; - constexpr static double err = 1/precision_digits; + constexpr static double precision_digits = 6; + constexpr static double err = 1 / precision_digits; CQuantity() {} CQuantity(uint32_t whole_qty) : qty(whole_qty) {} CQuantity(uint32_t int_qty, double fractional_qty) @@ -24,12 +24,11 @@ struct CQuantity { rv.qty = v; return rv; } - -static double round_to_decimal_places(double value, int decimal_places) { - double factor = pow(10, decimal_places); - return std::round(value * factor) / factor; -} + static double round_to_decimal_places(double value, int decimal_places) { + double factor = pow(10, decimal_places); + return std::round(value * factor) / factor; + } uint32_t value() const { return static_cast(qty); } double full_value() const { return qty; } float full_value_float() const { return static_cast(full_value()); } @@ -101,6 +100,7 @@ static double round_to_decimal_places(double value, int decimal_places) { return create_new(qty + rhs.qty); } bool is_zero() const { return *this == create_new(0.0); } + void make_zero_if_negative() { qty = std::max(0.0, qty); } void round() { qty = round_to_decimal_places(qty, 6); } }; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index e142ac995..896046b91 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -14,24 +14,16 @@ #include "lib/md/MDProducer.h" #include "lib/md/PriceSize.h" #include "lib/md/Shm/MDStructure.h" -#include "lib/orderman/CancelOrderMsg.h" -#include "lib/orderman/CancelReplaceOrderMsg.h" -#include "lib/orderman/CreateOrderMsg.h" #include "lib/orderman/OrderMsg.h" -#include "lib/orderman/events/CancelRejectEvent.h" -#include "lib/orderman/events/GatewayStatusChangeEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" -#include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/gateways/IExecutionGateway.h" -#include "lib/orderman/limiter/SecurityLimitNode.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/ExecutionReport.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/tracing/bts_trace.h" -#include "lib/utils/Dispatcher.h" #include "lib/utils/Puid.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/Uuid.h" @@ -40,9 +32,6 @@ #include "lib/utils/helper_macros.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" -#include -#include -#include #include #include #include @@ -53,14 +42,15 @@ #include #include #include -#include -#include #include namespace bts::orderman { // book conversions /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// + +// Copies bid, asks received from market data to the book (they are diff +// sized arrays). Also removes the 0 qtys void to_book( const std::array &bids, const std::array &asks, @@ -82,6 +72,7 @@ void to_book( copy_side(asks, book.ask()); } +// Opposite of the above void from_book( const bts::orderman::Book &book, std::array &bids, @@ -99,43 +90,53 @@ void from_book( bts::md::IntPrice convert_price(Price p) { return bts::md::IntPrice_from_double<7>(p.value()); } -bts::md::SecurityIndexData *find_handle( - bts::md::GeneralSecurityIndex &idx_map, SecurityKey sec_key) { - return idx_map.get_security(sec_key.value()); -} + void log_ord_msg(std::string /*log_prefix*/, const OrderMsg & /*ord_msg*/) { // auto sleep_period = std::chrono::milliseconds(500); // std::this_thread::sleep_for(sleep_period); // LOG(OrderMan, Info, "{} {}", log_prefix, ord_msg); //std::this_thread::sleep_for(sleep_period); } + void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er); + +// This is the result of applying a new OrderMsg enum class ActionResult { NewOrder, OrderModification, NoOp }; -// Every order send to sim is represented here. + +// Every order send to sim is represented here. These are contained as a vector +// in SEGSecurityData struct SEGOrderState { CreateOrderMsg crt_msg; - SEGOrderState(const CreateOrderMsg &crt_msg) : crt_msg(crt_msg) {} - - OrderKey ord_key() const { return crt_msg.key; } - bts::SecurityKey sec_key() const { - return bts::SecurityKey(crt_msg.security->id()); - } - // going out - bts::Price price() const { return crt_msg.price; } - bts::Quantity qty() const { return crt_msg.quantity; } - api::Side side() const { return crt_msg.side; } - // coming in bts::Quantity filled_qty = 0; bts::Price avg_filled_price = bts::Price(0); bts::Quantity last_filled_qty = 0; bts::Price last_filled_price = bts::Price(os::nan()); - //bool active = true; - bts::Quantity working_qty() const { return qty() - filled_qty; } bts::api::orderman::NativeOrderStatus status = bts::api::orderman::NativeOrderStatus::NATIVE_ORDER_STATUS_NEW; bts::core::TimeStamp last_touched = bts::core::TimeStamp::from_nanos(bts::core::TimeStamp::now_ns()); + SEGOrderState(const CreateOrderMsg &crt_msg) : crt_msg(crt_msg) {} + + // immutable getters + OrderKey ord_key() const { return crt_msg.key; } + bts::SecurityKey sec_key() const { + return bts::SecurityKey(crt_msg.security->id()); + } + bts::Price price() const { return crt_msg.price; } + bts::Quantity qty() const { return crt_msg.quantity; } + api::Side side() const { return crt_msg.side; } + bts::Quantity working_qty() const { + auto rv = qty() - filled_qty; + rv.make_zero_if_negative(); + return rv; + } + bool active() const { + auto int_status = bts::orderman::get_external_status(status); + bool terminal = bts::orderman::in_terminal_state(int_status); + return !terminal; + } + // mutators //////////////////////////////////////////////////////////////// void apply_fill(Price lf_pr, Quantity lf_qty) { if (!active()) { LOG(OrderMan, Error, @@ -150,19 +151,22 @@ struct SEGOrderState { filled_qty = Quantity::create_new(filled_qty.full_value() + lf_qty.full_value()); status = api::orderman::NATIVE_ORDER_STATUS_PARTIALLY_FILLED; - if (filled_qty >= qty()) { + if (working_qty().is_zero()) { status = api::orderman::NATIVE_ORDER_STATUS_FILLED; } } ActionResult apply_change(const CancelReplaceOrderMsg &cxl_repl_msg) { - last_touched = - bts::core::TimeStamp::from_nanos(bts::core::TimeStamp::now_ns()); if (!active()) - // already cancelled, further changes will be rejected + // already in final state, further changes will be rejected return ActionResult::NoOp; + // if price changes or qty increases, time gets updated + if (cxl_repl_msg.create_fields.quantity > qty() || + !securities::is_same(price(), cxl_repl_msg.create_fields.price)) + last_touched = + bts::core::TimeStamp::from_nanos(bts::core::TimeStamp::now_ns()); crt_msg = cxl_repl_msg.create_fields; // if qty is reduced, it can result in a cancel - if (working_qty() <= Quantity::create_new(0.0)) { + if (working_qty().is_zero()) { status = api::orderman::NATIVE_ORDER_STATUS_CANCELED; } return ActionResult::OrderModification; @@ -177,12 +181,7 @@ struct SEGOrderState { last_filled_qty = 0; last_filled_price = Price(os::nan()); } - bool active() const { - auto int_status = bts::orderman::get_external_status(status); - bool terminal = bts::orderman::in_terminal_state(int_status); - return !terminal; - } -}; // namespace bts::orderman +}; struct SEGTradeEntry { api::Side side; @@ -190,9 +189,12 @@ struct SEGTradeEntry { Quantity qty; }; +// Represents a security and all its data (orders, book, and transient data) struct SEGSecurityData { bts::SecurityKey key = SecurityKey{0}; + // book as sent by get_matched_book bts::orderman::Book real_book = {}; + // after the orders have been integated into real_book bts::orderman::Book matched_book = {}; std::vector orders = {}; std::queue pending_actions = {}; @@ -207,10 +209,12 @@ struct SEGSecurityData { } return nullptr; } + // actions are enqueued and taken care of at the end of the transaction void enqueue_action(const OrderMsg &ord_msg) { pending_actions.push(ord_msg); - log_ord_msg("SEGSecurityData::enqueue_action", ord_msg); } + // applies the action (ie new, cxl, mod) and returns the order alongside + // the result of the action std::tuple apply_order_action( const OrderMsg &msg) { // create results in a new order entry, otherwise apply_change or @@ -253,7 +257,7 @@ struct SEGSecurityData { struct SimExecutionGateway::PImpl { PImpl(bts::api::Venue venue, md::SecurityOracle o) - : venue(venue), admin_data(), sec_oracle(o) { + : venue(venue), sec_oracle(o) { LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor venue: {}", bts::api::Venue_Name(venue)); } @@ -266,9 +270,7 @@ struct SimExecutionGateway::PImpl { OnCancelReject on_cancel_reject; orderman::OnExchangePositionState on_exchange_position_state; orderman::OnExchangeOpenOrdersState on_exchange_open_orders; - api::admin::AdminData admin_data; md::SecurityOracle sec_oracle; - bts::md::MDProducer *md_producer = nullptr; md::GeneralSecurityIndex *producer_map = nullptr; // send_msgs is sent on the order_man thread, its dequeued in the market data // thread, and execution reports are queued to buffered_exec_reps @@ -341,22 +343,21 @@ void SimExecutionGateway::on_securities( } void SimExecutionGateway::on_admin_data( - const mercury::Update &update) { + const mercury::Update &) { LOG(OrderMan, Info, "SimExecutionGateway::on_admin_data venue: {} tid: {} tname: {}", bts::api::Venue_Name(me->venue), bts::os::get_thread_id(), bts::os::get_thread_name()); - if (update.events) { - for (auto const &ev : *(update.events)) - me->admin_data.CopyFrom(*ev.admin_data); - } } void SimExecutionGateway::send_fix(const jetfix::OutFIXPtr &, trace::CorID) { - // only deals with messages bts_assert(false); } +// This is where the messages are sent to the exchange. We simply write the +// operation to a concurrent queue and dequeue in the market data thread +// (the resulting execution rerports are written to another conrrent queue) +// which is then dequeued on dispatch_incoming_fix_messages) void SimExecutionGateway::send_msgs( std::vector const &msg_vec, trace::CorID) { // this is where it will be sent to the exchange (to simulate we'll just put @@ -366,7 +367,7 @@ void SimExecutionGateway::send_msgs( "SimExecutionGateway::send_msgs tid: {} tname: {} count: {}", bts::os::get_thread_id(), bts::os::get_thread_name(), msg_vec.size()); for (auto &m : msg_vec) { - LOG(OrderMan, Info, + LOG(OrderMan, Diag, "SimExecutionGateway::send_msgs tid: {} tname: {} m: {}", bts::os::get_thread_id(), bts::os::get_thread_name(), m); me->buffered_order_ops.push(m); @@ -401,6 +402,7 @@ bool SimExecutionGateway::get_matched_book( std::array &bids, std::array &asks) { bts::SecurityKey key = k; + // security entry is added here SEGSecurityData &seg_sec = *_find_add_security_entry(key, true, true); // this is where the book is updated to_book(bids, asks, seg_sec.real_book); @@ -409,7 +411,7 @@ bool SimExecutionGateway::get_matched_book( return false; // integrate the orders core::TimeStamp t1 = core::TimeStamp::now(); - LOG(OrderMan, Info, + LOG(OrderMan, Diag, "SimExecutionGateway::get_matched_book this will result in a book " "calculation for key: {}", key.value()); @@ -418,7 +420,6 @@ bool SimExecutionGateway::get_matched_book( OrderMsg ord_msg; // all ord_msgs are popped and enqueued in the security's SEGSecurityData while (me->buffered_order_ops.try_pop(ord_msg)) { - log_ord_msg("Right after popping from buffered_order_ops", ord_msg); std::optional op_sec_key = _extract_sec_key(ord_msg); if (!op_sec_key.has_value()) { LOG(OrderMan, Error, @@ -436,6 +437,7 @@ bool SimExecutionGateway::get_matched_book( op_seg_sec.enqueue_action(ord_msg); me->touched_secs.insert(op_seg_sec.key); } + // this takes care of everything ! _process_transaction(); from_book(seg_sec.matched_book, bids, asks); // cleanup @@ -445,14 +447,14 @@ bool SimExecutionGateway::get_matched_book( t_seg_sec.remove_inactive_orders(); } me->touched_secs.clear(); - core::TimeStamp t2 = core::TimeStamp::now(); - auto time_diff = t2.nanos() - t1.nanos(); LOG(OrderMan, Info, - "SimExecutionGateway::get_matched_book time: {} ns key: {}", time_diff, - key); + "SimExecutionGateway::get_matched_book time: {} ns key: {}", + core::TimeStamp::now().nanos() - t1.nanos(), key); return true; } +// subtracts all the trades that have happened against the book +// (not self crosses) bts::orderman::Book reduce_book_by_trades(SEGSecurityData &seg_sec) { bts::orderman::Book rv = seg_sec.real_book; for (const auto &tr : seg_sec.trades) { @@ -471,13 +473,18 @@ void SimExecutionGateway::_process_transaction() { OrderMsg ord_msg = sec_data.pending_actions.front(); sec_data.pending_actions.pop(); auto [action_res, seg_os] = sec_data.apply_order_action(ord_msg); - // any cxl and mods that affected the order, result in an er, - // which is fired here + // any cxl and mods (and creates) that affected the order, result + // in an er, which is fired here if (action_res != ActionResult::NoOp) { _push_execution_report(*seg_os); } } } + // internally cross orders + for (SecurityKey key : me->touched_secs) { + SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); + _internally_cross_orders(sec_data); + } // now apply all the orders to the book (match) for (SecurityKey key : me->touched_secs) { SEGSecurityData &sec_data = *_find_add_security_entry(key, false, true); @@ -500,6 +507,40 @@ void SimExecutionGateway::_process_transaction() { } } +// this crosses the BTS generated orders agianst each other. this is done first +// before the orders are crossed with the market book +void SimExecutionGateway::_internally_cross_orders(SEGSecurityData &seg_sec) { + auto try_cross_orders = [&](SEGOrderState &o1, SEGOrderState &o2) { + if (o1.ord_key() == o2.ord_key()) + return; + if (!o1.active() || !o2.active()) + return; + if (o1.side() == o2.side()) + return; + bool is_cross = + securities::is_equal_or_better(o1.side(), o1.price(), o2.price()); + if (!is_cross) + return; + // TODO, get the best price + auto o1_qty = o1.working_qty(); + auto o2_qty = o2.working_qty(); + auto crossed_qty = SpreaderUtils::cross_qtys(o1_qty, o2_qty); + // TODO, we are crossing with our own orders first (FIFO not respected) + o1.apply_fill(o1.price(), crossed_qty); + _push_execution_report(o1); + _write_trade(o1, o1.price(), crossed_qty); + o2.apply_fill(o2.price(), crossed_qty); + _push_execution_report(o2); + _write_trade(o2, o2.price(), crossed_qty); + }; + // O(n^2), we can index it better and reduce it to O(n) + for (SEGOrderState &o1 : seg_sec.orders) { + for (SEGOrderState &o2 : seg_sec.orders) { + try_cross_orders(o1, o2); + } + } +} + // We take an order and apply it to the book. As bts::orderman::Book SimExecutionGateway::_match_order( const bts::orderman::Book &book, SEGOrderState &seg_os) { @@ -528,8 +569,6 @@ bts::orderman::Book SimExecutionGateway::_cross_order( book, seg_os.side(), {seg_os.price(), seg_os.working_qty()}, fills); SEGSecurityData *seg_sec = _find_add_security_entry(seg_os.sec_key(), false, true); - // TODO: if one (or more) of our orders was a passive order in this fill - // it needs to be accounted for // this is where we need to do 2-4 for (const auto &[f_pr, f_qty] : fills) { seg_os.apply_fill(f_pr, f_qty); @@ -554,19 +593,8 @@ bts::orderman::Book SimExecutionGateway::_work_order( return rv; } -SEGOrderState *SimExecutionGateway::_find_order( - OrderKey order_key, SecurityKey security_key) { - auto it = me->books.find(security_key); - if (it == me->books.end()) - return nullptr; - for (auto &o : it->second.orders) { - if (o.ord_key() == order_key) { - return &o; - } - } - return nullptr; -} - +// adds the security entry. this is called from get_book or when we +// get a new order (also processed from within get_book) SEGSecurityData *SimExecutionGateway::_find_add_security_entry( SecurityKey security_key, bool add_if_absent, bool assert_for_presence) { auto find_add = [&]() -> SEGSecurityData * { @@ -591,6 +619,9 @@ SEGSecurityData *SimExecutionGateway::_find_add_security_entry( return rv; } +// fills execution report form SEGOrderState and writes it to +// buffered_exec_reps, which is picked up from the other thread +// and passed over to the order infrastructure void SimExecutionGateway::_push_execution_report(const SEGOrderState &seg_os) { ExecutionReport *er_p = me->exe_report_pool.construct(); ExecutionReport &er = *er_p; @@ -647,6 +678,9 @@ SimExecutionGateway::_find_order(OrderKey key) const { nullptr, nullptr); } +// this returns the security key from an OrdMsg. The reason it has more code +// than needed is because CancelOrderMsg might not have the security set. +// therefore we need to find the security from the order key std::optional SimExecutionGateway::_extract_sec_key( const OrderMsg &msg) { if (std::holds_alternative(msg)) { @@ -673,6 +707,7 @@ std::optional SimExecutionGateway::_extract_sec_key( return SecurityKey(0); } +// generates an execution rerport from SEGOrderState void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { const auto &cr_msg = seg_os.crt_msg; log_ord_msg("fill_execution_report", cr_msg); diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 041aba8ff..7cfbb7d6a 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -61,13 +61,13 @@ class SimExecutionGateway : public IExecutionGateway { std::array &asks); private: + void _internally_cross_orders(SEGSecurityData &); bts::orderman::Book _match_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _cross_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); bts::orderman::Book _work_order( const bts::orderman::Book &book, SEGOrderState &seg_ord); - SEGOrderState *_find_order(OrderKey order_key, SecurityKey security_key); SEGSecurityData *_find_add_security_entry( SecurityKey security_key, bool add_if_absent, bool assert_for_presence); void _push_execution_report(const SEGOrderState &seg_os); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 461f14295..d01ed12db 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1061,8 +1061,9 @@ class SpreaderUtils { Quantity l_qty = Quantity::create_new(ps.size()); //bts_assert(l_qty >= ord_qty); l_qty -= ord_qty; - l_qty = Quantity::create_new(std::max(l_qty.full_value(), 0.0)); + l_qty.make_zero_if_negative(); rv.at(i) = {ps.int_price(), l_qty.full_value_float()}; + break; } i++; } From d272612c6cfe1c5cb52b4738c0daf25859f9f5cd Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sun, 26 Feb 2023 23:04:08 -0500 Subject: [PATCH 21/23] Removed SimExecutionGateway's dependency on MDClient --- .../gateways/sim/SimExecutionGateway.cpp | 9 +++----- .../gateways/sim/SimExecutionGateway.h | 3 +-- .../sim/SimExecutionGatewayFactory.cpp | 23 ++++--------------- .../gateways/sim/SimExecutionGatewayFactory.h | 8 +------ src/server/sparkd/cmds/Run.cpp | 2 -- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index 896046b91..a87b5b77f 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -256,8 +256,7 @@ struct SEGSecurityData { }; struct SimExecutionGateway::PImpl { - PImpl(bts::api::Venue venue, md::SecurityOracle o) - : venue(venue), sec_oracle(o) { + PImpl(bts::api::Venue venue) : venue(venue) { LOG(OrderMan, Info, "SimExecutionGateway::PImpl constructor venue: {}", bts::api::Venue_Name(venue)); } @@ -270,7 +269,6 @@ struct SimExecutionGateway::PImpl { OnCancelReject on_cancel_reject; orderman::OnExchangePositionState on_exchange_position_state; orderman::OnExchangeOpenOrdersState on_exchange_open_orders; - md::SecurityOracle sec_oracle; md::GeneralSecurityIndex *producer_map = nullptr; // send_msgs is sent on the order_man thread, its dequeued in the market data // thread, and execution reports are queued to buffered_exec_reps @@ -291,9 +289,8 @@ struct SimExecutionGateway::PImpl { } }; -SimExecutionGateway::SimExecutionGateway( - bts::api::Venue venue, md::SecurityOracle o, bts::md::MDClient &) - : IExecutionGateway(), me(new PImpl(venue, o)) { +SimExecutionGateway::SimExecutionGateway(bts::api::Venue venue) + : IExecutionGateway(), me(new PImpl(venue)) { LOG(OrderMan, Info, "SimExecutionGateway::SimExecutionGateway constructor venue: {} tid: {} " "tname: " diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.h b/src/lib/orderman/gateways/sim/SimExecutionGateway.h index 7cfbb7d6a..3d0cb5141 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.h @@ -35,8 +35,7 @@ struct SEGSecurityData; class SimExecutionGateway : public IExecutionGateway { public: - SimExecutionGateway( - bts::api::Venue venue, md::SecurityOracle, bts::md::MDClient &md_client); + SimExecutionGateway(bts::api::Venue venue); virtual ~SimExecutionGateway(); // IExecutionGateway void start() override; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index f13c33902..1684574e5 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -2,7 +2,6 @@ #include "SimExecutionGateway.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" -#include "lib/md/MDClient.h" #include "lib/md/common.h" #include "lib/utils/LockBox.h" #include "lib/utils/bts_assert.h" @@ -15,12 +14,9 @@ namespace bts::orderman { SimExecutionGatewayFactory *SimExecutionGatewayFactory::instance = nullptr; std::once_flag SimExecutionGatewayFactory::flag; -SimExecutionGatewayFactory::SimExecutionGatewayFactory( - bts::md::MDClient &md_client) - : md_client(md_client), gateway_map() { +SimExecutionGatewayFactory::SimExecutionGatewayFactory() : gateway_map() { LOG(OrderMan, Info, - "SimExecutionGatewayFactory::SimExecutionGatewayFactory n_secs: {}", - md_client.oracle().get_securities().size()); + "SimExecutionGatewayFactory::SimExecutionGatewayFactory"); } std::shared_ptr SimExecutionGatewayFactory::get_getayeway( @@ -35,9 +31,7 @@ std::shared_ptr SimExecutionGatewayFactory::get_getayeway( &data) { auto it = data.find(venue); if (it == data.end()) { - data.insert( - {venue, std::make_shared( - venue, md_client.oracle(), md_client)}); + data.insert({venue, std::make_shared(venue)}); it = data.find(venue); } rv = it->second; @@ -51,19 +45,12 @@ SimExecutionGatewayFactory::~SimExecutionGatewayFactory() {} // singleton getter /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -void SimExecutionGatewayFactory::init_once(bts::md::MDClient &md_client) { - LOG(OrderMan, Info, "SimExecutionGatewayFactory::init_once"); +SimExecutionGatewayFactory *SimExecutionGatewayFactory::get() { std::call_once(flag, [&]() { LOG(OrderMan, Info, "SimExecutionGatewayFactory::init_once, initializing instance"); - instance = new SimExecutionGatewayFactory(md_client); + instance = new SimExecutionGatewayFactory(); }); -} -SimExecutionGatewayFactory *SimExecutionGatewayFactory::get() { - auto sleep_period = std::chrono::milliseconds(100); - while (instance == nullptr) { - std::this_thread::sleep_for(sleep_period); - } bts_assert(instance != nullptr); return instance; } diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h index 63f14ff8d..d32bcfe1a 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h @@ -6,23 +6,18 @@ #include #include -namespace bts::md { -class MDClient; -} // namespace bts::md - namespace bts::orderman { class SimExecutionGateway; class SimExecutionGatewayFactory { private: - bts::md::MDClient &md_client; bts::utils::LockBox< std::map>> gateway_map; private: - SimExecutionGatewayFactory(bts::md::MDClient &md_client); + SimExecutionGatewayFactory(); public: std::shared_ptr get_getayeway(api::Venue); @@ -36,7 +31,6 @@ class SimExecutionGatewayFactory { public: // this has to be called once before all usages - static void init_once(bts::md::MDClient &); static SimExecutionGatewayFactory *get(); }; diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 84a45a264..d69352aa9 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -89,8 +89,6 @@ static void execute() { sc, utils::Dispatcher::background(), mdclient); bts::md::MarketDataService mdserver(mdclient, sc, stats); - // starting sim executiop - bts::orderman::SimExecutionGatewayFactory::init_once(mdclient); // initialize order plugins orderman::DynamicOrderRegistry dyn_order_registry; SparkServices plugin_services(dyn_order_registry); From 9fd0df2a13e8143d9c71894e507405f0addfc55d Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 27 Feb 2023 15:44:58 -0500 Subject: [PATCH 22/23] SimExecution can be turned on from config now --- src/lib/config/protos/jetfix.proto | 9 +++++++++ .../gateways/ExecutionGatewayFactory.cpp | 13 ++++++------- .../sim/SimExecutionGatewayFactory.cpp | 19 +++++++++++++++++-- .../gateways/sim/SimExecutionGatewayFactory.h | 1 + 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/lib/config/protos/jetfix.proto b/src/lib/config/protos/jetfix.proto index 31b93fe9b..79e1e3f90 100644 --- a/src/lib/config/protos/jetfix.proto +++ b/src/lib/config/protos/jetfix.proto @@ -139,3 +139,12 @@ message CMECannedSecureLogon { "tbb3it0rUQSSTa0TC9QcRwkrHEMDLWhaJH4VQ0FqGB4 2018-04-05 " " 2019-04-05 NEWRELEASE \n" ]; } + + +message SimExecution{ + message SimExecutionEntry { + required bts.api.Venue venue = 100; + required bool incorporate_crosses_into_book = 200; + } + repeated SimExecutionEntry entries = 100; +} diff --git a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp index b9e61753e..a72c410c5 100644 --- a/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/ExecutionGatewayFactory.cpp @@ -7,6 +7,7 @@ #include "lib/orderman/gateways/GLBXExecutionGateway.h" #include "lib/orderman/gateways/GLBXiLink3ExecutionGateway.h" #include "lib/orderman/gateways/ICEExecutionGateway.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include "lib/orderman/gateways/sim/SimExecutionGatewayUniqueWrapper.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" @@ -20,7 +21,9 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( const config::JetFIX::Connection &conn, trace::PerfLog &pl, md::SecurityOracle o) { - // check which exchanges are set to Sim + if (SimExecutionGatewayFactory::is_sim_execution_on(conn.venue())) { + return std::make_unique(conn.venue()); + } LOG(OrderMan, Info, "ExecutionGatewayFactory::create_gateway conn: {}", utils::pb::to_string(conn)); if (conn.venue() == bts::api::VENUE_ICE || @@ -32,12 +35,8 @@ std::unique_ptr ExecutionGatewayFactory::create_gateway( conn, pl, o); return std::make_unique(conn, pl, o); } else if (conn.venue() == bts::api::VENUE_DERIBIT) - return std::make_unique(conn.venue()); - //return std::make_unique(o); - return std::make_unique(conn.venue()); - //return std::make_unique(o); - // return std::make_unique(o); - // return std::make_unique(conn, pl, o); + return std::make_unique(o); + return std::make_unique(o); } } // namespace bts::orderman diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp index 1684574e5..71bc624d7 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.cpp @@ -23,8 +23,13 @@ std::shared_ptr SimExecutionGatewayFactory::get_getayeway( api::Venue venue) { LOG(OrderMan, Info, "SimExecutionGatewayFactory::get_getayeway venue: {}", bts::api::Venue_Name(venue)); - // This needs to look at config, to check if an exchange is set to sim or - // not. If it is not to set to sim, it should return a nullptr + if (!is_sim_execution_on(venue)) { + LOG(OrderMan, Info, + "SimExecutionGatewayFactory::get_getayeway venue: {}, sim is turned " + "off", + bts::api::Venue_Name(venue)); + return nullptr; + } std::shared_ptr rv = nullptr; gateway_map.lock( [&, venue](std::map> @@ -55,4 +60,14 @@ SimExecutionGatewayFactory *SimExecutionGatewayFactory::get() { return instance; } +bool SimExecutionGatewayFactory::is_sim_execution_on(api::Venue venue) { + const auto &sim_exec = config::get(); + for (const auto &e : sim_exec.entries()) { + if (e.has_venue() && e.venue() == venue) { + return true; + } + } + return false; +} + } // namespace bts::orderman \ No newline at end of file diff --git a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h index d32bcfe1a..8fd6e00ec 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h +++ b/src/lib/orderman/gateways/sim/SimExecutionGatewayFactory.h @@ -32,6 +32,7 @@ class SimExecutionGatewayFactory { public: // this has to be called once before all usages static SimExecutionGatewayFactory *get(); + static bool is_sim_execution_on(api::Venue); }; } // namespace bts::orderman From eaa6493ce12d55b8a70d392a2427959a28bb1ef9 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 27 Feb 2023 20:54:43 -0500 Subject: [PATCH 23/23] Deribit production markets can work with SimExecution --- src/lib/md/vendor/emumba/EmumbaDeribitData.h | 3 +- .../gateways/sim/SimExecutionGateway.cpp | 2 +- .../md/platforms/emumba/EmMDListener.cpp | 66 +++++++++++++------ .../sparkd/md/platforms/emumba/EmMDListener.h | 10 +-- .../sparkd/md/platforms/emumba/EmumbaMain.cpp | 4 +- .../md/platforms/emumba/EmumbaSecurityIndex.h | 18 ----- .../md/platforms/emumba/IEMOrderMuxer.h | 2 +- 7 files changed, 56 insertions(+), 49 deletions(-) delete mode 100644 src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h diff --git a/src/lib/md/vendor/emumba/EmumbaDeribitData.h b/src/lib/md/vendor/emumba/EmumbaDeribitData.h index 4128fd8e4..a597aad21 100644 --- a/src/lib/md/vendor/emumba/EmumbaDeribitData.h +++ b/src/lib/md/vendor/emumba/EmumbaDeribitData.h @@ -5,12 +5,11 @@ #include "lib/md/SecurityIDRecorder.h" #include "server/sparkd/md/platforms/emumba/EMTradingSession.h" #include "server/sparkd/md/platforms/emumba/EmMDListener.h" -#include "server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h" #include namespace bts::md { struct EmumbaDeribitData { - bts::md::EmumbaSecurityIndex sec_index; + bts::md::GeneralSecurityIndex sec_index; bts::md::SecurityIDRecorder recorder; bts::md::MDProducer md_producer; bts::md::EmMDListener listener; diff --git a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp index a87b5b77f..478e62154 100644 --- a/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib/orderman/gateways/sim/SimExecutionGateway.cpp @@ -444,7 +444,7 @@ bool SimExecutionGateway::get_matched_book( t_seg_sec.remove_inactive_orders(); } me->touched_secs.clear(); - LOG(OrderMan, Info, + LOG(OrderMan, Diag, "SimExecutionGateway::get_matched_book time: {} ns key: {}", core::TimeStamp::now().nanos() - t1.nanos(), key); return true; diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index dc41ac945..47def5020 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -2,12 +2,15 @@ #include "lib/api/services/ShellDiagnosticService.server.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/IntPrice.h" #include "lib/md/MDProducer.h" #include "lib/md/PriceSize.h" #include "lib/md/Shm/FixedSecurity.h" #include "lib/md/common.h" #include "lib/md/protos/co2.pb.h" +#include "lib/orderman/gateways/sim/SimExecutionGateway.h" +#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h" #include "lib/os/os.h" #include "lib/persistence/IDGenerator.h" #include "lib/utils/PBUtils.h" @@ -18,7 +21,6 @@ #include "lib/utils/overloaded.h" #include "lib/utils/stats.h" #include "server/sparkd/md/platforms/emumba/EMTradingSession.h" -#include "server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include #include @@ -68,7 +70,11 @@ struct DescSearchResult { }; const double extract_qty(const emumba::market_data::quantity &qty); - +void possibly_match_with_sim_orders( + std::shared_ptr sim_ex_gwy, + uint32_t bts_sec_id, + MDArray &bids, + MDArray &asks); /* #region Type conversions */ IntPrice convert_price(const emumba::market_data::price &pr) { @@ -184,9 +190,9 @@ void copy_books( to[0] = PriceSize{convert_price(px), convert_qty(qty)}; } -inline EmumbaSecurityData *get_security( - EmumbaSecurityIndex &sec_map, uint64_t id) { - EmumbaSecurityData *rv = sec_map.get_security(id); +inline SecurityIndexData *get_security( + GeneralSecurityIndex &sec_map, uint64_t id) { + SecurityIndexData *rv = sec_map.get_security(id); bts_assert(rv != nullptr); return rv; } @@ -347,7 +353,7 @@ struct EmMDListener::PImpl { emumba::deribit_connector::deribit_handler *handler = nullptr; std::vector trading_sessions; // shared memory - EmumbaSecurityIndex &index; + GeneralSecurityIndex &index; MDProducer &md_producer; // map of exchange's sec desc vs SecurityAuxData std::unordered_map sec_emdesc_map = {}; @@ -373,8 +379,15 @@ struct EmMDListener::PImpl { &trading_sessions}; AsyncRequestHelper open_ord_helper = {&trading_sessions}; - explicit PImpl(EmumbaSecurityIndex &index_a, MDProducer &md_producer_a) - : index(index_a), md_producer(md_producer_a) {} + const std::shared_ptr sim_ex_gwy; + explicit PImpl(GeneralSecurityIndex &index_a, MDProducer &md_producer_a) + : index(index_a), md_producer(md_producer_a), + sim_ex_gwy(SimExecutionGatewayFactory::get()->get_getayeway( + api::VENUE_DERIBIT)) { + if (sim_ex_gwy != nullptr) { + sim_ex_gwy->set_producers(&index); + } + } }; SecurityAuxData &get_sud( @@ -386,7 +399,7 @@ SecurityAuxData &get_sud( return it->second; } -EmMDListener::EmMDListener(EmumbaSecurityIndex &index, MDProducer &md_producer) +EmMDListener::EmMDListener(GeneralSecurityIndex &index, MDProducer &md_producer) : me(std::make_unique(index, md_producer)) {} void run(__attribute__((unused)) const std::string &config_path) {} @@ -402,7 +415,7 @@ bts::orderman::OpResult EmMDListener::launch_new_order( } const std::string &def = std::get(order.order_def.sec_id.value()); - EmumbaSecurityData const *sec_ptr = _find_security(order.order_def.sec_id); + SecurityIndexData const *sec_ptr = _find_security(order.order_def.sec_id); if (sec_ptr == nullptr) { return { false, emumba::order_entry::order_key{0}, @@ -596,7 +609,7 @@ void EmMDListener::on_order_update( } // we keep the EMOrderState around, and update as we get callbacks auto &ex_ord_state = me->order_state_map[order_key.value()]; - EmumbaSecurityData *em_sec_data = + SecurityIndexData *em_sec_data = me->index.get_security(ex_ord_state.sec_key); bts_assert_msg( em_sec_data != nullptr, @@ -740,7 +753,7 @@ void EmMDListener::on_book_state_change( void EmMDListener::on_security_statistics( const emumba::market_data::market_data_statistics &market_data_stats, __attribute__((unused)) const void *ptr) { - EmumbaSecurityData *sec_data = _find_security(market_data_stats.sec_id); + SecurityIndexData *sec_data = _find_security(market_data_stats.sec_id); if (sec_data == nullptr) { LOG(md, Error, "EmMDListener::on_security_state could not find desc: {}", extract_security_desc(market_data_stats.sec_id)); @@ -775,7 +788,7 @@ void EmMDListener::on_quote( // this is the top of book change __attribute__((unused)) const emumba::market_data::quote "e, __attribute__((unused)) const void *ptr) { - EmumbaSecurityData *sec_data = _find_security(quote.sec_id); + SecurityIndexData *sec_data = _find_security(quote.sec_id); if (sec_data == nullptr) { LOG(md, Error, "EmMDListener::on_quote could not find desc: {}", extract_security_desc(quote.sec_id)); @@ -791,7 +804,7 @@ void EmMDListener::on_quote( } void _log_book( - EmumbaSecurityData *s_data, const emumba::market_data::order_book &book) { + SecurityIndexData *s_data, const emumba::market_data::order_book &book) { if (s_data->handle.security().type == api::SECURITYTYPE_OPTION) { LOG(md, Diag, "BookTop sec: {} bid: {}/{} ask: {}/{}", std::string(s_data->handle.security().security_desc()), @@ -803,7 +816,7 @@ void _log_book( void EmMDListener::on_book( const emumba::market_data::order_book &book, __attribute__((unused)) const void *ptr) { - EmumbaSecurityData *sec_data = _find_security(book.sec_id); + SecurityIndexData *sec_data = _find_security(book.sec_id); if (sec_data == nullptr) { LOG(md, Error, "EmMDListener::on_security_state could not find desc: {}", extract_security_desc(book.sec_id)); @@ -824,6 +837,8 @@ void EmMDListener::on_book( } copy_books(book.bids, me->bids); copy_books(book.asks, me->asks); + possibly_match_with_sim_orders( + me->sim_ex_gwy, sec_data->handle.key(), me->bids, me->asks); sec_data->handle.update_direct(utils::TimeStamp::now(), me->bids, me->asks); _check_pending_spreads(); } @@ -831,7 +846,7 @@ void EmMDListener::on_book( void EmMDListener::on_security_state( const emumba::market_data::security_state &sec_state, __attribute__((unused)) const void *ptr) { - EmumbaSecurityData *sec_data = _find_security(sec_state.sec_id); + SecurityIndexData *sec_data = _find_security(sec_state.sec_id); if (sec_data == nullptr) { LOG(md, Error, "EmMDListener::on_security_state could not find desc: {}", extract_security_desc(sec_state.sec_id)); @@ -848,7 +863,7 @@ void EmMDListener::on_trades( __attribute__((unused)) const void *ptr) { LOG(md, Diag, "EmMDListener::on_trades n_trades:{}", trades.size()); for (const auto &t : trades) { - EmumbaSecurityData *sec_data = _find_security(t->sec_id); + SecurityIndexData *sec_data = _find_security(t->sec_id); SecurityAuxData &sud = get_sud(t->sec_id, me->sec_emdesc_map); sud.last_trade_price = t->trade_price.to_double(); if (sec_data != nullptr) { @@ -881,7 +896,7 @@ void EmMDListener::on_error( emumba::market_data::market_data_error::error_type::disconnection) { clear_books(me->bids); clear_books(me->asks); - me->index.walk_security_list([&](EmumbaSecurityData &d) { + me->index.walk_security_list([&](SecurityIndexData &d) { d.handle.update_books( utils::TimeStamp::now(), me->bids, me->asks, {}, {}); }); @@ -1147,7 +1162,7 @@ security_key EmMDListener::_add_sec_entry( } // Find the shared memory security handle from the em's sec id string -EmumbaSecurityData *EmMDListener::_find_security( +SecurityIndexData *EmMDListener::_find_security( const emumba::market_data::security_id &id) { const std::string &desc = extract_security_desc(id); auto search_result = _find_em_sec(desc); @@ -1215,7 +1230,7 @@ void EmMDListener::_check_pending_spreads() { } void EmMDListener::_deduce_spread_leg_fills( - const EmumbaSecurityData &sec_data, + const SecurityIndexData &sec_data, const EMOrderState &order_state, const emumba::market_data::trade_record &fill, boost::container::small_vector &rv) { @@ -1286,6 +1301,17 @@ EmMDListener::_convert_combo_trade(const bts::api::ContractLeg &l) { return rv_o; } +void possibly_match_with_sim_orders( + std::shared_ptr sim_ex_gwy, + uint32_t bts_sec_id, + MDArray &bids, + MDArray &asks) { + if (sim_ex_gwy != nullptr) { + sim_ex_gwy->get_matched_book( + bts::md::SecurityKey(bts_sec_id), bids, asks); + } +} + /* #endregion */ } // namespace bts::md diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.h b/src/server/sparkd/md/platforms/emumba/EmMDListener.h index c8c8a300d..000f2b44e 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.h +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.h @@ -1,9 +1,9 @@ #pragma once #include "EMTradingSession.h" -#include "EmumbaSecurityIndex.h" #include "IEMOrderMuxer.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/common.h" #include "server/sparkd/md/platforms/emumba/IEMOrderMuxer.h" #include @@ -26,13 +26,13 @@ namespace bts::md { class MDProducer; class FixedSecurity; struct DescSearchResult; -struct EmumbaSecurityData; +struct SecurityIndexData; struct SecurityAuxData; class EmMDListener : public emumba::deribit_connector::deribit_listener, public orderman::IEMOrderMuxer { public: - EmMDListener(EmumbaSecurityIndex &index, MDProducer &md_producer); + EmMDListener(GeneralSecurityIndex &index, MDProducer &md_producer); static EmMDListener *singleton_instance(); // Run the connector void run(const std::string &config_path); @@ -159,7 +159,7 @@ class EmMDListener : public emumba::deribit_connector::deribit_listener, DescSearchResult _find_em_sec( const emumba::market_data::security &, bool add_if_absent); security_key _add_sec_entry(const emumba::market_data::security &); - EmumbaSecurityData *_find_security( + SecurityIndexData *_find_security( const emumba::market_data::security_id &id); SecurityAuxData *_find_sud(security_key); // subscribes to all securities here @@ -168,7 +168,7 @@ class EmMDListener : public emumba::deribit_connector::deribit_listener, const std::string &account); void _check_pending_spreads(); void _deduce_spread_leg_fills( - const EmumbaSecurityData &, + const SecurityIndexData &, const bts::orderman::EMOrderState &order_state, const emumba::market_data::trade_record &fill, boost::container::small_vector &rv); diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp b/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp index 18c5cf5c7..30ffb4852 100644 --- a/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmumbaMain.cpp @@ -2,9 +2,9 @@ #include "EMTradingSession.h" #include "EmMDListener.h" -#include "EmumbaSecurityIndex.h" #include "lib/config/config.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/MDProducer.h" #include "lib/md/SecurityDB.h" #include "lib/md/coconut2.h" @@ -31,7 +31,7 @@ using namespace bts::orderman; namespace bts::md { struct EmumbaMain::PImpl { - EmumbaSecurityIndex sec_index; + GeneralSecurityIndex sec_index; SecurityIDRecorder recorder; MDProducer producer; EmMDListener listener; diff --git a/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h b/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h deleted file mode 100644 index c68800ed3..000000000 --- a/src/server/sparkd/md/platforms/emumba/EmumbaSecurityIndex.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "lib/md/SecurityIndex.h" -#include -#include - -namespace bts::md { - -struct EmumbaSecurityData { - EmumbaSecurityData(uint64_t id, MDProducerHandle &h) : id(id), handle(h) {} - uint64_t id; // exchange id - MDProducerHandle handle; -}; - -using EmumbaSecurityIndex = - ConcurrentSecurityIndex; - -} // namespace bts::md \ No newline at end of file diff --git a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h index 838e3ffdc..4140eaa87 100644 --- a/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h +++ b/src/server/sparkd/md/platforms/emumba/IEMOrderMuxer.h @@ -1,7 +1,7 @@ #pragma once -#include "EmumbaSecurityIndex.h" #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" +#include "lib/md/GeneralSecurityIndex.h" #include "lib/md/common.h" #include "lib/orderman/RFQMsg.h" #include "lib/os/os.h"