diff --git a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp index ab2a95d1e..6adb4e1a2 100644 --- a/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp +++ b/src/lib/orderman/ccapi/CCAPIDeribitOrderMux.cpp @@ -420,6 +420,10 @@ void CCAPIDeribitOrderMux::dispatch_incoming_messages() { for (auto &kv : me->order_map) { auto ord_ch = kv.second.dispatch_end(); if (ord_ch) { + LOG(OrderMan, Info, + "CCAPIDeribitOrderMux::dispatch_incoming_messages firing " + "order_update_cb ord: {}", + kv.second.order_state()); me->order_update_cb(kv.second.order_state()); } } diff --git a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp b/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp index b479051d5..3f043a58e 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp +++ b/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.cpp @@ -16,6 +16,8 @@ bts::api::orderman::OrderStatus convert_ccapi_status( // TODO, find the other status'es if (status == "open") return bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else if (status == "cancelled") + return bts::api::orderman::OrderStatus::ORDER_STATUS_CANCELED; return bts::api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; } diff --git a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h b/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h index 5cbc4cf92..a56a05637 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h +++ b/src/lib/orderman/ccapi/CCAPIOrderCallbackMsgs.h @@ -12,9 +12,6 @@ #include #include #include -// #include -// #include -// #include #include #include diff --git a/src/lib/orderman/ccapi/CCAPIOrderState.h b/src/lib/orderman/ccapi/CCAPIOrderState.h index 4e4869f9a..392c8e275 100644 --- a/src/lib/orderman/ccapi/CCAPIOrderState.h +++ b/src/lib/orderman/ccapi/CCAPIOrderState.h @@ -40,6 +40,18 @@ struct CCAPIOrderState { size_t n_cbs = 0; size_t n_outgoing_mods = 0; + void add_trade(const CCAPITradeMsg &t, bool update_fill_state = true) { + cb_trades.push_back(t); + if (update_fill_state) { + last_filled_price = t.last_exec_price; + last_filled_qty = t.last_exec_qty; + avg_filled_price = (avg_filled_price * total_fills + + last_filled_price * last_filled_qty) / + (total_fills + last_filled_qty); + total_fills += last_filled_qty; + } + } + CCAPIOrderState( const api::Security &security, OrderKey order_key, @@ -55,9 +67,9 @@ struct CCAPIOrderState { inline std::ostream &operator<<(std::ostream &out, CCAPIOrderState const &s) { out << "sec_key: " << s.security.id() << " order_key: " << s.order_key << " cc_create_corr_id: " << s.cc_create_corr_id - << " side: " << securities::side_name(s.side) << " cc_order_key: " << s.cc_order_key << " status: " << api::orderman::OrderStatus_Name(s.status) + << " side: " << securities::side_name(s.side) << " order_px: " << s.order_px << " order_qty: " << s.order_qty << " total_fills: " << s.total_fills << " avg_filled_price: " << s.avg_filled_price diff --git a/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp b/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp index f2e7b9ba0..fbf406e24 100644 --- a/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp +++ b/src/lib/orderman/ccapi/CCAPISingleOrderManager.cpp @@ -6,7 +6,10 @@ #include "lib/domain_model/Security.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/os/os.h" #include "lib/utils/bts_assert.h" +#include +#include namespace bts::orderman { @@ -20,19 +23,6 @@ enum class CCAPISingleOrderManager::State { static bool eq(double p1, double p2) { return securities::eq(p1, p2); } -static bool gr_eq(double p1, double p2) { - return securities::gr_than_eq(p1, p2); -} - -static void copy_order_update( - CCAPIOrderState &to, const CCAPIOrderUpdateMsg &from) { - to.status = from.status; - to.order_px = from.price; - to.order_qty = from.qty; - to.total_fills = from.cumm_filled_qty; - to.avg_filled_price = from.cumm_filled_price; -} - struct PreviousState { double order_px = os::nan(); double order_qty = 0; @@ -57,13 +47,36 @@ struct PreviousState { } }; +// This is the message that informs us that the order has reached its final state +struct TerminalMessage { + api::orderman::OrderStatus status = + api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; + double final_accumulated_qty = os::nan(); + double final_avg_filled_price = os::nan(); + void update(const CCAPICreateOrderMsg &cr_msg) { + bts_assert(!terminated()); + status = cr_msg.status; + final_accumulated_qty = cr_msg.cumm_filled_qty; + final_avg_filled_price = cr_msg.cumm_filled_price; + bts_assert(terminated()); + } + void update(const CCAPIOrderUpdateMsg &ou_msg) { + bts_assert(!terminated()); + status = ou_msg.status; + final_accumulated_qty = ou_msg.cumm_filled_qty; + final_avg_filled_price = ou_msg.cumm_filled_price; + bts_assert(terminated()); + } + bool terminated() const { return orderman::in_terminal_state(status); } +}; + struct CCAPISingleOrderManager::PImpl { CCAPIOrderState order; PreviousState prev_state = {}; State state = State::WAITING_FOR_ID; std::vector buffered_order_updates = {}; std::vector buffered_trades = {}; - double accumulated_fills = 0; + TerminalMessage ter_msg = {}; PImpl( const api::Security &security, @@ -80,7 +93,7 @@ struct CCAPISingleOrderManager::PImpl { order_px, order_qty) {} bool fills_accounted() const { - return eq(accumulated_fills, order.total_fills); + return eq(ter_msg.final_accumulated_qty, order.total_fills); } }; @@ -94,7 +107,7 @@ CCAPISingleOrderManager::CCAPISingleOrderManager( : me(new PImpl( security, order_key, cc_create_corr_id, side, order_px, order_qty)) { LOG(OrderMan, Info, - "CCAPISingleOrderManager::cons order_key: {} sec_id: {} corr_id: {} p: " + "CCAPISingleOrderManager ok: {} ::const sec_id: {} corr_id: {} p: " "{} q: {} side: {}", order_key, security.id(), cc_create_corr_id, order_px, order_qty, (int)side); @@ -105,50 +118,41 @@ CCAPISingleOrderManager::~CCAPISingleOrderManager() {} void CCAPISingleOrderManager::handle_create_reponse( const CCAPICreateOrderMsg &create_order_msg) { LOG(OrderMan, Info, - "CCAPISingleOrderManager::handle_create ok: {} corr_id: {} " + "CCAPISingleOrderManager ok: {} ::handle_create corr_id: {} " "cc_order_key: {} state: {}", me->order.order_key, me->order.cc_create_corr_id, me->order.cc_order_key, _state_msg(me->state)); switch (me->state) { case State::WAITING_FOR_ID: - // copy create state me->order.cc_order_key = create_order_msg.order_id; - me->order.status = create_order_msg.status; me->order.order_px = create_order_msg.price; me->order.order_qty = create_order_msg.qty; - me->order.total_fills = create_order_msg.cumm_filled_qty; - me->order.avg_filled_price = create_order_msg.cumm_filled_price; - me->order.last_filled_price = create_order_msg.cumm_filled_price; - me->order.last_filled_qty = create_order_msg.cumm_filled_qty; + me->order.status = api::orderman::OrderStatus::ORDER_STATUS_WORKING; // copy trades for (const auto &tr : me->buffered_trades) { if (tr.order_id == me->order.cc_order_key) { - me->accumulated_fills += tr.last_exec_qty; - me->order.cb_trades.emplace_back(tr); + me->order.add_trade(tr); } } me->buffered_trades.clear(); - // order state: in case order_update is ahead of the create message - // (filled qty can not go down and status can not go from final state to - // non-final state) - for (const auto &ord_up : me->buffered_order_updates) { - if (ord_up.order_id == me->order.cc_order_key) { - if (gr_eq(ord_up.cumm_filled_qty, me->order.total_fills) || - (!in_terminal_state(me->order.status) && - in_terminal_state(ord_up.status))) { - copy_order_update(me->order, ord_up); - } - } - } - me->buffered_order_updates.clear(); - if (in_terminal_state(me->order.status)) { + // if create's status is final, and all trades have been accounted for we + // can straightaway go to end state, since the order update messages are + // redundant + if (in_terminal_state(create_order_msg.status)) { + me->ter_msg.update(create_order_msg); if (me->fills_accounted()) { - _switch_state(State::END); + _go_to_end_state(); } else { + me->order.status = api::orderman::ORDER_STATUS_WORKING; _switch_state(State::END_WAITING_FOR_FILLS); } } else { + me->order.status = api::orderman::ORDER_STATUS_WORKING; _switch_state(State::WORKING); + for (const auto &ord_up : me->buffered_order_updates) { + handle_order_sub_update(ord_up); + } + me->buffered_order_updates.clear(); } break; case State::WORKING: @@ -177,7 +181,7 @@ void CCAPISingleOrderManager::handle_order_sub_update( if (!_relevent_update(order_update_msg.order_id)) return; LOG(OrderMan, Info, - "CCAPISingleOrderManager::handle_order_update ok: {} corr_id: {} " + "CCAPISingleOrderManager ok: {} ::handle_order_sub_update corr_id: {} " "cc_order_key: {} state: {} order_update_msg.order_id: {}", me->order.order_key, me->order.cc_create_corr_id, me->order.cc_order_key, _state_msg(me->state), order_update_msg.order_id); @@ -186,12 +190,13 @@ void CCAPISingleOrderManager::handle_order_sub_update( me->buffered_order_updates.push_back(order_update_msg); break; case State::WORKING: - if (me->order.cc_order_key != order_update_msg.order_id) - return; - copy_order_update(me->order, order_update_msg); - if (in_terminal_state(me->order.status)) { + bts_assert(me->order.cc_order_key == order_update_msg.order_id); + me->order.order_px = order_update_msg.price; + me->order.order_qty = order_update_msg.qty; + if (in_terminal_state(order_update_msg.status)) { + me->ter_msg.update(order_update_msg); if (me->fills_accounted()) { - _switch_state(State::END); + _go_to_end_state(); } else { _switch_state(State::END_WAITING_FOR_FILLS); } @@ -209,7 +214,7 @@ void CCAPISingleOrderManager::handle_trade_sub_update( if (!_relevent_update(trade_msg.order_id)) return; LOG(OrderMan, Info, - "CCAPISingleOrderManager::handle_trade ok: {} corr_id: {} " + "CCAPISingleOrderManager ok: {} ::handle_trade corr_id: {} " "cc_order_key: {} state: {} trade_id: {} " "p: {} q: {}", me->order.order_key, me->order.cc_create_corr_id, me->order.cc_order_key, @@ -220,16 +225,14 @@ void CCAPISingleOrderManager::handle_trade_sub_update( me->buffered_trades.push_back(trade_msg); break; case State::WORKING: - if (me->order.cc_order_key != trade_msg.order_id) - return; - me->accumulated_fills += trade_msg.last_exec_qty; - me->order.cb_trades.emplace_back(trade_msg); + bts_assert(me->order.cc_order_key == trade_msg.order_id); + me->order.add_trade(trade_msg); break; case State::END_WAITING_FOR_FILLS: - me->accumulated_fills += trade_msg.last_exec_qty; - me->order.cb_trades.emplace_back(trade_msg); + bts_assert(me->order.cc_order_key == trade_msg.order_id); + me->order.add_trade(trade_msg); if (me->fills_accounted()) { - _switch_state(State::END); + _go_to_end_state(); } break; case State::END: @@ -256,22 +259,28 @@ const CCAPIOrderState &CCAPISingleOrderManager::order_state() const { void CCAPISingleOrderManager::_switch_state(State new_state) { LOG(OrderMan, Info, - "CCAPISingleOrderManager::_switch_state ok: {} cc_api_key: {} {} -> {}", + "CCAPISingleOrderManager ok: {} ::_switch_state cc_api_key: {} {} -> {}", me->order.order_key, me->order.cc_order_key, _state_msg(me->state), _state_msg(new_state)); me->state = new_state; } +void CCAPISingleOrderManager::_go_to_end_state() { + bts_assert(me->ter_msg.terminated()); + me->order.status = me->ter_msg.status; + _switch_state(State::END); +} + std::string CCAPISingleOrderManager::_state_msg( CCAPISingleOrderManager::State state) { switch (state) { - case State::WAITING_FOR_ID: + case CCAPISingleOrderManager::State::WAITING_FOR_ID: return "WaitingForID"; - case State::WORKING: + case CCAPISingleOrderManager::State::WORKING: return "Working"; - case State::END_WAITING_FOR_FILLS: + case CCAPISingleOrderManager::State::END_WAITING_FOR_FILLS: return "EndWaitingForFills"; - case State::END: + case CCAPISingleOrderManager::State::END: return "End"; } bts_assert(false); diff --git a/src/lib/orderman/ccapi/CCAPISingleOrderManager.h b/src/lib/orderman/ccapi/CCAPISingleOrderManager.h index da22e3346..45145dd84 100644 --- a/src/lib/orderman/ccapi/CCAPISingleOrderManager.h +++ b/src/lib/orderman/ccapi/CCAPISingleOrderManager.h @@ -12,7 +12,7 @@ struct CCAPITradeMsg; struct CCAPIOrderState; // Handles the state management for a single order. The complexity here -// is that the +// is that the class CCAPISingleOrderManager { public: @@ -50,6 +50,7 @@ class CCAPISingleOrderManager { PImpl *me; enum class State; void _switch_state(State new_state); + void _go_to_end_state(); std::string _state_msg(State new_state); bool _relevent_update(const std::string &cc_ord_key) const; };