diff --git a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp index 664c15eb0..f35682b9f 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -86,6 +87,7 @@ struct SubscriptionStatus { struct CCAPIDeribitOrderMux::PImpl { CCAPIConnectionConfig::DeribitConnectionConfig d_conn_config; const std::string missing_corrid_placeholder = "MISSING_CORRID"; + const std::vector currencies = {"BTC", "ETH"}; md::SecurityOracle sec_oracle; ccapi::SessionOptions session_options = {}; ccapi::SessionConfigs session_configs; @@ -98,9 +100,6 @@ struct CCAPIDeribitOrderMux::PImpl { // std::set subscribed_sec_map = {}; boost::lockfree::spsc_queue incoming_event_queue; OrderEventHandler event_handler; - google::protobuf::Timestamp last_sec_check_time = - google::protobuf::util::TimeUtil::GetCurrentTime(); - uint32_t sec_check_period = 10; // map of subscription confirmation for a security std::unordered_map sub_map = {}; // if we get a new order for a security that we hve not subscribed to yet @@ -313,7 +312,33 @@ void CCAPIDeribitOrderMux::dispatch_incoming_messages() { // Position -void CCAPIDeribitOrderMux::query_positions() {} +void CCAPIDeribitOrderMux::query_positions() { + LOG(OrderMan, Info, "CCAPIDeribitOrderMux::query_positions"); + std::vector reqs = {}; + bool generic_req = true; + if (generic_req) { + for (const auto &curr : me->currencies) { + std::string pos_query = "currency=" + curr; + // https://test.deribit.com/api/v2/private/get_positions?currency=BTC + ccapi::Request pos_request( + ccapi::Request::Operation::GENERIC_PRIVATE_REQUEST, + CCAPI_EXCHANGE_NAME_DERIBIT, "", "GetPositions:" + curr); + pos_request.appendParam( + {{CCAPI_HTTP_METHOD, "GET"}, + {CCAPI_HTTP_PATH, "/api/v2/private/get_positions"}, + {CCAPI_HTTP_QUERY_STRING, pos_query}, + {CCAPI_HTTP_HEADERS, "Content-Type: application/json"}}); + reqs.push_back(pos_request); + } + } else { + ccapi::Request request( + ccapi::Request::Operation::GET_ACCOUNT_POSITIONS, + CCAPI_EXCHANGE_NAME_DERIBIT, "", "GetPositions"); + request.appendParam({{"CCAPI_HTTP_QUERY_STRING", "currency=BTC"}}); + reqs.push_back(request); + } + me->session->sendRequest(reqs); +} OnCCAPIExchangePositionUpdate & CCAPIDeribitOrderMux::exchange_position_update_cb() { @@ -322,7 +347,25 @@ CCAPIDeribitOrderMux::exchange_position_update_cb() { // Open orders -void CCAPIDeribitOrderMux::query_open_orders() {} +void CCAPIDeribitOrderMux::query_open_orders() { + LOG(OrderMan, Info, "CCAPIDeribitOrderMux::query_open_orders"); + // TODO: BTC is hard coded here + std::vector reqs = {}; + for (const auto &curr : me->currencies) { + std::string pos_query = "currency=" + curr; + // https://test.deribit.com/api/v2/private/get_open_orders_by_currency?currency=BTC + ccapi::Request pos_request( + ccapi::Request::Operation::GENERIC_PRIVATE_REQUEST, + CCAPI_EXCHANGE_NAME_DERIBIT, "", "GetOpenOrders:" + curr); + pos_request.appendParam( + {{CCAPI_HTTP_METHOD, "GET"}, + {CCAPI_HTTP_PATH, "/api/v2/private/get_open_orders_by_currency"}, + {CCAPI_HTTP_QUERY_STRING, pos_query}, + {CCAPI_HTTP_HEADERS, "Content-Type: application/json"}}); + reqs.push_back(pos_request); + } + me->session->sendRequest(reqs); +} OnCCAPIExchangeOpenOrderUpdate & CCAPIDeribitOrderMux::exchange_open_orders_update_cb() { @@ -347,7 +390,8 @@ bool CCAPIDeribitOrderMux::_check_and_add_subscription( const auto &sec_desc = sec.deribit().security_desc(); LOG(OrderMan, Info, "CCAPIDeribitOrderMux::_check_and_add_subscription " - "CCAPI_EM_ORDER_UPDATE and CCAPI_EM_PRIVATE_TRADE subscriptions for " + "CCAPI_EM_ORDER_UPDATE and CCAPI_EM_PRIVATE_TRADE " + "subscriptions for " "sec: {} order_status_sub_corrid: {} trade_sub_corrid: {}", sec_desc, order_status_sub_corrid, trade_sub_corrid); std::vector subs = {}; @@ -464,7 +508,8 @@ void CCAPIDeribitOrderMux::_handle_element( void CCAPIDeribitOrderMux::_handle_subscription_status( const CCAPISubscriptionStatusMsg &ss_msg) { LOG(OrderMan, Info, - "CCAPIDeribitOrderMux::_handle_subscription_status status: {} corr_id: " + "CCAPIDeribitOrderMux::_handle_subscription_status status: {} " + "corr_id: " "{}", ss_msg.is_success, ss_msg.corr_id); if (ss_msg.is_success) { @@ -514,11 +559,14 @@ void CCAPIDeribitOrderMux::_send_order(const CreateOrderMsg &cr_msg) { me->session->sendRequest(request); } +// new orders that did not have a subscription were buffered in the +// buffered_creates vector void CCAPIDeribitOrderMux::_send_buffered_orders(uint32_t sec_id) { for (auto &cr_msg : me->buffered_creates) { if (cr_msg.security->id() == sec_id) { LOG(OrderMan, Info, - "CCAPIDeribitOrderMux::_send_buffered_orders sending buffered " + "CCAPIDeribitOrderMux::_send_buffered_orders sending " + "buffered " "order"); _send_order(cr_msg); } @@ -531,7 +579,8 @@ void CCAPIDeribitOrderMux::_send_buffered_orders(uint32_t sec_id) { }), me->buffered_creates.end()); LOG(OrderMan, Info, - "CCAPIDeribitOrderMux::_send_buffered_orders n_buffered_orders: {}", + "CCAPIDeribitOrderMux::_send_buffered_orders n_buffered_orders: " + "{}", me->buffered_creates.size()); } diff --git a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp index c7b332d05..e19dae49e 100644 --- a/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib/orderman/gateways/CCAPIExecutionGateway.cpp @@ -2,6 +2,7 @@ #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/core/TimeStamp.h" #include "lib/domain_model/Security.pb.h" #include "lib/domain_model/SecurityKey.h" //#include "lib/domain_model/common.h" @@ -24,6 +25,7 @@ #include "lib/os/os.h" //#include "lib/tracing/bts_trace.h" #include "lib/utils/bts_assert.h" +#include "lib/utils/bts_chrono.h" #include "lib/utils/datetime.h" //#include "lib/utils/helper_macros.h" #include "lib/orderman/ccapi/ICCAPIOrderMux.h" @@ -95,6 +97,8 @@ struct CCAPIExecutionGateway::PImpl { "SMALL"}}}; // callback cashed data const bts::api::Venue venue; + const size_t pos_query_period_ms = 10000; + core::TimeStamp last_pos_query_time = core::TimeStamp::now(); api::admin::AdminData admin_data = {}; md::SecurityOracle sec_oracle; // interface (IExecutionGateway) callbacks @@ -112,9 +116,6 @@ struct CCAPIExecutionGateway::PImpl { ExchangePosition exchange_position; ExchangeOpenOrders exchange_open_orders; // periodic query (temporary) - bts::datetime::PTime last_pos_fire_time = bts::datetime::now(); - uint32_t pos_fire_period_ms = 5000; - size_t dispatch_idx = 0; bool inited() const { return order_mux != nullptr; } }; @@ -144,6 +145,12 @@ void CCAPIExecutionGateway::dispatch_incoming_fix_messages() { if (!me->inited()) return; me->order_mux->dispatch_incoming_messages(); + if (core::TimeStamp::now().millis() - me->last_pos_query_time.millis() >= + me->pos_query_period_ms) { + me->last_pos_query_time = core::TimeStamp::now(); + me->order_mux->query_positions(); + me->order_mux->query_open_orders(); + } } void CCAPIExecutionGateway::on_securities(