diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 841e32391..0eb9488fb 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -83,6 +83,7 @@ namespace mbts.spark { add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), new DoubleMinMax(r => r.fill.LastShares), DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size); add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), new DoubleMinMax(r => r.fill.LastPrice), DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price); add_col(Columns.FillKind, DefaultColumnHeaders.FillKind, r => r.fill_kind.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillKind), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind); + add_col(Columns.FillStatus, DefaultColumnHeaders.FillStatus, r => r.fill_status.ToString(), dv_filter(EnumHelper.get_values().ToArray(), r => r.fill.FillStatus), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.FillKind); add_col(Columns.FillKey, DefaultColumnHeaders.FillKey, r => r.fill_key.ToString(), new RegexFilterVM(r => r.fill.FillKey), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.FillKey); add_col(Columns.OrderKey, DefaultColumnHeaders.OrderKey, r => r.order_key.ToString(), new RegexFilterVM(r => r.fill.OrderKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.OrderKey); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), new RegexFilterVM(r => r.fill.SecurityKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); @@ -182,6 +183,7 @@ namespace mbts.spark { case Columns.Exchange: return wrap_default(ft => ft.security.exchange_or_default()); case Columns.FillKey: return wrap(ft => ft.fill.FillKey); case Columns.FillKind: return wrap_default(ft => ft.fill.FillKind); + case Columns.FillStatus: return wrap_default(ft => ft.fill.FillStatus); case Columns.FillTime: return wrap(ft => ft.fill.Timestamp.to_local_time()); case Columns.OrderKey: return wrap(ft => ft.fill.OrderKey); case Columns.OrderType: return wrap_default(ft => ft.order?.order_type() ?? OrderType.None); @@ -241,6 +243,7 @@ namespace mbts.spark { public double price => _fill.LastPrice; public double size => _fill.LastShares; public FillKind fill_kind => _fill.FillKind; + public FillStatus fill_status => _fill.FillStatus; public string fill_key => _fill.FillKey; public string order_key => _order.Key.ToString(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index 55fb8fe2e..d53ca3810 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -7,7 +7,7 @@ namespace mbts.ui.spark { /// Interaction logic for FillsView.xaml /// partial class FillsView : UserControl { - public enum Columns { FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillKind, FillKey, OrderKey, SecurityKey } + public enum Columns { FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillKind, FillStatus, FillKey, OrderKey, SecurityKey } public FillsView() => InitializeComponent(); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs index 939bef5a0..ef19a8a68 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs @@ -86,6 +86,7 @@ namespace bts.shell { public static GridColumnSettings quantity => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings fill_kind => new GridColumnSettings(col_id(Columns.FillKind), DefaultColumnHeaders.FillKind, width: DefaultColumnWidths.FillKind); + public static GridColumnSettings fill_status => new GridColumnSettings(col_id(Columns.FillStatus), DefaultColumnHeaders.FillStatus, width: DefaultColumnWidths.FillKind); public static GridColumnSettings fill_key => new GridColumnSettings(col_id(Columns.FillKey), DefaultColumnHeaders.FillKey, width: DefaultColumnWidths.FillKey); public static GridColumnSettings order_key => new GridColumnSettings(col_id(Columns.OrderKey), DefaultColumnHeaders.OrderKey, width: DefaultColumnWidths.OrderKey); public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey); @@ -108,6 +109,7 @@ namespace bts.shell { yield return quantity; yield return price; yield return fill_kind; + yield return fill_status; yield return fill_key; yield return order_key; yield return security_key; @@ -200,6 +202,10 @@ namespace bts.shell { [ProtoMember(14)] [DIYGridColumnID(nameof(Columns.FillKind))] public Fill.Types.FillKind[] fill_kind { get; set; } + + [ProtoMember(15)] + [DIYGridColumnID(nameof(Columns.FillStatus))] + public Fill.Types.FillStatus[] fill_status { get; set; } } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 4bf15f346..270bc14db 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -96,6 +96,7 @@ namespace mbts.ui.controls { SessionLow = "Low", SessionHigh = "High", FillKind = "Fill Kind", + FillStatus = "Fill Status", Name = "Name", Description = "Description", N_Legs = "# Legs", diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index b4f6df2aa..6faf7bd07 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -262,6 +262,12 @@ message Fill { FILL_KIND_SOD = 2; } FillKind fill_kind = 10; + + enum FillStatus { + FILL_STATUS_ACTIVE = 0; + FILL_STATUS_BUSTED = 1; + } + FillStatus fill_status = 20; } enum OrderSubType { diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 3d6652726..ee5cd6aa6 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -87,12 +87,13 @@ void FillStore::on_execution_report( if (u.events) { for (auto const &ev : *u.events) { auto &er = *ev.data; + auto fk = fmt::format("{}:{}", er.order_key.value(), + to_str(er.exchange_fill_id)); + auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || - er.exec_type == api::orderman::EXEC_TYPE_FILL) { - - auto fk = fmt::format("{}:{}", er.order_key.value(), - to_str(er.exchange_fill_id)); - auto is_known = me->known_fills.count(fk); + er.exec_type == api::orderman::EXEC_TYPE_FILL || + er.exec_type == api::orderman::EXEC_TYPE_TRADE_CORRECT) { + api::orderman::Fill fill; if (!is_known) { fill.set_order_key(er.order_key.value()); @@ -108,6 +109,7 @@ void FillStore::on_execution_report( fill.set_avg_price(er.avg_price.value()); fill.set_side(er.side); fill.set_last_shares(er.last_shares.value()); + fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); fill.set_fill_key(fk); struct timeval tv; gettimeofday(&tv, NULL); @@ -130,6 +132,21 @@ void FillStore::on_execution_report( "Discarding known execution report for fill {}", fk); } // if partial_fill or fill + else if(er.exec_type == api::orderman::EXEC_TYPE_TRADE_CANCEL) + { + //TODO SOD + auto data = me->store->retrieve_one(fills_ns, fk); + Fill existing_fill; + if(is_known && data.first && utils::pb::from_string(data.second, &existing_fill)) + { + existing_fill.set_fill_status(api::orderman::Fill::FILL_STATUS_ACTIVE); + auto fv = utils::pb::to_string(existing_fill); + me->store->update(fills_ns, fk, fv); + publish(me->fill_stream, existing_fill, *er.security); + } + else + LOG(OrderMan, Warn, "Received bust for unknown fill {}", fk); + } } // for loop } // if u.events } diff --git a/src/lib/orderman/actors/ICEExecutionGateway.cpp b/src/lib/orderman/actors/ICEExecutionGateway.cpp index 8fd446604..afc6584d7 100644 --- a/src/lib/orderman/actors/ICEExecutionGateway.cpp +++ b/src/lib/orderman/actors/ICEExecutionGateway.cpp @@ -329,8 +329,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg return; } leg_security = it->second; - } - + } std::string text_msg; if (msg.has()) text_msg = msg.get(); @@ -343,6 +342,7 @@ void ICEExecutionGateway::on_exe_report(const jetfix::fix::ICEExecutionReportMsg // allocate from our pool auto data = me->exe_report_pool.construct(); + data->memo = msg.get(); data->exec_type = api::orderman::ExecType(msg.get()); data->msg_seq_num = msg.get(); diff --git a/src/lib/orderman/actors/SODPosition.cpp b/src/lib/orderman/actors/SODPosition.cpp index 18f6d83c4..b1dbb2d74 100644 --- a/src/lib/orderman/actors/SODPosition.cpp +++ b/src/lib/orderman/actors/SODPosition.cpp @@ -141,7 +141,7 @@ void SODPosition::_zero_pos(Fill &pos, const Fill &fill, api::Side side) { } bool SODPosition::add_fill_to_sod_pos(const Fill &fill) { - if (_enabled && fill.timestamp().seconds() < _sod_time.tv_sec) { + if (_enabled && fill.fill_status() == api::orderman::Fill::FILL_STATUS_ACTIVE && fill.timestamp().seconds() < _sod_time.tv_sec) { uint32_t seckey = fill.security_key(); const std::string &acct = fill.account(); auto acct_it = _sod_map.find(acct); diff --git a/src/lib/orderman/orderman_utils/ExecutionReport.h b/src/lib/orderman/orderman_utils/ExecutionReport.h index 49497a5b1..1fa1c0b55 100644 --- a/src/lib/orderman/orderman_utils/ExecutionReport.h +++ b/src/lib/orderman/orderman_utils/ExecutionReport.h @@ -36,6 +36,7 @@ public: std::string msg; api::Venue exchange; int64_t ice_cl_ord_id; + std::string memo; }; }} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index dd8148a62..aef39bf9e 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -296,10 +296,11 @@ void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const if (data != nullptr) { bts_assert(data->id == msg.marketId); - onixs_ice::Price price = msg.settlementPrice; - onixs_ice::DateTime time = msg.dateTime; + auto price = msg.settlementPrice; + auto time = msg.dateTime; auto denominator = data->handle.security().ice_settle_denominator; auto prx = convert_price(price, denominator); + LOG(md,Warn, "OnixSICE Got Settlement: {} - {}", std::to_string(data->id), std::to_string(prx.price())); data->handle.update_settlement(utils::TimeStamp::now(), prx, date_of_timestamp(time)); } }