diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 24a428934..2ddfba053 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,25 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.7.0 +### User Visible Changes + - Allowed algos to process "in-flight" fills while shutting down + - Changed the cover algo to continue to hedge while shutting down +### API Changes + - Changed the API so that algos do not fully terminate until all + their children are terminated. Algos that are in the process of + shutting down in response to a complete or cancel call will still + receive child updates, which they can use to calculate and report + an accurate fill count (during this shutdown stage algos cannot + create, cancel or update children). A new IAlgoServices method, + is_shutting_down(), can be used to determine if an algo is + shutting down. + +## 2.6.2 +### User Visible Changes + - Fixed an issue in the ladder where in some cases the mini order book could not be brought up from a badge + - Fixed a rare race condition that could lead to erroneous limit enforcement + - Fixed an issue with the margin limits where an error could occur if an account name with more than 12 chars was used ## 2.6.1 ### User Visible Changes diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 52c09c565..5545761d4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -144,7 +144,7 @@ namespace bts.shell.orderbook { pb.add_discrete_values(fs.symbols, o => o.security?.Symbol); // numeric pb.add_numeric(fs.qty, o => o.order.quantity()); - pb.add_numeric(fs.price, o => o.order.price()); + pb.add_price(fs.price, o => o.order.price(), o => o.security); pb.add_numeric(fs.qty_filled, o => o.order.filled()); pb.add_numeric(fs.avg_price, o => o.order.avg_price()); pb.add_numeric(fs.last_price, o => o.order.last_price()); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs index 03ee224f3..7d8833c00 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnPredicateBuilder.cs @@ -37,6 +37,51 @@ namespace mbts.spark.filters { _predicates.Add(impl); bool impl(TRow o) => max.CompareTo(selector(o)) >= 0; } + } + + // this is a copy of add_numeric except we do a tick_equals comparsion + // if the ticks are not equals, then it falls back to a regular double comparison + // + // if the SecurityImmutable? doesn't have a value + // then we fallback to double comparison + public void add_price(DoubleMinMaxState value, Func selector, Func si_selector) { + if (value == null) + return; + if (value.minimum.active) { + var min = value.minimum.value.Value; + if (value.maximum.active) { + var max = value.maximum.value.Value; + _predicates.Add(impl); + bool impl(TRow o) { + var v = selector(o); + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(min, v) <= 0 && + si.Value.ContractSpec.compare_tick_fallback_to_double(max, v) >= 0; + } + return min.CompareTo(v) <= 0 && max.CompareTo(v) >= 0; + } + } else { + _predicates.Add(impl); + bool impl(TRow o) { + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(min, selector(o)) <= 0; + } + return min.CompareTo(selector(o)) <= 0; + } + } + } else if (value.maximum.active) { + var max = value.maximum.value.Value; + _predicates.Add(impl); + bool impl(TRow o) { + var si = si_selector(o); + if (si.HasValue) { + return si.Value.ContractSpec.compare_tick_fallback_to_double(max, selector(o)) >= 0; + } + return max.CompareTo(selector(o)) >= 0; + } + } } public void add_regex(string str, Func selector) { diff --git a/src/client/spark/view/Spark/Core/TickUtils.cs b/src/client/spark/view/Spark/Core/TickUtils.cs index 5a2a7d5e6..8144dd74a 100644 --- a/src/client/spark/view/Spark/Core/TickUtils.cs +++ b/src/client/spark/view/Spark/Core/TickUtils.cs @@ -128,6 +128,9 @@ namespace mbts.spark { public static IEqualityComparer tick_equality_comparer(this ContractSpecificationImmutable contract) => EqualityComparer.Create((double a, double b) => tick_equals(contract, a, b), x => MathUtils.RoundFractionalUnits(x, contract.LowTick)); + public static int compare_tick_fallback_to_double(this ContractSpecificationImmutable contract, double x, double y) => + tick_equals(contract, x, y) ? 0 : x.CompareTo(y); + public static double round_to_tick(this ContractSpecificationImmutable spec, double value) { double intpart = (long)value; double floatpart = value % 1; diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 6117c69f1..6b112a9cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -11,19 +11,7 @@ namespace orderman { using namespace api::orderman; enum class CoverAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE, CANCELING }; -const char *CoverAlgo::status_name(Status st) { - switch (st) { - case Status::WORKING: - return "WORKING"; - case Status::WAITING_FOR_HEDGES: - return "WAITING_FOR_HEDGES"; - case Status::DONE: - return "DONE"; - case Status::CANCELING: - return "CANCELING"; - } - return nullptr; -} + struct CoverAlgo::PImpl { IAlgoServices *algo; OrderKey child_key = null_order_key(); @@ -94,8 +82,11 @@ void CoverAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, on_child_change(k, st); } -void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { - if (k == me->child_key) { +void CoverAlgo::on_covered_change(ChildState const &st) { + // First launch hedge if appropriate + switch (me->status) { + case Status::WORKING: + case Status::CANCELING: if (st.total_fills.value() > me->hedged_fills.value()) { auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); @@ -118,6 +109,15 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { hedge_qty.value(), hedge_price.value()); } algo().update_fill_state(st.total_fills, st.last_price); + break; + case Status::WAITING_FOR_HEDGES: + case Status::DONE: + break; + } + + // Now analyze child to figure out wheter we should terminate + switch (me->status) { + case Status::WORKING: switch (st.status) { case ChildStatus::WORKING: break; @@ -126,49 +126,70 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { "CoverAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); algo().set_ladder_visibility(false); - if (me->status == Status::WORKING) - me->status = Status::WAITING_FOR_HEDGES; - else { - me->status = Status::DONE; - algo().cancel(); - } + me->status = Status::WAITING_FOR_HEDGES; + check_terminate(); break; case ChildStatus::CANCELED: - if (me->status == Status::WORKING) { - LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); - } else if (me->status == Status::CANCELING) { - me->status = Status::DONE; - algo().cancel(); - } + LOG(OrderMan, Info, "CoverAlgo {}. Child was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); break; } - } else { + break; + case Status::CANCELING: switch (st.status) { case ChildStatus::WORKING: break; case ChildStatus::CANCELED: - if (me->cancel_on_external_hedge_cancel) { - LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); - } else - me->hedges.erase( - std::remove(me->hedges.begin(), me->hedges.end(), k), - me->hedges.end()); - break; case ChildStatus::COMPLETED: - me->hedges.erase(std::remove(me->hedges.begin(), me->hedges.end(), k), - me->hedges.end()); + LOG(OrderMan, Info, "CoverAlgo {}. Shutdown complete", + algo().order_key().value()); + me->status = Status::DONE; + algo().cancel(); break; } + break; + case Status::WAITING_FOR_HEDGES: + case Status::DONE: + break; } +} + +void CoverAlgo::on_hedge_change(OrderKey k, ChildState const &st) { + + // First adjust our hedge count or cancel if something went wrong + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + me->hedges.erase(std::remove(me->hedges.begin(), me->hedges.end(), k), + me->hedges.end()); + break; + case ChildStatus::CANCELED: + if (me->cancel_on_external_hedge_cancel) { + LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + return; + } else + me->hedges.erase(std::remove(me->hedges.begin(), me->hedges.end(), k), + me->hedges.end()); + break; + } + + // Now if we are waiting for hedges to complete, bail check_terminate(); } +void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { + if (k == me->child_key) + on_covered_change(st); + else + on_hedge_change(k,st); +} + void CoverAlgo::do_update(api::orderman::Update const &update) { if (me->status == Status::WORKING) { LOG(OrderMan, Diag, "CoverAlgo order {} receiving update: {}", @@ -243,6 +264,10 @@ IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { for (auto &k : me->hedges) algo().detach_child(k); algo().cancel_child(me->child_key); + + LOG(OrderMan, Info, + "CoverAlgo {} received cancel. Canceling child and waiting for an ack", + algo().order_key()); me->status = Status::CANCELING; return IAlgoOrder::OnCancelResponse::IGNORE; } @@ -259,5 +284,19 @@ IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { return IAlgoOrder::OnCancelResponse::HONOR; } +const char *CoverAlgo::status_name(Status st) { + switch (st) { + case Status::WORKING: + return "WORKING"; + case Status::WAITING_FOR_HEDGES: + return "WAITING_FOR_HEDGES"; + case Status::DONE: + return "DONE"; + case Status::CANCELING: + return "CANCELING"; + } + return nullptr; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 24fb06cf5..86904a2fc 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -31,6 +31,9 @@ private: void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); void check_terminate(); + + void on_hedge_change(OrderKey hedge, ChildState const&) ; + void on_covered_change(ChildState const&); const char *status_name(Status st); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp index f93231c57..897a366ff 100644 --- a/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/IcebergAlgo.cpp @@ -145,7 +145,7 @@ void IcebergAlgo::on_child_change(OrderKey k, ChildState const &st) { on_timer(); return; case ChildStatus::CANCELED: - algo().terminate_error("Unexpected child cancel"); + algo().cancel("Unexpected child cancel"); return; } } diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index 3fce29a98..1bbe3c362 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -33,7 +33,7 @@ int Span::execute(const std::vector&) auto& disp = utils::Dispatcher::current(); MarginServiceCore core(disp); - auto acct = orderman::to("ACC A"); + auto acct = std::string("ACC A"); Position p; p.security_desc = "ESU9"; p.account = acct; diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index cca8fa8c2..79faf20df 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -28,7 +28,7 @@ namespace bts namespace position { -using MarginMap = boost::container::flat_map; +using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { @@ -314,10 +314,9 @@ struct MarginServiceCore::PImpl } }; - bool compute_margin(const orderman::AccountName& acct, const std::string& portfolid_id, + bool compute_margin(const std::string& account_name, const std::string& portfolid_id, const std::vector& pos, std::function cb) { - auto account_name = orderman::to_trim_str(acct); pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); @@ -384,7 +383,7 @@ MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(dis MarginServiceCore::~MarginServiceCore() {} -void MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, +void MarginServiceCore::compute_margin(const std::string& acct, const std::vector& pos, std::function cb) { me->dispatcher.post([=] () @@ -393,7 +392,7 @@ void MarginServiceCore::compute_margin(const orderman::AccountName& acct, const }, me->throttle); } -bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, +bool MarginServiceCore::query_margin_webapi(const std::string& acct, const std::vector& pos, std::function cb) { utils::Uuid guid; @@ -425,7 +424,7 @@ void MarginServiceCore::set_verbose_debugging(bool verb) me->verbose = verb; } -bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::get_last_valid_result(const std::string& acct, MarginResult& result) { auto it = me->last_valid_results.find(acct); if(it != me->last_valid_results.end()) @@ -436,7 +435,7 @@ bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, return false; } -bool MarginServiceCore::get_last_result(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::get_last_result(const std::string& acct, MarginResult& result) { auto it = me->last_results.find(acct); if(it != me->last_results.end()) diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index 55da6185b..c4b7d7f8e 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -22,18 +22,18 @@ public: MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - void compute_margin(const orderman::AccountName&, const std::vector&, + void compute_margin(const std::string&, const std::vector&, std::function); void set_verbose_debugging(bool); - bool get_last_valid_result(const orderman::AccountName&, api::position::MarginResult&); - bool get_last_result(const orderman::AccountName&, api::position::MarginResult&); + bool get_last_valid_result(const std::string&, api::position::MarginResult&); + bool get_last_result(const std::string&, api::position::MarginResult&); private: friend class PositionTests; //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, const std::vector&, + bool query_margin_webapi(const std::string&, const std::vector&, std::function); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 2b3c790b0..723c95e7b 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -43,14 +43,10 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _last_report(), _first_time(true) { - LOG(Gen, Info, "MarginServiceServer: service started"); + if(!config::get().enabled()) + return; - // _admin_service.get_admin_data(api::VoidMessage(), - // [=] (const bts::api::Result<::bts::api::admin::AdminData> r) - // { - // if(r.value()) - // _admin_data = *r.value(); - // }); + LOG(Gen, Info, "MarginServiceServer: service started"); _admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( @@ -91,8 +87,7 @@ void MarginServiceServer::publish_all() if(_position->query_positions(acct, pos, pnl, &since) && pos.size()) { LOG(Gen, Info, "MarginServiceServer: requesting margin for {} ", acct); - auto aname = orderman::to(acct); - _margin->compute_margin(aname, pos, [this, since, acct, pnl](const MarginResult& m) + _margin->compute_margin(acct, pos, [this, since, acct, pnl](const MarginResult& m) { std::scoped_lock l(_lock); publish_margin(m); @@ -117,11 +112,9 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request } else { - orderman::AccountName acct; - orderman::str_to(request.account(), &acct); std::vector pos; AccountPNL pnl; _position->query_positions(request.account(), pos, pnl); - _margin->compute_margin(acct, pos, [=](const MarginResult& m) + _margin->compute_margin(request.account(), pos, [=](const MarginResult& m) { reply(m); }); @@ -183,7 +176,7 @@ void MarginServiceServer::incremental_update_report(const std::string& account, std::scoped_lock l(_lock); MarginResult margin; - if(!_margin->get_last_valid_result(orderman::to(account), margin)) + if(!_margin->get_last_valid_result(account, margin)) { margin.Clear(); margin.set_account(account); @@ -203,6 +196,13 @@ void MarginServiceServer::incremental_update_report(const std::string& account, void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) { + if(!config::get().enabled()) + { + api::ResultMessage resp; resp.set_success(true); + reply(resp); + return; + } + std::scoped_lock l(_lock); auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); if(!acct) @@ -234,6 +234,13 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) { + if(!config::get().enabled()) + { + api::ResultMessage resp; resp.set_success(true); + reply(resp); + return; + } + std::scoped_lock l(_lock); auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); if(!acct) @@ -265,6 +272,13 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan void MarginServiceServer::set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) { + if(!config::get().enabled()) + { + api::ResultMessage resp; resp.set_success(true); + reply(resp); + return; + } + std::scoped_lock l(_lock); auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); if(!acct) diff --git a/src/server/sparkd/position/Position.h b/src/server/sparkd/position/Position.h index c36fab8c0..721da10c3 100644 --- a/src/server/sparkd/position/Position.h +++ b/src/server/sparkd/position/Position.h @@ -6,7 +6,7 @@ namespace bts { namespace position { struct Position { - orderman::AccountName account; + std::string account; std::string security_desc; Quantity position; api::Side side; diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 4d42ed6cd..af18e4417 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -112,7 +112,7 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector if(sec && sec->has_glbx() && sec->has_future()) { Position pos; - pos.account = orderman::to(account); + pos.account = account; pos.security_desc = securities::descriptor(*sec); eraseSubStr(pos.security_desc, "SIM:"); int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index f73a0178f..7c3fdf022 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -84,16 +84,12 @@ me(new PImpl(context, rxcpp::operators::subscribe( [this](auto const& update) { for (const auto& f : update.removed()) - if(_valid_account_id(*f)) - me->publisher.add_or_update(_on_fill(*f,false)); + me->publisher.add_or_update(_on_fill(*f,false)); for (const auto& f : update.added()) - if(_valid_account_id(*f)) - me->publisher.add_or_update(_on_fill(*f,true)); + me->publisher.add_or_update(_on_fill(*f,true)); for (const auto& f : update.changed()) { - if(_valid_account_id(*f.previous()) && _valid_account_id(*f.current())){ - me->publisher.add_or_update(_on_fill(*f.previous(),false)); - me->publisher.add_or_update(_on_fill(*f.current(),true)); - } + me->publisher.add_or_update(_on_fill(*f.previous(),false)); + me->publisher.add_or_update(_on_fill(*f.current(),true)); } me->publisher.flush(); _compute_pnl_and_publish();