From 5135a21dc24a470415053210ce7c350804a6e92a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 23 May 2019 15:27:41 -0400 Subject: [PATCH 001/210] ProRata and Scratch Algos --- src/lib/api/services/OrderService.proto | 18 ++ .../orderman/events/OrderStateUpdateEvent.h | 6 + .../orderman/order_factory/OrderFactory.cpp | 10 + .../orders/algo/algo_orders/ProRataAlgo.cpp | 218 ++++++++++++++++++ .../orders/algo/algo_orders/ProRataAlgo.h | 37 +++ .../orders/algo/algo_orders/ScratchAlgo.cpp | 210 +++++++++++++++++ .../orders/algo/algo_orders/ScratchAlgo.h | 36 +++ 7 files changed, 535 insertions(+) create mode 100644 src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h create mode 100644 src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index b16c4d584..9e4ffa534 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -100,6 +100,8 @@ message CustomOrderDefinition OCOOrderDefinition oco = 25; PricerOrderDefinition pricer = 26; CompositeOrderDefinition composite = 27; + ScratchOrderDefinition scratch = 28; + ProRataOrderDefinition prorata = 29; DynamicOrderDefinition dynamic = 1000; } @@ -197,6 +199,18 @@ message CompositeOrderDefinition { uint32 algo_template_key = 1; CustomOrderDefinition definition = 2; } +message ScratchOrderDefinition { + spark.QuantityMeasure scratch_threshold = 1; + CustomOrderDefinition child = 10; +} +message ProRataOrderDefinition { + spark.QuantityMeasure fill_limit = 1; + spark.QuantityMeasure scratch_threshold = 2; + spark.QuantityMeasure stay_in_threshold = 3; + bool enable_scratch_on_overfill = 4; + bool enable_stay_in = 5; + CustomOrderDefinition child = 10; +} message DynamicOrderDefinition { string dynamic_order_type = 1; map order_params = 2; @@ -249,6 +263,8 @@ message OrderState { QueueHolderState queue_holder = 30; OCOOrderState oco = 25; PricerOrderState pricer = 26; + ScratchOrderState scratch = 27; + ProRataOrderState prorata = 28; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } @@ -324,6 +340,8 @@ message CoverOrderState {} message OffsetOrderState {} message OCOOrderState {} message PricerOrderState {} +message ScratchOrderState {} +message ProRataOrderState {} message DynamicOrderState {} message QueueHolderState {} diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index 7556ce6b4..af86ddf3a 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -146,6 +146,12 @@ class OrderStateUpdateEvent : public mercury::Event { case api::orderman::OrderState::kPricer: result.mutable_pricer(); break; + case api::orderman::OrderState::kScratch: + result.mutable_scratch(); + break; + case api::orderman::OrderState::kProrata: + result.mutable_prorata(); + break; case api::orderman::OrderState::kDynamic: result.mutable_dynamic(); break; diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 2cbac4d4b..b83c35e57 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -19,6 +19,8 @@ #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" @@ -193,6 +195,14 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kPricer: order_ptr.reset(new orderman::PricerOrder()); break; + case CustomOrderDefinition::kScratch: + order_ptr.reset( + new orderman::AlgoWrapperOrder(std::make_unique())); + break; + case CustomOrderDefinition::kProrata: + order_ptr.reset( + new orderman::AlgoWrapperOrder(std::make_unique())); + break; case CustomOrderDefinition::kDynamic: { order_ptr = me->dynamic_order_registry.build( def.custom_def().dynamic().dynamic_order_type()); diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp new file mode 100644 index 000000000..14666bcbf --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -0,0 +1,218 @@ +#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" + +#include "lib/domain_model/Security.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +enum class ProRataAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE }; +const char *ProRataAlgo::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"; + } + return nullptr; +} +struct ProRataAlgo::PImpl { + IAlgoServices *algo; + OrderKey child_key = null_order_key(); + Price price_improvement_delta; + ChildTemplate *child_template = nullptr; + ChildTemplate *hedge_template = nullptr; + Quantity hedged_fills = Quantity(0); + Status status = Status::WORKING; + std::vector hedges; +}; + +ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} +ProRataAlgo::~ProRataAlgo() {} +IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } + +OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { + auto &def = serv.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_cover()); + + // Validate the cover part of the definition + auto &cover = def.custom_def().cover(); + if (!cover.has_child() && + OrderKey(def.attach_target_order_key()) == null_order_key()) { + return OrderOpResult{ + ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Cover order must have either a child order definition or an " + "order to attach to"}; + } + + if (!cover.has_hedge()) + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Cover order must have a hedge order definition"}; + if (!serv.is_attaching()) { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().cover().child(); + me->child_template = &(serv.make_child_template(child_def)); + } + + init_hedge_template(serv, cover.hedge()); + set_price_improvement_delta(serv, cover); + return {}; +} + +void ProRataAlgo::do_launch(IAlgoServices &algo) { + me->algo = &algo; + LOG(OrderMan, Diag, "Starting ProRataAlgo {}, {} {}@{}. Will cover {} ticks", + algo.order_key().value(), + securities::side_name(algo.definition().side()), algo.quantity().value(), + algo.price().value(), + algo.definition().custom_def().cover().hedge_ticks()); + + LOG(OrderMan, Diag, "ProRataAlgo {} launching child", + algo.order_key().value()); + me->child_key = + algo.launch_child(*me->child_template, algo.price(), algo.quantity()); +} + +void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, + ChildState st) { + me->algo = &algo; + me->child_key = k; + me->hedged_fills = st.total_fills; + on_child_change(k, st); +} + +void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) { + if (k == me->child_key) { + if (st.total_fills.value() > me->hedged_fills.value()) { + auto hedge_qty = + Quantity(st.total_fills.value() - me->hedged_fills.value()); + auto hedge_price = securities::improve_price( + algo().definition().side(), st.last_price, + me->price_improvement_delta); + + auto hedge = + algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); + me->hedges.push_back(hedge); + + me->hedged_fills = + Quantity(hedge_qty.value() + me->hedged_fills.value()); + LOG(OrderMan, Diag, + "ProRataAlgo {}, launched new hedge in response to child fill. " + "Hedge: " + "{} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); + } + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + LOG(OrderMan, Info, + "ProRataAlgo {}. Child is completed, waiting for hedges ", + algo().order_key().value()); + me->status = Status::WAITING_FOR_HEDGES; + break; + case ChildStatus::CANCELED: + LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + break; + } + } else { + switch (st.status) { + case ChildStatus::WORKING: + break; + case ChildStatus::COMPLETED: + if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); + it != me->hedges.end()) + me->hedges.erase(it); + break; + case ChildStatus::CANCELED: + LOG(OrderMan, Info, "ProRataAlgo {}. Hedge was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + break; + } + } + check_terminate(); +} + +void ProRataAlgo::do_update(api::orderman::Update const &update) { + if (me->status == Status::WORKING) { + LOG(OrderMan, Diag, "ProRataAlgo order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + + if (update.has_custom() && !update.custom().has_cover()) { + algo().terminate_error("Invalid update"); + return; + } + + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); + + // process custom part of the udpate if any + if (update.has_custom()) { + auto &cover_update = update.custom().cover(); + set_price_improvement_delta(algo(), cover_update); + if (cover_update.has_child()) { + *child_update.mutable_custom() = cover_update.child(); + } + if (cover_update.has_hedge()) + init_hedge_template(algo(), cover_update.hedge()); + } + algo().update_child(me->child_key, child_update); + } else { + LOG(OrderMan, Info, + "ProRataAlgo {}. Received update after child has completed. Ignoring " + "it.", + algo().order_key().value()); + } +} + +void orderman::ProRataAlgo::init_hedge_template( + IBeforeLaunchAlgoServices &algo, + api::orderman::CustomOrderDefinition const &hedge_cdef) { + auto hedge_def = algo.definition(); + hedge_def.set_side(securities::other_side(algo.definition().side())); + hedge_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); + hedge_def.clear_attach_target_order_key(); + *hedge_def.mutable_custom_def() = hedge_cdef; + me->hedge_template = &(algo.make_child_template(hedge_def)); +} + +void ProRataAlgo::set_price_improvement_delta( + IBeforeLaunchAlgoServices &serv, + api::orderman::CoverOrderDefinition const &cover) { + me->price_improvement_delta = Price( + securities::tick_size(serv.security()).value() * cover.hedge_ticks()); +} + +void ProRataAlgo::check_terminate() { + LOG(OrderMan, Diag, + "ProRataAlgo {} check_terminate. State: {} Hedge count: {}", + algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, + me->hedges.size()); + + if (me->status == Status::WAITING_FOR_HEDGES && me->hedges.empty()) { + LOG(OrderMan, Info, "ProRataAlgo {}. Last hedge completed, terminating", + algo().order_key().value()); + algo().complete(); + } +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h new file mode 100644 index 000000000..71b68b465 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -0,0 +1,37 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +// Cover initializes the child order as normal. Fills trigger hedge +// orders to the opposite side of the market, n ticks away. + +class ProRataAlgo : public IAlgoOrder { +public: + ProRataAlgo(); + ~ProRataAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_child_change(OrderKey, ChildState const &) override; + +private: + struct PImpl; + enum class Status; + std::unique_ptr me; + IAlgoServices &algo() const; + void + set_price_improvement_delta(IBeforeLaunchAlgoServices &, + api::orderman::CoverOrderDefinition const &); + void init_hedge_template(IBeforeLaunchAlgoServices &, + api::orderman::CustomOrderDefinition const &); + void check_terminate(); + const char *status_name(Status st); +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp new file mode 100644 index 000000000..8d3936a08 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -0,0 +1,210 @@ +#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" + +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using namespace api::orderman; + +enum class ScratchAlgo::Status { WAITING_FOR_MD, WAITING_TO_SCRATCH, SCRATCHED }; + +struct ScratchAlgo::PImpl +{ + IAlgoServices *algo; + Quantity scratch_threshold; + Status status = Status::WAITING_FOR_MD; + OrderKey child_key = null_order_key(); + ChildTemplate *child_template = nullptr; + Book last_book; + Price scratch_price=Price(os::nan()); +}; + +ScratchAlgo::ScratchAlgo() : me(new PImpl()) {} +ScratchAlgo::~ScratchAlgo() {} +IAlgoServices &ScratchAlgo::algo() const { return *me->algo; } + +OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) +{ + auto &def = serv.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_scratch()); + + // Validate the scratch part of the definition + auto &scratch = def.custom_def().scratch(); + if (!scratch.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) + { + return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Scratch order must have either a child order definition or an order to attach to"}; + } + if (!serv.is_attaching()) + { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().scratch().child(); + me->child_template = &(serv.make_child_template(child_def)); + } + return {}; +} + +void ScratchAlgo::do_launch(IAlgoServices &algo) +{ + me->algo = &algo; + update_scratch_threshold(); + bts_assert(me->child_template); + me->child_key = algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + algo.subscribe_book(SecurityKey(algo.security().id())); +} + +void ScratchAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState st) +{ + me->algo = &algo; + update_scratch_threshold(); + me->child_key = k; + algo.subscribe_book(SecurityKey(algo.security().id())); + on_child_change(k, st); +} + +void ScratchAlgo::do_update(api::orderman::Update const &update) +{ + LOG(OrderMan, Diag, "ScratchOrder order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); + if (update.has_custom() && !update.custom().has_scratch()) + { + algo().terminate_error("Invalid update"); + return; + } + + Update child_update; + Price price_to_pass = get_price_to_pass(Price(update.price())); + child_update.set_price(price_to_pass.value()); + child_update.set_quantity(update.quantity()); + if (update.has_custom()) + { + update_scratch_threshold(); + auto &scratch_update = update.custom().scratch(); + *child_update.mutable_custom() = scratch_update.child(); + } + algo().update_child(me->child_key, child_update); + + // If we were not yet scratched it is possible we now can, since we + // could have changed the scratch_threshold + if (me->status == Status::WAITING_TO_SCRATCH) + try_to_scratch(); +} + +void ScratchAlgo::on_book(SecurityKey, Book const &b) +{ + me->last_book = b; + + LOG(OrderMan, Diag, "ScratchOrder order {} on book. BID: {}@{} ASK: {}@{}", + algo().order_key().value(), b.side(api::SIDE_BUY)[0].size(), + b.side(api::SIDE_BUY)[0].price(), b.side(api::SIDE_SELL)[0].size(), + b.side(api::SIDE_SELL)[0].price()); + + switch (me->status) + { + case Status::WAITING_FOR_MD: + { + auto other_side = securities::other_side(algo().definition().side()); + auto &other_side_top = me->last_book.side(other_side)[0]; + + if (other_side_top.size() > 0) + { + me->status = Status::WAITING_TO_SCRATCH; + LOG(OrderMan, Diag, + "ScratchOrder order {} receiving first book: {} Target: {}", + algo().order_key().value(), me->scratch_threshold.value(), + other_side_top.price()); + try_to_scratch(); + } + } break; + case Status::SCRATCHED: + break; + case Status::WAITING_TO_SCRATCH: + try_to_scratch(); + break; + } +} + +void ScratchAlgo::try_to_scratch() +{ + bts_assert(me->status == Status::WAITING_TO_SCRATCH); + auto my_side = algo().definition().side(); + auto other_side = securities::other_side(my_side); + + Quantity my_quan; + bool found = SpreaderUtils::find_qty_upto_price_level(me->last_book, my_side, algo().price(), /*unused*/ 0.0, my_quan); + auto &my_side_psz = me->last_book.side(my_side)[0]; + if (found && my_quan.value() <= me->scratch_threshold.value()) + { + Price scratch_price; + Quantity scratch_quan; + SpreaderUtils::traverse_depth_for_quantity(me->last_book, other_side, algo().quantity(), scratch_price, scratch_quan); + LOG(OrderMan, Diag, "ScratchOrder order {} scratching: {}@{} {}", + algo().order_key().value(), algo().quantity().value(), scratch_price, scratch_quan); + + // Time to scratch + Update child_update; + me->scratch_price = scratch_price; + child_update.set_price(scratch_price.value()); + //we still want to try to scratch all of it + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + me->status = Status::SCRATCHED; + } + else + { + LOG(OrderMan, Diag, + "ScratchOrder order {} still waiting to scratch. Order: {}@{} " + "My side: {}@{}" + "Thresh : {}@{}", + algo().order_key().value(), algo().quantity().value(), algo().price().value(), + my_side_psz.size(), my_side_psz.price(), + me->scratch_threshold.value(), my_quan); + } +} + +Price ScratchAlgo::get_price_to_pass (Price price) const +{ + Price rv; + switch (me->status) { + case Status::WAITING_FOR_MD: + case Status::WAITING_TO_SCRATCH: + rv = price; + break; + case Status::SCRATCHED: + rv = me->scratch_price; + break; + } + return rv; +} + +void ScratchAlgo::update_scratch_threshold() +{ + me->scratch_threshold = SpreaderUtils::_quantity_threshold( + algo().definition().custom_def().scratch().scratch_threshold(), algo().quantity()); +} + +void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) +{ + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) + { + case ChildStatus::WORKING: + return; + case ChildStatus::COMPLETED: + algo().complete(); + return; + case ChildStatus::CANCELED: + algo().cancel("Unexpected child cancel"); + return; + } +} + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h new file mode 100644 index 000000000..d86487366 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h @@ -0,0 +1,36 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +// Scratch monitors the cumulative size on the same side of the market of it's child +// if that size falls below the threshold it will cross the market, paying through enough levels to do all of it's size + +class ScratchAlgo : public IAlgoOrder +{ +public: + ScratchAlgo(); + ~ScratchAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices&) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices&,OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_book(SecurityKey, Book const &) override; + void on_child_change(OrderKey, ChildState const &) override; + +private: + enum class Status; + struct PImpl; + std::unique_ptr me; + + IAlgoServices &algo() const ; + void update_scratch_threshold(); + bool has_running_child() const; + void try_to_scratch(); + Price get_price_to_pass (Price price) const; +}; + +}} From 91bc135c61f50f34a3d31069680aa0a8e489aff3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Thu, 23 May 2019 15:49:12 -0400 Subject: [PATCH 002/210] Fix web ui build --- src/web/ui/src/Accounts/View.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index be6133fbf..f931c6de0 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -28,7 +28,7 @@ let isDirty model = account <> model.scratch | None -> false -let saveButton model dispatch = +let saveButton (model:Model) dispatch = let isNew = isNewAccount model.scratch let buttonText = if isNew then "Create" else "Save" let dirty = isDirty model || isNew @@ -50,7 +50,7 @@ let accountControls model (dispatch:Msg->unit) = // // General // -let generalView model dispatch = +let generalView (model:Model) dispatch = let account = model.scratch @@ -549,7 +549,7 @@ let lazyProductLimitsView model dispatch = productLimits model dispatch -let securityLimitsView model dispatch = +let securityLimitsView (model:Model) dispatch = let headerRow:TableControl.row = { cells = @@ -737,7 +737,7 @@ let ConnectionsView (model:Accounts.Types.Model) dispatch = let creditLimitsView model dispatch = div [] [str "lorem ipsum"] -let exchangeSettings model dispatch = +let exchangeSettings (model:Model) dispatch = let cme = model.scratch.exchangeAccountData.cmeAccountData let sim = model.scratch.exchangeAccountData.simAccountData let send = UpdateCME>>dispatch @@ -760,7 +760,7 @@ let exchangeSettings model dispatch = accountControls model dispatch ] -let tabContent model dispatch = +let tabContent (model:Model) dispatch = div [Key (string model.scratch.id); ClassName "is-tab-content"] [ // (match model.tab with (match model.tab, (accountIsSelected model.scratch Access.Accounts.empty) with From 3a516df5931a1c39fb9b2337791e85db1b74fbfc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 23 May 2019 18:16:20 -0400 Subject: [PATCH 003/210] more prorata --- src/lib/api/services/OrderService.proto | 14 +- .../orders/algo/algo_orders/ProRataAlgo.cpp | 264 +++++++++++------- .../orders/algo/algo_orders/ProRataAlgo.h | 14 +- .../orders/algo/algo_orders/ScratchAlgo.cpp | 7 +- 4 files changed, 191 insertions(+), 108 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 9e4ffa534..75ed9f7b6 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -204,12 +204,16 @@ message ScratchOrderDefinition { CustomOrderDefinition child = 10; } message ProRataOrderDefinition { - spark.QuantityMeasure fill_limit = 1; - spark.QuantityMeasure scratch_threshold = 2; - spark.QuantityMeasure stay_in_threshold = 3; - bool enable_scratch_on_overfill = 4; - bool enable_stay_in = 5; + uint32 hedge_ticks = 1; + spark.QuantityMeasure fill_limit = 2; + spark.QuantityMeasure scratch_threshold = 3; + spark.QuantityMeasure stay_in_threshold = 4; + bool enable_scratch_on_overfill = 5; + bool enable_stay_in = 6; + CustomOrderDefinition child = 10; + CustomOrderDefinition hedge = 20; + CustomOrderDefinition overfill_hedge = 30; } message DynamicOrderDefinition { string dynamic_order_type = 1; diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 14666bcbf..731002886 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -3,6 +3,7 @@ #include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/utils/PBUtils.h" namespace bts { @@ -10,152 +11,224 @@ namespace orderman { using namespace api::orderman; -enum class ProRataAlgo::Status { WORKING, WAITING_FOR_HEDGES, DONE }; -const char *ProRataAlgo::status_name(Status st) { - switch (st) { - case Status::WORKING: - return "WORKING"; - case Status::WAITING_FOR_HEDGES: - return "WAITING_FOR_HEDGES"; +enum class ProRataAlgo::Status { WAITING_FOR_MD, UNDERFILLED, OVERFILLED, DONE }; +const char *ProRataAlgo::status_name(Status st) +{ + switch (st) + { + case Status::WAITING_FOR_MD: + return "WAITING_FOR_MD"; + case Status::UNDERFILLED: + return "UNDERFILLED"; + case Status::OVERFILLED: + return "OVERFILLED"; case Status::DONE: - return "Done"; + return "DONE"; } return nullptr; } -struct ProRataAlgo::PImpl { +struct ProRataAlgo::PImpl +{ IAlgoServices *algo; OrderKey child_key = null_order_key(); - Price price_improvement_delta; + Quantity fill_limit; + Quantity scratch_threshold; + Quantity stay_in_threshold; ChildTemplate *child_template = nullptr; + + Price hedge_ticks; ChildTemplate *hedge_template = nullptr; + ChildTemplate *overfill_hedge_template = nullptr; + Quantity hedged_fills = Quantity(0); - Status status = Status::WORKING; + Status status = Status::WAITING_FOR_MD; std::vector hedges; + std::vector overfill_hedges; + + Book last_book; + Book book_at_inception; }; ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} ProRataAlgo::~ProRataAlgo() {} IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } -OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { +OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) +{ auto &def = serv.definition(); bts_assert(def.has_custom_def()); - bts_assert(def.custom_def().has_cover()); + bts_assert(def.custom_def().has_prorata()); - // Validate the cover part of the definition - auto &cover = def.custom_def().cover(); - if (!cover.has_child() && - OrderKey(def.attach_target_order_key()) == null_order_key()) { - return OrderOpResult{ - ORDER_ERROR_INVALID_ORDER_DEFINITON, - "Cover order must have either a child order definition or an " - "order to attach to"}; + // Validate the prorata part of the definition + auto &prorata = def.custom_def().prorata(); + if (!prorata.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) + { + return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, + "ProRata order must have either a child order definition or an order to attach to"}; } - if (!cover.has_hedge()) + if (!prorata.has_hedge()) return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, - "Cover order must have a hedge order definition"}; - if (!serv.is_attaching()) { + "ProRata order must have a hedge order definition"}; + if (!serv.is_attaching()) + { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().cover().child(); + *child_def.mutable_custom_def() = def.custom_def().prorata().child(); me->child_template = &(serv.make_child_template(child_def)); } - init_hedge_template(serv, cover.hedge()); - set_price_improvement_delta(serv, cover); + init_hedge_template(serv, prorata.hedge()); + init_hedge_template(serv, prorata.overfill_hedge()); + set_hedge_ticks(serv, prorata); return {}; } -void ProRataAlgo::do_launch(IAlgoServices &algo) { +void ProRataAlgo::do_launch(IAlgoServices &algo) +{ me->algo = &algo; LOG(OrderMan, Diag, "Starting ProRataAlgo {}, {} {}@{}. Will cover {} ticks", algo.order_key().value(), securities::side_name(algo.definition().side()), algo.quantity().value(), algo.price().value(), - algo.definition().custom_def().cover().hedge_ticks()); + algo.definition().custom_def().prorata().hedge_ticks()); - LOG(OrderMan, Diag, "ProRataAlgo {} launching child", - algo.order_key().value()); - me->child_key = - algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + LOG(OrderMan, Diag, "ProRataAlgo {} launching child", algo.order_key().value()); + me->child_key = algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + algo.subscribe_book(SecurityKey(algo.security().id())); } -void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, - ChildState st) { +void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState st) +{ me->algo = &algo; me->child_key = k; me->hedged_fills = st.total_fills; + algo.subscribe_book(SecurityKey(algo.security().id())); on_child_change(k, st); } -void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) { - if (k == me->child_key) { - if (st.total_fills.value() > me->hedged_fills.value()) { - auto hedge_qty = - Quantity(st.total_fills.value() - me->hedged_fills.value()); - auto hedge_price = securities::improve_price( - algo().definition().side(), st.last_price, - me->price_improvement_delta); - auto hedge = - algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); - me->hedges.push_back(hedge); +void ProRataAlgo::on_book(SecurityKey, Book const &b) +{ + me->last_book = b; + + LOG(OrderMan, Diag, "ProRataAlgo order {} on book. BID: {}@{} ASK: {}@{}", + algo().order_key().value(), b.side(api::SIDE_BUY)[0].size(), + b.side(api::SIDE_BUY)[0].price(), b.side(api::SIDE_SELL)[0].size(), + b.side(api::SIDE_SELL)[0].price()); - me->hedged_fills = - Quantity(hedge_qty.value() + me->hedged_fills.value()); + switch (me->status) + { + case Status::WAITING_FOR_MD: + { + auto other_side = securities::other_side(algo().definition().side()); + auto &other_side_top = me->last_book.side(other_side)[0]; + + if (other_side_top.size() > 0) + { + me->status = Status::UNDERFILLED; + me->book_at_inception = b; LOG(OrderMan, Diag, - "ProRataAlgo {}, launched new hedge in response to child fill. " - "Hedge: " - "{} {}@{}", - algo().order_key().value(), - securities::side_name(algo().definition().side()), - hedge_qty.value(), hedge_price.value()); + "ProRataAlgo order {} receiving first book: {} Target: {}", + algo().order_key().value(), me->scratch_threshold.value(), + other_side_top.price()); + } + } break; + case Status::UNDERFILLED: + break; + case Status::OVERFILLED: + //TODO bail.... + break; + case Status::DONE: + break; + } +} + +void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) +{ + if (k == me->child_key) + { + if (st.total_fills.value() > me->hedged_fills.value()) + { + auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); + me->hedged_fills = Quantity(hedge_qty.value() + me->hedged_fills.value()); + auto hedge_price = securities::improve_price(algo().definition().side(), st.last_price, me->hedge_ticks); + if(me->hedged_fills < me->fill_limit) + { + auto hedge = algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); + me->hedges.push_back(hedge); + LOG(OrderMan, Diag, + "ProRataAlgo {}, launched new hedge in response to child fill. " + "Hedge: " + "{} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); + } + else + { + auto hedge = algo().launch_child(*me->overfill_hedge_template, hedge_price, hedge_qty); + me->overfill_hedges.push_back(hedge); + LOG(OrderMan, Diag, + "ProRataAlgo {}, launched new OVERFILL hedge in response to child fill. " + "Hedge: " + "{} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); + me->status = Status::OVERFILLED; + } } algo().update_fill_state(st.total_fills, st.last_price); - switch (st.status) { + switch (st.status) + { case ChildStatus::WORKING: break; case ChildStatus::COMPLETED: LOG(OrderMan, Info, - "ProRataAlgo {}. Child is completed, waiting for hedges ", - algo().order_key().value()); - me->status = Status::WAITING_FOR_HEDGES; + "ProRataAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, terminating", - algo().order_key().value()); + LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, terminating", algo().order_key().value()); me->status = Status::DONE; algo().terminate_error("Unexpected child cancel"); break; } - } else { - switch (st.status) { + } + else //it's a hedge + { + switch (st.status) + { case ChildStatus::WORKING: break; case ChildStatus::COMPLETED: - if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); - it != me->hedges.end()) + if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) me->hedges.erase(it); + if (auto oit = std::find(me->overfill_hedges.begin(), me->overfill_hedges.end(), k); oit != me->overfill_hedges.end()) + me->overfill_hedges.erase(oit); break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "ProRataAlgo {}. Hedge was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); + LOG(OrderMan, Info, "ProRataAlgo {}. Hedge was canceled, removing", algo().order_key().value()); + if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) + me->hedges.erase(it); + if (auto oit = std::find(me->overfill_hedges.begin(), me->overfill_hedges.end(), k); oit != me->overfill_hedges.end()) + me->overfill_hedges.erase(oit); break; } } check_terminate(); } -void ProRataAlgo::do_update(api::orderman::Update const &update) { - if (me->status == Status::WORKING) { +void ProRataAlgo::do_update(api::orderman::Update const &update) +{ + if (me->status != Status::DONE) + { LOG(OrderMan, Diag, "ProRataAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_cover()) { + if (update.has_custom() && !update.custom().has_prorata()) + { algo().terminate_error("Invalid update"); return; } @@ -165,27 +238,31 @@ void ProRataAlgo::do_update(api::orderman::Update const &update) { child_update.set_quantity(update.quantity()); // process custom part of the udpate if any - if (update.has_custom()) { - auto &cover_update = update.custom().cover(); - set_price_improvement_delta(algo(), cover_update); - if (cover_update.has_child()) { - *child_update.mutable_custom() = cover_update.child(); - } - if (cover_update.has_hedge()) - init_hedge_template(algo(), cover_update.hedge()); + if (update.has_custom()) + { + //TODO MORE + auto &prorata_update = update.custom().prorata(); + set_hedge_ticks(algo(), prorata_update); + if (prorata_update.has_child()) + *child_update.mutable_custom() = prorata_update.child(); + if (prorata_update.has_hedge()) + init_hedge_template(algo(), prorata_update.hedge()); + if (prorata_update.has_overfill_hedge()) + init_hedge_template(algo(), prorata_update.overfill_hedge()); } algo().update_child(me->child_key, child_update); - } else { + } + else + { LOG(OrderMan, Info, - "ProRataAlgo {}. Received update after child has completed. Ignoring " - "it.", + "ProRataAlgo {}. Received update after child has completed. Ignoring it.", algo().order_key().value()); } } -void orderman::ProRataAlgo::init_hedge_template( - IBeforeLaunchAlgoServices &algo, - api::orderman::CustomOrderDefinition const &hedge_cdef) { +void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, + api::orderman::CustomOrderDefinition const &hedge_cdef) +{ auto hedge_def = algo.definition(); hedge_def.set_side(securities::other_side(algo.definition().side())); hedge_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); @@ -194,22 +271,21 @@ void orderman::ProRataAlgo::init_hedge_template( me->hedge_template = &(algo.make_child_template(hedge_def)); } -void ProRataAlgo::set_price_improvement_delta( - IBeforeLaunchAlgoServices &serv, - api::orderman::CoverOrderDefinition const &cover) { - me->price_improvement_delta = Price( - securities::tick_size(serv.security()).value() * cover.hedge_ticks()); +void ProRataAlgo::set_hedge_ticks(IBeforeLaunchAlgoServices &serv, api::orderman::CoverOrderDefinition const &cover) +{ + me->hedge_ticks = Price(securities::tick_size(serv.security()).value() * cover.hedge_ticks()); } -void ProRataAlgo::check_terminate() { +void ProRataAlgo::check_terminate() +{ LOG(OrderMan, Diag, "ProRataAlgo {} check_terminate. State: {} Hedge count: {}", algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, me->hedges.size()); - if (me->status == Status::WAITING_FOR_HEDGES && me->hedges.empty()) { - LOG(OrderMan, Info, "ProRataAlgo {}. Last hedge completed, terminating", - algo().order_key().value()); + if (me->status != Status::DONE && me->hedges.empty() && me->overfill_hedges.empty()) + { + LOG(OrderMan, Info, "ProRataAlgo {}. Last hedge completed, terminating", algo().order_key().value()); algo().complete(); } } diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index 71b68b465..497fa4531 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -5,10 +5,11 @@ namespace bts { namespace orderman { -// Cover initializes the child order as normal. Fills trigger hedge -// orders to the opposite side of the market, n ticks away. +// ProRata initializes the child order as normal. Fills trigger one type of hedge, overfills (fills > limit) trigger another +// type of hedge. Overfills also optionally trigger overfill_hedge scratching and cancelling children dependent on book state -class ProRataAlgo : public IAlgoOrder { +class ProRataAlgo : public IAlgoOrder +{ public: ProRataAlgo(); ~ProRataAlgo(); @@ -24,11 +25,8 @@ private: enum class Status; std::unique_ptr me; IAlgoServices &algo() const; - void - set_price_improvement_delta(IBeforeLaunchAlgoServices &, - api::orderman::CoverOrderDefinition const &); - void init_hedge_template(IBeforeLaunchAlgoServices &, - api::orderman::CustomOrderDefinition const &); + void set_hedge_ticks(IBeforeLaunchAlgoServices &, api::orderman::CoverOrderDefinition const &); + void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); void check_terminate(); const char *status_name(Status st); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 8d3936a08..766b37d31 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -21,6 +21,7 @@ struct ScratchAlgo::PImpl OrderKey child_key = null_order_key(); ChildTemplate *child_template = nullptr; Book last_book; + Book book_at_inception; Price scratch_price=Price(os::nan()); }; @@ -116,6 +117,7 @@ void ScratchAlgo::on_book(SecurityKey, Book const &b) if (other_side_top.size() > 0) { me->status = Status::WAITING_TO_SCRATCH; + me->book_at_inception = b; LOG(OrderMan, Diag, "ScratchOrder order {} receiving first book: {} Target: {}", algo().order_key().value(), me->scratch_threshold.value(), @@ -140,7 +142,10 @@ void ScratchAlgo::try_to_scratch() Quantity my_quan; bool found = SpreaderUtils::find_qty_upto_price_level(me->last_book, my_side, algo().price(), /*unused*/ 0.0, my_quan); auto &my_side_psz = me->last_book.side(my_side)[0]; - if (found && my_quan.value() <= me->scratch_threshold.value()) + auto &other_side_psz = me->last_book.side(other_side)[0]; + bool market_moved = other_side_psz.price() != my_side_psz.price(); + + if (market_moved || found && my_quan.value() <= me->scratch_threshold.value()) { Price scratch_price; Quantity scratch_quan; From e1f590127eef4640ed5da527a63760464bf80f95 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 23 May 2019 23:55:26 -0400 Subject: [PATCH 004/210] ready to test --- src/lib/api/services/OrderService.proto | 1 - .../orders/algo/algo_orders/ProRataAlgo.cpp | 140 +++++++++++------- .../orders/algo/algo_orders/ProRataAlgo.h | 11 +- .../orders/algo/algo_orders/ScratchAlgo.cpp | 2 +- 4 files changed, 95 insertions(+), 59 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 75ed9f7b6..d2bc605bc 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -206,7 +206,6 @@ message ScratchOrderDefinition { message ProRataOrderDefinition { uint32 hedge_ticks = 1; spark.QuantityMeasure fill_limit = 2; - spark.QuantityMeasure scratch_threshold = 3; spark.QuantityMeasure stay_in_threshold = 4; bool enable_scratch_on_overfill = 5; bool enable_stay_in = 6; diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 731002886..2bdd18e55 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -11,17 +11,15 @@ namespace orderman { using namespace api::orderman; -enum class ProRataAlgo::Status { WAITING_FOR_MD, UNDERFILLED, OVERFILLED, DONE }; +enum class ProRataAlgo::Status { WAITING_FOR_MD, WORKING, DONE }; //this is for the child const char *ProRataAlgo::status_name(Status st) { switch (st) { case Status::WAITING_FOR_MD: return "WAITING_FOR_MD"; - case Status::UNDERFILLED: - return "UNDERFILLED"; - case Status::OVERFILLED: - return "OVERFILLED"; + case Status::WORKING: + return "WORKING"; case Status::DONE: return "DONE"; } @@ -29,14 +27,20 @@ const char *ProRataAlgo::status_name(Status st) } struct ProRataAlgo::PImpl { + PImpl() : + is_overfilled(false) + { + } IAlgoServices *algo; OrderKey child_key = null_order_key(); + + Price hedge_price_diff; Quantity fill_limit; - Quantity scratch_threshold; Quantity stay_in_threshold; - ChildTemplate *child_template = nullptr; + bool enable_scratch_on_overfill; + bool enable_stay_in; - Price hedge_ticks; + ChildTemplate *child_template = nullptr; ChildTemplate *hedge_template = nullptr; ChildTemplate *overfill_hedge_template = nullptr; @@ -47,6 +51,7 @@ struct ProRataAlgo::PImpl Book last_book; Book book_at_inception; + bool is_overfilled; }; ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} @@ -68,8 +73,7 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) } if (!prorata.has_hedge()) - return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, - "ProRata order must have a hedge order definition"}; + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, "ProRata order must have a hedge order definition"}; if (!serv.is_attaching()) { // if we are not attaching create a child template so we can @@ -81,7 +85,7 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) init_hedge_template(serv, prorata.hedge()); init_hedge_template(serv, prorata.overfill_hedge()); - set_hedge_ticks(serv, prorata); + set_parameters(serv, prorata); return {}; } @@ -109,7 +113,7 @@ void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState } -void ProRataAlgo::on_book(SecurityKey, Book const &b) +void ProRataAlgo::on_book(SecurityKey, const Book& b) { me->last_book = b; @@ -127,25 +131,58 @@ void ProRataAlgo::on_book(SecurityKey, Book const &b) if (other_side_top.size() > 0) { - me->status = Status::UNDERFILLED; + me->status = Status::WORKING; me->book_at_inception = b; LOG(OrderMan, Diag, "ProRataAlgo order {} receiving first book: {} Target: {}", - algo().order_key().value(), me->scratch_threshold.value(), + algo().order_key().value(), me->fill_limit.value(), other_side_top.price()); } - } break; - case Status::UNDERFILLED: - break; - case Status::OVERFILLED: - //TODO bail.... + } + break; + case Status::WORKING: + check_overfill(); break; case Status::DONE: + check_overfill(); break; } } -void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) +void ProRataAlgo::check_overfill() +{ + if(me->is_overfilled) + { + if(me->enable_stay_in) + { + auto my_side = algo().definition().side(); + auto other_side = securities::other_side(my_side); + + Quantity my_quan; + bool found = SpreaderUtils::find_qty_upto_price_level(me->last_book, my_side, algo().price(), /*unused*/ 0.0, my_quan); + auto &my_side_psz = me->last_book.side(my_side)[0]; + auto &other_side_psz = me->last_book.side(other_side)[0]; + bool market_moved = other_side_psz.price() != my_side_psz.price(); + + if (market_moved || !found || (found && my_quan.value() <= me->stay_in_threshold.value()) ) + get_out(); + } + else + get_out(); + } +} + +void ProRataAlgo::get_out() +{ + if(me->enable_scratch_on_overfill) + { + //scratch all my overs TODO + me->enable_scratch_on_overfill = false; + } + algo().cancel_child(me->child_key); +} + +void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) { if (k == me->child_key) { @@ -153,31 +190,30 @@ void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) { auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); me->hedged_fills = Quantity(hedge_qty.value() + me->hedged_fills.value()); - auto hedge_price = securities::improve_price(algo().definition().side(), st.last_price, me->hedge_ticks); + auto hedge_price = securities::improve_price(algo().definition().side(), st.last_price, me->hedge_price_diff); if(me->hedged_fills < me->fill_limit) { auto hedge = algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); me->hedges.push_back(hedge); LOG(OrderMan, Diag, "ProRataAlgo {}, launched new hedge in response to child fill. " - "Hedge: " - "{} {}@{}", + "Hedge: {} {}@{}", algo().order_key().value(), securities::side_name(algo().definition().side()), hedge_qty.value(), hedge_price.value()); } else - { + { auto hedge = algo().launch_child(*me->overfill_hedge_template, hedge_price, hedge_qty); me->overfill_hedges.push_back(hedge); LOG(OrderMan, Diag, "ProRataAlgo {}, launched new OVERFILL hedge in response to child fill. " - "Hedge: " - "{} {}@{}", + "Hedge: {} {}@{}", algo().order_key().value(), securities::side_name(algo().definition().side()), - hedge_qty.value(), hedge_price.value()); - me->status = Status::OVERFILLED; + hedge_qty.value(), hedge_price.value()); + me->is_overfilled = true; + check_overfill(); } } algo().update_fill_state(st.total_fills, st.last_price); @@ -186,13 +222,12 @@ void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) case ChildStatus::WORKING: break; case ChildStatus::COMPLETED: - LOG(OrderMan, Info, - "ProRataAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); + LOG(OrderMan, Info, "ProRataAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); + me->status = Status::DONE; break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, terminating", algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); + LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, waiting on hedges", algo().order_key().value()); + me->status = Status::DONE; break; } } @@ -201,15 +236,9 @@ void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) switch (st.status) { case ChildStatus::WORKING: - break; - case ChildStatus::COMPLETED: - if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) - me->hedges.erase(it); - if (auto oit = std::find(me->overfill_hedges.begin(), me->overfill_hedges.end(), k); oit != me->overfill_hedges.end()) - me->overfill_hedges.erase(oit); - break; + break; case ChildStatus::CANCELED: - LOG(OrderMan, Info, "ProRataAlgo {}. Hedge was canceled, removing", algo().order_key().value()); + case ChildStatus::COMPLETED: if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) me->hedges.erase(it); if (auto oit = std::find(me->overfill_hedges.begin(), me->overfill_hedges.end(), k); oit != me->overfill_hedges.end()) @@ -220,7 +249,7 @@ void ProRataAlgo::on_child_change(OrderKey k, ChildState const &st) check_terminate(); } -void ProRataAlgo::do_update(api::orderman::Update const &update) +void ProRataAlgo::do_update(const api::orderman::Update& update) { if (me->status != Status::DONE) { @@ -240,14 +269,14 @@ void ProRataAlgo::do_update(api::orderman::Update const &update) // process custom part of the udpate if any if (update.has_custom()) { - //TODO MORE auto &prorata_update = update.custom().prorata(); - set_hedge_ticks(algo(), prorata_update); - if (prorata_update.has_child()) + set_parameters(algo(), prorata_update); + + if(prorata_update.has_child()) *child_update.mutable_custom() = prorata_update.child(); - if (prorata_update.has_hedge()) + if(prorata_update.has_hedge()) init_hedge_template(algo(), prorata_update.hedge()); - if (prorata_update.has_overfill_hedge()) + if(prorata_update.has_overfill_hedge()) init_hedge_template(algo(), prorata_update.overfill_hedge()); } algo().update_child(me->child_key, child_update); @@ -261,7 +290,7 @@ void ProRataAlgo::do_update(api::orderman::Update const &update) } void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, - api::orderman::CustomOrderDefinition const &hedge_cdef) + const api::orderman::CustomOrderDefinition& hedge_cdef) { auto hedge_def = algo.definition(); hedge_def.set_side(securities::other_side(algo.definition().side())); @@ -271,19 +300,24 @@ void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, me->hedge_template = &(algo.make_child_template(hedge_def)); } -void ProRataAlgo::set_hedge_ticks(IBeforeLaunchAlgoServices &serv, api::orderman::CoverOrderDefinition const &cover) +void ProRataAlgo::set_parameters(IBeforeLaunchAlgoServices &serv, const api::orderman::ProRataOrderDefinition& prorata) { - me->hedge_ticks = Price(securities::tick_size(serv.security()).value() * cover.hedge_ticks()); + me->hedge_price_diff = Price(securities::tick_size(serv.security()).value() * prorata.hedge_ticks()); + if(prorata.has_fill_limit()) + me->fill_limit = SpreaderUtils::_quantity_threshold(prorata.fill_limit(), algo().quantity()); + if(prorata.has_stay_in_threshold()) + me->stay_in_threshold = SpreaderUtils::_quantity_threshold(prorata.stay_in_threshold(), algo().quantity()); + me->enable_scratch_on_overfill = prorata.enable_scratch_on_overfill(); + me->enable_stay_in = prorata.enable_stay_in(); } void ProRataAlgo::check_terminate() { LOG(OrderMan, Diag, "ProRataAlgo {} check_terminate. State: {} Hedge count: {}", - algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, - me->hedges.size()); + algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, me->hedges.size()); - if (me->status != Status::DONE && me->hedges.empty() && me->overfill_hedges.empty()) + if (me->status == Status::DONE && me->hedges.empty() && me->overfill_hedges.empty()) { LOG(OrderMan, Info, "ProRataAlgo {}. Last hedge completed, terminating", algo().order_key().value()); algo().complete(); diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index 497fa4531..9ed33bdea 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -17,16 +17,19 @@ public: OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; void do_launch(IAlgoServices &) override; void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; - void do_update(api::orderman::Update const &) override; - void on_child_change(OrderKey, ChildState const &) override; + void do_update(const api::orderman::Update&) override; + void on_book(SecurityKey, const Book&) override; + void on_child_change(OrderKey, const ChildState&) override; private: struct PImpl; enum class Status; std::unique_ptr me; IAlgoServices &algo() const; - void set_hedge_ticks(IBeforeLaunchAlgoServices &, api::orderman::CoverOrderDefinition const &); - void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); + void set_parameters(IBeforeLaunchAlgoServices &, const api::orderman::ProRataOrderDefinition&); + void init_hedge_template(IBeforeLaunchAlgoServices &, const api::orderman::CustomOrderDefinition&); + void get_out(); + void check_overfill(); void check_terminate(); const char *status_name(Status st); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 766b37d31..443b200a2 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -145,7 +145,7 @@ void ScratchAlgo::try_to_scratch() auto &other_side_psz = me->last_book.side(other_side)[0]; bool market_moved = other_side_psz.price() != my_side_psz.price(); - if (market_moved || found && my_quan.value() <= me->scratch_threshold.value()) + if (market_moved || !found || (found && my_quan.value() <= me->scratch_threshold.value()) ) { Price scratch_price; Quantity scratch_quan; From c8c6aea1882e508d5eee6df07b4e2f1b30130795 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 24 May 2019 15:50:46 -0400 Subject: [PATCH 005/210] gui for haris orders --- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 17 ++++++ .../OrderTypeVMs/DynamicOrderParamVM.cs | 38 +++++++++++++ .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 6 ++ src/lib/api/services/OrderService.proto | 2 + .../orders/algo/algo_orders/ProRataAlgo.cpp | 25 +++++++++ .../orders/algo/algo_orders/ProRataAlgo.h | 1 + .../orders/algo/algo_orders/ScratchAlgo.cpp | 19 ++++++- .../orders/algo/algo_orders/ScratchAlgo.h | 4 +- src/server/sparkd/cmds/Run.cpp | 55 +++++++++++++++++++ 9 files changed, 163 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index 8587e9e92..f08137c66 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -71,6 +71,7 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: param.AsOrderDef = new CustomOrderDefinition(); break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: param.AsString = string.Empty; break; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: param.AsUint32 = 0u; break; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: param.AsQuantity = new bts.spark.QuantityMeasure(); break; } break; case DynamicOrderTypeDescriptor.DescriptorOneofCase.Structure: param.AsStruct = new DynamicOrderStruct(); break; @@ -87,5 +88,21 @@ namespace mbts.spark { } param.AsEnumerated.EnumValue = value ?? string.Empty; } + + internal static bts.spark.QuantityMeasureImmutable? get_quantity_value(DynamicOrderParam param) + { + return new bts.spark.QuantityMeasureImmutable(param?.AsQuantity); + } + internal static void set_quantity_value(DynamicOrderParam param, bts.spark.QuantityMeasureImmutable? value) + { + if (param == null) + { + return; + } + else if (param.ValueCase != DynamicOrderParam.ValueOneofCase.AsQuantity) + { + param.AsQuantity = value?.CloneToMutable(); + } + } } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs index 9cf2c4962..def02cd07 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs @@ -1,6 +1,7 @@ using bts.api.orderman; using Google.Protobuf.Reflection; using mbts.ui.shell; +using bts.spark; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -116,4 +117,41 @@ namespace mbts.spark { void _sync_elements() => elements.sync_with(_get_elements(descriptor)); } + + + class DynamicOrderQuantityVM : DynamicOrderParamVM, IDynamicOrderParamVM + { + static readonly FieldDescriptor _field_desc = DynamicOrderParam.Descriptor.FindFieldByNumber(DynamicOrderParam.AsQuantityFieldNumber); + QuantityMeasureImmutable? _value; + public DynamicOrderQuantityVM(DynamicOrderParamDescriptor descriptor) + : base(descriptor) + { + } + + public QuantityMeasureImmutable? value + { + get => _value; + set + { + _value = value; + _field_desc.Accessor.SetValue(param, _value?.CloneToMutable()); + RaisePropertyChanged(); + } + } + + public IObservable subscribe_value() => + Observable.Create(o => + { + PropertyChanged += on_prop_changed; + return Disposable.Create(() => PropertyChanged -= on_prop_changed); + void on_prop_changed(object sender, PropertyChangedEventArgs e) => + o.OnNext(value); + }); + + protected override void on_param_changed() + { + _value = new QuantityMeasureImmutable( (QuantityMeasure) _field_desc.Accessor.GetValue(param)); + RaisePropertyChanged(nameof(value)); + } + } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index c54208b68..848602c12 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -5,6 +5,7 @@ using mbts.collections; using mbts.spark.utilities; using mbts.ui.utility; using mbts.utils; +using bts.spark; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -73,6 +74,11 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: + { + var qm = new DynamicOrderQuantityVM(descriptor); + return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 })); + } default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.Primitive, nameof(descriptor)); } case DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated: diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index d2bc605bc..f90925449 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -563,6 +563,7 @@ enum DynamicOrderPrimitiveDescriptor { DYNAMIC_ORDER_PRIMITIVE_STRING = 3; DYNAMIC_ORDER_PRIMITIVE_BOOL = 4; DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF = 5; + DYNAMIC_ORDER_PRIMITIVE_QUANTITY = 6; } message DynamicOrderTypeDescriptor { @@ -611,6 +612,7 @@ message DynamicOrderParam { DynamicOrderArray as_array = 7; DynamicOrderStruct as_struct = 8; DynamicOrderEnumerated as_enumerated = 9; + spark.QuantityMeasure as_quantity = 10; } } diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 2bdd18e55..5ad8dfc96 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -58,6 +58,31 @@ ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} ProRataAlgo::~ProRataAlgo() {} IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } +void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) +{ + if (def.has_custom_def() && def.custom_def().has_dynamic()) + { + auto& dprorata = def.custom_def().dynamic(); + auto& mutable_def = const_cast(def); //TODO Terrible hack + auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); + + if(dprorata.order_params().count("hedge_ticks") > 0) + prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); + if(dprorata.order_params().count("fill_limit") > 0) + *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); + if(dprorata.order_params().count("stay_in_threshold") > 0) + *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); + if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) + prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); + if(dprorata.order_params().count("enable_stay_in") > 0) + prorata.set_enable_stay_in(dprorata.order_params().at("enable_stay_in").as_bool()); + + *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); + *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); + *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); + } +} + OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { auto &def = serv.definition(); diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index 9ed33bdea..f4c19960a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -32,6 +32,7 @@ private: void check_overfill(); void check_terminate(); const char *status_name(Status st); + void check_dynamic(const api::orderman::OrderDefinition&); }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 443b200a2..ea3ad3744 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -29,12 +29,27 @@ ScratchAlgo::ScratchAlgo() : me(new PImpl()) {} ScratchAlgo::~ScratchAlgo() {} IAlgoServices &ScratchAlgo::algo() const { return *me->algo; } +void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) +{ + if (def.has_custom_def() && def.custom_def().has_dynamic()) + { + auto& dscratch = def.custom_def().dynamic(); + auto& mutable_def = const_cast(def); //TODO Terrible hack + auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); + + if(dscratch.order_params().count("scratch_threshold") > 0) + *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); + + *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); + } +} + OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { - auto &def = serv.definition(); + const api::orderman::OrderDefinition& def = serv.definition(); + check_dynamic(def); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_scratch()); - // Validate the scratch part of the definition auto &scratch = def.custom_def().scratch(); if (!scratch.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h index d86487366..76c220a80 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h @@ -27,10 +27,10 @@ private: std::unique_ptr me; IAlgoServices &algo() const ; - void update_scratch_threshold(); - bool has_running_child() const; + void update_scratch_threshold(); void try_to_scratch(); Price get_price_to_pass (Price price) const; + void check_dynamic(const api::orderman::OrderDefinition&); }; }} diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 3c9b1ec1c..14b2faaf6 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -34,6 +34,10 @@ #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/AuthServiceServer.h" #include "server/sparkd/algo/AlgoDefinitionServiceServer.h" + +#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h" + #include namespace bts { @@ -76,6 +80,57 @@ int Run::execute(std::vector const &) { SparkServices plugin_services(dyn_order_registry); plugin::init_plugins(plugin_services); // finished initializing order plugins + + //TODO these will go away once Haris approves algo + using namespace api::orderman; + { + DynamicOrderDescriptor desc; + desc.set_dynamic_order_type("Scratch"); + auto param = desc.add_param_desc(); + param->set_param_name("scratch_threshold"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); + + param = desc.add_param_desc(); + param->set_param_name("child"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + plugin_services.register_dynamic_algo_order( + desc, []() { return std::make_unique(); }); + } + + { + DynamicOrderDescriptor desc; + desc.set_dynamic_order_type("ProRata"); + auto param = desc.add_param_desc(); + param->set_param_name("hedge_ticks"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); + param->set_param_name("fill_limit"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); + + param = desc.add_param_desc(); + param->set_param_name("stay_in_threshold"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); + param = desc.add_param_desc(); + param->set_param_name("enable_scratch_on_overfill"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_BOOL); + param = desc.add_param_desc(); + param->set_param_name("enable_stay_in"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_BOOL); + + param = desc.add_param_desc(); + param->set_param_name("child"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + param = desc.add_param_desc(); + param->set_param_name("hedge"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + param = desc.add_param_desc(); + param->set_param_name("overfill_hedge"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); + + + plugin_services.register_dynamic_algo_order( + desc, []() { return std::make_unique(); }); + } orderman::OrderServiceServer order_service_server( sc, mdclient, dyn_order_registry, stats, perf_log); From 117e1071162c8bfa23ff5a0155a8e4b97c122cca Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 24 May 2019 22:50:12 -0400 Subject: [PATCH 006/210] dynamics work again --- .../DynamicOrderTemplateSelector.cs | 2 ++ .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 7 +++++-- .../Order/AlgoContentTemplateSelector.xaml | 21 +++++++++++++++++++ .../orders/algo/algo_orders/ScratchAlgo.cpp | 5 ++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs index e09a3acab..cdf5a4906 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderTemplateSelector.cs @@ -19,6 +19,7 @@ namespace mbts.ui.spark public DataTemplate UIntTemplate { get; set; } public DataTemplate StringTemplate { get; set; } public DataTemplate OrderDefTemplate { get; set; } + public DataTemplate QuantityMeasureTemplate { get; set; } public DataTemplate EnumTemplate { get; set; } @@ -39,6 +40,7 @@ namespace mbts.ui.spark case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return UIntTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return StringTemplate; case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef: return OrderDefTemplate; + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: return QuantityMeasureTemplate; default: return null; } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index 848602c12..892e07fa0 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -47,10 +47,13 @@ namespace mbts.spark { protected override void on_model_internal() => _sync_dynamic_params(); - protected override IEnumerable get_selector_datum() => - OrderDataHelper.get_child_algo_data(new CustomOrderDefinition { + protected override IEnumerable get_selector_datum() + { + var data = OrderDataHelper.get_child_algo_data(new CustomOrderDefinition { Dynamic = model?.dynamic_helper?.create_def(dyn_type) ?? new DynamicOrderDefinition() }); + return data; + } void _sync_dynamic_params() { if (model != null) { diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 6706baf48..96db2855a 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1094,6 +1094,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index ea3ad3744..fb6c7dc03 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -40,7 +40,10 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dscratch.order_params().count("scratch_threshold") > 0) *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); - *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); + if(dscratch.order_params().count("child") > 0) + *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); + else + scratch.mutable_child()->mutable_limit(); } } From 5f125790cf74164322dc31e6ce239e7c0c827bd2 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sat, 25 May 2019 10:50:27 -0400 Subject: [PATCH 007/210] dynamics can now have QuantityMeasure --- .../Orders/OrderTypeVMs/DynamicOrderHelper.cs | 7 +---- .../OrderTypeVMs/DynamicOrderParamVM.cs | 28 ++++++++++--------- .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 2 +- .../Order/AlgoContentTemplateSelector.xaml | 7 +++-- .../orders/algo/algo_orders/ProRataAlgo.cpp | 10 +++++-- .../orders/algo/algo_orders/ScratchAlgo.cpp | 7 ++++- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs index f08137c66..9bae979d3 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderHelper.cs @@ -96,13 +96,8 @@ namespace mbts.spark { internal static void set_quantity_value(DynamicOrderParam param, bts.spark.QuantityMeasureImmutable? value) { if (param == null) - { return; - } - else if (param.ValueCase != DynamicOrderParam.ValueOneofCase.AsQuantity) - { - param.AsQuantity = value?.CloneToMutable(); - } + param.AsQuantity = value?.CloneToMutable(); } } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs index def02cd07..80e0c6edb 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs @@ -122,36 +122,38 @@ namespace mbts.spark { class DynamicOrderQuantityVM : DynamicOrderParamVM, IDynamicOrderParamVM { static readonly FieldDescriptor _field_desc = DynamicOrderParam.Descriptor.FindFieldByNumber(DynamicOrderParam.AsQuantityFieldNumber); - QuantityMeasureImmutable? _value; public DynamicOrderQuantityVM(DynamicOrderParamDescriptor descriptor) : base(descriptor) { } - public QuantityMeasureImmutable? value + QuantityMeasureImmutable? IDynamicOrderParamVM.value { get => quantity; set => quantity= value; } + public QuantityMeasureImmutable? quantity { - get => _value; - set + get => DynamicOrderHelper.get_quantity_value(param); + set { - _value = value; - _field_desc.Accessor.SetValue(param, _value?.CloneToMutable()); - RaisePropertyChanged(); + var orig = quantity; + DynamicOrderHelper.set_quantity_value(param, value); + if (quantity != orig) + RaisePropertyChanged(); } - } + } - public IObservable subscribe_value() => - Observable.Create(o => + public IObservable subscribe_value() + { + return Observable.Create(o => { PropertyChanged += on_prop_changed; return Disposable.Create(() => PropertyChanged -= on_prop_changed); void on_prop_changed(object sender, PropertyChangedEventArgs e) => - o.OnNext(value); + o.OnNext(quantity); }); + } protected override void on_param_changed() { - _value = new QuantityMeasureImmutable( (QuantityMeasure) _field_desc.Accessor.GetValue(param)); - RaisePropertyChanged(nameof(value)); + RaisePropertyChanged(nameof(quantity)); } } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index 892e07fa0..76af9879d 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -80,7 +80,7 @@ namespace mbts.spark { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: { var qm = new DynamicOrderQuantityVM(descriptor); - return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 })); + return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); } default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.Primitive, nameof(descriptor)); } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 96db2855a..dc159595c 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1102,8 +1102,11 @@ - - + + diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 5ad8dfc96..49f973079 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -65,7 +65,12 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) auto& dprorata = def.custom_def().dynamic(); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); - + + std::string keys; + for(auto& pair : dprorata.order_params()) + { + keys += pair.first; + } if(dprorata.order_params().count("hedge_ticks") > 0) prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); if(dprorata.order_params().count("fill_limit") > 0) @@ -85,7 +90,8 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { - auto &def = serv.definition(); + const api::orderman::OrderDefinition& def = serv.definition(); + check_dynamic(def); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_prorata()); diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index fb6c7dc03..9adaaf79c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -36,7 +36,12 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) auto& dscratch = def.custom_def().dynamic(); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); - + + std::string keys; + for(auto& pair : dscratch.order_params()) + { + keys += pair.first; + } if(dscratch.order_params().count("scratch_threshold") > 0) *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); From 6fc3c0b6016c2c862c6626fb992f6d7dbc22154a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sat, 25 May 2019 17:48:54 -0400 Subject: [PATCH 008/210] the bug turned out to be in my brain --- .../OrderTypeVMs/DynamicOrderParamVM.cs | 4 +--- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 3 ++- .../orders/algo/algo_orders/ProRataAlgo.cpp | 20 +++++++++++++++---- .../orders/algo/algo_orders/ScratchAlgo.cpp | 5 +++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs index 80e0c6edb..d80ae2413 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs @@ -123,9 +123,7 @@ namespace mbts.spark { { static readonly FieldDescriptor _field_desc = DynamicOrderParam.Descriptor.FindFieldByNumber(DynamicOrderParam.AsQuantityFieldNumber); public DynamicOrderQuantityVM(DynamicOrderParamDescriptor descriptor) - : base(descriptor) - { - } + : base(descriptor) { } QuantityMeasureImmutable? IDynamicOrderParamVM.value { get => quantity; set => quantity= value; } public QuantityMeasureImmutable? quantity diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index b14e7c7ef..f1c7dc58e 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -306,7 +306,8 @@ orderman::OrderOpResult AlgoWrapperOrder::on_cancel() { // IBeforeLaunchAlgoServices // -------------------------------------------------------------------------------- api::orderman::OrderDefinition const &AlgoWrapperOrder::definition() const { - return *def(); + //return *def(); + return me->definition; } api::Security const &AlgoWrapperOrder::security() const { diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 49f973079..6670084b0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -62,7 +62,8 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) { if (def.has_custom_def() && def.custom_def().has_dynamic()) { - auto& dprorata = def.custom_def().dynamic(); + //copy + api::orderman::DynamicOrderDefinition dprorata = def.custom_def().dynamic(); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); @@ -82,9 +83,20 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dprorata.order_params().count("enable_stay_in") > 0) prorata.set_enable_stay_in(dprorata.order_params().at("enable_stay_in").as_bool()); - *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); - *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); - *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); + if(dprorata.order_params().count("child") > 0) + *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); + else + prorata.mutable_child()->mutable_limit(); + + if(dprorata.order_params().count("hedge") > 0) + *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); + else + prorata.mutable_hedge()->mutable_limit(); + + if(dprorata.order_params().count("overfill_hedge") > 0) + *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); + else + prorata.mutable_overfill_hedge()->mutable_limit(); } } diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 9adaaf79c..c3ab411c0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -33,7 +33,8 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) { if (def.has_custom_def() && def.custom_def().has_dynamic()) { - auto& dscratch = def.custom_def().dynamic(); + //copy + api::orderman::DynamicOrderDefinition dscratch = def.custom_def().dynamic(); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); @@ -54,7 +55,7 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { - const api::orderman::OrderDefinition& def = serv.definition(); + auto& def = serv.definition(); check_dynamic(def); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_scratch()); From ea232fbaf1a637bb3bae645e85f0f1059dc44bcc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sat, 25 May 2019 23:27:54 -0400 Subject: [PATCH 009/210] ScratchAlgo works --- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 3 +-- .../orders/algo/algo_orders/ProRataAlgo.cpp | 15 +++++++-------- .../orders/algo/algo_orders/ScratchAlgo.cpp | 15 +++++++++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index f1c7dc58e..b14e7c7ef 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -306,8 +306,7 @@ orderman::OrderOpResult AlgoWrapperOrder::on_cancel() { // IBeforeLaunchAlgoServices // -------------------------------------------------------------------------------- api::orderman::OrderDefinition const &AlgoWrapperOrder::definition() const { - //return *def(); - return me->definition; + return *def(); } api::Security const &AlgoWrapperOrder::security() const { diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 6670084b0..c72a97ff0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -63,7 +63,8 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if (def.has_custom_def() && def.custom_def().has_dynamic()) { //copy - api::orderman::DynamicOrderDefinition dprorata = def.custom_def().dynamic(); + api::orderman::DynamicOrderDefinition dprorata; + dprorata.CopyFrom(def.custom_def().dynamic()); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); @@ -200,14 +201,12 @@ void ProRataAlgo::check_overfill() { auto my_side = algo().definition().side(); auto other_side = securities::other_side(my_side); - - Quantity my_quan; - bool found = SpreaderUtils::find_qty_upto_price_level(me->last_book, my_side, algo().price(), /*unused*/ 0.0, my_quan); - auto &my_side_psz = me->last_book.side(my_side)[0]; + + auto &my_side_psz = me->last_book.side(my_side)[0]; auto &other_side_psz = me->last_book.side(other_side)[0]; - bool market_moved = other_side_psz.price() != my_side_psz.price(); - - if (market_moved || !found || (found && my_quan.value() <= me->stay_in_threshold.value()) ) + bool market_moved = !securities::is_same(Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); + bool on_market = securities::is_same(Price(my_side_psz.price()), Price(algo().price())); + if (market_moved || (on_market && my_side_psz.size() <= me->stay_in_threshold.value()) ) get_out(); } else diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index c3ab411c0..1e015968d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -22,6 +22,7 @@ struct ScratchAlgo::PImpl ChildTemplate *child_template = nullptr; Book last_book; Book book_at_inception; + Quantity total_fills = Quantity(0); Price scratch_price=Price(os::nan()); }; @@ -33,8 +34,10 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) { if (def.has_custom_def() && def.custom_def().has_dynamic()) { + //copy - api::orderman::DynamicOrderDefinition dscratch = def.custom_def().dynamic(); + api::orderman::DynamicOrderDefinition dscratch; + dscratch.CopyFrom(def.custom_def().dynamic()); auto& mutable_def = const_cast(def); //TODO Terrible hack auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); @@ -164,12 +167,11 @@ void ScratchAlgo::try_to_scratch() auto other_side = securities::other_side(my_side); Quantity my_quan; - bool found = SpreaderUtils::find_qty_upto_price_level(me->last_book, my_side, algo().price(), /*unused*/ 0.0, my_quan); auto &my_side_psz = me->last_book.side(my_side)[0]; auto &other_side_psz = me->last_book.side(other_side)[0]; - bool market_moved = other_side_psz.price() != my_side_psz.price(); - - if (market_moved || !found || (found && my_quan.value() <= me->scratch_threshold.value()) ) + bool market_moved = !securities::is_same(Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); + bool on_market = securities::is_same(Price(my_side_psz.price()), Price(algo().price())); + if (market_moved || (on_market && my_side_psz.size() <= me->scratch_threshold.value()) ) { Price scratch_price; Quantity scratch_quan; @@ -182,7 +184,7 @@ void ScratchAlgo::try_to_scratch() me->scratch_price = scratch_price; child_update.set_price(scratch_price.value()); //we still want to try to scratch all of it - child_update.set_quantity(algo().quantity().value()); + child_update.set_quantity(algo().quantity().value() - me->total_fills.value()); algo().update_child(me->child_key, child_update); me->status = Status::SCRATCHED; } @@ -222,6 +224,7 @@ void ScratchAlgo::update_scratch_threshold() void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) { algo().update_fill_state(st.total_fills, st.last_price); + me->total_fills = st.total_fills; switch (st.status) { case ChildStatus::WORKING: From e19bb7c6218f9132dd8b27b9ef18b4297b77dd43 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sat, 25 May 2019 23:45:17 -0400 Subject: [PATCH 010/210] chase if worse --- src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 1e015968d..86d064979 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -169,7 +169,8 @@ void ScratchAlgo::try_to_scratch() Quantity my_quan; auto &my_side_psz = me->last_book.side(my_side)[0]; auto &other_side_psz = me->last_book.side(other_side)[0]; - bool market_moved = !securities::is_same(Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); + bool market_moved = !securities::is_equal_or_better(other_side, + Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); bool on_market = securities::is_same(Price(my_side_psz.price()), Price(algo().price())); if (market_moved || (on_market && my_side_psz.size() <= me->scratch_threshold.value()) ) { From 729986d53d710932acec8c86f465d5619f4d79de Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sun, 26 May 2019 23:30:55 -0400 Subject: [PATCH 011/210] need to test get_out function --- .../orders/algo/algo_orders/ProRataAlgo.cpp | 149 +++++++++++------- .../orders/algo/algo_orders/ProRataAlgo.h | 5 +- .../orders/algo/algo_orders/ScratchAlgo.cpp | 9 +- 3 files changed, 100 insertions(+), 63 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index c72a97ff0..20d489edc 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -11,7 +11,7 @@ namespace orderman { using namespace api::orderman; -enum class ProRataAlgo::Status { WAITING_FOR_MD, WORKING, DONE }; //this is for the child +enum class ProRataAlgo::Status { WAITING_FOR_MD, WORKING, DONE_WORKING, GETTING_OUT }; //this is for the child const char *ProRataAlgo::status_name(Status st) { switch (st) @@ -20,8 +20,10 @@ const char *ProRataAlgo::status_name(Status st) return "WAITING_FOR_MD"; case Status::WORKING: return "WORKING"; - case Status::DONE: - return "DONE"; + case Status::DONE_WORKING: + return "DONE_WORKING"; + case Status::GETTING_OUT: + return "GETTING_OUT"; } return nullptr; } @@ -47,7 +49,7 @@ struct ProRataAlgo::PImpl Quantity hedged_fills = Quantity(0); Status status = Status::WAITING_FOR_MD; std::vector hedges; - std::vector overfill_hedges; + std::map overfill_hedges; Book last_book; Book book_at_inception; @@ -68,11 +70,6 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) auto& mutable_def = const_cast(def); //TODO Terrible hack auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); - std::string keys; - for(auto& pair : dprorata.order_params()) - { - keys += pair.first; - } if(dprorata.order_params().count("hedge_ticks") > 0) prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); if(dprorata.order_params().count("fill_limit") > 0) @@ -127,15 +124,15 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) me->child_template = &(serv.make_child_template(child_def)); } - init_hedge_template(serv, prorata.hedge()); - init_hedge_template(serv, prorata.overfill_hedge()); - set_parameters(serv, prorata); + init_hedge_template(serv, prorata.hedge(), false); + init_hedge_template(serv, prorata.overfill_hedge(), true); return {}; } void ProRataAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; + set_parameters(algo, algo.definition().custom_def().prorata()); LOG(OrderMan, Diag, "Starting ProRataAlgo {}, {} {}@{}. Will cover {} ticks", algo.order_key().value(), securities::side_name(algo.definition().side()), algo.quantity().value(), @@ -150,6 +147,7 @@ void ProRataAlgo::do_launch(IAlgoServices &algo) void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState st) { me->algo = &algo; + set_parameters(algo, algo.definition().custom_def().prorata()); me->child_key = k; me->hedged_fills = st.total_fills; algo.subscribe_book(SecurityKey(algo.security().id())); @@ -187,15 +185,17 @@ void ProRataAlgo::on_book(SecurityKey, const Book& b) case Status::WORKING: check_overfill(); break; - case Status::DONE: + case Status::DONE_WORKING: check_overfill(); break; + case Status::GETTING_OUT: + break; } } void ProRataAlgo::check_overfill() { - if(me->is_overfilled) + if(me->is_overfilled && me->status != Status::GETTING_OUT) { if(me->enable_stay_in) { @@ -204,8 +204,10 @@ void ProRataAlgo::check_overfill() auto &my_side_psz = me->last_book.side(my_side)[0]; auto &other_side_psz = me->last_book.side(other_side)[0]; - bool market_moved = !securities::is_same(Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); + bool market_moved = !securities::is_equal_or_better(other_side, + Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); bool on_market = securities::is_same(Price(my_side_psz.price()), Price(algo().price())); + if (market_moved || (on_market && my_side_psz.size() <= me->stay_in_threshold.value()) ) get_out(); } @@ -214,14 +216,59 @@ void ProRataAlgo::check_overfill() } } +void ProRataAlgo::scratch(std::pair kk) +{ + auto other_side = securities::other_side(algo().definition().side()); + Price scratch_price; + Quantity scratch_quan; + SpreaderUtils::traverse_depth_for_quantity(me->last_book, other_side, kk.second, scratch_price, scratch_quan); + + Update update; + update.set_price(scratch_price.value()); + //we still want to try to scratch all of it + update.set_quantity(kk.second.value()); + algo().update_child(kk.first, update); +} + void ProRataAlgo::get_out() { - if(me->enable_scratch_on_overfill) - { - //scratch all my overs TODO - me->enable_scratch_on_overfill = false; + if(me->status != Status::GETTING_OUT) + { + me->status = Status::GETTING_OUT; + if(me->enable_scratch_on_overfill) + { + for(auto& h : me->overfill_hedges) + scratch(h); + } + algo().cancel_child(me->child_key); + check_terminate(); } - algo().cancel_child(me->child_key); +} + +void ProRataAlgo::standard_hedge(Price hedge_price, Quantity hedge_qty) +{ + auto hedge = algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); + me->hedges.push_back(hedge); + LOG(OrderMan, Diag, + "ProRataAlgo {}, launched new hedge in response to child fill. " + "Hedge: {} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); +} + +void ProRataAlgo::overfill_hedge(Price hedge_price, Quantity hedge_qty) +{ + auto hedge = algo().launch_child(*me->overfill_hedge_template, hedge_price, hedge_qty); + me->overfill_hedges[hedge] = hedge_qty; + LOG(OrderMan, Diag, + "ProRataAlgo {}, launched new OVERFILL hedge in response to child fill. " + "Hedge: {} {}@{}", + algo().order_key().value(), + securities::side_name(algo().definition().side()), + hedge_qty.value(), hedge_price.value()); + me->is_overfilled = true; + check_overfill(); } void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) @@ -230,33 +277,22 @@ void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) { if (st.total_fills.value() > me->hedged_fills.value()) { - auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); - me->hedged_fills = Quantity(hedge_qty.value() + me->hedged_fills.value()); + auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); auto hedge_price = securities::improve_price(algo().definition().side(), st.last_price, me->hedge_price_diff); - if(me->hedged_fills < me->fill_limit) - { - auto hedge = algo().launch_child(*me->hedge_template, hedge_price, hedge_qty); - me->hedges.push_back(hedge); - LOG(OrderMan, Diag, - "ProRataAlgo {}, launched new hedge in response to child fill. " - "Hedge: {} {}@{}", - algo().order_key().value(), - securities::side_name(algo().definition().side()), - hedge_qty.value(), hedge_price.value()); - } + if( me->hedged_fills.value() + hedge_qty.value() <= me->fill_limit.value() ) + standard_hedge(hedge_price, hedge_qty); else { - auto hedge = algo().launch_child(*me->overfill_hedge_template, hedge_price, hedge_qty); - me->overfill_hedges.push_back(hedge); - LOG(OrderMan, Diag, - "ProRataAlgo {}, launched new OVERFILL hedge in response to child fill. " - "Hedge: {} {}@{}", - algo().order_key().value(), - securities::side_name(algo().definition().side()), - hedge_qty.value(), hedge_price.value()); - me->is_overfilled = true; - check_overfill(); + auto over = me->hedged_fills.value() + hedge_qty.value() - me->fill_limit.value(); + if(over < hedge_qty.value()) + { + standard_hedge(hedge_price, Quantity(hedge_qty.value() - over)); + overfill_hedge(hedge_price, Quantity(over)); + } + else + overfill_hedge(hedge_price, hedge_qty); } + me->hedged_fills = Quantity(hedge_qty.value() + me->hedged_fills.value()); } algo().update_fill_state(st.total_fills, st.last_price); switch (st.status) @@ -265,11 +301,11 @@ void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) break; case ChildStatus::COMPLETED: LOG(OrderMan, Info, "ProRataAlgo {}. Child is completed, waiting for hedges ", algo().order_key().value()); - me->status = Status::DONE; + me->status = Status::DONE_WORKING; break; case ChildStatus::CANCELED: LOG(OrderMan, Info, "ProRataAlgo {}. Child was canceled, waiting on hedges", algo().order_key().value()); - me->status = Status::DONE; + me->status = Status::DONE_WORKING; break; } } @@ -283,8 +319,8 @@ void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) case ChildStatus::COMPLETED: if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) me->hedges.erase(it); - if (auto oit = std::find(me->overfill_hedges.begin(), me->overfill_hedges.end(), k); oit != me->overfill_hedges.end()) - me->overfill_hedges.erase(oit); + if(me->overfill_hedges.find(k) != me->overfill_hedges.end()) + me->overfill_hedges.erase(k); break; } } @@ -293,7 +329,7 @@ void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) void ProRataAlgo::do_update(const api::orderman::Update& update) { - if (me->status != Status::DONE) + if (me->status != Status::DONE_WORKING) { LOG(OrderMan, Diag, "ProRataAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); @@ -317,9 +353,9 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) if(prorata_update.has_child()) *child_update.mutable_custom() = prorata_update.child(); if(prorata_update.has_hedge()) - init_hedge_template(algo(), prorata_update.hedge()); + init_hedge_template(algo(), prorata_update.hedge(), false); if(prorata_update.has_overfill_hedge()) - init_hedge_template(algo(), prorata_update.overfill_hedge()); + init_hedge_template(algo(), prorata_update.overfill_hedge(), true); } algo().update_child(me->child_key, child_update); } @@ -332,14 +368,19 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) } void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, - const api::orderman::CustomOrderDefinition& hedge_cdef) + const api::orderman::CustomOrderDefinition& hedge_cdef, bool overfill) { - auto hedge_def = algo.definition(); + api::orderman::OrderDefinition hedge_def; + hedge_def.CopyFrom(algo.definition()); + hedge_def.set_side(securities::other_side(algo.definition().side())); hedge_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); hedge_def.clear_attach_target_order_key(); *hedge_def.mutable_custom_def() = hedge_cdef; - me->hedge_template = &(algo.make_child_template(hedge_def)); + if(!overfill) + me->hedge_template = &(algo.make_child_template(hedge_def)); + else + me->overfill_hedge_template = &(algo.make_child_template(hedge_def)); } void ProRataAlgo::set_parameters(IBeforeLaunchAlgoServices &serv, const api::orderman::ProRataOrderDefinition& prorata) @@ -359,7 +400,7 @@ void ProRataAlgo::check_terminate() "ProRataAlgo {} check_terminate. State: {} Hedge count: {}", algo().order_key(), log::CharPtrWrapper{status_name(me->status)}, me->hedges.size()); - if (me->status == Status::DONE && me->hedges.empty() && me->overfill_hedges.empty()) + if (me->status == Status::DONE_WORKING && me->hedges.empty() && me->overfill_hedges.empty()) { LOG(OrderMan, Info, "ProRataAlgo {}. Last hedge completed, terminating", algo().order_key().value()); algo().complete(); diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index f4c19960a..07ffc294c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -27,8 +27,11 @@ private: std::unique_ptr me; IAlgoServices &algo() const; void set_parameters(IBeforeLaunchAlgoServices &, const api::orderman::ProRataOrderDefinition&); - void init_hedge_template(IBeforeLaunchAlgoServices &, const api::orderman::CustomOrderDefinition&); + void init_hedge_template(IBeforeLaunchAlgoServices &, const api::orderman::CustomOrderDefinition&, bool); + void scratch(std::pair kk); void get_out(); + void standard_hedge(Price hedge_price, Quantity hedge_qty); + void overfill_hedge(Price hedge_price, Quantity hedge_qty); void check_overfill(); void check_terminate(); const char *status_name(Status st); diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 86d064979..e63254a9f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -22,7 +22,6 @@ struct ScratchAlgo::PImpl ChildTemplate *child_template = nullptr; Book last_book; Book book_at_inception; - Quantity total_fills = Quantity(0); Price scratch_price=Price(os::nan()); }; @@ -41,11 +40,6 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) auto& mutable_def = const_cast(def); //TODO Terrible hack auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); - std::string keys; - for(auto& pair : dscratch.order_params()) - { - keys += pair.first; - } if(dscratch.order_params().count("scratch_threshold") > 0) *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); @@ -185,7 +179,7 @@ void ScratchAlgo::try_to_scratch() me->scratch_price = scratch_price; child_update.set_price(scratch_price.value()); //we still want to try to scratch all of it - child_update.set_quantity(algo().quantity().value() - me->total_fills.value()); + child_update.set_quantity(algo().quantity().value()); algo().update_child(me->child_key, child_update); me->status = Status::SCRATCHED; } @@ -225,7 +219,6 @@ void ScratchAlgo::update_scratch_threshold() void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) { algo().update_fill_state(st.total_fills, st.last_price); - me->total_fills = st.total_fills; switch (st.status) { case ChildStatus::WORKING: From 0a33fb37b90e1ca72ca38d471bf319714eeb8994 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 27 May 2019 22:53:56 -0400 Subject: [PATCH 012/210] rata looking good --- src/lib/api/services/OrderService.proto | 10 ++++++---- .../orders/algo/algo_orders/ProRataAlgo.cpp | 20 ++++++++++++------- .../orders/algo/algo_orders/ScratchAlgo.cpp | 5 +++++ src/server/sparkd/cmds/Run.cpp | 7 +++++++ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index f90925449..35d385b16 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -201,14 +201,16 @@ message CompositeOrderDefinition { } message ScratchOrderDefinition { spark.QuantityMeasure scratch_threshold = 1; + uint32 chase_ticks = 2; CustomOrderDefinition child = 10; } message ProRataOrderDefinition { uint32 hedge_ticks = 1; - spark.QuantityMeasure fill_limit = 2; - spark.QuantityMeasure stay_in_threshold = 4; - bool enable_scratch_on_overfill = 5; - bool enable_stay_in = 6; + uint32 chase_ticks = 2; + spark.QuantityMeasure fill_limit = 5; + spark.QuantityMeasure stay_in_threshold = 6; + bool enable_scratch_on_overfill = 7; + bool enable_stay_in = 8; CustomOrderDefinition child = 10; CustomOrderDefinition hedge = 20; diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 20d489edc..6e109135b 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -37,10 +37,11 @@ struct ProRataAlgo::PImpl OrderKey child_key = null_order_key(); Price hedge_price_diff; + Price chase_diff; Quantity fill_limit; Quantity stay_in_threshold; bool enable_scratch_on_overfill; - bool enable_stay_in; + bool enable_stay_in; ChildTemplate *child_template = nullptr; ChildTemplate *hedge_template = nullptr; @@ -72,6 +73,10 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dprorata.order_params().count("hedge_ticks") > 0) prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); + prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); + if(dprorata.order_params().count("chase_ticks") > 0) + prorata.set_chase_ticks(dprorata.order_params().at("chase_ticks").as_uint32()); + if(dprorata.order_params().count("fill_limit") > 0) *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); if(dprorata.order_params().count("stay_in_threshold") > 0) @@ -218,14 +223,14 @@ void ProRataAlgo::check_overfill() void ProRataAlgo::scratch(std::pair kk) { - auto other_side = securities::other_side(algo().definition().side()); + auto cross_side = algo().definition().side(); Price scratch_price; Quantity scratch_quan; - SpreaderUtils::traverse_depth_for_quantity(me->last_book, other_side, kk.second, scratch_price, scratch_quan); + SpreaderUtils::traverse_depth_for_quantity(me->last_book, cross_side, kk.second, scratch_price, scratch_quan); + scratch_price = securities::worsen_price(cross_side, scratch_price, me->chase_diff); Update update; update.set_price(scratch_price.value()); - //we still want to try to scratch all of it update.set_quantity(kk.second.value()); algo().update_child(kk.first, update); } @@ -235,12 +240,12 @@ void ProRataAlgo::get_out() if(me->status != Status::GETTING_OUT) { me->status = Status::GETTING_OUT; + algo().cancel_child(me->child_key); if(me->enable_scratch_on_overfill) { for(auto& h : me->overfill_hedges) scratch(h); - } - algo().cancel_child(me->child_key); + } check_terminate(); } } @@ -275,7 +280,7 @@ void ProRataAlgo::on_child_change(OrderKey k, const ChildState& st) { if (k == me->child_key) { - if (st.total_fills.value() > me->hedged_fills.value()) + if (st.total_fills.value() > me->hedged_fills.value() && me->status == Status::WORKING) { auto hedge_qty = Quantity(st.total_fills.value() - me->hedged_fills.value()); auto hedge_price = securities::improve_price(algo().definition().side(), st.last_price, me->hedge_price_diff); @@ -386,6 +391,7 @@ void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, void ProRataAlgo::set_parameters(IBeforeLaunchAlgoServices &serv, const api::orderman::ProRataOrderDefinition& prorata) { me->hedge_price_diff = Price(securities::tick_size(serv.security()).value() * prorata.hedge_ticks()); + me->chase_diff = Price(securities::tick_size(serv.security()).value() * prorata.chase_ticks()); if(prorata.has_fill_limit()) me->fill_limit = SpreaderUtils::_quantity_threshold(prorata.fill_limit(), algo().quantity()); if(prorata.has_stay_in_threshold()) diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index e63254a9f..5cd57bf4a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -17,6 +17,7 @@ struct ScratchAlgo::PImpl { IAlgoServices *algo; Quantity scratch_threshold; + Price chase_diff; Status status = Status::WAITING_FOR_MD; OrderKey child_key = null_order_key(); ChildTemplate *child_template = nullptr; @@ -42,6 +43,8 @@ void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dscratch.order_params().count("scratch_threshold") > 0) *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); + if(dscratch.order_params().count("chase_ticks") > 0) + scratch.set_chase_ticks(dscratch.order_params().at("chase_ticks").as_uint32()); if(dscratch.order_params().count("child") > 0) *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); @@ -214,6 +217,8 @@ void ScratchAlgo::update_scratch_threshold() { me->scratch_threshold = SpreaderUtils::_quantity_threshold( algo().definition().custom_def().scratch().scratch_threshold(), algo().quantity()); + me->chase_diff = Price(securities::tick_size( + algo().security()).value() * algo().definition().custom_def().scratch().chase_ticks()); } void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 14b2faaf6..299e53901 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -89,6 +89,9 @@ int Run::execute(std::vector const &) { auto param = desc.add_param_desc(); param->set_param_name("scratch_threshold"); param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); + param = desc.add_param_desc(); + param->set_param_name("chase_ticks"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); param = desc.add_param_desc(); param->set_param_name("child"); @@ -103,6 +106,10 @@ int Run::execute(std::vector const &) { auto param = desc.add_param_desc(); param->set_param_name("hedge_ticks"); param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); + param->set_param_name("chase_ticks"); + param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); + param = desc.add_param_desc(); param->set_param_name("fill_limit"); param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); From 91989e6bafcede628b0ef3da821c6bff5ef3931b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 10:19:31 -0400 Subject: [PATCH 013/210] Quantity measure validation --- .../orders/algo/algo_orders/ProRataAlgo.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 6e109135b..b177fd227 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -73,14 +73,25 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dprorata.order_params().count("hedge_ticks") > 0) prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); - prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); + prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); + if(dprorata.order_params().count("chase_ticks") > 0) prorata.set_chase_ticks(dprorata.order_params().at("chase_ticks").as_uint32()); if(dprorata.order_params().count("fill_limit") > 0) *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); + if(!prorata.has_fill_limit() || + prorata.fill_limit().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + prorata.mutable_fill_limit()->set_absolute(1u); + + if(dprorata.order_params().count("stay_in_threshold") > 0) - *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); + *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); + if(!prorata.has_stay_in_threshold() || + prorata.stay_in_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + prorata.mutable_stay_in_threshold()->set_absolute(1u); + + if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); if(dprorata.order_params().count("enable_stay_in") > 0) @@ -131,6 +142,7 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) init_hedge_template(serv, prorata.hedge(), false); init_hedge_template(serv, prorata.overfill_hedge(), true); + return {}; } From e8bc07360db095887ad89f2b77e72780b7310a00 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 13:52:18 -0400 Subject: [PATCH 014/210] got the dynamism and updates working --- src/lib/orderman/orders/algo/DynamicHelpers.h | 40 ++++++++++++ .../orders/algo/algo_orders/ScratchAlgo.cpp | 65 +++++++++++-------- .../orders/algo/algo_orders/ScratchAlgo.h | 7 +- 3 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 src/lib/orderman/orders/algo/DynamicHelpers.h diff --git a/src/lib/orderman/orders/algo/DynamicHelpers.h b/src/lib/orderman/orders/algo/DynamicHelpers.h new file mode 100644 index 000000000..99261d06d --- /dev/null +++ b/src/lib/orderman/orders/algo/DynamicHelpers.h @@ -0,0 +1,40 @@ +#pragma once + +#include "lib/api/services/OrderService.pb.h" + +namespace bts { +namespace orderman { + +template +bool has_custom(const T& orig) +{ + return orig.has_custom_def(); +} +template<> +bool has_custom(const api::orderman::Update& orig) +{ + return orig.has_custom(); +} +template +const api::orderman::CustomOrderDefinition& custom(const T& orig) +{ + return orig.custom_def(); +} +template<> +const api::orderman::CustomOrderDefinition& custom(const api::orderman::Update& orig) +{ + return orig.custom(); +} +template +api::orderman::CustomOrderDefinition& mutable_custom(T& orig) +{ + return *orig.mutable_custom_def(); +} +template<> +api::orderman::CustomOrderDefinition& mutable_custom(api::orderman::Update& orig) +{ + return *orig.mutable_custom(); +} + + +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 5cd57bf4a..49a4e61b3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -1,5 +1,6 @@ #include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h" #include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/algo/DynamicHelpers.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" @@ -16,6 +17,8 @@ enum class ScratchAlgo::Status { WAITING_FOR_MD, WAITING_TO_SCRATCH, SCRATCHED } struct ScratchAlgo::PImpl { IAlgoServices *algo; + OrderDefinition definition; + Quantity scratch_threshold; Price chase_diff; Status status = Status::WAITING_FOR_MD; @@ -29,39 +32,40 @@ struct ScratchAlgo::PImpl ScratchAlgo::ScratchAlgo() : me(new PImpl()) {} ScratchAlgo::~ScratchAlgo() {} IAlgoServices &ScratchAlgo::algo() const { return *me->algo; } +const OrderDefinition& ScratchAlgo::definition() const { return me->definition; } -void ScratchAlgo::check_dynamic(const api::orderman::OrderDefinition& def) +template +T convert_from_dynamic(const T& orig) { - if (def.has_custom_def() && def.custom_def().has_dynamic()) - { - - //copy - api::orderman::DynamicOrderDefinition dscratch; - dscratch.CopyFrom(def.custom_def().dynamic()); - auto& mutable_def = const_cast(def); //TODO Terrible hack - auto& scratch = *mutable_def.mutable_custom_def()->mutable_scratch(); + T newt = orig; + if ( has_custom(orig) && custom(orig).has_dynamic()) + { + const DynamicOrderDefinition& dscratch = custom(orig).dynamic(); + auto& scratch = *mutable_custom(newt).mutable_scratch(); if(dscratch.order_params().count("scratch_threshold") > 0) *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); + if(dscratch.order_params().count("chase_ticks") > 0) scratch.set_chase_ticks(dscratch.order_params().at("chase_ticks").as_uint32()); if(dscratch.order_params().count("child") > 0) *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); else - scratch.mutable_child()->mutable_limit(); - } + scratch.mutable_child()->mutable_limit(); + } + return newt; } OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { - auto& def = serv.definition(); - check_dynamic(def); - bts_assert(def.has_custom_def()); - bts_assert(def.custom_def().has_scratch()); + me->definition = convert_from_dynamic(serv.definition()); + + bts_assert(definition().has_custom_def()); + bts_assert(definition().custom_def().has_scratch()); // Validate the scratch part of the definition - auto &scratch = def.custom_def().scratch(); - if (!scratch.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) + auto &scratch = definition().custom_def().scratch(); + if (!scratch.has_child() && OrderKey(definition().attach_target_order_key()) == null_order_key()) { return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, "Scratch order must have either a child order definition or an order to attach to"}; @@ -70,8 +74,8 @@ OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().scratch().child(); + auto child_def = definition(); + *child_def.mutable_custom_def() = definition().custom_def().scratch().child(); me->child_template = &(serv.make_child_template(child_def)); } return {}; @@ -96,9 +100,13 @@ void ScratchAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState } void ScratchAlgo::do_update(api::orderman::Update const &update) -{ +{ LOG(OrderMan, Diag, "ScratchOrder order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_scratch()) + + Update converted_update = convert_from_dynamic(update); + me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); + + if (update.has_custom() && !converted_update.custom().has_scratch()) { algo().terminate_error("Invalid update"); return; @@ -111,7 +119,7 @@ void ScratchAlgo::do_update(api::orderman::Update const &update) if (update.has_custom()) { update_scratch_threshold(); - auto &scratch_update = update.custom().scratch(); + auto &scratch_update = converted_update.custom().scratch(); *child_update.mutable_custom() = scratch_update.child(); } algo().update_child(me->child_key, child_update); @@ -135,7 +143,7 @@ void ScratchAlgo::on_book(SecurityKey, Book const &b) { case Status::WAITING_FOR_MD: { - auto other_side = securities::other_side(algo().definition().side()); + auto other_side = securities::other_side(definition().side()); auto &other_side_top = me->last_book.side(other_side)[0]; if (other_side_top.size() > 0) @@ -160,7 +168,7 @@ void ScratchAlgo::on_book(SecurityKey, Book const &b) void ScratchAlgo::try_to_scratch() { bts_assert(me->status == Status::WAITING_TO_SCRATCH); - auto my_side = algo().definition().side(); + auto my_side = definition().side(); auto other_side = securities::other_side(my_side); Quantity my_quan; @@ -215,10 +223,15 @@ Price ScratchAlgo::get_price_to_pass (Price price) const void ScratchAlgo::update_scratch_threshold() { + if (definition().custom_def().scratch().scratch_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + { + algo().terminate_error("Invalid quantity, terminating"); + return; + } me->scratch_threshold = SpreaderUtils::_quantity_threshold( - algo().definition().custom_def().scratch().scratch_threshold(), algo().quantity()); + definition().custom_def().scratch().scratch_threshold(), algo().quantity()); me->chase_diff = Price(securities::tick_size( - algo().security()).value() * algo().definition().custom_def().scratch().chase_ticks()); + algo().security()).value() * definition().custom_def().scratch().chase_ticks()); } void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h index 76c220a80..11640bdca 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h @@ -25,12 +25,13 @@ private: enum class Status; struct PImpl; std::unique_ptr me; - - IAlgoServices &algo() const ; + + const api::orderman::OrderDefinition& definition() const; + IAlgoServices& algo() const; + void update_scratch_threshold(); void try_to_scratch(); Price get_price_to_pass (Price price) const; - void check_dynamic(const api::orderman::OrderDefinition&); }; }} From 938a572a54f54a571535a764f89fd2f78e7b9e8a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 14:14:16 -0400 Subject: [PATCH 015/210] rethinking the dynamictype -> native type for sake of gui going to make a new type of DefaultOrderVM that uses reflection instead of converting dynamic -> native in the orderman --- .../orderman/orders/algo/DynamicHelpers.cpp | 25 ++++++++ src/lib/orderman/orders/algo/DynamicHelpers.h | 17 ++---- .../orders/algo/algo_orders/ProRataAlgo.cpp | 60 ++++++++++--------- .../orders/algo/algo_orders/ProRataAlgo.h | 2 +- .../orders/algo/algo_orders/ScratchAlgo.cpp | 3 +- 5 files changed, 64 insertions(+), 43 deletions(-) create mode 100644 src/lib/orderman/orders/algo/DynamicHelpers.cpp diff --git a/src/lib/orderman/orders/algo/DynamicHelpers.cpp b/src/lib/orderman/orders/algo/DynamicHelpers.cpp new file mode 100644 index 000000000..6d347c867 --- /dev/null +++ b/src/lib/orderman/orders/algo/DynamicHelpers.cpp @@ -0,0 +1,25 @@ +#include "DynamicHelpers.h" + +namespace bts { +namespace orderman { + +template<> +bool has_custom(const api::orderman::Update& orig) +{ + return orig.has_custom(); +} + +template<> +const api::orderman::CustomOrderDefinition& custom(const api::orderman::Update& orig) +{ + return orig.custom(); +} + +template<> +api::orderman::CustomOrderDefinition& mutable_custom(api::orderman::Update& orig) +{ + return *orig.mutable_custom(); +} + + +}} \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/DynamicHelpers.h b/src/lib/orderman/orders/algo/DynamicHelpers.h index 99261d06d..53488ba33 100644 --- a/src/lib/orderman/orders/algo/DynamicHelpers.h +++ b/src/lib/orderman/orders/algo/DynamicHelpers.h @@ -11,30 +11,23 @@ bool has_custom(const T& orig) return orig.has_custom_def(); } template<> -bool has_custom(const api::orderman::Update& orig) -{ - return orig.has_custom(); -} +bool has_custom(const api::orderman::Update& orig); + template const api::orderman::CustomOrderDefinition& custom(const T& orig) { return orig.custom_def(); } template<> -const api::orderman::CustomOrderDefinition& custom(const api::orderman::Update& orig) -{ - return orig.custom(); -} +const api::orderman::CustomOrderDefinition& custom(const api::orderman::Update& orig); + template api::orderman::CustomOrderDefinition& mutable_custom(T& orig) { return *orig.mutable_custom_def(); } template<> -api::orderman::CustomOrderDefinition& mutable_custom(api::orderman::Update& orig) -{ - return *orig.mutable_custom(); -} +api::orderman::CustomOrderDefinition& mutable_custom(api::orderman::Update& orig); }} \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index b177fd227..f9a30826a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -3,6 +3,8 @@ #include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/algo/DynamicHelpers.h" + #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/utils/PBUtils.h" @@ -34,6 +36,8 @@ struct ProRataAlgo::PImpl { } IAlgoServices *algo; + OrderDefinition definition; + OrderKey child_key = null_order_key(); Price hedge_price_diff; @@ -60,16 +64,16 @@ struct ProRataAlgo::PImpl ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} ProRataAlgo::~ProRataAlgo() {} IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } +const OrderDefinition& ProRataAlgo::definition() const { return me->definition; } -void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) +template +T convert_from_dynamic(const T& orig) { - if (def.has_custom_def() && def.custom_def().has_dynamic()) - { - //copy - api::orderman::DynamicOrderDefinition dprorata; - dprorata.CopyFrom(def.custom_def().dynamic()); - auto& mutable_def = const_cast(def); //TODO Terrible hack - auto& prorata = *mutable_def.mutable_custom_def()->mutable_prorata(); + T newt = orig; + if(has_custom(orig) && custom(orig).has_dynamic()) + { + const DynamicOrderDefinition& dprorata = custom(orig).dynamic(); + auto& prorata = *mutable_custom(newt).mutable_prorata(); if(dprorata.order_params().count("hedge_ticks") > 0) prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); @@ -83,14 +87,12 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(!prorata.has_fill_limit() || prorata.fill_limit().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) prorata.mutable_fill_limit()->set_absolute(1u); - - + if(dprorata.order_params().count("stay_in_threshold") > 0) *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); if(!prorata.has_stay_in_threshold() || prorata.stay_in_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) prorata.mutable_stay_in_threshold()->set_absolute(1u); - if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); @@ -110,19 +112,20 @@ void ProRataAlgo::check_dynamic(const api::orderman::OrderDefinition& def) if(dprorata.order_params().count("overfill_hedge") > 0) *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); else - prorata.mutable_overfill_hedge()->mutable_limit(); - } + prorata.mutable_overfill_hedge()->mutable_limit(); + } + return newt; } OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { const api::orderman::OrderDefinition& def = serv.definition(); - check_dynamic(def); - bts_assert(def.has_custom_def()); - bts_assert(def.custom_def().has_prorata()); + me->definition = convert_from_dynamic(serv.definition()); + bts_assert(definition().has_custom_def()); + bts_assert(definition().custom_def().has_prorata()); // Validate the prorata part of the definition - auto &prorata = def.custom_def().prorata(); + auto &prorata = definition().custom_def().prorata(); if (!prorata.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) { return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, @@ -135,8 +138,8 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().prorata().child(); + auto child_def = definition(); + *child_def.mutable_custom_def() = definition().custom_def().prorata().child(); me->child_template = &(serv.make_child_template(child_def)); } @@ -149,12 +152,12 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) void ProRataAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; - set_parameters(algo, algo.definition().custom_def().prorata()); + set_parameters(algo, definition().custom_def().prorata()); LOG(OrderMan, Diag, "Starting ProRataAlgo {}, {} {}@{}. Will cover {} ticks", algo.order_key().value(), - securities::side_name(algo.definition().side()), algo.quantity().value(), + securities::side_name(definition().side()), algo.quantity().value(), algo.price().value(), - algo.definition().custom_def().prorata().hedge_ticks()); + definition().custom_def().prorata().hedge_ticks()); LOG(OrderMan, Diag, "ProRataAlgo {} launching child", algo.order_key().value()); me->child_key = algo.launch_child(*me->child_template, algo.price(), algo.quantity()); @@ -164,14 +167,13 @@ void ProRataAlgo::do_launch(IAlgoServices &algo) void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState st) { me->algo = &algo; - set_parameters(algo, algo.definition().custom_def().prorata()); + set_parameters(algo, definition().custom_def().prorata()); me->child_key = k; me->hedged_fills = st.total_fills; algo.subscribe_book(SecurityKey(algo.security().id())); on_child_change(k, st); } - void ProRataAlgo::on_book(SecurityKey, const Book& b) { me->last_book = b; @@ -351,7 +353,9 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) LOG(OrderMan, Diag, "ProRataAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - if (update.has_custom() && !update.custom().has_prorata()) + Update converted_update = convert_from_dynamic(update); + me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); + if (update.has_custom() && !converted_update.custom().has_prorata()) { algo().terminate_error("Invalid update"); return; @@ -364,7 +368,7 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) // process custom part of the udpate if any if (update.has_custom()) { - auto &prorata_update = update.custom().prorata(); + auto &prorata_update = converted_update.custom().prorata(); set_parameters(algo(), prorata_update); if(prorata_update.has_child()) @@ -388,9 +392,9 @@ void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, const api::orderman::CustomOrderDefinition& hedge_cdef, bool overfill) { api::orderman::OrderDefinition hedge_def; - hedge_def.CopyFrom(algo.definition()); + hedge_def.CopyFrom(definition()); - hedge_def.set_side(securities::other_side(algo.definition().side())); + hedge_def.set_side(securities::other_side(definition().side())); hedge_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); hedge_def.clear_attach_target_order_key(); *hedge_def.mutable_custom_def() = hedge_cdef; diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index 07ffc294c..05ae354b3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -35,7 +35,7 @@ private: void check_overfill(); void check_terminate(); const char *status_name(Status st); - void check_dynamic(const api::orderman::OrderDefinition&); + const api::orderman::OrderDefinition& definition() const; }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 49a4e61b3..745cc72cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -104,8 +104,7 @@ void ScratchAlgo::do_update(api::orderman::Update const &update) LOG(OrderMan, Diag, "ScratchOrder order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); Update converted_update = convert_from_dynamic(update); - me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); - + me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); if (update.has_custom() && !converted_update.custom().has_scratch()) { algo().terminate_error("Invalid update"); From 1567ca475d62e529b60c7c731ca9b15960ef8eaf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 14:29:01 -0400 Subject: [PATCH 016/210] now moving to gui --- .../orders/algo/algo_orders/ProRataAlgo.cpp | 136 +++++++++--------- .../orders/algo/algo_orders/ProRataAlgo.h | 1 - .../orders/algo/algo_orders/ScratchAlgo.cpp | 71 +++++---- .../orders/algo/algo_orders/ScratchAlgo.h | 4 +- 4 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index f9a30826a..96b7aa52e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -36,8 +36,6 @@ struct ProRataAlgo::PImpl { } IAlgoServices *algo; - OrderDefinition definition; - OrderKey child_key = null_order_key(); Price hedge_price_diff; @@ -64,68 +62,66 @@ struct ProRataAlgo::PImpl ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} ProRataAlgo::~ProRataAlgo() {} IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } -const OrderDefinition& ProRataAlgo::definition() const { return me->definition; } -template -T convert_from_dynamic(const T& orig) -{ - T newt = orig; - if(has_custom(orig) && custom(orig).has_dynamic()) - { - const DynamicOrderDefinition& dprorata = custom(orig).dynamic(); - auto& prorata = *mutable_custom(newt).mutable_prorata(); +// template +// T convert_from_dynamic(const T& orig) +// { +// T newt = orig; +// if(has_custom(orig) && custom(orig).has_dynamic()) +// { +// const DynamicOrderDefinition& dprorata = custom(orig).dynamic(); +// auto& prorata = *mutable_custom(newt).mutable_prorata(); - if(dprorata.order_params().count("hedge_ticks") > 0) - prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); - prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); +// if(dprorata.order_params().count("hedge_ticks") > 0) +// prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); +// prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); - if(dprorata.order_params().count("chase_ticks") > 0) - prorata.set_chase_ticks(dprorata.order_params().at("chase_ticks").as_uint32()); +// if(dprorata.order_params().count("chase_ticks") > 0) +// prorata.set_chase_ticks(dprorata.order_params().at("chase_ticks").as_uint32()); - if(dprorata.order_params().count("fill_limit") > 0) - *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); - if(!prorata.has_fill_limit() || - prorata.fill_limit().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) - prorata.mutable_fill_limit()->set_absolute(1u); +// if(dprorata.order_params().count("fill_limit") > 0) +// *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); +// if(!prorata.has_fill_limit() || +// prorata.fill_limit().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) +// prorata.mutable_fill_limit()->set_absolute(1u); - if(dprorata.order_params().count("stay_in_threshold") > 0) - *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); - if(!prorata.has_stay_in_threshold() || - prorata.stay_in_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) - prorata.mutable_stay_in_threshold()->set_absolute(1u); +// if(dprorata.order_params().count("stay_in_threshold") > 0) +// *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); +// if(!prorata.has_stay_in_threshold() || +// prorata.stay_in_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) +// prorata.mutable_stay_in_threshold()->set_absolute(1u); - if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) - prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); - if(dprorata.order_params().count("enable_stay_in") > 0) - prorata.set_enable_stay_in(dprorata.order_params().at("enable_stay_in").as_bool()); +// if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) +// prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); +// if(dprorata.order_params().count("enable_stay_in") > 0) +// prorata.set_enable_stay_in(dprorata.order_params().at("enable_stay_in").as_bool()); - if(dprorata.order_params().count("child") > 0) - *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); - else - prorata.mutable_child()->mutable_limit(); +// if(dprorata.order_params().count("child") > 0) +// *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); +// else +// prorata.mutable_child()->mutable_limit(); - if(dprorata.order_params().count("hedge") > 0) - *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); - else - prorata.mutable_hedge()->mutable_limit(); +// if(dprorata.order_params().count("hedge") > 0) +// *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); +// else +// prorata.mutable_hedge()->mutable_limit(); - if(dprorata.order_params().count("overfill_hedge") > 0) - *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); - else - prorata.mutable_overfill_hedge()->mutable_limit(); - } - return newt; -} +// if(dprorata.order_params().count("overfill_hedge") > 0) +// *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); +// else +// prorata.mutable_overfill_hedge()->mutable_limit(); +// } +// return newt; +// } OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { const api::orderman::OrderDefinition& def = serv.definition(); - me->definition = convert_from_dynamic(serv.definition()); - bts_assert(definition().has_custom_def()); - bts_assert(definition().custom_def().has_prorata()); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_prorata()); // Validate the prorata part of the definition - auto &prorata = definition().custom_def().prorata(); + auto &prorata = def.custom_def().prorata(); if (!prorata.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) { return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, @@ -138,8 +134,8 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. - auto child_def = definition(); - *child_def.mutable_custom_def() = definition().custom_def().prorata().child(); + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().prorata().child(); me->child_template = &(serv.make_child_template(child_def)); } @@ -152,12 +148,12 @@ OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) void ProRataAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; - set_parameters(algo, definition().custom_def().prorata()); + set_parameters(algo, algo.definition().custom_def().prorata()); LOG(OrderMan, Diag, "Starting ProRataAlgo {}, {} {}@{}. Will cover {} ticks", algo.order_key().value(), - securities::side_name(definition().side()), algo.quantity().value(), + securities::side_name(algo.definition().side()), algo.quantity().value(), algo.price().value(), - definition().custom_def().prorata().hedge_ticks()); + algo.definition().custom_def().prorata().hedge_ticks()); LOG(OrderMan, Diag, "ProRataAlgo {} launching child", algo.order_key().value()); me->child_key = algo.launch_child(*me->child_template, algo.price(), algo.quantity()); @@ -167,7 +163,7 @@ void ProRataAlgo::do_launch(IAlgoServices &algo) void ProRataAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, ChildState st) { me->algo = &algo; - set_parameters(algo, definition().custom_def().prorata()); + set_parameters(algo, algo.definition().custom_def().prorata()); me->child_key = k; me->hedged_fills = st.total_fills; algo.subscribe_book(SecurityKey(algo.security().id())); @@ -353,9 +349,7 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) LOG(OrderMan, Diag, "ProRataAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - Update converted_update = convert_from_dynamic(update); - me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); - if (update.has_custom() && !converted_update.custom().has_prorata()) + if (update.has_custom() && !update.custom().has_prorata()) { algo().terminate_error("Invalid update"); return; @@ -368,7 +362,7 @@ void ProRataAlgo::do_update(const api::orderman::Update& update) // process custom part of the udpate if any if (update.has_custom()) { - auto &prorata_update = converted_update.custom().prorata(); + auto &prorata_update = update.custom().prorata(); set_parameters(algo(), prorata_update); if(prorata_update.has_child()) @@ -392,9 +386,9 @@ void orderman::ProRataAlgo::init_hedge_template(IBeforeLaunchAlgoServices &algo, const api::orderman::CustomOrderDefinition& hedge_cdef, bool overfill) { api::orderman::OrderDefinition hedge_def; - hedge_def.CopyFrom(definition()); + hedge_def.CopyFrom(algo.definition()); - hedge_def.set_side(securities::other_side(definition().side())); + hedge_def.set_side(securities::other_side(algo.definition().side())); hedge_def.set_sub_type(ORDER_SUB_TYPE_HEDGING_LEG); hedge_def.clear_attach_target_order_key(); *hedge_def.mutable_custom_def() = hedge_cdef; @@ -408,10 +402,22 @@ void ProRataAlgo::set_parameters(IBeforeLaunchAlgoServices &serv, const api::ord { me->hedge_price_diff = Price(securities::tick_size(serv.security()).value() * prorata.hedge_ticks()); me->chase_diff = Price(securities::tick_size(serv.security()).value() * prorata.chase_ticks()); - if(prorata.has_fill_limit()) - me->fill_limit = SpreaderUtils::_quantity_threshold(prorata.fill_limit(), algo().quantity()); - if(prorata.has_stay_in_threshold()) - me->stay_in_threshold = SpreaderUtils::_quantity_threshold(prorata.stay_in_threshold(), algo().quantity()); + + if (!prorata.has_fill_limit() || prorata.fill_limit().quantity_case() == + bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + { + algo().terminate_error("Invalid fill limit quantity, terminating"); + return; + } + me->fill_limit = SpreaderUtils::_quantity_threshold(prorata.fill_limit(), algo().quantity()); + + if (!prorata.has_stay_in_threshold() || prorata.stay_in_threshold().quantity_case() == + bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + { + algo().terminate_error("Invalid stay_in_threshold quantity, terminating"); + return; + } + me->stay_in_threshold = SpreaderUtils::_quantity_threshold(prorata.stay_in_threshold(), algo().quantity()); me->enable_scratch_on_overfill = prorata.enable_scratch_on_overfill(); me->enable_stay_in = prorata.enable_stay_in(); } diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h index 05ae354b3..502cbf520 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.h @@ -35,7 +35,6 @@ private: void check_overfill(); void check_terminate(); const char *status_name(Status st); - const api::orderman::OrderDefinition& definition() const; }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 745cc72cb..2bb3b56ad 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -32,40 +32,38 @@ struct ScratchAlgo::PImpl ScratchAlgo::ScratchAlgo() : me(new PImpl()) {} ScratchAlgo::~ScratchAlgo() {} IAlgoServices &ScratchAlgo::algo() const { return *me->algo; } -const OrderDefinition& ScratchAlgo::definition() const { return me->definition; } -template -T convert_from_dynamic(const T& orig) -{ - T newt = orig; - if ( has_custom(orig) && custom(orig).has_dynamic()) - { - const DynamicOrderDefinition& dscratch = custom(orig).dynamic(); - auto& scratch = *mutable_custom(newt).mutable_scratch(); +// template +// T convert_from_dynamic(const T& orig) +// { +// T newt = orig; +// if ( has_custom(orig) && custom(orig).has_dynamic()) +// { +// const DynamicOrderDefinition& dscratch = custom(orig).dynamic(); +// auto& scratch = *mutable_custom(newt).mutable_scratch(); - if(dscratch.order_params().count("scratch_threshold") > 0) - *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); +// if(dscratch.order_params().count("scratch_threshold") > 0) +// *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); - if(dscratch.order_params().count("chase_ticks") > 0) - scratch.set_chase_ticks(dscratch.order_params().at("chase_ticks").as_uint32()); +// if(dscratch.order_params().count("chase_ticks") > 0) +// scratch.set_chase_ticks(dscratch.order_params().at("chase_ticks").as_uint32()); - if(dscratch.order_params().count("child") > 0) - *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); - else - scratch.mutable_child()->mutable_limit(); - } - return newt; -} +// if(dscratch.order_params().count("child") > 0) +// *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); +// else +// scratch.mutable_child()->mutable_limit(); +// } +// return newt; +// } OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { - me->definition = convert_from_dynamic(serv.definition()); - - bts_assert(definition().has_custom_def()); - bts_assert(definition().custom_def().has_scratch()); + const auto& def = serv.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_scratch()); // Validate the scratch part of the definition - auto &scratch = definition().custom_def().scratch(); - if (!scratch.has_child() && OrderKey(definition().attach_target_order_key()) == null_order_key()) + auto &scratch = def.custom_def().scratch(); + if (!scratch.has_child() && OrderKey(def.attach_target_order_key()) == null_order_key()) { return OrderOpResult{ ORDER_ERROR_INVALID_ORDER_DEFINITON, "Scratch order must have either a child order definition or an order to attach to"}; @@ -74,8 +72,8 @@ OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. - auto child_def = definition(); - *child_def.mutable_custom_def() = definition().custom_def().scratch().child(); + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().scratch().child(); me->child_template = &(serv.make_child_template(child_def)); } return {}; @@ -103,9 +101,7 @@ void ScratchAlgo::do_update(api::orderman::Update const &update) { LOG(OrderMan, Diag, "ScratchOrder order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - Update converted_update = convert_from_dynamic(update); - me->definition.mutable_custom_def()->CopyFrom(custom(converted_update)); - if (update.has_custom() && !converted_update.custom().has_scratch()) + if (update.has_custom() && !update.custom().has_scratch()) { algo().terminate_error("Invalid update"); return; @@ -118,7 +114,7 @@ void ScratchAlgo::do_update(api::orderman::Update const &update) if (update.has_custom()) { update_scratch_threshold(); - auto &scratch_update = converted_update.custom().scratch(); + auto &scratch_update = update.custom().scratch(); *child_update.mutable_custom() = scratch_update.child(); } algo().update_child(me->child_key, child_update); @@ -142,7 +138,7 @@ void ScratchAlgo::on_book(SecurityKey, Book const &b) { case Status::WAITING_FOR_MD: { - auto other_side = securities::other_side(definition().side()); + auto other_side = securities::other_side(algo().definition().side()); auto &other_side_top = me->last_book.side(other_side)[0]; if (other_side_top.size() > 0) @@ -167,7 +163,7 @@ void ScratchAlgo::on_book(SecurityKey, Book const &b) void ScratchAlgo::try_to_scratch() { bts_assert(me->status == Status::WAITING_TO_SCRATCH); - auto my_side = definition().side(); + auto my_side = algo().definition().side(); auto other_side = securities::other_side(my_side); Quantity my_quan; @@ -222,15 +218,16 @@ Price ScratchAlgo::get_price_to_pass (Price price) const void ScratchAlgo::update_scratch_threshold() { - if (definition().custom_def().scratch().scratch_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) + if (algo().definition().custom_def().scratch().scratch_threshold().quantity_case() == + bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) { algo().terminate_error("Invalid quantity, terminating"); return; } me->scratch_threshold = SpreaderUtils::_quantity_threshold( - definition().custom_def().scratch().scratch_threshold(), algo().quantity()); + algo().definition().custom_def().scratch().scratch_threshold(), algo().quantity()); me->chase_diff = Price(securities::tick_size( - algo().security()).value() * definition().custom_def().scratch().chase_ticks()); + algo().security()).value() * algo().definition().custom_def().scratch().chase_ticks()); } void ScratchAlgo::on_child_change(OrderKey, ChildState const &st) diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h index 11640bdca..ca6fada14 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.h @@ -24,9 +24,7 @@ public: private: enum class Status; struct PImpl; - std::unique_ptr me; - - const api::orderman::OrderDefinition& definition() const; + std::unique_ptr me; IAlgoServices& algo() const; void update_scratch_threshold(); From b1e19294e6f4de47401076fe351a2d40153818cc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 17:50:35 -0400 Subject: [PATCH 017/210] making some headway on generic order ui --- src/client/spark/Orders/OrderDataHelper.cs | 12 ++ .../Orders/OrderTypeVMs/GenericOrderHelper.cs | 52 +++++ .../OrderTypeVMs/GenericOrderParamVM.cs | 178 ++++++++++++++++++ .../GenericOrderTemplateSelector.cs | 63 +++++++ .../Orders/OrderTypeVMs/GenericOrderVM.cs | 152 +++++++++++++++ .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 3 +- .../Order/AlgoContentTemplateSelector.xaml | 170 +++++++++++++++++ .../Order/AlgoContentTemplateSelector.xaml.cs | 2 + src/lib/api/services/OrderService.proto | 8 + 9 files changed, 639 insertions(+), 1 deletion(-) create mode 100644 src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs create mode 100644 src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs create mode 100644 src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs create mode 100644 src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index e31fface7..c3c9a8c96 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -213,6 +213,8 @@ namespace mbts.spark.utilities { public OffsetOrderDefinition offset_order() => OrderDataHelper.Defaults.OffsetOrderDefinition(); public TriggerOrderDefinition trigger_order() => OrderDataHelper.Defaults.TriggerOrderDefinition(); public DynamicOrderDefinition dynamic_order() => OrderDataHelper.Defaults.DynamicOrderDefinition(); + public GenericOrderDefinition generic_order(CustomOrderDefinition.CustomOneofCase order_type) => + OrderDataHelper.Defaults.GenericOrderDefinition(order_type); public SpreaderOrderDefinition spreader_order() => OrderDataHelper.Defaults.SpreaderOrderDefinition(); public SpreaderOrderDefinition spreader_order(SecurityImmutable security, ExecutionStrategyImmutable strategy) => new SpreaderOrderDefinition { @@ -245,6 +247,9 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = spreader_order(); break; case CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = dynamic_order(); break; //case CustomOrderDefinition.CustomOneofCase.QueueHolder: rv.QueueHolder = queue_holder_order(); break; + default: + rv.Generic = generic_order(order_type); + break; } return rv; } @@ -270,6 +275,7 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order }; case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; + case CustomOrderDefinition.CustomOneofCase.Generic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: goto default; //case CustomOrderDefinition.CustomOneofCase.QueueHolder: return new OrderMetadata { KeyBinding = "Q", Color = BTSColors.purple.rgb_color() }; default: return _default_order_metadata; @@ -431,6 +437,7 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order }; case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; + case CustomOrderDefinition.CustomOneofCase.Generic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: default: return _default_order_metadata; } @@ -993,6 +1000,9 @@ namespace mbts.spark.utilities { case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Trigger: rv.Trigger = TriggerOrderDefinition(); break; case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = SpreaderOrderDefinition(); break; case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = DynamicOrderDefinition(); break; + default: + rv.Generic = GenericOrderDefinition(order_type); + break; } return rv; } @@ -1016,7 +1026,9 @@ namespace mbts.spark.utilities { public static OffsetOrderDefinition OffsetOrderDefinition() => new OffsetOrderDefinition { Child = CustomOrderDefinition(), }; public static TriggerOrderDefinition TriggerOrderDefinition() => new TriggerOrderDefinition { Child = CustomOrderDefinition(), TriggerCondition = new TriggerCondition(), TriggerAction = new TriggerAction(), }; public static DynamicOrderDefinition DynamicOrderDefinition() => new DynamicOrderDefinition(); + public static GenericOrderDefinition GenericOrderDefinition(CustomOrderDefinition.CustomOneofCase order_type) => new GenericOrderDefinition { knownType = order_type.ToString() } ; public static SpreaderOrderDefinition SpreaderOrderDefinition() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() }; } } + } diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs new file mode 100644 index 000000000..e6a261364 --- /dev/null +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs @@ -0,0 +1,52 @@ + +using bts.api; +using bts.api.orderman; +using bts.utils; +using Google.Protobuf; +using Google.Protobuf.Reflection; +using mbts.ui.utility; +using mbts.utils; +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.Linq; +using System.Reactive.Linq; + +namespace mbts.spark +{ + [Export] + class GenericOrderHelper + { + [ImportingConstructor] + private GenericOrderHelper(OrderService order_service) + { + } + + internal static string get_enumerated_value(IMessage message, FieldDescriptor fd) + { + var ev = fd.Accessor.GetValue(message); + return ev.ToString(); + } + internal static void set_enumerated_value(IMessage message, FieldDescriptor fd, string value) + { + if (message == null) + { + return; + } + var ev = fd.EnumType.Values.First(x => x.Name == value)?.Number; + if(ev.HasValue) + fd.Accessor.SetValue(message, ev.Value); + } + + internal static bts.spark.QuantityMeasureImmutable? get_quantity_value(IMessage message, FieldDescriptor fd) + { + return (bts.spark.QuantityMeasureImmutable)fd.Accessor.GetValue(message); + } + internal static void set_quantity_value(IMessage message, FieldDescriptor fd, bts.spark.QuantityMeasureImmutable? value) + { + if (message == null) + return; + fd.Accessor.SetValue(message, value?.CloneToMutable()); + } + } +} diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs new file mode 100644 index 000000000..606c83641 --- /dev/null +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs @@ -0,0 +1,178 @@ +using bts.api.orderman; +using Google.Protobuf.Reflection; +using mbts.ui.shell; +using bts.spark; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Linq; +using System.Reactive.Linq; +using Google.Protobuf.Reflection; + +namespace mbts.spark +{ + interface IGenericOrderParamVM + { + FieldDescriptor descriptor { get; } + Google.Protobuf.IMessage message { get; set; } + } + + interface IGenericOrderParamVM : IGenericOrderParamVM + { + T value { get; set; } + IObservable subscribe_value(); + } + + abstract class GenericOrderParamVM : DisposableViewModelBase, IGenericOrderParamVM + { + Google.Protobuf.IMessage _message; + protected GenericOrderParamVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) + { + _message = message; + this.descriptor = descriptor; + } + + public FieldDescriptor descriptor { get; set; } + public Google.Protobuf.IMessage message + { + get => _message; + set + { + _message = value; + on_param_changed(); + } + } + + protected abstract void on_param_changed(); + } + + class GenericOrderParamVM : GenericOrderParamVM, IGenericOrderParamVM + { + readonly Func _convert; + readonly Func _convert_back; + TView _value; + + public GenericOrderParamVM(Google.Protobuf.IMessage message, FieldDescriptor field_descriptor, Func convert, Func convert_back) : + base(message, field_descriptor) + { + _convert = convert; + _convert_back = convert_back; + } + + public TView value + { + get => _value; + set + { + this.descriptor.Accessor.SetValue(this.message, _convert_back(_value = value)); + RaisePropertyChanged(); + } + } + + public IObservable subscribe_value() => + Observable.Create(o => + { + PropertyChanged += on_prop_changed; + return Disposable.Create(() => PropertyChanged -= on_prop_changed); + void on_prop_changed(object sender, PropertyChangedEventArgs e) => + o.OnNext(value); + }); + + protected override void on_param_changed() + { + _value = _convert(ConvertUtils.try_convert(this.descriptor.Accessor.GetValue(this.message))); + RaisePropertyChanged(nameof(value)); + } + } + + class GenericOrderEnumeratedVM : GenericOrderParamVM, IGenericOrderParamVM + { + public GenericOrderEnumeratedVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) + : base(message, descriptor) + { + elements = new ObservableCollection(_get_elements(descriptor)); + } + + public ObservableCollection elements { get; } + + public string selected_element + { + get => GenericOrderHelper.get_enumerated_value(message, descriptor); + set + { + var orig = selected_element; + GenericOrderHelper.set_enumerated_value(message, descriptor, value); + if (selected_element != orig) + RaisePropertyChanged(); + } + } + string IGenericOrderParamVM.value { get => selected_element; set => selected_element = value; } + + IObservable IGenericOrderParamVM.subscribe_value() => + Observable.Create(o => + { + PropertyChanged += on_prop_changed; + return Disposable.Create(() => PropertyChanged -= on_prop_changed); + void on_prop_changed(object sender, PropertyChangedEventArgs e) => + o.OnNext(selected_element); + }); + + protected override void on_param_changed() + { + _sync_elements(); + RaisePropertyChanged(nameof(selected_element)); + } + + static IEnumerable _get_elements(FieldDescriptor descriptor) + { + if(descriptor.FieldType == Google.Protobuf.Reflection.FieldType.Enum) + { + return descriptor.EnumType.Values.Select(x => x.Name); + } + else + return Enumerable.Empty(); + } + + void _sync_elements() + { + elements.sync_with(_get_elements(descriptor)); + } + } + + + class GenericOrderQuantityVM : GenericOrderParamVM, IGenericOrderParamVM + { + public GenericOrderQuantityVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) + : base(message, descriptor) { } + + QuantityMeasureImmutable? IGenericOrderParamVM.value { get => quantity; set => quantity= value; } + public QuantityMeasureImmutable? quantity + { + get => GenericOrderHelper.get_quantity_value(message, descriptor); + set + { + var orig = quantity; + GenericOrderHelper.set_quantity_value(message, descriptor, value); + if (quantity != orig) + RaisePropertyChanged(); + } + } + + public IObservable subscribe_value() + { + return Observable.Create(o => + { + PropertyChanged += on_prop_changed; + return Disposable.Create(() => PropertyChanged -= on_prop_changed); + void on_prop_changed(object sender, PropertyChangedEventArgs e) => + o.OnNext(quantity); + }); + } + + protected override void on_param_changed() + { + RaisePropertyChanged(nameof(quantity)); + } + } +} diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs new file mode 100644 index 000000000..8d29d0271 --- /dev/null +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs @@ -0,0 +1,63 @@ + +using bts.api.orderman; +using mbts.spark; +using mbts.ui.converters; +using mbts.ui.utilities; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; + +namespace mbts.ui.spark +{ + class GenericOrderTemplateSelector : DataTemplateSelector + { + public DataTemplate BoolTemplate { get; set; } + public DataTemplate DoubleTemplate { get; set; } + public DataTemplate IntTemplate { get; set; } + public DataTemplate UIntTemplate { get; set; } + public DataTemplate StringTemplate { get; set; } + public DataTemplate OrderDefTemplate { get; set; } + public DataTemplate QuantityMeasureTemplate { get; set; } + + public DataTemplate EnumTemplate { get; set; } + + public override DataTemplate SelectTemplate(object item, DependencyObject container) + { + var vm = item as GenericOrderParamVM; + if (vm != null) + { + switch (vm.descriptor.FieldType) + { + case Google.Protobuf.Reflection.FieldType.Bool: + return BoolTemplate; + case Google.Protobuf.Reflection.FieldType.Float: + case Google.Protobuf.Reflection.FieldType.Double: + return DoubleTemplate; + case Google.Protobuf.Reflection.FieldType.Int32: + case Google.Protobuf.Reflection.FieldType.Int64: + return IntTemplate; + case Google.Protobuf.Reflection.FieldType.UInt32: + case Google.Protobuf.Reflection.FieldType.UInt64: + return UIntTemplate; + case Google.Protobuf.Reflection.FieldType.String: + return StringTemplate; + case Google.Protobuf.Reflection.FieldType.Enum: + return EnumTemplate; + case Google.Protobuf.Reflection.FieldType.Message: + { + if(vm.descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) + return QuantityMeasureTemplate; + else if (vm.descriptor.MessageType.FullName == typeof(bts.api.orderman.CustomOrderDefinition).FullName) + return OrderDefTemplate; + } + break; + default: return null; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs new file mode 100644 index 000000000..6c5bbf74f --- /dev/null +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -0,0 +1,152 @@ + +using bts; +using bts.api.orderman; +using bts.collections; +using mbts.collections; +using mbts.spark.utilities; +using mbts.ui.utility; +using mbts.utils; +using bts.spark; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Linq; +using System.Reactive.Linq; + +using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; + +namespace mbts.spark +{ + static partial class OrderTypeVMFactory + { + class GenericOrderVM : OrderTypeVMBase + { + readonly ObservableKeyedCollection _parameters = new ObservableKeyedCollection(vm => vm.descriptor.ParamName); + readonly Property _algo_type_string; + readonly AlgoType _algo_type; + + public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) + : base(key, display_name, editing_permissions) + { + _algo_type = algo_type; + _algo_type_string = add_property(nameof(this.algo_type), GenericOrderDefinition.KnownTypeFieldNumber, + algo_type.ToString(), permissions: AlgoParamPermissions.None); + _parameters = new ObservableKeyedCollection(vm => vm.descriptor.Name); + _resources.AddRange( + _algo_type_string.Subscribe(_ => + { + _sync_generic_params(); + sync_selectors(); + }), + ObservableAutoWrapper.connect_item_hooks(_parameters, p => + { + p.PropertyChanged += on_param_prop_changed; + return Disposable.Create(() => + { + p.PropertyChanged -= on_param_prop_changed; + remove_property(p.descriptor.Name); + p.Dispose(); + }); + }, true)); + void on_param_prop_changed(object sender, PropertyChangedEventArgs e) => raise_definition_changed(); + } + + public string algo_type => _algo_type_string.Value; + public override string abbreviation => + model == null ? display_name : model.factory.abbreviate_algo(new OneOf(_algo_type)); + public override AlgoDisplayGroup group => AlgoDisplayGroup.API; + public ObservableCollection parameters => _parameters; + + protected CustomOrderDefinition construct() + { + string propname = _algo_type.ToString(); + var pi = typeof(CustomOrderDefinition).GetProperty(propname, + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + ExceptionAssert.Argument.NotNull(pi, "construction of " + propname); + var rt = pi.PropertyType; + var rtt = Activator.CreateInstance(rt); + + System.Reflection.typ + } + + protected override void on_model_internal() + { + _sync_generic_params(); + } + + + void _sync_generic_params() + { + if (model != null) + { + var desc = model.dynamic_helper.get_descriptor(dyn_type); + Google.Protobuf.Reflection.MessageDescriptor desc = + _parameters.SyncWithDictionary(desc.ParamDesc.Where(_is_value_param_desc).ToDictionary(p => p.ParamName), _mk_param_vm); + } + } + + + protected override IEnumerable get_selector_datum() + { + var data = OrderDataHelper.get_child_algo_data( + new CustomOrderDefinition { Dynamic = model?.dynamic_helper?.create_def(dyn_type) ?? new DynamicOrderDefinition() + }); + return data; + } + + static bool _is_value_param_desc(DynamicOrderParamDescriptor desc) + { + return desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated || + (desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && desc.ParamType.Primitive != DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef); + } + + + DynamicOrderParamVM _mk_param_vm(DynamicOrderParamDescriptor descriptor) { + ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor)); + switch (descriptor.ParamType.DescriptorCase) { + case DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive: + switch (descriptor.ParamType.Primitive) { + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool: return mk(DynamicOrderParam.AsBoolFieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: + { + var qm = new DynamicOrderQuantityVM(descriptor); + return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); + } + default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.Primitive, nameof(descriptor)); + } + case DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated: + var pvm = new DynamicOrderEnumeratedVM(descriptor); + attached(pvm, DynamicOrderHelper.get_enumerated_value, DynamicOrderHelper.set_enumerated_value); + return pvm; + default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.DescriptorCase, nameof(descriptor)); + } + + DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default) { + var fdesc = DynamicOrderParam.Descriptor.FindFieldByNumber(field_number); + var pvm = new DynamicOrderParamVM(descriptor, fdesc, convert, convert_back); + return attached>(pvm, get_from_param, assign_to_param, default_value); + + TView get_from_param(DynamicOrderParam param) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); + void assign_to_param(DynamicOrderParam param, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); + } + + TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { + add_property( + pvm.descriptor.ParamName, + mdef => mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p) ? selector(p) : default_value, + (mdef, v) => assign_to_param(mdef.OrderParams.GetOrAdd(pvm.descriptor.ParamName, pn => new DynamicOrderParam()), v), + () => pvm.value, + v => pvm.value = v, + pvm.subscribe_value(), + default_value); + return pvm; + } + } + } + } +} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 693dd9e25..d760f0737 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -56,6 +56,7 @@ namespace mbts.spark { public static IAlgoVM iceberg(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) => new IcebergOrderVM(key, display_name, editing_permissions); public static IAlgoVM spreader(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) => new SpreaderOrderVM(key, display_name, editing_permissions); public static IAlgoVM dynamic(AlgoKey key, string display_name, string dynamic_type, AlgoEditingPermissions editing_permissions) => new DynamicOrderVM(key, dynamic_type, display_name, editing_permissions); + public static IAlgoVM generic(AlgoKey key, string display_name, AlgoType algo_type, AlgoEditingPermissions editing_permissions) => new GenericOrderVM(key, algo_type, display_name, editing_permissions); public static IAlgoVM create(AlgoData def_data, AlgoEditingPermissions editing_permissions = default_editing_permissions, bool is_expanded = false) { if (def_data.value.CustomCase == AlgoType.Composite) { @@ -87,7 +88,7 @@ namespace mbts.spark { case AlgoType.Spreader: vm = spreader(key, name, editing_permissions); break; case AlgoType.Dynamic: vm = dynamic(key, name, name, editing_permissions); break; case AlgoType.None: vm = new DefaultAlgoVM(); break; - default: throw new NotImplementedException(); + default: vm = generic(key, name, algo_type, editing_permissions); break; } vm.is_expanded = is_expanded && vm.can_expand; return vm; diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index dc159595c..f5dc590c9 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1138,5 +1138,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml.cs b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml.cs index 9e1110cd8..1c8cfaf22 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml.cs +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml.cs @@ -44,6 +44,7 @@ namespace mbts.ui.spark { public DataTemplate SpreaderTemplate { get; set; } public DataTemplate DynamicOrderTemplate { get; set; } public DataTemplate DefaultOrderTemplate { get; set; } + public DataTemplate GenericOrderTemplate { get; set; } public override DataTemplate SelectTemplate(object item, DependencyObject container) { if (item is IDynamicAlgoVMImpl) { @@ -65,6 +66,7 @@ namespace mbts.ui.spark { case CustomOrderDefinition.CustomOneofCase.Iceberg: return IcebergOrderTemplate; case CustomOrderDefinition.CustomOneofCase.Spreader: return SpreaderTemplate; case CustomOrderDefinition.CustomOneofCase.Dynamic: return DynamicOrderTemplate; + default: return GenericOrderTemplate; } } return null; diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 35d385b16..6f1d48fe7 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -103,6 +103,7 @@ message CustomOrderDefinition ScratchOrderDefinition scratch = 28; ProRataOrderDefinition prorata = 29; + GenericOrderDefinition generic = 900; DynamicOrderDefinition dynamic = 1000; } } @@ -220,6 +221,11 @@ message DynamicOrderDefinition { string dynamic_order_type = 1; map order_params = 2; } +//Like dynamic, this order type generates a UI, but is used a wrapper for a typed native algo above +message GenericOrderDefinition { + string known_type = 1; + CustomOrderDefinition definition = 2; +} // End custom order definitions message OrderRecord { @@ -271,6 +277,7 @@ message OrderState { ScratchOrderState scratch = 27; ProRataOrderState prorata = 28; + GenericOrderState generic = 250; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } } @@ -348,6 +355,7 @@ message PricerOrderState {} message ScratchOrderState {} message ProRataOrderState {} message DynamicOrderState {} +message GenericOrderState {} message QueueHolderState {} enum OrderStatus { From 01956e92b6b95127b6c334cbcfad40666c889ff1 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 21:25:39 -0400 Subject: [PATCH 018/210] added facility for simple guis of well known order type protos to be generated; worth it. --- src/client/spark/Orders/OrderDataHelper.cs | 28 ++- .../OrderTypeVMs/DynamicOrderParamVM.cs | 2 +- .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 2 +- .../Orders/OrderTypeVMs/GenericOrderHelper.cs | 6 +- .../OrderTypeVMs/GenericOrderParamVM.cs | 39 ++-- .../GenericOrderTemplateSelector.cs | 58 +++--- .../Orders/OrderTypeVMs/GenericOrderVM.cs | 180 ++++++++++-------- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 7 +- .../Collections/ObservableKeyedCollection.cs | 16 ++ src/lib/api/services/OrderService.proto | 8 - src/server/sparkd/cmds/Run.cpp | 58 ------ 11 files changed, 194 insertions(+), 210 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index c3c9a8c96..af4fd93ec 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -213,8 +213,6 @@ namespace mbts.spark.utilities { public OffsetOrderDefinition offset_order() => OrderDataHelper.Defaults.OffsetOrderDefinition(); public TriggerOrderDefinition trigger_order() => OrderDataHelper.Defaults.TriggerOrderDefinition(); public DynamicOrderDefinition dynamic_order() => OrderDataHelper.Defaults.DynamicOrderDefinition(); - public GenericOrderDefinition generic_order(CustomOrderDefinition.CustomOneofCase order_type) => - OrderDataHelper.Defaults.GenericOrderDefinition(order_type); public SpreaderOrderDefinition spreader_order() => OrderDataHelper.Defaults.SpreaderOrderDefinition(); public SpreaderOrderDefinition spreader_order(SecurityImmutable security, ExecutionStrategyImmutable strategy) => new SpreaderOrderDefinition { @@ -248,7 +246,7 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = dynamic_order(); break; //case CustomOrderDefinition.CustomOneofCase.QueueHolder: rv.QueueHolder = queue_holder_order(); break; default: - rv.Generic = generic_order(order_type); + OrderTypeVMFactory.GenericOrderFactory.setup_generic_custom_order(rv, order_type); break; } return rv; @@ -275,7 +273,6 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order }; case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; - case CustomOrderDefinition.CustomOneofCase.Generic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: goto default; //case CustomOrderDefinition.CustomOneofCase.QueueHolder: return new OrderMetadata { KeyBinding = "Q", Color = BTSColors.purple.rgb_color() }; default: return _default_order_metadata; @@ -437,7 +434,6 @@ namespace mbts.spark.utilities { case CustomOrderDefinition.CustomOneofCase.Trigger: return new OrderMetadata { KeyBinding = "T", Color = BTSColors.Orders.trigger_order }; case CustomOrderDefinition.CustomOneofCase.Spreader: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.spreader_order }; case CustomOrderDefinition.CustomOneofCase.Dynamic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; - case CustomOrderDefinition.CustomOneofCase.Generic: return new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.top_order }; case CustomOrderDefinition.CustomOneofCase.None: default: return _default_order_metadata; } @@ -593,9 +589,6 @@ namespace mbts.spark.utilities { new AlgoStructureKey(defi.CustomCase))); public static readonly CustomOrderDefinition.CustomOneofCase[] - // The following standard types are not yet ready for production use: - // CustomOrderDefinition.CustomOneofCase.Tick, - // CustomOrderDefinition.CustomOneofCase.Dynamic, exchange_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, CustomOrderDefinition.CustomOneofCase.Limit, @@ -605,24 +598,28 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Scratch, + CustomOrderDefinition.CustomOneofCase.Prorata, }, - // The following spreader types are not yet ready for production use: - // CustomOrderDefinition.CustomOneofCase.Dynamic, spreader_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Spreader, CustomOrderDefinition.CustomOneofCase.Iceberg, CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, - CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Cover, + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Scratch, + CustomOrderDefinition.CustomOneofCase.Prorata, }, attachable_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Iceberg, CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Scratch, + CustomOrderDefinition.CustomOneofCase.Prorata, }; public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray(); @@ -1001,7 +998,7 @@ namespace mbts.spark.utilities { case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = SpreaderOrderDefinition(); break; case bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = DynamicOrderDefinition(); break; default: - rv.Generic = GenericOrderDefinition(order_type); + OrderTypeVMFactory.GenericOrderFactory.setup_generic_custom_order(rv, order_type); break; } return rv; @@ -1026,7 +1023,6 @@ namespace mbts.spark.utilities { public static OffsetOrderDefinition OffsetOrderDefinition() => new OffsetOrderDefinition { Child = CustomOrderDefinition(), }; public static TriggerOrderDefinition TriggerOrderDefinition() => new TriggerOrderDefinition { Child = CustomOrderDefinition(), TriggerCondition = new TriggerCondition(), TriggerAction = new TriggerAction(), }; public static DynamicOrderDefinition DynamicOrderDefinition() => new DynamicOrderDefinition(); - public static GenericOrderDefinition GenericOrderDefinition(CustomOrderDefinition.CustomOneofCase order_type) => new GenericOrderDefinition { knownType = order_type.ToString() } ; public static SpreaderOrderDefinition SpreaderOrderDefinition() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() }; } } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs index d80ae2413..ade3260a4 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderParamVM.cs @@ -26,7 +26,7 @@ namespace mbts.spark { protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor) : this(descriptor, DynamicOrderHelper.init_param(descriptor)) { } - protected DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) { + private DynamicOrderParamVM(DynamicOrderParamDescriptor descriptor, DynamicOrderParam param) { this.descriptor = descriptor; _param = param; } diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index 76af9879d..37726c245 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -74,7 +74,7 @@ namespace mbts.spark { switch (descriptor.ParamType.Primitive) { case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool: return mk(DynamicOrderParam.AsBoolFieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); + case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs index e6a261364..948b8a487 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs @@ -40,7 +40,11 @@ namespace mbts.spark internal static bts.spark.QuantityMeasureImmutable? get_quantity_value(IMessage message, FieldDescriptor fd) { - return (bts.spark.QuantityMeasureImmutable)fd.Accessor.GetValue(message); + var qm = (bts.spark.QuantityMeasure)fd.Accessor.GetValue(message); + if(qm != null) + return new bts.spark.QuantityMeasureImmutable(qm); + else + return null; } internal static void set_quantity_value(IMessage message, FieldDescriptor fd, bts.spark.QuantityMeasureImmutable? value) { diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs index 606c83641..a0ed8fbb8 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderParamVM.cs @@ -8,13 +8,13 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; using System.Reactive.Linq; -using Google.Protobuf.Reflection; +using Google.Protobuf; namespace mbts.spark { interface IGenericOrderParamVM { - FieldDescriptor descriptor { get; } + FieldDescriptor descriptor { get; } Google.Protobuf.IMessage message { get; set; } } @@ -24,12 +24,14 @@ namespace mbts.spark IObservable subscribe_value(); } - abstract class GenericOrderParamVM : DisposableViewModelBase, IGenericOrderParamVM + abstract class GenericOrderParamVM : DisposableViewModelBase, IGenericOrderParamVM + where TMutable : class, IMessage, new() { - Google.Protobuf.IMessage _message; - protected GenericOrderParamVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) - { - _message = message; + TMutable _message; + + protected GenericOrderParamVM(FieldDescriptor descriptor) + { + _message = new TMutable(); this.descriptor = descriptor; } @@ -39,7 +41,7 @@ namespace mbts.spark get => _message; set { - _message = value; + _message = (TMutable)value; on_param_changed(); } } @@ -47,14 +49,15 @@ namespace mbts.spark protected abstract void on_param_changed(); } - class GenericOrderParamVM : GenericOrderParamVM, IGenericOrderParamVM + class GenericOrderParamVM : GenericOrderParamVM, IGenericOrderParamVM + where TMutable : class, IMessage, new() { readonly Func _convert; readonly Func _convert_back; TView _value; - public GenericOrderParamVM(Google.Protobuf.IMessage message, FieldDescriptor field_descriptor, Func convert, Func convert_back) : - base(message, field_descriptor) + public GenericOrderParamVM(FieldDescriptor field_descriptor, Func convert, Func convert_back) : + base(field_descriptor) { _convert = convert; _convert_back = convert_back; @@ -86,10 +89,11 @@ namespace mbts.spark } } - class GenericOrderEnumeratedVM : GenericOrderParamVM, IGenericOrderParamVM + class GenericOrderEnumeratedVM : GenericOrderParamVM, IGenericOrderParamVM + where TMutable : class, IMessage, new() { - public GenericOrderEnumeratedVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) - : base(message, descriptor) + public GenericOrderEnumeratedVM(FieldDescriptor descriptor) + : base(descriptor) { elements = new ObservableCollection(_get_elements(descriptor)); } @@ -141,10 +145,11 @@ namespace mbts.spark } - class GenericOrderQuantityVM : GenericOrderParamVM, IGenericOrderParamVM + class GenericOrderQuantityVM : GenericOrderParamVM, IGenericOrderParamVM + where TMutable : class, IMessage, new() { - public GenericOrderQuantityVM(Google.Protobuf.IMessage message, FieldDescriptor descriptor) - : base(message, descriptor) { } + public GenericOrderQuantityVM(FieldDescriptor descriptor) + : base(descriptor) { } QuantityMeasureImmutable? IGenericOrderParamVM.value { get => quantity; set => quantity= value; } public QuantityMeasureImmutable? quantity diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs index 8d29d0271..4eaafb297 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderTemplateSelector.cs @@ -12,7 +12,7 @@ using System.Windows.Data; namespace mbts.ui.spark { - class GenericOrderTemplateSelector : DataTemplateSelector + class GenericOrderParamTemplateSelector : DataTemplateSelector { public DataTemplate BoolTemplate { get; set; } public DataTemplate DoubleTemplate { get; set; } @@ -26,36 +26,40 @@ namespace mbts.ui.spark public override DataTemplate SelectTemplate(object item, DependencyObject container) { - var vm = item as GenericOrderParamVM; + var vm = item as IGenericOrderParamVM; if (vm != null) + return select_template(vm.descriptor); + return null; + } + + public DataTemplate select_template(Google.Protobuf.Reflection.FieldDescriptor descriptor) + { + switch (descriptor.FieldType) { - switch (vm.descriptor.FieldType) + case Google.Protobuf.Reflection.FieldType.Bool: + return BoolTemplate; + case Google.Protobuf.Reflection.FieldType.Float: + case Google.Protobuf.Reflection.FieldType.Double: + return DoubleTemplate; + case Google.Protobuf.Reflection.FieldType.Int32: + case Google.Protobuf.Reflection.FieldType.Int64: + return IntTemplate; + case Google.Protobuf.Reflection.FieldType.UInt32: + case Google.Protobuf.Reflection.FieldType.UInt64: + return UIntTemplate; + case Google.Protobuf.Reflection.FieldType.String: + return StringTemplate; + case Google.Protobuf.Reflection.FieldType.Enum: + return EnumTemplate; + case Google.Protobuf.Reflection.FieldType.Message: { - case Google.Protobuf.Reflection.FieldType.Bool: - return BoolTemplate; - case Google.Protobuf.Reflection.FieldType.Float: - case Google.Protobuf.Reflection.FieldType.Double: - return DoubleTemplate; - case Google.Protobuf.Reflection.FieldType.Int32: - case Google.Protobuf.Reflection.FieldType.Int64: - return IntTemplate; - case Google.Protobuf.Reflection.FieldType.UInt32: - case Google.Protobuf.Reflection.FieldType.UInt64: - return UIntTemplate; - case Google.Protobuf.Reflection.FieldType.String: - return StringTemplate; - case Google.Protobuf.Reflection.FieldType.Enum: - return EnumTemplate; - case Google.Protobuf.Reflection.FieldType.Message: - { - if(vm.descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) - return QuantityMeasureTemplate; - else if (vm.descriptor.MessageType.FullName == typeof(bts.api.orderman.CustomOrderDefinition).FullName) - return OrderDefTemplate; - } - break; - default: return null; + if(descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) + return QuantityMeasureTemplate; + else if (descriptor.MessageType.FullName == typeof(bts.api.orderman.CustomOrderDefinition).FullName) + return OrderDefTemplate; } + break; + default: return null; } return null; } diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs index 6c5bbf74f..3a42bbdfe 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -14,31 +14,57 @@ using System.ComponentModel; using System.Linq; using System.Reactive.Linq; + +using Google.Protobuf; +using Google.Protobuf.Reflection; +using bts.api; using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; namespace mbts.spark { static partial class OrderTypeVMFactory { - class GenericOrderVM : OrderTypeVMBase + internal class GenericOrderFactory + { + static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) + { + var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(), + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + var rt = prop.PropertyType; + + var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(), + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + var rti = propi.PropertyType; + + var vmt = typeof(GenericOrderVM<,>); + Type[] typeargs = { rt, rti }; + var makevm = vmt.MakeGenericType(typeargs); + object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions); + return (IAlgoVM)vm; + } + static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) + { + var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(), + System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); + var rt = prop.PropertyType; + var rtt = Activator.CreateInstance(rt); + prop.SetValue(custom, rtt); + } + } + + class GenericOrderVM : OrderTypeVMBase + where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage { - readonly ObservableKeyedCollection _parameters = new ObservableKeyedCollection(vm => vm.descriptor.ParamName); - readonly Property _algo_type_string; + readonly ObservableKeyedCollection, string> _parameters = + new ObservableKeyedCollection, string>(vm => vm.descriptor.Name); readonly AlgoType _algo_type; public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { _algo_type = algo_type; - _algo_type_string = add_property(nameof(this.algo_type), GenericOrderDefinition.KnownTypeFieldNumber, - algo_type.ToString(), permissions: AlgoParamPermissions.None); - _parameters = new ObservableKeyedCollection(vm => vm.descriptor.Name); + _parameters = new ObservableKeyedCollection, string>(vm => vm.descriptor.Name); _resources.AddRange( - _algo_type_string.Subscribe(_ => - { - _sync_generic_params(); - sync_selectors(); - }), ObservableAutoWrapper.connect_item_hooks(_parameters, p => { p.PropertyChanged += on_param_prop_changed; @@ -50,103 +76,97 @@ namespace mbts.spark }); }, true)); void on_param_prop_changed(object sender, PropertyChangedEventArgs e) => raise_definition_changed(); + _sync_generic_params(); + sync_selectors(); } - public string algo_type => _algo_type_string.Value; + public string algo_type => _algo_type.ToString(); public override string abbreviation => model == null ? display_name : model.factory.abbreviate_algo(new OneOf(_algo_type)); public override AlgoDisplayGroup group => AlgoDisplayGroup.API; - public ObservableCollection parameters => _parameters; - - protected CustomOrderDefinition construct() - { - string propname = _algo_type.ToString(); - var pi = typeof(CustomOrderDefinition).GetProperty(propname, - System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); - ExceptionAssert.Argument.NotNull(pi, "construction of " + propname); - var rt = pi.PropertyType; - var rtt = Activator.CreateInstance(rt); - - System.Reflection.typ - } + public ObservableCollection> parameters => _parameters; protected override void on_model_internal() { _sync_generic_params(); } - void _sync_generic_params() { if (model != null) - { - var desc = model.dynamic_helper.get_descriptor(dyn_type); - Google.Protobuf.Reflection.MessageDescriptor desc = - _parameters.SyncWithDictionary(desc.ParamDesc.Where(_is_value_param_desc).ToDictionary(p => p.ParamName), _mk_param_vm); + { + Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor; + _parameters.SyncWithDictionaryNotNull( + desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm); } } + static bool _is_value_param_desc(FieldDescriptor desc) + { + return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message || + _is_quantity_measure_desc(desc)); + } + static bool _is_quantity_measure_desc(FieldDescriptor desc) + { + return desc.FieldType == Google.Protobuf.Reflection.FieldType.Message && + desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName; + } protected override IEnumerable get_selector_datum() { - var data = OrderDataHelper.get_child_algo_data( - new CustomOrderDefinition { Dynamic = model?.dynamic_helper?.create_def(dyn_type) ?? new DynamicOrderDefinition() - }); - return data; + return OrderDataHelper.get_child_algo_data(_algo_type); } - static bool _is_value_param_desc(DynamicOrderParamDescriptor desc) + GenericOrderParamVM _mk_param_vm(FieldDescriptor descriptor) { - return desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated || - (desc.ParamType.DescriptorCase == DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive && desc.ParamType.Primitive != DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveOrderDef); - } - - - DynamicOrderParamVM _mk_param_vm(DynamicOrderParamDescriptor descriptor) { ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor)); - switch (descriptor.ParamType.DescriptorCase) { - case DynamicOrderTypeDescriptor.DescriptorOneofCase.Primitive: - switch (descriptor.ParamType.Primitive) { - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveBool: return mk(DynamicOrderParam.AsBoolFieldNumber, v => v, v => v.GetValueOrDefault()); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveDouble: return mk(DynamicOrderParam.AsDoubleFieldNumber, v => v, v => v, double.NaN); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveInt: return mk(DynamicOrderParam.AsInt32FieldNumber, v => v, v => v.GetValueOrDefault()); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveUint: return mk(DynamicOrderParam.AsUint32FieldNumber, v => v, v => v.GetValueOrDefault()); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveString: return mk(DynamicOrderParam.AsStringFieldNumber, v => v, v => v); - case DynamicOrderPrimitiveDescriptor.DynamicOrderPrimitiveQuantity: - { - var qm = new DynamicOrderQuantityVM(descriptor); - return attached(qm, DynamicOrderHelper.get_quantity_value, DynamicOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); - } - default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.Primitive, nameof(descriptor)); - } - case DynamicOrderTypeDescriptor.DescriptorOneofCase.Enumerated: - var pvm = new DynamicOrderEnumeratedVM(descriptor); - attached(pvm, DynamicOrderHelper.get_enumerated_value, DynamicOrderHelper.set_enumerated_value); - return pvm; - default: throw ExceptionBuilder.Argument.unexpected_case(descriptor.ParamType.DescriptorCase, nameof(descriptor)); + + if (descriptor.FieldType == FieldType.Message && + descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) + { + var qm = new GenericOrderQuantityVM(descriptor); + return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value, new QuantityMeasure { Ratio = 1.0, Absolute = 1 }); } - - DynamicOrderParamVM mk(int field_number, Func convert, Func convert_back, TView default_value = default) { - var fdesc = DynamicOrderParam.Descriptor.FindFieldByNumber(field_number); - var pvm = new DynamicOrderParamVM(descriptor, fdesc, convert, convert_back); - return attached>(pvm, get_from_param, assign_to_param, default_value); - - TView get_from_param(DynamicOrderParam param) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); - void assign_to_param(DynamicOrderParam param, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); - } - - TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : DynamicOrderParamVM, IDynamicOrderParamVM { - add_property( - pvm.descriptor.ParamName, - mdef => mdef.OrderParams.TryGetValue(pvm.descriptor.ParamName, out DynamicOrderParam p) ? selector(p) : default_value, - (mdef, v) => assign_to_param(mdef.OrderParams.GetOrAdd(pvm.descriptor.ParamName, pn => new DynamicOrderParam()), v), - () => pvm.value, - v => pvm.value = v, - pvm.subscribe_value(), - default_value); + else if(descriptor.FieldType == FieldType.Enum) + { + var pvm = new GenericOrderEnumeratedVM(descriptor); + attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value); return pvm; } + else if (descriptor.FieldType == FieldType.Bool) + return mk(descriptor, v => v, v => v.GetValueOrDefault()); + else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float) + return mk(descriptor, v => v, v => v, double.NaN); + else if (descriptor.FieldType == FieldType.Int32) + return mk(descriptor, v => v, v => v.GetValueOrDefault()); + else if (descriptor.FieldType == FieldType.UInt32) + return mk(descriptor, v => v, v => v.GetValueOrDefault()); + else if (descriptor.FieldType == FieldType.String) + return mk(descriptor, v => v, v => v); + else + return null; } + GenericOrderParamVM mk(FieldDescriptor fdesc, Func convert, Func convert_back, TView default_value = default) + { + var pvm = new GenericOrderParamVM(fdesc, convert, convert_back); + return attached>(pvm, get_from_param, assign_to_param, default_value); + + TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert(fdesc.Accessor.GetValue(param))); + void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value)); + } + + TParam attached(TParam pvm, Func selector, Action assign_to_param, T default_value = default) where TParam : GenericOrderParamVM, IGenericOrderParamVM + { + add_property( + pvm.descriptor.Name, + mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value, + (mdef, v) => assign_to_param(mdef, pvm.descriptor, v), + () => pvm.value, + v => pvm.value = v, + pvm.subscribe_value(), + default_value); + return pvm; + } } } } \ No newline at end of file diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index d760f0737..ed4ba86db 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -56,7 +56,12 @@ namespace mbts.spark { public static IAlgoVM iceberg(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) => new IcebergOrderVM(key, display_name, editing_permissions); public static IAlgoVM spreader(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) => new SpreaderOrderVM(key, display_name, editing_permissions); public static IAlgoVM dynamic(AlgoKey key, string display_name, string dynamic_type, AlgoEditingPermissions editing_permissions) => new DynamicOrderVM(key, dynamic_type, display_name, editing_permissions); - public static IAlgoVM generic(AlgoKey key, string display_name, AlgoType algo_type, AlgoEditingPermissions editing_permissions) => new GenericOrderVM(key, algo_type, display_name, editing_permissions); + + public static IAlgoVM generic(AlgoKey key, string display_name, + AlgoType algo_type, AlgoEditingPermissions editing_permissions) + { + return GenericOrderFactory.create_vm(key, algo_type, display_name, editing_permissions); + } public static IAlgoVM create(AlgoData def_data, AlgoEditingPermissions editing_permissions = default_editing_permissions, bool is_expanded = false) { if (def_data.value.CustomCase == AlgoType.Composite) { diff --git a/src/client/spark/core/Collections/ObservableKeyedCollection.cs b/src/client/spark/core/Collections/ObservableKeyedCollection.cs index 578c51acb..e25dc53a6 100644 --- a/src/client/spark/core/Collections/ObservableKeyedCollection.cs +++ b/src/client/spark/core/Collections/ObservableKeyedCollection.cs @@ -128,6 +128,22 @@ namespace mbts.collections { } } + public void SyncWithDictionaryNotNull(IReadOnlyDictionary dictionary, Func factory) + { + foreach (var k in _map.Keys.Except(dictionary.Keys).ToList()) + Remove(k); + foreach (var kv in dictionary) + { + if (!ContainsKey(kv.Key)) + { + var v = factory(kv.Value); + if(v != null) + Add(v); + } + } + } + + public void SyncWithDictionary(IReadOnlyDictionary dictionary, Func factory) { foreach (var k in _map.Keys.Except(dictionary.Keys).ToList()) Remove(k); diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 6f1d48fe7..35d385b16 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -103,7 +103,6 @@ message CustomOrderDefinition ScratchOrderDefinition scratch = 28; ProRataOrderDefinition prorata = 29; - GenericOrderDefinition generic = 900; DynamicOrderDefinition dynamic = 1000; } } @@ -221,11 +220,6 @@ message DynamicOrderDefinition { string dynamic_order_type = 1; map order_params = 2; } -//Like dynamic, this order type generates a UI, but is used a wrapper for a typed native algo above -message GenericOrderDefinition { - string known_type = 1; - CustomOrderDefinition definition = 2; -} // End custom order definitions message OrderRecord { @@ -277,7 +271,6 @@ message OrderState { ScratchOrderState scratch = 27; ProRataOrderState prorata = 28; - GenericOrderState generic = 250; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } } @@ -355,7 +348,6 @@ message PricerOrderState {} message ScratchOrderState {} message ProRataOrderState {} message DynamicOrderState {} -message GenericOrderState {} message QueueHolderState {} enum OrderStatus { diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 299e53901..6460a060b 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -81,64 +81,6 @@ int Run::execute(std::vector const &) { plugin::init_plugins(plugin_services); // finished initializing order plugins - //TODO these will go away once Haris approves algo - using namespace api::orderman; - { - DynamicOrderDescriptor desc; - desc.set_dynamic_order_type("Scratch"); - auto param = desc.add_param_desc(); - param->set_param_name("scratch_threshold"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); - param = desc.add_param_desc(); - param->set_param_name("chase_ticks"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); - - param = desc.add_param_desc(); - param->set_param_name("child"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); - plugin_services.register_dynamic_algo_order( - desc, []() { return std::make_unique(); }); - } - - { - DynamicOrderDescriptor desc; - desc.set_dynamic_order_type("ProRata"); - auto param = desc.add_param_desc(); - param->set_param_name("hedge_ticks"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); - param = desc.add_param_desc(); - param->set_param_name("chase_ticks"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_UINT); - - param = desc.add_param_desc(); - param->set_param_name("fill_limit"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); - - param = desc.add_param_desc(); - param->set_param_name("stay_in_threshold"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_QUANTITY); - param = desc.add_param_desc(); - param->set_param_name("enable_scratch_on_overfill"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_BOOL); - param = desc.add_param_desc(); - param->set_param_name("enable_stay_in"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_BOOL); - - param = desc.add_param_desc(); - param->set_param_name("child"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); - param = desc.add_param_desc(); - param->set_param_name("hedge"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); - param = desc.add_param_desc(); - param->set_param_name("overfill_hedge"); - param->mutable_param_type()->set_primitive(DYNAMIC_ORDER_PRIMITIVE_ORDER_DEF); - - - plugin_services.register_dynamic_algo_order( - desc, []() { return std::make_unique(); }); - } - orderman::OrderServiceServer order_service_server( sc, mdclient, dyn_order_registry, stats, perf_log); support::ErrorReportServer error_report_service(sc); From 90178908ba524dca535aedbde04953b4636869d0 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 28 May 2019 22:02:21 -0400 Subject: [PATCH 019/210] looking good; need John to help me figure out the hedge lablels --- .../spark/Orders/OrderTypeVMs/GenericOrderVM.cs | 9 ++++----- .../Order/AlgoContentTemplateSelector.xaml | 14 +++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs index 3a42bbdfe..dd5117dfd 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -48,6 +48,10 @@ namespace mbts.spark System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public); var rt = prop.PropertyType; var rtt = Activator.CreateInstance(rt); + + var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition)); + foreach(var cid in ci) + cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() }); prop.SetValue(custom, rtt); } } @@ -112,11 +116,6 @@ namespace mbts.spark desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName; } - protected override IEnumerable get_selector_datum() - { - return OrderDataHelper.get_child_algo_data(_algo_type); - } - GenericOrderParamVM _mk_param_vm(FieldDescriptor descriptor) { ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor)); diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index f5dc590c9..34ece4c80 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1167,7 +1167,7 @@ - + - + - + - + - + - + + Text="{Binding descriptor.Name, Converter={x:Static ut:DisplayNameHelper.SnakeToTitleCaseConverter}}"/> From 717c90867aebeab89d3962bd0554e0cff87626ea Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 29 May 2019 15:08:14 -0400 Subject: [PATCH 020/210] fixed multiple child case, thanks Eric --- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 3 ++ src/client/spark/Orders/OrderDataHelper.cs | 6 ++- .../Orders/OrderTypeVMs/GenericOrderVM.cs | 6 +++ .../spark/Orders/OrderTypeVMs/IOrderTypeVM.cs | 1 + .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 2 + .../Order/AlgoContentTemplateSelector.xaml | 2 +- .../orders/algo/algo_orders/ProRataAlgo.cpp | 50 ------------------- .../orders/algo/algo_orders/ScratchAlgo.cpp | 23 --------- 8 files changed, 18 insertions(+), 75 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 7ec794043..55f88e7c2 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -51,6 +51,9 @@ namespace mbts.spark { readonly Property _selected_format; readonly EnumMaskInt32 _permissions_mask = new EnumMaskInt32(); + mbts.ui.spark.AlgoContentTemplateSelector.OrderKind IAlgoSelector.order_kind => + new mbts.ui.spark.AlgoContentTemplateSelector.OrderKind(string.Empty, string.Empty); + int? _favorite_index; Brush _badge_fill; Snapshot? _committed; diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index af4fd93ec..8b5c25c0a 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -26,7 +26,11 @@ namespace mbts.spark.utilities { public readonly Func get_child; public readonly Action assign_child; - public ChildAlgoData(string name, Func get_child_from_impl, Action assign_child_to_impl, Func get_child, Action assign_child) { + public ChildAlgoData(string name, Func get_child_from_impl, + Action assign_child_to_impl, + Func get_child, + Action assign_child) + { this.name = name; this.get_child = get_child; this.assign_child = assign_child; diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs index dd5117dfd..b8a128520 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -116,6 +116,12 @@ namespace mbts.spark desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName; } + protected override IEnumerable get_selector_datum() + { + var v = OrderDataHelper.get_child_algo_data(_algo_type); + return v; + } + GenericOrderParamVM _mk_param_vm(FieldDescriptor descriptor) { ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor)); diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index 8fd3dfcf6..a8fb64efe 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -92,6 +92,7 @@ namespace mbts.spark { IReadOnlyObservableCollection algos_view { get; } IAlgoVM selected_algo { get; set; } void load_algo_data(IReadOnlyDictionary algo_data, AlgoKey? default_algo); + mbts.ui.spark.AlgoContentTemplateSelector.OrderKind order_kind {get;} } static class OrderTypeVMExtensions { diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index ed4ba86db..7ce192ead 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -954,6 +954,8 @@ namespace mbts.spark { public string id { get; } public string display_name { get; } + public mbts.ui.spark .AlgoContentTemplateSelector.OrderKind order_kind => + new mbts.ui.spark.AlgoContentTemplateSelector.OrderKind(display_name, string.Empty); public bool is_enabled { get; set; } = true; public bool initialized { get; private set; } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index 34ece4c80..56a66b77b 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -1299,7 +1299,7 @@ SelectedItem="{Binding selected_algo}" CanEditStructure="{Binding DataContext.editing_permissions, Converter={StaticResource CanEditStructureConverter}, RelativeSource={RelativeSource AncestorType=ItemsControl}}" ContentTemplateSelector="{DynamicResource AlgoTemplateSelector}" - OrderKind="{x:Static usp:AlgoContentTemplateSelector.ChildKind}" + OrderKind="{Binding order_kind}" OrderKindTemplate="{StaticResource OrderKindTemplate}" /> diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 96b7aa52e..00a39730c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -63,56 +63,6 @@ ProRataAlgo::ProRataAlgo() : me(new PImpl()) {} ProRataAlgo::~ProRataAlgo() {} IAlgoServices &ProRataAlgo::algo() const { return *me->algo; } -// template -// T convert_from_dynamic(const T& orig) -// { -// T newt = orig; -// if(has_custom(orig) && custom(orig).has_dynamic()) -// { -// const DynamicOrderDefinition& dprorata = custom(orig).dynamic(); -// auto& prorata = *mutable_custom(newt).mutable_prorata(); - -// if(dprorata.order_params().count("hedge_ticks") > 0) -// prorata.set_hedge_ticks(dprorata.order_params().at("hedge_ticks").as_uint32()); -// prorata.set_hedge_ticks(std::max(1u, prorata.hedge_ticks())); - -// if(dprorata.order_params().count("chase_ticks") > 0) -// prorata.set_chase_ticks(dprorata.order_params().at("chase_ticks").as_uint32()); - -// if(dprorata.order_params().count("fill_limit") > 0) -// *prorata.mutable_fill_limit() = dprorata.order_params().at("fill_limit").as_quantity(); -// if(!prorata.has_fill_limit() || -// prorata.fill_limit().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) -// prorata.mutable_fill_limit()->set_absolute(1u); - -// if(dprorata.order_params().count("stay_in_threshold") > 0) -// *prorata.mutable_stay_in_threshold() = dprorata.order_params().at("stay_in_threshold").as_quantity(); -// if(!prorata.has_stay_in_threshold() || -// prorata.stay_in_threshold().quantity_case() == bts::spark::QuantityMeasure::QuantityCase::QUANTITY_NOT_SET) -// prorata.mutable_stay_in_threshold()->set_absolute(1u); - -// if(dprorata.order_params().count("enable_scratch_on_overfill") > 0) -// prorata.set_enable_scratch_on_overfill(dprorata.order_params().at("enable_scratch_on_overfill").as_bool()); -// if(dprorata.order_params().count("enable_stay_in") > 0) -// prorata.set_enable_stay_in(dprorata.order_params().at("enable_stay_in").as_bool()); - -// if(dprorata.order_params().count("child") > 0) -// *prorata.mutable_child() = dprorata.order_params().at("child").as_order_def(); -// else -// prorata.mutable_child()->mutable_limit(); - -// if(dprorata.order_params().count("hedge") > 0) -// *prorata.mutable_hedge() = dprorata.order_params().at("hedge").as_order_def(); -// else -// prorata.mutable_hedge()->mutable_limit(); - -// if(dprorata.order_params().count("overfill_hedge") > 0) -// *prorata.mutable_overfill_hedge() = dprorata.order_params().at("overfill_hedge").as_order_def(); -// else -// prorata.mutable_overfill_hedge()->mutable_limit(); -// } -// return newt; -// } OrderOpResult ProRataAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 2bb3b56ad..9d9af6b98 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -33,29 +33,6 @@ ScratchAlgo::ScratchAlgo() : me(new PImpl()) {} ScratchAlgo::~ScratchAlgo() {} IAlgoServices &ScratchAlgo::algo() const { return *me->algo; } -// template -// T convert_from_dynamic(const T& orig) -// { -// T newt = orig; -// if ( has_custom(orig) && custom(orig).has_dynamic()) -// { -// const DynamicOrderDefinition& dscratch = custom(orig).dynamic(); -// auto& scratch = *mutable_custom(newt).mutable_scratch(); - -// if(dscratch.order_params().count("scratch_threshold") > 0) -// *scratch.mutable_scratch_threshold() = dscratch.order_params().at("scratch_threshold").as_quantity(); - -// if(dscratch.order_params().count("chase_ticks") > 0) -// scratch.set_chase_ticks(dscratch.order_params().at("chase_ticks").as_uint32()); - -// if(dscratch.order_params().count("child") > 0) -// *scratch.mutable_child() = dscratch.order_params().at("child").as_order_def(); -// else -// scratch.mutable_child()->mutable_limit(); -// } -// return newt; -// } - OrderOpResult ScratchAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { const auto& def = serv.definition(); From 3d11aba8ef9ee12c1539d462d437c2d24ef5b3f3 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 29 May 2019 15:35:47 -0400 Subject: [PATCH 021/210] fix build from merge --- src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/services/OrderService.proto | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index c332cbc98..39c84c8bb 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index e45314190..235b49171 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -101,8 +101,8 @@ message CustomOrderDefinition OCOOrderDefinition oco = 25; PricerOrderDefinition pricer = 26; CompositeOrderDefinition composite = 27; - ScratchOrderDefinition scratch = 28; - ProRataOrderDefinition prorata = 29; + ScratchOrderDefinition scratch = 31; + ProRataOrderDefinition prorata = 32; DynamicOrderDefinition dynamic = 1000; } @@ -272,8 +272,8 @@ message OrderState { QueueHolderState queue_holder = 30; OCOOrderState oco = 25; PricerOrderState pricer = 26; - ScratchOrderState scratch = 27; - ProRataOrderState prorata = 28; + ScratchOrderState scratch = 31; + ProRataOrderState prorata = 32; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } From d8559276d04c12aff67715e1b729bc0b4cec18a9 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 29 May 2019 16:55:11 -0400 Subject: [PATCH 022/210] test case for scratchalgo --- .../orders/algo/algo_orders/ScratchAlgo.cpp | 14 +++--- testing/manual/algos/scratch_controlled.txt | 48 +++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 testing/manual/algos/scratch_controlled.txt diff --git a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp index 9d9af6b98..d2645d7a1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ScratchAlgo.cpp @@ -146,16 +146,16 @@ void ScratchAlgo::try_to_scratch() Quantity my_quan; auto &my_side_psz = me->last_book.side(my_side)[0]; auto &other_side_psz = me->last_book.side(other_side)[0]; - bool market_moved = !securities::is_equal_or_better(other_side, - Price(other_side_psz.price()), Price(me->book_at_inception.side(other_side)[0].price())); + auto other_side_price = Price(other_side_psz.price()); + auto inception_other_side_price = Price(me->book_at_inception.side(other_side)[0].price()); + + bool market_moved = !securities::is_equal_or_better(other_side, other_side_price, inception_other_side_price); bool on_market = securities::is_same(Price(my_side_psz.price()), Price(algo().price())); if (market_moved || (on_market && my_side_psz.size() <= me->scratch_threshold.value()) ) { - Price scratch_price; - Quantity scratch_quan; - SpreaderUtils::traverse_depth_for_quantity(me->last_book, other_side, algo().quantity(), scratch_price, scratch_quan); - LOG(OrderMan, Diag, "ScratchOrder order {} scratching: {}@{} {}", - algo().order_key().value(), algo().quantity().value(), scratch_price, scratch_quan); + Price scratch_price = securities::worsen_price(other_side, inception_other_side_price, me->chase_diff); + LOG(OrderMan, Diag, "ScratchOrder order {} scratching: {}@{}", + algo().order_key().value(), algo().quantity().value(), scratch_price); // Time to scratch Update child_update; diff --git a/testing/manual/algos/scratch_controlled.txt b/testing/manual/algos/scratch_controlled.txt new file mode 100644 index 000000000..0d8740cb4 --- /dev/null +++ b/testing/manual/algos/scratch_controlled.txt @@ -0,0 +1,48 @@ +Test Author: Kevin +If it breaks: Kevin + +When the scratch order is placed, it takes a snapshot of the opposite inside market; if that level gets +worse, it will cross the market chase_ticks through. + +It also continually monitors the size on the same side of the market if the quantity at that (same side) level falls below the "Scratch Threshold" AND the order's price is equal to the best bid or offer. It will cross by chase_ticks. + +0. This needs sim market data **not** to be merged with replay (or +cert), so we can create our own markets. Use the following key to set +market data up: + +ExchangeSim { + value { + merge_with_md: false + } +} + +1. Bring up a ladder, lets say in SIM:ESU9 (does not matter which security) + +2. Create the ask side of the market by sending 50 lot sell limit orders at 2833.25 through 2832.25 +(if there are no markets use the M View and the ticket to enter, if you already had left over +orders cancel them) + +2. Create the bid side of the market by sending 50 lot buy limit orders at 2830.50 through 2831.50. +You should have no orders at 2831.75 and 2832. + +Basics: +3. Enter a 20 lot buy scratch order at 2831.50 with the following parameters +Scratch Threshold = Absolute:21 +Max Chase Ticks = 2 +Child = Limit +Verify that the Lean order along with the Child order shows up + +4) Now cancel the 50 lot sell at 2832.25, you should see the 20 lot scratch pay 2832.50 on 20 + +5) Repeat 3, now cancel the 50 lot buy at 2831.50, you should again see scratch pay 2832.50 on 20. +Put the 50 lot buy back in. + +6) Repeat 3, put an offer in at 2832.25, cancel it; nothing should happen. Cancel the Scratch Algo + +7) This time enter the algo with Max Chase = 0, cancel the 50 lot offer at 2832.75 and 2833. Nothing should happen. Now cancel the 2832.5 offer, you should see the algo pay up to 2832.5, but not fill. + +8) Cancel the last offer at 2833.25. Nothing should happen. + +9) Repeat all of this on the sell side + + From 5b818bf276ecd64629ec5955cee81795e16e842e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 29 May 2019 17:43:05 -0400 Subject: [PATCH 023/210] test for prorata order --- .../orders/algo/algo_orders/ProRataAlgo.cpp | 1 + testing/manual/algos/pro_rata_controlled.txt | 87 +++++++++++++++++++ testing/manual/algos/scratch_controlled.txt | 9 +- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 testing/manual/algos/pro_rata_controlled.txt diff --git a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp index 00a39730c..bebd90879 100644 --- a/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/ProRataAlgo.cpp @@ -187,6 +187,7 @@ void ProRataAlgo::scratch(std::pair kk) Price scratch_price; Quantity scratch_quan; SpreaderUtils::traverse_depth_for_quantity(me->last_book, cross_side, kk.second, scratch_price, scratch_quan); + //Quantity scratch_quan = Price(me->book_at_inception.side(other_side)[0].price()) scratch_price = securities::worsen_price(cross_side, scratch_price, me->chase_diff); Update update; diff --git a/testing/manual/algos/pro_rata_controlled.txt b/testing/manual/algos/pro_rata_controlled.txt new file mode 100644 index 000000000..b9ea169e6 --- /dev/null +++ b/testing/manual/algos/pro_rata_controlled.txt @@ -0,0 +1,87 @@ +Test Author: Kevin +If it breaks: Kevin + +When the prorata order is placed, it acts as a slightly more complex hedging algorithm than Cover. +It will: + - Classify each fill as a normal fill or an 'overfill' according to "Fill Limit" parameters + - Standard fills are hedged with the "Hedge" child order + - Over fills are hedge with the "Overfill Hedge" child order + +The prorata order works the child until the Fill Limit is breached. +Once the fill limit is breached, the algo will begin the 'get out process' +Unless: + - If "Enable Stay In" is checked, AND + a) The opposite inside market (at inception) doesn't move against us AND + b) The same side quantity remains ABOVE the "Stay in Threshold" +If "Enable Stay In" is not checked, 'get out process' begins right away + +"Get Out Process" means + 1) Cancel the child order + 2) Scratch the overfill hedges if and only if the "Enable Scratch on Overfill" is checked + -Scratches are done "Chase Ticks" through the original opposite market + + +0. This needs sim market data **not** to be merged with replay (or +cert), so we can create our own markets. Use the following key to set +market data up: + +ExchangeSim { + value { + merge_with_md: false + } +} + +1. Bring up a ladder, lets say in SIM:ESU9 (does not matter which security) + +2. Create the ask side of the market by sending 50 lot sell limit orders at 2833.25 through 2832.25 +(if there are no markets use the M View and the ticket to enter, if you already had left over +orders cancel them) + +2. Create the bid side of the market by sending 50 lot buy limit orders at 2830.75 through 2831.50. +You should have no orders at 2831.50, 2831.75 and 2832. + +Basics: +3. Enter a 20 lot buy prorata order at 2831.50 with the following parameters + + Hedge Ticks = 1 + Chase Ticks = 1 + Fill Limit = Absolute:5 + Stay in Threshold = Absolute:21 + Enable Scratch on Overfill = true + Enable Stay In = true + +Verify that the Prorata order along with the Child order shows up. + +Next put a 50 lot buy limit order on top of your prorata at 2831.50 + + +4) Using 1 lot limit sells, fill 5 of your prorata order. Verify that you see covers going in 1 tick better + +5) Cancel the 50 lot limit at 2831.50. Nothing should happen. Put the 50 lot back. + +6) Fill one more 1 lot. + +7) Again cancel the 50 lot limit at 2831.50. You should see: + - The remainder of the 20 lot should cancel + - 1 lot of your hedges should scratch to sell at 2831.25 + - The parent order should stay in + - You should still be working 5 sales for hedges + +8) Fill the 5 sells, it should cancel the parent. + +9) Repeat 3-8, but this time set Enable Scratch on Overfill = false, Enable Stay In = true + - You should see the same results in 7, except the 1 lot scratch won't happen so you'll still have 6 working hedges + +9) Repeat 3-6, but this time set Enable Scratch on Overfill = false, Enable Stay In = false + - After filling your last lot in 1 you should see your working order cancel, with 6 hedges working + - The ladder may deceive you here, check the OB + - Cancel your hedges, this should cancel the whole chain + +9) Repeat 3-6, but this time set Enable Scratch on Overfill = true, Enable Stay In = false + - After filling your last lot in 1 you should see your working order cancel, one hedge scratch (at 2831.50), and 5 hedges working + - The ladder may deceive you here, check the OB + - Cancel your hedges, this should cancel the whole chain + +10) Repeat all of this on the sell side + + diff --git a/testing/manual/algos/scratch_controlled.txt b/testing/manual/algos/scratch_controlled.txt index 0d8740cb4..e711374a2 100644 --- a/testing/manual/algos/scratch_controlled.txt +++ b/testing/manual/algos/scratch_controlled.txt @@ -27,10 +27,11 @@ You should have no orders at 2831.75 and 2832. Basics: 3. Enter a 20 lot buy scratch order at 2831.50 with the following parameters -Scratch Threshold = Absolute:21 -Max Chase Ticks = 2 -Child = Limit -Verify that the Lean order along with the Child order shows up + Scratch Threshold = Absolute:21 + Max Chase Ticks = 2 + Child = Limit + + Verify that the Scratch order along with the Child order shows up 4) Now cancel the 50 lot sell at 2832.25, you should see the 20 lot scratch pay 2832.50 on 20 From 159e8fba2392e896dcff46eb81767e156447fdaa Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 12 Jun 2019 18:17:09 -0400 Subject: [PATCH 024/210] beginnings of span, should't be long --- src/lib/api/services/MarginService.proto | 28 +++++ .../sparkd/position/IMarginObserver.cpp | 9 -- src/server/sparkd/position/IMarginObserver.h | 18 --- src/server/sparkd/position/MarginResult.h | 4 +- .../sparkd/position/MarginServiceCore.cpp | 104 +++++++++-------- .../sparkd/position/MarginServiceCore.h | 16 +-- .../sparkd/position/MarginServiceServer.cpp | 105 ++++++++++++++++++ .../sparkd/position/MarginServiceServer.h | 33 ++++++ src/server/sparkd/position/Position.h | 13 +-- 9 files changed, 236 insertions(+), 94 deletions(-) create mode 100644 src/lib/api/services/MarginService.proto delete mode 100644 src/server/sparkd/position/IMarginObserver.cpp delete mode 100644 src/server/sparkd/position/IMarginObserver.h create mode 100644 src/server/sparkd/position/MarginServiceServer.cpp create mode 100644 src/server/sparkd/position/MarginServiceServer.h diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto new file mode 100644 index 000000000..e870029ce --- /dev/null +++ b/src/lib/api/services/MarginService.proto @@ -0,0 +1,28 @@ +syntax="proto3"; +package bts.api.position; +option csharp_namespace="bts.api.position"; +import "lib/api/apioptions.proto"; +import "lib/api/apicore.proto"; +import "lib/domain_model/Security.proto"; + +message MarginResult { + int32 id = 1 [(bts.api.key)=true]; + string account = 10; + string portfolio_id = 15; + string settle_indicator = 20; + string settle_qualifier = 30; + string as_of_time = 40; + string calculation_id = 50; + + double opt_value = 100; + double nonopt_value = 110; + double maint_margin = 120; + double initial_margin = 130; +} + +service MarginService { + option (bts.api.service_description) = "Provides CME Margin Information per account"; + + // subscription + rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); +} \ No newline at end of file diff --git a/src/server/sparkd/position/IMarginObserver.cpp b/src/server/sparkd/position/IMarginObserver.cpp deleted file mode 100644 index 6536da462..000000000 --- a/src/server/sparkd/position/IMarginObserver.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "IMarginObserver.h" - -namespace bts -{ -namespace position -{ - IMarginObserver::~IMarginObserver() {} -} -} diff --git a/src/server/sparkd/position/IMarginObserver.h b/src/server/sparkd/position/IMarginObserver.h deleted file mode 100644 index de4a0e278..000000000 --- a/src/server/sparkd/position/IMarginObserver.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" - -namespace bts -{ -namespace position -{ -struct MarginResult; -class -IMarginObserver -{ -public: - virtual ~IMarginObserver(); - virtual void on_margin_change(const orderman::AccountName&, const MarginResult&) = 0; -}; -} -} diff --git a/src/server/sparkd/position/MarginResult.h b/src/server/sparkd/position/MarginResult.h index 53cd29332..c04f0a09b 100644 --- a/src/server/sparkd/position/MarginResult.h +++ b/src/server/sparkd/position/MarginResult.h @@ -9,7 +9,9 @@ namespace position { struct MarginResult { - bool valid; + enum class ResultStatus { NewValid, CachedValid, Error }; + ResultStatus result_status; + std::string settle_indicator; std::string settle_qualifier; std::string portfolio_id; diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 3bc45e612..b98720bff 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -3,7 +3,6 @@ #include "PositionServiceCore.h" #include "Position.h" #include "MarginResult.h" -#include "IMarginObserver.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" @@ -39,25 +38,22 @@ namespace position using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { - securities::ISecurityDB& db; - PositionServiceCore position_service; - IMarginObserver* observer; MarginMap last_results, last_valid_results; std::string url_base, core_user, core_password, post_margin_path, get_margin_path; size_t max_iterations; bool verbose; int throttle; - bts::datetime::PTime last_update; - PImpl(securities::ISecurityDB& d, IMarginObserver* obs) : - db(d), position_service(d), observer(obs), last_results(), last_valid_results(), - url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("BT5u53r!"), + bts::datetime::PTime last_call; + PImpl() : + last_results(), last_valid_results(), //api_bts_span BT5Margin! + url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("Summer123"), post_margin_path("margins/?complete=true"), get_margin_path("margins/"), max_iterations(20), verbose(false), throttle(30000), - last_update() + last_call() { auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) @@ -321,7 +317,7 @@ struct MarginServiceCore::PImpl }; bool compute_margin(const std::string& account_name, const std::string& portfolid_id, - const std::vector& pos, MarginResult& margin) + const std::vector& pos, std::function cb) { margin.valid = false; pugi::xml_document doc; @@ -331,12 +327,9 @@ struct MarginServiceCore::PImpl size_t count = 0; for(const auto& i : pos) { - if(i.security && i.security->has_glbx()) - { - int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security->glbx().security_desc(), p, "\n"); - count++; - } + int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); + request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security_desc, p, "\n"); + count++; } if(count > 0) { @@ -345,6 +338,30 @@ struct MarginServiceCore::PImpl xml_string_writer writer(xml); doc.save(writer); + post(post_margin_path, xml, reply); + std::string portid_resp, calcid_resp; + if(parse_margin_response(reply, portid_resp, calcid_resp)) + { + utils::Dispatcher::get_named("MarginServiceServer").post( + [=]() + { + try + { + if(get(get_margin_path + calcid_resp, reply2)) + { + parse_margin_calculation(reply2, margin); + return true; + } + } + catch(...) + { + } + }, 5000); + return true; + } + } + + size_t iters = 0; while(iters++ < max_iterations) { @@ -368,56 +385,49 @@ struct MarginServiceCore::PImpl } }; -MarginServiceCore::MarginServiceCore(securities::ISecurityDB& db, IMarginObserver* obs) - : me(new PImpl(db, obs)) +MarginServiceCore::MarginServiceCore() : me(new PImpl()) { } MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::pump(const orderman::AccountName& acct) -{ - MarginResult result; - return compute_margin(acct, result); -} -bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, MarginResult& result) +bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, + std::function cb) { auto now = bts::datetime::now(); - auto diff = bts::datetime::ptime_diff_in_ms(now, me->last_update); - if(me->last_update.is_not_a_date_time() || abs(diff) > me->throttle) + auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); + if(me->last_call.is_not_a_date_time() || diff > me->throttle) { - query_margin_webapi(acct, result); - me->last_update = now; - return true; + me->last_call = now; + return query_margin_webapi(acct, pos, cb); } else { - get_last_valid_result(acct, result); - return false; //false, we did not get new data + MarginResult result; + if(get_last_valid_result(acct, result)) + { + result.status = MarginResult::ResultStatus::CachedValid; + cb(result); + } + return false; //no error } } -bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, MarginResult& margin) +bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, + std::function cb) { - std::vector pos; - me->position_service.query_all_positions(acct, pos); utils::Uuid guid; - bool succ = me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, margin); - if(me->observer) - me->observer->on_margin_change(acct, margin); - me->last_results.insert_or_assign(acct, margin); - if(succ && margin.valid) - me->last_valid_results.insert_or_assign(acct, margin); - return succ; + return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + [this, &] (const MarginResult& m) + { + me->last_results.insert_or_assign(acct, m); + if(m.status == MarginResult::ResultStatus::NewValid) + me->last_valid_results.insert_or_assign(acct, m); + cb(m); + }); } -bool MarginServiceCore::query_margin_webapi(const std::vector& pos, MarginResult& margin) -{ - utils::Uuid guid; - std::string str = guid.to_text_string(); - return me->compute_margin(str.substr(0, 3), str, pos, margin); -} void MarginServiceCore::set_verbose_debugging(bool verb) { diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index 51ab6321e..db3226098 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -17,22 +17,18 @@ class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); public: - MarginServiceCore(securities::ISecurityDB&, IMarginObserver* obs = nullptr); + + MarginServiceCore(); ~MarginServiceCore(); - - //Call as much as you want; it will update IMarginObserver at most once every 30s - bool pump(const orderman::AccountName&); - //Call as much as you want; it will query the webapi at most once every 30s - bool compute_margin(const orderman::AccountName&, MarginResult&); + void compute_margin(const orderman::AccountName&, const std::vector&, std::function); private: friend class PositionTests; bool get_last_valid_result(const orderman::AccountName&, MarginResult&); bool get_last_result(const orderman::AccountName&, MarginResult&); - //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, MarginResult&); - //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const std::vector&, MarginResult&); + + //This is a blocking call to a WebAPI. Very Slow. + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); void set_verbose_debugging(bool); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp new file mode 100644 index 000000000..fbf6872e3 --- /dev/null +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -0,0 +1,105 @@ +#include "MarginServiceServer.h" +#include "Position.h" + +#include "lib/persistence/SqliteStore.h" +#include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" +#include "lib/utils/PBUtils.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/AuthToken.h" +#include "lib/utils/Dispatcher.h" + +#include +#include +#include +#include +#include +#include + +using namespace bts::api::orderman; +using namespace bts::api::position; +using namespace std; + +namespace bts { +namespace position { + +MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md::MDClient& mdclient) + : bts::api::position::MarginServiceBase (context), + _publisher(make_margin_data_stateful_publisher()), + _position_service(context.locate()), + _position_map(), + _oracle(mdclient) +{ + LOG(Gen, Info, "MarginServiceServer: service started"); + + _position_service.subscribe_position_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + for (const auto& o : update.removed()) + { + const auto& it = _position_map.find(o->record_id()); + if(it != _position_map.end()) + _position_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _position_map[o->record_id()] = *o; + } + for (const auto& o : update.added()) + { + _position_map[o->record_id()] = *o; + } + }); + + auto& disp = utils::Dispatcher::get_named("MarginServiceServer"); + utils::DispatcherTimer web_api_timer(disp, 250, [&]() + { + for (auto& p: platforms) + p->send_heartbeats(); + }); + web_api_timer.start(); + + disp.run(); +} + +MarginServiceServer::~MarginServiceServer() {} + +void MarginServiceServer::query_accounts_and_positions(std::map, std::vector& result) + +void MarginServiceServer::query_all_positions(const orderman::AccountName& account, std::vector& result) +{ + result.reserve(_position_map.size()); + for(auto& entry : _position_map) + { + if(entry.second.account() != account) + continue; + const PositionUnit& unit = entry.second; + auto sec = _oracle.get_security(unit.security_id()); + if(sec && sec->has_glbx()) + { + Position pos; + pos.account = unit.account(); + pos.security_desc = securities::descriptor(*sec); + int32_t pos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); + pos.position = Quantity(abs(pos)); + pos.side = (pos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } +} + +void MarginServiceServer::_publish_margin() +{ + // // TODO, need to delete all state + // std::vector entitlements; + // AdminServiceUtils::get_md_entitlement_report(_state,entitlements); + // for (const auto& e : entitlements) + // _md_entit_publisher.add_or_update(e); + // _md_entit_publisher.flush(); +} +}} + diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h new file mode 100644 index 000000000..917466af9 --- /dev/null +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/api/services/MarginService.server.pb.h" +#include "lib/md/SecurityOracle.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" +#include "lib/utils/bts_no_copy.h" +#include +#include + +namespace bts { +namespace securities { class ISecurityDB; } +namespace position { +struct Position; + +class MarginServiceServer : public api::position::MarginServiceBase +{ +public: + MarginServiceServer(bts::api::ServiceContext&, md::MDClient&); + ~MarginServiceServer(); + +private: + void query_all_positions(const orderman::AccountName&, std::vector&); + void _publish_margin(); + +private: + MarginServiceBase::Margin_dataStatefulPublisher _publisher; + api::position::PositionService _position_service; + std::map _position_map; + securities::SecurityOracle _oracle; +}; +}} diff --git a/src/server/sparkd/position/Position.h b/src/server/sparkd/position/Position.h index 715f27724..c36fab8c0 100644 --- a/src/server/sparkd/position/Position.h +++ b/src/server/sparkd/position/Position.h @@ -1,19 +1,14 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/domain_model/Security.pb.h" -namespace bts -{ -namespace position -{ +namespace bts { +namespace position { struct Position { orderman::AccountName account; - const api::Security* security; + std::string security_desc; Quantity position; api::Side side; - Price avg_price; }; -} -} +}} From be5d037ca96ffa8ea37ba16e3a5c01dbe15139c8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 13 Jun 2019 17:52:47 -0400 Subject: [PATCH 025/210] span works again --- .vscode/launch.json | 2 +- src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/services/MarginService.proto | 11 +- src/lib/utils/Dispatcher.cpp | 14 ++ src/lib/utils/Dispatcher.h | 1 + src/server/sparkd/cmds/Span.cpp | 62 ++++++- src/server/sparkd/position/MarginResult.h | 27 --- .../sparkd/position/MarginServiceCore.cpp | 157 +++++++++--------- .../sparkd/position/MarginServiceCore.h | 19 ++- .../sparkd/position/MarginServiceServer.cpp | 84 +++------- .../sparkd/position/MarginServiceServer.h | 23 ++- .../sparkd/position/PositionAggregator.cpp | 91 ++++++++++ .../sparkd/position/PositionAggregator.h | 32 ++++ .../sparkd/position/PositionServiceCore.cpp | 141 ---------------- .../sparkd/position/PositionServiceCore.h | 36 ---- .../sparkd/position/tests/PositionTests.cpp | 21 +-- 16 files changed, 342 insertions(+), 381 deletions(-) delete mode 100644 src/server/sparkd/position/MarginResult.h create mode 100644 src/server/sparkd/position/PositionAggregator.cpp create mode 100644 src/server/sparkd/position/PositionAggregator.h delete mode 100644 src/server/sparkd/position/PositionServiceCore.cpp delete mode 100644 src/server/sparkd/position/PositionServiceCore.h diff --git a/.vscode/launch.json b/.vscode/launch.json index fac8a7668..8ddf7d5a1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ - "run" + "span" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index f862b0d26..2222ef991 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index e870029ce..cb63f8d48 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -3,11 +3,13 @@ package bts.api.position; option csharp_namespace="bts.api.position"; import "lib/api/apioptions.proto"; import "lib/api/apicore.proto"; -import "lib/domain_model/Security.proto"; message MarginResult { + enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } + int32 id = 1 [(bts.api.key)=true]; - string account = 10; + string account = 10; + ResultStatus status = 12; string portfolio_id = 15; string settle_indicator = 20; string settle_qualifier = 30; @@ -20,9 +22,14 @@ message MarginResult { double initial_margin = 130; } +message MarginRequest { + string account = 10; +} + service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; // subscription rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); + rpc get_margin(MarginRequest) returns (MarginResult); } \ No newline at end of file diff --git a/src/lib/utils/Dispatcher.cpp b/src/lib/utils/Dispatcher.cpp index 1d7ab64d3..c45d28c54 100755 --- a/src/lib/utils/Dispatcher.cpp +++ b/src/lib/utils/Dispatcher.cpp @@ -214,6 +214,20 @@ void Dispatcher::post(Action&& action, int64_t delay_ms) } } +void Dispatcher::post_copy(Action action, int64_t delay_ms) +{ + if (delay_ms > 0) + { + shared_ptr timer = make_shared(_me->service); + timer->expires_from_now(boost::posix_time::milliseconds(delay_ms)); + timer->async_wait([timer, action] (const boost::system::error_code& err) { if (!err) action(); }); + } + else + { + _me->service.post(action); + } +} + io_service* Dispatcher::io_service() { return &_me->service; } // diff --git a/src/lib/utils/Dispatcher.h b/src/lib/utils/Dispatcher.h index 2adc656af..997ab1220 100755 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib/utils/Dispatcher.h @@ -88,6 +88,7 @@ public: void invoke(Action action); // Queue an action on the dispatcher thread and return immediately. void post(Action&& action, int64_t delay_ms=0); + void post_copy(Action action, int64_t delay_ms=0); boost::asio::io_service* io_service(); diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index 8499a465e..51f65b5ee 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -1,15 +1,66 @@ #include "Span.h" +#include "server/sparkd/position/PositionAggregator.h" #include "server/sparkd/position/MarginServiceCore.h" +#include "server/sparkd/position/Position.h" +#include "lib/orderman/orderman_utils/orderman_common.h" -namespace bts -{ -namespace cmd -{ +#include "lib/config/config.h" +#include "lib/api/public/ServiceContext.h" +#include "lib/api/services/AuthService.client.pb.h" +#include "lib/domain_model/Security.pb.h" +#include "lib/utils/helper_macros.h" +#include "lib/utils/Dispatcher.h" + +#include +#include +#include +#include +#include +#include +#include + +using namespace bts::position; +using namespace bts::api::position; + +namespace bts { +namespace cmd { int Span::execute(const std::vector&) { + srand (time(NULL)); + std::condition_variable cv; + std::mutex cv_m; + std::unique_lock lk(cv_m); + + auto& disp = utils::Dispatcher::create_new("SPAN"); + MarginServiceCore core(disp); + + auto acct = orderman::to("ACC A"); + Position p; + p.security_desc = "ESU9"; + p.account = acct; + p.position = Quantity(rand() % 100); + p.side = api::SIDE_BUY; + std::vector pos; + pos.push_back(p); + p.position = Quantity(rand() % 200); + p.side = api::SIDE_SELL; + pos.push_back(p); + + //core.set_verbose_debugging(true); + core.compute_margin(acct, pos, [&cv](const api::position::MarginResult& m) + { + std::string str; + google::protobuf::TextFormat::PrintToString(m, &str); + + std::cout << std::endl << str << std::endl << std::endl; + cv.notify_all(); + }); + + std::cout << "Waiting for margin results, press any key to exit" << std::endl; + cv.wait(lk); return 0; } @@ -18,7 +69,6 @@ std::string Span::help() return "\t test CME CORE Span integration \n"; } -} -} +}} diff --git a/src/server/sparkd/position/MarginResult.h b/src/server/sparkd/position/MarginResult.h deleted file mode 100644 index c04f0a09b..000000000 --- a/src/server/sparkd/position/MarginResult.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/domain_model/Security.pb.h" - -namespace bts -{ -namespace position -{ -struct MarginResult -{ - enum class ResultStatus { NewValid, CachedValid, Error }; - ResultStatus result_status; - - std::string settle_indicator; - std::string settle_qualifier; - std::string portfolio_id; - std::string as_of_time; - std::string calculation_id; - - double opt_value; - double nonopt_value; - double maint_margin; - double initial_margin; -}; -} -} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index b98720bff..49647f877 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,13 +1,11 @@ #include "MarginServiceCore.h" -#include "PositionServiceCore.h" #include "Position.h" -#include "MarginResult.h" - #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/Uuid.h" +#include "lib/utils/Dispatcher.h" #include "lib/utils/bts_chrono.h" #include "lib/logging/logging.h" #include "lib/utils/helper_macros.h" @@ -22,13 +20,7 @@ #include #include -#define CONSOLE_LOG(...) std::cout , __VA_ARGS__ , std::endl - -template std::ostream& operator,(std::ostream& out, const T& t) { out << t; return out; } -std::ostream& operator,(std::ostream& out, std::ostream&(*f)(std::ostream&)) { out << f; return out; } -#define MARGIN_LOG(subsystem,level,...) \ - bts::log::_thread_logger.logger->enqueue(log::log_ts(),bts::log::subsystem,level,__FILE__,__LINE__,__VA_ARGS__); \ -CONSOLE_LOG(__VA_ARGS__) +using bts::api::position::MarginResult; namespace bts { @@ -38,19 +30,18 @@ namespace position using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { - MarginMap last_results, last_valid_results; - + utils::Dispatcher& dispatcher; + MarginMap last_results, last_valid_results; std::string url_base, core_user, core_password, post_margin_path, get_margin_path; - size_t max_iterations; bool verbose; int throttle; bts::datetime::PTime last_call; - PImpl() : + PImpl(utils::Dispatcher& disp) : + dispatcher(disp), last_results(), last_valid_results(), //api_bts_span BT5Margin! url_base("https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/"), core_user("api_bts1"), core_password("Summer123"), post_margin_path("margins/?complete=true"), get_margin_path("margins/"), - max_iterations(20), verbose(false), throttle(30000), last_call() @@ -58,7 +49,7 @@ struct MarginServiceCore::PImpl auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) { - MARGIN_LOG(Gen,Error,"curl_global_init() failed: ", std::string(curl_easy_strerror(res))); + LOG(Gen,Error,"curl_global_init() failed: {}", std::string(curl_easy_strerror(res))); } } ~PImpl() @@ -147,7 +138,7 @@ struct MarginServiceCore::PImpl struct curl_slist* setup_url_and_headers(CURL* curl, const std::string& xpath) { std::string full_url = url_base + xpath; - MARGIN_LOG(Gen,Info,"CORE Margin URL: ",full_url); + LOG(Gen,Info,"CORE Margin URL: {}",full_url); curl_easy_setopt(curl, CURLOPT_URL, full_url.c_str()); //curl_easy_setopt(curl, CURLOPT_URL, "https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/margins/"); curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_callback); @@ -178,19 +169,19 @@ struct MarginServiceCore::PImpl curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&reply); curl_easy_setopt(curl, CURLOPT_POSTFIELDS, payload.c_str()); - MARGIN_LOG(Gen,Info,"CORE Margin Payload: ", payload); + LOG(Gen,Info,"CORE Margin Payload: {}", payload); auto res = curl_easy_perform(curl); if(res == CURLE_OK) { std::string resp(reply.data.begin(), reply.data.end()); - MARGIN_LOG(Gen,Info,"CORE Margin Post Response: ", resp); + LOG(Gen,Info,"CORE Margin Post Response: {}", resp); succ = true; } else { std::string error(curl_easy_strerror(res)); - MARGIN_LOG(Gen,Error,"POST curl_easy_perform() failed: ", error); - std::cout << fmt::format("CORE Margin CURL Error: ", error); + LOG(Gen,Error,"POST curl_easy_perform() failed: {}", error); + //std::cout << fmt::format("CORE Margin CURL Error: ", error); } curl_easy_cleanup(curl); if(header) @@ -198,7 +189,7 @@ struct MarginServiceCore::PImpl } else { - MARGIN_LOG(Gen,Error,"curl_easy_init() failed\n"); + LOG(Gen,Error,"curl_easy_init() failed\n"); } return succ; } @@ -217,12 +208,12 @@ struct MarginServiceCore::PImpl if(res == CURLE_OK) { std::string resp(reply.data.begin(), reply.data.end()); - MARGIN_LOG(Gen,Info,"CORE Margin GET Response: ", resp); + LOG(Gen,Info,"CORE Margin GET Response: {}", resp); succ = true; } else { - MARGIN_LOG(Gen,Error,"GET curl_easy_perform() failed: ", std::string(curl_easy_strerror(res))); + LOG(Gen,Error,"GET curl_easy_perform() failed: {}", std::string(curl_easy_strerror(res))); } curl_easy_cleanup(curl); if(header) @@ -230,7 +221,7 @@ struct MarginServiceCore::PImpl } else { - MARGIN_LOG(Gen,Error,"curl_easy_init() failed\n"); + LOG(Gen,Error,"curl_easy_init() failed\n"); } return succ; } @@ -280,7 +271,7 @@ struct MarginServiceCore::PImpl void parse_margin_calculation(const CurlMsg& msg, MarginResult& result) { - result.valid = false; + result.set_status(MarginResult::Error); std::string str(msg.data.begin(), msg.data.end()); pugi::xml_document doc; doc.load_string(str.c_str()); @@ -289,19 +280,19 @@ struct MarginServiceCore::PImpl child = child.child("margin"); if(child) { - result.settle_indicator = child.attribute("settleInd").as_string(); - result.settle_qualifier = child.attribute("settleQual").as_string(); - result.portfolio_id = child.attribute("portfolioId").as_string(); - result.as_of_time = child.attribute("asOfTime").as_string(); - result.calculation_id = child.attribute("id").as_string(); + result.set_settle_indicator(child.attribute("settleInd").as_string()); + result.set_settle_qualifier(child.attribute("settleQual").as_string()); + result.set_portfolio_id(child.attribute("portfolioId").as_string()); + result.set_as_of_time(child.attribute("asOfTime").as_string()); + result.set_calculation_id(child.attribute("id").as_string()); auto val = child.child("amounts"); - if(val && result.portfolio_id != "") + if(val && result.portfolio_id() != "") { - result.opt_value = child.attribute("optVal").as_double(); - result.nonopt_value = child.attribute("nonOptVal").as_double(); - result.maint_margin = child.attribute("maint").as_double(); - result.initial_margin = child.attribute("init").as_double(); - result.valid = true; + result.set_opt_value(val.attribute("optVal").as_double()); + result.set_nonopt_value(val.attribute("nonOptVal").as_double()); + result.set_maint_margin(val.attribute("maint").as_double()); + result.set_initial_margin(val.attribute("init").as_double()); + result.set_status(MarginResult::NewValid); } } } @@ -317,18 +308,17 @@ struct MarginServiceCore::PImpl }; bool compute_margin(const std::string& account_name, const std::string& portfolid_id, - const std::vector& pos, std::function cb) - { - margin.valid = false; + const std::vector& pos, std::function cb) + { pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); - std::string request = "\nFirm Id, Acct Id, Ticker Symbol, Net Positions\n"; + std::string request = "\nFirm Id, Acct Id, Exchange, Ticker Symbol, Net Positions\n"; size_t count = 0; for(const auto& i : pos) { int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {} {}", account_name, i.security_desc, p, "\n"); + request += fmt::format("BTS, {}, {}, {}, {}, {}", account_name, "CME", i.security_desc, p, "\n"); count++; } if(count > 0) @@ -338,54 +328,48 @@ struct MarginServiceCore::PImpl xml_string_writer writer(xml); doc.save(writer); + CurlMsg reply; post(post_margin_path, xml, reply); std::string portid_resp, calcid_resp; if(parse_margin_response(reply, portid_resp, calcid_resp)) - { - utils::Dispatcher::get_named("MarginServiceServer").post( + { + std::function do_web; + do_web = [=]() { + MarginResult margin; + margin.set_status(MarginResult::Error); + margin.set_account(account_name); + CurlMsg reply2; bool done = false; try { if(get(get_margin_path + calcid_resp, reply2)) { parse_margin_calculation(reply2, margin); - return true; + cb(margin); + done = true; } } + catch(const std::exception& ex) + { + LOG(Gen, Error, "Exception in parse_margin_calculation {}", std::string(ex.what())); + } catch(...) { - } - }, 5000); + LOG(Gen, Error, "Unknown Exception in parse_margin_calculation"); + } + if(!done) + dispatcher.post_copy(do_web, 5000); + }; + dispatcher.post_copy(do_web, 5000); return true; } } - - - size_t iters = 0; - while(iters++ < max_iterations) - { - CurlMsg reply; - sleep_for(5s); - post(post_margin_path, xml, reply); - std::string portid_resp, calcid_resp; - if(parse_margin_response(reply, portid_resp, calcid_resp)) - { - CurlMsg reply2; - sleep_for(2s); - if(get(get_margin_path + calcid_resp, reply2)) - { - parse_margin_calculation(reply2, margin); - return true; - } - } - } - } return false; } }; -MarginServiceCore::MarginServiceCore() : me(new PImpl()) +MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(disp)) { } @@ -393,7 +377,7 @@ MarginServiceCore::~MarginServiceCore() {} bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, - std::function cb) + std::function cb) { auto now = bts::datetime::now(); auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); @@ -407,10 +391,10 @@ bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const MarginResult result; if(get_last_valid_result(acct, result)) { - result.status = MarginResult::ResultStatus::CachedValid; + result.set_status(MarginResult::CachedValid); cb(result); } - return false; //no error + return true; //no error, just returning cached } } @@ -418,14 +402,27 @@ bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, c std::function cb) { utils::Uuid guid; - return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, - [this, &] (const MarginResult& m) - { - me->last_results.insert_or_assign(acct, m); - if(m.status == MarginResult::ResultStatus::NewValid) - me->last_valid_results.insert_or_assign(acct, m); - cb(m); - }); + try + { + return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + [=] (const MarginResult& m) + { + me->last_results.insert_or_assign(acct, m); + if(m.status() == MarginResult::NewValid) + me->last_valid_results.insert_or_assign(acct, m); + cb(m); + }); + } + catch(const std::exception& ex) + { + LOG(Gen, Error, "Exception in query_margin_webapi {}", std::string(ex.what())); + return false; + } + catch(...) + { + LOG(Gen, Error, "Unknown Exception in query_margin_webapi"); + return false; + } } diff --git a/src/server/sparkd/position/MarginServiceCore.h b/src/server/sparkd/position/MarginServiceCore.h index db3226098..7964b5f55 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/api/services/MarginService.pb.h" #include "server/sparkd/position/Position.h" #include "lib/domain_model/Security.pb.h" @@ -8,29 +9,31 @@ namespace bts { +namespace utils { class Dispatcher; } namespace securities { class ISecurityDB; } namespace position { -struct MarginResult; class IMarginObserver; class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); public: - MarginServiceCore(); + MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - void compute_margin(const orderman::AccountName&, const std::vector&, std::function); + bool compute_margin(const orderman::AccountName&, const std::vector&, + std::function); + void set_verbose_debugging(bool); private: friend class PositionTests; - bool get_last_valid_result(const orderman::AccountName&, MarginResult&); - bool get_last_result(const orderman::AccountName&, MarginResult&); + bool get_last_valid_result(const orderman::AccountName&, api::position::MarginResult&); + bool get_last_result(const orderman::AccountName&, api::position::MarginResult&); //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); - void set_verbose_debugging(bool); - + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, + std::function); + private: struct PImpl; std::unique_ptr me; diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index fbf6872e3..e4a6c61b6 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -1,26 +1,22 @@ #include "MarginServiceServer.h" +#include "MarginServiceCore.h" +#include "PositionAggregator.h" #include "Position.h" -#include "lib/persistence/SqliteStore.h" +#include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" -#include "lib/utils/PBUtils.h" -#include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/utils/TimeStamp.h" -#include "lib/utils/AuthToken.h" #include "lib/utils/Dispatcher.h" -#include -#include -#include -#include #include #include using namespace bts::api::orderman; using namespace bts::api::position; using namespace std; +using bts::api::position::MarginResult; namespace bts { namespace position { @@ -28,71 +24,41 @@ namespace position { MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md::MDClient& mdclient) : bts::api::position::MarginServiceBase (context), _publisher(make_margin_data_stateful_publisher()), - _position_service(context.locate()), - _position_map(), - _oracle(mdclient) + _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), + _position(new PositionAggregator(context.locate(), mdclient)), + _margin(new MarginServiceCore(_dispatcher)) { LOG(Gen, Info, "MarginServiceServer: service started"); - _position_service.subscribe_position_data() | - rxcpp::operators::subscribe( - [this](auto const& update) - { - for (const auto& o : update.removed()) - { - const auto& it = _position_map.find(o->record_id()); - if(it != _position_map.end()) - _position_map.erase(it); - } - for (const auto& ch : update.changed()) - { - const auto& o = ch.current(); - _position_map[o->record_id()] = *o; - } - for (const auto& o : update.added()) - { - _position_map[o->record_id()] = *o; - } - }); - - auto& disp = utils::Dispatcher::get_named("MarginServiceServer"); - utils::DispatcherTimer web_api_timer(disp, 250, [&]() + utils::DispatcherTimer web_api_timer(_dispatcher, 30000, [this]() { - for (auto& p: platforms) - p->send_heartbeats(); + std::map> posmap; + _position->query_accounts_and_positions(posmap); + for(const auto& i : posmap) + _margin->compute_margin(i.first, i.second, [this](const MarginResult& m) { publish_margin(m); } ); }); web_api_timer.start(); - - disp.run(); } MarginServiceServer::~MarginServiceServer() {} -void MarginServiceServer::query_accounts_and_positions(std::map, std::vector& result) - -void MarginServiceServer::query_all_positions(const orderman::AccountName& account, std::vector& result) +void MarginServiceServer::get_margin(const api::position::MarginRequest& request, + const api::Response& reply) { - result.reserve(_position_map.size()); - for(auto& entry : _position_map) - { - if(entry.second.account() != account) - continue; - const PositionUnit& unit = entry.second; - auto sec = _oracle.get_security(unit.security_id()); - if(sec && sec->has_glbx()) + orderman::AccountName acct; + orderman::str_to(request.account(), &acct); + std::vector pos; + _position->query_all_positions(acct, pos); + + _margin->compute_margin(acct, pos, + [=](const MarginResult& m) { - Position pos; - pos.account = unit.account(); - pos.security_desc = securities::descriptor(*sec); - int32_t pos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); - pos.position = Quantity(abs(pos)); - pos.side = (pos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.push_back(pos); - } - } + reply(m); + }); } -void MarginServiceServer::_publish_margin() + +void MarginServiceServer::publish_margin(const api::position::MarginResult&) { // // TODO, need to delete all state // std::vector entitlements; diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 917466af9..2ab269a7d 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/api/services/MarginService.server.pb.h" #include "lib/md/SecurityOracle.h" #include "lib/api/public/ServiceContext.h" @@ -8,26 +9,34 @@ #include "lib/utils/bts_no_copy.h" #include #include +#include namespace bts { -namespace securities { class ISecurityDB; } +namespace utils { class Dispatcher; } namespace position { + struct Position; +class PositionAggregator; +class MarginServiceCore; class MarginServiceServer : public api::position::MarginServiceBase { public: MarginServiceServer(bts::api::ServiceContext&, md::MDClient&); ~MarginServiceServer(); + + void get_margin(const api::position::MarginRequest& request, + const api::Response& reply) override; private: - void query_all_positions(const orderman::AccountName&, std::vector&); - void _publish_margin(); + void query_accounts_and_positions(std::map>& result); + void query_all_positions(const orderman::AccountName& account, std::vector&); + void publish_margin(const api::position::MarginResult&); private: - MarginServiceBase::Margin_dataStatefulPublisher _publisher; - api::position::PositionService _position_service; - std::map _position_map; - securities::SecurityOracle _oracle; + MarginServiceBase::Margin_dataStatefulPublisher _publisher; + utils::Dispatcher& _dispatcher; + std::unique_ptr _position; + std::unique_ptr _margin; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp new file mode 100644 index 000000000..b0c9cc68d --- /dev/null +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -0,0 +1,91 @@ + +#include "PositionAggregator.h" +#include "Position.h" + +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/utils/TimeStamp.h" +#include "lib/utils/Dispatcher.h" + +#include +#include + +using namespace bts::api::orderman; +using namespace bts::api::position; +using namespace std; + +namespace bts { +namespace position { + +PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) + : _position_service(std::move(pos)), + _position_map(), + _oracle(mdclient), + _lock() +{ + _position_service.subscribe_position_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + std::lock_guard l(_lock); + for (const auto& o : update.removed()) + { + const auto& it = _position_map.find(o->record_id()); + if(it != _position_map.end()) + _position_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _position_map[o->record_id()] = *o; + } + for (const auto& o : update.added()) + { + _position_map[o->record_id()] = *o; + orderman::AccountName acct; + orderman::str_to(o->account(), &acct); + _accounts.insert(acct); + } + }); +} + +PositionAggregator::~PositionAggregator() {} + +void PositionAggregator::query_accounts_and_positions(std::map> & result) +{ + std::lock_guard l(_lock); + for(const auto& i : _accounts) + { + std::vector pos; + query_all_positions(i, pos); + result[i] = pos; + } +} + +void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) +{ + std::lock_guard l(_lock); + result.reserve(_position_map.size()); + for(auto& entry : _position_map) + { + const PositionUnit& unit = entry.second; + if(unit.account() != orderman::to_str(account)) + continue; + auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); + if(sec && sec->has_glbx() && sec->has_future()) + { + Position pos; + pos.account = account; + pos.security_desc = securities::descriptor(*sec); + int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); + pos.position = Quantity(abs(totalpos)); + pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } +} + +}} + diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h new file mode 100644 index 000000000..9701ccb44 --- /dev/null +++ b/src/server/sparkd/position/PositionAggregator.h @@ -0,0 +1,32 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/md/SecurityOracle.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" +#include "lib/utils/bts_no_copy.h" +#include +#include +#include + +namespace bts { +namespace position { +struct Position; + +class PositionAggregator +{ +public: + PositionAggregator(api::position::PositionService&&, md::MDClient&); + ~PositionAggregator(); + + void query_accounts_and_positions(std::map>& result); + void query_all_positions(const orderman::AccountName& account, std::vector&); + +private: + api::position::PositionService _position_service; + std::map _position_map; + std::set _accounts; + md::SecurityOracle _oracle; + std::mutex _lock; +}; +}} diff --git a/src/server/sparkd/position/PositionServiceCore.cpp b/src/server/sparkd/position/PositionServiceCore.cpp deleted file mode 100644 index 8fca5da02..000000000 --- a/src/server/sparkd/position/PositionServiceCore.cpp +++ /dev/null @@ -1,141 +0,0 @@ -#include "PositionServiceCore.h" - -#include "Position.h" -#include "IPositionObserver.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/securities/ISecurityDB.h" - -#include "lib/utils/bts_assert.h" -#include "lib/logging/logging.h" - -#include -#include - -namespace bts -{ -namespace position -{ - -template int sgn(T val) { - return (T(0) < val) - (val < T(0)); -} - -class BookEntry -{ -public: - orderman::AccountName account; - SecurityKey security_key; - double position; - double avg_price; -public: - BookEntry(const orderman::AccountName& acc, SecurityKey k) : - account(acc), security_key(k), position(0.0), avg_price(0.0) - { - } - void add_fill(double last_size, double last_price, api::Side side) - { - if(side == api::SIDE_SELL) - last_size = -last_size; - if(position == 0.0 || sgn(position) == sgn(last_size)) - { - double prev = position * avg_price; - position += last_size; - avg_price = prev + (last_size*last_price) / position; - } - else - position += last_size; - } -}; - -struct PositionServiceCore::PImpl -{ - typedef std::pair KeyType; - boost::container::flat_map> book; - IPositionObserver* observer; - PImpl(IPositionObserver* obs) : book(), observer(obs) - { - } - - BookEntry& find_entry(const orderman::AccountName& account, SecurityKey skey) - { - KeyType key(account, skey); - auto& entry = book[key]; - if(!entry) - entry = std::make_shared(account, skey); - return *entry; - } - - void book_raw_fill(const orderman::AccountName& account, SecurityKey sec, - double last_size, double last_price, api::Side side) - { - auto& entry = find_entry(account, sec); - entry.add_fill(last_size, last_price, side); - if(observer) - observer->on_position_change(account, sec, entry.position, entry.avg_price); - } -}; - -PositionServiceCore::PositionServiceCore(securities::ISecurityDB& db, IPositionObserver* obs) - : me(new PImpl(obs)), _db(db) -{ -} - -PositionServiceCore::~PositionServiceCore() {} - -bool PositionServiceCore::query_position(const orderman::AccountName& account, SecurityKey seckey, Position& result) -{ - auto& entry = me->find_entry(account, seckey); - auto sec = _db.resolve(entry.security_key); - if(sec) - { - result.account = entry.account; - result.avg_price = Price(entry.avg_price); - result.position = Quantity(abs(entry.position)); - result.side = (entry.position < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.security = sec; - return true; - } - else - return false; -} - -void PositionServiceCore::query_all_positions(const orderman::AccountName& account, std::vector& result) -{ - result.reserve(me->book.size()); - for(auto& entry : me->book) - { - if(entry.first.first != account) - continue; - auto sec = _db.resolve(entry.second->security_key); - if(sec) - { - Position pos; - pos.account = entry.second->account; - pos.avg_price = Price(entry.second->avg_price); - pos.position = Quantity(abs(entry.second->position)); - pos.side = (entry.second->position < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - pos.security = sec; - result.push_back(pos); - } - } -} - -void PositionServiceCore::consume_raw_fill(const std::string& account, uint32_t security_key, - double last_size, double last_price, api::Side side) -{ - orderman::AccountName acc = orderman::to(account); - SecurityKey skey(security_key); - auto sec = _db.resolve(skey); - if(sec->Contract_case() == api::Security::ContractCase::kSpread) - { - //TODO this is wrong; need the leg fills - for(int i = 0; i < sec->spread().legs_size(); i++) - me->book_raw_fill(acc, SecurityKey(sec->spread().legs(i).security().id()), - 0.0, 0.0, side); - } - else - me->book_raw_fill(acc, skey, last_size, last_price, side); -} - -} -} diff --git a/src/server/sparkd/position/PositionServiceCore.h b/src/server/sparkd/position/PositionServiceCore.h deleted file mode 100644 index b6e2482f7..000000000 --- a/src/server/sparkd/position/PositionServiceCore.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/utils/bts_no_copy.h" -#include "lib/domain_model/Security.pb.h" - -#include - -namespace bts -{ -namespace securities { class ISecurityDB; } -namespace position -{ -struct Position; -class IPositionObserver; -class PositionServiceCore -{ - BTS_NO_COPY(PositionServiceCore); -public: - PositionServiceCore(securities::ISecurityDB&, IPositionObserver* obs = nullptr); - ~PositionServiceCore(); - - bool query_position(const orderman::AccountName&, SecurityKey, Position&); - void query_all_positions(const orderman::AccountName&, std::vector&); - -private: - void consume_raw_fill(const std::string& account, uint32_t security_key, - double last_size, double last_price, api::Side side); - -private: - struct PImpl; - std::unique_ptr me; - securities::ISecurityDB& _db; -}; -} -} diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index 62c93aec6..51d1f5086 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -1,11 +1,6 @@ #include "catch/catch.hpp" -#include "../MarginServiceCore.h" -#include "../PositionServiceCore.h" #include "../Position.h" -#include "../MarginResult.h" -#include "../IMarginObserver.h" - #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/config/config.h" @@ -26,14 +21,14 @@ namespace position class PositionTests { public: - static bool query_margin_webapi(MarginServiceCore& svc, const std::vector& pos, MarginResult& res) - { - return svc.query_margin_webapi(pos, res); - } - static void set_verbose_debugging(MarginServiceCore& svc, bool verb) - { - return svc.set_verbose_debugging(verb); - } + // static bool query_margin_webapi(MarginServiceCore& svc, const std::vector& pos, MarginResult& res) + // { + // return svc.query_margin_webapi(pos, res); + // } + // static void set_verbose_debugging(MarginServiceCore& svc, bool verb) + // { + // return svc.set_verbose_debugging(verb); + // } }; From 9883553fb524bee43971de748aae70a005bb4c13 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 14 Jun 2019 11:21:09 -0400 Subject: [PATCH 026/210] MarginService --- .vscode/launch.json | 2 +- src/lib/api/services/MarginService.proto | 2 +- src/lib/api/services/PositionService.proto | 1 + src/lib/config/defaults/toggles.conf | 6 ++ src/lib/config/protos/toggles.proto | 4 ++ src/server/sparkd/cmds/Run.cpp | 6 +- src/server/sparkd/cmds/Span.cpp | 5 +- src/server/sparkd/position/AccountInfo.cpp | 27 ++++++++ src/server/sparkd/position/AccountInfo.h | 20 ++++++ .../sparkd/position/MarginServiceCore.cpp | 20 ++++-- .../sparkd/position/MarginServiceCore.h | 12 ++-- .../sparkd/position/MarginServiceServer.cpp | 66 ++++++++++++------- .../sparkd/position/MarginServiceServer.h | 8 +-- .../sparkd/position/PositionAggregator.cpp | 15 +++-- .../sparkd/position/PositionAggregator.h | 8 ++- .../sparkd/position/PositionServiceServer.cpp | 11 ++-- .../sparkd/position/PositionServiceServer.h | 3 +- 17 files changed, 154 insertions(+), 62 deletions(-) create mode 100644 src/server/sparkd/position/AccountInfo.cpp create mode 100644 src/server/sparkd/position/AccountInfo.h diff --git a/.vscode/launch.json b/.vscode/launch.json index 8ddf7d5a1..fac8a7668 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "launch", "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ - "span" + "run" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index cb63f8d48..eec52bbb8 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -7,7 +7,7 @@ import "lib/api/apicore.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } - int32 id = 1 [(bts.api.key)=true]; + int32 account_id = 5 [(bts.api.key)=true]; string account = 10; ResultStatus status = 12; string portfolio_id = 15; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index fa14b930c..671654eaf 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -8,6 +8,7 @@ import "lib/domain_model/Security.proto"; message PositionUnit{ int32 record_id = 1 [(bts.api.key)=true]; string account = 10; + uint32 account_id = 15; uint32 security_id = 20; double sod_long_pos = 30; double sod_long_avg_price = 40; diff --git a/src/lib/config/defaults/toggles.conf b/src/lib/config/defaults/toggles.conf index 939c2e230..eb250ba1e 100644 --- a/src/lib/config/defaults/toggles.conf +++ b/src/lib/config/defaults/toggles.conf @@ -8,4 +8,10 @@ OrdersSoftCleanup { value { enabled: true } +} + +SpanMargin { + value { + enabled: true + } } \ No newline at end of file diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 1c53353c4..812e868be 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -49,4 +49,8 @@ message EnsureOnScreenWithWorkAreaRect { // and the new ensure_onscreen code has only been tested with a single monitor arrangement. // Should verify that the code works with every monitor arrangement before enabling by default. optional bool enabled = 1 [default = false]; +} + +message SpanMargin { + optional bool enabled = 1 [default = false]; } \ No newline at end of file diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 3c9b1ec1c..76ae2a7e7 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -29,6 +29,7 @@ #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" #include "server/sparkd/md/run_md.h" #include "server/sparkd/position/PositionServiceServer.h" +#include "server/sparkd/position/MarginServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" @@ -84,11 +85,10 @@ int Run::execute(std::vector const &) { md::auxiliary::MarketDataAuxiliaryServiceServer md_aux_server(sc); //orderman::AlgoServiceServer algo_server(sc); bts::api::orderman::algo::AlgoDefinitionServiceServer algo_definition_server(sc); - - - + position::PositionServiceServer position_service(sc); + position::MarginServiceServer margin_service(sc, mdclient); metrics::ShellLatencyServer shell_latency_service( sc, stats, utils::Dispatcher::background()); diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index 51f65b5ee..ee9efd1a9 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -37,10 +37,11 @@ int Span::execute(const std::vector&) auto& disp = utils::Dispatcher::create_new("SPAN"); MarginServiceCore core(disp); - auto acct = orderman::to("ACC A"); + auto name = orderman::to("ACC A"); + AccountInfo acct(name); Position p; p.security_desc = "ESU9"; - p.account = acct; + p.account = name; p.position = Quantity(rand() % 100); p.side = api::SIDE_BUY; std::vector pos; diff --git a/src/server/sparkd/position/AccountInfo.cpp b/src/server/sparkd/position/AccountInfo.cpp new file mode 100644 index 000000000..b3ff450e0 --- /dev/null +++ b/src/server/sparkd/position/AccountInfo.cpp @@ -0,0 +1,27 @@ +#include "AccountInfo.h" + +#include + +namespace bts { +namespace position { + +AccountInfo::AccountInfo(uint32_t accid, orderman::AccountName accname) : account_id(accid), account_name(accname) +{ +} + +AccountInfo::AccountInfo(orderman::AccountName accname) : account_id(UINT32_MAX), account_name(accname) +{ +} + + +bool AccountInfo::operator<(const AccountInfo &o) const +{ + return this->account_id < o.account_id && this->account_name < o.account_name; +} + +bool AccountInfo::operator==(const AccountInfo &o) const +{ + return this->account_id == o.account_id && this->account_name == o.account_name; +} + +}} \ No newline at end of file diff --git a/src/server/sparkd/position/AccountInfo.h b/src/server/sparkd/position/AccountInfo.h new file mode 100644 index 000000000..67634d69f --- /dev/null +++ b/src/server/sparkd/position/AccountInfo.h @@ -0,0 +1,20 @@ +#pragma once + +#include "lib/orderman/orderman_utils/orderman_common.h" + +namespace bts { +namespace position { + +struct AccountInfo +{ + AccountInfo(uint32_t, orderman::AccountName); + AccountInfo(orderman::AccountName); + + uint32_t account_id; + orderman::AccountName account_name; + + bool operator<(const AccountInfo &o) const; + bool operator==(const AccountInfo &o) const; +}; + +}} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 49647f877..fba759b68 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,6 +1,7 @@ #include "MarginServiceCore.h" #include "Position.h" +#include "AccountInfo.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" @@ -27,7 +28,8 @@ namespace bts namespace position { -using MarginMap = boost::container::flat_map; +using MarginMap = boost::container::flat_map; + struct MarginServiceCore::PImpl { utils::Dispatcher& dispatcher; @@ -307,9 +309,11 @@ struct MarginServiceCore::PImpl } }; - bool compute_margin(const std::string& account_name, const std::string& portfolid_id, + bool compute_margin(const AccountInfo& acct, const std::string& portfolid_id, const std::vector& pos, std::function cb) { + auto account_name = orderman::to_str(acct.account_name); + auto account_id = acct.account_id; pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); @@ -340,6 +344,7 @@ struct MarginServiceCore::PImpl MarginResult margin; margin.set_status(MarginResult::Error); margin.set_account(account_name); + margin.set_account_id(account_id); CurlMsg reply2; bool done = false; try { @@ -376,7 +381,7 @@ MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(dis MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, +bool MarginServiceCore::compute_margin(const AccountInfo& acct, const std::vector& pos, std::function cb) { auto now = bts::datetime::now(); @@ -398,13 +403,14 @@ bool MarginServiceCore::compute_margin(const orderman::AccountName& acct, const } } -bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, + +bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std::vector& pos, std::function cb) { utils::Uuid guid; try { - return me->compute_margin(orderman::to_str(acct), guid.to_text_string(), pos, + return me->compute_margin(acct, guid.to_text_string(), pos, [=] (const MarginResult& m) { me->last_results.insert_or_assign(acct, m); @@ -431,7 +437,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 AccountInfo& acct, MarginResult& result) { auto it = me->last_valid_results.find(acct); if(it != me->last_valid_results.end()) @@ -442,7 +448,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 AccountInfo& 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 7964b5f55..d7b3c32d5 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -14,6 +14,8 @@ namespace securities { class ISecurityDB; } namespace position { class IMarginObserver; +struct AccountInfo; + class MarginServiceCore { BTS_NO_COPY(MarginServiceCore); @@ -21,17 +23,17 @@ public: MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - bool compute_margin(const orderman::AccountName&, const std::vector&, - std::function); + bool compute_margin(const AccountInfo&, const std::vector&, + std::function); void set_verbose_debugging(bool); private: friend class PositionTests; - 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 AccountInfo&, api::position::MarginResult&); + bool get_last_result(const AccountInfo&, api::position::MarginResult&); //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 AccountInfo&, const std::vector&, std::function); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index e4a6c61b6..1afc98bba 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -3,6 +3,8 @@ #include "PositionAggregator.h" #include "Position.h" +#include "lib/config/config.h" +#include "lib/config/protos/toggles.pb.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" @@ -25,19 +27,31 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: : bts::api::position::MarginServiceBase (context), _publisher(make_margin_data_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), + _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)) { LOG(Gen, Info, "MarginServiceServer: service started"); + publish_all(); + _timer.start(); +} - utils::DispatcherTimer web_api_timer(_dispatcher, 30000, [this]() +void MarginServiceServer::publish_all() +{ + if(config::get().enabled()) { - std::map> posmap; + PositionAggregator::PositionMap posmap; _position->query_accounts_and_positions(posmap); for(const auto& i : posmap) - _margin->compute_margin(i.first, i.second, [this](const MarginResult& m) { publish_margin(m); } ); - }); - web_api_timer.start(); + { + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i.first.account_name) ); + _margin->compute_margin(i.first, i.second, + [this, i](const MarginResult& m) + { + publish_margin(m); + }); + } + } } MarginServiceServer::~MarginServiceServer() {} @@ -45,27 +59,35 @@ MarginServiceServer::~MarginServiceServer() {} void MarginServiceServer::get_margin(const api::position::MarginRequest& request, const api::Response& reply) { - orderman::AccountName acct; - orderman::str_to(request.account(), &acct); - std::vector pos; - _position->query_all_positions(acct, pos); - - _margin->compute_margin(acct, pos, - [=](const MarginResult& m) - { - reply(m); - }); + if(!config::get().enabled()) + { + MarginResult res; + res.set_account(request.account()); + reply(res); + } + else + { + orderman::AccountName acct; + orderman::str_to(request.account(), &acct); + std::vector pos; + _position->query_all_positions(acct, pos); + + AccountInfo info(acct); + _margin->compute_margin(info, pos, + [=](const MarginResult& m) + { + reply(m); + }); + } } -void MarginServiceServer::publish_margin(const api::position::MarginResult&) +void MarginServiceServer::publish_margin(const api::position::MarginResult& account_result) { - // // TODO, need to delete all state - // std::vector entitlements; - // AdminServiceUtils::get_md_entitlement_report(_state,entitlements); - // for (const auto& e : entitlements) - // _md_entit_publisher.add_or_update(e); - // _md_entit_publisher.flush(); + //account_result here is keyed on account_id, which is included for streaming margin computations but not + //on-demand computations + _publisher.add_or_update(account_result); + _publisher.flush(); } }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 2ab269a7d..d645e17c4 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -27,16 +27,16 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; - + private: - void query_accounts_and_positions(std::map>& result); - void query_all_positions(const orderman::AccountName& account, std::vector&); void publish_margin(const api::position::MarginResult&); + void publish_all(); private: MarginServiceBase::Margin_dataStatefulPublisher _publisher; utils::Dispatcher& _dispatcher; + utils::DispatcherTimer _timer; std::unique_ptr _position; - std::unique_ptr _margin; + std::unique_ptr _margin; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index b0c9cc68d..1c2857209 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -29,7 +29,7 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: rxcpp::operators::subscribe( [this](auto const& update) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); for (const auto& o : update.removed()) { const auto& it = _position_map.find(o->record_id()); @@ -46,32 +46,33 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: _position_map[o->record_id()] = *o; orderman::AccountName acct; orderman::str_to(o->account(), &acct); - _accounts.insert(acct); + _accounts.insert( AccountInfo{o->account_id(), acct}); } }); } PositionAggregator::~PositionAggregator() {} -void PositionAggregator::query_accounts_and_positions(std::map> & result) +void PositionAggregator::query_accounts_and_positions(PositionMap& result) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); for(const auto& i : _accounts) { std::vector pos; - query_all_positions(i, pos); + query_all_positions(i.account_name, pos); result[i] = pos; } } void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) { - std::lock_guard l(_lock); + std::scoped_lock l(_lock); result.reserve(_position_map.size()); + auto the_account = orderman::to_str(account); for(auto& entry : _position_map) { const PositionUnit& unit = entry.second; - if(unit.account() != orderman::to_str(account)) + if(unit.account() != the_account) continue; auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); if(sec && sec->has_glbx() && sec->has_future()) diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 9701ccb44..c493470a9 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -1,5 +1,6 @@ #pragma once +#include "AccountInfo.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/md/SecurityOracle.h" #include "lib/api/services/PositionService.pb.h" @@ -19,14 +20,15 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - void query_accounts_and_positions(std::map>& result); + typedef std::map< AccountInfo, std::vector > PositionMap; + void query_accounts_and_positions(PositionMap& result); void query_all_positions(const orderman::AccountName& account, std::vector&); private: api::position::PositionService _position_service; std::map _position_map; - std::set _accounts; + std::set _accounts; md::SecurityOracle _oracle; - std::mutex _lock; + std::recursive_mutex _lock; }; }} diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 6f4bfa843..a5c7b63d9 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -105,8 +105,7 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - std::string fill_account=_fill_account(f); - PositionUnit& pu=_get_or_add(fill_account,f.security_key()); + PositionUnit& pu=_get_or_add(f); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -147,14 +146,16 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, - uint32_t seckey){ +PositionUnit& PositionServiceServer::_get_or_add (const Fill& f) { + const std::string& acct = _fill_account(f); + uint32_t seckey = f.security_key(); auto &pu = me->state[acct][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); pu.set_account(acct); - pu.set_security_id(seckey); + pu.set_security_id(seckey); + pu.set_account_id(f.internal_account_id()); } return pu; } diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index cd983e8c6..ec669eca8 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -28,8 +28,7 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { _on_fill(const bts::api::orderman::Fill &fill, bool is_add); // given an account and key, finds (or adds if absent) // the PositionUnit entry - bts::api::position::PositionUnit &_get_or_add(const std::string &acct, - uint32_t sec_id); + bts::api::position::PositionUnit &_get_or_add(const bts::api::orderman::Fill&); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, From 419833d398c4aae0eafdd72f6b7356177cd19892 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 14 Jun 2019 18:10:41 -0400 Subject: [PATCH 027/210] slight timing issue with span --- src/lib/api/services/MarginService.proto | 3 +- src/lib/api/services/PositionService.proto | 1 - src/server/sparkd/cmds/Span.cpp | 18 ++--- src/server/sparkd/position/AccountInfo.cpp | 27 ------- src/server/sparkd/position/AccountInfo.h | 20 ----- .../sparkd/position/MarginServiceCore.cpp | 42 +++------- .../sparkd/position/MarginServiceCore.h | 10 +-- .../sparkd/position/MarginServiceServer.cpp | 33 ++++---- .../sparkd/position/MarginServiceServer.h | 2 + .../sparkd/position/PositionAggregator.cpp | 79 +++++++++++-------- .../sparkd/position/PositionAggregator.h | 11 +-- .../sparkd/position/PositionServiceServer.cpp | 11 ++- .../sparkd/position/PositionServiceServer.h | 3 +- 13 files changed, 103 insertions(+), 157 deletions(-) delete mode 100644 src/server/sparkd/position/AccountInfo.cpp delete mode 100644 src/server/sparkd/position/AccountInfo.h diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index eec52bbb8..02ac20f04 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -7,8 +7,7 @@ import "lib/api/apicore.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } - int32 account_id = 5 [(bts.api.key)=true]; - string account = 10; + string account = 10 [(bts.api.key)=true]; ResultStatus status = 12; string portfolio_id = 15; string settle_indicator = 20; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index 671654eaf..fa14b930c 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -8,7 +8,6 @@ import "lib/domain_model/Security.proto"; message PositionUnit{ int32 record_id = 1 [(bts.api.key)=true]; string account = 10; - uint32 account_id = 15; uint32 security_id = 20; double sod_long_pos = 30; double sod_long_avg_price = 40; diff --git a/src/server/sparkd/cmds/Span.cpp b/src/server/sparkd/cmds/Span.cpp index ee9efd1a9..3fce29a98 100644 --- a/src/server/sparkd/cmds/Span.cpp +++ b/src/server/sparkd/cmds/Span.cpp @@ -29,19 +29,14 @@ namespace cmd { int Span::execute(const std::vector&) { - srand (time(NULL)); - std::condition_variable cv; - std::mutex cv_m; - std::unique_lock lk(cv_m); - - auto& disp = utils::Dispatcher::create_new("SPAN"); + srand(time(NULL)); + auto& disp = utils::Dispatcher::current(); MarginServiceCore core(disp); - auto name = orderman::to("ACC A"); - AccountInfo acct(name); + auto acct = orderman::to("ACC A"); Position p; p.security_desc = "ESU9"; - p.account = name; + p.account = acct; p.position = Quantity(rand() % 100); p.side = api::SIDE_BUY; std::vector pos; @@ -51,17 +46,16 @@ int Span::execute(const std::vector&) pos.push_back(p); //core.set_verbose_debugging(true); - core.compute_margin(acct, pos, [&cv](const api::position::MarginResult& m) + core.compute_margin(acct, pos, [](const api::position::MarginResult& m) { std::string str; google::protobuf::TextFormat::PrintToString(m, &str); std::cout << std::endl << str << std::endl << std::endl; - cv.notify_all(); }); std::cout << "Waiting for margin results, press any key to exit" << std::endl; - cv.wait(lk); + disp.run(); return 0; } diff --git a/src/server/sparkd/position/AccountInfo.cpp b/src/server/sparkd/position/AccountInfo.cpp deleted file mode 100644 index b3ff450e0..000000000 --- a/src/server/sparkd/position/AccountInfo.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "AccountInfo.h" - -#include - -namespace bts { -namespace position { - -AccountInfo::AccountInfo(uint32_t accid, orderman::AccountName accname) : account_id(accid), account_name(accname) -{ -} - -AccountInfo::AccountInfo(orderman::AccountName accname) : account_id(UINT32_MAX), account_name(accname) -{ -} - - -bool AccountInfo::operator<(const AccountInfo &o) const -{ - return this->account_id < o.account_id && this->account_name < o.account_name; -} - -bool AccountInfo::operator==(const AccountInfo &o) const -{ - return this->account_id == o.account_id && this->account_name == o.account_name; -} - -}} \ No newline at end of file diff --git a/src/server/sparkd/position/AccountInfo.h b/src/server/sparkd/position/AccountInfo.h deleted file mode 100644 index 67634d69f..000000000 --- a/src/server/sparkd/position/AccountInfo.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "lib/orderman/orderman_utils/orderman_common.h" - -namespace bts { -namespace position { - -struct AccountInfo -{ - AccountInfo(uint32_t, orderman::AccountName); - AccountInfo(orderman::AccountName); - - uint32_t account_id; - orderman::AccountName account_name; - - bool operator<(const AccountInfo &o) const; - bool operator==(const AccountInfo &o) const; -}; - -}} diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index fba759b68..0abf89902 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -1,7 +1,6 @@ #include "MarginServiceCore.h" #include "Position.h" -#include "AccountInfo.h" #include "lib/config/config.h" #include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" @@ -28,7 +27,7 @@ namespace bts namespace position { -using MarginMap = boost::container::flat_map; +using MarginMap = boost::container::flat_map; struct MarginServiceCore::PImpl { @@ -37,7 +36,6 @@ struct MarginServiceCore::PImpl std::string url_base, core_user, core_password, post_margin_path, get_margin_path; bool verbose; int throttle; - bts::datetime::PTime last_call; PImpl(utils::Dispatcher& disp) : dispatcher(disp), last_results(), last_valid_results(), //api_bts_span BT5Margin! @@ -45,8 +43,7 @@ struct MarginServiceCore::PImpl post_margin_path("margins/?complete=true"), get_margin_path("margins/"), verbose(false), - throttle(30000), - last_call() + throttle(30000) { auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) @@ -309,11 +306,10 @@ struct MarginServiceCore::PImpl } }; - bool compute_margin(const AccountInfo& acct, const std::string& portfolid_id, + bool compute_margin(const orderman::AccountName& acct, const std::string& portfolid_id, const std::vector& pos, std::function cb) { - auto account_name = orderman::to_str(acct.account_name); - auto account_id = acct.account_id; + 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); @@ -344,7 +340,6 @@ struct MarginServiceCore::PImpl MarginResult margin; margin.set_status(MarginResult::Error); margin.set_account(account_name); - margin.set_account_id(account_id); CurlMsg reply2; bool done = false; try { @@ -381,30 +376,16 @@ MarginServiceCore::MarginServiceCore(utils::Dispatcher& disp) : me(new PImpl(dis MarginServiceCore::~MarginServiceCore() {} -bool MarginServiceCore::compute_margin(const AccountInfo& acct, const std::vector& pos, +void MarginServiceCore::compute_margin(const orderman::AccountName& acct, const std::vector& pos, std::function cb) { - auto now = bts::datetime::now(); - auto diff = bts::datetime::ptime_diff_in_ms(me->last_call, now); - if(me->last_call.is_not_a_date_time() || diff > me->throttle) + me->dispatcher.post([=] () { - me->last_call = now; - return query_margin_webapi(acct, pos, cb); - } - else - { - MarginResult result; - if(get_last_valid_result(acct, result)) - { - result.set_status(MarginResult::CachedValid); - cb(result); - } - return true; //no error, just returning cached - } + query_margin_webapi(acct, pos, cb); + }, me->throttle); } - -bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std::vector& pos, +bool MarginServiceCore::query_margin_webapi(const orderman::AccountName& acct, const std::vector& pos, std::function cb) { utils::Uuid guid; @@ -431,13 +412,12 @@ bool MarginServiceCore::query_margin_webapi(const AccountInfo& acct, const std:: } } - void MarginServiceCore::set_verbose_debugging(bool verb) { me->verbose = verb; } -bool MarginServiceCore::get_last_valid_result(const AccountInfo& acct, MarginResult& result) +bool MarginServiceCore::get_last_valid_result(const orderman::AccountName& acct, MarginResult& result) { auto it = me->last_valid_results.find(acct); if(it != me->last_valid_results.end()) @@ -448,7 +428,7 @@ bool MarginServiceCore::get_last_valid_result(const AccountInfo& acct, MarginRes return false; } -bool MarginServiceCore::get_last_result(const AccountInfo& acct, MarginResult& result) +bool MarginServiceCore::get_last_result(const orderman::AccountName& 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 d7b3c32d5..55da6185b 100644 --- a/src/server/sparkd/position/MarginServiceCore.h +++ b/src/server/sparkd/position/MarginServiceCore.h @@ -14,7 +14,6 @@ namespace securities { class ISecurityDB; } namespace position { class IMarginObserver; -struct AccountInfo; class MarginServiceCore { @@ -23,17 +22,18 @@ public: MarginServiceCore(utils::Dispatcher&); ~MarginServiceCore(); - bool compute_margin(const AccountInfo&, const std::vector&, + void compute_margin(const orderman::AccountName&, 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&); + private: friend class PositionTests; - bool get_last_valid_result(const AccountInfo&, api::position::MarginResult&); - bool get_last_result(const AccountInfo&, api::position::MarginResult&); //This is a blocking call to a WebAPI. Very Slow. - bool query_margin_webapi(const AccountInfo&, const std::vector&, + bool query_margin_webapi(const orderman::AccountName&, const std::vector&, std::function); private: diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 1afc98bba..b8c1fb0a3 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -29,7 +29,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), - _margin(new MarginServiceCore(_dispatcher)) + _margin(new MarginServiceCore(_dispatcher)), + _latest_position(0) { LOG(Gen, Info, "MarginServiceServer: service started"); publish_all(); @@ -40,17 +41,21 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - PositionAggregator::PositionMap posmap; - _position->query_accounts_and_positions(posmap); - for(const auto& i : posmap) + auto accts = _position->get_accounts(); + for(const auto& i : accts) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i.first.account_name) ); - _margin->compute_margin(i.first, i.second, - [this, i](const MarginResult& m) - { - publish_margin(m); - }); + datetime::LLDateTime since = _latest_position; + std::vector pos; + if(_position->query_positions(i, pos, &since)) + { + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); + _margin->compute_margin(i, pos, [this](const MarginResult& m) + { + publish_margin(m); + }); + } } + _latest_position = datetime::ll_now(); } } @@ -70,11 +75,9 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request orderman::AccountName acct; orderman::str_to(request.account(), &acct); std::vector pos; - _position->query_all_positions(acct, pos); - - AccountInfo info(acct); - _margin->compute_margin(info, pos, - [=](const MarginResult& m) + _position->query_positions(acct, pos); + + _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); }); diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index d645e17c4..0647f512a 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -7,6 +7,7 @@ #include "lib/api/services/PositionService.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" +#include "lib/utils/datetime.h" #include #include #include @@ -38,5 +39,6 @@ private: utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; + datetime::LLDateTime _latest_position; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 1c2857209..82b8ca683 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -22,8 +22,9 @@ namespace position { PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) : _position_service(std::move(pos)), _position_map(), + _accounts(), _oracle(mdclient), - _lock() + _lock() { _position_service.subscribe_position_data() | rxcpp::operators::subscribe( @@ -40,52 +41,66 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: { const auto& o = ch.current(); _position_map[o->record_id()] = *o; + _accounts[o->account()] = bts::datetime::ll_now(); } for (const auto& o : update.added()) { _position_map[o->record_id()] = *o; - orderman::AccountName acct; - orderman::str_to(o->account(), &acct); - _accounts.insert( AccountInfo{o->account_id(), acct}); + _accounts[o->account()] = bts::datetime::ll_now(); } }); } PositionAggregator::~PositionAggregator() {} -void PositionAggregator::query_accounts_and_positions(PositionMap& result) +std::vector PositionAggregator::get_accounts() { - std::scoped_lock l(_lock); + std::vector vec; for(const auto& i : _accounts) - { - std::vector pos; - query_all_positions(i.account_name, pos); - result[i] = pos; - } + vec.push_back(orderman::to(i.first)); + return vec; } -void PositionAggregator::query_all_positions(const orderman::AccountName& account, std::vector& result) +void eraseSubStr(std::string & mainStr, const std::string & toErase) { - std::scoped_lock l(_lock); - result.reserve(_position_map.size()); - auto the_account = orderman::to_str(account); - for(auto& entry : _position_map) - { - const PositionUnit& unit = entry.second; - if(unit.account() != the_account) - continue; - auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); - if(sec && sec->has_glbx() && sec->has_future()) - { - Position pos; - pos.account = account; - pos.security_desc = securities::descriptor(*sec); - int32_t totalpos = unit.sod_long_pos() + unit.day_long_pos() - unit.sod_short_pos() - unit.day_short_pos(); - pos.position = Quantity(abs(totalpos)); - pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); - result.push_back(pos); - } - } + size_t pos = mainStr.find(toErase); + if (pos != std::string::npos) + mainStr.erase(pos, toErase.length()); +} + +bool PositionAggregator::query_positions(const orderman::AccountName& account, std::vector& result, + datetime::LLDateTime* since) +{ + std::string acc = orderman::to_trim_str(account); + auto last_update = _accounts[acc]; + if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) + { + std::scoped_lock l(_lock); + result.reserve(_position_map.size()); + auto the_account = orderman::to_trim_str(account); + for(auto& entry : _position_map) + { + const PositionUnit& unit = entry.second; + if(unit.account() != the_account) + continue; + auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); + if(sec && sec->has_glbx() && sec->has_future()) + { + Position pos; + 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(); + pos.position = Quantity(abs(totalpos)); + pos.side = (totalpos < 0.0 ? api::SIDE_SELL : api::SIDE_BUY); + result.push_back(pos); + } + } + if(since) + *since = _accounts[acc]; + return true; + } + return false; } }} diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index c493470a9..7571d2cc0 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -1,11 +1,12 @@ #pragma once -#include "AccountInfo.h" #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/md/SecurityOracle.h" #include "lib/api/services/PositionService.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" +#include "lib/utils/datetime.h" + #include #include #include @@ -20,14 +21,14 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - typedef std::map< AccountInfo, std::vector > PositionMap; - void query_accounts_and_positions(PositionMap& result); - void query_all_positions(const orderman::AccountName& account, std::vector&); + std::vector get_accounts(); + bool query_positions(const orderman::AccountName& account, std::vector& result, + datetime::LLDateTime* since = nullptr); private: api::position::PositionService _position_service; std::map _position_map; - std::set _accounts; + std::map _accounts; md::SecurityOracle _oracle; std::recursive_mutex _lock; }; diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index a5c7b63d9..6f4bfa843 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -105,7 +105,8 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, bool is_add){ - PositionUnit& pu=_get_or_add(f); + std::string fill_account=_fill_account(f); + PositionUnit& pu=_get_or_add(fill_account,f.security_key()); double avg_price, tot_qty; if(f.fill_kind()==bts::api::orderman::Fill::FILL_KIND_SOD){ if(f.side()==api::Side::SIDE_BUY){ @@ -146,16 +147,14 @@ const PositionUnit& PositionServiceServer::_on_fill (const Fill& f, return pu; } -PositionUnit& PositionServiceServer::_get_or_add (const Fill& f) { - const std::string& acct = _fill_account(f); - uint32_t seckey = f.security_key(); +PositionUnit& PositionServiceServer::_get_or_add (const std::string& acct, + uint32_t seckey){ auto &pu = me->state[acct][seckey]; if (pu.record_id() == 0) { // new PU pu.set_record_id(++me->id); pu.set_account(acct); - pu.set_security_id(seckey); - pu.set_account_id(f.internal_account_id()); + pu.set_security_id(seckey); } return pu; } diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index ec669eca8..cd983e8c6 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -28,7 +28,8 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { _on_fill(const bts::api::orderman::Fill &fill, bool is_add); // given an account and key, finds (or adds if absent) // the PositionUnit entry - bts::api::position::PositionUnit &_get_or_add(const bts::api::orderman::Fill&); + bts::api::position::PositionUnit &_get_or_add(const std::string &acct, + uint32_t sec_id); static void _avg_price_qty(double base_p, double base_q, double fill_p, double fill_q, bool is_add, const std::string &fill_id, double &avg_price, From d7d319f1e3fbb6f28215f1421d705992b19cac29 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 10:43:27 -0400 Subject: [PATCH 028/210] fixed span timing --- .../sparkd/position/MarginServiceCore.cpp | 4 +-- .../sparkd/position/MarginServiceServer.cpp | 27 ++++++++++++------- .../sparkd/position/MarginServiceServer.h | 3 ++- .../sparkd/position/PositionAggregator.cpp | 3 +-- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 0abf89902..3e221b9e5 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -313,12 +313,12 @@ struct MarginServiceCore::PImpl pugi::xml_document doc; pugi::xml_node trades_node; create_margin_request(portfolid_id, doc, trades_node); - std::string request = "\nFirm Id, Acct Id, Exchange, Ticker Symbol, Net Positions\n"; + std::string request = "\nFirm Id, Acct Id, Ticker Symbol, Net Positions\n"; size_t count = 0; for(const auto& i : pos) { int p = i.position.value() * (i.side == api::SIDE_SELL ? -1 : 1); - request += fmt::format("BTS, {}, {}, {}, {}, {}", account_name, "CME", i.security_desc, p, "\n"); + request += fmt::format("BTS, {}, {}, {}, {}", account_name, i.security_desc, p, "\n"); count++; } if(count > 0) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index b8c1fb0a3..2ed1644b0 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -30,7 +30,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), - _latest_position(0) + _last_update(), + _lock() { LOG(Gen, Info, "MarginServiceServer: service started"); publish_all(); @@ -41,21 +42,29 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - auto accts = _position->get_accounts(); + auto accts = _position->get_accounts(); for(const auto& i : accts) - { - datetime::LLDateTime since = _latest_position; + { + datetime::LLDateTime since = 0; + { + std::scoped_lock l(_lock); + auto it = _last_update.find(i); + if(it != _last_update.end()) + since = it->second; + } std::vector pos; - if(_position->query_positions(i, pos, &since)) + orderman::AccountName acct = i; + if(_position->query_positions(acct, pos, &since)) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); - _margin->compute_margin(i, pos, [this](const MarginResult& m) + _margin->compute_margin(i, pos, [this, since, acct](const MarginResult& m) { publish_margin(m); - }); - } + std::scoped_lock l(_lock); + _last_update[acct] = since; + }); + } } - _latest_position = datetime::ll_now(); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 0647f512a..c63a121ec 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -39,6 +39,7 @@ private: utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; - datetime::LLDateTime _latest_position; + std::map _last_update; + std::recursive_mutex _lock; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 82b8ca683..066e4e753 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -76,7 +76,6 @@ bool PositionAggregator::query_positions(const orderman::AccountName& account, s if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) { std::scoped_lock l(_lock); - result.reserve(_position_map.size()); auto the_account = orderman::to_trim_str(account); for(auto& entry : _position_map) { @@ -97,7 +96,7 @@ bool PositionAggregator::query_positions(const orderman::AccountName& account, s } } if(since) - *since = _accounts[acc]; + *since = last_update; return true; } return false; From f3294701653fbf24ca0f1a80efc8ed1daba63063 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 16:49:21 -0400 Subject: [PATCH 029/210] added spreadsheet to help test span --- .../spark_excel/margin_data_example.xlsm | Bin 0 -> 16839 bytes .../rtd/formatting/JsonFormatter.cs | 4 +- src/lib/api/apicore.proto | 5 +- src/lib/api/services/MarginService.proto | 29 +++- .../sparkd/position/MarginServiceServer.cpp | 150 +++++++++++++++--- .../sparkd/position/MarginServiceServer.h | 24 ++- .../sparkd/position/PositionAggregator.cpp | 17 +- .../sparkd/position/PositionAggregator.h | 3 +- 8 files changed, 186 insertions(+), 46 deletions(-) create mode 100644 src/client/spark_excel/margin_data_example.xlsm diff --git a/src/client/spark_excel/margin_data_example.xlsm b/src/client/spark_excel/margin_data_example.xlsm new file mode 100644 index 0000000000000000000000000000000000000000..0decb97da7ba9119dc4c2799b50c3a1ac7aca6a9 GIT binary patch literal 16839 zcmeHuW1A)0vUS;Z7rSiRwr$&1muauO4%eHN+i*N0H?z#J%-sir5;NJX@nd@0= zjP>N4BW6U#jF6KA20;M;1AqVk0Kf-;(fP4Z1_%If4h8^#3;+S7DQIisWNhQ4tK@EH z?5IuSW^MH~4+MxT2LR~v_y2eNFCKw0<#Cx^I)qNbYq+>7G8aJeAUQ=iYHaiZV>~?z zSuDk&My?;Loo_NT{s2kA;Sy~ruk5#PW5d}YtYw3!l2S$iRsAj4p+FsQgU{~7-n<)0 zs(Cpu8@|xElr7fczscSh^%h z(MLc-N>FY1?W^Ww^UM*^e5g80j$-pYo%8S;z^N|Eh5iYJxO3Ajt(>>n*pGdZqr+fQ zGIA1-SwCi(Mw!+_U}vpYQVyDrxahG}FlE=bcQKCCEI>IO&H}==b>9d2#n`FWkuczc zBcKg~$D^sOyXFIG$32qvorf!0K`bgb(qVOTHiz@+!JIJ?EE;kEM(k`G7s zQTarCj}L*s{t||((+`J}yqX&q2j)t6*aoyReXV5tHH-!xixzGb*(&fk1_Y+&C_|Xh z*!rsL8&iK9Bl>33315nh*An-+gS&9$ zsJZ5QEFi!=z)N|axqj6)F-hCH(H?jiq{u|_Wg&Bpy6g*@K$lFe7JnBQ6%RnY&6q{} z`9fd_oJF#tC42YL$YxI<88#)hb<4FG?#Op~>PM4pR`S#_!L?HqxGin;q~9|DucZ6= z;D5K04{vu2=1;W<~oCLvgirur#o>wfw^u{?ljxKON%dZ~u26?TON| zpP~uA6nhP!aQ*Jp{WR5zlN#$HNaxL$+-j|crD~6HwrL1;!ch_^IY1n*Tjq^dRC72Q zQyTfOHJl^e&xRWYQ9d}g#Dz$k9uk3t7^ljjOspZ+4=6^3erS42N|tmOQ%uJ!tTmuO z0CjoFNiL2qM;=}SHkt;bUC0$elhQE5nG}!_DZ+T%%G|$GU{WuGyuCpFVhhL2`Js(f zH)f`m>s{9Uj0@c|M0Fd$tAS$8RCy50fYp6{FR3ogo-;y!UTk|r)>Q}{M6-GIwdmj<2qNa!puhx zf)Kq*u%PRZT2A4)e*BkF{B!Oq%q@Rj#5wg`VhHI)o0w zYxv~LWi}fvX64!WMymlGgqh^?<^F_0jiG3(6sMpkR}x5SVY@9R#;n6bR@?Sg-lkwr zV7&S|;_(X%Vm->DdhX=AQSTHgGDvw1;;1^g8CHlp@3;5$QrGwUGRGZOuQTjTy2yxA%DSPCY98fJ1+tE@%^O%8ghw-3AK)&*2gyZI7OEK($R z5s^eZ%yrOKo%xmSQ6|JV?MLy(;ukA2dWL?{Lc-#BC@O7uAM7W^CU*0Hb%Q~Z#2i?< z_4m%DgElM8>cFreX$Btz0z^&~qVlC1Ps0AbWNYs!C$EP6x~`T^TPL>Hn+PP(2ClSb z(R>{pa`tXswym!VwUawD0YMldh%KqN*Y|ffmkYd~Gxhg5d@(4rPW%k7i?IF(vHzSyCo^Mf zW7)Ht1Kv8@Jp^=ooua18?nHh!UDuAC+AH*bTF-9e4z_1qPLxc!?JU=#f37zj(0zz{I z35fRXSIe|3zlHYm;LWm`dAJ6@Nn+u~Lk$^@xk;^TWQbj^EWBK552RBNA@W!AB&Ro@ z2T2g8CxzeXV~mb+;nR;vH-}dHt0F250^tF!hbk|W&YKYTGCjye5`OjYV94d+7nGh^ z9SMEJXdjd~0n85bBazNP1>?+GU=o-xPJwg^RbK_>G4y64f=>*=NQNR=(V2g3A6b}( z+K@u0Z!oad*WP@caX$9Hb{fAz=^-=KI9=3Kb#ZtG>z-q%Ts(F5XvoL{)Y}A?uAmbB ze*Z2~kuXi=d$!APZqp!N(e?!Nc2At9nJH5=En!?E1Ut;LkaC4JZ{p=K-h&l8z?yt@ zKjG4}>U0HWbUjY&`5{rJ?s^S|!hk88GPRQX<}JY;BE_~!9b^mOng6{Poh&q%tCcAN zGG@M1E#k_H<{4m$FBml{?mMZGzgOrEO|*!=!8m{|l2&SsV5b)5OndAdsI=1R3tdkv zBJ{VaET4~)Uy64pzY=ysCZqA*onDWoulw+*sZFyUmwnXMpW^ z6O$6!ccS(oD4K%8`ME$IXF=g?Rj`{FH^bRSxvKJAlL6~wue%!I1RDG>gFM92-vfAL zGsU5ifVC66rBHKYiwJNyFi`2o(eqRrY>O})YUof0Qf7pf7AT2k}lzIfkipv8r=LcV?rU{T71V zDkcUoCJ~5-bdY+@kwuQ36o7j} z4J_C};rxP|E=r?7#zCF$j_jx-ba7?Q+ApsVj5EbXWxyM&2q7Q&&_WS#Y0oNn$N2;} zM7i#jf;6;VgznGDWGAEn5}K73hNP=Qx)!$ClOatjUxGzi|Oi_V_v}&0? z!KtzACQD`r%xt>%gQ=q_5Y}uhgui0~n?u|iK~lhNE)50-TkC7JdH{$jo;)g?KnCBY z&Mi|M-;V;|FeIAocC%nfb4#wf_mM0XtY>Tk%8-7Gn3(gcR@{kbEcP#i%6b#^U-F%$ zx5~#BstSbon-=v|W(6|SG{-|t!t?s5Rn^m%GDds$S}f>NHIX^6K;974S|EqK$1x{3 zQ{!qH+wSEL&~}3&oZ?`vQww-zzR|uEn`9&ojKmXYz+=HYpSgw4L#=6iKf|))j7SJS zJE2@M-ta)CHAZZ|LXzW5i>9I>A&r=pU$tajz{I_=pLrm$Qwkm;1FVu_DZM< zgndy=ST_3An_eMB&kAW__o9E^Sx~JAj)XrCmz)a=%a{}l5W!4J`Jn+k_DvotQ7OMp zyrvVd=c-B^(8Wnxk_36DEUyllaK+_;nYz&PM<_<%E+LZvqrGp>8;25qHhq%au0Dmo zx8EtdwKd~D+9A_%c!~j-=@7l7Kt{4=W}Z5UW;3~13(P^qSKK2NiZ=O+*V5F)uCL1B z`mel-!k46Wpfx-TxL4aQYI+5Xh3EFU0&vP?kR_YwQ*5a#fYU&#?R2pGpssTVU0*|< zyT;ii`wEydh~@!dV{@wUO5_k~;f;R^ZIbs}9B&wl*Cxh>75g_c)ELAJe8W}b>1N?eAk~hUTUfiI0mK3PbvMfh_aobSy7=TiCM+Wu-zRoirJ^Pfk12*7kG!a z^ih13_O_MFI)~5eyArfAA;Vir!2?x%upZxF+>#Ic@Xo z_^&Lw#^f`qcb=k}+k-LV!@V70OwNXCLrc!anYpdy1ac_BgtM=P*oK{nsJtfE(_VIW zaGorw^u*G1Jw+6LxgofzT)ulv*yA%5U7s%M?@lb*h2)prr+bV23`8*g3Pc>ujE$Wf zY5%-1{Nc$W#ID()>-nx%7|c|9v#EON$j`L zNFNNlyc4M5ei(OcwTqPW z=?PWy97;p1Ye7_D(#?=A`4y%>Wybjls6ubD#~SMzY0!($g6kJFz6zzbSz@RuYxE$^ zPx!);h6bpBecxnly#*dGwzLyzJ+H(fXTrf}X`SC*5@ctz=&YpXXfYRm)c2&F@4g6t zZl4~>9iku#L@wf|WuEMpLMR!2=5FT{84YGNFCH@0It+{;pkywINTvf>a-5R;3d(T*Y57F<*!<=+Dnvh z+;Xe{CO#*#a7CeAQDI80shR|Nks8{-;@rq?glVg3PsFVmd#?RcMMb+o6C2et*j#m?ENC+v)c{ zTePhm=&3(L&sa2buVzax zKBj11OJ8kv`&!4`F%<`tFG?T%R+8j?YGd)(eE_xE0HyKZYs+u6bJ6rru2Aa7Pw&k* zkp~c2kXpJWRW2;lp_TGjj-+ww&jd~YwyALv?|}*OIYwhT;0|vyeQ{L54|YT->Ub^O z`3%|rZc0;88#EiA@!%xR|7c2o28D_0mX13tC~q5S@8B^n#F@uC=m*S@nFv6ss*UUC zF3(|zA|SGn11tVSADybT^kPr!b?PvOM`Eq2tvt1tAFoRK5zT)nSr*`aE7J60tnp2oD%Td(h+Mo8~Mfj zaBKiZlD*t{SInOCd4i$S!K^DU-%C!Ztz+8xqENr-qr%p%f1|-gdTbs7j1m?&BZS(G zaoNDE=o@Hu-q+3>N#ZcM@;Vyzy5T5@ z6i03Cn}G&@=Q5#PQRb)cku|h!SmY^L7O}P zuyGU;vYB6I8I*U=dS;li1G^`utY)(i*iN4Z%zIqUDWexZT(|+rtH0?ZM~YVPNO}oE zlM76JzWw~Xwi;@R4A#-3>2!Czx##8Iv4|67V;u?ytzdi0-X90O>=%voV_ZplCjjKN z>Wo{>ghUA4>uS=~R?u~7#bU{Nox!)Vc_=jgtqU@iDF%xrA^0kd>5L`v#|DKtSYA8t z6W8Nn$($~wIYj!_+LTo)&T6%LiY4}R+z^Q_+lfscP&Rs!Q!A=4%u<>s(%BAGzOIS9 zGFUL?C?C=U!#Gpu0EI?|Xs1wcXx_V**aqrSQ*6wUuNo?y$1i9=6#znbUs(DGJ^8HX z=MESDq=Q~OvqJyak`sSHJw|>^|Gi}GJUXFli+1;57h6F3(<&a%F2KC)RVbIYGISv} zE`Dlt;UVX};0;XDt|}I~hPKVi25PLY4%!YdW*kyHL5HWfe#jkGU46-@;)HQ~1e@H0 zK_kndV>QEfKr!Ejb+6>Z$HIn<_7hC5vE$HVeX)<=_wWkoWrTHD%t_+mhzc}!JcP0a zwf2Nl74SHF1|1QJbJ^mA(H^S^Z#pVMXtng^yKTyA$b2(t!WBQRkHy`Y`sukM5|d5T zk&sQc<>FEYVkWwZ^xn>L( z$5Pe+jw(yC3QyBx?MYX*{@AdN=ocrMzDTtu@0UTFUZB>z{0?hgC^dj6A;E|kl`x-} zKpekk6lTU>oBFd%t1F~C*hpWe%SY29#-KbaVq2b`izb+Kpjr_|Hey?yo{KgZy`{RE zwi{#)g1I_EKpQ3|eA}L$i##~fz)b^YGJM;ezI`|-NRF{ciEtrO2jvXOQ^`L@@=6@? zB5`XL$y3FDQqs;O&tZp9Bol|60zJVG&`IUlow+5ERlYX43mY@6XY4uvEaOL{3$b7* zuNJm2<>rg~9g7{4R#0k7HmCBNpggi^F&d|^K3$87yaB5F0G35P)>k~xN~3dE z_Fi$J?i0#diCcPQRk!$@Xf@7Rd-$U}Vu?_=q84%14n#xnbQ98pu=$RCPDBmmbz@2gq0Yu6eP4<)TKa$TY*7&N_V6tJbUkZyw5DHkaIndK^<|{!86tiP+%^}u71>TKmXf?uhvcE{K_`By1ucEv?exH>l_AbaIrAia-Qs#Und;#`jIlz1J;AnN)SVaOGJzP?dglM+c0J__-61{ zfLP`hEB=#<_*DXb3OHW0rn8E-Cr1R%+dh9df^ONuv{m5Femw{c=EJ|3Do}2H3v#B@PtclbrE}-Nno1sLglJ(`fr$_>D{^k z>{yUGn%WC+RLy6qLWiutk(n;8$dApT+7qE%ID#93=5x8;fHg96xt{98`=?xMuf;=E zvpcTD;B2@9lP81&Lz<~Y8@_Go7+t)(i;37zRS3n*xmRdsuh!tSGW6}7(^v?()cAL= zK^?V{x&sd%;Qz@dnu6W23jC2A;R66b{JebTxm*nN4kzPO5idim#$WQ>F@##^##<9fig_a-EK!P9vB%zJ@JTA>R5We+n3_CZd?S{0fg@+n znrFS;^m%vxxW&zUaz9QVil$}z=`e;m)+Pu$ z2T2XW6YZ-{ulwywm7fk;A8ijd)v(C+;Id8q)Yv$eStJ$c@u1Ve)u`pjBJEp{0X}}F zq>Ta3!Tz55GE1ZwgV)Twr->Dwtm+TjnU2^}1T-0$Hzw84|{X?m6&mCQQGWL#E(a)6REUL*RMK z&i5)mSwr8Jk6AVW!)~Rw>_O<0mxyf+Ut&H~IoLS>Nk8LmVm@j+@@i}~z;X~WEABOA zf0y3EZ;rsYIe=y$-+fJTK-FNiz_j4%fm8u}K;*P^nt8h6L43bX!8rj~`ZjcPY)RxG z9|0`@uLA^iLD|qwfm;Ev0Hynmch7ep`da#0`gw10Y<<&%=Gzvu1NY_EgMa{D^*!%~ z`wFxM00S(q2Z8}=(2Ze7hyXt52SNvU24Vx`0@&u4?x*Ri>BrrzqlXs@lIV^W`3Pl* zr}@PLE7AlNltS+_bEXIZ2Gg#7j$ar&SB{Ana`lE{7Q{7Uku4GBXL7cY7g5#q%e1TG zCOUb*=TriRjb}5MOrHdHwOCsQGM(Vpk?Mdbt#>}>RZu=?gm?2(r_W+{9l&rPJ!E(Wru)$lJOTo)mZRt-I;?lpT1!RSWzy&&Fu96ppvr{nGrx`_w3{!(RNVZ zwTVkW1>ow+Vg-*z(}m6FMq4th2tYZ?1i_tl5B=B2GLEpE{qs%by?e%=ZtT_`a(vF| zF@qLM^N!4PnZ;K!B-rJk9God&MMT(w@o~RAn+3cQG)wyJC}{6{j;eTK>K9^rN#^rQ zl5F$8`NI5+EeYaTx?*HPd?nP4iY6hw4< z=a4Pr(+)0A*z0zZrvdhx1a{BoGk(wTX@f)p*4m2UY_`4lv~XGPD*g*HNa#A~%JCd$ z&59@@8CJ|!WfzRb(=1(G-EO*K>Y?tn2>z6hWWisVsUp2kusIR+dTO`^5@`sIy%oW} z$aT_ivr%DUrnXlM@*|pY50rC%B9&jP%Mp0{QlDTvIS-`s?{b*O z)KQ6ylIf>aK4XB&@wi+jl)^7-RT@7{#(KC)t11wwx%vfC&2fVy+lf=jES4>pgFWy0 zq6I1uX(YHW*=|XYu7|sY{DW}PJvA3XMEL4CN?Fdj9V{KGc(@QE%=?syU0$?1r<(IN z3ODmkTO}{eT^i@;rJI&s9o1Sie#{-U7THg}$7^!t)%eLNvFF}L1%V~CtqRJYx;48E zBA;5dDhh-u( zT$*eRxDc_z+TH4y_3V?DJmPN?BCw-7!vKfQU2TtLqJu;&X{l@S`wb1JhxN!1^=qcT z`H*q2<&tGRgqhW|a^*-1F;1A#G}|~MpJgUdt9NW>?KJ6B^b+oKj?_~F`3W^b4%e7OhY{}RZDu2 zov@9=I!!9g)WDEdCdGxdV4{gwKbN?0?W6>C`~8WFsR`9(Ds-Th*}o8+m8mw1wd)j9 zZi)QC=3BYyvSnUlLhpKIyoQZxN{_c(VcduNDEJ`RmGAYv-wkkEZ&pL>q>D370S`sa zwKs%P;d9P2?$PUZv`$VfILwC+MQR}KtES(4sybP}3!x}ek+`9uHC0%QNp}HLuxpFH zsb=(@>8GI2&_u2^BX1!>wL%A|UK})pj0;J;knP8eN0_A=!fa}2(^n^FmxnT~I6G^o z)BPCi2(_=xGyD-UkL#9KWW3t|utt0sv?&vGeT~F<<8FXrmqy$v3bAKrQbZJ&J?|6-{4|&2|;&4rD((xmFj2}$896+7T%|2s?U~kYmWh$}AV2S&Ya|L8 zd(B=vn$*VR3!9o0nf&;?+l5BbndeT-S3lc5pqEs**d+^Q2_#J!v~_T9UMmQxE7u_9 zjUQ#6y(TBIFvc~Z5Wgu@mcs&h;`o3?;?@*|w$CzZg zu{6_?#wc48PuVz|IZf@eNIxASaK+c%EA`kTa1FabZW(S6-X~C%92TxL6r*vFTqbmg zvyAvDOcN0;&8fdMMh_Jg*UgMb~AY zAY9>L67V8hgSPwK>j0r1%k<3I9+No`tMW+-NE%=8Fg1;5VDUpS^vANRpGMF*?3dej zRaUmTI;OKOGgxU+sKl7Gz;~!Xo-OFh^1Dn%$PB`OJ5%lV-OycO#L3N|i~LO0QV7tm z?bfIsJWrHlNh3TgGM${YHZfdN@ehtm&Puy??YNxp7T8s)f}1M45Lu_X;Pq1xSQ4ac z-baS$-s{aBI~g==g8QV9d7~==?LL${A(WzyF5+ET^4pn!9GBTi}DA)wh+3A zYt0;TV6FGAUkB)4^T1dG>mac2c9NaB$|{+IXrO9O{cNV!4wc|#_Ua(r=cMluL{C=Z zst{~E$YT)qs3OOaY8WQv(~5365r#ueRKguP@u{FrZ+%hgJ?G-Y(43rGHi zVbfe9@@&_~9o-%zuj&LiYwH=uJO3p}))$ixdwtjo!T3r58R-g-|7|3hg|(h^eS*eJ zj#FkAXgC1eSuMm8ACFB(PUb4(sT3F}w29x$553b#_M|7~R=b&cpV)kuLOf` zpGTUuSQBCuUNO3yj;LM?!K3L67{_Fu$9KAu(E3~)-V;Xtd};B3=kD>lD9`VD3%PaE zpqR{0Rk2C>8Puw%Ebzqu9RL>sIU~)=74A3ShF7P{&8+OiJmhTJqmiYBsqMZ-GV@P+5Zx>h=SQcOw zXcjQpnLFbPW^>m^?&^o*_VWa|Dqiz9W9dHoa6gfas>N5cr|Fr)6`Qt;<4$E>uaDS0 zc;VRp*pGJvgdk-W2o@=V1^Ln}Y-nvW4?9+8UxDX`bD95#@3&;w&HBhb4 z1C_+8y5o?;)@(_KEnPX4TIiNA`J&r3r{?GEXf(I{^s2+(s_pmySvy?^T`;hMiut;M zj9I6FSa97o?{D!9CUJZPIc6OJSBmW%-Lkyejf);7BKUH-l%A9LD_6Ex^lNLAbp%W> z?e{4)dwN{@VOE&Frq03|0wZQ)`K9Eo2{|XAqAJu6F@C$(h}lh7v;y-z1~q8k)yu6-+Bg9YX{N>>hx?F-jbeFl}{&^E;5eZyu)#Q6W^JS7^+yLUnMA; zpFBI!Dul7sQQOV3Q0>r(y07wa=B>w$SVfLwLpvh1o#sx1jk+P*vLl++#~3c_~Tp5-^5pW(#+OOJ$DbdA`9> zl;!k%;_0U+$naFUn11IG4_YbMv)5te!Ns&=7V~v+H+n^TJSv6c<*gQ|C?i^yEX7B9M##Z-qNMm+(bAC}9ulVS!{Jq_!dT9HO?ZjF1vHLxnjf0dB z_*%}BmBm?N-W2XNAW7S;Tfsvt(`O5DqayX1#jH7CnKB;TMvO-!y$LuyLH5gJ9cj{K zKS>fOZ(H~MGbl9aD4lTmHTeX(i>(3jEzhZ9l7A8{mApkM&CRmPQ{pe$Gk)|le!Mfc z+}f%Nj7u1(lo_zzGgB{7smU6G%$@X-TsKapG-+&@xB|&Yvh#O_!Uk0 zi+6IH7?T5%7k`VNq0E+&(@k^YvOt~ruj`nZHFF>%b9ymE@l=y6iu zAys@~BziP>#E4hgSSPAL-Mm*bmPD2?3w_+>J2(c@MYrCs@hEp4M0I&%JD#+?{ni_Y zbq1GQ+GBkyI($#6u9}8$aq!Mb!|-5PSsNG8I+r@8U0rQuWggt2l@0G37d!|U zXpqv?{?hk;6EbPA5fE^)Q3(%^()U!Wi%@Tr{vSw)(L#)uPEXI#;3fwpO018yb0 zq)#MWkJ5LLxC=(3XQ%A*G|xe;YQy2zI&hDJW|N0Vs@!0nX^JIZ)+BfR&WD63?#SyX zD4$RhHj&ijhC4)i)kRDiZu>)=@pLsyxNob}g2CSln<6Dk`0+C}XFZb<5j(>oI)NyN9rHyUEvZ7?FbRI|XN-IMULoza*DCP%urc;FTNgJ)G}|6G zt-3t6r%Gc z&JuM2$bb`8SPMBi`j?>_Q5PjYRCz!HIW}HQzer6RMjwsIS4@{Sjj}ar8#AUGFhCzw zQA=e(MM1&pC-r>bs}32O$&aof1MP-Ks5QLW7RxA-#o)_X5mof z#Kh#T!cj?HbNk(PUX^3U$GgXQf4|kS#dIMxvi}3}GoAMLO(?cAbG-J?z1*D7jVRcE zB-|XG+^viq|JWX^SGKlXr9*hf zM{FJmKeu(ecb-1H1YFd_DM1YcVQ$b~*Qf#J_tRAgfl&oD$xe}iIy5MM1MJ64BFZ2) z5?5;Qw)t0xge5{M;de{~{yQ)2CK6 zbgIRX;+beb8ad;i4$oX8!qpG}jiAMSjO<`BwH*pCJ<-7bL2WXe5y)=T`{oeJRmSeSNo| z$!g|{hH{VXkMbZH@jU;yiuk|)46Y6{P%+Y?jLlZSUn;ozm!tee-Nh|u+OuqkNan&Z zhwyMdp$9eK)r?Rt6wc|_`=_v^ zB^!MJt#3qkzSWcTqNLi?VDk9&@TWzG&rL_IQ4Kt;6b|T9XpYFKFxsS@L7YK@qz-h_ zx-%XuSm*!v!a>U?$}g$l=&`6h*qqWeADFdNT*sIM2*4GkRTXk=x~O4a)@)c9@kuu*ti;<%1?cg2*x^ zl70GqCoIb>PpdlUyFEQ2n`1w7wpoLd8c76IQ)oYSiJ<#G0(G^b={Z z75z(gr2eKMh)w}w3ENO2q1YEkQ@1e)>c>zda7SHbN@V<46&`7#{R@e*u-?PKabdT) z2?slsHOf7j*cC~9AzF*uEgfrpfE%_UtM4M#mEof; zQ16fXEoabgSN56ju3q3e3R$AyRQG}*A-iKNg$9qGHvacTz!*)|@bz!IIL`I}YIZMDkG-q>vOkLlNQ<2Nf`*u00v> zUZuYSHF3q-%7hMdqiMgIrW%?Ta^L63*OSH-;hf?A+h+7X6q!zFI!Rut6Z zrc;IzOcNLJqt&U+iD@lQ|MXZ{&KH~hdB~=|D-bCYCO(jUMCp?0&L5Ydl|A`kN*mqXH5!5A5zThQ$jBJef;E;)MM zzKu=HfJG46gl$FcEgm7J6V8&sEIlrafT+mnJ6n8I%_a8imlGMqE^r%UFJ>C`uX^M* z(TUvB$%!(ZS__M1ylXZVJ-`I4+pX}S-#{T%eYS@8clG&`W1@VEed64HwJ*PYI)%S0 zWs>i;KH^g;Ou&CA1p?5>*6?$4#?Fye-_Gt2rF{00{9j4@rv+ss$jW~9NDW+4UgHpK zmdv76s3aK%J`uu|H!479L@}CEX>s1b$hT#ClZHtsqS36G9B^~LaW&5G+nm;+A+=&a z(P!=v1n3za_x?bLIc>YuB@krDW#R!N>&KPTI;q36NHYKq!`2%_1ca7HW`-u8UZ`ef z(`T<%7^r9Nw_X`mQ=aIRuD8{MATo7-SL}`cnkbjWdg*5%rd5BpKE<#S4WGU6671K| zYJquKj?Yv0er^?xK{;aMiq;-)C{Mo*b*AZ1zt|GLt5Q*ZZ8zT2%7DxNbC+*D;5fOF zi6&Qtnp&e8MKSn-w#u5M7Cm5U8zqnVXBuDR{BrP*DzAXVJ4dN1HDCmapTYV|DTbHL zF6iGju$tMJT>yb0po>B+MRBiW8<@g)@UvpVJc9jPyVadNXX!UN&1uIwlfh=LOP+=4 zH^KA3(RHqC)Q7MH?UtU7@v!C)t`4Y%UTF^E&ke%im$(Uix!;EXe$&k{VDz4cf$l+tKHrc_4> zRy@o`I0oRHM2@RRs#KkGa2vbb)4r@PUg2?bssp{{8sd0bcvfN^1_#S^RU@XlQ_voD zfnG*TF~gP?bWJ2>qxv(lfc(n<-uS8MV|wa3A1>o-OzPmCiNxS8;57&tgXcAKINs+t z{(b$FW8m-P{ghtZr>FgF1Nd`)+ty0o$=u3V$k@)<#>m*l(EK04cX{%7bRHi{&||_F zC&B{+guhh(#??nY)*&DixhAqOaKBX7TO#*t*mKKSR9Ml(+eHahORd|BBZr0RGJJ?5 z`pHB84D+(}dj%yz`f_1r`BE$IUj4_vo|(v zmz3ku#lAR9!mY5&iIMAttbvm5i>qVvokD$|&d9YBQ&IAM8max!-9EY`7AoCb(rGh$ zh7plSE}Si{wd+xcJWka4lrCxGDcFY1icQ52d#qLT=-p8hR`|ds$FuVai*~ZJnQHU{ z=N62?h+n^2oV13_zpLvp^&$nYP886iXVH1;eycP8x;JKz{^N#Hpz1yscexVN_j_a| z#79BWIk%*x#{(6yld(}@}tcC zk)UOCrvVsw2BCr8@Aw1~mS}_hi-{7oDoz!llgFiQL(GL4IE1YVJB$+Kj`N8NXKHnZ z;^dvCX-y$Fj)tDMGS%FR=0|sPO8LrvCVEzYPdP{Tb{2=LYY8 zTKPY(|DoMmPV(Og{=IwjpTIw^d!NC;zx0y+4*d6qx_<>ieb#{d&+T=;^Zece^%qn2 zr#1c75%oLx_vV|wz=qI&f`4zt`JLeR!sovT$dLZ~-~Uzy{X5I=g}HyROng?o{MR%5 zE6bl{y1%phUOD;~izDiPWcjm>^mmruYi<5w3Bmr8<=-oBeuw{_Irt0yMEfWFuROx< z(BI$2{(^2Y`~&*?yV>syzrV5k#qh@XC&RzJzx;6u-lNcL9G9m~#GO*#8HIASVg>nWXun{|_Eu=F{Xhx&Qd|{{Y()), _publisher(make_margin_data_stateful_publisher()), + _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), _timer(_dispatcher, 60000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), + //state below + _lock(), _last_update(), - _lock() + _admin_data() { LOG(Gen, Info, "MarginServiceServer: service started"); + + _admin_data = *_admin_service.get_admin_data(api::VoidMessage()).value(); + _admin_service.subscribe_admin_data() | + rxcpp::operators::subscribe( + [this](auto const &update) + { + std::scoped_lock l(_lock); + bts_assert(update.all().size() == 1); + _admin_data = *update.all()[0]; + }); + publish_all(); _timer.start(); } @@ -42,25 +60,24 @@ void MarginServiceServer::publish_all() { if(config::get().enabled()) { - auto accts = _position->get_accounts(); + std::scoped_lock l(_lock); + auto accts = AdminServiceUtils::accounts(_admin_data, false); for(const auto& i : accts) { datetime::LLDateTime since = 0; - { - std::scoped_lock l(_lock); - auto it = _last_update.find(i); - if(it != _last_update.end()) - since = it->second; - } - std::vector pos; - orderman::AccountName acct = i; + std::string acct = i->name(); + auto it = _last_update.find(acct); + if(it != _last_update.end()) + since = it->second; + std::vector pos; if(_position->query_positions(acct, pos, &since)) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", orderman::to_str(i) ); - _margin->compute_margin(i, pos, [this, since, acct](const MarginResult& m) + LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); + auto aname = orderman::to(acct); + _margin->compute_margin(aname, pos, [this, since, acct](const MarginResult& m) { - publish_margin(m); - std::scoped_lock l(_lock); + std::scoped_lock l(_lock); + publish_margin(m); _last_update[acct] = since; }); } @@ -84,8 +101,7 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request orderman::AccountName acct; orderman::str_to(request.account(), &acct); std::vector pos; - _position->query_positions(acct, pos); - + _position->query_positions(request.account(), pos); _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); @@ -94,12 +110,104 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request } -void MarginServiceServer::publish_margin(const api::position::MarginResult& account_result) +void MarginServiceServer::publish_margin(const api::position::MarginResult& result) { - //account_result here is keyed on account_id, which is included for streaming margin computations but not - //on-demand computations - _publisher.add_or_update(account_result); + std::scoped_lock l(_lock); + _publisher.add_or_update(result); _publisher.flush(); + + publish_excess_liquidity_report(result); } + +void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result) +{ + std::scoped_lock l(_lock); + ExcessLiquidityReport report; + report.set_account(result.account()); + report.mutable_margin_result()->CopyFrom(result); + auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); + double netliq = 0.0; + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + netliq = report.leverage_factor() * report.cash_balance(); + } + netliq -= result.maint_margin(); + report.set_excess_liquidity(netliq); + _report_publisher.add_or_update(report); + _report_publisher.flush(); +} + +void MarginServiceServer::update_report(const std::string& account) +{ + MarginResult res; + auto acct = orderman::to(account); + if(_margin->get_last_valid_result(acct, res)) + publish_excess_liquidity_report(res); +} + +void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_leverage_factor_percentage(request.leverage_factor()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + update_report(request.account()); + }); + } +} + +void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_cash_balance(request.cash_balance()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + update_report(request.account()); + }); + } +} + }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index c63a121ec..3fb3e06ad 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -1,11 +1,12 @@ #pragma once #include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/api/services/MarginService.server.pb.h" #include "lib/md/SecurityOracle.h" +#include "lib/persistence/IStore.h" #include "lib/api/public/ServiceContext.h" -#include "lib/api/services/PositionService.pb.h" -#include "lib/api/services/PositionService.client.pb.h" +#include "lib/api/services/MarginService.server.pb.h" +#include "lib/api/services/AdminService.pb.h" +#include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/bts_no_copy.h" #include "lib/utils/datetime.h" #include @@ -28,18 +29,33 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; + + void set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; + + void set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; private: void publish_margin(const api::position::MarginResult&); + void publish_excess_liquidity_report(const api::position::MarginResult&); + void update_report(const std::string&); void publish_all(); private: + api::admin::AdminService _admin_service; MarginServiceBase::Margin_dataStatefulPublisher _publisher; + MarginServiceBase::Excess_liquidity_reportStatefulPublisher _report_publisher; utils::Dispatcher& _dispatcher; utils::DispatcherTimer _timer; std::unique_ptr _position; std::unique_ptr _margin; - std::map _last_update; + +private: + //state std::recursive_mutex _lock; + std::map _last_update; + bts::api::admin::AdminData _admin_data; + }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 066e4e753..74f0131e5 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -53,13 +53,6 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: PositionAggregator::~PositionAggregator() {} -std::vector PositionAggregator::get_accounts() -{ - std::vector vec; - for(const auto& i : _accounts) - vec.push_back(orderman::to(i.first)); - return vec; -} void eraseSubStr(std::string & mainStr, const std::string & toErase) { @@ -68,25 +61,23 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) mainStr.erase(pos, toErase.length()); } -bool PositionAggregator::query_positions(const orderman::AccountName& account, std::vector& result, +bool PositionAggregator::query_positions(const std::string& account, std::vector& result, datetime::LLDateTime* since) { - std::string acc = orderman::to_trim_str(account); - auto last_update = _accounts[acc]; + auto last_update = _accounts[account]; if(!since || *since == 0 || bts::datetime::ll_diff_in_us(*since, last_update) > 0) { std::scoped_lock l(_lock); - auto the_account = orderman::to_trim_str(account); for(auto& entry : _position_map) { const PositionUnit& unit = entry.second; - if(unit.account() != the_account) + if(unit.account() != account) continue; auto sec = _oracle.get_security( SecurityKey(unit.security_id()) ); if(sec && sec->has_glbx() && sec->has_future()) { Position pos; - pos.account = account; + pos.account = orderman::to(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/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 7571d2cc0..db9ec5ad5 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -21,8 +21,7 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - std::vector get_accounts(); - bool query_positions(const orderman::AccountName& account, std::vector& result, + bool query_positions(const std::string& account, std::vector& result, datetime::LLDateTime* since = nullptr); private: From e9f61dc3c055644ebc1f71ce6c8c2ba47a02daaf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 17 Jun 2019 18:15:05 -0400 Subject: [PATCH 030/210] added get_excess_liquidity_report rpc for adminui --- .../spark_excel/margin_data_example.xlsm | Bin 16839 -> 17157 bytes src/lib/api/services/MarginService.proto | 1 + .../sparkd/position/MarginServiceServer.cpp | 21 +++++++++++++++--- .../sparkd/position/MarginServiceServer.h | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/client/spark_excel/margin_data_example.xlsm b/src/client/spark_excel/margin_data_example.xlsm index 0decb97da7ba9119dc4c2799b50c3a1ac7aca6a9..58d601e8c01d87018a85563e8e32032eca0a7b4e 100644 GIT binary patch delta 9018 zcmZ8{Wl){L(kAZiPH?y2?k>UI-JRgPxck8+xJ!VO5S)WUaCZ+92<{Tt+`C)#?e6^O z>FMd}sd{Q=o|^6%iGYrZhHeVON1>Z!{j!e;1vN_plE5JbxY+$%oHGnvyw(J;-a@z^ zC`EcW+H(nB`(J1`BC+}d^Z3ptgMSjygfk3Rwtg7v?ag#XGh|)$UPHJRF;whaTclZC zeh+dEa`{xcf*L`(Sx?j<2g7e1(07{jcH@8fy~2shC%j@m2D*J#T(SOr{_jo7=>um# z!g8cKIxE~2kknJ@ycgvTIZx1|Hj3 zm7o;Q5mxP9>oyJG6ehr7qpllL}CC<zfAg020dc__lBSzbEIPH3+*4_@#xU^!_AiI89Uz7+uIupC|C;f zoRM^(zM$|^Z_I`CUUwr?VmSteRmdr;_zUf4D)Skip<3=b*W(D}N3(UmrfXLBwwpen zCs4T~dTCOr+hK)%hS!&H-u=c6rF;?;%_+QYw zvP*#H8?$bm>ym#qD$ab^2>n+wAK~vX;wid7%kL~6OR1J?#U@Nd?qLrCn@NZ|E;m+W zM6ThX%=b)39QhuZXAGZ?WsS#1NoHx0y@mmlh{ZGxIDP2E4OqTM)@Ymd3zFqU(Rv=j zx3GqZ4>Gk~ePT_yk|bec_%FvYX*V?tPYYjtZFj)u<1rU{5c}JEn5dmaR7;$*lCCab zuv7Mr+*WvbFJREW(D>HV*th~kzKre*JsCY#IXDR4=5CjvZlOz^9pi1NTUJt^zl-Y2w73g?Gh}vySqE*U5BVP5)$PWzgh5e zt{c`_5nbxN@Zpl84I(rI%p>%S`kP0noLpPTo_E@=e_T^d6PTb|GSa=t!3kS(p#>M8H?0~NT)8*yFm%qz+)0alfzJAW*iZtitKp|-IXi5dFE@YMB z?BmeW?N?XL+ubNv7^h1Yt4R?&H#xJBc1H#^D6X6)`A&IpSIH7!WsYTJK<2BlJot(N z`qZ^Z1oOcar@oXcSgif04`w&aYAn1W>I0aLe$~LH5>t_U9E`3Yz^T``qGI38PhtIB9q^>zsuX`D=jA<8?2v z*LMp?ErA2u;^ataxz|3R7R~3oCLRJ!W_)bLT)f?a-=C6&&Or#ME^MEqNLJWDraq33iQ_?xb!>(xYiH?2h@JZI!+@<}0evdrZa7CP{|OfdY0?t;dW+$Mv_eWoWH&N$R>G8{|xAZ{m@^sl*M|#@Bd;@sl?bEN-qdC`hD%N6k{{)B~?;^RWUdf zZ}`iJN#^IGW-O?x6pQX6#63~aju{2_S{rX~R2#2!*95;02R}-G#Dv#G*m7oYz1n*y zHbc-qhQ;Z^&wzbNV^>|@SbkobO5Dyc-G&iRc(w%9lpoPgE8Q^pu}<#cT zv6k|%JX#3}_O;_p$MsI`xPTpQ<@ehI6-rD|g7lN7M7gN}HJF#M)4|hhS38wG6q9ccy3;<)5qH4h>wW}!U+?{IQ7qaB zP0 zdh!d!cs7ix8g{&6%F`fIhp&wq)fs3u3Z+WvXJS-j_Vd_HKUYItGr*e*&$8k8>J_{t zT{2&i1$~86CCvmzRU$q$JiGmM7WZrRk-&8zT^`(gIDks>#|4Q|S>w6`?j7x`>*aR1 z6(LnrHU-A^(&Y(SnEZhp{G26z^zCI-;ir~tkB)a(D5&>;LR}da4i5?e3Y0>I0RJ=F zqf`=!+hruT?qI7)V{Sd}z{}TQmJO7r%(&47p#69)_R8 z`hXk;_lJ*%7Arn%hW3C;0R!DdaYC@X;#<{@#B^Bs5u9Njj7#_5H(~Bh-(?nq7B7Xd ztNNbY_qUtrm!gN`$LaBHkpSm6j)gXADK28!VW~BZxZy}dU^Dq%R zF7q!^D8))ux1`e#^_1Ux5VHQXUgIVK^b0p<|; zCd|(L&9YUxG^HXttyw-Ssg(13n&0iO%T1wYJN@jj1qj-t{pg$?fb5ChguDRKL%! zNZc7#zdP;B6PcgC^CZs@aT>f=U4=itQMX|L=3MHq3ot$q9CIdjDs@a_I9Av!SQaRh zbtK=4;zIYDt&LDbeRv+|NeR>@5`9=>G-H@=FxfCgu#D^+#*{mVFcMfu&}R@sbMhvN zHnd|Xp)hm_LWy0Dn044&7}79Rh^;wl6aJ%!JG?vH45Bf-F}gD>V-S(6I42Yu47NFd z*o3xM=wg2dqssZtWxs^-gzi94%)h1a<~ zuDWq_`rMWF`cz<2$ggk7`vk9%pQQR2ql7rjn922j@h zIq~XR(HeN90y3Jr&QE>Upu@i<+@lef91b@Vy%yHF(KKHm7t`l*VcMT<5D!9YyY$A@ zeZ5ffOlWGJq%gpBsnW;FhB6Kd%54SC)bK)e(um&sN8y|O1;?c5;blkaA$`E)^R@fN zeKByxOA@tQTY7A7#w)v4peC%2;_1VTE+;1tO+`WcY#;F|)utRe=V@{fH2yh=#G-;M zSh-A6nSMv|Zz$SWYE6vT$|W}s_G@Q*E6E$1l&i4u9o96Z!oY<9Hgy(j=H!J`y(uGr zn8M0?JtA#YATPz-Kl`A)n+Qz&#i%c$7A2mHp*Os?JrT2w9~gL{!yn+hv~*bl{pObp zVx(r5Ji+K=SPF!HB-!&uPP3Chjpx$4y-HY8tVDjYD9| zZ=5fA+8RKrSm4O>Soa5GrLi+4*av%{xD^f73lqWQ%?RPZ*ODY|XBkLgZy_1D{-DJi znS<-f23L^da-HLV8BXl^z1NIX1fx3kXW zMpA*;U@=uoO$APjYn76V@(%ujR#C#pwiB|b#Ak(Zs1fX17JD_zt8dk|(B8STZDy!jcE)-r+D z-5#Pw@a{hUl`~m33Ghwu@`0WAPM8!=(5b~&Dr^kQyQg66tPv%+z#PfgH@vX-lW6D0 zOEwsxu84S(p)L3p^c4A#JbZrnOJFVt3IDm$AZUyzp`KJx4re*a$8FuWgx1-Eor(LYDVRqE1vwa3{FtT_vZXXVccWyL93nBo@29Jcmj5I5_$$~WKc zM9VFC9r~KUq6m*|O(xzk2dXZ7R%#R0(Ht*4(Oki-<^it7-JT#s@aOzJV(KC0dMjXp z>(!dZm<4%Ro-NGqT3t%@ZCDe5jkFu>&%L|vpJZ`oA^?^a5^mI}6^CE3hdd6>^+^?% zvoJXs!v>;~VKkTWBCukv+9e-SVIJ_7yC7CLbafMxo6)l;`?JCDP6l z0)XlU4(PcH4i{Gk8?>3V{d4^?lfp`W~@ML zp96hm*Qga48a%hJ3(1f??Wm8`dYdeS?FpGhqq2=`^n~q( zn(UtB5uRyAQxsVV#zw~Mo(3wco(W&IfYU+hA3Tn%o}X&Mh;QFBg{v{9?tsPsI~U;j z!l>b{4f=+Z-(aDmiofk0&xxyXwF*JuK~B6gIs%ooP{kPUJ99cc%j4}~E#c25^FU)ZbZ&cSQ> zOM6mLo)(RTY@>ZhYQOf|b}LDK51~I0T@y%}%)+Y_UCF*_+u?~J*HU_TQ$0v#^r5OM z^aDh9EJkY^GhbAMJBuZ$fP!K8R7A{^Cg^1;G54cEI#m7sN_2-_3!w$VwTl<>&G-{+&daFFm!ng?R!_qv z@zJ55!1J&3qd0^c#7xN$+Ar+%TIz;*v})?C7#E}52DPDvlI-j90>Y-(CLR8?94a>& zSyN;l0vX)bX9pZ4;Ax-wV)VDAs=ebJXt;~#!pqss`7Da zWTGGx>oOnGpSfxrdR_-}4njIK(wPIVL_uCWC(9WZTM~I#r&9NkuMC8>`>uQ4p?6pUua)g+8doVGuU(J9t`uSzH`{) ziT8ZSUkEG&dx!C|3Q`2U4MPF`Oh!JcJtphIm0miQ3tk!am%I`i%qZD>GM+ya*$`g$5xxu9?x7yADcp zQO!5w^+`R^&Cctp3(Bn5zT-`w?2wmC^iN{9f8QSujW#3FfydlMj<*LlVDl}rqj%fe z$FQpT%8Jon%84E3P8TX+pDO_2}SSIO&f~yDB*3upBeU+Wf0QUUf@Ys*vXYKhON>% zTb(Af(;hk7^zRU^DsHa`;qzU2AkTA=)c zz}wL83*j5?Z>O8AXK(n&AM5;3xV|-@PNSa-OZunRmoO(4GFaaKWI(z~L(F!l*KA4} zLGs>UF{PQYiuBFbaNJF?Lw@#1a@f-nQBS?VwKVI%^XH!>W};8X3qKo0F$3d?VX$xmIeyb`tq_c{a{=9;LL^WeTuRlEw<7h`8Q`{*^6U2QUR zg3&zG%LT*?{1{IatbmB@3)vdn?{V$BWE?(2gRZ51j9TYQmpc4uM*_|olo-Tx*_@@T z(1zBITS;gBqaY4QEj-n<)-YuS$8*KUdZvUbn(Vzl=@e zt8JD|@R{FjdVd{ZijkXnYm{zX(dy!=68u(IQ)Tz}M!9Z+Q?vIxF?&IR@5?E7cjv^) zLevAUdPQ`5{U>}&X6uXCgDs!QJ{erf*hmINy4d|J`EbjNMcyVDyJ#FQYi0wB7_ki~ zWp3wdV!-9HU^yZmQ?NSdJxOgLRDJP$CJ74Lsnx#J`O1IrP#$j_6HybmG9}};f*nu2 zY?b`H$)-wJ@%(zVyZabh5qak$hlq34EU=#DeS40=(DduiDN5ARQ}fd8t-H~Q1ZhBt!=Jh++_`xOT?#2-~nau|3UVvA} zyN}D`i;dZ}W47D=bpZ#-dUcx|dYxvqrk|$P7nOf>Yd0|UsA{@=JU7W^>s$_h&@JB| z)NbNT#|s8gQSdK(LV3T8_r--npC2aAx*+g+6YF%Bt$(5S`nu!!(mt?lfNR1|te`$V zlPKzTqW>P`;Xf}w&Fb8FHs}Iev}wNIkeQa2fG%-iC}=yMTU(@m$f-2f{;6goZTNGC z(#aPyo-?2EC0qixcfO4eCu_qwOj4cJvKvr zB}{Oq%?qv?SoRfZ`)1Q~wBmUqnvYsdL8b7dHh8duPYjaAmtz)7dhkHp*LJTHUzsJ^ zAj!zhR&}W7<)J9qWJv%b-ExD6{AxlO9_f1@RBt^fmaNDBocb@aKSy;ajK*J?Vmu7n zPaomv(I5onYSj>LDDQ`z$;&d|GJ%;{9`QljmImsh-SYi{a<2hJ+o3lGP-WoVSfAeBFMlCOJ$-h>R|36Vy3)} zd*r;z$#7X3e1PaDA6oHuGsJ(Qm+(ItCT%Y@ge5SXffOf5Cpp;DgW<`>I9ai$83T`w zsctZ&{#5s)BvG!`A3YowKbclfED(YW~ufsHAEz&W(TxyAwIpcNH>} zDOhySnDVgGaHRj>m)lh2>50UD$uaCS^9~gi!gPMxP5R2fpCS#Y-oaBi-WRX4~b z?RVsxSmbBqzKz=|Tp>LKQi7;wp-JP61mo>~GXVK>l=^r-4)?yTvUvBc9l^`*ifQ`4 zk260joUSgnIO)-MQG}z4oKVDllPSNv$s0N~5n!!5Fz&4>I4@9+&^&D_YMPVRPo@p( z^N0cAn?sDBx&AiCt}hzyo1T4cHy$O0do4U`;QdlOvi%3m&rnMBt@wule*|9F`m*6Z zx}S8NiC7i?v3Gzp*`?D14OK6NcV{6xP;Bskh|EUim$~}Ym~^C-xlNdum^hJ^>{Raa z;8$j_o#XIoKw0O|848d8EdpTweQU@2SsGn~O){lZa=E+X-$P{jRnPyyG%<5#C|A7$ zn;ZR))niH&67|G==c9UEokLW_%*G$nUH!#B2D@#g6H}+%I%d10uTSvHI;p2qM_)|M zCUD*vpukrguP}h2`*_G56ciK$8VU;UU+?G4;bm{(X=APB?djlZ=k=c&oVUif+5jh3 z7tIwW%XW(ol_|4WvP(b|?0 zBtK^3$cq`*w41CD^pzuFPbtt_GAzj|wIHy}9PK=~{F#t3gK0HabAqOF34TSX^|FFM z>x5%3rb}GkGCGFUCkeDK?qY;fohIBiKoL<?)QBB<*Rnlpb!8Ff&qn*;Q@Hzv+rCmP*B{cP*7O^8yPDLXDexY z3kTQ#qLQ`lx~7gLyUlV($=b_5T&~Iib3NnLyArn$5^A#%3Ws2!{T(oS@KkBx50% zHws_)4h8XbvfNuq^ca3yb;wP4S_u-yNVDq{FPglVrZ(vg&Ts7bbABvyWq0*fWSj7oY>pZ<})7Jb<-LI@kr>Uu>*VIU+l24^+6!@*8 z=_{*)uS&!ukBuxNLMKlh9k6(71m}q+m|mbTsFhji&$Ag-%B-ARWtv{ggRNX%Nv1rg z;j5a=FrvXBs}rUst)5BCkdAw_PvX~#HV3-rypo}a%W+7f9r+iKnVJ_!lc!GaV4;qV zW$-izaX5@8Q`~gqVmrQ3^>p~jSf^I4W*#g?bV!k%yWR7DjR>i{w%+xTG_fU1Il z&E@iz0NR3&JO0?6hl5?MzqV!_6xmI2gU)#4>Q8WNHLX~M?jLq2X`W7d#n`Rct>}vD2Rq5?cP;2J`=VVTe4*}y?H%^ zBraNBy37I#PNY0^I<6ll45EQBh0Vod87ED%lcvZc0&|CkH^05P$N{3l!3VuaV1T9h zz%cM}x>VBg;1>aIXrNJAJ#TE=?Q4Py6oZFIA3!HSpJUYq9o@lDN~3v6 zQPZnB3j;TzE`j{hK!rLS=*CcSc<-8FhP7kblzdSeX_Ic`5!anI?O_Yd-s(9#F+<))2Hn|H|Lf8YX zZZ8Y99!xKz55|jb#@cE^1WY?Jf2)zrt8c!|k##O-J_QmQ^*ErF{UP!1@OHH6sp$(c zczRF zR<%Y9R_y%$Ox)RJah*UiYij1t{d7ynDtaELh|ZcR<$@iYqu=;)C!Nf`eK8B1)E0PK zFk}3R-EesyhEy3+XR@y|(#YoPu)Q>H(X~cd`9ijWIyQ5%%{6j~Vjl>}?m{j0x z1HGWzcr9-kxqJ5O#A7!gN(5*jzG|T`VrR?+dLNkA4$)|ZF&(9-VCWHveB{bV9~)KN zRVv1-W`MyBXX-0&44LXl=8b6R$Ff>OvDS<9RO0HFX5><0=KP*IE9gw+jGTd_6d$fh z%V7SK0UkOY2|x6s6!Dibl$+@lq>S)cCl#tIJw z;=|LbWpwegoOn#t9<66d9nM&YUdYmxVY0(!0`pBLwtXi~GEySlD!Df8*hap8_hsy+ z72B>{0-(XGqI=N)_dk;%aS^ir)|hbr-S84nP}u*v|7nTjAaV&&m{(4au>>XA|4)_w zlp)E6Kra3t>;D2Bf-RN+ delta 8696 zcmZvCWl)_l*X_aGi(7GbJGi@3w73*^r%)cGxO0HwPH`yE;&O0`Q>?hVyTk4K{kZRU zXKsEZYmzm|OlD`TnY|Mh4l@`E^CK7^buw<1eH9S|njnWr;1UB|?7mKpDFzN6oBZ!y zRx@6a5}xRC4mJsQ`A~AOVbk>*S5CYiqj2Ql)noe?LulVR_3F74?gbkR(D(KgTJ>7R z>d)Su|2_?)L?p?FAkEtDSA@WQb8KI~k$l;E+E

p^gs0xKs?HoKYt$2X29vo!6YN zE>oD66+u$iqGf=v5|*fH%rg0EQJEwr7-Xf~BU*UQ7cg5W9XS;)u=tc&e#GXK&@K^& z|JfWLqkiQxI|c4t^B_!|tkf|L>Q;jHDwR;>$qKW(|GQ3dEK{R;@u0rNE78Z_vO1s6 zZnNiuzS^Gjwu{HoyH6}WkHkH%dPw6Yu{i~06JT9?j~fHkmBCtXxq}-HWfDIwa8C*n zTv)TiD{jsNC`RK;WKb?{CCPdHInw$;tNRfVYekg~VTCsW$ClqVF}5{y^quFvwsRH2 zi62x6tC=Mam8_zOo38;H3&_7w!K#t#Aj`G!I55 zzjUD_@+Oe-L&DE9c#rvGzppaeAr`ia-;3PMm(Q58*db@FFHbtAlP~@7`{qD4l{83i z3O;l$gv}#N^=!qLMgN--fP1{jT4ZXise>3!G9m%sj&qOkM)os*%$Dzz36Cs%{i3jn z|F!*x_E7SIJ#xUq!l{ZdIN0~V2FGmsth+74eOVd$#m=ls>ScJ_;n^u4>W zJGw0(q#_o!cSI44*WuXJn})AQleA5}COQx{ybw8BH*^h~@OjAeTr+w!YRGB_VtqlD zM3@*vwvV+&1+zA!S2tPt-W&l%=JyOMM{j z=8c9!E;usiH;kP;Ta(IaW*Qd5z>*s0lRZ?H$WjM0qN6MzJHQf__nqxCO%fzrNQR&A~QsTjhgUqHt=#sasqHHDW(|=bQbwxnKt;|ij07Lr( zi>ln14NWc)_Hc&&A0N=wV>S%9L^#3;TYmiDfWprp^ZkgCGDc5`-f-g*VG7T&@coEB z5xwEZ)jkv!romIHO*0p3^6nTnKsy9TP(D{gIZaug#tqO7nNW7ME_C0dk;@@xVkU$H z!+7dG`th}-2x!))b&-)ob&pnFAUN&21=p~mWjJ{H-hiMCUOs5DTd=)q6Q;=r5s1eOL6N-Yx$ zk3inXPgwV4^6$v#8}q96h)Q=bB*f)fYGS9;t#SL36zMmvW0bOPR#|&RB}`D~mAg$f zvZ;`QN+EBb4gInk}^2QRR=JNJbFE8 ze^oV%YVSsReWLFrF3oP~`z^N4N}I-8SpsiE>1IN!Ytq>*Hvik_xY5IjYuVl1Iqx}$ zhq-%@?*8kBoz#`wMoO8A^0@(u7)LiD-F-d0jlgL(BdY)G*FmFM4*@gadgiN9MJgi- z*65)EtY~VATA=zapKVE&>~U>w0(b2fZI;w+ha(h;TUM6JYb*n4eSzPR?jjJoo7@bA zS7}}qJ@#ntO0Q$tQ^fBJp@9>-`%6=wbd|^mA={El&e3bVm3tp7IPC?Y!5Lr)v7@YY z)6g+b84KW-^C{fzv!E()t9pI{z9-i49U@6XS_@wfRmfQvpt|=~JcmerL!yi~^wJFs z5Q-sx*^!LKHm#hSa)j>N1?&W%nvGl6AI`$bsXrYRE7Pv3fa=Grh8nGhgqfBU)295b zQFneXyR&>jf}DvO$homkz_E{&=+s7YeI|*_f|`a3lA@Rx8qWcktj))IGJ67Wu{qv8 zcz4Z_#^aG9Gn7VNOSgc$lzb+3%^hiPn(RcYtPqHe{g=hgiQ}VP zzx^ji=h7DQ_z%+w94ni~ny@R8J8m;q4F#SMggky&v z4)y~b^!B^51U*1u^Ktc&0|?#&J$_eDwZSF?y&Tx$%!8 z#y%49$EYZCm{mv}d@!Z*`DhN=Bl6-*XS=_tGns>%?>A_u=POqK0{KJF1A)#U9m1il8w3`jZn6O>MZ z&6Vi~nLbPvJfoxNvQCJ1PswKwIEs82TlmZ%>wE-#3?oD%%%8A&AOK#&$fQ{eiUl9^ zeiG9Yq2$rm_%{}@xx{XjX`IjdqECC4#9!zLhGN+&?Gjb zU6Fz$&5)7dfTf@lDCT?EWe_@?rWrgDf(4Ywl?EGWAQ+w#<`~`?)*GfRI4jsN$S_zG zYGOv22%q9d5POGeNoh#zPa12DkHBo^$TIl>84}*A;bhW z-**D@&<4=ZS1$a5@90I0{H~G3JqzxkJM?2u(t3$V8>WADGl1S9ZVY*m;I+J!P}uV0 zMYUlV9lyM^@A0mvnZ|VG2vV30m5I{(BU!R`Gb1h8j?@T3mC{I_TYDiZquKkUULi#` znt|QG*!`vJ@@+nF!bK7`Us1SkYs#m%n5`tJf$HwXj3Fln4yU3ZezXmJrfyaa-qbSQ z2^i50ATci?`=VSVsZ75i`4WWwJFz@W?C&`bFU~WKks-#LHB}RS&F92Dtl|xy5M&(X z@ZoJA99@o-E;#vb#1C5qT;nuU_#6BFt*&ywZXnW}dQxuet~4H-UxOE=K>xv%^UA^{i|?ezEkf|n4%fX8FWfaocU6l#I`>Y+UFc5+6v zdSI>ODI*G616s{kzL#Nj9IcuF$+M0(QR7jrsi`THvy5#Jx*Q|tiQtU@DoYP122>+f=gFxG zTf8^@9z8&KSGDLmpKsIvpVlgkYfAT@+t-XG74W_*AzrTi_}hB4Tco148i!4!Pb%Gx zB22lRE}hYS!JaQX;6@@|ss@K$N%RZ=U(w@U3_)c=!pO4%4Cf-`Bz_82@E=3n9XwdY zM6hG*dUfc$pNu;vn+sP<)(VeWmCx+F8)vvwoBlp~=(l|QKC|Ci>NfG3Y$#k<7p$Qz zSa1^;hM3y6B&~Vm+w40;i4}p{I4N;m*e`l!XM4 zpb31HA1Gu^K}PDi7*dP*=-uREA%a61)$ZHCXXcjr*FX6R583i+V;^T6l79S?> zz`<5m)MsfqHDtz!V_rA)8DJCw7cl1DM%n%p5Xo1SDU|lH?;wS(3ha&dWlf5#KVO`Z z0eA9f<9`y)ZtVo@qB^L-LdAgZyD85yM)OTlNb);p!+4esKmT+5Z`-L#u#ivcnY$e^ z-zOlA=vU1C;p}YVll2Uzd5{fqfhh)6-e24ql`0~nbJm79KW9?rE((QIZ6_`HdhAFrEip z+yr03we{rwN}TZaA}f27!d-iSBJuSY_E1DMmlQal?5&!!tN_IcCD z^Oh=FS~{^tC0Ij?dBc5L%xw(guWkN?^)Z3mg<mYKkJkGN10D0^k4AYMn4Vn zsr-s^uH(pBnwVY~%y9&SJL}l8g1KF3j4$l6L$GrW8WtAS0^2~O!vME2ON!HoE^C+5 z&&Cn{bM8@#4NO-77qPG*yLi911F^BYQFM%}NCb-%_2HEaY0fG>;-?Q(ej7_j6+Yv)rCo0cn<@ztxI0Jx!n_qfXzLscF%B_ZSME9zIVb+ogp>l_}G zY?{z(8{^ll$Sql%iM6oPq8z;nWQ6zaPWb*}_biO5!(#kuox=6b2_lopw;q4Jw70I? zDTH6`$!hha*L1g#bB|1seon@aDlvcq_bmwnSDJy2&20AN!AA_y6Fjn-ju)wzEbM5o zJICd293g zKq3Hlm!q|4U*6a#P6(}#{t!bbGUc)#ukQe_U(!p4>L`gJ`U~i8!u($2V~&CibjaXT zIH~l?KI$p^_WNwJMuAbfgAI>6XEfdek#lpo+@ou+XncE^rk*Fvv`ave_$+aldJu^O z*~-ut>`&)Xc(~`3k}tz)`~p82R>s+FHG~1RE!d$@Brp942P#UiiH6#F_I(8$Y-E$9 zZ7^Y{r}|-c!j*9|+YX)G5VK;!RQ$u@La={^u|gA0EoB*@hKamc0`;BEA4H*vLjO$8 z!^ocn$reSv$=wXDFhO}``W}*^K3Rfe15DlPzUH#Du1|HXAFq_ z7VyoP;`h~bKuQUZJQ?PvxB%MPbW*L!UlCQ!Xjz9j>Mc|8E%RT>XXp-R%oEk(BD1ZN zREdT^lv_+|7UIcI6vJlNu7taP*J7D*Y|)NZn;p{F;S@()J1#Sl)5h>CtQd(N4s-n} z$xyVHFzh5Vo6b<7W1!iBgI|5~yXrR}^J%8G9uB>55*n_2?T9W5CVde1G_Yqekkf)u z1hh^Ac`sqs-@B5!3ZD-`_kyLNc_1H<5A5~s2AXRZasUb#J%G5Gv>6Eun>ebs5s1-D zcrO%$kJv_;&-3O2!UAEz$_HCQ^I!nX06bshd$e^!XfL!W_zaW)N`PHM04U&Iaec}1 zuXBT*MAsEBUQ%2E&|L&HA*c&67cmzm7afU@5IL#rD#RX}gkJs;fcz)7ZBGnroE3z>K_?V8aK z_VTcrS-5{Tk!&^gxJ9X-YCtRQU&JSQUd1D6_=r<{(KZ`m{~0}HY!NSE1)D+zd_w3@ z^}|<$>s?Iv*+K=EFx`8Ryf5+3txZlb=;0ihllpF46kJ0B=)FyyKuI0772hY#ziI2^ z8lJGFwfJuelCIA&(`!Bi#dh;;#EUO1lXSWl?<{_|$LF6<3f|(x53EXQulIgxu-~9J$3^HAw2$#;q0%`_dUf(t1 z*(%cw*UM8!D7B%B0XFkxymuyrg`$17zhJNYU@AjL$&M>oo4bn%R7!S3@|5fnx7R)_ z$qtZe_4~R-6*r*U$utTIt9g@MDjQtLB;N}DMEUcr@^FKiU)Q90pa-+eao?#Df5M)C zyBswF5f34K?jorAIb3RXwPJCv%&lZuS3_U7IE`32ou*3P81QMa&l^nfO|G2AKYYF} zy|nHfFGTo@J>uv5uN?vw)if&;b99+ukTUgJ@KitT@V}|`m5{bS_&}Yy7 zo4U5X8?M`h9#B40W_}7C#kY0A+^1l*BMmrN6)Mg3d^`*YHk0PQub9ue_D@Erk?!8^ zaP$}9-Ly@3Kfe{fXgn78jsEGSE-C46SxMxLk1XO=-38H7n(Orma(~_S@tL!W>CxcF z>FKrEd1K15{o|_FcJCj98`t1NFZny@YaUpLfd=kE0|*e{_fnd*!F&!)HTH#S`77iA z>o}{`=@Tj|(TCKKR1Q{6`wI5U1>O6U2aaP&!edFwW8Z@M+G?TWoM$p)UJiYpL9e$*LGjva z21@@HzTIK#G7u?FSKu1wY~yUlblY=<}J=tduPAU^!i$TnD0o~n-YYd zbNHr8l7r!Y@s9ny`W}BX@hz1<@OrecQCNNT0f=XL5TDqfBN0Lor&^cfu5@7$_Lcwp zu5vhjfqQD$r1l4CLvyU4>OnbUO3J7gQ_Uo+)!l^DZMx#zaQsO4u$8##CzH5h1G^r> zM0$0aT*5K$Oe7-SQ>fX)Se%~;j)CSUSFw!koz_eD6>jeWjstT?PO1RbuDZ)ah{%I? z5`g8EI)sIoo4a}%Z*pd0)78~hS?MntS@Y|4^;8U-hyX?PM~Lc8@VHtAMhr5hdK~2T zPW6U$X&&{3CFBhkCtil<%=7*+9_d@-=v`Rjalph5Y=u0sR_7L%pl{gVjz(BgwEEV| zayJ;ieUb9G3d@8%CF7f_T@@cMMZpS741|dt3qYZmvl=-*5}aj!3~SXNioP(xyc@8c z*u&KmMGVOJP)@w8ycK*hD8qcs)WFPgj}KYHHP9I9knb^&v;K9}7vV)|YFI9MRjVJ4 z^jgvst6VNgm18&^kcJI`A0snJby2}{PfLWz$hlYr`)=8apgggBkF`ea%h*Lq9kg=& z3QVgU4iqIJd={1Wq7}b0Mf%ru5&j2Z(RQ&yS^Se3me}tr$ey-0)h?Br$shri>xUKv0e`jV6{)6;?5x0 zHWCSa&bOcQRVY`HqB~T0xf#U5!BsTW-JTig?6fWlt*R<_Km9(E+E%yr;ec z8#1{TF^Nf)p7W|AWiw*dTc}}Lni1okbdvRUR10M%w9hcL@LpCqut|G8wh(W)ZYicD zHTmU;L9t3YP)ucHUV7o7y0tfc**pE_>VQ87YaxswYlIgc|6u7$+r=V@S{3?>iHtI# zPp+zu;WAyr`i zMmWd0t8L}X&hApc724FBP)u@7pV!oXV29r5n~6Lw=bQSs))=pMfVr6khk_h+klaDO zslSG$uJmYN;d4ye!U-zx=W8LrKgMLw^Kt1YGnB$7r^eq4h{3~pktS{TXYc*EU+>Ad z5}6Tx>-Ib$MTBGh*~GDVcDDJCq^-SsttT(9pRQ01Q{7dj%dDQzA0V*XYiFm`qs3+} zJ+|)+1ww_3-+;=s2aAGj9W!zKFUwW{dE_Aj5+&7pInl$;6rLj(ebVB4;Tgw%>KwzD zcKdOc&&%0oIsi43^;Kg7RX1wpB-vHSIJ-e@P7iV4O3NbZnSgTY`ymfw6nh-T++o4 z9%?u3_|BUiItN}=Q!ct^0+O~eLf%348n@lT2@mPqO;x>8Ak2K^ZYqlKy8{)-Dm3RA!Lzy@1V z@qg^Aw5F}bs1N(`1}#iN&1qGKHMVT!L;V19Siyx|?OLj}5ODmrzEECd{mT_dOdrKN zP4ruheEQyMp4jAqVki(H^}gsjEq>Om4Xj|nFO6mmUetI=#!l$Obl|qlN{XVUE%nR< zC&$&DkxdgHs(t7}a>o0@$8PZ6jLA7ZMN~B{MXl3lZoX1{+1b7uj#^-&6)W;H0t%%b zus*c2WiFYP5EoPiB>6tHFTBA1H(VebQbY}50u8VTbbAz63Jsz{JTQQ>G#GjdP;w#`=F}qEXiZSGj!~Ivyouh3 zYc%Xp+2+rxcia0Qg0YyR%2>M|X1Iy(f6TH$q`t}ZUk}Kfa;D)eM;hOk$F)oQxfv5H z=7?uv%%yyp!dT~xXV3>iin4{GNzKaqsfDNokCGmjQrLoc(CHL3#y4q|&THp`lWr%_ zs<~a2HZT``ga*j#1&{hxJDLgw=Df&fi}=GQ^49N42fsDiGio=mAeIe*X+}X_sZ11R z4B9{PcdrsRy4x4b6|4O(k4(_keIh)LN{-8&qA)Q;&g&HPHj8=N<4y@H>6rh3Gr}%t zRh;#H#}+dY_fw7?+1zENuSihvJSU_NY+EZ0Y{6W>Gja!9@I_PpM}H7BxFtKqA#Eaj z0CI>*-|G2W5$PTbDw83eEL@*T*Gr1%bkt+Zaa>gC_{(WIX-mEDlZTMK-U3#H2jSsu z-ygmOr-_pSf2^CetiJT4Mb79N{6P-}=@)6t$EC}?g#Md=hEr(ON8-TBh~^~Uz->j}nu|Y|7lReuJeV zQ>RTvQ^ci*Wx$o%57Bu$t2UmhIiLZfNmE#IG-n|3#B=u{*md{x+MGfAzI&%}F)P8a zFq|n^>tbW@iUeU|`|Fs65>p9!8EldgqAyHgN(gzd_R6a=g|1y}1&LC0#XC#osY*GW z@HV;YAS0=AzlUh8U>V|+cTwE5!yAfFMGYPEXgV;0v^?idb0DTCyn2)b0=ozTn2TMv zh*_?OC>MSkS1H~^kbC|-h0Gx2mP?{P$Gxk6^zBT;zWPgtD%%@u1EKgP%>Vu&0VgR! zX7isC5#B%DmH>fp{tf?a5o8cUNm1B)4oIdXCE5S=yMI#u?!TmeXpI~4#zO!(lEfza zA2ax0UhrSu3lD@)N(7dHAEF~gP4+)3@Q-KnPb2={L-)ZDh!hRk|AhFz#iW0xLi*ob S{vjJ-$R8;-#5K|X%>EyId64=5 diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index cf52ed475..502602749 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -49,6 +49,7 @@ service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; rpc get_margin(MarginRequest) returns (MarginResult); + rpc get_excess_liquidity_report(MarginRequest) returns (ExcessLiquidityReport); rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage); rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage); diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index f1a02d6f5..26bc54e56 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -38,7 +38,8 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: //state below _lock(), _last_update(), - _admin_data() + _admin_data(), + _last_report() { LOG(Gen, Info, "MarginServiceServer: service started"); @@ -70,7 +71,7 @@ void MarginServiceServer::publish_all() if(it != _last_update.end()) since = it->second; std::vector pos; - if(_position->query_positions(acct, pos, &since)) + if(_position->query_positions(acct, pos, &since) && pos.size()) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); auto aname = orderman::to(acct); @@ -109,6 +110,19 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request } } +void MarginServiceServer::get_excess_liquidity_report(const api::position::MarginRequest& request, + const api::Response& reply) +{ + std::scoped_lock l(_lock); + ExcessLiquidityReport rep; + rep.set_account(request.account()); + auto it = _last_report.find(request.account()); + if(it != _last_report.end()) + rep.CopyFrom(it->second); + reply(rep); +} + + void MarginServiceServer::publish_margin(const api::position::MarginResult& result) { @@ -134,7 +148,8 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M netliq = report.leverage_factor() * report.cash_balance(); } netliq -= result.maint_margin(); - report.set_excess_liquidity(netliq); + report.set_excess_liquidity(netliq); + _last_report[result.account()] = report; _report_publisher.add_or_update(report); _report_publisher.flush(); } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 3fb3e06ad..b99836099 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -30,6 +30,9 @@ public: void get_margin(const api::position::MarginRequest& request, const api::Response& reply) override; + void get_excess_liquidity_report(const api::position::MarginRequest& request, + const api::Response& reply) override; + void set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; @@ -56,6 +59,7 @@ private: std::recursive_mutex _lock; std::map _last_update; bts::api::admin::AdminData _admin_data; + std::map _last_report; }; }} From e47af3d7bd5aaf5e4695a14a8ffee7e4af59d6bf Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 20 Jun 2019 10:34:06 -0400 Subject: [PATCH 031/210] update api docs --- src/client/spark_sdk/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/spark_sdk/README.md b/src/client/spark_sdk/README.md index a5367bce8..15e1ed463 100644 --- a/src/client/spark_sdk/README.md +++ b/src/client/spark_sdk/README.md @@ -73,6 +73,10 @@ Commands: order [] Arguments: --pump= + +Example: + To print simulated market data to the screen: + spark_sdk.exe md SIM FUTURE ES SIM:ESU9 --user=bts ``` * Check out sample code From 0700e9e80d06a6e9c7c4531950582b6c17554f39 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 29 Jun 2019 16:10:34 -0500 Subject: [PATCH 032/210] SP-89 Port Offset order to new api --- .../orderman/order_factory/OrderFactory.cpp | 4 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 160 ++++++++++++++++++ .../orders/algo/algo_orders/OffsetAlgo.h | 33 ++++ 3 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 461ea669c..0a4922f54 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -19,8 +19,8 @@ #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" -#include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" #include "lib/orderman/orders/spreader_orders/SpreaderOrder.h" #include "lib/orderman/orders/CompositeOrder.h" @@ -183,7 +183,7 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, new orderman::AlgoWrapperOrder(std::make_unique())); break; case CustomOrderDefinition::kOffset: - order_ptr.reset(new orderman::OffsetOrder()); + order_ptr.reset(new orderman::AlgoWrapperOrder(std::make_unique())); break; case CustomOrderDefinition::kQueueHolder: order_ptr.reset(new orderman::QueueHolderOrder()); diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp new file mode 100644 index 000000000..f8fb5cdfa --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -0,0 +1,160 @@ +#include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" +#include "lib/os/os.h" +#include "lib/utils/PBUtils.h" + +namespace bts { +namespace orderman { + +using namespace api::orderman; +using namespace std; + +enum class OffsetAlgo::Status { WAITING_FOR_MD, DEPLOYED }; + +struct OffsetAlgo::PImpl { + IAlgoServices *algo; + Status status = Status::WAITING_FOR_MD; + OrderKey child_key = null_order_key(); + ChildTemplate *child_template = nullptr; + Book last_book; + uint32_t tick_offset_on_deploy; +}; + +OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} +OffsetAlgo::~OffsetAlgo() {} +IAlgoServices &OffsetAlgo::algo() const { return *me->algo; } + +OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { + auto &def = serv.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_offset()); + // Validate the offset part of the definition + auto &offset = def.custom_def().offset(); + if (!offset.has_child() && + OrderKey(def.attach_target_order_key()) == null_order_key()) { + return OrderOpResult{ + ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Offset order must have either a child order definition or an " + "order to attach to"}; + } + + me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); + + if (!serv.is_attaching()) { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); + } + + return {}; +} + +void OffsetAlgo::do_launch(IAlgoServices &algo) { + me->algo = &algo; + bts_assert(me->child_template); + me->child_key = + algo.launch_child(*me->child_template, algo.price(), algo.quantity()); + algo.subscribe_book(SecurityKey(algo.security().id())); +} + +void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, + ChildState st) { + me->algo = &algo; + me->child_key = k; + algo.subscribe_book(SecurityKey(algo.security().id())); + on_child_change(k, st); +} + +void OffsetAlgo::do_update(api::orderman::Update const &update) { + LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + // validate update + if (update.has_custom() && !update.custom().has_offset()) { + algo().terminate_error("Invalid update"); + return; + } + // apply update + switch (me->status) { + case Status::WAITING_FOR_MD: + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); + break; + case Status::DEPLOYED: + // only update quantity (tick offset is irrelevant once deployed) + Update child_update; + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + break; + } +} + +void OffsetAlgo::on_book(SecurityKey, Book const &b) { + me->last_book = b; + // log top of book + LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", + algo().order_key().value(), b.side(api::SIDE_BUY)[0].size(), + b.side(api::SIDE_BUY)[0].price(), b.side(api::SIDE_SELL)[0].size(), + b.side(api::SIDE_SELL)[0].price()); + // attempt deploy + if (me->status == Status::WAITING_FOR_MD) + try_deploy(); +} + +void OffsetAlgo::try_deploy() { + bts_assert(me->status == Status::WAITING_FOR_MD); + auto side = algo().definition().side(); + auto &top_psz = me->last_book.side(side)[0]; + if (top_psz.size()) { + // determine/set price + Update child_update; + const double &offset = securities::tick_size(algo().security()).value() * + me->tick_offset_on_deploy; + if (side == bts::api::SIDE_BUY) { + child_update.set_price(top_psz.price() - offset); + } else { + // assume that side == SIDE_SELL (bc the book returned a valid size for + // whatever side this is). + child_update.set_price(top_psz.price() + offset); + } + // set quantity + child_update.set_quantity(algo().quantity().value()); + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} {} ticks " + "away.", + algo().order_key().value(), algo().definition().side(), + algo().quantity().value(), algo().price().value(), + me->tick_offset_on_deploy); + // deploy + algo().update_child(me->child_key, child_update); + algo().set_ladder_visibility(false); + me->status = Status::DEPLOYED; + } else { + // log state (still waiting for md) + LOG(OrderMan, Diag, + "OffsetAlgo order {} still waiting for md. Order: {} {}@ {} ticks " + "away.", + algo().order_key().value(), algo().definition().side(), + algo().quantity().value(), me->tick_offset_on_deploy); + } +} + +void OffsetAlgo::on_child_change(OrderKey, ChildState const &st) { + algo().update_fill_state(st.total_fills, st.last_price); + switch (st.status) { + case ChildStatus::WORKING: + return; + case ChildStatus::COMPLETED: + algo().complete(); + return; + case ChildStatus::CANCELED: + algo().cancel("Unexpected child cancel"); + return; + } +} +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h new file mode 100644 index 000000000..14097f638 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h @@ -0,0 +1,33 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { + +// Offset sends a child-order/algo N ticks away from the top of the book. +// If necessary, it will wait for the market to arrive before shooting the +// child. + +class OffsetAlgo : public IAlgoOrder { + public: + OffsetAlgo(); + ~OffsetAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_book(SecurityKey, Book const &) override; + void on_child_change(OrderKey, ChildState const &) override; + + private: + enum class Status; + struct PImpl; + std::unique_ptr me; + IAlgoServices &algo() const; + void try_deploy(); +}; + +} // namespace orderman +} // namespace bts \ No newline at end of file From 7de7f6e496351238ad3b252f14d6e234934ec8fc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 30 Jun 2019 12:47:05 -0500 Subject: [PATCH 033/210] remove old OffsetOrder.cpp/h, replace with new OffsetAlgo in CMakeDeps --- src/lib/CMakeDeps.cmake | 2 +- .../orders/book_algos/OffsetOrder.cpp | 102 ------------------ .../orderman/orders/book_algos/OffsetOrder.h | 29 ----- 3 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 src/lib/orderman/orders/book_algos/OffsetOrder.cpp delete mode 100644 src/lib/orderman/orders/book_algos/OffsetOrder.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..8d136b5e4 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.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/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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp b/src/lib/orderman/orders/book_algos/OffsetOrder.cpp deleted file mode 100644 index 6a1a6972d..000000000 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include "OffsetOrder.h" - -#include "lib/orderman/actors/order_manager/OrderBuilder.h" -#include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" -#include "lib/utils/PBUtils.h" -#include - -namespace bts { -namespace orderman { - -using namespace api::orderman; - -struct OffsetOrder::PImpl -{ - PImpl() {} - - uint32_t tick_offset_on_deploy; -}; - - -OffsetOrder::OffsetOrder() : me(new PImpl()) {} - -OffsetOrder::~OffsetOrder() {} - -void OffsetOrder::setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState& initial_state, api::orderman::OrderDefinition* out_child) -{ - initial_state.mutable_offset(); - auto const &offset_def = this_def.custom_def().offset(); - *out_child->mutable_custom_def() = offset_def.child(); - - me->tick_offset_on_deploy = offset_def.tick_offset_on_deploy(); -} - - -void OffsetOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) -{ - switch (this_state().status()) - { - case ORDER_STATUS_WORKING: - switch (child_state().status()) - { - case ORDER_STATUS_INACTIVE: - { - if(definition().side() == api::SIDE_BUY) - { - const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; - double price = same.price() - tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - else - { - const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; - double price = same.price() + tick_size() * me->tick_offset_on_deploy; - activate_child(Price(price), Quantity(this_state().quantity())); - transition(ORDER_STATUS_WORKING); - } - report_state(); - } - break; - case ORDER_STATUS_WORKING: - { - detach(); - } - break; - - case ORDER_STATUS_PENDING_WORKING: - break; - - // child cannot be in any of these states if we are in the working state - case ORDER_STATUS_DISCONNECTED: - case ORDER_STATUS_ERROR: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } - break; - - case ORDER_STATUS_COMPLETED: - case ORDER_STATUS_CANCELED: - case ORDER_STATUS_ERROR: - break; - - case ORDER_STATUS_INACTIVE: - case ORDER_STATUS_REJECTED_BY_SPARK: - case ORDER_STATUS_PENDING_WORKING: - case ORDER_STATUS_DISCONNECTED: - case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: - case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: - bts_assert(false); - break; - } -} - -} -} - diff --git a/src/lib/orderman/orders/book_algos/OffsetOrder.h b/src/lib/orderman/orders/book_algos/OffsetOrder.h deleted file mode 100644 index 7b9ad70fb..000000000 --- a/src/lib/orderman/orders/book_algos/OffsetOrder.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "lib/orderman/orders/book_algos/BookAlgo.h" - -namespace bts { -namespace orderman { - -class OrderStateUpdateEvent; -class BookUpdateEvent; - -//OffsetOrder deploys N ticks away from the initial same-side inside market it's mainly for composition / fat finger - -class OffsetOrder : public BookAlgo -{ -public: - OffsetOrder(); - virtual ~OffsetOrder(); - -protected: - void setup_child(const api::orderman::OrderDefinition& this_def, const PreActivationOrderServices&, - api::orderman::OrderState&, api::orderman::OrderDefinition*) override; - void on_book_update(const bts::orderman::BookUpdateEvent&) override; - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} From 4ada322c5699080ab9bdc565c1ff6a05e4ef9d71 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 30 Jun 2019 12:56:59 -0500 Subject: [PATCH 034/210] bring back OffsetOrder gui in ladder/ticket --- src/client/spark/Orders/OrderDataHelper.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 511dc6711..2abb71e8e 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -605,7 +605,8 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Offset }, // The following spreader types are not yet ready for production use: // CustomOrderDefinition.CustomOneofCase.Dynamic, From 94d66a8e994f10324878f5cd7f99e4e567bdf075 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 12:40:16 -0400 Subject: [PATCH 035/210] Add Margin tab to Spark Admin --- src/web/ui/src/Access.fs | 26 +++++++++++++ src/web/ui/src/Accounts/State.fs | 30 ++++++++++++--- src/web/ui/src/Accounts/Types.fs | 14 +++++++ src/web/ui/src/Accounts/View.fs | 62 ++++++++++++++++++++++++++++++- src/web/ui/src/Controls/Fields.fs | 7 +++- 5 files changed, 130 insertions(+), 9 deletions(-) diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 3de9afcff..1c715c97b 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -1,6 +1,7 @@ [] module Access open bts.api.admin +open bts.api.position open bts.api open Elmish open bts.api.orderman @@ -20,6 +21,12 @@ let getAccountOrdersData (admin:IAdminService) (success) (fail) = success (fun e -> fail e.Message) +let getMarginData (span:IMarginService) (account_name: string) (success) (fail) = + Cmd.ofPromise + span.get_excess_liquidity_report + { account = account_name } + success + (fun e -> fail e.Message) module Lens = // type Setter<'a,'b> = { @@ -108,6 +115,25 @@ module Accounts = } } + let emptyMargin : ExcessLiquidityReport = { + account = "ERROR NO DATA" + marginResult = { + account = "ERROR NO DATA" + status = bts.api.position.MarginResult.ResultStatus.Error + portfolioId = "" + settleIndicator = "" + settleQualifier = "" + asOfTime = "" + calculationId = "" + optValue = 0.0 + nonoptValue = 0.0 + maintMargin = 0.0 + initialMargin = 0.0 + } + leverageFactor = 0.0 + cashBalance = 0.0 + excessLiquidity = 0.0 + } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index fcbaac147..d13f9a5b4 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -8,6 +8,7 @@ open Fable.Import open bts.co2 open Fable open Fable.PowerPack +open bts.api.position let isNewAccount (account:BTSAccount) = account.id = 0u && account.isPresent @@ -17,8 +18,12 @@ let currentAccountIsDefault (account:BTSAccount) = (account.id = 0u) let init (context:ServiceContext.ServiceContext) = let admin = AdminService.Create context "" let mdr = MarketDataRelay.Create context "" + let span = MarginService.Create context "" { tab = General admin = admin + marginService = span + marginData = emptyMargin + marginScratch = emptyMargin adminData = None ordersData = [] SelectedOrders = [] @@ -75,7 +80,9 @@ let applySIMUpdate (data:SIMAccountData) = function let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { let! result = admin.update_account { completeData = account } - if result.isSuccess then + let! result2 = model.marginService.set_cash_factor { account = model.scratch.name; leverageFactor = model.marginScratch.leverageFactor } + let! result3 = model.marginService.set_cash_balance { account = model.scratch.name; cashBalance = model.marginScratch.cashBalance } + if result.isSuccess && result2.success && result3.success then let! data = admin.get_filtered_admin_data () return UpdateAdminData data else @@ -194,7 +201,18 @@ let update msg (model:Model) : Model * Cmd = | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> - { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.Empty + { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.ofMsg <| GetMarginData + | GetMarginData -> + { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) + | UpdateMarginData newData -> + match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name) with + | true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false -> {model with marginData = newData}, Cmd.Empty + + | SetMarginCashBalance newBalance -> + { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty + | SetMarginCashFactor newFactor -> + { model with marginScratch = { model.marginScratch with leverageFactor = newFactor}},Cmd.Empty | DeleteAccount account -> let mdl = { model with OptionsMenuOpen = ""} match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with @@ -217,6 +235,8 @@ let update msg (model:Model) : Model * Cmd = match tab with | OrdersTab -> { (clearSelection model) with tab = tab }, Cmd.ofMsg GetOrdersData + | MarginTab -> + { (clearSelection model) with tab = tab }, Cmd.ofMsg GetMarginData | _ -> { (clearSelection model) with tab = tab }, Cmd.Empty | Update field -> @@ -227,8 +247,8 @@ let update msg (model:Model) : Model * Cmd = { model with scratch = { model.scratch with securityClipLimits = { limit = limits } }; SelectedClipLimits = selectedlimits }, Cmd.Empty | AddClipLimit limit -> let limits = match (Array.exists (fun (elm:AccountSecurityClipLimitUnit) -> elm.security.securitySymbol = "") model.scratch.securityClipLimits.limit) with - | true -> model.scratch.securityClipLimits.limit - | false -> Array.concat [ model.scratch.securityClipLimits.limit; [| limit |] ] + | true -> model.scratch.securityClipLimits.limit + | false -> Array.concat [ model.scratch.securityClipLimits.limit; [| limit |] ] { model with scratch = { model.scratch with securityClipLimits = { limit = limits } }}, Cmd.Empty | ChangeMultipleClipLimits (value, selectedLimits) -> @@ -320,7 +340,7 @@ let update msg (model:Model) : Model * Cmd = | RequestExpirationNames -> model, Cmd.ofExistingPromise (requestExpNames model.mdRelay) id (box>>ErrorOccured) | UpdateExpirationNames (data:ExpirationNameList[]) -> - { model with mdRelayExpNameData = data }, Cmd.Empty + { model with mdRelayExpNameData = data }, Cmd.ofMsg GetMarginData | OpenOptionsMenu acc -> {model with OptionsMenuOpen = acc}, Cmd.Empty | OpenConfirmModal (title, okMessage) -> diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index f249085bf..be4e54e8c 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -5,6 +5,7 @@ open bts.api open bts.api.orderman open JSMap open bts.co2 +open bts.api.position type Tab = | General @@ -13,6 +14,7 @@ type Tab = | ExchangeSettingsTab | ConnectionsTab | OrdersTab + | MarginTab let venues = [| Venue.GLBX; Venue.SIM |] @@ -50,10 +52,19 @@ type Msg = | UpdateOrdersData of OrdersSummary | SelectOrder of bool * OrdersSummaryUnit list | CancelOrders of OrdersSummaryUnit list + // Margin / Span + | GetMarginData + | UpdateMarginData of ExcessLiquidityReport + | SetMarginCashBalance of double + | SetMarginCashFactor of double + | SelectAccount of BTSAccount | DeleteAccount of BTSAccount | AddAccount + | SaveLeverageFactor + | SaveCashBalance | SaveScratch + | ErrorOccured of obj // Tabs | SelectTab of Tab @@ -91,6 +102,9 @@ type Msg = type Model = { tab : Tab admin : IAdminService + marginService: IMarginService + marginData: ExcessLiquidityReport + marginScratch: ExcessLiquidityReport adminData : AdminData option ordersData : OrdersSummaryUnit list SelectedOrders: OrdersSummaryUnit list diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 0b66c54cb..65c0f7925 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -23,9 +23,12 @@ let selectedAccount model = | None -> None let isDirty model = + let marginDirty = model.marginData.cashBalance <> model.marginScratch.cashBalance || + model.marginData.leverageFactor <> model.marginScratch.leverageFactor match selectedAccount model with | Some account -> - account <> model.scratch + account <> model.scratch || + marginDirty | None -> false let saveButton model dispatch = @@ -80,6 +83,58 @@ let generalView model dispatch = accountControls model dispatch ] +let marginView model dispatch = + + let headerRow:TableControl.row = + { + cells = + [ + //TableControl.Cell (str "Account") + TableControl.Cell (str "As Of Time") + //TableControl.Cell (str "Cash Balance") + TableControl.Cell (str "Excess Liquidity") + TableControl.Cell (str "Initial Margin") + //TableControl.Cell (str "Leverage Factor") + TableControl.Cell (str "Maint Margin") + // TableControl.Cell (str "nonoptValue") + // TableControl.Cell (str "optValue") + // TableControl.Cell (str "portfolioId") + // TableControl.Cell (str "settleIndicator") + // TableControl.Cell (str "settleQualifier") + ] + className = "" + header = None + } + + let rws:TableControl.row = + { + cells = + [ + //TableControl.Cell (str model.marginScratch.account) + TableControl.Cell (str model.marginScratch.marginResult.asOfTime) + //TableControl.Cell (str (sprintf "%f" model.marginScratch.cashBalance)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.excessLiquidity)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.initialMargin)) + //TableControl.Cell (str (sprintf "%f" model.marginScratch.leverageFactor)) + TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.maintMargin)) + // TableControl.Cell (str (sprintf "%f" margin.nonoptValue)) + // TableControl.Cell (str (sprintf "%f" margin.optValue)) + // TableControl.Cell (str margin.portfolioId) + // TableControl.Cell (str margin.settleIndicator) + // TableControl.Cell (str margin.settleQualifier) + ] + className = "" + header = None + } + + div [][ + TableControl.createDataTable (Some headerRow) [rws] (span [][]) + Fields.double "Cash Factor:" model.marginScratch.leverageFactor [] (SetMarginCashFactor >> dispatch) + Fields.double "Cash Balance:" model.marginScratch.cashBalance [] (SetMarginCashBalance >> dispatch) + accountControls model dispatch + ] + + let GetSymbolArray (model:Model) = Array.map (fun a -> a.symbol ) model.mdRelayProductData |> Array.distinct @@ -771,7 +826,8 @@ let tabContent model dispatch = | ConnectionsTab, _ -> ConnectionsView model dispatch | CreditLimitsTab, _ -> creditLimitsView model dispatch | ExchangeSettingsTab, _ -> exchangeSettings model dispatch - | OrdersTab, _ -> ordersView model dispatch) + | OrdersTab, _ -> ordersView model dispatch + | marginTab, _ -> marginView model dispatch) ] let isActive account = function @@ -905,6 +961,7 @@ let tabName = function | ConnectionsTab -> "Connections" | ExchangeSettingsTab -> "Exchange Settings" | OrdersTab -> "Orders" + | MarginTab -> "Margin" | other -> string other let tabHeader tab currentTab dispatch = @@ -939,6 +996,7 @@ let root (model:Model) dispatch = // tabHeader CreditLimits model.tab dispatch (if (Array.length data.accounts > 0) then (tabHeader ExchangeSettingsTab model.tab dispatch) else span [][] ) (if (Array.length data.accounts > 0) then (tabHeader OrdersTab model.tab dispatch) else span [][] ) + (if (Array.length data.accounts > 0) then (tabHeader MarginTab model.tab dispatch) else span [][] ) ] ] tabContent model dispatch diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index 2fbd6cd2f..719e7705d 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -134,6 +134,9 @@ let password (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = let number (lbl:string) (dv:int) (attrs:IHTMLProp list) onchange = text lbl (string dv) attrs (int>>onchange) +let double (lbl:string) (dv:double) (attrs:IHTMLProp list) onchange = + text lbl (string dv) attrs (double>>onchange) + let enumSelect<'a> (lbl:string) (dv:'a) (values:'a[]) (attrs:IHTMLProp list) (onchange:'a->unit) = let vals = match (Array.tryFindIndex (fun elm -> unbox elm = unbox dv) values) with | None -> Array.concat [[| dv |]; values] @@ -194,7 +197,7 @@ let radioButton (lbl:string) (description:string) (dv:bool) (attrs:IHTMLProp lis let mapSelectEx (lbl:string) (options:Map) (defaultText:string option) (defaultValue:string option) (onchange:'a->unit) (is_disabled:bool option) = - let dis = + let dis = match is_disabled with | None -> false | Some a -> a @@ -214,7 +217,7 @@ let mapSelectEx (lbl:string) (options:Map) (defaultText:string op Label lbl div [ ClassName "control" ] [ - div [ ClassName "select"] + div [ ClassName "select"] [ select [ Value dv From ab255c8777759c3b9e80bece91579d91e312ce31 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 12:51:17 -0400 Subject: [PATCH 036/210] update ui.fsproj --- src/web/ui/src/ui.fsproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index 7538454d3..cf28db353 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -28,6 +28,7 @@ + From bc3418734fc4a73722ffbec8a51b53049af509e1 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 13:22:27 -0400 Subject: [PATCH 037/210] Span Columns and Formatting --- src/web/ui/src/Accounts/View.fs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 65c0f7925..4b0d9d240 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -91,13 +91,13 @@ let marginView model dispatch = [ //TableControl.Cell (str "Account") TableControl.Cell (str "As Of Time") - //TableControl.Cell (str "Cash Balance") - TableControl.Cell (str "Excess Liquidity") + TableControl.Cell (str "Leverage Factor") + TableControl.Cell (str "Cash Balance") + TableControl.Cell (str "Non Opt Value") + TableControl.Cell (str "Opt Value") TableControl.Cell (str "Initial Margin") - //TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Maint Margin") - // TableControl.Cell (str "nonoptValue") - // TableControl.Cell (str "optValue") + TableControl.Cell (str "Excess Liquidity") // TableControl.Cell (str "portfolioId") // TableControl.Cell (str "settleIndicator") // TableControl.Cell (str "settleQualifier") @@ -111,14 +111,14 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str model.marginScratch.account) - TableControl.Cell (str model.marginScratch.marginResult.asOfTime) - //TableControl.Cell (str (sprintf "%f" model.marginScratch.cashBalance)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.excessLiquidity)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.initialMargin)) - //TableControl.Cell (str (sprintf "%f" model.marginScratch.leverageFactor)) - TableControl.Cell (str (sprintf "%f" model.marginScratch.marginResult.maintMargin)) - // TableControl.Cell (str (sprintf "%f" margin.nonoptValue)) - // TableControl.Cell (str (sprintf "%f" margin.optValue)) + TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) // TableControl.Cell (str margin.settleQualifier) @@ -129,8 +129,8 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.double "Cash Factor:" model.marginScratch.leverageFactor [] (SetMarginCashFactor >> dispatch) - Fields.double "Cash Balance:" model.marginScratch.cashBalance [] (SetMarginCashBalance >> dispatch) + Fields.number "Leverage Factor:" (int model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) + Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] From beff060a4f242251974fe69414f1279f03b945c6 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 14:27:44 -0400 Subject: [PATCH 038/210] Update unchanged margin values --- src/web/ui/src/Accounts/State.fs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index d13f9a5b4..e8a66f431 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -201,13 +201,18 @@ let update msg (model:Model) : Model * Cmd = | _ -> [] {model with SelectedOrders = so}, Cmd.Empty | SelectAccount account -> - { (clearSelection model) with previousScratch = model.scratch; scratch = account }, Cmd.ofMsg <| GetMarginData + { (clearSelection model) with previousScratch = model.scratch; scratch = account; marginScratch = emptyMargin }, Cmd.ofMsg <| GetMarginData | GetMarginData -> { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) | UpdateMarginData newData -> - match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name) with - | true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false -> {model with marginData = newData}, Cmd.Empty + match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), + (model.marginData.leverageFactor = model.marginScratch.leverageFactor), + (model.marginData.cashBalance = model.marginScratch.cashBalance) with + | true, _, _ -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false, true, true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty + | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, Cmd.Empty + | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, Cmd.Empty + | false, false, false -> {model with marginData = newData}, Cmd.Empty | SetMarginCashBalance newBalance -> { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty From 90fd5bd382b64e4ac198a7aa0e811c9fc9e49737 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 1 Jul 2019 14:52:40 -0400 Subject: [PATCH 039/210] Handle save errors better --- src/web/ui/src/Accounts/State.fs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e8a66f431..426db2899 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -82,11 +82,16 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promi let! result = admin.update_account { completeData = account } let! result2 = model.marginService.set_cash_factor { account = model.scratch.name; leverageFactor = model.marginScratch.leverageFactor } let! result3 = model.marginService.set_cash_balance { account = model.scratch.name; cashBalance = model.marginScratch.cashBalance } - if result.isSuccess && result2.success && result3.success then + + if (result.isSuccess && result2.success && result3.success) then let! data = admin.get_filtered_admin_data () return UpdateAdminData data + elif (not result.isSuccess) then + return (ErrorOccured (sprintf "Error saving account: %s" result.errorText)) + elif (not result2.success) then + return ErrorOccured (sprintf "Error saving leverage factor: %s" result2.errorMessage) else - return ErrorOccured (sprintf "Error saving account: %s" result.errorText) + return ErrorOccured (sprintf "Error saving cash balence: %s" result3.errorMessage) } let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise { From a6ad70fc05f8a4060c23cb493e7649aac14d66c7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:46:03 -0400 Subject: [PATCH 040/210] SP-28 Algo unit test utils --- src/lib/md/relay/RelayRecorder.cpp | 51 ++- src/lib/md/relay/RelayRecorder.h | 5 +- .../orders/algo/IBeforeLaunchAlgoServices.cpp | 7 + .../orders/algo/IBeforeLaunchAlgoServices.h | 3 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 374 ++++++++++++++++++ .../algo/algo_orders/tests/AlgoTestDriver.h | 140 +++++++ src/lib/utils/ValueWrapper.h | 1 + 7 files changed, 570 insertions(+), 11 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index d2a094b52..a15652138 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -11,6 +11,7 @@ #include "lib/md/protos/co2.pb.h" #include "lib/md/SecurityIDRecorder.h" #include "lib/config/protos/system.pb.h" +#include "lib/config/protos/MarketData.pb.h" #include "lib/utils/bts_chrono.h" #include @@ -173,7 +174,7 @@ void replay_file(const std::string& filename, IRelayWriter& writer, int32_t nagg } while (loop); } -void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { +bool replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop) { // split up url parts size_t http_len = BTS_ARRAYSIZE("http://") - 1; auto after_host = url.find('/', http_len); @@ -184,21 +185,53 @@ void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) filename = os::sparkdata_path("data/replay/") + filename; utils::download_file_if_newer(host, path, filename); if (boost::filesystem::exists(filename)) { - replay_file(filename, writer, naggle_ms, true); + replay_file(filename, writer, naggle_ms, loop); + return true; + } + return false; +} + +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop) { + if (!replay_url(url, writer, naggle_ms, loop)) { + const auto fallback = config::get().fallback(); + if (boost::filesystem::exists(fallback)) { + replay_file(fallback, writer, naggle_ms, loop); + } } } -void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { - // loops forever - replay_url(url, writer, naggle_ms); - // If it returns it means it failed to download or play cached - const auto fallback = config::get().fallback(); - if (boost::filesystem::exists(fallback)) { - replay_file(fallback, writer, naggle_ms); +struct SecurityExtractorDone : public std::bad_exception {}; +struct SecurityExtractor : public IRelayWriter { + size_t _count; + std::function _cb; + std::set _keys; + SecurityExtractor(std::function& cb, size_t count) + : _count(count), _cb(cb), _keys() { } + ~SecurityExtractor() override {}; + void write(const co2::MDReply& data, bool*) { + for (auto const &ch : data.channels()) { + for (auto const &cr : ch.updates()) { + if (cr.has_security() && _keys.find(cr.security().id()) == _keys.end()) { + _keys.insert(cr.security().id()); + _cb(cr.security()); + } + } + } + if (_keys.size() >= _count) { + throw SecurityExtractorDone(); + } } +}; +void get_securities_from_replay(std::function cb) { + SecurityExtractor extractor(cb, 100); + auto url = config::get().url(); + try { + replay_url_with_fallback(url, extractor, 0, false); + } catch(const SecurityExtractorDone&) { } } + shared_ptr mkrelayproducer(bool shared); /*this is the public one*/ diff --git a/src/lib/md/relay/RelayRecorder.h b/src/lib/md/relay/RelayRecorder.h index d70dd4757..da6286340 100644 --- a/src/lib/md/relay/RelayRecorder.h +++ b/src/lib/md/relay/RelayRecorder.h @@ -29,9 +29,10 @@ void print_recording(const std::string&); void unprint_recording(const std::string& src, const std::string& dest); void trace_recording(const std::string& file, security_key key); void replay_recording(const std::string&, int32_t delay_ms, const std::string fallback=""); -void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); -void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms); +bool replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop=true); +void replay_url_with_fallback(const std::string& url, IRelayWriter& writer, int32_t naggle_ms, bool loop=true); void replay_file(const std::string& filename, IRelayWriter& writer, int32_t naggle_ms, bool loop=false); +void get_securities_from_replay(std::function); }}//namespace diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp index 87f753e91..426290ef4 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp +++ b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.cpp @@ -1 +1,8 @@ #include "lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h" +namespace bts { +namespace orderman { + +TimeStamp IBeforeLaunchAlgoServices::get_time() const { return Timer::now(); } + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h index 733f60d7c..3756971db 100644 --- a/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h +++ b/src/lib/orderman/orders/algo/IBeforeLaunchAlgoServices.h @@ -3,6 +3,7 @@ #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/SecurityKey.h" #include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/utils/bts_chrono.h" namespace bts { namespace orderman { @@ -42,6 +43,8 @@ class IBeforeLaunchAlgoServices { virtual ChildTemplate & make_child_template(api::orderman::OrderDefinition const &child_def, size_t reserve = 1) = 0; + + virtual TimeStamp get_time() const; }; } // namespace orderman diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp new file mode 100644 index 000000000..2791ac953 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -0,0 +1,374 @@ +#include "AlgoTestDriver.h" +#include "lib/md/relay/RelayRecorder.h" +#include "catch/catch.hpp" +#include "lib/api/services/OrderService.pb.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/logging/logging.h" + +#include +#include + +namespace bts { +namespace orderman { +namespace test { +using namespace api::orderman; + +constexpr bool has_flag(ATDFlags prop, ATDFlags flag) { + return ((uint32_t)prop & (uint32_t)flag) == (uint32_t)flag; +} + +const std::map& get_some_securities() { + static std::map results; + if (results.empty()) { + md::get_securities_from_replay([&](const api::Security& s) { + results.insert(std::make_pair(SecurityKey(s.id()), s)); + }); + } + return results; +} + + +struct RecursionCounter { + size_t depth = 0; + virtual void flush() = 0; +}; +struct RecursionGuard { + RecursionGuard(RecursionCounter& c) : counter(c) { + counter.depth += 1; + REQUIRE(counter.depth < 100); + } + ~RecursionGuard() { + counter.depth -= 1; + if (counter.depth == 0) { counter.flush(); } + } +private: + RecursionCounter& counter; +}; + +struct AlgoTestDriverBase::Impl : public RecursionCounter { + IAlgoOrder& algo; + api::orderman::OrderDefinition definition; + Price price; + Quantity size; + ATDFlags flags; + TimeStamp now; + api::Security security; + OrderKey order_key, parent_key; + + AlgoState state; + std::vector orders; + + std::map books; + std::map book_subs; + bool sub_timer = false; + + // Callbacks + std::vector> on_child_launching; + std::vector> on_child_changing; + std::vector> on_child_changed; + + Impl(IAlgoOrder& o) : algo(o) {} + + OrderKey next_order() { + _next_order.value() += 1; + return _next_order; + } + RecursionGuard recusion_guard() { return {*this}; } + + void flush() override; + bool flushing = false; + // child changes must be asyncronous + std::vector> deferred; + void defer_child_change(OrderKey k, ChildState cs) { deferred.push_back(std::make_tuple(k,cs)); } + +private: + OrderKey _next_order = OrderKey(99); +}; + +void AlgoTestDriverBase::Impl::flush() { + if(flushing) return; + flushing = true; + for (const auto& update : deferred) { + algo.on_child_change(std::get(update), std::get(update)); + } + deferred.clear(); + flushing = false; +} + +AlgoTestDriverBase::AlgoTestDriverBase( + IAlgoOrder& algo, + const api::orderman::OrderDefinition& def, + Price price, Quantity size, + ATDFlags flags) + : me(new Impl(algo)) { + + me->definition = def; + me->price = price; + me->size = size; + me->flags = flags; + me->now = Timer::now(); + me->state = AlgoState::CREATED; + + auto securities = get_some_securities(); + REQUIRE(securities.size() > 0); + me->security = securities.begin()->second; + + me->order_key = me->next_order(); + if (has_flag(flags, ATDFlags::HAS_PARENT)) { + me->parent_key = me->next_order(); + } +} + +AlgoTestDriverBase::~AlgoTestDriverBase() {} + +OrderOpResult AlgoTestDriverBase::before_launch() { + REQUIRE(me->state == AlgoState::CREATED); + me->state = AlgoState::READY; + return me->algo.do_before_launch(*this); +} + +void AlgoTestDriverBase::launch() { + REQUIRE(me->state == AlgoState::READY); + me->algo.do_launch(*this); + me->state = AlgoState::RUNNING; +} + +void AlgoTestDriverBase::launch_attached(OrderKey key, ChildState state) { + REQUIRE(me->state == AlgoState::READY); + me->algo.do_launch_attached(*this, key, state); + me->state = AlgoState::RUNNING; +} +void AlgoTestDriverBase::do_update(const api::orderman::Update& update) { + auto guard = me->recusion_guard(); + REQUIRE(me->state == AlgoState::RUNNING); + me->algo.do_update(update); +} + +void AlgoTestDriverBase::update_book(const Book& book) { + auto key = book.security_key(); + me->books[key] = book; + auto iter = me->book_subs.find(key); + if (iter != me->book_subs.end()) { + me->algo.on_book(key, book); + } +} +void AlgoTestDriverBase::advance_time(Duration d) { + me->now += d; + if (me->sub_timer) { + me->algo.on_timer(); + } +} + +const std::vector& AlgoTestDriverBase::child_orders() const { + return me->orders; +} + +AlgoState AlgoTestDriverBase::state() const { + return me->state; +} + +void AlgoTestDriverBase::fill(OrderKey k, Price price, Quantity qty) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == k) { + REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); + for (const auto& cb : me->on_child_changing) cb(child); + auto old = child; + + auto total_price = child.cstate.avg_price.value() * child.cstate.total_fills.value(); + total_price += price.value() * qty.value(); + + child.cstate.last_fills = qty; + child.cstate.total_fills.value() += qty.value(); + child.cstate.last_price = price; + child.cstate.avg_price = Price { total_price / child.cstate.total_fills.value() }; + + if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { + child.cstate.status = ChildStatus::COMPLETED; + } + + for (const auto& cb : me->on_child_changed) cb(old, child); + // No defer because this is called from outside + if (child.subscribed) me->algo.on_child_change(k, child.cstate); + break; + } + } +} + +const ChildOrder* largest_order(const std::vector& orders) { + uint32_t sz = 0; + const ChildOrder* result = nullptr; + for (const auto& order : orders) { + auto available = + order.cstate.quantity.value() - order.cstate.total_fills.value(); + if (order.cstate.status == ChildStatus::WORKING && + available > sz) { + sz = available; + result = ℴ + } + } + return result; +} +void AlgoTestDriverBase::fill(Price p, Quantity q) { + auto to_fill = q.value(); + while(to_fill > 0) { + auto order = largest_order(this->child_orders()); + REQUIRE(order); + auto available = (order->cstate.quantity.value() - order->cstate.total_fills.value()); + if (available >= to_fill) { + this->fill(order->key, p, Quantity {to_fill}); + return; + } + else { + this->fill(order->key, p, Quantity {available}); + to_fill -= available; + } + } +} + +void AlgoTestDriverBase::on_child_launching(std::function&& cb) { + me->on_child_launching.push_back(cb); +} +void AlgoTestDriverBase::on_child_changing(std::function&& cb) { + me->on_child_changing.push_back(cb); +} +void AlgoTestDriverBase::on_child_changed(std::function&& cb) { + me->on_child_changed.push_back(cb); +} + +// +// Utility + +ChildOrder mkchild(OrderKey key, Price price, Quantity qty, bool sub) { + ChildOrder result = {}; + result.key = key; + result.cstate.price = price; + result.cstate.quantity = qty; + result.subscribed = sub; + return result; +} + +// +// IBeforeLaunch + +const api::orderman::OrderDefinition& AlgoTestDriverBase::definition() const { return me->definition; } +const api::Security& AlgoTestDriverBase::security() const { return me->security; } +OrderKey AlgoTestDriverBase::order_key() const { return me->order_key; } +OrderKey AlgoTestDriverBase::parent_order_key() const { return me->parent_key; } +const api::Security* AlgoTestDriverBase::lookup_security(SecurityKey key) const { + auto s = get_some_securities(); + auto iter = s.find(key); + if (iter != s.end()) { + return &iter->second; + } + return nullptr; +} +bool AlgoTestDriverBase::is_attaching() const { return has_flag(me->flags, ATDFlags::IS_ATTACHING); } +ChildTemplate& AlgoTestDriverBase::make_child_template(const api::orderman::OrderDefinition&, size_t) { + ChildTemplate* t = nullptr; + return *t; +} +TimeStamp AlgoTestDriverBase::get_time() const { return me->now; } + +// +// IAlgoServices + +Price AlgoTestDriverBase::price() const { return me->price; } +Quantity AlgoTestDriverBase::quantity() const { return me->size; } +Quantity AlgoTestDriverBase::total_fills() const { return Quantity(0); } + +void AlgoTestDriverBase::subscribe_book(SecurityKey key){ + me->book_subs[key] = true; + auto iter = me->books.find(key); + if (iter != me->books.end()) { + me->algo.on_book(key, iter->second); + } +} +void AlgoTestDriverBase::unsubscribe_book(SecurityKey key) { + me->book_subs.erase(key); +} +void AlgoTestDriverBase::subscribe_child_change(OrderKey k) { + for (auto& child : me->orders) { + if (child.key == k) { + child.subscribed = true; + } + } +} +void AlgoTestDriverBase::unsubscribe_child_change(OrderKey k) { + for (auto& child : me->orders) { + if (child.key == k) { + child.subscribed = false; + } + } +} +void AlgoTestDriverBase::subscribe_timer() { me->sub_timer = true; } +void AlgoTestDriverBase::unsubscribe_timer() { me->sub_timer = false; } + +OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity qty, bool sub) { + OrderKey key = me->next_order(); + me->orders.push_back( + mkchild(key, price, qty, sub)); + for(const auto& cb : me->on_child_launching) cb(key); + return key; +} +OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & od, Price price, Quantity qty, bool sub) { + return launch_child(make_child_template(od), price, qty, sub); +} +void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const & update) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == key) { + for (const auto& cb : me->on_child_changing) cb(child); + auto old = child; + if (update.price() != 0) { + child.cstate.price = Price(update.price()); + } + if (update.quantity() != 0) { + child.cstate.quantity = Quantity(update.quantity()); + } + if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { + child.cstate.status = ChildStatus::COMPLETED; + } + for (const auto& cb : me->on_child_changed) cb(old, child); + + if (child.subscribed) { + me->defer_child_change(key, child.cstate); + } + } + } +} +void AlgoTestDriverBase::cancel_child(OrderKey key) { + auto guard = me->recusion_guard(); + for (auto& child : me->orders) { + if (child.key == key) { + REQUIRE(child.cstate.status != ChildStatus::CANCELED); + for (const auto& cb : me->on_child_changing) cb(child); + auto before = child; + child.cstate.status = ChildStatus::CANCELED; + for (const auto& cb : me->on_child_changed) cb(before, child); + if(child.subscribed) { + me->defer_child_change(key, child.cstate); + } + break; + } + } +} +void AlgoTestDriverBase::detach_child(OrderKey key) { + std::remove_if(me->orders.begin(), me->orders.end(), [key](const auto& order) { return order.key == key; }); +} +void AlgoTestDriverBase::detach_all_children() { + me->orders.clear(); +} +void AlgoTestDriverBase::cancel(std::string const &) { + me->state = AlgoState::CANCELED; +} +void AlgoTestDriverBase::terminate_error(std::string const &) { + me->state = AlgoState::TERMINATED; +} +void AlgoTestDriverBase::complete() { + me->state = AlgoState::COMPLETED; +} +void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } +void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } + +}}}//namespace \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h new file mode 100644 index 000000000..b475e8941 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -0,0 +1,140 @@ +#pragma once +#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/md/IntPrice.h" +#include +#include +#include + +namespace bts { +namespace orderman { +namespace test { + +const std::map& get_some_securities(); + +enum class ATDFlags { + NONE = 0, + IS_ATTACHING = 1, + HAS_PARENT = 2, +}; + +enum class AlgoState { + CREATED, + // before_lauh() -> + READY, + // launch() -> + RUNNING, + CANCELED, + TERMINATED, + COMPLETED +}; + +struct ChildOrder { + OrderKey key; + bool subscribed; + ChildState cstate; + uint32_t active_qty() const { + return cstate.status == ChildStatus::WORKING ? + cstate.quantity.value() - cstate.total_fills.value() : 0; + } +}; + +class AlgoTestDriverBase : private IAlgoServices { + struct Impl; + std::unique_ptr me; + + public: + AlgoTestDriverBase( + IAlgoOrder& algo, + const api::orderman::OrderDefinition& def, + Price price, Quantity size, + ATDFlags flags=ATDFlags::NONE); + ~AlgoTestDriverBase(); + + // + // Expose some things from IAlgoServices + const api::Security& security() const override; + Price price() const override; + Quantity quantity() const override; + Quantity total_fills() const override; + + // + // Change state + + OrderOpResult before_launch(); + void launch(); + void launch_attached(OrderKey, ChildState); + void do_update(const api::orderman::Update&); + + void update_book(const Book&); + void advance_time(Duration); + + // + // Inspection methods + const std::vector& child_orders() const; + AlgoState state() const; + + // Fills for this specific order + void fill(OrderKey, Price, Quantity); + // Fill this quantity, start with the largest child order + void fill(Price, Quantity); + + void on_child_launching(std::function&&); + void on_child_changing(std::function&&); + void on_child_changed(std::function&&); + + + +private: + + // + // IBeforeLaunchAlgoServices + const api::orderman::OrderDefinition& definition() const override; + // const api::Security& security() const override; + OrderKey order_key() const override; + OrderKey parent_order_key() const override; + const api::Security* lookup_security(SecurityKey) const override; + bool is_attaching() const override; + ChildTemplate& make_child_template(const api::orderman::OrderDefinition& child_def, size_t reserve = 1) override; + TimeStamp get_time() const override; + + // + // IAlgoServices + void subscribe_book(SecurityKey)override; + void unsubscribe_book(SecurityKey) override; + void subscribe_child_change(OrderKey) override; + void unsubscribe_child_change(OrderKey) override; + void subscribe_timer() override; + void unsubscribe_timer() override; + + OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) override; + OrderKey launch_child(api::orderman::OrderDefinition const &, Price, + Quantity, bool) override; + void update_child(OrderKey , api::orderman::Update const &) override; + void cancel_child(OrderKey) override; + void detach_child(OrderKey) override; + void detach_all_children() override; + + void cancel(std::string const &) override; + void terminate_error(std::string const &) override; + void complete() override; + void set_ladder_visibility(bool) override; + void update_fill_state(Quantity , Price) override; + +}; + +template +struct AlgoTestDriver : public AlgoTestDriverBase +{ + // Avoids mutual ownership problem + Algo _algo; + AlgoTestDriver( + const api::orderman::OrderDefinition& def, + const md::IntPrice& price, Quantity size, + ATDFlags flags=ATDFlags::NONE) + : AlgoTestDriverBase(_algo, def, Price {price.price()}, size, flags), _algo() + { } + const Algo& algo() const { return _algo; } +}; + +}}}//namespace \ No newline at end of file diff --git a/src/lib/utils/ValueWrapper.h b/src/lib/utils/ValueWrapper.h index 6c8b8692b..5df5e2ace 100644 --- a/src/lib/utils/ValueWrapper.h +++ b/src/lib/utils/ValueWrapper.h @@ -24,6 +24,7 @@ public: bool operator==(ValueWrapper const&v) const {return _v == v._v;} bool operator!=(ValueWrapper const&v) const {return _v != v._v;} bool operator<(ValueWrapper const&v) const {return _v < v._v;} + bool operator>(ValueWrapper const&v) const {return _v > v._v;} ValueT const& value() const {return _v;} ValueT & value() {return _v;} private: From 226fcc279bc9ddbdbc76607692c32f40720ffcb3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:46:20 -0400 Subject: [PATCH 041/210] Utils for manipulating dynamic algos --- .../orderman_utils/orderman_utils.cpp | 63 +++++++++++++++++++ .../orderman/orderman_utils/orderman_utils.h | 61 ++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 8099a0b5a..cd26ab515 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -49,5 +49,68 @@ bool should_forward_attachment( } } +api::orderman::DynamicOrderParam dynamic_parameter(int32_t v) { + api::orderman::DynamicOrderParam res; + res.set_as_int32(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(uint32_t v) { + api::orderman::DynamicOrderParam res; + res.set_as_uint32(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(double v) { + api::orderman::DynamicOrderParam res; + res.set_as_double(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(std::string v) { + api::orderman::DynamicOrderParam res; + res.set_as_string(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(bool v) { + api::orderman::DynamicOrderParam res; + res.set_as_bool(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::CustomOrderDefinition& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_order_def()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderArray& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_array()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderStruct& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_struct()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderEnumerated& v) { + api::orderman::DynamicOrderParam res; + res.mutable_as_enumerated()->CopyFrom(v); + return res; +} +api::orderman::DynamicOrderParam dynamic_array(const std::vector& v) { + api::orderman::DynamicOrderArray a; + for (const auto& item : v) { + a.add_element()->CopyFrom(item); + } + return dynamic_parameter(a); +} +api::orderman::DynamicOrderParam dynamic_map( + const std::vector>& v) { + DynamicOrderStruct res; + auto& map = *res.mutable_field(); + for (const auto& tup : v) { + map[std::get(tup)] = std::get<1>(tup); + } + return dynamic_parameter(res); +} + + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orderman_utils/orderman_utils.h b/src/lib/orderman/orderman_utils/orderman_utils.h index 50b97ce43..435c5bbb1 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.h +++ b/src/lib/orderman/orderman_utils/orderman_utils.h @@ -1,4 +1,6 @@ #include "lib/api/services/OrderService.pb.h" +#include +#include namespace bts { namespace orderman { @@ -30,5 +32,64 @@ inline bool is_parent_order(const bts::api::orderman::OrderRecord &ord) { bool should_forward_attachment(const api::orderman::CustomOrderDefinition &def); bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase) ; + +api::orderman::DynamicOrderParam dynamic_parameter(int32_t); +api::orderman::DynamicOrderParam dynamic_parameter(uint32_t); +api::orderman::DynamicOrderParam dynamic_parameter(double); +api::orderman::DynamicOrderParam dynamic_parameter(std::string); +api::orderman::DynamicOrderParam dynamic_parameter(bool); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::CustomOrderDefinition&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderArray&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderStruct&); +api::orderman::DynamicOrderParam dynamic_parameter(const api::orderman::DynamicOrderEnumerated&); +api::orderman::DynamicOrderParam dynamic_array(const std::vector&); +api::orderman::DynamicOrderParam dynamic_map( const std::vector>&); + +template +std::optional get_if(const api::orderman::DynamicOrderParam&) { return nullptr; } + +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsInt32 ? std::optional{p.as_int32()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsUint32 ? std::optional{p.as_uint32()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsDouble ? std::optional{p.as_double()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsBool ? std::optional{p.as_bool()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsOrderDef ? std::optional{p.as_order_def()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsArray ? std::optional{p.as_array()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsStruct ? std::optional{p.as_struct()} : std::nullopt; +} +template <> +inline std::optional get_if(const api::orderman::DynamicOrderParam& p) { + return p.value_case() == api::orderman::DynamicOrderParam::kAsEnumerated ? std::optional{p.as_enumerated()} : std::nullopt; +} + + +template +std::optional get_if(const google::protobuf::Map& map, const std::string& key) { + auto c = map.find(key); + if (c != map.end()) { + return get_if(c->second); + } + return std::nullopt; +} + } // namespace orderman } // namespace bts From 0dcdbd540ecf65dbcca807b968de7205a8149f58 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 15:47:56 -0400 Subject: [PATCH 042/210] SP-87 Splitter algo --- .gitignore | 1 + src/lib/api/services/OrderService.proto | 11 +- src/lib/md/IntPrice.h | 6 +- src/lib/md/PriceSize.h | 2 +- .../orderman/events/OrderStateUpdateEvent.h | 3 + .../orderman/order_factory/OrderFactory.cpp | 5 + .../orders/algo/algo_orders/SplitterAlgo.cpp | 219 ++++++++ .../orders/algo/algo_orders/SplitterAlgo.h | 32 ++ .../algo/algo_orders/tests/splitter_tests.cpp | 526 ++++++++++++++++++ 9 files changed, 800 insertions(+), 5 deletions(-) create mode 100644 src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp diff --git a/.gitignore b/.gitignore index 7c976336d..98475e215 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 1908ff7bf..f0cb044fb 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -101,6 +101,7 @@ message CustomOrderDefinition OCOOrderDefinition oco = 25; PricerOrderDefinition pricer = 26; CompositeOrderDefinition composite = 27; + SplitterOrderDefinition splitter = 29; DynamicOrderDefinition dynamic = 1000; } @@ -204,6 +205,12 @@ message CompositeOrderDefinition { uint32 algo_template_key = 1; CustomOrderDefinition definition = 2; } +message SplitterOrderDefinition { + uint32 max_order_qty = 1; + uint32 exposed_qty = 2; + // uint32 target_qty = 3; + CustomOrderDefinition child = 10; +} message DynamicOrderDefinition { string dynamic_order_type = 1; map order_params = 2; @@ -253,9 +260,10 @@ message OrderState { TriggerOrderState trigger = 21; CoverOrderState cover = 22; OffsetOrderState offset = 24; - QueueHolderState queue_holder = 30; OCOOrderState oco = 25; PricerOrderState pricer = 26; + QueueHolderState queue_holder = 30; + SplitterOrderState splitter = 31; DynamicOrderState dynamic = 255; // do not use anything bigger than 255, or things will break } @@ -334,6 +342,7 @@ message OCOOrderState {} message PricerOrderState {} message DynamicOrderState {} message QueueHolderState {} +message SplitterOrderState {} enum OrderStatus { diff --git a/src/lib/md/IntPrice.h b/src/lib/md/IntPrice.h index dfca4e73f..22822745b 100644 --- a/src/lib/md/IntPrice.h +++ b/src/lib/md/IntPrice.h @@ -34,9 +34,9 @@ class IntPrice { #endif public: - IntPrice() : _mantissa(0), _exponent(127) {/*nan*/} - IntPrice(int64_t mantissa, int8_t exponent) : _mantissa(mantissa), _exponent(exponent) {} - IntPrice(const IntPrice& other) : _mantissa(other._mantissa), _exponent(other._exponent) {} + constexpr IntPrice() : _mantissa(0), _exponent(127) {/*nan*/} + constexpr IntPrice(int64_t mantissa, int8_t exponent) : _mantissa(mantissa), _exponent(exponent) {} + constexpr IntPrice(const IntPrice& other) : _mantissa(other._mantissa), _exponent(other._exponent) {} bool operator==(const IntPrice& other) const { if(_exponent == other._exponent) { diff --git a/src/lib/md/PriceSize.h b/src/lib/md/PriceSize.h index e10a90365..3a72de6b1 100644 --- a/src/lib/md/PriceSize.h +++ b/src/lib/md/PriceSize.h @@ -77,7 +77,7 @@ public: extern PriceSize NO_MARKET; static_assert(sizeof(PriceSize) == 16, "PriceSize should be small"); -template +template PriceSize PriceSize_from_double(double price, Size size) { if (size == 0 || os::is_nan(price)) return NO_MARKET; return { IntPrice_from_double(price), size }; diff --git a/src/lib/orderman/events/OrderStateUpdateEvent.h b/src/lib/orderman/events/OrderStateUpdateEvent.h index b639c4549..9aeb47d81 100644 --- a/src/lib/orderman/events/OrderStateUpdateEvent.h +++ b/src/lib/orderman/events/OrderStateUpdateEvent.h @@ -153,6 +153,9 @@ class OrderStateUpdateEvent : public mercury::Event { case api::orderman::OrderState::kDynamic: result.mutable_dynamic(); break; + case api::orderman::OrderState::kSplitter: + result.mutable_splitter(); + break; case api::orderman::OrderState::CUSTOM_NOT_SET: break; } diff --git a/src/lib/orderman/order_factory/OrderFactory.cpp b/src/lib/orderman/order_factory/OrderFactory.cpp index 461ea669c..2f80825fe 100644 --- a/src/lib/orderman/order_factory/OrderFactory.cpp +++ b/src/lib/orderman/order_factory/OrderFactory.cpp @@ -19,6 +19,7 @@ #include "lib/orderman/orders/algo/algo_orders/TopAlgo.h" #include "lib/orderman/orders/algo/algo_orders/IcebergAlgo.h" #include "lib/orderman/orders/algo/algo_orders/LeanAlgo.h" +#include "lib/orderman/orders/algo/algo_orders/SplitterAlgo.h" #include "lib/orderman/orders/book_algos/OCOOrder.h" #include "lib/orderman/orders/book_algos/OffsetOrder.h" #include "lib/orderman/orders/book_algos/PricerOrder.h" @@ -208,6 +209,10 @@ Order &OrderFactory::allocate(OrderKey k, OrderKey pk, case CustomOrderDefinition::kComposite: order_ptr.reset(new orderman::CompositeOrder()); break; + case CustomOrderDefinition::kSplitter: + order_ptr.reset( + new orderman::AlgoWrapperOrder(std::make_unique())); + break; case CustomOrderDefinition::CUSTOM_NOT_SET: bts_assert(false); break; diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp new file mode 100644 index 000000000..f7a2e6f2e --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -0,0 +1,219 @@ +#include "SplitterAlgo.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +// #include "google/btree/btree_map.h" + +#include +#include + +namespace bts { +namespace orderman { +namespace splitter { + +using namespace api::orderman; + +struct ChildOrderState { + OrderKey key; + ChildState state; + uint32_t remaining() const { return state.quantity.value() - state.total_fills.value(); } + uint32_t min_qty() const { return state.total_fills.value(); } +}; + +struct SplitterAlgo::Impl { + IAlgoServices* algo = nullptr; + ChildTemplate* child_template = nullptr; + + uint32_t clip = 0; + uint32_t exposed_qty = 0; + uint32_t target_qty = 0; + + bool is_terminated = false; + + std::vector orders; +}; + +SplitterAlgo::SplitterAlgo() : me(new Impl()) { } +SplitterAlgo::~SplitterAlgo() {} + +OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { + // Validate and store parameters + + auto& def = ibl.definition(); + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_splitter()); + auto& splitter = def.custom_def().splitter(); + + me->clip = splitter.max_order_qty(); + me->exposed_qty = splitter.exposed_qty(); + if (me->clip <= 0 || me->exposed_qty <= 0) { + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, + "max order quantity and exposed quantity must be greater than 0"}; + } + + // Create child template + auto child_def = def; + *child_def.mutable_custom_def() = splitter.child(); + me->child_template = &ibl.make_child_template(child_def); + + me->orders.reserve(me->exposed_qty / me->clip + 1); + + return {}; +} + +void SplitterAlgo::do_launch(IAlgoServices& ias) { + me->algo = &ias; + me->target_qty = ias.quantity().value(); + // launches initial child orders + sync_orders(); +} +void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { + //todo +} +void SplitterAlgo::do_update(const api::orderman::Update& update) { + // Update # child orders + if (update.has_custom() && update.custom().has_splitter()) { + auto& splitter = update.custom().splitter(); + if (splitter.max_order_qty() > 0) { + me->clip = splitter.max_order_qty(); + } + me->exposed_qty = splitter.exposed_qty(); + } + me->target_qty = update.quantity(); + + sync_orders(); +} +void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { + for (auto& child : me->orders) { + if (child.key == key) { + child.state = state; + break; + } + } + + sync_orders(); +} + +struct MinMax { + uint32_t min, max; +}; + +// TEST case: +// total = 300, clip = 100 +// constraints: 50,50,50,50 +void compute_desired_sizes(uint32_t total, uint32_t clip, const std::vector& constraints, std::vector* results) { + bts_assert(results); + results->clear(); + + uint32_t irreducible = 0; + for (const auto& mm : constraints) irreducible += mm.min; + + auto citer = constraints.begin(); + while(total > 0) { + auto current = std::min(total, clip); + // fit to constraint + if (citer != constraints.end()) { + irreducible -= citer->min; + if (current > citer->max) current = citer->max; + if (current < citer->min) current = citer->min; + + // I can't be higher than (total - irreducible) + if (current > (total - irreducible)) current = (total-irreducible); + citer++; + } + results->push_back(Quantity{current}); + total -= current; + } +} + +void get_constraints(const std::vector& orders, std::vector* constraints) { + bts_assert(constraints); + for (const auto& order : orders) { + //Note: to maintain queue position set max to current quantity. This will cause more orders to be added to the end if size increases + constraints->push_back(MinMax { + order.state.total_fills.value(), + order.state.status == ChildStatus::WORKING ? + std::numeric_limits::max() : order.state.total_fills.value() + }); + } +} + +bool SplitterAlgo::is_complete() const { + uint32_t fills = 0; + for (const auto& o : me->orders) { fills += o.state.total_fills.value(); } + return fills >= me->target_qty; +} + +void SplitterAlgo::terminate() const { + algo().complete(); + //?? Do we need to clean up children? + for (const auto& o : me->orders) { + if (o.state.status == ChildStatus::WORKING) { + algo().cancel_child(o.key); + } + } + me->is_terminated = true; +} + +void SplitterAlgo::sync_orders() { + if (me->is_terminated) return; + if (is_complete()) { + terminate(); + return; + } + + std::sort(me->orders.begin(), me->orders.end(), [](auto& a, auto b) { return b.min_qty() < a.min_qty(); }); + std::vector constraints; + get_constraints(me->orders, &constraints); + + std::vector desired; + compute_desired_sizes(me->exposed_qty, me->clip, constraints, &desired); + + auto oiter = me->orders.begin(); + // iterate to the current number of orders, don't consider orders that we're adding + auto order_count = me->orders.size(); + auto price = algo().price(); + for (const auto& qty : desired) { + if (order_count == 0) { + // Ran out of existing orders, time to add more + auto key = algo().launch_child(*me->child_template, price, qty); + // Assume the order begins successfully. Hopefully we get back some sort of NACK otherwise + me->orders.push_back({ key, {} }); + me->orders.back().state.price = price; + me->orders.back().state.quantity = Quantity { qty }; + me->orders.back().state.status = ChildStatus::WORKING; + } + else { + // Check the current order's quantity and modify it to match desired qty + if (oiter->state.status == ChildStatus::WORKING) { + if (oiter->state.price != price || + oiter->state.quantity != qty) { + Update update; + update.set_quantity(qty.value()); + update.set_price(price.value()); + algo().update_child(oiter->key, update); + } + } + oiter++; + order_count -= 1; + } + } + // cancel any orders past desired + if (desired.size() < me->orders.size()) { + for (size_t x = desired.size(); x < me->orders.size(); ++x) { + auto& order= me->orders[x]; + if (order.state.status == ChildStatus::WORKING) { + order.state.status = ChildStatus::CANCELED; + algo().cancel_child(order.key); + } + } + } + +} + +IAlgoServices& SplitterAlgo::algo() const { bts_assert(me->algo); return *me->algo; } + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h new file mode 100644 index 000000000..ff2d86598 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -0,0 +1,32 @@ +#pragma once +#include "lib/orderman/orders/algo/IAlgoOrder.h" + +namespace bts { +namespace orderman { +namespace splitter { + +class SplitterAlgo : public IAlgoOrder +{ + struct Impl; + std::unique_ptr me; + +public: + SplitterAlgo(); + ~SplitterAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_child_change(OrderKey, ChildState const &) override; + +private: + IAlgoServices& algo() const; + + void sync_orders(); + bool is_complete() const; + void terminate() const; +}; + + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp new file mode 100644 index 000000000..adb06283b --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -0,0 +1,526 @@ + +#include "catch/catch.hpp" +#include "../SplitterAlgo.h" +#include "AlgoTestDriver.h" +#include "lib/orderman/orderman_utils/Book.h" +#include +#include +#include + +using namespace std; +using namespace bts::orderman::splitter; +using namespace bts::api::orderman; + +namespace bts { +namespace orderman { +namespace test { + +/* + +- max/exposed, assert correct # of orders on the market +- completes on target_qty reached +- completes on target_qty exceeded +- send fills, check order state +- send fills, then change target_qty + + */ + +constexpr auto some_price = md::IntPrice { 128000, -3 }; + +using ExpectedCount = utils::ValueWrapper; +struct SimpleCase { + ExpectedCount expected_orders; + Quantity target; + SplitterOrderDefinition sod; +}; + +SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, uint32_t target) { + SimpleCase result; + result.expected_orders = expected; + result.target = Quantity {target}; + result.sod.set_max_order_qty(max_size); + result.sod.set_exposed_qty(exposed); + return result; +} + + +TEST_CASE("initial orders", "[algo][splitter]") { + std::vector cases; + cases.push_back(mkSimple(ExpectedCount {10},10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + + for (const auto& tcase : cases) { + auto expected = tcase.expected_orders.value(); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = tcase.sod; + AlgoTestDriver state(def, some_price, tcase.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.child_orders().size() == expected); + REQUIRE(state.state() == AlgoState::RUNNING); + } +} + +TEST_CASE("completes on target", "[algo][splitter]") { + std::vector cases; + cases.push_back(mkSimple(ExpectedCount {3}, 30, 90, 50)); + cases.push_back(mkSimple(ExpectedCount {10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount {4}, 13, 50, 150)); + cases.push_back(mkSimple(ExpectedCount {12}, 13, 150, 50)); + + for (const auto& tcase : cases) { + auto expected = tcase.expected_orders.value(); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = tcase.sod; + AlgoTestDriver state(def, some_price, tcase.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.child_orders().size() == expected); + REQUIRE(state.state() == AlgoState::RUNNING); + + SECTION("Fill completely") { + auto orders = state.child_orders(); + // Fill the order + size_t filled = 0; + size_t iterations = 0; + while(state.state() == AlgoState::RUNNING) { + // loop to allow more orders to be added + ++iterations; + REQUIRE(iterations < 999); + for (const auto& order : orders) { + state.fill(order.key, Price (some_price.price()), order.cstate.quantity); + filled += order.cstate.quantity.value(); + if (filled >= tcase.target.value()) { + REQUIRE(state.state() == AlgoState::COMPLETED); + break; + } + else { + REQUIRE(state.state() == AlgoState::RUNNING); + } + } + } + } + SECTION("fill one by one") { + const auto& orders = state.child_orders(); + // Fill 1 per iteration. + // Algo should add more orders if not enough are visible initially + size_t filled = 0; + size_t iterations = 0; + while(state.state() == AlgoState::RUNNING) { + ++iterations; + REQUIRE(iterations < 999);//not making progress + for (const auto& order : orders) { + if (order.cstate.status == ChildStatus::WORKING) { + auto price = Price {some_price.price()}; + state.fill(order.key, price, Quantity {1}); + filled += 1; + // Fills should never cause new orders to get added + REQUIRE(state.child_orders().size() == expected); + if (filled >= tcase.target.value()) { + REQUIRE(state.state() == AlgoState::COMPLETED); + break; + } + else { + REQUIRE(state.state() == AlgoState::RUNNING); + } + } + } + } + } + } +} + +TEST_CASE("updates", "[algo][splitter]") { + // Start in state 0, update to state 1 + std::vector, SimpleCase>> cases; + + // reduce max order size, increase # orders + cases.push_back({ + mkSimple(ExpectedCount {10} /*order count*/, 10 /*max*/, 100 /*exposed*/, 50 /*target*/), + {}, + mkSimple(ExpectedCount {20}, 5, 100, 50) + }); + /// reduce max order size, keep # orders constant + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {}, + mkSimple(ExpectedCount {10}, 5, 50, 50) + }); + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {5,5}, + mkSimple(ExpectedCount {8}, 5, 50, 40) + }); + cases.push_back({ + mkSimple(ExpectedCount {10}, 10, 100, 50), + {5,5}, + mkSimple(ExpectedCount {18}, 5, 100, 50) + }); + + + for (const auto& tcase : cases) { + auto case_init = std::get<0>(tcase); + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + *def.mutable_custom_def()->mutable_splitter() = case_init.sod; + AlgoTestDriver state(def, some_price, case_init.target); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == case_init.expected_orders.value()); + for (const auto& o : state.child_orders()) { + if (o.cstate.status == ChildStatus::WORKING) { + REQUIRE(o.cstate.quantity.value() <= case_init.sod.exposed_qty()); + } + } + + for(auto q : std::get<1>(tcase)) { + state.fill({}, Quantity {q}); + } + + Update update; + auto case_next = std::get<2>(tcase); + update.set_price(some_price.price()); + update.set_quantity(case_next.target.value()); + *def.mutable_custom_def()->mutable_splitter() = case_next.sod; + *update.mutable_custom() = def.custom_def(); + + state.do_update(update); + REQUIRE(state.state() == AlgoState::RUNNING); + size_t working = 0; + for (const auto& c : state.child_orders()) if (c.cstate.status == ChildStatus::WORKING) working += 1; + REQUIRE(working == case_next.expected_orders.value()); + for (const auto& o : state.child_orders()) { + if (o.cstate.status == ChildStatus::WORKING) { + REQUIRE(o.cstate.quantity.value() <= case_next.sod.exposed_qty()); + } + } + } +} +TEST_CASE("Reduction with fills", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/50, 100/50, 100/50, 100/50 + // Change expose to 300 + // naive: 100, 100, 100 but we *can't* reduce the last to 0 + // expected: 100, 100, 50, 50 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + for (const auto& order : state.child_orders()) { + state.fill(order.key, {}, Quantity {50}); + } + + // Reduce exposed quantity + Update update; + update.set_quantity(300); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(300); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 300); + + // need this to be 100,100,50,50 not 100,100,100 + std::set actual, expected {100,100,50,50}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("Reduction with fills 2", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/35, 100/45, 100/55, 100/65 + // Change expose to 300 + // naive: 100, 100, 100 but we *can't* reduce the last to 0 + // expected: 100, 100, 65, 35 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity {35}); + state.fill({}, Quantity {45}); + state.fill({}, Quantity {55}); + state.fill({}, Quantity {65}); + + // Reduce exposed quantity + Update update; + update.set_quantity(300); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(300); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 300); + + // need this to be 100,100,50,50 not 100,100,100 + std::set actual, expected {100,100,65,35}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("Reduction with fills 3", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/35, 100/45, 100/55, 100/65 + // Change expose to 201 + // naive: 100, 100, 1 but we *can't* reduce the last to 0 + // expected: 66, 55, 45, 35 + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity {35}); + state.fill({}, Quantity {45}); + state.fill({}, Quantity {55}); + state.fill({}, Quantity {65}); + + // Reduce exposed quantity + Update update; + update.set_quantity(201); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(201); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + size_t total = 0; + for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + REQUIRE(total == 201); + + std::set actual, expected {66,55,45,35}; + for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + REQUIRE(actual == expected); +} + +TEST_CASE("reduce to completion", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/100, 100/100, 100/0, 100/00 + // Change expose to 200 + // expected: algo transitions to copmleted state canceling 2 orders + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity{100}); + state.fill({}, Quantity{100}); + + // Reduce exposed quantity + Update update; + update.set_quantity(200); + def.mutable_custom_def()->mutable_splitter()->set_exposed_qty(200); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::COMPLETED); + size_t total = 0; + for (const auto& order : state.child_orders()) { + if (order.cstate.status == ChildStatus::WORKING) { + total += order.cstate.quantity.value(); + } + else { + total += order.cstate.total_fills.value(); + } + } + REQUIRE(total == 200); +} + +TEST_CASE("reduce to completion 2", "[algo][splitter]") { + // Fills represent a floor on how much a trade can be reduced + // IF we have expose:400, clip: 100 we get + // 100,100,100,100 + // Receive fills + // 100/100, 100/100, 100/0, 100/00 + // Change expose to 200 + // expected: algo transitions to copmleted state canceling 2 orders + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(400); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + // Add fills + state.fill({}, Quantity{100}); + state.fill({}, Quantity{50}); + state.fill({}, Quantity{50}); + + // Reduce exposed quantity + Update update; + update.set_quantity(200); + state.do_update(update); + + REQUIRE(state.state() == AlgoState::COMPLETED); +} + +TEST_CASE("Async Fills", "[algo][splitter]") { + // OK, NOW it gets tricky because we're going to test the asyncronous stuff + + // Start with 4 orders size 20 outstanding (80 total exposed) + // Change exposure to 64 so one of the four will be reduced to 5 + // Before the change is confirmed fill the one that is reducing by 7 + // which would constitute an overfill + // Algo must reduce a second order to compensate + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(20); + splitter->set_exposed_qty(80); + AlgoTestDriver state(def, some_price, Quantity {80}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 4); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 20); } + + // Set up some instant fills + bool applied_fills = false; + state.on_child_changing([&](const auto&) { + if (applied_fills) return; + applied_fills = true; + // 7 fills on the last order which is has a size reduction in flight + state.fill(state.child_orders().rbegin()->key, {}, Quantity {7}); + }); + + Update update; + update.set_price(state.price().value()); + update.set_quantity(state.quantity().value()); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(65); + // This should trigger 1 order to be reduced to size 5 from 20 + // in the meantime we'll trigger fills of size 7 + // This results in an overfill for the 5 lot order + // And the + state.do_update(update); + + // expected result: + // 7 fills, exposed_qty 65 = 58 active + uint32_t active = 0; + for (const auto& o : state.child_orders()) active += o.active_qty(); + REQUIRE(active == 58); +} + +TEST_CASE("Increase then decrease", "[algo][splitter]") { + // Start with 3 orders of size 100 + // Increase the size to 400 so we launch a 4th order + // Then instantly send another update to 350 + + // NOTE: this test is not very good due to limitations in the test driver + // I'm leaving it in because it passes but if it starts failing in the future + // it's probably OK to disable it + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + auto* splitter = def.mutable_custom_def()->mutable_splitter(); + splitter->set_max_order_qty(100); + splitter->set_exposed_qty(300); + AlgoTestDriver state(def, some_price, Quantity {300}); + + REQUIRE(state.before_launch().ok()); + state.launch(); + // check initial state + REQUIRE(state.state() == AlgoState::RUNNING); + REQUIRE(state.child_orders().size() == 3); + for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + + Update update; + update.set_price(state.price().value()); + update.set_quantity(state.quantity().value()); + update.mutable_custom()->mutable_splitter()->set_exposed_qty(400); + + // Set up some instant fills + bool applied_second_update = false; + state.on_child_launching([&,update](const auto&) mutable { + if (!applied_second_update) { + applied_second_update = true; + update.mutable_custom()->mutable_splitter()->set_exposed_qty(350); + state.do_update(update); + } + }); + + state.do_update(update); + + // expected result: + // 350 exposed, NOT 450 + uint32_t quantity = 0; + for (const auto& o : state.child_orders()) quantity += o.active_qty(); + REQUIRE(quantity == 350); +} + + +}}}//namespace \ No newline at end of file From b8a9116ea6bedd4cc19b9d79b8c5b9ab7df86d97 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 1 Jul 2019 16:08:28 -0400 Subject: [PATCH 043/210] SP-30 Dorman part 1 --- .../orders/algo/algo_orders/DormanAlgo.cpp | 382 ++++++++++++++++++ .../orders/algo/algo_orders/DormanAlgo.h | 82 ++++ .../algo/algo_orders/tests/dorman_tests.cpp | 353 ++++++++++++++++ 3 files changed, 817 insertions(+) create mode 100644 src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp create mode 100644 src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h create mode 100644 src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp new file mode 100644 index 000000000..b1f31c717 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -0,0 +1,382 @@ +#include "DormanAlgo.h" +#include "lib/api/services/OrderService.pb.h" +#include "lib/domain_model/Security.h" +#include "lib/logging/logging.h" +#include "lib/orderman/order_factory/IOrderFactory.h" +#include "lib/orderman/orderman_utils/Book.h" +#include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/utils/PBUtils.h" +#include "lib/orderman/orderman_utils/orderman_utils.h" + + +namespace bts { +namespace orderman { +namespace dorman { + +using namespace api::orderman; + + +// Class which will send out multiple orders but act like one order +struct ChildOrderState { + Quantity size; + Quantity filled; +}; + +class MultiOrder { + IAlgoServices* _algo = nullptr; + uint32_t _clip = 0; + ChildTemplate* _template = nullptr; + + Quantity _qty = {}; + std::map _orders; + + public: + MultiOrder() {} + ~MultiOrder() { + if (_algo) { + for (const auto& pair : _orders) { + _algo->cancel_child(pair.first); + } + } + } + void do_before_launch(IBeforeLaunchAlgoServices& algo, uint32_t clip) { + _clip = clip == 0 ? std::numeric_limits::max() : clip; + auto def = algo.definition(); + + CustomOrderDefinition default_order; + default_order.mutable_limit(); + + *def.mutable_custom_def() = + get_if(def.custom_def().dynamic().order_params(), "Child") + .value_or(default_order); + _template = &algo.make_child_template(def); + } + + void set_algo_services(IAlgoServices& a) { _algo = &a; } + + void update(Price p, Quantity q) { + bts_assert(_algo != nullptr); + // This class does not handle delayed size changes + if (q < _qty) { + // cancel some orders + auto excess = _qty.value() - q.value(); + while(excess > 0) { + // cancel some orders + auto iter = _orders.begin(); + auto lsize = iter->second.size.value() - iter->second.filled.value(); + if (lsize > excess) { + // Reduce order size + Update update; + update.set_quantity(lsize - excess); + _algo->update_child(iter->first, update); + iter->second.size.value() -= excess; + excess = 0; + } + else { + excess -= lsize; + _algo->cancel_child(iter->first); + _orders.erase(iter); + } + } + _qty = q; + } + else if (q > _qty) { + // add more orders + auto shortfall = q.value() - _qty.value(); + while(shortfall > 0) { + auto order_size = Quantity { std::min(shortfall, _clip) }; + auto child_id = _algo->launch_child(*_template, p, order_size, true); + _orders.insert(std::make_pair(child_id, ChildOrderState { order_size, Quantity {0} })); + shortfall -= order_size.value(); + } + _qty = q; + } + } + + Quantity quantity() const { return _qty; } +}; + + +// +// Algo State +// + +// +// Algo Impl +// +struct FutureQty { + Quantity size; + TimeStamp when; +}; + +struct DormanAlgo::Impl { + IAlgoServices *algo = nullptr; + AlgoParams params; + api::Side side; + + std::optional next_size; + MultiOrder child; +}; + +DormanAlgo::DormanAlgo() : + me(new Impl()) +{ } +DormanAlgo::~DormanAlgo() { } + +// Not latency sensitive. Do expensive initialization here +OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& iblas) { + const auto& def = iblas.definition(); + // Validation + bts_assert(def.has_custom_def()); + bts_assert(def.custom_def().has_dynamic()); + auto params = to_dorman_params(def.custom_def().dynamic()); + if (auto r = std::get_if(¶ms)) { + return *r; + } + me->params = std::get(params); + me->side = def.side(); + if (me->side != api::Side::SIDE_BUY && me->side != api::Side::SIDE_SELL) { + return OrderOpResult { ORDER_ERROR_INVALID_ORDER_DEFINITON, "Invalid side" }; + } + me->child.do_before_launch(iblas, me->params.clip_limit); + + return {/*ok*/}; +} + +void DormanAlgo::do_launch(IAlgoServices& algo) { + me->algo = &algo; + me->child.set_algo_services(algo); + + algo.subscribe_book(SecurityKey(algo.security().id())); + algo.subscribe_timer(); +} + +void DormanAlgo::do_launch_attached(IAlgoServices& algo, OrderKey k, ChildState state) { + me->algo = &algo; + (void)k; + (void)state; +} +void DormanAlgo::do_update(const api::orderman::Update& update) { + LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", + algo().order_key().value(), utils::pb::to_string(update)); + (void)update; +} + +void DormanAlgo::on_child_change(OrderKey k, const ChildState& st) { + (void)k; + (void)st; +} +void DormanAlgo::on_book(SecurityKey key, const Book& book) { + if (key.value() != me->algo->security().id()) { return; } + auto price = me->algo->price(); + auto tick = me->algo->security().contract_spec().low_tick(); + + // Determine available size on the market + auto& side = book.side(me->side); + uint32_t available = 0; + for (const auto& level : side) { + if (securities::test_price_equality(level.price(), price.value(), tick)) { + available = level.size(); + break; + } + } + + // Check the step_table + auto target = Quantity {0}; + if (available > 0) { + for (const auto& entry : me->params.steps.step_table) { + target = Quantity { std::get<1>(entry) }; + if (std::get<0>(entry) > available) { + break; + } + } + } + target = Quantity { std::min(target.value(), me->params.steps.maximum) }; + + // First on_book + if (me->child.quantity() == Quantity {0}) { + me->child.update(price, target); + } + // See if we need to adjust + else { + if (target < me->child.quantity()) { + // If target < size reduce immidiately + me->child.update(price, target); + me->next_size = std::nullopt; + } + else if (target > me->child.quantity()) { + // if target > size schedule increase + if (me->next_size) { + // already planning to increase + me->next_size.value().size = target; + } + else { + // no scheduled increase + me->next_size = { FutureQty { target, me->algo->get_time() + std::chrono::seconds(me->params.steps.trail_seconds) } }; + } + } + } +} +void DormanAlgo::on_timer() { + // Check for pending size changes + if (me->next_size && + me->algo->get_time() >= me->next_size.value().when) { + auto size = me->next_size.value().size; + me->child.update(me->algo->price(), size); + me->next_size = std::nullopt; + } +} + +IAlgoServices& DormanAlgo::algo() const { return *me->algo; } + +// +// Visibility for testing +// + +Quantity DormanAlgo::desired_size() const { return me->child.quantity(); } + +// +// +// Parameter parsing and validation +// +// + +Result bad_definition(const char* msg) { return {OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, msg}}; } + +Result to_dorman_params(const api::orderman::DynamicOrderDefinition& def) { + const auto& params = def.order_params(); + AlgoParams res; + + // + // Step Table + auto step_table = get_if(params, "Step Table"); + if (!step_table) return bad_definition("Missing 'Step Table'"); + for (const auto& element : step_table.value().element()) { + auto row = get_if(element); + if (!row) return bad_definition("Invalid row type in step table."); + auto mk = get_if(row.value().field(), "Market Quantity"); + if (!mk) return bad_definition("Step table row missing 'Market Quantity'"); + auto ok = get_if(row.value().field(), "Order Quantity"); + if (!ok) return bad_definition("Step table row missing 'Order Quantity'"); + res.steps.step_table.push_back({mk.value(), ok.value()}); + } + res.steps.maximum = get_if(params, "Max Size").value_or(-1); + res.steps.trail_seconds = get_if(params, "Trail Seconds").value_or(0); + + // + // Clip limit + res.clip_limit = get_if(params, "Clip Size").value_or(0); + + // + // scratch + auto enable_scratch = get_if(params, "Enable Scratch"); + if (enable_scratch && enable_scratch.value()) { + auto overfill = get_if(params, "Max Overfill"); + if (!overfill) return bad_definition("Missing 'Max Overfill'"); + res.scratch = { overfill.value() }; + } + + // + // profit orders + auto enable_profit_orders = get_if(params, "Profit Orders"); + if (enable_profit_orders && enable_profit_orders.value()) { + auto ticks = get_if(params, "Ticks Away"); + if (!ticks) return bad_definition("Missing 'Ticks Away'"); + res.profit_orders = { ticks.value() }; + } + + // + // trade accumulation + auto trade_acc = get_if(params, "Trade Accumulation"); + if (trade_acc) { + auto ta = trade_acc.value(); + TradeAccumulationParams tap; + + auto contracts = get_if(ta.field(), "Contracts"); + if (!contracts) return bad_definition("Missing 'Trade Accumulation # Contracts'"); + tap.contracts = contracts.value(); + + auto interval = get_if(ta.field(), "Interval (seconds)"); + if (!interval) return bad_definition("Missing 'Trade Accumulation Interval'"); + tap.seconds = interval.value(); + + auto sleep = get_if(ta.field(), "Sleep (seconds)"); + if (!sleep) return bad_definition("Missing 'Trade Accumulation Sleep'"); + tap.sleep_seconds = sleep.value(); + + res.trade_accumulation = {tap}; + } + + return {res}; +} + +api::orderman::DynamicOrderDefinition to_dynamic_order_params(const AlgoParams& input) { + api::orderman::DynamicOrderDefinition result; + result.set_dynamic_order_type("Dorman"); + auto& map = *result.mutable_order_params(); + // step table + + // array of maps + // rows are "de-normalized" maps with column headers as keys + // + // example: + // map["Step Table"] = + // dynamic_array({ + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(500)}, + // {"Order Quantity", dynamic_parameter(250)} + // }), + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(1000)}, + // {"Order Quantity", dynamic_parameter(400)} + // }), + // dynamic_map({ + // {"Market Quantity", dynamic_parameter(1000)}, + // {"Order Quantity", dynamic_parameter(1000)} + // }) + // }); + std::vector table; + std::transform( + input.steps.step_table.begin(), + input.steps.step_table.end(), + std::back_inserter(table), + [](const auto& item) { + return dynamic_map({ + { "Market Quantity", dynamic_parameter(std::get<0>(item)) }, + { "Order Quantity", dynamic_parameter(std::get<1>(item)) } + }); + }); + map["Step Table"] = dynamic_array(table); + map["Max Size"] = dynamic_parameter(input.steps.maximum); + map["Trail Seconds"] = dynamic_parameter(input.steps.trail_seconds); + map["Clip Size"] = dynamic_parameter(input.clip_limit); + + // scratch + map["Enable Scratch"] = dynamic_parameter((bool)(input.scratch)); + if (input.scratch) { + map["Max Overfill"] = dynamic_parameter(input.scratch.value().max_overfill); + } + // + // profit orders + map["Profit Orders"] = dynamic_parameter((bool)input.profit_orders); + if (input.profit_orders) { + map["Ticks Away"] = dynamic_parameter(input.profit_orders.value().ticks_away); + } + + // + // trade accumulator + if (input.trade_accumulation) { + auto& tap = input.trade_accumulation.value(); + map["Trade Accumulation"] = + dynamic_map({ + { "Contracts", dynamic_parameter(tap.contracts) }, + { "Interval (seconds)", dynamic_parameter(tap.seconds) }, + { "Sleep (seconds)", dynamic_parameter(tap.sleep_seconds) } + }); + } + + return result; +} + + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h new file mode 100644 index 000000000..9d0628b76 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -0,0 +1,82 @@ +#pragma once + +#include "lib/orderman/orders/algo/IAlgoOrder.h" +#include +#include +#include +#include + +namespace bts { +namespace orderman { +namespace dorman { + +// +// Algo parameters +// + +// This defines the market quantity vs the order quantity +struct StepParams { + std::vector> step_table; + // This is the cap on the maximum quantity, + // even though the step table can allow for higher quantities (depending on the + // clip size this could be divided across multiple exchange orders) + uint32_t maximum; + // If the market increases don't follow until it has stayed high for trail_seconds; + uint32_t trail_seconds; +}; + +// If the number of accumulated fills (net of profit orders) touches or goes beyond +// this, the fills will be scratched by entering opposite orders at the fill price +struct ScratchParams { + uint32_t max_overfill; +}; +// If this is enabled, then as fills accumulate, profit GTC orders are +// immediately sent N ticks away on the opposite side. +struct ProfitOrderParams { + uint32_t ticks_away; +}; +// If N contracts trade in T seconds, then the algo is paused (ie child exchange order +// is/are cancelled) for X seconds. Once the condition clears order is reentered. +struct TradeAccumulationParams { + uint32_t contracts; + uint32_t seconds; + uint32_t sleep_seconds; +}; +struct AlgoParams { + StepParams steps; + uint32_t clip_limit; + std::optional scratch; + std::optional profit_orders; + std::optional trade_accumulation; +}; + + +class DormanAlgo : public IAlgoOrder { + struct Impl; + std::unique_ptr me; + IAlgoServices& algo() const; + +public: + DormanAlgo(); + ~DormanAlgo(); + + OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; + void do_launch(IAlgoServices &) override; + void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; + void do_update(api::orderman::Update const &) override; + void on_child_change(OrderKey, ChildState const &) override; + void on_book(SecurityKey, const Book&) override; + void on_timer() override; + + Quantity desired_size() const; + +}; + +template +using Result = std::variant; + +Result to_dorman_params(const api::orderman::DynamicOrderDefinition&); +// std::optional to_dorman_params(const api::orderman::DynamicOrderDefinition&); +api::orderman::DynamicOrderDefinition to_dynamic_order_params(const AlgoParams&); + +}}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp new file mode 100644 index 000000000..55a8ad308 --- /dev/null +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -0,0 +1,353 @@ +#include "catch/catch.hpp" +#include "../DormanAlgo.h" +#include "AlgoTestDriver.h" +#include "lib/orderman/orderman_utils/Book.h" +#include +#include + +using namespace std; +using namespace bts::orderman::dorman; + +namespace bts { +namespace orderman { +namespace test { + +/* STATE + +struct OrderState { + Price desired_price; + Quantity desired_size; +} + +*/ + +/* TEST ASPECTS + +order_qty vs market quantity +order_qty reduce when market changes +order_qty increase (w/ delay) when market changes +order_qty maximum + +overfill [under/over] max with auto-scratch [on/off] +Profit orders + - test that orders are sent + - test that away order are at the right price + +Trade Accumulation + - accumulator goes [on/off] + - Dorman goes to sleep when it goes 'on' and wakes up when it goes 'off' + +Market Moves + - Available size increases + - Available size decreases + +clip size pseudo-order + - change clip size + - immidiate effect? + - don't have to cancel if clip size goes down? + - change order size [up/down] + - suspend/resume + - cancels all + + + */ + +void check_round_trip(const AlgoParams& input) { + auto d1 = to_dynamic_order_params(input); + auto ap1 = to_dorman_params(d1); + if (std::holds_alternative(ap1)) { + std::cout << std::get(ap1).error_msg; + } + REQUIRE(std::holds_alternative(ap1)); + auto d2 = to_dynamic_order_params(std::get(ap1)); + + REQUIRE(d2.DebugString() == d1.DebugString()); +} + +TEST_CASE("dorman_round_trip_params", "[algo][dorman]") { + + SECTION("a") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} }, + 1024, 5 + }; + check_round_trip(input); + } + + SECTION("b") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} + }, + 1024, 5 + }; + input.scratch = { 500 }; + input.profit_orders = { 42 }; + input.clip_limit = 220; + check_round_trip(input); + } + + SECTION("c") { + AlgoParams input; + input.steps = { + { {500, 250}, + {1000, 400} + }, + 1024, 5 + }; + input.profit_orders = { 42 }; + input.trade_accumulation = { + 100, 200, 300 + }; + check_round_trip(input); + } + +} + +struct ExpectedSize { + uint32_t input; + uint32_t expected; +}; +constexpr auto some_price = md::IntPrice { 128000, -3 }; + +size_t count_child_size(const std::vector& child_orders) { + return std::accumulate( + child_orders.begin(), + child_orders.end(), 0, + [](uint32_t acc, const auto& child) { + if (child.cstate.status != ChildStatus::CANCELED) { + // count working+completed + return acc + child.cstate.quantity.value(); + } + else return acc; + }); +} + + +TEST_CASE("dorman_order_size", "[algo][dorman]") { + // Repeate the test for a variety of clip sizes + for (auto clip : { 100, 20, 900, 1 }) { + + // create a table of various sizes + // send market state to the algo + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 400}, + {2000, 600}, + {3500, 750}, + {10000, 999} + }; + input.steps.maximum = 800; + input.steps.trail_seconds = 5; + input.clip_limit = clip; + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + + + SECTION("initial size vs market") { + std::vector test_sizes { + { 10, 250 }, + { 200, 250 }, + { 250, 250 }, + { 500, 400 }, + { 999, 400 }, + { 2500, 750 }, + { 9999, 800 } + }; + + for (auto& s : test_sizes) + { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + + // order size is driven by the available market size + book.bid()[0] = { some_price, s.input }; + state.update_book(book); + + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size().value() == s.expected); + REQUIRE( + s.expected == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + } + SECTION("Reduce qty on market shrink (immidiate)") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(400)); + + // Check that orders were created + REQUIRE( + 400 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + + // Reduce market + book.bid()[0] = { some_price, 405 }; + state.update_book(book); + REQUIRE(state.algo().desired_size() == Quantity(250)); + REQUIRE( + 250 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + + SECTION("Increase qty w/ delay when market grows") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(400)); + + // Check that orders were created + REQUIRE( + 400 == count_child_size(state.child_orders())); + + // INCREASE market + book.bid()[0] = { some_price, 1001 }; + state.update_book(book); + // NOTE: that the orders do not follow the market instantly + // so this is still 400 + REQUIRE( + 400 == count_child_size(state.child_orders())); + + // Still 400 after the timer ticks but not enough time has passed + state.advance_time(std::chrono::seconds()); + REQUIRE( + 400 == count_child_size(state.child_orders())); + + state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); + REQUIRE( + 600 == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + + } + SECTION("Respect maximum") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 10505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + + REQUIRE(state.algo().desired_size() == Quantity(input.steps.maximum)); + + // Check that orders were created + REQUIRE( + input.steps.maximum == count_child_size(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); + } + } + } +} + +TEST_CASE("Dorman fills", "[algo][dorman]") { + + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + SECTION("complete when filled") { + // Send out some orders + // Fill them + // Expect order state to become finished + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 501 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().desired_size() == Quantity(450)); + + for (const auto& order : state.child_orders()) { + state.fill(order.key, price, order.cstate.quantity); + } + + REQUIRE(state.state() == AlgoState::COMPLETED); + } + + // Test cases for transitions w/ fills + // + + // target = 500 + // send 5 orders of size 100 + // market move, new target = 450 + // reduce order #5 to 50 + // Before we confirm the move + // - fill #4 for 80 + // :: algo needs to shed another 30 Quantity + + // ^ same but fill #2 for 80 + + + /* + NOTES: + vector = f(fills, target, clip) + => feed into diff + */ +} + +TEST_CASE("Dorman overfill", "[algo][dorman]") { + SECTION("auto-scratch OFF") { + } + SECTION("auto-scratch ON") { + } +} + +TEST_CASE("Dorman profit-orders", "[algo][dorman]") { + SECTION("profit-orders OFF") { + // Profit orders are not sent + } + SECTION("profit-orders ON") { + // profit orders are sent at the right price + } +} + +TEST_CASE("Dorman trade accumulation", "[algo][dorman]") { + SECTION("exceed limit") { + // Profit orders are not sent + } + SECTION("return to normal") { + // profit orders are sent at the right price + } +} + + +}}}//namespace + From 0067e52155ec271d489bf2197f5d5d399f40b9a0 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 1 Jul 2019 23:58:03 -0500 Subject: [PATCH 044/210] SP-89 (pr edit) - wait 4 mkt 2 launch; attach impl --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 4 +- src/client/spark/Orders/OrderDataHelper.cs | 3 +- src/lib/config/protos/UI.proto | 5 ++ .../orderman_utils/orderman_utils.cpp | 5 ++ .../orders/algo/algo_orders/OffsetAlgo.cpp | 68 +++++++++++-------- 5 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 77ecffeb4..19f8cb495 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -994,11 +994,13 @@ namespace mbts.spark { var join = config.Configuration.get(); var lean = config.Configuration.get(); var top = config.Configuration.get(); + var offset = config.Configuration.get(); _algo_type_conf = new Dictionary { { CustomOrderDefinition.CustomOneofCase.Cover, (cover.show_price, cover.show_quantity) }, { CustomOrderDefinition.CustomOneofCase.Join, (join.show_price, join.show_quantity) }, { CustomOrderDefinition.CustomOneofCase.Lean, (lean.show_price, lean.show_quantity) }, - { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) } + { CustomOrderDefinition.CustomOneofCase.Top, (top.show_price, top.show_quantity) }, + { CustomOrderDefinition.CustomOneofCase.Offset, (offset.show_price, offset.show_quantity) } }; } diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 2abb71e8e..ba6699cdf 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -623,7 +623,8 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Lean, CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, - CustomOrderDefinition.CustomOneofCase.Top + CustomOrderDefinition.CustomOneofCase.Top, + CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/config/protos/UI.proto b/src/lib/config/protos/UI.proto index 5731f5170..6d51c635d 100644 --- a/src/lib/config/protos/UI.proto +++ b/src/lib/config/protos/UI.proto @@ -141,6 +141,11 @@ message TopAttachUIOptions { optional bool show_quantity = 2 [default = false]; } +message OffsetAttachUIOptions { + optional bool show_price = 1 [default = false]; + optional bool show_quantity = 2 [default = false]; +} + message ManualFillsOptions { optional bool modal_transactions = 1 [default = true]; } \ No newline at end of file diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 8099a0b5a..a2fbae1ba 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,6 +14,7 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: + case CustomOrderDefinition::kOffset: return true; default: return false; @@ -44,6 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); + case CustomOrderDefinition::kOffset: + return + cdef.offset().has_child() && + can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index f8fb5cdfa..47b179671 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -56,8 +56,6 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; bts_assert(me->child_template); - me->child_key = - algo.launch_child(*me->child_template, algo.price(), algo.quantity()); algo.subscribe_book(SecurityKey(algo.security().id())); } @@ -84,9 +82,14 @@ void OffsetAlgo::do_update(api::orderman::Update const &update) { update.custom().offset().tick_offset_on_deploy(); break; case Status::DEPLOYED: - // only update quantity (tick offset is irrelevant once deployed) + // don't update price - tick offset only determines the deploy price; + // it is irrelevant after that. Update child_update; child_update.set_quantity(algo().quantity().value()); + if (update.has_custom()) { + auto &offset_update = update.custom().offset(); + *child_update.mutable_custom() = offset_update.child(); + } algo().update_child(me->child_key, child_update); break; } @@ -108,38 +111,45 @@ void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; - if (top_psz.size()) { - // determine/set price - Update child_update; - const double &offset = securities::tick_size(algo().security()).value() * - me->tick_offset_on_deploy; - if (side == bts::api::SIDE_BUY) { - child_update.set_price(top_psz.price() - offset); - } else { - // assume that side == SIDE_SELL (bc the book returned a valid size for - // whatever side this is). - child_update.set_price(top_psz.price() + offset); - } - // set quantity - child_update.set_quantity(algo().quantity().value()); - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} {} ticks " - "away.", - algo().order_key().value(), algo().definition().side(), - algo().quantity().value(), algo().price().value(), - me->tick_offset_on_deploy); - // deploy - algo().update_child(me->child_key, child_update); - algo().set_ladder_visibility(false); - me->status = Status::DEPLOYED; - } else { + if (!top_psz.size()) { // log state (still waiting for md) LOG(OrderMan, Diag, "OffsetAlgo order {} still waiting for md. Order: {} {}@ {} ticks " "away.", algo().order_key().value(), algo().definition().side(), algo().quantity().value(), me->tick_offset_on_deploy); + + } else { + const double &offset = securities::tick_size(algo().security()).value() * + me->tick_offset_on_deploy; + const auto &price = + securities::worsen_price(side, Price(top_psz.price()), Price(offset)); + if (algo().is_attaching()) { + // log imminent update + LOG(OrderMan, Diag, + "OffsetAlgo order {} updating attached-child. Order: {} {}@ {} " + "({} ticks " + "away).", + algo().order_key().value(), side, algo().quantity().value(), + price.value(), me->tick_offset_on_deploy); + // update + Update child_update; + child_update.set_price(price.value()); + child_update.set_quantity(algo().quantity().value()); + algo().update_child(me->child_key, child_update); + } else { + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, algo().quantity().value(), + price.value(), me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, price, algo().quantity()); + } + algo().set_ladder_visibility(false); + me->status = Status::DEPLOYED; } } From 1104f4db1d5293c04bd83ece42a7178fe8f970eb Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 09:52:24 -0400 Subject: [PATCH 045/210] SP-87 Reject attach in before_launch --- src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index f7a2e6f2e..786e2ad2d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -61,6 +61,11 @@ OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { me->orders.reserve(me->exposed_qty / me->clip + 1); + if (ibl.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Splitter does not support attach."}; + } + return {}; } @@ -71,7 +76,8 @@ void SplitterAlgo::do_launch(IAlgoServices& ias) { sync_orders(); } void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { - //todo + // rejected in before_launch + bts_assert(false); } void SplitterAlgo::do_update(const api::orderman::Update& update) { // Update # child orders From 049381908cd8087146d485780de8b3ec331f8cc7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 10:34:28 -0400 Subject: [PATCH 046/210] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7c976336d..cf4c7c358 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide/* From 2d56eedf3e3663c0ffe4e4ad75ef5568d20c8e2e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 10:37:47 -0400 Subject: [PATCH 047/210] Bugfix in synthetic_book_merge_tests --- src/lib/md/test/synthetic_book_merge_tests.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index 25d97cfab..e53b8414e 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -111,7 +111,7 @@ tuple,vector> make_securities(c l->mutable_security()->mutable_contract_spec()->set_low_tick(tick_size); l->mutable_security()->mutable_contract_spec()->set_high_tick(tick_size); l->set_quantity(quantity); - l->set_price_multiplier(quantity * (side == api::SIDE_BUY ? 1.0 : -1)); + l->set_price_multiplier(mult); l->set_side(side); synthetic->legs.push_back(instr.consumer()); legs.push_back(instr); @@ -126,7 +126,8 @@ tuple,vector> make_securities(c double quantity, tick_size; api::Side side; std::tie(quantity, tick_size, side) = t; - legs.push_back({ quantity, quantity, tick_size, side }); + double mult = quantity * (side == api::SIDE_BUY ? 1.0 : -1); + legs.push_back({ quantity, mult, tick_size, side }); } return make_securities(legs); } From ac90a2131483454575f12654ecf928dc8fe0c782 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Jul 2019 11:43:36 -0400 Subject: [PATCH 048/210] Clang build fixes. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/md/relay/RelayRecorder.cpp | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..cad2d5f8e 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/SplitterAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.cpp;orderman/orders/algo/algo_orders/tests/AlgoTestDriver.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/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index a15652138..f443c0926 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -208,7 +208,7 @@ struct SecurityExtractor : public IRelayWriter { SecurityExtractor(std::function& cb, size_t count) : _count(count), _cb(cb), _keys() { } ~SecurityExtractor() override {}; - void write(const co2::MDReply& data, bool*) { + void write(const co2::MDReply& data, bool*) override { for (auto const &ch : data.channels()) { for (auto const &cr : ch.updates()) { if (cr.has_security() && _keys.find(cr.security().id()) == _keys.end()) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 2791ac953..c2997c288 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -31,6 +31,7 @@ const std::map& get_some_securities() { struct RecursionCounter { size_t depth = 0; virtual void flush() = 0; + virtual ~RecursionCounter() {} }; struct RecursionGuard { RecursionGuard(RecursionCounter& c) : counter(c) { @@ -371,4 +372,4 @@ void AlgoTestDriverBase::complete() { void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } -}}}//namespace \ No newline at end of file +}}}//namespace From ce104479e1ce88315b35ccf6ecb2b32ea4eca74b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:51:06 -0500 Subject: [PATCH 049/210] removing last_side; incrementing shm_version --- src/lib/md/Shm/MDStructure.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib/md/Shm/MDStructure.h index dd5dbb6b5..3553b71d8 100644 --- a/src/lib/md/Shm/MDStructure.h +++ b/src/lib/md/Shm/MDStructure.h @@ -26,7 +26,7 @@ namespace md { using utils::TimeStamp; -const uint32_t shm_version = 101; +const uint32_t shm_version = 102; struct ALIGNED_(CACHE_LINE) HotHeader { size_t count; @@ -214,7 +214,6 @@ struct ColdEntry { last_trade(), total_volume(0), last_trade_time(), - last_side(co2::AggressorSide::AGGRESSOR_SIDE_NONE), misc(), deleted(false) { @@ -230,7 +229,6 @@ struct ColdEntry { AtomicPriceSize last_trade; size_t total_volume; datetime::LLDateTime last_trade_time; - co2::AggressorSide last_side; MiscData misc; From b9dcad95496f8e4444fcfcacb8ab0b9acad1ae90 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:52:21 -0500 Subject: [PATCH 050/210] don't reset last trade size when aggressor changes --- src/lib/md/MDProducerHandle.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index 471fd53e1..d11579e82 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -104,12 +104,11 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { // Add this trade to the last trade if price/side match auto current = std::get(cdata().last_trade.load()); - if (current.int_price() == price.int_price() && agside == cdata().last_side) { + if (current.int_price() == price.int_price()) { cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time); } else { cdata().last_trade.store(price,time); - cdata().last_side = agside; } cdata().last_trade_time = tradetime; cdata().total_volume = volume; From db2de3e8c45aa5b942d3698ddd2fca371180b1d0 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 10:53:11 -0500 Subject: [PATCH 051/210] remove last_side; change StructLayout Size accordingly --- src/client/spark_api/Co2/MDConsumerHandle.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/client/spark_api/Co2/MDConsumerHandle.cs b/src/client/spark_api/Co2/MDConsumerHandle.cs index d13ef5b08..7b03bdaee 100644 --- a/src/client/spark_api/Co2/MDConsumerHandle.cs +++ b/src/client/spark_api/Co2/MDConsumerHandle.cs @@ -253,14 +253,13 @@ namespace mbts.co2 { } } - [StructLayout(LayoutKind.Sequential, Size = 712)] + [StructLayout(LayoutKind.Sequential, Size = 704)] internal struct ColdEntry { public int exchange_status; // Last trade public AtomicPriceSize last_trade; public ulong total_volume; public utils.LLDateTime last_trade_time; - private AggressorSide last_side; //// Settlement public UInt64 misc_timestamp; From 5a256d4634ed60ca0a5605baee1ab31f1fa40fd3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 11:55:55 -0400 Subject: [PATCH 052/210] SP-104 PEBKAC buy with negative mult is nonsense --- .../md/test/synthetic_book_merge_tests.cpp | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index e53b8414e..63d1914c9 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -458,6 +458,113 @@ TEST_CASE("Synthetic_net_change", "[md][synthetic]") { } } +TEST_CASE("HCL_SP_104", "[md][synthetic]") { + shared_ptr synthetic; + vector test_instr; + tie(synthetic, test_instr) = make_securities({ + // (quantity, multiplier, tick_size, side) + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, 1.0, 0.01, api::SIDE_BUY}, + {1.0, -1.0, 0.01, api::SIDE_SELL}, + {1.0, -1.0, 0.01, api::SIDE_SELL } + }); + auto leg1 = test_instr[0]; // CLQ9-CLU9 + auto leg2 = test_instr[1]; // HCLQ9-CLQ9 + auto leg3 = test_instr[2]; // HCLQ9-HCLU9 + auto leg4 = test_instr[3]; // HCLU9-CLU9 + + setup_market(leg1.producer(), + { + { -0.10, 3299 }, + { -0.11, 2885 }, + { -0.12, 2558 }, + { -0.13, 2447 }, + { -0.14, 1540 }, + { -0.15, 2334 }, + { -0.16, 1396 }, + { -0.17, 1190 }, + { -0.18, 1221 }, + { -0.19, 812 } + }, + { + { -0.09, 1318 }, + { -0.08, 2174 }, + { -0.07, 3057 }, + { -0.06, 2331 }, + { -0.05, 2543 }, + { -0.04, 2638 }, + { -0.03, 2232 }, + { -0.02, 3221 }, + { -0.01, 2863 }, + { 0.00, 3327 } + }); + + setup_market(leg2.producer(), + { + { 4.06, 1 }, + { 4.05, 2 }, + { 4.04, 3 }, + { 4.03, 12 }, + { 4.02, 6 }, + { 4.01, 1 } + }, + { + { 4.07, 1 }, + { 4.08, 2 }, + { 4.10, 8 }, + { 4.11, 10 }, + { 4.12, 2 }, + { 4.14, 1 } + }); + + setup_market(leg3.producer(), + { + { 0.20, 2 }, + { 0.19, 6 }, + { 0.18, 5 }, + { 0.17, 18 }, + { 0.16, 2 }, + { 0.15, 3 }, + { 0.14, 2 } + }, + { + { 0.22, 2 }, + { 0.23, 4 }, + { 0.24, 9 }, + { 0.25, 17}, + { 0.26, 5 }, + { 0.27, 5 }, + { 0.28, 4 }, + { 0.29, 2 }, + { 0.30, 2 } + }); + + setup_market(leg4.producer(), + { + { 3.75, 1 }, + { 3.74, 3 }, + { 3.73, 4 }, + { 3.72, 12 }, + { 3.71, 1 }, + { 3.70, 3 } + }, + { + { 3.78, 1 }, + { 3.79, 2 }, + { 3.80, 6 }, + { 3.81, 1 }, + { 3.82, 10 }, + { 3.83, 1 } + }); + + MDConsumerHandle synthetic_handle(synthetic); + // dump_market(synthetic_handle); + expect_market(synthetic_handle, + { { -0.04,1 },{ -0.06,1 },{ -0.07,1 },{ -0.09,3 },{ -0.11,3 },{ -0.12,1 },{ -0.13,5 },{ -0.14,3 },{ -0.15,2 },{ -0.16,1 } }, + { { 0.03,1 },{ 0.05,1 },{ 0.06,1 },{ 0.08,1 },{ 0.09,4 },{ 0.11,3 },{ 0.12,2 },{ 0.13,7 },{ 0.14,1 },{ 0.16,2 } } + ); +} + // // Benchmarks From 5b75b8718a010baca3a0dbeb0456cb4895a20537 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 11:14:01 -0500 Subject: [PATCH 053/210] updating comment to reflect change --- src/lib/md/MDProducerHandle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index d11579e82..a52292972 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -102,7 +102,7 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { } void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { - // Add this trade to the last trade if price/side match + // Add this trade to the last trade if price match auto current = std::get(cdata().last_trade.load()); if (current.int_price() == price.int_price()) { cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time); From cb31269a70b4b422d24b611e5e6400cfabf610b8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 13:14:46 -0400 Subject: [PATCH 054/210] added pnl impact to margin --- src/lib/api/services/MarginService.proto | 3 +- src/lib/api/services/PositionService.proto | 1 + .../sparkd/position/MarginServiceServer.cpp | 66 +++++++++++-------- .../sparkd/position/MarginServiceServer.h | 7 +- .../sparkd/position/PositionAggregator.cpp | 27 ++++++++ .../sparkd/position/PositionAggregator.h | 3 +- .../position/PositionServicePNLHelper.cpp | 4 ++ 7 files changed, 81 insertions(+), 30 deletions(-) diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index 502602749..c6479c66e 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -3,6 +3,7 @@ package bts.api.position; option csharp_namespace="bts.api.position"; import "lib/api/apioptions.proto"; import "lib/api/apicore.proto"; +import "lib/api/services/PositionService.proto"; message MarginResult { enum ResultStatus { NewValid = 0; CachedValid = 1; Error = 2; } @@ -26,7 +27,7 @@ message ExcessLiquidityReport { double leverage_factor = 20; double cash_balance = 30; MarginResult margin_result = 40; - + AccountPNL account_pnl = 50; double excess_liquidity = 100; } diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index c7879cc5d..b8aceea6c 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -32,6 +32,7 @@ message PNLUnit{ message AccountPNL{ uint32 account_id = 1 [(bts.api.key)=true]; + string account_name = 10; double day_pnl = 20; } diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 26bc54e56..a216ffa77 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -13,6 +13,7 @@ #include "lib/utils/bts_assert.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/Dispatcher.h" +#include "lib/os/os.h" #include #include @@ -70,15 +71,16 @@ void MarginServiceServer::publish_all() auto it = _last_update.find(acct); if(it != _last_update.end()) since = it->second; - std::vector pos; - if(_position->query_positions(acct, pos, &since) && pos.size()) + std::vector pos; AccountPNL pnl; + if(_position->query_positions(acct, pos, pnl, &since) && pos.size()) { LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); auto aname = orderman::to(acct); - _margin->compute_margin(aname, pos, [this, since, acct](const MarginResult& m) + _margin->compute_margin(aname, pos, [this, since, acct, pnl](const MarginResult& m) { std::scoped_lock l(_lock); - publish_margin(m); + publish_margin(m); + publish_excess_liquidity_report(m, pnl); _last_update[acct] = since; }); } @@ -101,8 +103,8 @@ void MarginServiceServer::get_margin(const api::position::MarginRequest& request { orderman::AccountName acct; orderman::str_to(request.account(), &acct); - std::vector pos; - _position->query_positions(request.account(), pos); + std::vector pos; AccountPNL pnl; + _position->query_positions(request.account(), pos, pnl); _margin->compute_margin(acct, pos, [=](const MarginResult& m) { reply(m); @@ -128,38 +130,50 @@ void MarginServiceServer::publish_margin(const api::position::MarginResult& resu { std::scoped_lock l(_lock); _publisher.add_or_update(result); - _publisher.flush(); - - publish_excess_liquidity_report(result); + _publisher.flush(); } -void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result) +void MarginServiceServer::publish_excess_liquidity_report(const api::position::MarginResult& result, const api::position::AccountPNL& pnl) { std::scoped_lock l(_lock); ExcessLiquidityReport report; report.set_account(result.account()); + report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); - auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); - double netliq = 0.0; - if(acct && acct->has_margin_limit()) - { - report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); - netliq = report.leverage_factor() * report.cash_balance(); - } - netliq -= result.maint_margin(); + update_report_with_account(report, result.account()); + + double netliq = report.leverage_factor() * report.cash_balance(); + if(!bts::os::is_nan(result.maint_margin())) + netliq -= result.maint_margin(); + if(!bts::os::is_nan(pnl.day_pnl())) + netliq += pnl.day_pnl(); report.set_excess_liquidity(netliq); _last_report[result.account()] = report; _report_publisher.add_or_update(report); _report_publisher.flush(); } -void MarginServiceServer::update_report(const std::string& account) +void MarginServiceServer::update_report_with_account(const std::string& account) { - MarginResult res; - auto acct = orderman::to(account); - if(_margin->get_last_valid_result(acct, res)) - publish_excess_liquidity_report(res); + auto it = _last_report.find(account); + if(it != _last_report.end()) + { + api::position::ExcessLiquidityReport report = it->second; + update_report_with_account(report, account); + _report_publisher.add_or_update(report); + _report_publisher.flush(); + } +} + +void MarginServiceServer::update_report_with_account(api::position::ExcessLiquidityReport& report, + const std::string& account) +{ + auto acct = AdminServiceUtils::find_account(_admin_data, account, false); + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + } } void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, @@ -188,7 +202,7 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report(request.account()); + update_report_with_account(request.account()); }); } } @@ -219,7 +233,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report(request.account()); + update_report_with_account(request.account()); }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index b99836099..27ff1e3f6 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -7,6 +7,8 @@ #include "lib/api/services/MarginService.server.pb.h" #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/PositionService.pb.h" +#include "lib/api/services/PositionService.client.pb.h" #include "lib/utils/bts_no_copy.h" #include "lib/utils/datetime.h" #include @@ -41,8 +43,9 @@ public: private: void publish_margin(const api::position::MarginResult&); - void publish_excess_liquidity_report(const api::position::MarginResult&); - void update_report(const std::string&); + void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); + void update_report_with_account(const std::string&); + void update_report_with_account(api::position::ExcessLiquidityReport&, const std::string&); void publish_all(); private: diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 74f0131e5..0bcaeb329 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -22,6 +22,7 @@ namespace position { PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md::MDClient& mdclient) : _position_service(std::move(pos)), _position_map(), + _pnl_map(), _accounts(), _oracle(mdclient), _lock() @@ -49,6 +50,28 @@ PositionAggregator::PositionAggregator(api::position::PositionService&& pos, md: _accounts[o->account()] = bts::datetime::ll_now(); } }); + _position_service.subscribe_pnl_account_data() | + rxcpp::operators::subscribe( + [this](auto const& update) + { + std::scoped_lock l(_lock); + for (const auto& o : update.removed()) + { + const auto& it = _pnl_map.find(o->account_name()); + if(it != _pnl_map.end()) + _pnl_map.erase(it); + } + for (const auto& ch : update.changed()) + { + const auto& o = ch.current(); + _pnl_map[o->account_name()] = *o; + } + for (const auto& o : update.added()) + { + _pnl_map[o->account_name()] = *o; + } + }); + } PositionAggregator::~PositionAggregator() {} @@ -62,6 +85,7 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) } bool PositionAggregator::query_positions(const std::string& account, std::vector& result, + api::position::AccountPNL& pnl, datetime::LLDateTime* since) { auto last_update = _accounts[account]; @@ -88,6 +112,9 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; + auto pit = _pnl_map.find(account); + if(pit != _pnl_map.end()) + pnl = pit->second; return true; } return false; diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index db9ec5ad5..6b46e5429 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -21,12 +21,13 @@ public: PositionAggregator(api::position::PositionService&&, md::MDClient&); ~PositionAggregator(); - bool query_positions(const std::string& account, std::vector& result, + bool query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since = nullptr); private: api::position::PositionService _position_service; std::map _position_map; + std::map _pnl_map; std::map _accounts; md::SecurityOracle _oracle; std::recursive_mutex _lock; diff --git a/src/server/sparkd/position/PositionServicePNLHelper.cpp b/src/server/sparkd/position/PositionServicePNLHelper.cpp index c2c50b4f0..e7687c87b 100644 --- a/src/server/sparkd/position/PositionServicePNLHelper.cpp +++ b/src/server/sparkd/position/PositionServicePNLHelper.cpp @@ -174,10 +174,12 @@ void PositionServicePNLHelper::_aggregate_account_pnl( std::map acc_pnl; for (const auto& pnlu : in_pnl){ uint32_t acct_id = pnlu.pos().account_id(); + const std::string& acct_name = pnlu.pos().account(); auto it=acc_pnl.find(acct_id); if(it==acc_pnl.end()){ AccountPNL new_acc; new_acc.set_account_id(acct_id); + new_acc.set_account_name(acct_name); new_acc.set_day_pnl(0.0); acc_pnl[acct_id]=new_acc; it=acc_pnl.find(acct_id); @@ -188,10 +190,12 @@ void PositionServicePNLHelper::_aggregate_account_pnl( } // for accounts with no positions add 0 for (const auto& p : account_map){ + const std::string& acct_name = p.first; uint32_t acct_id = p.second; if(acc_pnl.find(acct_id) == acc_pnl.end()){ AccountPNL new_acc; new_acc.set_account_id(acct_id); + new_acc.set_account_name(acct_name); new_acc.set_day_pnl(0.0); acc_pnl[acct_id]=new_acc; } From 8248bd7db8c242b51518f7015e2ac9b1fb3d86a9 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 13:26:11 -0400 Subject: [PATCH 055/210] Add descriptive comment to splitteralgo --- .../orders/algo/algo_orders/SplitterAlgo.h | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index ff2d86598..ca293856c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -5,6 +5,28 @@ namespace bts { namespace orderman { namespace splitter { +/* + SplitterAlgo + + Parameters: + max_order_qty + -- Clip size. No single order can exceed this quantity. + exposed_qty + -- The total quantity we want visible on the exchange. + -- This will typically be higher than the quantity which helps capture fills in pro-rata algorithms + price, quantity + -- Common to all orders. + -- Splitter is filled when it reaches (or exceeds) quantity not exposed_qty + + SplitterAlgo acts as a single order to its parent but actually divides the total exposure + by the clip size and working several orders at once. + - It completes when the quantity is matched or exceeded. + - It tries to maximize the size of the orders and it may sacrifice queue position to do that. + - It reacts to fills and parameter changes and adjusts it's children appropriately. + - See splitter_tests.cpp for examples + - Future work: By constraining maximum size we can force this algorithm to maintain queue position. + +*/ class SplitterAlgo : public IAlgoOrder { struct Impl; From cdabf3b0233dd53e9d0698b604acf099c1ab9151 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 13:34:30 -0400 Subject: [PATCH 056/210] SP-87 - Report fills to parent --- .../orderman/orders/algo/algo_orders/SplitterAlgo.cpp | 9 ++++++++- .../orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 9 ++++++--- .../orders/algo/algo_orders/tests/splitter_tests.cpp | 8 ++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 786e2ad2d..761604888 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -5,7 +5,6 @@ #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/algo/IAlgoServices.h" -// #include "google/btree/btree_map.h" #include #include @@ -32,6 +31,8 @@ struct SplitterAlgo::Impl { uint32_t target_qty = 0; bool is_terminated = false; + Quantity total_fills = {}; + Price last_fill_price = {}; std::vector orders; }; @@ -95,6 +96,12 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { for (auto& child : me->orders) { if (child.key == key) { + auto delta = state.total_fills.value() - child.state.total_fills.value(); + if (delta != 0) { + me->total_fills = Quantity { me->total_fills.value() + delta }; + me->last_fill_price = state.last_price; + algo().update_fill_state(me->total_fills, me->last_fill_price); + } child.state = state; break; } diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index c2997c288..bee71af2f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -55,6 +55,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { TimeStamp now; api::Security security; OrderKey order_key, parent_key; + std::tuple fill_state; AlgoState state; std::vector orders; @@ -276,7 +277,9 @@ TimeStamp AlgoTestDriverBase::get_time() const { return me->now; } Price AlgoTestDriverBase::price() const { return me->price; } Quantity AlgoTestDriverBase::quantity() const { return me->size; } -Quantity AlgoTestDriverBase::total_fills() const { return Quantity(0); } +Quantity AlgoTestDriverBase::total_fills() const { + return std::get(me->fill_state); +} void AlgoTestDriverBase::subscribe_book(SecurityKey key){ me->book_subs[key] = true; @@ -370,6 +373,6 @@ void AlgoTestDriverBase::complete() { me->state = AlgoState::COMPLETED; } void AlgoTestDriverBase::set_ladder_visibility(bool) { /* whatever, ok */ } -void AlgoTestDriverBase::update_fill_state(Quantity, Price) { } +void AlgoTestDriverBase::update_fill_state(Quantity q, Price p) { me->fill_state = { q, p }; } -}}}//namespace +}}}//namespace \ No newline at end of file diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index adb06283b..46cce7292 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -99,6 +99,7 @@ TEST_CASE("completes on target", "[algo][splitter]") { for (const auto& order : orders) { state.fill(order.key, Price (some_price.price()), order.cstate.quantity); filled += order.cstate.quantity.value(); + REQUIRE(filled == state.total_fills().value()); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; @@ -123,6 +124,7 @@ TEST_CASE("completes on target", "[algo][splitter]") { auto price = Price {some_price.price()}; state.fill(order.key, price, Quantity {1}); filled += 1; + REQUIRE(filled == state.total_fills().value()); // Fills should never cause new orders to get added REQUIRE(state.child_orders().size() == expected); if (filled >= tcase.target.value()) { @@ -184,10 +186,14 @@ TEST_CASE("updates", "[algo][splitter]") { } } + uint32_t fills = 0; for(auto q : std::get<1>(tcase)) { state.fill({}, Quantity {q}); + fills += q; } + REQUIRE(state.total_fills().value() == fills); + Update update; auto case_next = std::get<2>(tcase); update.set_price(some_price.price()); @@ -251,6 +257,8 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { std::set actual, expected {100,100,50,50}; for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } REQUIRE(actual == expected); + + REQUIRE(state.total_fills().value() == 200); } TEST_CASE("Reduction with fills 2", "[algo][splitter]") { From 23f10eac70ec0937a75e5d89cd9d6b804f44a475 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 2 Jul 2019 14:10:27 -0400 Subject: [PATCH 057/210] Add accountPnl to emptyMargin --- src/web/ui/src/Access.fs | 7 ++++++- src/web/ui/src/ui.fsproj | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 5b44bfb20..33a6d1453 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -113,7 +113,7 @@ module Accounts = riskLimitEnforcement = { productLimitInNetTerms = true } - accountLossLimit = + accountLossLimit = { enforce = false totalLossLimit = 0u @@ -137,6 +137,11 @@ module Accounts = } leverageFactor = 0.0 cashBalance = 0.0 + accountPnl = { + accountId = 0u + accountName = "" + dayPnl = 0.0 + } excessLiquidity = 0.0 } diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index cf28db353..fc520834a 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -28,6 +28,7 @@ + From b2c3488c5e78594e2101c21e1b77bd2c8e14bc81 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 14:01:07 -0500 Subject: [PATCH 058/210] draw volume numbers when bars not present --- src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 8f0168332..f91867329 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -215,7 +215,7 @@ namespace mbts.spark { Brush total_brush = null; if (settings.total.bars.result.HasValue) { total_brush = new SolidColorBrush(settings.total.bars.result.Value); - } else if (components.Count == 0) { + } else if (components.Count == 0 && !settings.show_ltq) { _clear_visual(dv); return; } From 8f22a326ab15973a7ff8e9a68c3daeb233ac3e92 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Jul 2019 14:01:50 -0500 Subject: [PATCH 059/210] last on volume foreground text is now white --- src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index f91867329..d12c79a6c 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -221,10 +221,10 @@ namespace mbts.spark { } // inflate the max so that the graph never fills the available space double max = data.Max(v => v.Volume) * 1.1; - Brush text_brush = settings.general.foreground.rgb_brush(); _render_cells(dv, row_height, data.Select(d => (d.Price, d)), settings.general, prices, spec, render_cell); /// local methods void render_cell(DrawingContext dc, int r, VolumeAtPriceLevelImmutable vap) { + Brush text_brush = settings.general.foreground.rgb_brush(); double y = row_height * r; var last_trade_here = r == last_index; @@ -259,6 +259,7 @@ namespace mbts.spark { if (settings.show_ltq && last_trade_here) { numbers_text.Clear(); numbers_text.Add(last_size_and_direction); + text_brush = BTSCoreColors.white; } if (numbers_text.Count > 0) { string str = string.Join("/", numbers_text); From b5d7d98098c06d949cbbca670aa74286fc6686d4 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 2 Jul 2019 15:04:55 -0400 Subject: [PATCH 060/210] Add DayPnL to SA Margin tab --- src/web/ui/src/Accounts/View.fs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 4be9094d5..c6eedaa7b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -90,17 +90,16 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str "Account") - TableControl.Cell (str "As Of Time") + TableControl.Cell (div [Style [MinWidth "3em"]][str "As Of"]) + TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Cash Balance") TableControl.Cell (str "Non Opt Value") TableControl.Cell (str "Opt Value") TableControl.Cell (str "Initial Margin") - TableControl.Cell (str "Maint Margin") + TableControl.Cell (str "Maint. Margin") + TableControl.Cell (str "Day PnL") TableControl.Cell (str "Excess Liquidity") - // TableControl.Cell (str "portfolioId") - // TableControl.Cell (str "settleIndicator") - // TableControl.Cell (str "settleQualifier") ] className = "" header = None @@ -110,14 +109,15 @@ let marginView model dispatch = { cells = [ - //TableControl.Cell (str model.marginScratch.account) TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) + TableControl.Cell (str model.marginScratch.account) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginScratch.accountPnl.dayPnl))) TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) From 6997aed9bd45d30d5df4335d301504a4f347f926 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 15:05:23 -0400 Subject: [PATCH 061/210] fixed SPARK-2524, allowing admin logins to not require a keycode session --- src/lib/utils/AuthSessionManager.cpp | 5 +++ src/lib/utils/AuthToken.cpp | 40 ++++++++++++++++++- src/server/sparkd/user/AdminServiceServer.cpp | 2 +- testing/manual/keycodes/keycode.txt | 16 +++++++- 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 11d620282..6170fdb40 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -105,13 +105,18 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t if(it != _map.end()) { _map[tok.id()] = Session{tok}; + LOG(Gen, Warn, "KEYCODE: Replacing session {} ", tok.id()); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; + LOG(Gen, Warn, "KEYCODE: Creating session {} ", tok.id()); return true; } + if(msg) + *msg = "KEYCODES: Not Enough Logins available for session"; + LOG(Gen, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); return false; } diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index e1292b595..ebd753957 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -51,6 +51,42 @@ AuthSessionManager& session_manager() return mgr; } +bool requires_auth_session(const admin::BTSUser& user) +{ + bool needs_session = false; + //if the user can trade in any account or see market data, it needs a session + if(user.has_user_data() && + user.user_data().has_account_permissions() && + user.user_data().account_permissions().account_permissions_size()) + { + for(const auto& i: user.user_data().account_permissions().account_permissions()) + { + if(i.second.has_trading_permission() && i.second.trading_permission().has_permissions()) + { + needs_session = true; + break; + } + } + } + + if(user.has_user_data() && + user.user_data().has_exchange_user_data()) + { + if(user.user_data().exchange_user_data().has_cme_data()) + { + for(const auto& i: user.user_data().exchange_user_data().cme_data().md_permissions()) + { + if(i.enabled()) + { + needs_session = true; + break; + } + } + } + } + return needs_session; +} + AuthToken generate_token(const admin::BTSUser& user, std::string* msg) { api::user::TokenPayload payload; @@ -58,7 +94,9 @@ AuthToken generate_token(const admin::BTSUser& user, std::string* msg) payload.set_id(user.id()); if(user.name() == "bts") payload.set_wheel(true); - session_manager().add_or_replace_session(payload, msg); + + if(requires_auth_session(user)) + session_manager().add_or_replace_session(payload, msg); auto token = encrypt(payload.SerializeAsString()); bts_assert_d(token.size() < 255-8); AuthToken result; diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 9e317e7fc..b795c7f39 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -155,7 +155,7 @@ void AdminServiceServer::get_filtered_admin_data( const api::Response& reply) { bts::api::user::TokenPayload toke; - if(bts::api::auth::decode_token(token, &toke)) + bts::api::auth::decode_token(token, &toke); { if(toke.wheel()) reply(_state); diff --git a/testing/manual/keycodes/keycode.txt b/testing/manual/keycodes/keycode.txt index ffd573a26..ed9535602 100644 --- a/testing/manual/keycodes/keycode.txt +++ b/testing/manual/keycodes/keycode.txt @@ -15,7 +15,7 @@ This will test our ability to generate and enforce keycodes. You should see keycode details printed to screen -4) Now test concurrent logins. Start a sparkd. +4) Now test concurrent logins. Start a sparkd. Make sure bts_2 and bts_3 have market data permission a) Start a spark -multiple login as bts and go to where you would see some market data b) Start another spark -multiple but log in as bts_2 and display some data c) Start a third spark -multiple, log in as bts_2 and display some data. @@ -37,5 +37,19 @@ You should see keycode details printed to screen d) remove the expired keycode you just generated by: rm ~/sparkdata/conf/keycode.conf e) restart sparkd, you should see data as normal in bts_2 + +6) Test admin vs trading logins +Note that an admin login is one that does not have trading permission in any account +AND does not have the ability to see any market data + + a) start sparkd again. make sure bts_2 and bts_3 have market data and trading permissions in webui + b) Start a spark -multiple login as bts_2 and go to where you would see some market data. You should see data + c) Start a webui and log in as bts_3, you should see data + d) close your shell and log out of web ui, now log in bts_3 into the webui and log in bts_2 in a shell ( + this is the reverse of the previous order), you should see a message in the shell about keycodes, but it will let you log in, just not see market data + e) from the webui, de-permission bts_3 from trading AND market data, + f) exit shell, log out of webui and kill sparkd, restart sparkd + + g)now try d again-- you should not get the same shell error From 7973b927a2e0251201d2c13b18cd7817d47314d2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 15:22:54 -0500 Subject: [PATCH 062/210] SP-89 (pr edit) - fwd price updates to child; cache update qty --- src/client/spark/Orders/OrderDataHelper.cs | 2 +- .../orderman_utils/orderman_utils.cpp | 8 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 83 +++++++++---------- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index ba6699cdf..9b8113547 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -624,7 +624,7 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top, - CustomOrderDefinition.CustomOneofCase.Offset + //CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index a2fbae1ba..24af902e3 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -45,10 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); - case CustomOrderDefinition::kOffset: - return - cdef.offset().has_child() && - can_consume_attachment(cdef.offset().child().custom_case()); + // case CustomOrderDefinition::kOffset: + // return + // cdef.offset().has_child() && + // can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index 47b179671..4ca18e87a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -20,6 +20,7 @@ struct OffsetAlgo::PImpl { ChildTemplate *child_template = nullptr; Book last_book; uint32_t tick_offset_on_deploy; + uint32_t quantity; }; OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} @@ -30,6 +31,10 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { auto &def = serv.definition(); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_offset()); + if (serv.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Attaching to offset algo is not supported"}; + } // Validate the offset part of the definition auto &offset = def.custom_def().offset(); if (!offset.has_child() && @@ -39,53 +44,54 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { "Offset order must have either a child order definition or an " "order to attach to"}; } - me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); - - if (!serv.is_attaching()) { - // if we are not attaching create a child template so we can - // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().offset().child(); - me->child_template = &(serv.make_child_template(child_def)); - } - + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); return {}; } void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; + me->quantity = algo.quantity().value(); bts_assert(me->child_template); algo.subscribe_book(SecurityKey(algo.security().id())); } -void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, - ChildState st) { - me->algo = &algo; - me->child_key = k; - algo.subscribe_book(SecurityKey(algo.security().id())); - on_child_change(k, st); +void OffsetAlgo::do_launch_attached(IAlgoServices &, OrderKey, + ChildState) { + bts_assert(false); } void OffsetAlgo::do_update(api::orderman::Update const &update) { LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); + bts_assert(!algo().is_attaching()); // validate update if (update.has_custom() && !update.custom().has_offset()) { algo().terminate_error("Invalid update"); return; } + me->quantity = update.quantity(); // apply update switch (me->status) { case Status::WAITING_FOR_MD: - me->tick_offset_on_deploy = - update.custom().offset().tick_offset_on_deploy(); + if (update.has_custom()) { + // already asserted that the child is Offset + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); + auto &def = algo().definition(); + auto child_def = def; + *child_def.mutable_custom_def() = update.custom().offset().child(); + me->child_template = &(algo().make_child_template(child_def)); + } break; case Status::DEPLOYED: - // don't update price - tick offset only determines the deploy price; - // it is irrelevant after that. Update child_update; - child_update.set_quantity(algo().quantity().value()); + child_update.set_quantity(me->quantity); + child_update.set_price(algo().price().value()); if (update.has_custom()) { auto &offset_update = update.custom().offset(); *child_update.mutable_custom() = offset_update.child(); @@ -96,6 +102,7 @@ void OffsetAlgo::do_update(api::orderman::Update const &update) { } void OffsetAlgo::on_book(SecurityKey, Book const &b) { + bts_assert(!algo().is_attaching()); me->last_book = b; // log top of book LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", @@ -109,6 +116,7 @@ void OffsetAlgo::on_book(SecurityKey, Book const &b) { void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); + bts_assert(!algo().is_attaching()); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; if (!top_psz.size()) { @@ -124,30 +132,15 @@ void OffsetAlgo::try_deploy() { me->tick_offset_on_deploy; const auto &price = securities::worsen_price(side, Price(top_psz.price()), Price(offset)); - if (algo().is_attaching()) { - // log imminent update - LOG(OrderMan, Diag, - "OffsetAlgo order {} updating attached-child. Order: {} {}@ {} " - "({} ticks " - "away).", - algo().order_key().value(), side, algo().quantity().value(), - price.value(), me->tick_offset_on_deploy); - // update - Update child_update; - child_update.set_price(price.value()); - child_update.set_quantity(algo().quantity().value()); - algo().update_child(me->child_key, child_update); - } else { - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " - "away).", - algo().order_key().value(), side, algo().quantity().value(), - price.value(), me->tick_offset_on_deploy); - // deploy - me->child_key = - algo().launch_child(*me->child_template, price, algo().quantity()); - } + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, me->quantity, + price.value(), me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, Price(price), Quantity(me->quantity)); algo().set_ladder_visibility(false); me->status = Status::DEPLOYED; } From 8d34279ab0e8bb6cfc6d7d8dea6144fd2dd45df7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Jul 2019 16:26:34 -0400 Subject: [PATCH 063/210] SP-68 Fix crash on exit by not touching queue on windows. insert_or_replace() is a no-op on windows anyway. --- src/lib/md/SecurityCache.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/md/SecurityCache.cpp b/src/lib/md/SecurityCache.cpp index 160633145..63a181a5d 100644 --- a/src/lib/md/SecurityCache.cpp +++ b/src/lib/md/SecurityCache.cpp @@ -22,6 +22,7 @@ void SecurityCacheImpl::enqueue_update_db(const SecurityPtr& security) { } void SecurityCacheImpl::flush() { + #ifndef _WIN32 if (!update_queue.empty()) { std::vector work; SecurityPtr temp; @@ -33,6 +34,7 @@ void SecurityCacheImpl::flush() { } } } + #endif } ////////////////// From 4b76e9175730b640a29aa3a24eb77677fcf00aaf Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 15:48:24 -0500 Subject: [PATCH 064/210] SP-89 (pr edit) - 'can_consume_attachment()' returns false for 'Offset' --- src/lib/orderman/orderman_utils/orderman_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index 24af902e3..cb18aea6c 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,8 +14,8 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: - case CustomOrderDefinition::kOffset: - return true; + // case CustomOrderDefinition::kOffset: + // return true; default: return false; } From cc579034b22edf8e710510f632301eea3ec4b7f9 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:05:22 -0400 Subject: [PATCH 065/210] fix bug in margin service --- src/server/sparkd/position/MarginServiceServer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index a216ffa77..6f7d42b96 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -44,7 +44,12 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: { LOG(Gen, Info, "MarginServiceServer: service started"); - _admin_data = *_admin_service.get_admin_data(api::VoidMessage()).value(); + _admin_service.get_admin_data(api::VoidMessage(), + [=] (const bts::api::Result<::bts::api::admin::AdminData> r) + { + if(r.value()) + _admin_data = *r.value(); + }); _admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) From fdb462eda4f635ab12e0cac4ac660623c2355a89 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:34:46 -0400 Subject: [PATCH 066/210] simplify margin server states --- .../sparkd/position/MarginServiceServer.cpp | 35 +++++-------------- .../sparkd/position/MarginServiceServer.h | 2 -- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 6f7d42b96..9557b8a1a 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -33,7 +33,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _publisher(make_margin_data_stateful_publisher()), _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), - _timer(_dispatcher, 60000, [=]() { publish_all();} ), + _timer(_dispatcher, 20000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), //state below @@ -145,7 +145,12 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M report.set_account(result.account()); report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); - update_report_with_account(report, result.account()); + auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); + if(acct && acct->has_margin_limit()) + { + report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); + report.set_cash_balance(acct->margin_limit().cash_balance()); + } double netliq = report.leverage_factor() * report.cash_balance(); if(!bts::os::is_nan(result.maint_margin())) @@ -158,28 +163,6 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M _report_publisher.flush(); } -void MarginServiceServer::update_report_with_account(const std::string& account) -{ - auto it = _last_report.find(account); - if(it != _last_report.end()) - { - api::position::ExcessLiquidityReport report = it->second; - update_report_with_account(report, account); - _report_publisher.add_or_update(report); - _report_publisher.flush(); - } -} - -void MarginServiceServer::update_report_with_account(api::position::ExcessLiquidityReport& report, - const std::string& account) -{ - auto acct = AdminServiceUtils::find_account(_admin_data, account, false); - if(acct && acct->has_margin_limit()) - { - report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); - } -} void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -207,7 +190,7 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report_with_account(request.account()); + _last_update[request.account()] = 0; }); } } @@ -238,7 +221,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - update_report_with_account(request.account()); + _last_update[request.account()] = 0; }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 27ff1e3f6..760d1f459 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -44,8 +44,6 @@ public: private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); - void update_report_with_account(const std::string&); - void update_report_with_account(api::position::ExcessLiquidityReport&, const std::string&); void publish_all(); private: From 6bc293a58e30873c22548e1e855c3d00c6b32ec0 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:35:29 -0400 Subject: [PATCH 067/210] add mic for DME --- src/web/ui/src/Users/Types.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 869e2f2b9..51b83e88a 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -70,4 +70,5 @@ let CMEMicMap:Map = Map.empty .Add("XCME", bts.api.CMEMics.CME) .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) - .Add("XCEC", bts.api.CMEMics.COMEX) \ No newline at end of file + .Add("XCEC", bts.api.CMEMics.COMEX) + .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file From f2f06d76dedffb4430a8767423b34f938287a817 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 17:43:28 -0400 Subject: [PATCH 068/210] PR feedback --- src/lib/utils/AuthSessionManager.cpp | 8 ++++---- src/lib/utils/AuthToken.cpp | 13 +++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/lib/utils/AuthSessionManager.cpp b/src/lib/utils/AuthSessionManager.cpp index 6170fdb40..dddb415fd 100644 --- a/src/lib/utils/AuthSessionManager.cpp +++ b/src/lib/utils/AuthSessionManager.cpp @@ -86,7 +86,7 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t return true; if(datetime::ll_diff_in_us(datetime::ll_now(), _expiration) < 0) { - LOG(Gen,Error, "Your BTS Keycode is expired!"); + LOG(User,Error, "Your BTS Keycode is expired!"); if(msg) *msg = "Your BTS Keycode is EXPIRED! Please contact sales@bluetradesys.com"; return false; @@ -105,18 +105,18 @@ bool AuthSessionManager::add_or_replace_session(const api::user::TokenPayload& t if(it != _map.end()) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Replacing session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Replacing session {} ", tok.id()); return true; } else if(_map.size() < _nusers) { _map[tok.id()] = Session{tok}; - LOG(Gen, Warn, "KEYCODE: Creating session {} ", tok.id()); + LOG(User, Warn, "KEYCODE: Creating session {} ", tok.id()); return true; } if(msg) *msg = "KEYCODES: Not Enough Logins available for session"; - LOG(Gen, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); + LOG(User, Error, "KEYCODES: Not Enough Logins available for session {}", tok.id()); return false; } diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index ebd753957..2423638a8 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -53,7 +53,6 @@ AuthSessionManager& session_manager() bool requires_auth_session(const admin::BTSUser& user) { - bool needs_session = false; //if the user can trade in any account or see market data, it needs a session if(user.has_user_data() && user.user_data().has_account_permissions() && @@ -62,10 +61,7 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().account_permissions().account_permissions()) { if(i.second.has_trading_permission() && i.second.trading_permission().has_permissions()) - { - needs_session = true; - break; - } + return true; } } @@ -77,14 +73,11 @@ bool requires_auth_session(const admin::BTSUser& user) for(const auto& i: user.user_data().exchange_user_data().cme_data().md_permissions()) { if(i.enabled()) - { - needs_session = true; - break; - } + return true; } } } - return needs_session; + return false; } AuthToken generate_token(const admin::BTSUser& user, std::string* msg) From 4654cd47391801bb961ab812fb2218c0eb396f4a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Jul 2019 18:29:10 -0400 Subject: [PATCH 069/210] changes in margin workflow for webui --- .../sparkd/position/MarginServiceServer.cpp | 56 +++++++++++++++---- .../sparkd/position/MarginServiceServer.h | 2 + .../sparkd/position/PositionAggregator.cpp | 15 ++++- .../sparkd/position/PositionAggregator.h | 2 + 4 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 9557b8a1a..8a2551595 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -40,16 +40,18 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _lock(), _last_update(), _admin_data(), - _last_report() + _last_report(), + _first_time(true) { LOG(Gen, Info, "MarginServiceServer: service started"); - _admin_service.get_admin_data(api::VoidMessage(), - [=] (const bts::api::Result<::bts::api::admin::AdminData> r) - { - if(r.value()) - _admin_data = *r.value(); - }); + // _admin_service.get_admin_data(api::VoidMessage(), + // [=] (const bts::api::Result<::bts::api::admin::AdminData> r) + // { + // if(r.value()) + // _admin_data = *r.value(); + // }); + _admin_service.subscribe_admin_data() | rxcpp::operators::subscribe( [this](auto const &update) @@ -57,9 +59,20 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: std::scoped_lock l(_lock); bts_assert(update.all().size() == 1); _admin_data = *update.all()[0]; - }); + + if(_first_time) + { + auto accts = AdminServiceUtils::accounts(_admin_data, false); + for(const auto& i : accts) + { + MarginResult margin; margin.Clear(); margin.set_account(i->name()); + AccountPNL pnl; pnl.Clear(); pnl.set_account_name(i->name()); + publish_excess_liquidity_report(margin, pnl); + } + _first_time = false; + } + }); - publish_all(); _timer.start(); } @@ -190,10 +203,31 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - _last_update[request.account()] = 0; + incremental_update_report(request.account()); }); } } + +//so the admin ui knows what to do +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)) + { + margin.Clear(); + margin.set_account(account); + } + AccountPNL pnl; + if(!_position->query_pnl(account, pnl)) + { + pnl.Clear(); + pnl.set_account_name(account); + } + publish_excess_liquidity_report(margin, pnl); + _last_update[account] = 0; +} void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -221,7 +255,7 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - _last_update[request.account()] = 0; + incremental_update_report(request.account()); }); } } diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index 760d1f459..d7b49d928 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -45,6 +45,7 @@ private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); void publish_all(); + void incremental_update_report(const std::string& account); private: api::admin::AdminService _admin_service; @@ -61,6 +62,7 @@ private: std::map _last_update; bts::api::admin::AdminData _admin_data; std::map _last_report; + bool _first_time; }; }} diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 0bcaeb329..45a83dd07 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -84,6 +84,17 @@ void eraseSubStr(std::string & mainStr, const std::string & toErase) mainStr.erase(pos, toErase.length()); } +bool PositionAggregator::query_pnl(const std::string& account, api::position::AccountPNL& pnl) +{ + auto pit = _pnl_map.find(account); + if(pit != _pnl_map.end()) + { + pnl = pit->second; + return true; + } + return false; +} + bool PositionAggregator::query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since) @@ -112,9 +123,7 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; - auto pit = _pnl_map.find(account); - if(pit != _pnl_map.end()) - pnl = pit->second; + query_pnl(account, pnl); return true; } return false; diff --git a/src/server/sparkd/position/PositionAggregator.h b/src/server/sparkd/position/PositionAggregator.h index 6b46e5429..3553b17d5 100644 --- a/src/server/sparkd/position/PositionAggregator.h +++ b/src/server/sparkd/position/PositionAggregator.h @@ -23,6 +23,8 @@ public: bool query_positions(const std::string& account, std::vector& result, api::position::AccountPNL& pnl, datetime::LLDateTime* since = nullptr); + + bool query_pnl(const std::string& account, api::position::AccountPNL& pnl); private: api::position::PositionService _position_service; From 092e63e300016010bb1f68b4420c6c19663adc79 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Jul 2019 16:54:40 -0500 Subject: [PATCH 070/210] OffsetAlgo attach impl (take 2) --- src/client/spark/Orders/OrderDataHelper.cs | 2 +- .../orderman_utils/orderman_utils.cpp | 12 +- .../orders/algo/algo_orders/OffsetAlgo.cpp | 127 +++++++++++------- .../orders/algo/algo_orders/OffsetAlgo.h | 7 +- 4 files changed, 90 insertions(+), 58 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 9b8113547..ba6699cdf 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -624,7 +624,7 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top, - //CustomOrderDefinition.CustomOneofCase.Offset + CustomOrderDefinition.CustomOneofCase.Offset }, outright_order_types = new[] { CustomOrderDefinition.CustomOneofCase.Market, diff --git a/src/lib/orderman/orderman_utils/orderman_utils.cpp b/src/lib/orderman/orderman_utils/orderman_utils.cpp index cb18aea6c..a2fbae1ba 100644 --- a/src/lib/orderman/orderman_utils/orderman_utils.cpp +++ b/src/lib/orderman/orderman_utils/orderman_utils.cpp @@ -14,8 +14,8 @@ bool can_consume_attachment(api::orderman::CustomOrderDefinition::CustomCase ord case CustomOrderDefinition::kTop: case CustomOrderDefinition::kCover: case CustomOrderDefinition::kLean: - // case CustomOrderDefinition::kOffset: - // return true; + case CustomOrderDefinition::kOffset: + return true; default: return false; } @@ -45,10 +45,10 @@ bool should_forward_attachment( return cdef.lean().has_child() && can_consume_attachment(cdef.lean().child().custom_case()); - // case CustomOrderDefinition::kOffset: - // return - // cdef.offset().has_child() && - // can_consume_attachment(cdef.offset().child().custom_case()); + case CustomOrderDefinition::kOffset: + return + cdef.offset().has_child() && + can_consume_attachment(cdef.offset().child().custom_case()); default: return false; } diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp index 4ca18e87a..3b09525cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.cpp @@ -1,6 +1,6 @@ +#include "lib/orderman/orders/algo/IAlgoServices.h" #include "lib/orderman/orders/algo/algo_orders/OffsetAlgo.h" #include "lib/orderman/order_factory/IOrderFactory.h" -#include "lib/orderman/orders/algo/IAlgoServices.h" #include "lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/os/os.h" #include "lib/utils/PBUtils.h" @@ -20,7 +20,7 @@ struct OffsetAlgo::PImpl { ChildTemplate *child_template = nullptr; Book last_book; uint32_t tick_offset_on_deploy; - uint32_t quantity; + double child_price = os::nan(); }; OffsetAlgo::OffsetAlgo() : me(new PImpl()) {} @@ -31,10 +31,6 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { auto &def = serv.definition(); bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_offset()); - if (serv.is_attaching()) { - return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, - "Attaching to offset algo is not supported"}; - } // Validate the offset part of the definition auto &offset = def.custom_def().offset(); if (!offset.has_child() && @@ -45,64 +41,64 @@ OrderOpResult OffsetAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { "order to attach to"}; } me->tick_offset_on_deploy = offset.tick_offset_on_deploy(); - // if we are not attaching create a child template so we can - // quickly launch our child when the time comes. - auto child_def = def; - *child_def.mutable_custom_def() = def.custom_def().offset().child(); - me->child_template = &(serv.make_child_template(child_def)); + if (!serv.is_attaching()) { + // if we are not attaching create a child template so we can + // quickly launch our child when the time comes. + auto child_def = def; + *child_def.mutable_custom_def() = def.custom_def().offset().child(); + me->child_template = &(serv.make_child_template(child_def)); + } return {}; } void OffsetAlgo::do_launch(IAlgoServices &algo) { me->algo = &algo; - me->quantity = algo.quantity().value(); bts_assert(me->child_template); algo.subscribe_book(SecurityKey(algo.security().id())); } -void OffsetAlgo::do_launch_attached(IAlgoServices &, OrderKey, - ChildState) { - bts_assert(false); +void OffsetAlgo::do_launch_attached(IAlgoServices &algo, OrderKey k, + ChildState st) { + me->algo = &algo; + me->child_key = k; + me->child_price = st.price.value(); + algo.subscribe_book(SecurityKey(algo.security().id())); } void OffsetAlgo::do_update(api::orderman::Update const &update) { LOG(OrderMan, Diag, "OffsetAlgo order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - bts_assert(!algo().is_attaching()); - // validate update - if (update.has_custom() && !update.custom().has_offset()) { - algo().terminate_error("Invalid update"); - return; + if (update.has_custom()) { + if (!update.custom().has_offset()) { + algo().terminate_error("Invalid update"); + return; + } + me->tick_offset_on_deploy = + update.custom().offset().tick_offset_on_deploy(); } - me->quantity = update.quantity(); - // apply update switch (me->status) { case Status::WAITING_FOR_MD: if (update.has_custom()) { - // already asserted that the child is Offset - me->tick_offset_on_deploy = - update.custom().offset().tick_offset_on_deploy(); - auto &def = algo().definition(); - auto child_def = def; - *child_def.mutable_custom_def() = update.custom().offset().child(); - me->child_template = &(algo().make_child_template(child_def)); + if (algo().is_attaching()) { + // don't change the child's price + // (need md to determine initial deploy price) + bts_assert(!os::is_nan(me->child_price)); + algo().update_child(me->child_key, mk_child_update(update, me->child_price)); + } else { + auto &def = algo().definition(); + auto child_def = def; + *child_def.mutable_custom_def() = update.custom().offset().child(); + me->child_template = &(algo().make_child_template(child_def)); + } } break; case Status::DEPLOYED: - Update child_update; - child_update.set_quantity(me->quantity); - child_update.set_price(algo().price().value()); - if (update.has_custom()) { - auto &offset_update = update.custom().offset(); - *child_update.mutable_custom() = offset_update.child(); - } - algo().update_child(me->child_key, child_update); + algo().update_child(me->child_key, mk_child_update(update)); break; } } void OffsetAlgo::on_book(SecurityKey, Book const &b) { - bts_assert(!algo().is_attaching()); me->last_book = b; // log top of book LOG(OrderMan, Diag, "OffsetAlgo order {} on book. BID: {}@{} ASK: {}@{}", @@ -114,9 +110,22 @@ void OffsetAlgo::on_book(SecurityKey, Book const &b) { try_deploy(); } +Update OffsetAlgo::mk_child_update(const Update &source, const double &price_override) { + Update target; + if (source.has_custom()) { + bts_assert(source.custom().has_offset()); + *target.mutable_custom() = source.custom().offset().child(); + } + if (!os::is_nan(price_override)) + target.set_price(price_override); + else + target.set_price(source.price()); + target.set_quantity(source.quantity()); + return target; +} + void OffsetAlgo::try_deploy() { bts_assert(me->status == Status::WAITING_FOR_MD); - bts_assert(!algo().is_attaching()); auto side = algo().definition().side(); auto &top_psz = me->last_book.side(side)[0]; if (!top_psz.size()) { @@ -130,23 +139,41 @@ void OffsetAlgo::try_deploy() { } else { const double &offset = securities::tick_size(algo().security()).value() * me->tick_offset_on_deploy; - const auto &price = - securities::worsen_price(side, Price(top_psz.price()), Price(offset)); - // log imminent deploy - LOG(OrderMan, Diag, - "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " - "away).", - algo().order_key().value(), side, me->quantity, - price.value(), me->tick_offset_on_deploy); - // deploy - me->child_key = - algo().launch_child(*me->child_template, Price(price), Quantity(me->quantity)); + me->child_price = + securities::worsen_price(side, Price(top_psz.price()), Price(offset)).value(); + if (algo().is_attaching()) { + // log imminent update + LOG(OrderMan, Diag, + "OffsetAlgo order {} attaching child {}. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), + me->child_key.value(), side, + algo().quantity().value(), + me->child_price, me->tick_offset_on_deploy); + // update + Update child_update; + child_update.set_quantity(algo().quantity().value()); + child_update.set_price(me->child_price); + algo().update_child(me->child_key, child_update); + } else { + // log imminent deploy + LOG(OrderMan, Diag, + "OffsetAlgo order {} deploying child. Order: {} {}@ {} ({} ticks " + "away).", + algo().order_key().value(), side, + algo().quantity().value(), + me->child_price, me->tick_offset_on_deploy); + // deploy + me->child_key = + algo().launch_child(*me->child_template, Price(me->child_price), algo().quantity()); + } algo().set_ladder_visibility(false); me->status = Status::DEPLOYED; } } void OffsetAlgo::on_child_change(OrderKey, ChildState const &st) { + me->child_price = st.price.value(); algo().update_fill_state(st.total_fills, st.last_price); switch (st.status) { case ChildStatus::WORKING: diff --git a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h index 14097f638..4e73e2f23 100644 --- a/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/OffsetAlgo.h @@ -2,6 +2,8 @@ #include "lib/orderman/orders/algo/IAlgoOrder.h" +using Update = bts::api::orderman::Update; + namespace bts { namespace orderman { @@ -17,7 +19,7 @@ class OffsetAlgo : public IAlgoOrder { OrderOpResult do_before_launch(IBeforeLaunchAlgoServices &) override; void do_launch(IAlgoServices &) override; void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; - void do_update(api::orderman::Update const &) override; + void do_update(Update const &) override; void on_book(SecurityKey, Book const &) override; void on_child_change(OrderKey, ChildState const &) override; @@ -25,6 +27,9 @@ class OffsetAlgo : public IAlgoOrder { enum class Status; struct PImpl; std::unique_ptr me; + + static Update mk_child_update(const Update& source_update, const double& price_override = os::nan()); + IAlgoServices &algo() const; void try_deploy(); }; From 9d924fa4ba2c7c5479c2caafae1c427149977751 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 10:14:01 -0400 Subject: [PATCH 071/210] Margin table formatting --- src/web/ui/src/Accounts/View.fs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index c6eedaa7b..a0cb5baf9 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -109,16 +109,16 @@ let marginView model dispatch = { cells = [ - TableControl.Cell (str model.marginScratch.marginResult.asOfTime.[0..9]) - TableControl.Cell (str model.marginScratch.account) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.leverageFactor))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.cashBalance))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.nonoptValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.optValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.initialMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.marginResult.maintMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.accountPnl.dayPnl))) - TableControl.Cell (str (sprintf "%i" (int model.marginScratch.excessLiquidity))) + TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) + TableControl.Cell (str model.marginData.account) + TableControl.Cell (str (System.String.Format("{0:f2}", model.marginData.leverageFactor))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.cashBalance))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.nonoptValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.optValue))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.initialMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.maintMargin))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.accountPnl.dayPnl))) + TableControl.Cell (str (sprintf "%i" (int model.marginData.excessLiquidity))) // TableControl.Cell (str margin.portfolioId) // TableControl.Cell (str margin.settleIndicator) // TableControl.Cell (str margin.settleQualifier) @@ -129,7 +129,7 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.number "Leverage Factor:" (int model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) + Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] From 4e6e97d90b9d74ab136ed75a229da73f81ff8b39 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 3 Jul 2019 13:40:41 -0400 Subject: [PATCH 072/210] Added unit test for splitter compute_desired_sizes. --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 4 - .../orders/algo/algo_orders/SplitterAlgo.h | 4 + .../algo/algo_orders/tests/splitter_tests.cpp | 306 +++++++++++------- 3 files changed, 190 insertions(+), 124 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 786e2ad2d..f9d79c2db 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -103,10 +103,6 @@ void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { sync_orders(); } -struct MinMax { - uint32_t min, max; -}; - // TEST case: // total = 300, clip = 100 // constraints: 50,50,50,50 diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index ff2d86598..927bd87f3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -28,5 +28,9 @@ private: void terminate() const; }; +// exposed for unit testing purposes. +struct MinMax {uint32_t min, max;}; +void compute_desired_sizes(uint32_t , uint32_t , + const std::vector& , std::vector* ); }}} //namespace diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index adb06283b..5139d971a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -1,11 +1,13 @@ -#include "catch/catch.hpp" #include "../SplitterAlgo.h" #include "AlgoTestDriver.h" +#include "catch/catch.hpp" #include "lib/orderman/orderman_utils/Book.h" +#include #include -#include #include +#include +#include "lib/utils/bts_chrono.h" using namespace std; using namespace bts::orderman::splitter; @@ -25,33 +27,75 @@ namespace test { */ -constexpr auto some_price = md::IntPrice { 128000, -3 }; +constexpr auto some_price = md::IntPrice{128000, -3}; -using ExpectedCount = utils::ValueWrapper; +using ExpectedCount = utils::ValueWrapper; struct SimpleCase { ExpectedCount expected_orders; Quantity target; SplitterOrderDefinition sod; }; -SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, uint32_t target) { +SimpleCase mkSimple(ExpectedCount expected, uint32_t max_size, uint32_t exposed, + uint32_t target) { SimpleCase result; result.expected_orders = expected; - result.target = Quantity {target}; + result.target = Quantity{target}; result.sod.set_max_order_qty(max_size); result.sod.set_exposed_qty(exposed); return result; } +TEST_CASE("compute_desired_sizes fuzzing", "[algo][splitter]") { + srand((unsigned)time(0)); + + auto start = Timer::now(); + + while (sec_diff(Timer::now(),start) < 5) { + uint32_t total = rand() % 100 + 1; + uint32_t clip = rand() % 4 + 1; + std::vector constraints(rand() % 10); + std::vector result; + + uint32_t all_fills = 0; + for (auto &mm : constraints) { + uint32_t order_working = rand() % 2; + uint32_t fills = rand() % 2 * clip; + all_fills += fills; + mm = {fills, order_working ? fills + rand() % clip + 1 : fills}; + } + if (all_fills < total) { + compute_desired_sizes(total, clip, constraints, &result); + uint32_t exposed_qty = 0; + for (auto q : result) + exposed_qty += q.value(); + + bool clip_size_honored = true; + for (auto q : result) + clip_size_honored = clip_size_honored && (q.value() <= clip); + + if (exposed_qty != total || !clip_size_honored) { + std::cout << "total: " << total << "\n" + << "clip: " << clip << "\n{ "; + + for (auto mm : constraints) + std::cout << "{" << mm.min << "," << mm.max << "},"; + std::cout << " }\n"; + } + REQUIRE(clip_size_honored); + REQUIRE(exposed_qty == total); + } + } +} TEST_CASE("initial orders", "[algo][splitter]") { std::vector cases; - cases.push_back(mkSimple(ExpectedCount {10},10, 100, 50)); - cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount{11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 150)); - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto expected = tcase.expected_orders.value(); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -67,15 +111,15 @@ TEST_CASE("initial orders", "[algo][splitter]") { TEST_CASE("completes on target", "[algo][splitter]") { std::vector cases; - cases.push_back(mkSimple(ExpectedCount {3}, 30, 90, 50)); - cases.push_back(mkSimple(ExpectedCount {10}, 10, 100, 50)); - cases.push_back(mkSimple(ExpectedCount {11}, 10, 105, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 50)); - cases.push_back(mkSimple(ExpectedCount {5}, 10, 50, 150)); - cases.push_back(mkSimple(ExpectedCount {4}, 13, 50, 150)); - cases.push_back(mkSimple(ExpectedCount {12}, 13, 150, 50)); + cases.push_back(mkSimple(ExpectedCount{3}, 30, 90, 50)); + cases.push_back(mkSimple(ExpectedCount{10}, 10, 100, 50)); + cases.push_back(mkSimple(ExpectedCount{11}, 10, 105, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 50)); + cases.push_back(mkSimple(ExpectedCount{5}, 10, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{4}, 13, 50, 150)); + cases.push_back(mkSimple(ExpectedCount{12}, 13, 150, 50)); - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto expected = tcase.expected_orders.value(); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -88,48 +132,47 @@ TEST_CASE("completes on target", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); SECTION("Fill completely") { - auto orders = state.child_orders(); + auto orders = state.child_orders(); // Fill the order size_t filled = 0; size_t iterations = 0; - while(state.state() == AlgoState::RUNNING) { + while (state.state() == AlgoState::RUNNING) { // loop to allow more orders to be added ++iterations; REQUIRE(iterations < 999); - for (const auto& order : orders) { - state.fill(order.key, Price (some_price.price()), order.cstate.quantity); + for (const auto &order : orders) { + state.fill(order.key, Price(some_price.price()), + order.cstate.quantity); filled += order.cstate.quantity.value(); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; - } - else { + } else { REQUIRE(state.state() == AlgoState::RUNNING); } } } } SECTION("fill one by one") { - const auto& orders = state.child_orders(); + const auto &orders = state.child_orders(); // Fill 1 per iteration. // Algo should add more orders if not enough are visible initially size_t filled = 0; size_t iterations = 0; - while(state.state() == AlgoState::RUNNING) { + while (state.state() == AlgoState::RUNNING) { ++iterations; - REQUIRE(iterations < 999);//not making progress - for (const auto& order : orders) { + REQUIRE(iterations < 999); // not making progress + for (const auto &order : orders) { if (order.cstate.status == ChildStatus::WORKING) { - auto price = Price {some_price.price()}; - state.fill(order.key, price, Quantity {1}); + auto price = Price{some_price.price()}; + state.fill(order.key, price, Quantity{1}); filled += 1; // Fills should never cause new orders to get added REQUIRE(state.child_orders().size() == expected); if (filled >= tcase.target.value()) { REQUIRE(state.state() == AlgoState::COMPLETED); break; - } - else { + } else { REQUIRE(state.state() == AlgoState::RUNNING); } } @@ -144,30 +187,22 @@ TEST_CASE("updates", "[algo][splitter]") { std::vector, SimpleCase>> cases; // reduce max order size, increase # orders - cases.push_back({ - mkSimple(ExpectedCount {10} /*order count*/, 10 /*max*/, 100 /*exposed*/, 50 /*target*/), - {}, - mkSimple(ExpectedCount {20}, 5, 100, 50) - }); + cases.push_back({mkSimple(ExpectedCount{10} /*order count*/, 10 /*max*/, + 100 /*exposed*/, 50 /*target*/), + {}, + mkSimple(ExpectedCount{20}, 5, 100, 50)}); /// reduce max order size, keep # orders constant - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {}, - mkSimple(ExpectedCount {10}, 5, 50, 50) - }); - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {5,5}, - mkSimple(ExpectedCount {8}, 5, 50, 40) - }); - cases.push_back({ - mkSimple(ExpectedCount {10}, 10, 100, 50), - {5,5}, - mkSimple(ExpectedCount {18}, 5, 100, 50) - }); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {}, + mkSimple(ExpectedCount{10}, 5, 50, 50)}); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {5, 5}, + mkSimple(ExpectedCount{8}, 5, 50, 40)}); + cases.push_back({mkSimple(ExpectedCount{10}, 10, 100, 50), + {5, 5}, + mkSimple(ExpectedCount{18}, 5, 100, 50)}); - - for (const auto& tcase : cases) { + for (const auto &tcase : cases) { auto case_init = std::get<0>(tcase); api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); @@ -178,14 +213,14 @@ TEST_CASE("updates", "[algo][splitter]") { state.launch(); REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == case_init.expected_orders.value()); - for (const auto& o : state.child_orders()) { + for (const auto &o : state.child_orders()) { if (o.cstate.status == ChildStatus::WORKING) { REQUIRE(o.cstate.quantity.value() <= case_init.sod.exposed_qty()); } } - for(auto q : std::get<1>(tcase)) { - state.fill({}, Quantity {q}); + for (auto q : std::get<1>(tcase)) { + state.fill({}, Quantity{q}); } Update update; @@ -198,9 +233,11 @@ TEST_CASE("updates", "[algo][splitter]") { state.do_update(update); REQUIRE(state.state() == AlgoState::RUNNING); size_t working = 0; - for (const auto& c : state.child_orders()) if (c.cstate.status == ChildStatus::WORKING) working += 1; + for (const auto &c : state.child_orders()) + if (c.cstate.status == ChildStatus::WORKING) + working += 1; REQUIRE(working == case_next.expected_orders.value()); - for (const auto& o : state.child_orders()) { + for (const auto &o : state.child_orders()) { if (o.cstate.status == ChildStatus::WORKING) { REQUIRE(o.cstate.quantity.value() <= case_next.sod.exposed_qty()); } @@ -218,21 +255,23 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { // expected: 100, 100, 50, 50 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - for (const auto& order : state.child_orders()) { - state.fill(order.key, {}, Quantity {50}); + for (const auto &order : state.child_orders()) { + state.fill(order.key, {}, Quantity{50}); } // Reduce exposed quantity @@ -244,12 +283,16 @@ TEST_CASE("Reduction with fills", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 300); - + // need this to be 100,100,50,50 not 100,100,100 - std::set actual, expected {100,100,50,50}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + std::set actual, expected{100, 100, 50, 50}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -264,23 +307,25 @@ TEST_CASE("Reduction with fills 2", "[algo][splitter]") { // expected: 100, 100, 65, 35 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - state.fill({}, Quantity {35}); - state.fill({}, Quantity {45}); - state.fill({}, Quantity {55}); - state.fill({}, Quantity {65}); + state.fill({}, Quantity{35}); + state.fill({}, Quantity{45}); + state.fill({}, Quantity{55}); + state.fill({}, Quantity{65}); // Reduce exposed quantity Update update; @@ -291,12 +336,16 @@ TEST_CASE("Reduction with fills 2", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 300); - + // need this to be 100,100,50,50 not 100,100,100 - std::set actual, expected {100,100,65,35}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + std::set actual, expected{100, 100, 65, 35}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -311,23 +360,25 @@ TEST_CASE("Reduction with fills 3", "[algo][splitter]") { // expected: 66, 55, 45, 35 api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills - state.fill({}, Quantity {35}); - state.fill({}, Quantity {45}); - state.fill({}, Quantity {55}); - state.fill({}, Quantity {65}); + state.fill({}, Quantity{35}); + state.fill({}, Quantity{45}); + state.fill({}, Quantity{55}); + state.fill({}, Quantity{65}); // Reduce exposed quantity Update update; @@ -338,11 +389,15 @@ TEST_CASE("Reduction with fills 3", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); size_t total = 0; - for (const auto& order : state.child_orders()) { total += order.cstate.quantity.value(); } + for (const auto &order : state.child_orders()) { + total += order.cstate.quantity.value(); + } REQUIRE(total == 201); - - std::set actual, expected {66,55,45,35}; - for (const auto& order : state.child_orders()) { actual.insert(order.cstate.quantity.value()); } + + std::set actual, expected{66, 55, 45, 35}; + for (const auto &order : state.child_orders()) { + actual.insert(order.cstate.quantity.value()); + } REQUIRE(actual == expected); } @@ -356,17 +411,19 @@ TEST_CASE("reduce to completion", "[algo][splitter]") { // expected: algo transitions to copmleted state canceling 2 orders api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills state.fill({}, Quantity{100}); @@ -380,11 +437,10 @@ TEST_CASE("reduce to completion", "[algo][splitter]") { REQUIRE(state.state() == AlgoState::COMPLETED); size_t total = 0; - for (const auto& order : state.child_orders()) { + for (const auto &order : state.child_orders()) { if (order.cstate.status == ChildStatus::WORKING) { total += order.cstate.quantity.value(); - } - else { + } else { total += order.cstate.total_fills.value(); } } @@ -401,17 +457,19 @@ TEST_CASE("reduce to completion 2", "[algo][splitter]") { // expected: algo transitions to copmleted state canceling 2 orders api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(400); - AlgoTestDriver state(def, some_price, Quantity {300}); + AlgoTestDriver state(def, some_price, Quantity{300}); REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } // Add fills state.fill({}, Quantity{100}); @@ -437,25 +495,28 @@ TEST_CASE("Async Fills", "[algo][splitter]") { api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(20); splitter->set_exposed_qty(80); - AlgoTestDriver state(def, some_price, Quantity {80}); - + AlgoTestDriver state(def, some_price, Quantity{80}); + REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 4); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 20); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 20); + } // Set up some instant fills bool applied_fills = false; - state.on_child_changing([&](const auto&) { - if (applied_fills) return; + state.on_child_changing([&](const auto &) { + if (applied_fills) + return; applied_fills = true; // 7 fills on the last order which is has a size reduction in flight - state.fill(state.child_orders().rbegin()->key, {}, Quantity {7}); + state.fill(state.child_orders().rbegin()->key, {}, Quantity{7}); }); Update update; @@ -465,13 +526,14 @@ TEST_CASE("Async Fills", "[algo][splitter]") { // This should trigger 1 order to be reduced to size 5 from 20 // in the meantime we'll trigger fills of size 7 // This results in an overfill for the 5 lot order - // And the + // And the state.do_update(update); - // expected result: + // expected result: // 7 fills, exposed_qty 65 = 58 active uint32_t active = 0; - for (const auto& o : state.child_orders()) active += o.active_qty(); + for (const auto &o : state.child_orders()) + active += o.active_qty(); REQUIRE(active == 58); } @@ -480,23 +542,25 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { // Increase the size to 400 so we launch a 4th order // Then instantly send another update to 350 - // NOTE: this test is not very good due to limitations in the test driver + // NOTE: this test is not very good due to limitations in the test driver // I'm leaving it in because it passes but if it starts failing in the future // it's probably OK to disable it api::orderman::OrderDefinition def; def.set_side(api::SIDE_BUY); - auto* splitter = def.mutable_custom_def()->mutable_splitter(); + auto *splitter = def.mutable_custom_def()->mutable_splitter(); splitter->set_max_order_qty(100); splitter->set_exposed_qty(300); - AlgoTestDriver state(def, some_price, Quantity {300}); - + AlgoTestDriver state(def, some_price, Quantity{300}); + REQUIRE(state.before_launch().ok()); state.launch(); // check initial state REQUIRE(state.state() == AlgoState::RUNNING); REQUIRE(state.child_orders().size() == 3); - for(const auto& c : state.child_orders()) { REQUIRE(c.cstate.quantity.value() == 100); } + for (const auto &c : state.child_orders()) { + REQUIRE(c.cstate.quantity.value() == 100); + } Update update; update.set_price(state.price().value()); @@ -505,7 +569,7 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { // Set up some instant fills bool applied_second_update = false; - state.on_child_launching([&,update](const auto&) mutable { + state.on_child_launching([&, update](const auto &) mutable { if (!applied_second_update) { applied_second_update = true; update.mutable_custom()->mutable_splitter()->set_exposed_qty(350); @@ -515,12 +579,14 @@ TEST_CASE("Increase then decrease", "[algo][splitter]") { state.do_update(update); - // expected result: + // expected result: // 350 exposed, NOT 450 uint32_t quantity = 0; - for (const auto& o : state.child_orders()) quantity += o.active_qty(); + for (const auto &o : state.child_orders()) + quantity += o.active_qty(); REQUIRE(quantity == 350); } - -}}}//namespace \ No newline at end of file +} // namespace test +} // namespace orderman +} // namespace bts From 08c27625009f7735b75d82a1e88263a1af25d0da Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 3 Jul 2019 13:41:07 -0400 Subject: [PATCH 073/210] SP-87 PR feedback 1/2 --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 30 +++++++++++++++---- .../orders/algo/algo_orders/SplitterAlgo.h | 2 ++ .../algo/algo_orders/tests/splitter_tests.cpp | 2 +- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 8e3a54b85..9afc50d9f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -18,7 +18,6 @@ using namespace api::orderman; struct ChildOrderState { OrderKey key; ChildState state; - uint32_t remaining() const { return state.quantity.value() - state.total_fills.value(); } uint32_t min_qty() const { return state.total_fills.value(); } }; @@ -55,10 +54,12 @@ OrderOpResult SplitterAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { "max order quantity and exposed quantity must be greater than 0"}; } - // Create child template - auto child_def = def; - *child_def.mutable_custom_def() = splitter.child(); - me->child_template = &ibl.make_child_template(child_def); + if (me->exposed_qty < me->target_qty) { + return OrderOpResult{ORDER_ERROR_INVALID_ORDER_DEFINITON, + "Exposed quantity must be greater than or equal to target quantity"}; + } + + update_child_template(ibl); me->orders.reserve(me->exposed_qty / me->clip + 1); @@ -88,9 +89,16 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { me->clip = splitter.max_order_qty(); } me->exposed_qty = splitter.exposed_qty(); + update_child_template(algo()); } me->target_qty = update.quantity(); + if (me->exposed_qty < me->target_qty) { + algo().cancel("Exposed quantity must be greater than or equal to target quantity"); + return; + } + + //todo: forward update.custom() to sync_orders sync_orders(); } void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { @@ -120,6 +128,8 @@ void compute_desired_sizes(uint32_t total, uint32_t clip, const std::vector overfills ? + auto citer = constraints.begin(); while(total > 0) { auto current = std::min(total, clip); @@ -166,6 +176,16 @@ void SplitterAlgo::terminate() const { } me->is_terminated = true; } + +void SplitterAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl) { + // Create child template + auto child_def = ibl.definition(); + bts_assert(child_def.has_custom_def()); + bts_assert(child_def.custom_def().has_splitter()); + auto& splitter = child_def.custom_def().splitter(); + *child_def.mutable_custom_def() = splitter.child(); + me->child_template = &ibl.make_child_template(child_def); +} void SplitterAlgo::sync_orders() { if (me->is_terminated) return; diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index 04258dafd..07eb15e41 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -48,6 +48,8 @@ private: void sync_orders(); bool is_complete() const; void terminate() const; + + void update_child_template(IBeforeLaunchAlgoServices&); }; // exposed for unit testing purposes. diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index 923c39fcb..03f52ef09 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -529,7 +529,7 @@ TEST_CASE("Async Fills", "[algo][splitter]") { Update update; update.set_price(state.price().value()); - update.set_quantity(state.quantity().value()); + update.set_quantity(65); update.mutable_custom()->mutable_splitter()->set_exposed_qty(65); // This should trigger 1 order to be reduced to size 5 from 20 // in the meantime we'll trigger fills of size 7 From 7f2988ec57471346036ffdd327eca1fa58867920 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 3 Jul 2019 14:07:43 -0400 Subject: [PATCH 074/210] SP-87 PR feedback 2/2 --- .../orders/algo/algo_orders/SplitterAlgo.cpp | 19 +++++++++++++------ .../orders/algo/algo_orders/SplitterAlgo.h | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp index 9afc50d9f..78d257102 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.cpp @@ -82,14 +82,18 @@ void SplitterAlgo::do_launch_attached(IAlgoServices &, OrderKey, ChildState) { bts_assert(false); } void SplitterAlgo::do_update(const api::orderman::Update& update) { - // Update # child orders + const CustomOrderDefinition* new_child_def = nullptr; if (update.has_custom() && update.custom().has_splitter()) { auto& splitter = update.custom().splitter(); if (splitter.max_order_qty() > 0) { me->clip = splitter.max_order_qty(); } me->exposed_qty = splitter.exposed_qty(); - update_child_template(algo()); + + if (splitter.has_child()) { + update_child_template(algo()); + new_child_def = &splitter.child(); + } } me->target_qty = update.quantity(); @@ -98,8 +102,7 @@ void SplitterAlgo::do_update(const api::orderman::Update& update) { return; } - //todo: forward update.custom() to sync_orders - sync_orders(); + sync_orders(new_child_def); } void SplitterAlgo::on_child_change(OrderKey key, ChildState const & state) { for (auto& child : me->orders) { @@ -187,7 +190,7 @@ void SplitterAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl) { me->child_template = &ibl.make_child_template(child_def); } -void SplitterAlgo::sync_orders() { +void SplitterAlgo::sync_orders(const api::orderman::CustomOrderDefinition* new_child_def) { if (me->is_terminated) return; if (is_complete()) { terminate(); @@ -219,10 +222,14 @@ void SplitterAlgo::sync_orders() { // Check the current order's quantity and modify it to match desired qty if (oiter->state.status == ChildStatus::WORKING) { if (oiter->state.price != price || - oiter->state.quantity != qty) { + oiter->state.quantity != qty || + new_child_def != nullptr) { Update update; update.set_quantity(qty.value()); update.set_price(price.value()); + if (new_child_def != nullptr) { + *update.mutable_custom() = *new_child_def; + } algo().update_child(oiter->key, update); } } diff --git a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h index 07eb15e41..92850aa7d 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/SplitterAlgo.h @@ -45,7 +45,7 @@ public: private: IAlgoServices& algo() const; - void sync_orders(); + void sync_orders(const api::orderman::CustomOrderDefinition* new_child_def = nullptr); bool is_complete() const; void terminate() const; From 500e5b5fe4a40a7ad49bbcc955ac2720d2319e0c Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 14:19:51 -0400 Subject: [PATCH 075/210] Polling and commas --- src/web/ui/src/Accounts/State.fs | 11 ++++++----- src/web/ui/src/Accounts/View.fs | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index e38c29882..5976740c3 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -210,14 +210,15 @@ let update msg (model:Model) : Model * Cmd = | GetMarginData -> { model with ShowLoading = false}, (getMarginData model.marginService model.scratch.name UpdateMarginData (box>>ErrorOccured)) | UpdateMarginData newData -> + let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), (model.marginData.leverageFactor = model.marginScratch.leverageFactor), (model.marginData.cashBalance = model.marginScratch.cashBalance) with - | true, _, _ -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false, true, true -> {model with marginData = newData; marginScratch = newData}, Cmd.Empty - | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, Cmd.Empty - | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, Cmd.Empty - | false, false, false -> {model with marginData = newData}, Cmd.Empty + | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd + | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd + | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd + | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd + | false, false, false -> {model with marginData = newData}, cmd | SetMarginCashBalance newBalance -> { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index a0cb5baf9..13efe0ae0 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -11,10 +11,14 @@ open Fable open System open bts.co2 open Elmish.React.Common - +open Fable.Core.JsInterop +open Fable.Core let accountIsSelected (initialState:BTSAccount) (scratch:BTSAccount) = scratch <> initialState +[] +let withCommas (n:float) : string = jsNative + let selectedAccount model = match model.adminData with | Some data -> @@ -90,7 +94,7 @@ let marginView model dispatch = cells = [ //TableControl.Cell (str "Account") - TableControl.Cell (div [Style [MinWidth "3em"]][str "As Of"]) + TableControl.Cell (div [Style [MinWidth "3em"]][str "Time"]) TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") TableControl.Cell (str "Cash Balance") @@ -111,17 +115,14 @@ let marginView model dispatch = [ TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) TableControl.Cell (str model.marginData.account) - TableControl.Cell (str (System.String.Format("{0:f2}", model.marginData.leverageFactor))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.cashBalance))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.nonoptValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.optValue))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.initialMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.marginResult.maintMargin))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.accountPnl.dayPnl))) - TableControl.Cell (str (sprintf "%i" (int model.marginData.excessLiquidity))) - // TableControl.Cell (str margin.portfolioId) - // TableControl.Cell (str margin.settleIndicator) - // TableControl.Cell (str margin.settleQualifier) + TableControl.Cell (str (withCommas model.marginData.leverageFactor)) + TableControl.Cell (str (withCommas model.marginData.cashBalance)) + TableControl.Cell (str (withCommas model.marginData.marginResult.nonoptValue)) + TableControl.Cell (str (withCommas model.marginData.marginResult.optValue)) + TableControl.Cell (str (withCommas model.marginData.marginResult.initialMargin)) + TableControl.Cell (str (withCommas model.marginData.marginResult.maintMargin)) + TableControl.Cell (str (withCommas model.marginData.accountPnl.dayPnl)) + TableControl.Cell (str (withCommas model.marginData.excessLiquidity)) ] className = "" header = None From 4f7fcc563465c2ef6bde35d1876af46dbfb1e8ec Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 14:54:40 -0400 Subject: [PATCH 076/210] Move loss limits to the top of the limits page --- src/web/ui/src/Accounts/View.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 13efe0ae0..6e49e415b 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -737,9 +737,10 @@ let securityLimitsView model dispatch = let LimitsView model dispatch = div [ Class "limits-container"] [ + lossLimitView model dispatch + br [] lazyClipLimitsView model dispatch lazyProductLimitsView model dispatch - lossLimitView model dispatch //securityLimitsView model dispatch accountControls model dispatch From ebad5b389f2d9748fa80ecac08c81d1ed6da1615 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 3 Jul 2019 16:01:50 -0400 Subject: [PATCH 077/210] Fix Save button --- src/web/ui/src/Accounts/State.fs | 7 ++++--- src/web/ui/src/Accounts/View.fs | 17 ++++++++++------- src/web/ui/src/Global.fs | 4 +++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 5976740c3..717c2d43d 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -2,6 +2,7 @@ module Accounts.State open Accounts.Types open bts.api.admin +open Global open Elmish open Fable.PowerPack.PromiseImpl open Fable.Import @@ -212,8 +213,8 @@ let update msg (model:Model) : Model * Cmd = | UpdateMarginData newData -> let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), - (model.marginData.leverageFactor = model.marginScratch.leverageFactor), - (model.marginData.cashBalance = model.marginScratch.cashBalance) with + (compareDouble model.marginData.leverageFactor model.marginScratch.leverageFactor 10000u), + (compareDouble model.marginData.cashBalance model.marginScratch.cashBalance 10000u) with | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd @@ -237,7 +238,7 @@ let update msg (model:Model) : Model * Cmd = | SaveScratch -> match isNewAccount model.scratch with | true -> model, Cmd.ofExistingPromise (createAccount model.admin model.scratch model ) id (box>>ErrorOccured) - | false -> model, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model ) id (box>>ErrorOccured) + | false -> { model with marginScratch = model.marginData }, Cmd.ofExistingPromise (saveAccount model.admin model.scratch model ) id (box>>ErrorOccured) | ErrorOccured msg -> Global.alert Global.Error (string msg) Browser.console.log msg diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 6e49e415b..f077e2ac2 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -16,9 +16,12 @@ open Fable.Core let accountIsSelected (initialState:BTSAccount) (scratch:BTSAccount) = scratch <> initialState -[] +[] let withCommas (n:float) : string = jsNative +[] +let withCommasAndTwoDigits (n:float) : string = jsNative + let selectedAccount model = match model.adminData with | Some data -> @@ -117,12 +120,12 @@ let marginView model dispatch = TableControl.Cell (str model.marginData.account) TableControl.Cell (str (withCommas model.marginData.leverageFactor)) TableControl.Cell (str (withCommas model.marginData.cashBalance)) - TableControl.Cell (str (withCommas model.marginData.marginResult.nonoptValue)) - TableControl.Cell (str (withCommas model.marginData.marginResult.optValue)) - TableControl.Cell (str (withCommas model.marginData.marginResult.initialMargin)) - TableControl.Cell (str (withCommas model.marginData.marginResult.maintMargin)) - TableControl.Cell (str (withCommas model.marginData.accountPnl.dayPnl)) - TableControl.Cell (str (withCommas model.marginData.excessLiquidity)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.nonoptValue)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.optValue)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.initialMargin)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.maintMargin)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.accountPnl.dayPnl)) + TableControl.Cell (str (withCommasAndTwoDigits model.marginData.excessLiquidity)) ] className = "" header = None diff --git a/src/web/ui/src/Global.fs b/src/web/ui/src/Global.fs index 4b6dfe9df..41c76cca2 100644 --- a/src/web/ui/src/Global.fs +++ b/src/web/ui/src/Global.fs @@ -11,6 +11,8 @@ type AlertLevel = [] let alert (_:AlertLevel) (_:string) = Fable.Core.Exceptions.jsNative +let compareDouble (d1:double) (d2:double) (precision: uint32) = (int (d1 * (double precision))) = (int (d2 * (double precision))) + module Reflection = open Fable.Core.JsInterop @@ -21,7 +23,7 @@ module Reflection = [] let values<'a> x : 'a[] = jsNative - let iterate<'a> x : (string*'a)[] = + let iterate<'a> x : (string*'a)[] = Array.zip (keys x) (values x) let spread<'a> (a:'a) (b:obj) : 'a = Imports.DynamicService.merge (a,b) From cd68b95a3e32b8f74aff2efcf367da83a2e42a5f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 5 Jul 2019 08:19:05 -0500 Subject: [PATCH 078/210] add a mechanism for ignoring InlineUserProperty's force_override property --- .../spark/Orders/OrderPropertiesEditorVM.cs | 15 ++++++++++++--- src/client/spark/core/Utility/ViewModelBase.cs | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index bcf276bec..122ac1589 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -105,7 +105,7 @@ namespace mbts.spark { var inline_account_src = order_properties.AggregateLatest( model.factory.subscribe_accounts(), (last, change, cache) => convert_inline_account(change.New.account, cache), - (last, props, change) => convert_inline_account(props.account, change.New), + (last, props, change) => convert_inline_account(props.account, change.New, false), () => new InlineUserProperty(), new InlineOrderProperties(), DictionaryHelper.empty()); @@ -263,9 +263,18 @@ namespace mbts.spark { break; } } - InlineUserProperty convert_inline_account(InlineUserProperty account_id, IReadOnlyDictionary account_map) => + // + // Regarding the 3rd parameter, force_override_from_inline_property: + // When using an InlineUserProperty, in the context of assigning a default vs selected item, + // there is somewhat of a conflict between the IObserver> and the + // IObserver> OnNext methods. This 3rd paramter provides yet another override + // to say if the force_override should come from the inline property or if the force_override should + // be disbled, by way of the immediate return in ViewModelBase._try_auto_select when force_override + // is false. Our intent is then accomplished because we are no longer attempting to set a default/ + // selected item when the account_tuples potentially changes + InlineUserProperty convert_inline_account(InlineUserProperty account_id, IReadOnlyDictionary account_map, bool force_override_from_inline_property = true) => account_id.has_value && account_map.TryGetValue(account_id.value, out string name) ? - new InlineUserProperty(new AccountTuple(account_id.value, name), account_id.force_override) : + new InlineUserProperty(new AccountTuple(account_id.value, name), force_override_from_inline_property ? account_id.force_override : false) : new InlineUserProperty(); } diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 3800e98bf..8fa702aaf 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -820,6 +820,11 @@ namespace mbts.ui.shell { void _try_auto_select() { if (_is_user_selected_item) { + // if we have a user-selected item and the _desired_item for which we might want to set as the selected item + // isn't force_override, then no change + if (!_desired_item.force_override) { + return; + } if (desired_item_valid() && _desired_item.force_override && _try_match_item(_desired_item.value, out TValue match)) { _set_selected_item(match, SelectionReason.SettingsMandatedSelection); return; From e447096733263c4936927a3929e9ca80ddef4f92 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Jul 2019 11:00:42 -0400 Subject: [PATCH 079/210] Routed excess liquidity to OrderManager. --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/MarginService.proto | 3 ++- src/lib/orderman/actors/ServiceBridge.cpp | 25 ++++++++++++++++--- src/lib/orderman/actors/ServiceBridge.h | 3 +++ .../actors/order_manager/OrderManager.cpp | 20 ++++++++++++--- .../actors/order_manager/OrderManager.h | 2 ++ .../events/ExcessLiquidityUpdateEvent.h | 25 +++++++++++++++++++ src/lib/orderman/limiter/Limiter.cpp | 1 + src/lib/orderman/limiter/Limiter.h | 3 ++- .../orderman/server/OrderServiceServer.cpp | 17 ++++++++++--- src/server/sparkd/CMakeDeps.cmake | 2 +- src/web/CMakeDeps.cmake | 2 +- src/web/ui/src/Access.fs | 1 + 13 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 src/lib/orderman/events/ExcessLiquidityUpdateEvent.h diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index bef6d7f85..1bf4e1c6f 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index c6479c66e..007e874e8 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -19,11 +19,12 @@ message MarginResult { double opt_value = 100; double nonopt_value = 110; double maint_margin = 120; - double initial_margin = 130; + double initial_margin = 130; } message ExcessLiquidityReport { string account = 10 [(bts.api.key)=true]; + uint32 account_id = 11; double leverage_factor = 20; double cash_balance = 30; MarginResult margin_result = 40; diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 227d86c84..c85e3bfbd 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -1,12 +1,14 @@ #include "ServiceBridge.h" #include "lib/api/public/ServiceContext.h" +#include "lib/api/services/OrderService.pb.h" #include "lib/api/services/PositionService.pb.h" #include "lib/mercury/broker/BrokerProxy.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" #include "lib/orderman/events/CancelOrderEvent.h" #include "lib/orderman/events/DetachOrderEvent.h" +#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" @@ -15,13 +17,11 @@ #include "lib/orderman/events/UpdateOrderEvent.h" #include "lib/orderman/order_factory/OrderFactory.h" #include "lib/orderman/order_router/OrderRouter.h" +#include "lib/orderman/orderman_utils/orderman_common.h" +#include "lib/orderman/orders/Order.h" #include "lib/orderman/securities/MapSecurityDB.h" #include "lib/tracing/PerfLog.h" #include "lib/utils/PBUtils.h" - -#include "lib/api/services/OrderService.pb.h" -#include "lib/orderman/orderman_utils/orderman_common.h" -#include "lib/orderman/orders/Order.h" #include namespace bts { @@ -53,6 +53,7 @@ struct ServiceBridge::PImpl { mercury::Stream detach_order_pub; mercury::Stream new_admin_data_pub; mercury::Stream account_pnl_pub; + mercury::Stream excess_liquidity_pub; std::unordered_set known_orders; std::vector> admin_data_updates; mercury::BrokerProxy &service_call_marshaller; @@ -85,6 +86,7 @@ void ServiceBridge::init() { me->detach_order_pub = make_stream(); me->new_admin_data_pub = make_stream(); me->account_pnl_pub = make_stream(); + me->excess_liquidity_pub = make_stream(); me->ready.set_value(); } @@ -236,6 +238,21 @@ void ServiceBridge::update_account_pnl( }); } +void ServiceBridge::update_excess_liquidity_report( + api::position::Excess_liquidity_reportUpdate const &elr) { + me->service_call_marshaller.schedule_action([this, elr]() { + for (auto const &elr : elr.added()) { + publish(me->excess_liquidity_pub, AccountID(elr->account_id()), + elr->excess_liquidity()); + } + for (auto const &elr : elr.changed()) { + publish(me->excess_liquidity_pub, + AccountID(elr.current()->account_id()), + elr.current()->excess_liquidity()); + } + }); +} + bool ServiceBridge::is_ready() const { return me->have_orders && me->order_manager_ready; } diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index 621aaf256..ab68bf1ed 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/api/services/MarginService.client.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/config/protos/jetfix.pb.h" #include "lib/md/SecurityOracle.h" @@ -77,6 +78,8 @@ class ServiceBridge : public mercury::Actor { void update_admin_data(std::shared_ptr const &admin); void update_account_pnl(api::position::Pnl_account_dataUpdate const &); + void update_excess_liquidity_report( + api::position::Excess_liquidity_reportUpdate const &); private: struct PImpl; diff --git a/src/lib/orderman/actors/order_manager/OrderManager.cpp b/src/lib/orderman/actors/order_manager/OrderManager.cpp index 737bee203..76bcabfb4 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.cpp +++ b/src/lib/orderman/actors/order_manager/OrderManager.cpp @@ -5,6 +5,7 @@ #include "lib/orderman/actors/order_manager/OrderServices.h" #include "lib/orderman/actors/order_manager/OrderServicesData.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" +#include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/NewSecuritiesEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" @@ -55,6 +56,9 @@ void OrderManager::init() { [this](auto const &admin_update) { this->on_admin_data(admin_update); }); subscribe( [this](auto const &pnl_update) { this->on_pnl_update(pnl_update); }); + subscribe([this](auto const &liq_update) { + this->on_excess_liquidity_update(liq_update); + }); } void OrderManager::on_admin_data(const mercury::Update &m) { @@ -77,10 +81,18 @@ void OrderManager::on_admin_data(const mercury::Update &m) { } } -void OrderManager::on_pnl_update(const mercury::Update &u) { - if (u.events) - for (auto ev : *u.events) - me->services_data.limiter.set_day_pnl(ev.account_id,ev.day_pnl); +void OrderManager::on_pnl_update( + const mercury::Update &u) { + if (u.events) + for (auto ev : *u.events) + me->services_data.limiter.set_day_pnl(ev.account_id, ev.day_pnl); +} + +void OrderManager::on_excess_liquidity_update( + const mercury::Update &u) { + if (u.events) + for (auto ev : *u.events) + me->services_data.limiter.set_excess_liquidity(ev.account_id, ev.excess_liquidity); } void OrderManager::on_securities( diff --git a/src/lib/orderman/actors/order_manager/OrderManager.h b/src/lib/orderman/actors/order_manager/OrderManager.h index c97980372..218704ad2 100644 --- a/src/lib/orderman/actors/order_manager/OrderManager.h +++ b/src/lib/orderman/actors/order_manager/OrderManager.h @@ -35,6 +35,7 @@ class CreateFIXBufferReplyEvent; class GatewayStatusChangeEvent; class NewAdminDataEvent; class AccountPnLUpdateEvent; +class ExcessLiquidityUpdateEvent; struct SessionServicesData; class DynamicOrderRegistry; } // namespace orderman @@ -85,6 +86,7 @@ class OrderManager : public mercury::Actor, public mercury::IPollableActor { void on_timer(const mercury::Update &); void on_admin_data(const mercury::Update &); void on_pnl_update(const mercury::Update &); + void on_excess_liquidity_update(const mercury::Update &); void on_poll(trace::PerfLog& log) override; // end external events diff --git a/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h b/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h new file mode 100644 index 000000000..3174c787a --- /dev/null +++ b/src/lib/orderman/events/ExcessLiquidityUpdateEvent.h @@ -0,0 +1,25 @@ +#pragma once + +#include "lib/mercury/common/mercury_common.h" +#include "lib/mercury/events/Event.h" +#include "lib/mercury/synopsis/MergeByKey.h" + +#include + +namespace bts { +namespace orderman { + +class ExcessLiquidityUpdateEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::MergeByKey; + AccountID key() const { return account_id; } + + ExcessLiquidityUpdateEvent(AccountID id, double excess_liquidity) + : account_id(id), excess_liquidity(excess_liquidity) {} + + AccountID account_id; + double excess_liquidity; +}; + +} // namespace orderman +} // namespace bts diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 1df9a4c99..572d533a1 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -78,6 +78,7 @@ void Limiter::set_day_pnl (AccountID account_id, double pnl){ _add_account_and_reset(account_id); me->limit_store->set_pnl(account_id, pnl); } +void Limiter::set_excess_liquidity (AccountID , double ) {} Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index 1b7df944e..5dba06d8d 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -34,7 +34,8 @@ class Limiter { void remove(api::Security const &, std::string const & /* account_name */, api::Side, Quantity, bool recurse); void set_day_pnl (AccountID account_id, double pnl); - + void set_excess_liquidity(AccountID account_id, double excesss_liquidity); + enum LimiterErrorCode { OK, NO_SUCH_SECURITY, diff --git a/src/lib/orderman/server/OrderServiceServer.cpp b/src/lib/orderman/server/OrderServiceServer.cpp index a777b7ccb..381673dac 100644 --- a/src/lib/orderman/server/OrderServiceServer.cpp +++ b/src/lib/orderman/server/OrderServiceServer.cpp @@ -1,6 +1,7 @@ #include "OrderServiceServer.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/services/MarginService.client.pb.h" #include "lib/api/services/PositionService.client.pb.h" #include "lib/config/config.h" #include "lib/config/protos/jetfix.pb.h" @@ -98,6 +99,7 @@ struct OrderServiceServer::PImpl { publish_orders(), publish_fills(), admin_service(ctx.locate()), position_service(ctx.locate()), + margin_service(ctx.locate()), md_consumer(mdc.current_consumer()), stats(stats), dyn_order_registry(d), log(log), in_flight_order_ops(), current_req_op_id(0) {} @@ -114,6 +116,7 @@ struct OrderServiceServer::PImpl { OrderServiceServer::FillsPublisher publish_fills; api::admin::AdminService admin_service; api::position::PositionService position_service; + api::position::MarginService margin_service; bts::md::MDConsumer &md_consumer; metrics::MetricsContainer &stats; DynamicOrderRegistry const &dyn_order_registry; @@ -240,10 +243,16 @@ OrderServiceServer::OrderServiceServer(bts::api::ServiceContext &ctx, // subscribe to position updates and foward them to the service bridge me->position_service.subscribe_pnl_account_data() | - rxcpp::operators::subscribe( - [this](auto const &update) { - me->service_bridge->update_account_pnl(update); - }); + rxcpp::operators::subscribe( + [this](auto const &update) { + me->service_bridge->update_account_pnl(update); + }); + + me->margin_service.subscribe_excess_liquidity_report() | + rxcpp::operators::subscribe( + [this](auto const &update) { + me->service_bridge->update_excess_liquidity_report(update); + }); } OrderServiceServer::~OrderServiceServer() { diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index ff12df496..d570ae6a8 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/MarginServiceServer.cpp;position/PositionAggregator.cpp;position/PositionServicePNLHelper.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..bc74cb4cf 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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.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/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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.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/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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.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/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 33a6d1453..74bc1c4af 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -122,6 +122,7 @@ module Accounts = let emptyMargin : ExcessLiquidityReport = { account = "ERROR NO DATA" + accountId = 0u marginResult = { account = "ERROR NO DATA" status = bts.api.position.MarginResult.ResultStatus.Error From 2d4e94a636c235c865e7c2785e505ee3ddb304fd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 15:39:35 +0000 Subject: [PATCH 080/210] Types.fs edited online with Bitbucket --- src/web/ui/src/Users/Types.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 51b83e88a..6de2e5df3 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -71,4 +71,4 @@ let CMEMicMap:Map = Map.empty .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) .Add("XCEC", bts.api.CMEMics.COMEX) - .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file + .Add("DUMX", bts.api.CMEMics.DME) \ No newline at end of file From 850386c1d4e0bd5b3f13814d93a445567c73dce8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 5 Jul 2019 12:05:16 -0400 Subject: [PATCH 081/210] Margin enforced in the limiter --- src/lib/orderman/limiter/LimitStore.cpp | 6 +++++ src/lib/orderman/limiter/LimitStore.h | 36 ++++++++++++++++++++++++- src/lib/orderman/limiter/Limiter.cpp | 10 ++++++- src/lib/orderman/limiter/Limiter.h | 3 ++- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 285273139..2fae93f93 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -44,6 +44,12 @@ void LimitStore::set_pnl (AccountID account_id, double pnl){ bts_assert(it != _account_data_map.end()); it->second.curr_day_pnl = pnl; } +void LimitStore::set_excess_liquidity (AccountID account_id, + double excess_liquidity){ + auto it = _account_data_map.find(account_id.value()); + bts_assert(it != _account_data_map.end()); + it->second.excess_liquidity = excess_liquidity; +} void LimitStore::_add_product_entry( const api::Security &security, const bts::api::admin::AdminData &admin_data) { diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index b586617c2..e49382324 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -39,10 +39,12 @@ private: public: const bts::api::admin::BTSAccount& account; double curr_day_pnl; + double excess_liquidity; AccountData (const bts::api::admin::BTSAccount& account) : account(account), - curr_day_pnl (os::nan()) + curr_day_pnl (os::nan()), + excess_liquidity (os::nan()) {} }; const bts::api::admin::AdminData _admin_data; @@ -107,6 +109,7 @@ public: } } void set_pnl (AccountID account_id, double pnl); + void set_excess_liquidity (AccountID account_id, double excess_liquidity); // risk limit checks //////////////////// // checks to see if the user is allowed to trade @@ -153,6 +156,9 @@ public: bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; _loss_limit(account_id, rv); + if(!rv.ok()) + return rv; + _margin_limit(account_id,rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -260,5 +266,33 @@ private: out_res.error_msg = "Could not find account"; } } + void _margin_limit(AccountID account_id, + Limiter::LimiterQueryResult& out_res) const{ + // similiar flow as the loss_limit above + const auto acct_it = _account_data_map.find(account_id.value()); + if(acct_it != _account_data_map.end()){ + const auto& account_data = acct_it->second; + const auto& account = account_data.account; + if (account.has_margin_limit() && + account.margin_limit().enforce_margin()){ + double ex_liq = account_data.excess_liquidity; + if(os::is_nan(ex_liq)){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = "Could not find account Excess Liquidity"; + } + else{ + if(ex_liq < 0){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", + ex_liq); + } + } + } + } + else{ + out_res.result = Limiter::LimiterErrorCode::NO_SUCH_ACCOUNT; + out_res.error_msg = "Could not find account"; + } + } }; }} diff --git a/src/lib/orderman/limiter/Limiter.cpp b/src/lib/orderman/limiter/Limiter.cpp index 572d533a1..cd1cfc9e5 100644 --- a/src/lib/orderman/limiter/Limiter.cpp +++ b/src/lib/orderman/limiter/Limiter.cpp @@ -78,7 +78,15 @@ void Limiter::set_day_pnl (AccountID account_id, double pnl){ _add_account_and_reset(account_id); me->limit_store->set_pnl(account_id, pnl); } -void Limiter::set_excess_liquidity (AccountID , double ) {} +void Limiter::set_excess_liquidity (AccountID account_id, + double excess_liquidity) { + LOG(OrderMan, Info, + "Limiter::set_excess_liquidity account:{} excess_liquidity: {}", + account_id, excess_liquidity); + if (!me->limit_store->has_account(account_id)) + _add_account_and_reset(account_id); + me->limit_store->set_excess_liquidity(account_id, excess_liquidity); +} Limiter::LimiterQueryResult Limiter::can_trade(UserID user_id, AccountID account_id) const { LimiterQueryResult rv = me->limit_store->can_trade(user_id, account_id); diff --git a/src/lib/orderman/limiter/Limiter.h b/src/lib/orderman/limiter/Limiter.h index 5dba06d8d..8ad1f0929 100644 --- a/src/lib/orderman/limiter/Limiter.h +++ b/src/lib/orderman/limiter/Limiter.h @@ -48,7 +48,8 @@ class Limiter { NO_SUCH_ACCOUNT, USER_DEACTIVATED, NO_SUCH_USER, - LOSS_LIMIT_BREACHED + LOSS_LIMIT_BREACHED, + MARGIN_LIMIT_BREACHED }; struct LimiterQueryResult { From ae4a8bbf46510b2a2b8db31018475f5dbc68c57f Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 12:28:58 -0400 Subject: [PATCH 082/210] more span --- .gitignore | 1 + src/lib/CMakeDeps_win.cmake | 2 +- src/lib/api/services/MarginService.proto | 11 +- src/lib/config/defaults/span.conf | 9 ++ src/lib/config/defaults/toggles.conf | 6 -- src/lib/config/protos/span.proto | 10 ++ src/lib/config/protos/toggles.proto | 4 - .../sparkd/position/MarginServiceCore.cpp | 8 ++ .../sparkd/position/MarginServiceServer.cpp | 101 ++++++++++++------ .../sparkd/position/MarginServiceServer.h | 6 +- .../sparkd/position/PositionAggregator.cpp | 3 +- src/web/ui/src/Access.fs | 1 + 12 files changed, 112 insertions(+), 50 deletions(-) create mode 100644 src/lib/config/defaults/span.conf create mode 100644 src/lib/config/protos/span.proto diff --git a/.gitignore b/.gitignore index 7c976336d..c7a63b0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv /src/lib/orderman/perf_analysis/log.csv /doc/user/public/* +.ionide/ diff --git a/src/lib/CMakeDeps_win.cmake b/src/lib/CMakeDeps_win.cmake index 2222ef991..b98ed6d8b 100644 --- a/src/lib/CMakeDeps_win.cmake +++ b/src/lib/CMakeDeps_win.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;os/os.cpp;os/tests/os_tests.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;utils/AuthSessionManager.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/MarginService.proto b/src/lib/api/services/MarginService.proto index 007e874e8..abe7a343b 100644 --- a/src/lib/api/services/MarginService.proto +++ b/src/lib/api/services/MarginService.proto @@ -29,7 +29,8 @@ message ExcessLiquidityReport { double cash_balance = 30; MarginResult margin_result = 40; AccountPNL account_pnl = 50; - double excess_liquidity = 100; + bool should_enforce_margin = 60; + double excess_liquidity = 100; } @@ -47,14 +48,20 @@ message CashBalanceUpdate { double cash_balance = 20; } +message EnforceUpdate { + string account = 10; + bool should_enforce_margin = 20; +} + service MarginService { option (bts.api.service_description) = "Provides CME Margin Information per account"; rpc get_margin(MarginRequest) returns (MarginResult); rpc get_excess_liquidity_report(MarginRequest) returns (ExcessLiquidityReport); + rpc set_should_enforce_margin(EnforceUpdate) returns (bts.api.ResultMessage); rpc set_cash_factor(CashFactorUpdate) returns (bts.api.ResultMessage); rpc set_cash_balance(CashBalanceUpdate) returns (bts.api.ResultMessage); - + rpc margin_data(bts.api.VoidMessage) returns (stream MarginResult); rpc excess_liquidity_report(bts.api.VoidMessage) returns (stream ExcessLiquidityReport); } \ No newline at end of file diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf new file mode 100644 index 000000000..7f86bfab3 --- /dev/null +++ b/src/lib/config/defaults/span.conf @@ -0,0 +1,9 @@ + +SpanMargin { + value { + enabled: true + login: 'api_bts1' + password: 'Summer123' + url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' + } +} diff --git a/src/lib/config/defaults/toggles.conf b/src/lib/config/defaults/toggles.conf index eb250ba1e..52b63f712 100644 --- a/src/lib/config/defaults/toggles.conf +++ b/src/lib/config/defaults/toggles.conf @@ -9,9 +9,3 @@ OrdersSoftCleanup { enabled: true } } - -SpanMargin { - value { - enabled: true - } -} \ No newline at end of file diff --git a/src/lib/config/protos/span.proto b/src/lib/config/protos/span.proto new file mode 100644 index 000000000..6d207757f --- /dev/null +++ b/src/lib/config/protos/span.proto @@ -0,0 +1,10 @@ +syntax='proto2'; +package bts.config; + +message SpanMargin +{ + optional bool enabled = 10; + optional string login = 20; + optional string password = 30; + optional string url = 40; +} diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 100eb9124..af0232f0b 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -54,7 +54,3 @@ message EnsureOnScreenWithWorkAreaRect { // Should verify that the code works with every monitor arrangement before enabling by default. optional bool enabled = 1 [default = false]; } - -message SpanMargin { - optional bool enabled = 1 [default = false]; -} \ No newline at end of file diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 3e221b9e5..cca8fa8c2 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -10,6 +10,7 @@ #include "lib/logging/logging.h" #include "lib/utils/helper_macros.h" #include "lib/utils/datetime.h" +#include "lib/config/protos/span.pb.h" #include "curl/curl.h" @@ -45,6 +46,13 @@ struct MarginServiceCore::PImpl verbose(false), throttle(30000) { + if(config::get().login() != "") + core_user = config::get().login(); + if(config::get().password() != "") + core_password = config::get().password(); + if(config::get().url() != "") + url_base = config::get().url(); + auto res = curl_global_init(CURL_GLOBAL_DEFAULT); if(res != CURLE_OK) { diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index 8a2551595..bdc286cac 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -7,7 +7,7 @@ #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/persistence/SqliteStore.h" #include "lib/config/config.h" -#include "lib/config/protos/toggles.pb.h" +#include "lib/config/protos/span.pb.h" #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" @@ -33,7 +33,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: _publisher(make_margin_data_stateful_publisher()), _report_publisher(make_excess_liquidity_report_stateful_publisher()), _dispatcher(utils::Dispatcher::get_named("MarginServiceServer")), - _timer(_dispatcher, 20000, [=]() { publish_all();} ), + _timer(_dispatcher, 30000, [=]() { publish_all();} ), _position(new PositionAggregator(context.locate(), mdclient)), _margin(new MarginServiceCore(_dispatcher)), //state below @@ -65,9 +65,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: auto accts = AdminServiceUtils::accounts(_admin_data, false); for(const auto& i : accts) { - MarginResult margin; margin.Clear(); margin.set_account(i->name()); - AccountPNL pnl; pnl.Clear(); pnl.set_account_name(i->name()); - publish_excess_liquidity_report(margin, pnl); + incremental_update_report(i->name(), i->id()); } _first_time = false; } @@ -78,7 +76,7 @@ MarginServiceServer::MarginServiceServer(bts::api::ServiceContext& context, md:: void MarginServiceServer::publish_all() { - if(config::get().enabled()) + if(config::get().enabled()) { std::scoped_lock l(_lock); auto accts = AdminServiceUtils::accounts(_admin_data, false); @@ -92,7 +90,7 @@ void MarginServiceServer::publish_all() std::vector pos; AccountPNL pnl; if(_position->query_positions(acct, pos, pnl, &since) && pos.size()) { - LOG(Gen, Info, "MarginServiceServer: computing margin for {} ", acct); + 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) { @@ -111,7 +109,7 @@ MarginServiceServer::~MarginServiceServer() {} void MarginServiceServer::get_margin(const api::position::MarginRequest& request, const api::Response& reply) { - if(!config::get().enabled()) + if(!config::get().enabled()) { MarginResult res; res.set_account(request.account()); @@ -156,13 +154,15 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M std::scoped_lock l(_lock); ExcessLiquidityReport report; report.set_account(result.account()); + report.set_account_id(pnl.account_id()); report.mutable_account_pnl()->CopyFrom(pnl); report.mutable_margin_result()->CopyFrom(result); auto acct = AdminServiceUtils::find_account(_admin_data, result.account(), false); if(acct && acct->has_margin_limit()) { report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); - report.set_cash_balance(acct->margin_limit().cash_balance()); + report.set_cash_balance(acct->margin_limit().cash_balance()); + report.set_should_enforce_margin(acct->margin_limit().enforce_margin()); } double netliq = report.leverage_factor() * report.cash_balance(); @@ -176,6 +176,28 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M _report_publisher.flush(); } +//so the admin ui knows what to do +void MarginServiceServer::incremental_update_report(const std::string& account, uint32_t account_id) +{ + std::scoped_lock l(_lock); + + MarginResult margin; + if(!_margin->get_last_valid_result(orderman::to(account), margin)) + { + margin.Clear(); + margin.set_account(account); + } + AccountPNL pnl; + if(!_position->query_pnl(account, pnl)) + { + pnl.Clear(); + pnl.set_account_name(account); + pnl.set_account_id(account_id); + } + publish_excess_liquidity_report(margin, pnl); + _last_update[account] = 0; +} + void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactorUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -197,37 +219,16 @@ void MarginServiceServer::set_cash_factor(const ::bts::api::position::CashFactor update.mutable_complete_data()->CopyFrom(*acct); _admin_service.update_account(update, - [this, request, reply](const api::Result& admin_result) + [this, request, reply, update](const api::Result& admin_result) { api::ResultMessage resp; resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - incremental_update_report(request.account()); + incremental_update_report(request.account(), update.complete_data().id()); }); } } - -//so the admin ui knows what to do -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)) - { - margin.Clear(); - margin.set_account(account); - } - AccountPNL pnl; - if(!_position->query_pnl(account, pnl)) - { - pnl.Clear(); - pnl.set_account_name(account); - } - publish_excess_liquidity_report(margin, pnl); - _last_update[account] = 0; -} void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) @@ -249,16 +250,48 @@ void MarginServiceServer::set_cash_balance(const ::bts::api::position::CashBalan update.mutable_complete_data()->CopyFrom(*acct); _admin_service.update_account(update, - [this, request, reply](const api::Result& admin_result) + [this, request, reply, update](const api::Result& admin_result) { api::ResultMessage resp; resp.set_success(admin_result.success()); resp.set_error_message(admin_result.error_message()); reply(resp); - incremental_update_report(request.account()); + incremental_update_report(request.account(), update.complete_data().id()); }); } } +void MarginServiceServer::set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) +{ + std::scoped_lock l(_lock); + auto acct = AdminServiceUtils::find_account(_admin_data, request.account(), false); + if(!acct) + { + auto msg = "Account " + request.account() +"not found"; + api::ResultMessage resp; + resp.set_success(false); + resp.set_error_message(msg); + reply(resp); + } + else + { + acct->mutable_margin_limit()->set_enforce_margin(request.should_enforce_margin()); + AccountUpdateAPIArgument update; + update.mutable_complete_data()->CopyFrom(*acct); + + _admin_service.update_account(update, + [this, request, reply, update](const api::Result& admin_result) + { + api::ResultMessage resp; + resp.set_success(admin_result.success()); + resp.set_error_message(admin_result.error_message()); + reply(resp); + incremental_update_report(request.account(), update.complete_data().id()); + }); + } +} + + }} diff --git a/src/server/sparkd/position/MarginServiceServer.h b/src/server/sparkd/position/MarginServiceServer.h index d7b49d928..aa0c5cd01 100644 --- a/src/server/sparkd/position/MarginServiceServer.h +++ b/src/server/sparkd/position/MarginServiceServer.h @@ -40,12 +40,16 @@ public: void set_cash_balance(const ::bts::api::position::CashBalanceUpdate& request, const api::Response<::bts::api::ResultMessage>& reply) override; + + void set_should_enforce_margin(const ::bts::api::position::EnforceUpdate& request, + const api::Response<::bts::api::ResultMessage>& reply) override; + private: void publish_margin(const api::position::MarginResult&); void publish_excess_liquidity_report(const api::position::MarginResult&, const api::position::AccountPNL&); void publish_all(); - void incremental_update_report(const std::string& account); + void incremental_update_report(const std::string& account, uint32_t account_id); private: api::admin::AdminService _admin_service; diff --git a/src/server/sparkd/position/PositionAggregator.cpp b/src/server/sparkd/position/PositionAggregator.cpp index 45a83dd07..4d42ed6cd 100644 --- a/src/server/sparkd/position/PositionAggregator.cpp +++ b/src/server/sparkd/position/PositionAggregator.cpp @@ -123,8 +123,7 @@ bool PositionAggregator::query_positions(const std::string& account, std::vector } if(since) *since = last_update; - query_pnl(account, pnl); - return true; + return query_pnl(account, pnl); } return false; } diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 74bc1c4af..935e66560 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -136,6 +136,7 @@ module Accounts = maintMargin = 0.0 initialMargin = 0.0 } + shouldEnforceMargin = false leverageFactor = 0.0 cashBalance = 0.0 accountPnl = { From 213567bcdb841c6d56957d37e0b53ed23eebdbc9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 5 Jul 2019 11:49:34 -0500 Subject: [PATCH 083/210] display tooltip again when re-entering same cell where tooltip was previouly closed --- src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index 2a2af3223..b78519f62 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -694,12 +694,14 @@ namespace mbts.spark { // At any rate, we need this part hiding the tooltip so that we don't leave random tooltips around // and we have to reset to old row so that when we go back to what could be our preivous row, the tooltip gets drawn again //System.Diagnostics.Debug.WriteLine(" Tooltip - Volume is 0"); + _old_tooltip_row = int.MaxValue; _hide_tool_tip(); //_old_tooltip_row = Int32.MaxValue; } } } else { //System.Diagnostics.Debug.WriteLine(" Tooltip - not over Volume column"); + _old_tooltip_row = int.MaxValue; _hide_tool_tip(); } } From d871ffca6dd76e20ce698baf28ee2c29d013fb24 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 12:59:41 -0400 Subject: [PATCH 084/210] temporarily tie span enforcement to config while michael works --- src/lib/orderman/limiter/LimitStore.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index e49382324..7efcf76ab 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -10,6 +10,9 @@ #include "ProductLimitTree.h" #include "SecurityLimitTree.h" #include "lib/os/os.h" +#include "lib/config/config.h" +#include "lib/config/protos/span.pb.h" + namespace bts { namespace orderman { @@ -272,9 +275,10 @@ private: const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - const auto& account = account_data.account; - if (account.has_margin_limit() && - account.margin_limit().enforce_margin()){ + //const auto& account = account_data.account; + if(config::get().enabled()) { + // if (account.has_margin_limit() && + // account.margin_limit().enforce_margin()){ double ex_liq = account_data.excess_liquidity; if(os::is_nan(ex_liq)){ out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; From 25b69e4f7d683f16bb406888ada3fd880d792857 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Fri, 5 Jul 2019 13:29:22 -0400 Subject: [PATCH 085/210] fix small bug and add manual test --- src/lib/orderman/limiter/LimitStore.cpp | 6 +++-- testing/manual/span/span.txt | 29 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 testing/manual/span/span.txt diff --git a/src/lib/orderman/limiter/LimitStore.cpp b/src/lib/orderman/limiter/LimitStore.cpp index 2fae93f93..3f71be12b 100644 --- a/src/lib/orderman/limiter/LimitStore.cpp +++ b/src/lib/orderman/limiter/LimitStore.cpp @@ -32,11 +32,13 @@ void LimitStore::copy_data_from(LimitStore &source) { if (source_security_limit_tree != nullptr) it->second.copy_positions_from(*source_security_limit_tree); } - // copy pnl's + // copy pnl's and liqs for (auto it=_account_data_map.begin();it!=_account_data_map.end();it++){ auto source_it = source._account_data_map.find(it->first); - if(source_it != source._account_data_map.end()) + if(source_it != source._account_data_map.end()) { it->second.curr_day_pnl = source_it->second.curr_day_pnl; + it->second.excess_liquidity = source_it->second.excess_liquidity; + } } } void LimitStore::set_pnl (AccountID account_id, double pnl){ diff --git a/testing/manual/span/span.txt b/testing/manual/span/span.txt new file mode 100644 index 000000000..22a815661 --- /dev/null +++ b/testing/manual/span/span.txt @@ -0,0 +1,29 @@ +Test Author: Kevin +If it breaks: Kevin + +This will test our ability to compute and enforce span margin at CME + +1) Make sure span.conf looks like: + +SpanMargin { + value { + enabled: true + login: 'api_bts1' + password: 'Summer123' + url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' + } +} + +2) Fire up a shell and trade 1 ES into ACC A + +3) Open a webui, look at Margin Tab in ACC A + +You should see a value of around 6300 in maintenance margin after a minute or two + +4) If not already zero, set your cash balance to zero. + +5) Try to trade an ES in ACC A, you should be blocked by a limit breach + +6) Increase your cash balance to 10,000 and set leverage factor to 1.0 + +7) Try to trade again, you should be able to. \ No newline at end of file From 96fc54ff0f33fe614b0b7458fa469db391cd3307 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 5 Jul 2019 14:35:18 -0400 Subject: [PATCH 086/210] Added ticks_off to top algo server side. --- src/lib/api/services/OrderService.proto | 2 +- .../orders/algo/algo_orders/TopAlgo.cpp | 31 ++++++++++++++++--- .../orders/algo/algo_orders/TopAlgo.h | 2 +- src/web/CMakeDeps.cmake | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 1908ff7bf..42d7f2531 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -160,8 +160,8 @@ message JoinOrderDefinition { CustomOrderDefinition child = 6; } message TopOrderDefinition { - uint32 watch_level_tick_offset = 1; spark.QuantityMeasure top_threshold = 2; + uint32 ticks_off = 3; CustomOrderDefinition child = 6; } message TriggerOrderDefinition { diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp index e16aaa5d8..b7fac256e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -16,6 +16,7 @@ using namespace api::orderman; struct TopAlgo::PImpl { IAlgoServices *algo; spark::QuantityMeasure top_threshold_measure; + uint32_t ticks_off = 0; OrderKey child_key = null_order_key(); ChildTemplate *child_template = nullptr; Book last_book; @@ -41,7 +42,7 @@ OrderOpResult TopAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { } me->top_threshold_measure = top.top_threshold(); - + me->ticks_off = top.ticks_off(); if (!serv.is_attaching()) { // if we are not attaching create a child template so we can // quickly launch our child when the time comes. @@ -93,7 +94,7 @@ void TopAlgo::do_update(api::orderman::Update const &update) { void TopAlgo::on_book(SecurityKey, Book const &b) { me->last_book = b; - ensure_min_quantity(); + ensure_order_meets_constraints(); } void TopAlgo::on_child_change(OrderKey, ChildState const &st) { @@ -111,14 +112,14 @@ void TopAlgo::on_child_change(OrderKey, ChildState const &st) { } } -bool TopAlgo::ensure_min_quantity() { +bool TopAlgo::ensure_order_meets_constraints() { LOG(OrderMan, Diag, "Top order {} received book update. Current top of book: {}@{}", algo().order_key().value(), top_of_book_quantity().value(), top_of_book_price().value()); if (better_than_top()) { - LOG(OrderMan, Diag, + LOG(OrderMan, Info, "Top order {} became better than the top of the book, canceling", algo().order_key().value()); algo().cancel("Order would become BBO"); @@ -135,7 +136,7 @@ bool TopAlgo::ensure_min_quantity() { algo().order_key().value(), total_min_quantity, top_of_book_quantity().value()); if (top_of_book_quantity() < Quantity(total_min_quantity)) { - LOG(OrderMan, Diag, + LOG(OrderMan, Info, "Top order {} is canceling because min quantiy is not met", algo().order_key().value()); algo().cancel("Top of book is below threshold"); @@ -147,6 +148,26 @@ bool TopAlgo::ensure_min_quantity() { algo().order_key().value(), algo().price().value(), top_of_book_price().value()); + if (me->ticks_off > 0) { + auto tick_diff = securities::price_diff_to_ticks( + algo().price().value(), top_of_book_price().value(), + securities::tick_size(algo().security()).value()); + if (std::abs(tick_diff) <= (int)me->ticks_off) { + LOG(OrderMan, Info, + "Top order {} price {} is less than {} ticks away from top ({}). " + "Canceling", + algo().order_key().value(), algo().price().value(), + me->ticks_off + 1, top_of_book_price().value()); + algo().cancel("Order is too close to top of the book"); + return false; + } else + LOG(OrderMan, Diag, + "Top order {} price {} is {} ticks away from top. Top: {} Ticks " + "off: {}", + algo().order_key().value(), algo().price().value(), + std::abs(tick_diff), top_of_book_price().value(), me->ticks_off); + } + return true; } diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h index 3648dc50c..857f12f88 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.h @@ -27,7 +27,7 @@ class TopAlgo : public IAlgoOrder { bool at_top_of_book() const; bool better_than_top() const; Quantity min_quantity_at_top() const; - bool ensure_min_quantity(); + bool ensure_order_meets_constraints(); bool has_running_child() const; Price top_of_book_price() const; Quantity top_of_book_quantity() const; diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..1843aaacb 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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.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/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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.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/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 7e1463683f1642cfbe3307b917025c00ca98e2b7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 5 Jul 2019 11:55:02 -0400 Subject: [PATCH 087/210] SP-30 base Dorman algo atop SplitterAlgo --- .vscode/launch.json | 2 +- .../orders/algo/algo_orders/DormanAlgo.cpp | 230 +++++++++--------- .../orders/algo/algo_orders/DormanAlgo.h | 11 +- .../algo/algo_orders/tests/AlgoTestDriver.cpp | 15 +- .../algo/algo_orders/tests/AlgoTestDriver.h | 1 + .../algo/algo_orders/tests/dorman_tests.cpp | 224 ++++++++--------- 6 files changed, 247 insertions(+), 236 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index fac8a7668..cda1e31c2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -249,7 +249,7 @@ "program": "/home/bts/spark/build/ninja_debug/server/sparkd", "args": [ "test", - "SingleWriterConcurrentVector" + "[dorman]" ], "stopAtEntry": false, "cwd": "/home/bts/spark/build/ninja_debug/server/", diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index b1f31c717..ef5692f45 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -15,87 +15,8 @@ namespace dorman { using namespace api::orderman; - -// Class which will send out multiple orders but act like one order -struct ChildOrderState { - Quantity size; - Quantity filled; -}; - -class MultiOrder { - IAlgoServices* _algo = nullptr; - uint32_t _clip = 0; - ChildTemplate* _template = nullptr; - - Quantity _qty = {}; - std::map _orders; - - public: - MultiOrder() {} - ~MultiOrder() { - if (_algo) { - for (const auto& pair : _orders) { - _algo->cancel_child(pair.first); - } - } - } - void do_before_launch(IBeforeLaunchAlgoServices& algo, uint32_t clip) { - _clip = clip == 0 ? std::numeric_limits::max() : clip; - auto def = algo.definition(); - - CustomOrderDefinition default_order; - default_order.mutable_limit(); - - *def.mutable_custom_def() = - get_if(def.custom_def().dynamic().order_params(), "Child") - .value_or(default_order); - _template = &algo.make_child_template(def); - } - - void set_algo_services(IAlgoServices& a) { _algo = &a; } - - void update(Price p, Quantity q) { - bts_assert(_algo != nullptr); - // This class does not handle delayed size changes - if (q < _qty) { - // cancel some orders - auto excess = _qty.value() - q.value(); - while(excess > 0) { - // cancel some orders - auto iter = _orders.begin(); - auto lsize = iter->second.size.value() - iter->second.filled.value(); - if (lsize > excess) { - // Reduce order size - Update update; - update.set_quantity(lsize - excess); - _algo->update_child(iter->first, update); - iter->second.size.value() -= excess; - excess = 0; - } - else { - excess -= lsize; - _algo->cancel_child(iter->first); - _orders.erase(iter); - } - } - _qty = q; - } - else if (q > _qty) { - // add more orders - auto shortfall = q.value() - _qty.value(); - while(shortfall > 0) { - auto order_size = Quantity { std::min(shortfall, _clip) }; - auto child_id = _algo->launch_child(*_template, p, order_size, true); - _orders.insert(std::make_pair(child_id, ChildOrderState { order_size, Quantity {0} })); - shortfall -= order_size.value(); - } - _qty = q; - } - } - - Quantity quantity() const { return _qty; } -}; - +#define REQUIRE(condition, message) \ + if (!(condition)) { algo().cancel(message); return; } // // Algo State @@ -113,9 +34,14 @@ struct DormanAlgo::Impl { IAlgoServices *algo = nullptr; AlgoParams params; api::Side side; - + Quantity exposed_qty = {}; std::optional next_size; - MultiOrder child; + + OrderDefinition splitter_definition; + OrderKey child_id; + ChildState child_state; + + uint32_t fills ={}; }; DormanAlgo::DormanAlgo() : @@ -123,49 +49,90 @@ DormanAlgo::DormanAlgo() : { } DormanAlgo::~DormanAlgo() { } -// Not latency sensitive. Do expensive initialization here -OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& iblas) { - const auto& def = iblas.definition(); +OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { + const auto& def = ibl.definition(); // Validation bts_assert(def.has_custom_def()); bts_assert(def.custom_def().has_dynamic()); + auto params = to_dorman_params(def.custom_def().dynamic()); - if (auto r = std::get_if(¶ms)) { - return *r; + if (auto error = std::get_if(¶ms)) { + return *error; } me->params = std::get(params); me->side = def.side(); if (me->side != api::Side::SIDE_BUY && me->side != api::Side::SIDE_SELL) { return OrderOpResult { ORDER_ERROR_INVALID_ORDER_DEFINITON, "Invalid side" }; } - me->child.do_before_launch(iblas, me->params.clip_limit); + + CustomOrderDefinition default_order; + default_order.mutable_limit(); + auto child_def = + get_if(def.custom_def().dynamic().order_params(), "Child") + .value_or(default_order); + + update_child_template(ibl, child_def); + + if (ibl.is_attaching()) { + return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, + "Splitter does not support attach."}; + } return {/*ok*/}; } + void DormanAlgo::do_launch(IAlgoServices& algo) { me->algo = &algo; - me->child.set_algo_services(algo); - algo.subscribe_book(SecurityKey(algo.security().id())); algo.subscribe_timer(); } -void DormanAlgo::do_launch_attached(IAlgoServices& algo, OrderKey k, ChildState state) { - me->algo = &algo; - (void)k; - (void)state; +void DormanAlgo::do_launch_attached(IAlgoServices&, OrderKey, ChildState) { + bts_assert(false); } void DormanAlgo::do_update(const api::orderman::Update& update) { LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - (void)update; + + if (me->fills >= update.quantity()) { + algo().complete(); + } + + if (update.has_custom()) { + REQUIRE(update.custom().has_dynamic(), "Update cannot change order type"); + auto params = to_dorman_params(update.custom().dynamic()); + + if (auto error = std::get_if(¶ms)) { + algo().cancel(error->error_msg); + } + + me->params = std::get(params); + + // Check for child + auto child = get_if(update.custom().dynamic().order_params(), "Child"); + if (child) { + update_child_template(algo(), child.value()); + } + } } -void DormanAlgo::on_child_change(OrderKey k, const ChildState& st) { - (void)k; - (void)st; +void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { + REQUIRE(k == me->child_id, "Unexpected update from illigitimate child"); + REQUIRE(state.total_fills.value() >= me->child_state.total_fills.value(), "Unexpected fill decrease."); + + auto delta = state.total_fills.value() - me->child_state.total_fills.value(); + if (delta != 0) { + me->fills += delta; + algo().update_fill_state(Quantity {me->fills}, state.last_price); + } + me->child_state = state; + + if (me->fills >= algo().quantity().value()) { + algo().complete(); + } } + void DormanAlgo::on_book(SecurityKey key, const Book& book) { if (key.value() != me->algo->security().id()) { return; } auto price = me->algo->price(); @@ -194,24 +161,24 @@ void DormanAlgo::on_book(SecurityKey key, const Book& book) { target = Quantity { std::min(target.value(), me->params.steps.maximum) }; // First on_book - if (me->child.quantity() == Quantity {0}) { - me->child.update(price, target); + if (!child_active()) { + update_child(target); } // See if we need to adjust else { - if (target < me->child.quantity()) { - // If target < size reduce immidiately - me->child.update(price, target); + // If target < size reduce immidiately + if (target < me->exposed_qty) { + update_child(target); me->next_size = std::nullopt; } - else if (target > me->child.quantity()) { - // if target > size schedule increase + // if target > size schedule increase + else if (target > me->exposed_qty) { if (me->next_size) { - // already planning to increase + // already planning to increase, update the target me->next_size.value().size = target; } else { - // no scheduled increase + // no existing scheduled increase, create one now me->next_size = { FutureQty { target, me->algo->get_time() + std::chrono::seconds(me->params.steps.trail_seconds) } }; } } @@ -222,7 +189,7 @@ void DormanAlgo::on_timer() { if (me->next_size && me->algo->get_time() >= me->next_size.value().when) { auto size = me->next_size.value().size; - me->child.update(me->algo->price(), size); + update_child(size); me->next_size = std::nullopt; } } @@ -230,10 +197,49 @@ void DormanAlgo::on_timer() { IAlgoServices& DormanAlgo::algo() const { return *me->algo; } // -// Visibility for testing -// +// private -Quantity DormanAlgo::desired_size() const { return me->child.quantity(); } +void DormanAlgo::update_child(Quantity exposed) { + auto& splitter = *me->splitter_definition.mutable_custom_def()->mutable_splitter(); + splitter.set_max_order_qty(me->params.clip_limit); + splitter.set_exposed_qty(exposed.value()); + me->exposed_qty = exposed; + if (!child_active()) { + // launch child + me->child_id = algo().launch_child(me->splitter_definition, algo().price(), algo().quantity()); + } + else { + Update update; + update.set_price(algo().price().value()); + update.set_quantity(algo().quantity().value()); + *update.mutable_custom()->mutable_splitter() = splitter; + algo().update_child(me->child_id, update); + } +} + +void DormanAlgo::update_child_template(IBeforeLaunchAlgoServices& ibl, const CustomOrderDefinition& child) { + auto child_def = ibl.definition(); + // Insert a spliter between this and the configured child definition. + api::orderman::SplitterOrderDefinition& splitter_def = *child_def.mutable_custom_def()->mutable_splitter(); + *splitter_def.mutable_child() = child; + me->splitter_definition = child_def; +} + +Quantity DormanAlgo::exposed_qty() const { return me->exposed_qty; } + +bool DormanAlgo::child_active() const { return me->child_id.value() != 0; } + +void DormanAlgo::pause_until(TimeStamp) { + // cancel child + algo().cancel_child(me->child_id); + + // retain me->child_id for updates + + // set paused flag + // set paused_time flag + // ignore child_update if paused + // check paused_time in on_timer +} // // diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 9d0628b76..01f997068 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -68,7 +68,16 @@ public: void on_book(SecurityKey, const Book&) override; void on_timer() override; - Quantity desired_size() const; + Quantity exposed_qty() const; + +private: + // + // Child management + void update_child_template(IBeforeLaunchAlgoServices&, const api::orderman::CustomOrderDefinition&); + void launch_child(); + void update_child(Quantity exposed); + bool child_active() const; + void pause_until(TimeStamp); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index bee71af2f..14a9439ad 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -315,8 +315,13 @@ OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity for(const auto& cb : me->on_child_launching) cb(key); return key; } -OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & od, Price price, Quantity qty, bool sub) { - return launch_child(make_child_template(od), price, qty, sub); +OrderKey AlgoTestDriverBase::launch_child(api::orderman::OrderDefinition const & def, Price price, Quantity qty, bool sub) { + OrderKey key = me->next_order(); + me->orders.push_back( + mkchild(key, price, qty, sub)); + me->orders.back().def = {def}; + for(const auto& cb : me->on_child_launching) cb(key); + return key; } void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const & update) { auto guard = me->recusion_guard(); @@ -333,6 +338,12 @@ void AlgoTestDriverBase::update_child(OrderKey key, api::orderman::Update const if (child.cstate.quantity.value() <= child.cstate.total_fills.value()) { child.cstate.status = ChildStatus::COMPLETED; } + if (update.has_custom()) { + if (!child.def) { + child.def = {api::orderman::OrderDefinition()}; + } + *child.def.value().mutable_custom_def() = update.custom(); + } for (const auto& cb : me->on_child_changed) cb(old, child); if (child.subscribed) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index b475e8941..c39f7f2db 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -33,6 +33,7 @@ struct ChildOrder { OrderKey key; bool subscribed; ChildState cstate; + std::optional def; uint32_t active_qty() const { return cstate.status == ChildStatus::WORKING ? cstate.quantity.value() - cstate.total_fills.value() : 0; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index 55a8ad308..e3d5c6f83 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -16,7 +16,7 @@ namespace test { struct OrderState { Price desired_price; - Quantity desired_size; + Quantity exposed_qty; } */ @@ -113,14 +113,17 @@ struct ExpectedSize { }; constexpr auto some_price = md::IntPrice { 128000, -3 }; -size_t count_child_size(const std::vector& child_orders) { +size_t child_exposed(const std::vector& child_orders) { return std::accumulate( child_orders.begin(), child_orders.end(), 0, [](uint32_t acc, const auto& child) { if (child.cstate.status != ChildStatus::CANCELED) { - // count working+completed - return acc + child.cstate.quantity.value(); + REQUIRE(child.def); + return + acc + + child.def.value().custom_def().splitter().exposed_qty() + + child.cstate.total_fills.value(); } else return acc; }); @@ -128,140 +131,121 @@ size_t count_child_size(const std::vector& child_orders) { TEST_CASE("dorman_order_size", "[algo][dorman]") { - // Repeate the test for a variety of clip sizes - for (auto clip : { 100, 20, 900, 1 }) { + // create a table of various sizes + // send market state to the algo + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 400}, + {2000, 600}, + {3500, 750}, + {10000, 999} + }; + input.steps.maximum = 800; + input.steps.trail_seconds = 5; + input.clip_limit = 100; - // create a table of various sizes - // send market state to the algo - AlgoParams input; - input.steps.step_table = { - {500, 250}, - {1000, 400}, - {2000, 600}, - {3500, 750}, - {10000, 999} + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + + SECTION("initial size vs market") { + std::vector test_sizes { + { 10, 250 }, + { 200, 250 }, + { 250, 250 }, + { 500, 400 }, + { 999, 400 }, + { 2500, 750 }, + { 9999, 800 } }; - input.steps.maximum = 800; - input.steps.trail_seconds = 5; - input.clip_limit = clip; - api::orderman::OrderDefinition def; - def.set_side(api::SIDE_BUY); - def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); - - - SECTION("initial size vs market") { - std::vector test_sizes { - { 10, 250 }, - { 200, 250 }, - { 250, 250 }, - { 500, 400 }, - { 999, 400 }, - { 2500, 750 }, - { 9999, 800 } - }; - - for (auto& s : test_sizes) - { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - - // order size is driven by the available market size - book.bid()[0] = { some_price, s.input }; - state.update_book(book); - - REQUIRE(state.before_launch().ok()); - state.launch(); - REQUIRE(state.algo().desired_size().value() == s.expected); - REQUIRE( - s.expected == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - } - } - SECTION("Reduce qty on market shrink (immidiate)") { + for (auto& s : test_sizes) + { AlgoTestDriver state(def, some_price, Quantity {10}); auto secid = SecurityKey(state.security().id()); Book book(secid); - book.bid()[0] = { some_price, 505 }; + + // order size is driven by the available market size + book.bid()[0] = { some_price, s.input }; state.update_book(book); + REQUIRE(state.before_launch().ok()); state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(400)); + REQUIRE(state.algo().exposed_qty().value() == s.expected); + REQUIRE(s.expected == child_exposed(state.child_orders())); + } + } + SECTION("Reduce qty on market shrink (immidiate)") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(400)); - // Check that orders were created - REQUIRE( - 400 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - - // Reduce market - book.bid()[0] = { some_price, 405 }; - state.update_book(book); - REQUIRE(state.algo().desired_size() == Quantity(250)); - REQUIRE( - 250 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } + // Check that orders were created + REQUIRE(400 == child_exposed(state.child_orders())); + for(const auto& ch : state.child_orders()) { + REQUIRE(ch.cstate.quantity == state.quantity()); } - SECTION("Increase qty w/ delay when market grows") { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - book.bid()[0] = { some_price, 505 }; - state.update_book(book); - REQUIRE(state.before_launch().ok()); - state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(400)); + // Reduce market + book.bid()[0] = { some_price, 405 }; + state.update_book(book); + REQUIRE(state.algo().exposed_qty() == Quantity(250)); + REQUIRE( + 250 == child_exposed(state.child_orders())); + } - // Check that orders were created - REQUIRE( - 400 == count_child_size(state.child_orders())); + SECTION("Increase qty w/ delay when market grows") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(400)); - // INCREASE market - book.bid()[0] = { some_price, 1001 }; - state.update_book(book); - // NOTE: that the orders do not follow the market instantly - // so this is still 400 - REQUIRE( - 400 == count_child_size(state.child_orders())); + // Check that orders were created + REQUIRE( + 400 == child_exposed(state.child_orders())); - // Still 400 after the timer ticks but not enough time has passed - state.advance_time(std::chrono::seconds()); - REQUIRE( - 400 == count_child_size(state.child_orders())); + // INCREASE market + book.bid()[0] = { some_price, 1001 }; + state.update_book(book); + // NOTE: that the orders do not follow the market instantly + // so this is still 400 + REQUIRE( + 400 == child_exposed(state.child_orders())); - state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); - REQUIRE( - 600 == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } + // Still 400 after the timer ticks but not enough time has passed + state.advance_time(std::chrono::seconds()); + REQUIRE( + 400 == child_exposed(state.child_orders())); - } - SECTION("Respect maximum") { - AlgoTestDriver state(def, some_price, Quantity {10}); - auto secid = SecurityKey(state.security().id()); - Book book(secid); - book.bid()[0] = { some_price, 10505 }; - state.update_book(book); - REQUIRE(state.before_launch().ok()); - state.launch(); + state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); + REQUIRE( + 600 == child_exposed(state.child_orders())); - REQUIRE(state.algo().desired_size() == Quantity(input.steps.maximum)); + } + SECTION("Respect maximum") { + AlgoTestDriver state(def, some_price, Quantity {10}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 10505 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); - // Check that orders were created - REQUIRE( - input.steps.maximum == count_child_size(state.child_orders())); - for(const auto& ch : state.child_orders()) { - REQUIRE(ch.cstate.quantity.value() <= input.clip_limit); - } - } + REQUIRE(state.algo().exposed_qty() == Quantity(input.steps.maximum)); + + // Check that orders were created + REQUIRE( + input.steps.maximum == child_exposed(state.child_orders())); } } @@ -293,7 +277,7 @@ TEST_CASE("Dorman fills", "[algo][dorman]") { state.update_book(book); REQUIRE(state.before_launch().ok()); state.launch(); - REQUIRE(state.algo().desired_size() == Quantity(450)); + REQUIRE(state.algo().exposed_qty() == Quantity(450)); for (const auto& order : state.child_orders()) { state.fill(order.key, price, order.cstate.quantity); From f5bbc4245f7e09b8cd85a2c99e9f156e1a5b06f7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 5 Jul 2019 16:12:32 -0500 Subject: [PATCH 088/210] SP-111 / SP-113 Add ticks off parameter to top algo UI --- src/client/spark/Orders/OrderDataHelper.cs | 4 ++-- src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs | 3 +++ .../view/Controls/Order/AlgoContentTemplateSelector.xaml | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 81e342b38..e3a8179b1 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -715,7 +715,7 @@ namespace mbts.spark.utilities { !b.HasChild); public static bool top_equals(TopOrderDefinitionImmutable a, TopOrderDefinitionImmutable b) => - a.WatchLevelTickOffset == b.WatchLevelTickOffset && + a.TicksOff == b.TicksOff && (a.HasTopThreshold ? b.HasTopThreshold && quantity_measure_equals(a.TopThreshold, b.TopThreshold) : !b.HasTopThreshold) && @@ -906,7 +906,7 @@ namespace mbts.spark.utilities { add_component(_get_hash(_get_tick_child(tick))); break; case CustomOrderDefinition.CustomOneofCase.Top: - add_component(def.Top.WatchLevelTickOffset.GetHashCode()); + add_component(def.Top.TicksOff.GetHashCode()); add_component(def.Top.HasTopThreshold ? def.Top.TopThreshold.GetHashCode() : 0); add_component(_get_top_child(def.Top).GetHashCode()); break; diff --git a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs index 984303599..8f41cbbaf 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TopOrderVM.cs @@ -5,13 +5,16 @@ using TopDefi = bts.api.orderman.TopOrderDefinitionImmutable; namespace mbts.spark { static partial class OrderTypeVMFactory { class TopOrderVM : OrderTypeVMBase { + readonly Property _ticks_off; readonly Property _top_threshold; public TopOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) : base(key, display_name, editing_permissions) { + _ticks_off = add_nullable_property(nameof(ticks_off), TopDef.TicksOffFieldNumber); _top_threshold = add_property(nameof(top_threshold), TopDef.TopThresholdFieldNumber, new QuantityMeasureImmutable(new QuantityMeasure { Ratio = 1.0, Absolute = 1 })); } + public uint? ticks_off { get => _ticks_off.Value; set => _ticks_off.set(value); } public QuantityMeasureImmutable? top_threshold { get => _top_threshold.Value; set => _top_threshold.set(value); } } } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index c64d29f52..a3b82fee1 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -489,6 +489,8 @@ + + @@ -503,9 +505,11 @@ + Ticks Off + Date: Mon, 8 Jul 2019 10:15:14 -0400 Subject: [PATCH 089/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f2ba4c36e..b06ee5496 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,9 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.6.0 +### User Visible Changes + - In the ladder made last trade more distinctive when overlayed on the volumn column ## 2.5.0 ### User Visible Changes - Added loss limit risk check From e079acf91f4bdf56e84a850ccfc2b31b7dea4681 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 10:28:18 -0400 Subject: [PATCH 090/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index b06ee5496..873055005 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,7 @@ insert_anchor_links = "right" ## 2.6.0 ### User Visible Changes - In the ladder made last trade more distinctive when overlayed on the volumn column + - In the ladder, corrected display of volume tool tip ## 2.5.0 ### User Visible Changes - Added loss limit risk check From 4ecbfe5f5b2a18f978ea1cd4bb69898815324e47 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 5 Jul 2019 17:08:42 -0400 Subject: [PATCH 091/210] SP-31 Dorman auto-scratch --- .../orders/algo/algo_orders/DormanAlgo.cpp | 34 ++++- .../orders/algo/algo_orders/DormanAlgo.h | 2 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 21 ++- .../algo/algo_orders/tests/AlgoTestDriver.h | 6 +- .../algo/algo_orders/tests/dorman_tests.cpp | 131 +++++++++++++----- 5 files changed, 148 insertions(+), 46 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index ef5692f45..ce8d33ce4 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -75,7 +75,7 @@ OrderOpResult DormanAlgo::do_before_launch(IBeforeLaunchAlgoServices& ibl) { if (ibl.is_attaching()) { return OrderOpResult{ORDER_ERROR_OP_NOT_SUPPORTED, - "Splitter does not support attach."}; + "This algo does not support attach."}; } return {/*ok*/}; @@ -95,10 +95,6 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { LOG(OrderMan, Diag, "Dorman order {} receiving update: {}", algo().order_key().value(), utils::pb::to_string(update)); - if (me->fills >= update.quantity()) { - algo().complete(); - } - if (update.has_custom()) { REQUIRE(update.custom().has_dynamic(), "Update cannot change order type"); auto params = to_dorman_params(update.custom().dynamic()); @@ -115,10 +111,14 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { update_child_template(algo(), child.value()); } } + + if (me->fills >= update.quantity()) { + algo().complete(); + } } -void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { - REQUIRE(k == me->child_id, "Unexpected update from illigitimate child"); +void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { + REQUIRE(key == me->child_id, "Unexpected update from illigitimate child"); REQUIRE(state.total_fills.value() >= me->child_state.total_fills.value(), "Unexpected fill decrease."); auto delta = state.total_fills.value() - me->child_state.total_fills.value(); @@ -128,6 +128,11 @@ void DormanAlgo::on_child_change(OrderKey k, const ChildState& state) { } me->child_state = state; + if (me->params.scratch && + me->fills >= me->params.scratch.value().max_overfill) { + do_scratch(); + } + if (me->fills >= algo().quantity().value()) { algo().complete(); } @@ -241,6 +246,21 @@ void DormanAlgo::pause_until(TimeStamp) { // check paused_time in on_timer } +void DormanAlgo::do_scratch() { + // When the # of fills exceeds the max overfill quantity + // We enter fills opposite fills at the fill price and terminate + + OrderDefinition def = me->splitter_definition; + def.set_side(securities::other_side(me->side)); + def.mutable_custom_def()->mutable_splitter()->set_exposed_qty(me->fills); + + auto price = me->child_state.last_price; + auto scratch_id = algo().launch_child(def, price, Quantity { me->fills }, false); + + algo().detach_child(scratch_id); + algo().complete(); +} + // // // Parameter parsing and validation diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 01f997068..6f262d8cb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -79,6 +79,8 @@ private: bool child_active() const; void pause_until(TimeStamp); + void do_scratch(); + }; template diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 14a9439ad..abd9f1cf3 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -59,6 +59,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { AlgoState state; std::vector orders; + std::vector detached_orders; std::map books; std::map book_subs; @@ -68,6 +69,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { std::vector> on_child_launching; std::vector> on_child_changing; std::vector> on_child_changed; + bool allow_overfill = false; Impl(IAlgoOrder& o) : algo(o) {} @@ -165,6 +167,10 @@ const std::vector& AlgoTestDriverBase::child_orders() const { return me->orders; } +const std::vector& AlgoTestDriverBase::detached_orders() const { + return me->detached_orders; +} + AlgoState AlgoTestDriverBase::state() const { return me->state; } @@ -173,7 +179,7 @@ void AlgoTestDriverBase::fill(OrderKey k, Price price, Quantity qty) { auto guard = me->recusion_guard(); for (auto& child : me->orders) { if (child.key == k) { - REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); + if (!me->allow_overfill) REQUIRE(child.cstate.quantity.value() - child.cstate.total_fills.value() >= qty.value()); for (const auto& cb : me->on_child_changing) cb(child); auto old = child; @@ -237,6 +243,9 @@ void AlgoTestDriverBase::on_child_changing(std::function&& cb) { me->on_child_changed.push_back(cb); } + +bool AlgoTestDriverBase::allow_overfill() const { return me->allow_overfill; } +void AlgoTestDriverBase::allow_overfill(bool value) { me->allow_overfill = value; } // // Utility @@ -369,9 +378,17 @@ void AlgoTestDriverBase::cancel_child(OrderKey key) { } } void AlgoTestDriverBase::detach_child(OrderKey key) { - std::remove_if(me->orders.begin(), me->orders.end(), [key](const auto& order) { return order.key == key; }); + for (auto iter = me->orders.begin(); iter != me->orders.end(); ++iter) { + auto order = *iter; + if (order.key == key) { + me->detached_orders.push_back(order); + me->orders.erase(iter); + break; + } + } } void AlgoTestDriverBase::detach_all_children() { + for (const auto& order : me->orders) me->detached_orders.push_back(order); me->orders.clear(); } void AlgoTestDriverBase::cancel(std::string const &) { diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index c39f7f2db..50ac02acd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -73,6 +73,7 @@ class AlgoTestDriverBase : private IAlgoServices { // // Inspection methods const std::vector& child_orders() const; + const std::vector& detached_orders() const; AlgoState state() const; // Fills for this specific order @@ -84,7 +85,10 @@ class AlgoTestDriverBase : private IAlgoServices { void on_child_changing(std::function&&); void on_child_changed(std::function&&); - + // + // Tweak internal REQUIRE + bool allow_overfill() const; + void allow_overfill(bool=true); private: diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index e3d5c6f83..b38121daf 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -7,6 +7,7 @@ using namespace std; using namespace bts::orderman::dorman; +using namespace bts::api::orderman; namespace bts { namespace orderman { @@ -113,22 +114,31 @@ struct ExpectedSize { }; constexpr auto some_price = md::IntPrice { 128000, -3 }; -size_t child_exposed(const std::vector& child_orders) { + +template +size_t count_x(const std::vector& child_orders, CB fn) { return std::accumulate( child_orders.begin(), child_orders.end(), 0, - [](uint32_t acc, const auto& child) { - if (child.cstate.status != ChildStatus::CANCELED) { - REQUIRE(child.def); - return - acc + - child.def.value().custom_def().splitter().exposed_qty() - + child.cstate.total_fills.value(); - } - else return acc; + [&](uint32_t acc, const auto& child) { + return acc + fn(child); }); } +size_t count_exposed(const std::vector& child_orders) { + return count_x(child_orders, [](const ChildOrder& child) { + REQUIRE(child.def); + if (child.cstate.status == ChildStatus::CANCELED) return 0u; + else return child.def.value().custom_def().splitter().exposed_qty() + child.cstate.total_fills.value(); + }); +} + +size_t count_fills(const std::vector& child_orders) { + return count_x(child_orders, [](const ChildOrder& child) { + return child.def.value().custom_def().splitter().exposed_qty() + child.cstate.total_fills.value(); + }); +} + TEST_CASE("dorman_order_size", "[algo][dorman]") { // create a table of various sizes @@ -173,7 +183,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { REQUIRE(state.before_launch().ok()); state.launch(); REQUIRE(state.algo().exposed_qty().value() == s.expected); - REQUIRE(s.expected == child_exposed(state.child_orders())); + REQUIRE(s.expected == count_exposed(state.child_orders())); } } SECTION("Reduce qty on market shrink (immidiate)") { @@ -187,7 +197,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { REQUIRE(state.algo().exposed_qty() == Quantity(400)); // Check that orders were created - REQUIRE(400 == child_exposed(state.child_orders())); + REQUIRE(400 == count_exposed(state.child_orders())); for(const auto& ch : state.child_orders()) { REQUIRE(ch.cstate.quantity == state.quantity()); } @@ -197,7 +207,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { state.update_book(book); REQUIRE(state.algo().exposed_qty() == Quantity(250)); REQUIRE( - 250 == child_exposed(state.child_orders())); + 250 == count_exposed(state.child_orders())); } SECTION("Increase qty w/ delay when market grows") { @@ -212,7 +222,7 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // Check that orders were created REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); // INCREASE market book.bid()[0] = { some_price, 1001 }; @@ -220,16 +230,16 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // NOTE: that the orders do not follow the market instantly // so this is still 400 REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); // Still 400 after the timer ticks but not enough time has passed state.advance_time(std::chrono::seconds()); REQUIRE( - 400 == child_exposed(state.child_orders())); + 400 == count_exposed(state.child_orders())); state.advance_time(std::chrono::seconds(input.steps.trail_seconds)); REQUIRE( - 600 == child_exposed(state.child_orders())); + 600 == count_exposed(state.child_orders())); } SECTION("Respect maximum") { @@ -245,12 +255,11 @@ TEST_CASE("dorman_order_size", "[algo][dorman]") { // Check that orders were created REQUIRE( - input.steps.maximum == child_exposed(state.child_orders())); + input.steps.maximum == count_exposed(state.child_orders())); } } TEST_CASE("Dorman fills", "[algo][dorman]") { - AlgoParams input; input.steps.step_table = { {500, 250}, @@ -289,29 +298,79 @@ TEST_CASE("Dorman fills", "[algo][dorman]") { // Test cases for transitions w/ fills // - // target = 500 - // send 5 orders of size 100 - // market move, new target = 450 - // reduce order #5 to 50 - // Before we confirm the move - // - fill #4 for 80 - // :: algo needs to shed another 30 Quantity + SECTION("Complete by update") { + // target = 500, exposed = 650 + // Fill 400 + // Change target to 350 + // expect completion + AlgoTestDriver state(def, some_price, Quantity {500}); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {500}); - // ^ same but fill #2 for 80 - - - /* - NOTES: - vector = f(fills, target, clip) - => feed into diff - */ + // Fill 400 + state.fill(price, Quantity { 400 }); + Update update; + update.set_quantity(350); + state.do_update(update); + REQUIRE(state.state() == AlgoState::COMPLETED); + } } TEST_CASE("Dorman overfill", "[algo][dorman]") { - SECTION("auto-scratch OFF") { - } + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + SECTION("auto-scratch ON") { + input.scratch = {{ 500 }}; } + SECTION("auto-scratch OFF") { + // both sections will run + input.scratch = std::nullopt; + } + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + AlgoTestDriver state(def, some_price, Quantity {100}); + state.allow_overfill(); + auto secid = SecurityKey(state.security().id()); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {100}); + REQUIRE(state.child_orders().size() == 1); + + state.fill(state.child_orders().begin()->key, price, Quantity {500}); + REQUIRE(state.state() == AlgoState::COMPLETED); + + if (input.scratch) { + // check that we scratched + REQUIRE(state.detached_orders().size() > 0); + } + else { + // check that we *did not* scratch + REQUIRE(state.detached_orders().size() == 0); + } + } TEST_CASE("Dorman profit-orders", "[algo][dorman]") { From fa163216915d8b110c4d4d9fabce89e2ab6927b5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 10:45:56 -0400 Subject: [PATCH 092/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + src/web/CMakeDeps.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 873055005..5933e4fd3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -8,6 +8,7 @@ insert_anchor_links = "right" ### User Visible Changes - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip + - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes ## 2.5.0 ### User Visible Changes - Added loss limit risk check diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 40156daa9..1843aaacb 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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/watch/release.sh;api/quiet_build.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/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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.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/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 4f997505f3808edbda24ef1d0e50b010aacb1844 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 8 Jul 2019 11:12:55 -0400 Subject: [PATCH 093/210] Enforce Margin Limit in Spark Admin --- src/web/ui/src/Accounts/State.fs | 24 +++++++++++++++++------- src/web/ui/src/Accounts/Types.fs | 1 + src/web/ui/src/Accounts/View.fs | 14 ++++++++------ src/web/ui/src/Controls/Fields.fs | 5 +++++ 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 717c2d43d..dabaa22ca 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -83,14 +83,17 @@ let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promi let! result = admin.update_account { completeData = account } let! result2 = model.marginService.set_cash_factor { account = model.scratch.name; leverageFactor = model.marginScratch.leverageFactor } let! result3 = model.marginService.set_cash_balance { account = model.scratch.name; cashBalance = model.marginScratch.cashBalance } + let! result4 = model.marginService.set_should_enforce_margin { account = model.scratch.name; shouldEnforceMargin = model.marginScratch.shouldEnforceMargin } - if (result.isSuccess && result2.success && result3.success) then + if (result.isSuccess && result2.success && result3.success && result4.success) then let! data = admin.get_filtered_admin_data () return UpdateAdminData data elif (not result.isSuccess) then return (ErrorOccured (sprintf "Error saving account: %s" result.errorText)) elif (not result2.success) then return ErrorOccured (sprintf "Error saving leverage factor: %s" result2.errorMessage) + elif (not result4.success) then + return ErrorOccured (sprintf "Error saving Enfrce Margin: %s" result4.errorMessage) else return ErrorOccured (sprintf "Error saving cash balence: %s" result3.errorMessage) } @@ -214,17 +217,24 @@ let update msg (model:Model) : Model * Cmd = let cmd = Cmd.ofPromise (fun _ -> promise { do! Promise.sleep 10000 } ) () (fun _ -> GetMarginData) (fun _ -> GetMarginData) match (model.marginScratch = emptyMargin || model.marginScratch.account <> model.scratch.name), (compareDouble model.marginData.leverageFactor model.marginScratch.leverageFactor 10000u), - (compareDouble model.marginData.cashBalance model.marginScratch.cashBalance 10000u) with - | true, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd - | false, true, true -> {model with marginData = newData; marginScratch = newData}, cmd - | false, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd - | false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd - | false, false, false -> {model with marginData = newData}, cmd + (compareDouble model.marginData.cashBalance model.marginScratch.cashBalance 10000u), + (model.marginData.shouldEnforceMargin = model.marginScratch.shouldEnforceMargin) with + | true, _, _, _ -> {model with marginData = newData; marginScratch = newData}, cmd + | false, true, true, true -> {model with marginData = newData; marginScratch = newData}, cmd + | false, false, true, true -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance; shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd + | false, true, false, true -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor; shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd + | false, false, false, true -> {model with marginData = newData; marginScratch = { model.marginScratch with shouldEnforceMargin = newData.shouldEnforceMargin}}, cmd + | false, true, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance; leverageFactor = newData.leverageFactor}}, cmd + | false, false, true, false -> {model with marginData = newData; marginScratch = {model.marginScratch with cashBalance = newData.cashBalance}}, cmd + | false, true, false, false -> {model with marginData = newData; marginScratch = {model.marginScratch with leverageFactor = newData.leverageFactor}}, cmd + | false, false, false, false -> {model with marginData = newData}, cmd | SetMarginCashBalance newBalance -> { model with marginScratch = { model.marginScratch with cashBalance = newBalance}},Cmd.Empty | SetMarginCashFactor newFactor -> { model with marginScratch = { model.marginScratch with leverageFactor = newFactor}},Cmd.Empty + | SetEnforceMargin enf -> + { model with marginScratch = { model.marginScratch with shouldEnforceMargin = enf}},Cmd.Empty | DeleteAccount account -> let mdl = { model with OptionsMenuOpen = ""} match Fable.Import.Browser.window.confirm (sprintf "Are you sure you want to delete '%s'" account.name) with diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 69960b809..5536dae53 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -57,6 +57,7 @@ type Msg = | UpdateMarginData of ExcessLiquidityReport | SetMarginCashBalance of double | SetMarginCashFactor of double + | SetEnforceMargin of bool | SelectAccount of BTSAccount | DeleteAccount of BTSAccount diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index f077e2ac2..b61f2c50d 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -31,7 +31,8 @@ let selectedAccount model = let isDirty model = let marginDirty = model.marginData.cashBalance <> model.marginScratch.cashBalance || - model.marginData.leverageFactor <> model.marginScratch.leverageFactor + model.marginData.leverageFactor <> model.marginScratch.leverageFactor || + model.marginData.shouldEnforceMargin <> model.marginScratch.shouldEnforceMargin match selectedAccount model with | Some account -> account <> model.scratch || @@ -91,12 +92,12 @@ let generalView model dispatch = ] let marginView model dispatch = + let disabled = not model.marginScratch.shouldEnforceMargin let headerRow:TableControl.row = { cells = [ - //TableControl.Cell (str "Account") TableControl.Cell (div [Style [MinWidth "3em"]][str "Time"]) TableControl.Cell (str "Account") TableControl.Cell (str "Leverage Factor") @@ -118,8 +119,8 @@ let marginView model dispatch = [ TableControl.Cell (str model.marginData.marginResult.asOfTime.[0..9]) TableControl.Cell (str model.marginData.account) - TableControl.Cell (str (withCommas model.marginData.leverageFactor)) - TableControl.Cell (str (withCommas model.marginData.cashBalance)) + TableControl.Cell (Fields.disabledSpan (withCommas model.marginData.leverageFactor) disabled) + TableControl.Cell (Fields.disabledSpan (withCommas model.marginData.cashBalance) disabled) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.nonoptValue)) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.optValue)) TableControl.Cell (str (withCommasAndTwoDigits model.marginData.marginResult.initialMargin)) @@ -133,8 +134,9 @@ let marginView model dispatch = div [][ TableControl.createDataTable (Some headerRow) [rws] (span [][]) - Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [] (double >> SetMarginCashFactor >> dispatch) - Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [] (double >> SetMarginCashBalance >> dispatch) + Fields.checkbox "Enforce Margin Limit" "" (model.marginScratch.shouldEnforceMargin) [] (SetEnforceMargin >> dispatch) + Fields.double "Leverage Factor:" (model.marginScratch.leverageFactor) [Disabled disabled] (double >> SetMarginCashFactor >> dispatch) + Fields.number "Cash Balance:" (int model.marginScratch.cashBalance) [Disabled disabled] (double >> SetMarginCashBalance >> dispatch) accountControls model dispatch ] diff --git a/src/web/ui/src/Controls/Fields.fs b/src/web/ui/src/Controls/Fields.fs index d26e93e12..e359a4eef 100644 --- a/src/web/ui/src/Controls/Fields.fs +++ b/src/web/ui/src/Controls/Fields.fs @@ -16,6 +16,11 @@ let Label (lbl:string) = label [ ClassName "label" ] [ str lbl ] +let disabledSpan (text:string) (disabled: bool) = + match disabled with + | true -> span [Class "disabled-label"] [str text] + | false -> span [] [str text] + let text (lbl:string) (dv:string) (attrs:IHTMLProp list) onchange = div [ ClassName "field" ] From e7a941212464b97603895e236e01998fe55d73c4 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 12:21:39 -0400 Subject: [PATCH 094/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 5933e4fd3..71aa59b71 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + ## 2.5.0 ### User Visible Changes - Added loss limit risk check From f4395ef8336e616545616292e4c10ba0c22b6661 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 12:26:27 -0400 Subject: [PATCH 095/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71aa59b71..ffb88aee2 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,7 +9,9 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes - +### Internal Changes + - Ensure that admin logins are always allowed to login, regardless of keycode status. + ## 2.5.0 ### User Visible Changes - Added loss limit risk check From 33f533af9b19eb778174c81dce3ddbc8d058da9b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 13:08:18 -0400 Subject: [PATCH 096/210] set span to default off, hook up admin boolean to enforce span behind config key --- src/lib/config/defaults/span.conf | 2 +- src/lib/orderman/limiter/LimitStore.h | 24 +++++++++---------- .../sparkd/position/MarginServiceServer.cpp | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/config/defaults/span.conf b/src/lib/config/defaults/span.conf index 7f86bfab3..96ea56a5a 100644 --- a/src/lib/config/defaults/span.conf +++ b/src/lib/config/defaults/span.conf @@ -1,7 +1,7 @@ SpanMargin { value { - enabled: true + enabled: false login: 'api_bts1' password: 'Summer123' url: 'https://cmecorenr.cmegroup.com/MarginServiceApi/1.4/' diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 7efcf76ab..2f2f527d4 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -275,20 +275,20 @@ private: const auto acct_it = _account_data_map.find(account_id.value()); if(acct_it != _account_data_map.end()){ const auto& account_data = acct_it->second; - //const auto& account = account_data.account; + const auto& account = account_data.account; if(config::get().enabled()) { - // if (account.has_margin_limit() && - // account.margin_limit().enforce_margin()){ - double ex_liq = account_data.excess_liquidity; - if(os::is_nan(ex_liq)){ - out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = "Could not find account Excess Liquidity"; - } - else{ - if(ex_liq < 0){ + if (account.has_margin_limit() && account.margin_limit().enforce_margin()){ + double ex_liq = account_data.excess_liquidity; + if(os::is_nan(ex_liq)){ out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; - out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", - ex_liq); + out_res.error_msg = "Could not find account Excess Liquidity"; + } + else{ + if(ex_liq < 0){ + out_res.result = Limiter::LimiterErrorCode::MARGIN_LIMIT_BREACHED; + out_res.error_msg = fmt::format("Margin Limit Excess Liquidity : {}", + ex_liq); + } } } } diff --git a/src/server/sparkd/position/MarginServiceServer.cpp b/src/server/sparkd/position/MarginServiceServer.cpp index bdc286cac..2b3c790b0 100644 --- a/src/server/sparkd/position/MarginServiceServer.cpp +++ b/src/server/sparkd/position/MarginServiceServer.cpp @@ -162,7 +162,8 @@ void MarginServiceServer::publish_excess_liquidity_report(const api::position::M { report.set_leverage_factor( acct->margin_limit().leverage_factor_percentage() ); report.set_cash_balance(acct->margin_limit().cash_balance()); - report.set_should_enforce_margin(acct->margin_limit().enforce_margin()); + report.set_should_enforce_margin(acct->margin_limit().enforce_margin() && + config::get().enabled()); } double netliq = report.leverage_factor() * report.cash_balance(); From fb08533488f5df0114854a08e8001340ba410d2e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 13:51:54 -0400 Subject: [PATCH 097/210] SP-32 profit orders --- .../orders/algo/algo_orders/DormanAlgo.cpp | 42 ++++++- .../orders/algo/algo_orders/DormanAlgo.h | 3 + .../algo/algo_orders/tests/AlgoTestDriver.cpp | 12 +- .../algo/algo_orders/tests/AlgoTestDriver.h | 1 + .../algo/algo_orders/tests/dorman_tests.cpp | 115 +++++++++++++++++- 5 files changed, 166 insertions(+), 7 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp index ce8d33ce4..eec8210f0 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.cpp @@ -42,6 +42,8 @@ struct DormanAlgo::Impl { ChildState child_state; uint32_t fills ={}; + + std::vector profit_orders; }; DormanAlgo::DormanAlgo() : @@ -113,7 +115,7 @@ void DormanAlgo::do_update(const api::orderman::Update& update) { } if (me->fills >= update.quantity()) { - algo().complete(); + complete(); } } @@ -125,6 +127,7 @@ void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { if (delta != 0) { me->fills += delta; algo().update_fill_state(Quantity {me->fills}, state.last_price); + send_profit_order(state.last_price, Quantity {delta}); } me->child_state = state; @@ -134,7 +137,7 @@ void DormanAlgo::on_child_change(OrderKey key, const ChildState& state) { } if (me->fills >= algo().quantity().value()) { - algo().complete(); + complete(); } } @@ -199,6 +202,14 @@ void DormanAlgo::on_timer() { } } +IAlgoOrder::OnCancelResponse DormanAlgo::on_cancel() { + // detach any remaining profit orders so they keep running + for(const auto& key : me->profit_orders) { + algo().detach_child(key); + } + return OnCancelResponse::HONOR; +} + IAlgoServices& DormanAlgo::algo() const { return *me->algo; } // @@ -258,6 +269,33 @@ void DormanAlgo::do_scratch() { auto scratch_id = algo().launch_child(def, price, Quantity { me->fills }, false); algo().detach_child(scratch_id); + complete(); +} + +void DormanAlgo::send_profit_order(Price p, Quantity q) { + if (me->params.profit_orders) { + auto side = securities::other_side(me->side); + Price offset = + Price { algo().security().contract_spec().low_tick() * me->params.profit_orders.value().ticks_away }; + auto price = + securities::worsen_price(side, p, offset); + + OrderDefinition def = me->splitter_definition; + def.set_time_in_force(TimeInForce::TIME_IN_FORCE_GTC); + def.set_side(side); + def.mutable_custom_def()->limit(); + me->profit_orders.push_back( + algo().launch_child(def, price, q, false)); + } +} + +void DormanAlgo::complete() { + // Allow profit orders to keep running + if (me->params.profit_orders) { + for(const auto& key : me->profit_orders) { + algo().detach_child(key); + } + } algo().complete(); } diff --git a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h index 6f262d8cb..4be257975 100644 --- a/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/DormanAlgo.h @@ -67,6 +67,7 @@ public: void on_child_change(OrderKey, ChildState const &) override; void on_book(SecurityKey, const Book&) override; void on_timer() override; + IAlgoOrder::OnCancelResponse on_cancel() override; Quantity exposed_qty() const; @@ -80,6 +81,8 @@ private: void pause_until(TimeStamp); void do_scratch(); + void send_profit_order(Price, Quantity); + void complete(); }; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index abd9f1cf3..12861b54e 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -162,6 +162,16 @@ void AlgoTestDriverBase::advance_time(Duration d) { me->algo.on_timer(); } } +IAlgoOrder::OnCancelResponse AlgoTestDriverBase::cancel() { + auto r = me->algo.on_cancel(); + if (r == IAlgoOrder::OnCancelResponse::HONOR) { + me->state = AlgoState::CANCELED; + for (auto& o : me->orders) { + o.cstate.status = ChildStatus::CANCELED; + } + } + return r; +} const std::vector& AlgoTestDriverBase::child_orders() const { return me->orders; @@ -392,7 +402,7 @@ void AlgoTestDriverBase::detach_all_children() { me->orders.clear(); } void AlgoTestDriverBase::cancel(std::string const &) { - me->state = AlgoState::CANCELED; + cancel(); } void AlgoTestDriverBase::terminate_error(std::string const &) { me->state = AlgoState::TERMINATED; diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index 50ac02acd..1d8acc5d6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -69,6 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void update_book(const Book&); void advance_time(Duration); + IAlgoOrder::OnCancelResponse cancel(); // // Inspection methods diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index b38121daf..5613de3d1 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -2,6 +2,7 @@ #include "../DormanAlgo.h" #include "AlgoTestDriver.h" #include "lib/orderman/orderman_utils/Book.h" +#include "lib/domain_model/Security.h" #include #include @@ -374,14 +375,120 @@ TEST_CASE("Dorman overfill", "[algo][dorman]") { } TEST_CASE("Dorman profit-orders", "[algo][dorman]") { - SECTION("profit-orders OFF") { - // Profit orders are not sent + AlgoParams input; + input.steps.step_table = { + {500, 250}, + {1000, 450}, + {2000, 650}, + {3500, 750}, + }; + input.steps.maximum = 750; + input.steps.trail_seconds = 2; + input.clip_limit = 100; + + bool test_cancel = true; + + SECTION("Profit Orders ON - Cancel") { + // Send profit orders 3 ticks away + input.profit_orders = {{ 3 }}; } - SECTION("profit-orders ON") { - // profit orders are sent at the right price + SECTION("Profit Orders ON - Complete") { + // Send profit orders 3 ticks away + input.profit_orders = {{ 3 }}; + test_cancel = false; + } + SECTION("Profit Orders OFF") { + input.profit_orders = std::nullopt; + } + SECTION("Profit Orders OFF - complete") { + input.profit_orders = std::nullopt; + test_cancel = false; + } + + api::orderman::OrderDefinition def; + def.set_side(api::SIDE_BUY); + def.mutable_custom_def()->mutable_dynamic()->CopyFrom(to_dynamic_order_params(input)); + auto price = Price { some_price.price() }; + + AlgoTestDriver state(def, some_price, Quantity {100}); + auto secid = SecurityKey(state.security().id()); + auto tick = state.security().contract_spec().low_tick(); + Book book(secid); + book.bid()[0] = { some_price, 1999 }; + state.update_book(book); + REQUIRE(state.before_launch().ok()); + state.launch(); + REQUIRE(state.algo().exposed_qty() == Quantity(650)); + REQUIRE(state.quantity() == Quantity {100}); + REQUIRE(state.child_orders().size() == 1); + + state.fill(state.child_orders().begin()->key, price, Quantity {20}); + + if (input.profit_orders) { + // We're testing the bid side so we expect 3 ticks up + auto expected_price = Price { + price.value() + (tick * input.profit_orders.value().ticks_away) }; + REQUIRE(state.child_orders().size() > 1); + REQUIRE(state.detached_orders().empty()); + size_t profit_order_count = 0; + for (const auto& order : state.child_orders()) { + if (order.def.value().side() == api::SIDE_SELL) { + profit_order_count += 1; + REQUIRE(order.cstate.quantity.value() == 20); + REQUIRE(securities::is_same(order.cstate.price, expected_price)); + } + } + REQUIRE(profit_order_count == 1); + } + else { + REQUIRE(state.child_orders().size() == 1); + REQUIRE(state.detached_orders().empty()); + } + + state.fill(state.child_orders().begin()->key, price, Quantity {42}); + + if (input.profit_orders) { + auto expected_price = Price { + price.value() + (tick * input.profit_orders.value().ticks_away) }; + REQUIRE(state.child_orders().size() > 1); + REQUIRE(state.detached_orders().empty()); + bool got_20 = false; + bool got_42 = false; + for (const auto& order : state.child_orders()) { + if (order.def.value().side() == api::SIDE_SELL) { + if (order.cstate.quantity.value() == 20) got_20 = true; + if (order.cstate.quantity.value() == 42) got_42 = true; + REQUIRE(securities::is_same(order.cstate.price, expected_price)); + } + } + REQUIRE(got_42); + REQUIRE(got_20); + } + else { + REQUIRE(state.child_orders().size() == 1); + REQUIRE(state.detached_orders().empty()); + } + + if (test_cancel) { + // Profit orders should detach on cancel + state.cancel(); + REQUIRE(state.state() == AlgoState::CANCELED); + if (input.profit_orders) { + REQUIRE(state.detached_orders().size() > 0); + } + } + else { + state.fill(state.child_orders().begin()->key, price, Quantity {38}); + REQUIRE(state.state() == AlgoState::COMPLETED); + if (input.profit_orders) { + REQUIRE(state.detached_orders().size() > 0); + } } } +// TEST_CASE("Dorman detaches profit orders when completed by scratch", "[algo][dorman][!hide]") { +// } + TEST_CASE("Dorman trade accumulation", "[algo][dorman]") { SECTION("exceed limit") { // Profit orders are not sent From 37dacff74dfed7cd11a34ff0f3d4a28e9e0e03a1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 14:09:37 -0400 Subject: [PATCH 098/210] Fixed a bug in top update --- doc/user/content/release_notes/_index.md | 1 + src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index ffb88aee2..0bf2094a9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + - Added an option for the Top Algo to delete itself if within N ticks from top of book ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp index b7fac256e..acb3f3f29 100644 --- a/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/TopAlgo.cpp @@ -88,6 +88,7 @@ void TopAlgo::do_update(api::orderman::Update const &update) { auto &top_update = update.custom().top(); *child_update.mutable_custom() = top_update.child(); me->top_threshold_measure = top_update.top_threshold(); + me->ticks_off = top_update.ticks_off(); } algo().update_child(me->child_key, child_update); } From 369fb55e9061a4b989341ad8645234f2150daf0c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 14:20:14 -0400 Subject: [PATCH 099/210] fix auth tests to respect difference betwen admin and trader login --- src/lib/utils/tests/AuthTokenTests.cpp | 35 ++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 51de507f7..6bcbe52d8 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -5,19 +5,34 @@ namespace bts { namespace test { TEST_CASE("AuthToken", "[security]") { - api::admin::BTSUser user; - user.set_id(42); - user.set_name("user1"); + api::admin::BTSUser admin_user; + admin_user.set_id(42); + admin_user.set_name("user1"); + + api::admin::BTSUser trader_user; + trader_user.set_id(43); + trader_user.set_name("trader1"); + trader_user.mutable_user_data()->mutable_exchange_user_data()->mutable_cme_data()->add_md_permissions()->set_enabled(true); - SECTION("round trip") { - auto token = api::auth::generate_token(user); + SECTION("round trip admin") { + auto token = api::auth::generate_token(admin_user); + // We use 1 byte for api header size + REQUIRE(token.ByteSize() <= 240); + api::user::TokenPayload payload; + REQUIRE(!api::auth::decode_token(token, &payload)); + REQUIRE(payload.id() == admin_user.id()); + REQUIRE(payload.wheel() == false); + } + + SECTION("round trip trader") { + auto token = api::auth::generate_token(trader_user); // We use 1 byte for api header size REQUIRE(token.ByteSize() <= 240); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == trader_user.id()); REQUIRE(payload.wheel() == false); - } + } SECTION("empty token") { api::user::TokenPayload payload; @@ -28,11 +43,11 @@ TEST_CASE("AuthToken", "[security]") { } SECTION("bts is the big wheel") { - user.set_name("bts"); - auto token = api::auth::generate_token(user); + admin_user.set_name("bts"); + auto token = api::auth::generate_token(admin_user); api::user::TokenPayload payload; REQUIRE(api::auth::decode_token(token, &payload)); - REQUIRE(payload.id() == user.id()); + REQUIRE(payload.id() == admin_user.id()); REQUIRE(payload.wheel()); } } From 8206f457b5e71cae85836a4d104bb15ac3b7e09a Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 14:27:37 -0400 Subject: [PATCH 100/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index ffb88aee2..1c9a618eb 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -9,6 +9,7 @@ insert_anchor_links = "right" - In the ladder made last trade more distinctive when overlayed on the volumn column - In the ladder, corrected display of volume tool tip - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes + - Address a rare issue that could lead to an error report on UI exit ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From 72a6689cd4010e0714f3eca392350206c873a9a8 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 14:41:07 -0400 Subject: [PATCH 101/210] SP-117 Expose ticker to IAlgoOrder --- src/lib/orderman/events/TickerUpdateEvent.h | 1 + .../orderman/orders/algo/AlgoWrapperOrder.cpp | 16 ++++++++++++++++ src/lib/orderman/orders/algo/AlgoWrapperOrder.h | 2 ++ src/lib/orderman/orders/algo/IAlgoOrder.h | 4 ++++ src/lib/orderman/orders/algo/IAlgoServices.h | 4 ++++ .../algo/algo_orders/tests/AlgoTestDriver.cpp | 16 ++++++++++++++++ .../algo/algo_orders/tests/AlgoTestDriver.h | 4 ++++ src/server/sparkd/cmds/QuickTest.cpp | 2 ++ 8 files changed, 49 insertions(+) diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index d34522d48..c8082d169 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -6,6 +6,7 @@ #include "lib/orderman/orderman_utils/orderman_common.h" #include "lib/utils/bts_chrono.h" #include "lib/md/protos/co2.pb.h" +#include "boost/container/small_vector.hpp" namespace bts { namespace orderman { diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index c3a483969..2520fdc62 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -49,6 +49,7 @@ struct AlgoWrapperOrder::PImpl { OrderState const &state() const { return _state; } Map book_subs; + Map ticker_subs; Map children; bool has_timer_sub = false; @@ -364,6 +365,21 @@ void AlgoWrapperOrder::unsubscribe_book(SecurityKey k) { me->services->unsubscribe_from_book(it->second); } +void AlgoWrapperOrder::subscribe_ticker(SecurityKey k) { + if (!is_working()) return; + bts_assert(me->ticker_subs.find(k) == me->ticker_subs.end()); + + me->ticker_subs[k] = me->services->subscribe_to_ticker( + k, [this,k](const auto& ev) { me->algo->on_ticker(k, ev.trades); }); +} + +void AlgoWrapperOrder::unsubscribe_ticker(SecurityKey k) { + if (!is_working()) return; + bts_assert(me->ticker_subs.find(k) != me->ticker_subs.end()); + if (auto it = me->ticker_subs.find(k); it != me->ticker_subs.end()) + me->services->unsubscribe_from_ticker(it->second); +} + void AlgoWrapperOrder::subscribe_child_change(OrderKey k) { if (!is_working()) return; diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h index f11a84a23..472d9c2c0 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h @@ -46,6 +46,8 @@ class AlgoWrapperOrder : public Order, void unsubscribe_child_change(OrderKey) override; void subscribe_timer() override; void unsubscribe_timer() override; + void subscribe_ticker(SecurityKey) override; + void unsubscribe_ticker(SecurityKey) override; OrderKey launch_child(ChildTemplate &, Price, Quantity, bool subscribe = true) override; OrderKey launch_child(api::orderman::OrderDefinition const &, Price, diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 3b882b49d..6fc25a893 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orders/Order.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include namespace bts { @@ -36,6 +37,9 @@ class IAlgoOrder { // The book for the specified security has changed virtual void on_book(SecurityKey, Book const &) {} + // Trades stream for the specified security + virtual void on_ticker(SecurityKey, const boost::container::small_vector&) {}; + // A period timer has run out virtual void on_timer() {} diff --git a/src/lib/orderman/orders/algo/IAlgoServices.h b/src/lib/orderman/orders/algo/IAlgoServices.h index 4d9cd2f2f..5fb5acd28 100644 --- a/src/lib/orderman/orders/algo/IAlgoServices.h +++ b/src/lib/orderman/orders/algo/IAlgoServices.h @@ -38,6 +38,10 @@ class IAlgoServices : public IBeforeLaunchAlgoServices { virtual void subscribe_timer() = 0; virtual void unsubscribe_timer() = 0; + // Subscribe to trade ticker + virtual void subscribe_ticker(SecurityKey) = 0; + virtual void unsubscribe_ticker(SecurityKey) = 0; + // -------------------------------------------------------------- // Child management // -------------------------------------------------------------- diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 12861b54e..4343d9a68 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -63,6 +63,7 @@ struct AlgoTestDriverBase::Impl : public RecursionCounter { std::map books; std::map book_subs; + std::map ticker_subs; bool sub_timer = false; // Callbacks @@ -156,6 +157,12 @@ void AlgoTestDriverBase::update_book(const Book& book) { me->algo.on_book(key, book); } } +void AlgoTestDriverBase::update_ticker(SecurityKey key, boost::container::small_vector& data) { + auto iter = me->ticker_subs.find(key); + if (iter != me->ticker_subs.end() && iter->second) { + me->algo.on_ticker(key, data); + } +} void AlgoTestDriverBase::advance_time(Duration d) { me->now += d; if (me->sub_timer) { @@ -310,6 +317,14 @@ void AlgoTestDriverBase::subscribe_book(SecurityKey key){ void AlgoTestDriverBase::unsubscribe_book(SecurityKey key) { me->book_subs.erase(key); } + +void AlgoTestDriverBase::subscribe_ticker(SecurityKey key) { + me->ticker_subs[key] = true; +} +void AlgoTestDriverBase::unsubscribe_ticker(SecurityKey key) { + me->ticker_subs.erase(key); +} + void AlgoTestDriverBase::subscribe_child_change(OrderKey k) { for (auto& child : me->orders) { if (child.key == k) { @@ -327,6 +342,7 @@ void AlgoTestDriverBase::unsubscribe_child_change(OrderKey k) { void AlgoTestDriverBase::subscribe_timer() { me->sub_timer = true; } void AlgoTestDriverBase::unsubscribe_timer() { me->sub_timer = false; } + OrderKey AlgoTestDriverBase::launch_child(ChildTemplate&, Price price, Quantity qty, bool sub) { OrderKey key = me->next_order(); me->orders.push_back( diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index 1d8acc5d6..ffa0060e6 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -1,6 +1,7 @@ #pragma once #include "lib/orderman/orders/algo/IAlgoOrder.h" #include "lib/orderman/orders/algo/IAlgoServices.h" +#include "lib/orderman/events/TickerUpdateEvent.h" #include "lib/md/IntPrice.h" #include #include @@ -68,6 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void do_update(const api::orderman::Update&); void update_book(const Book&); + void update_ticker(SecurityKey, boost::container::small_vector&); void advance_time(Duration); IAlgoOrder::OnCancelResponse cancel(); @@ -112,6 +114,8 @@ private: void unsubscribe_child_change(OrderKey) override; void subscribe_timer() override; void unsubscribe_timer() override; + void subscribe_ticker(SecurityKey) override; + void unsubscribe_ticker(SecurityKey) override; OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) override; OrderKey launch_child(api::orderman::OrderDefinition const &, Price, diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index f6f86be5a..37f087650 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -33,6 +33,8 @@ struct Proxy : public IAlgoServices { void unsubscribe_child_change(OrderKey) {} void subscribe_timer() {} void unsubscribe_timer() {} + void subscribe_ticker(SecurityKey) override {} + void unsubscribe_ticker(SecurityKey) override {} OrderKey launch_child(ChildTemplate &, Price, Quantity, bool) { return {}; } OrderKey launch_child(api::orderman::OrderDefinition const &, Price, Quantity, bool) { From 74a91a7d2e2212ef7f31c4f681ba1e2ee7a21ac7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 8 Jul 2019 14:49:44 -0400 Subject: [PATCH 102/210] SP-117 typedef TradeVector type --- src/lib/orderman/events/TickerUpdateEvent.h | 3 ++- src/lib/orderman/orders/algo/IAlgoOrder.h | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp | 2 +- .../orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/events/TickerUpdateEvent.h b/src/lib/orderman/events/TickerUpdateEvent.h index c8082d169..029d0fc04 100644 --- a/src/lib/orderman/events/TickerUpdateEvent.h +++ b/src/lib/orderman/events/TickerUpdateEvent.h @@ -28,9 +28,10 @@ class TickerUpdateEvent : public mercury::Event { co2::AggressorSide aggressor_side; }; - boost::container::small_vector trades; + boost::container::small_vector trades; TickerUpdateEvent(SecurityKey key) : _key(key), trades() {} }; +typedef boost::container::small_vector TradeVector; } } diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 6fc25a893..15cf711d5 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -38,7 +38,7 @@ class IAlgoOrder { virtual void on_book(SecurityKey, Book const &) {} // Trades stream for the specified security - virtual void on_ticker(SecurityKey, const boost::container::small_vector&) {}; + virtual void on_ticker(SecurityKey, const TradeVector&) {}; // A period timer has run out virtual void on_timer() {} diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 4343d9a68..777553d29 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -157,7 +157,7 @@ void AlgoTestDriverBase::update_book(const Book& book) { me->algo.on_book(key, book); } } -void AlgoTestDriverBase::update_ticker(SecurityKey key, boost::container::small_vector& data) { +void AlgoTestDriverBase::update_ticker(SecurityKey key, TradeVector& data) { auto iter = me->ticker_subs.find(key); if (iter != me->ticker_subs.end() && iter->second) { me->algo.on_ticker(key, data); diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h index ffa0060e6..917c36bdd 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h @@ -69,7 +69,7 @@ class AlgoTestDriverBase : private IAlgoServices { void do_update(const api::orderman::Update&); void update_book(const Book&); - void update_ticker(SecurityKey, boost::container::small_vector&); + void update_ticker(SecurityKey, TradeVector&); void advance_time(Duration); IAlgoOrder::OnCancelResponse cancel(); From 10476c6662354ed9946678f41ce9246ac0f03c1f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 14:22:55 -0500 Subject: [PATCH 103/210] null ref check on LadderSettings.mini_ob.value --- .../spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index ea67bad1d..82e95beb8 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -363,7 +363,9 @@ namespace mbts.spark { } else { clone = SparkUtils.clone_proto(_current); #pragma warning disable CS0612 // Type or member is obsolete - clone.mini_ob = new LadderMiniOrderBookSettings(mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion)); + clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ? + mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) : + mini_ob.create()); #pragma warning restore CS0612 // Type or member is obsolete } clone.badge_style = badge_style; From dbdc915ff24852bc4f53f8ea787cf87171b92c14 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 14:24:36 -0500 Subject: [PATCH 104/210] populating mini_ob (LadderMiniOrderBookSettings) in LadderSettings.Default --- src/client/spark/Modules/Trading/Ladder/LadderSettings.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index 7fbb2fb55..636d901c4 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -339,6 +339,7 @@ namespace mbts.spark { zoom_slider_visible = false, zoom_factor = _default_zoom_factor, net_change = NetChangeTerms.None, + mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general), }; rv.row_height = LadderRender.measure_row_height(rv); return rv; From f12217d76ced7fd91c200e53ac3818b54f0f3fc6 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 8 Jul 2019 20:12:47 +0000 Subject: [PATCH 105/210] Remove mapping of DME mic per Pedro --- src/web/ui/src/Users/Types.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 6de2e5df3..51b83e88a 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -71,4 +71,4 @@ let CMEMicMap:Map = Map.empty .Add("XNYM", bts.api.CMEMics.NYMEX) .Add("XCBT", bts.api.CMEMics.CBT) .Add("XCEC", bts.api.CMEMics.COMEX) - .Add("DUMX", bts.api.CMEMics.DME) \ No newline at end of file + .Add("DME", bts.api.CMEMics.DME) \ No newline at end of file From d5fdcc67961a05595f0bbac00362d59ccb433f12 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 15:37:38 -0500 Subject: [PATCH 106/210] don't revert to default selected setter when server reboots --- .../spark/core/Utility/ViewModelBase.cs | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 8fa702aaf..9f047adff 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -792,14 +792,20 @@ namespace mbts.ui.shell { void IObserver>.OnNext(IEnumerable value) { _is_items_source_changing = true; if (_is_user_selected_item) { - var curr_selected_item = selected_item; - _items.sync_with(value); - if (_try_match_item(curr_selected_item, out TValue match)) { - _is_user_selected_item = true; - _set_selected_item(match, SelectionReason.CurrentValueWasRestored); - } else { - _is_user_selected_item = false; - _try_auto_select(); + // Becauase we wish to preserve the status of _is_user_selected_item + // on server reboots, I don't want that main else to fire if value.Any() is false, + // so that is why I'm not && here; the sync_with() down there will clear out + // _is_user_selected_item when the server reboots + if (value.Any()) { + var curr_selected_item = selected_item; + _items.sync_with(value); + if (_try_match_item(curr_selected_item, out TValue match)) { + _is_user_selected_item = true; + _set_selected_item(match, SelectionReason.CurrentValueWasRestored); + } else { + _is_user_selected_item = false; + _try_auto_select(); + } } } else { _items.sync_with(value); From 3422a44c87338e34413eed06c79d7f11b2088bd6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 16:49:32 -0400 Subject: [PATCH 107/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + src/lib/CMakeDeps.cmake | 2 +- src/web/CMakeDeps.cmake | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 0286a8dcf..71033b6a2 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -11,6 +11,7 @@ insert_anchor_links = "right" - In the ladder, changed the consolidation of last trade to consider only the price ignoring aggressor changes - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit + - Added margin risk limits ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1bf4e1c6f..5effdb441 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/web/CMakeDeps.cmake b/src/web/CMakeDeps.cmake index 1843aaacb..bc74cb4cf 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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.proto;../lib/api/services/ErrorReportService.proto;../lib/api/services/HelloService.proto;../lib/api/services/MBOService.proto;../lib/api/services/MarketDataAuxiliaryService.proto;../lib/api/services/MarketDataRelay.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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.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/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/apicore.proto;../lib/api/apigateway.proto;../lib/api/apioptions.proto;../lib/api/services/AdminService.proto;../lib/api/services/AlgoDefinitionService.proto;../lib/api/services/AlgoService.proto;../lib/api/services/ApiUnitTestService.proto;../lib/api/services/AuthService.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/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;api/build.sh;api/node_modules/exit/test/fixtures/create-files.sh;api/node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/bin/update_authors.sh;api/node_modules/psl/scripts/ci-build.sh;api/node_modules/watch/release.sh;api/quiet_build.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/obj/Debug/netstandard2.0/ui.AssemblyInfo.fs) \ No newline at end of file From 5e04abe5731f7e9a7dd1573974ad696579721fa1 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 8 Jul 2019 16:50:07 -0400 Subject: [PATCH 108/210] Combining the account lookup for loss_limitm and span --- src/lib/orderman/limiter/LimitStore.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/lib/orderman/limiter/LimitStore.h b/src/lib/orderman/limiter/LimitStore.h index 2f2f527d4..f46ca7f0c 100644 --- a/src/lib/orderman/limiter/LimitStore.h +++ b/src/lib/orderman/limiter/LimitStore.h @@ -158,10 +158,13 @@ public: Quantity quantity, bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; - _loss_limit(account_id, rv); + const auto acct_it = _account_data_map.find(account_id.value()); + AccountData const* account_ptr = (acct_it == _account_data_map.end()) ? + nullptr : &(acct_it->second); + _loss_limit(account_ptr, rv); if(!rv.ok()) return rv; - _margin_limit(account_id,rv); + _margin_limit(account_ptr,rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -192,10 +195,13 @@ public: Quantity from, Quantity to, bool enforce_clip = true) const{ Limiter::LimiterQueryResult rv; rv.result = Limiter::OK; + const auto acct_it = _account_data_map.find(account_id.value()); + AccountData const* account_ptr = (acct_it == _account_data_map.end()) ? + nullptr : &(acct_it->second); // in case of order modifications, loss limits are only checked // for size increases if (to.value() > from.value()) - _loss_limit(account_id, rv); + _loss_limit(account_ptr, rv); if(!rv.ok()) return rv; const SecurityLimitTree* sec_tree = _find_security(security.id()); @@ -235,16 +241,15 @@ private: void _add_product_entry(const api::Security& security, const bts::api::admin::AdminData& admin_data); void _set_user_data(); - void _loss_limit(AccountID account_id, + void _loss_limit(AccountData const* account_ptr, Limiter::LimiterQueryResult& out_res) const{ // the usual flow should not alter out_res. // its set to an error state iff : // i. account is not found // ii. limit check is enabled but pnl is nan // iii. limit check is enable and it actually fails - const auto acct_it = _account_data_map.find(account_id.value()); - if(acct_it != _account_data_map.end()){ - const auto& account_data = acct_it->second; + if(account_ptr != nullptr){ + const auto& account_data = *account_ptr; const auto& account = account_data.account; if (account.has_account_loss_limit() && account.account_loss_limit().enforce()){ @@ -269,12 +274,11 @@ private: out_res.error_msg = "Could not find account"; } } - void _margin_limit(AccountID account_id, + void _margin_limit(AccountData const* account_ptr, Limiter::LimiterQueryResult& out_res) const{ // similiar flow as the loss_limit above - const auto acct_it = _account_data_map.find(account_id.value()); - if(acct_it != _account_data_map.end()){ - const auto& account_data = acct_it->second; + if(account_ptr != nullptr){ + const auto& account_data = *account_ptr; const auto& account = account_data.account; if(config::get().enabled()) { if (account.has_margin_limit() && account.margin_limit().enforce_margin()){ From 087b0015105878a5b77a3452cd2bca3ac43a47ba Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 17:03:56 -0400 Subject: [PATCH 109/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71033b6a2..27e67d72a 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,6 +12,7 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits + - Added support for the Dubai Mercantile Exchange (DME) MIC ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From cd744963ff306035b756aae6fad90c2b46081021 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 16:21:46 -0500 Subject: [PATCH 110/210] Revert "don't revert to default selected setter when server reboots" This reverts commit d5fdcc67961a05595f0bbac00362d59ccb433f12. --- .../spark/core/Utility/ViewModelBase.cs | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index 9f047adff..8fa702aaf 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -792,20 +792,14 @@ namespace mbts.ui.shell { void IObserver>.OnNext(IEnumerable value) { _is_items_source_changing = true; if (_is_user_selected_item) { - // Becauase we wish to preserve the status of _is_user_selected_item - // on server reboots, I don't want that main else to fire if value.Any() is false, - // so that is why I'm not && here; the sync_with() down there will clear out - // _is_user_selected_item when the server reboots - if (value.Any()) { - var curr_selected_item = selected_item; - _items.sync_with(value); - if (_try_match_item(curr_selected_item, out TValue match)) { - _is_user_selected_item = true; - _set_selected_item(match, SelectionReason.CurrentValueWasRestored); - } else { - _is_user_selected_item = false; - _try_auto_select(); - } + var curr_selected_item = selected_item; + _items.sync_with(value); + if (_try_match_item(curr_selected_item, out TValue match)) { + _is_user_selected_item = true; + _set_selected_item(match, SelectionReason.CurrentValueWasRestored); + } else { + _is_user_selected_item = false; + _try_auto_select(); } } else { _items.sync_with(value); From 0e4fe1b47e6faec0f324abb7f7e94d0b124eda32 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Jul 2019 16:29:19 -0500 Subject: [PATCH 111/210] filter the SelectorProperty source for updates that actually have items; this keeps the currently selected account through server restarts --- src/client/spark/Orders/OrderPropertiesEditorVM.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 122ac1589..81354eae0 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -109,9 +109,14 @@ namespace mbts.spark { () => new InlineUserProperty(), new InlineOrderProperties(), DictionaryHelper.empty()); + // Note that with the .Where on the account_tuples, we will ignore any + // updates for which all accounts have been removed. + // This was a safer change than changing SelectorProperty's IEnumberable.OnNext + // so that it would not reset the selected item on server reboots; i.e. this + // change only affects this IObservable. _accounts = backing( nameof(selected_account), - model.factory.subscribe_account_tuples(), + model.factory.subscribe_account_tuples().Where(items => items.Any()), inline_account_src, a => new AccountTuple?(a), () => accounts.Cast().FirstOrDefault(), From 93824786c77966111ff1108547cea9d44fe7549d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 17:32:33 -0400 Subject: [PATCH 112/210] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 71033b6a2..fea4413e9 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,6 +12,7 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits + - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book. ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. From 2940601f4bca0c6c481b0fb196f4229655312ed8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 8 Jul 2019 18:15:31 -0400 Subject: [PATCH 113/210] Updated release notes --- doc/user/content/release_notes/_index.md | 3 ++- src/lib/CMakeDeps.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index fea4413e9..471ae1b0c 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -12,7 +12,8 @@ insert_anchor_links = "right" - Added an option for the Top Algo to delete itself if within N ticks from top of book - Address a rare issue that could lead to an error report on UI exit - Added margin risk limits - - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book. + - Added the "Offset" algo. Offset prices a child algo at a parameterizable distance from the top of the book + - Avoided switching the current account and order type on open ladders when limits are changed ### Internal Changes - Ensure that admin logins are always allowed to login, regardless of keycode status. diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 5effdb441..9a5e0590d 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/TopAlgo.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/BookOrderBase.cpp;orderman/orders/book_algos/OCOOrder.cpp;orderman/orders/book_algos/OffsetOrder.cpp;orderman/orders/book_algos/PricerOrder.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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;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/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.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/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;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/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.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;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/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.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/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.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;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/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.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/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServices.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/core/IOrderServices.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.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/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orderman_utils/orderman_utils.cpp;orderman/orders/CompositeOrder.cpp;orderman/orders/DynamicOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/TriggerOrder.cpp;orderman/orders/algo/AlgoWrapperOrder.cpp;orderman/orders/algo/IAlgoOrder.cpp;orderman/orders/algo/IAlgoServices.cpp;orderman/orders/algo/IBeforeLaunchAlgoServices.cpp;orderman/orders/algo/algo_orders/CoverAlgo.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/OffsetAlgo.cpp;orderman/orders/algo/algo_orders/TopAlgo.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/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/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/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;os/os.cpp;os/tests/os_tests.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/GrowableSPSCQueue.cpp;utils/HTTPStream.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/stats.cpp;utils/tests/AuthTokenTests.cpp;utils/tests/SingleWriterConcurrentVectorTests.cpp;utils/thread_manager.cpp) \ No newline at end of file From 6b799bf93b1a1920a844c3aa98fe7ced018ee941 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 8 Jul 2019 15:37:35 -0500 Subject: [PATCH 114/210] [non-functional] normalize spacing/tabs in LoginView.xaml --- .../spark/view/Shell/Login/LoginView.xaml | 293 ++++++++++-------- 1 file changed, 157 insertions(+), 136 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index 61ab1e961..e11a66b2f 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -1,143 +1,164 @@ - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - @@ -580,4 +444,4 @@ - \ No newline at end of file + diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs index 95214f635..f14a1798f 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs @@ -1,13 +1,10 @@ using mbts.spark; using mbts.ui.converters; -using System; using System.Windows.Controls; using System.Windows.Data; -using System.Windows.Input; namespace mbts.ui.spark { partial class AlgoStudioView : UserControl { - public const string BadgesInTreeViewVisibilityKey = nameof(BadgesInTreeViewVisibilityKey); public static readonly IValueConverter EditPaneVisualStateConverter = ValueConverter.create(obj => obj == null ? VisualStates.Inactive : VisualStates.Active); @@ -18,7 +15,7 @@ namespace mbts.ui.spark { DataContextChanged += (s, e) => set_controller(); set_controller(); // local methods - void set_controller() => Disposable.replace(ref _controller, AlgoStudioViewControllerFactory.create(DataContext, _tree_view, name_text_box, custom_badge_color_picker_button, custom_badge_color_picker_popup)); + void set_controller() => Disposable.replace(ref _controller, AlgoStudioViewControllerFactory.create(DataContext, name_text_box, custom_badge_color_picker_button, custom_badge_color_picker_popup)); } public new AlgoStudioVM DataContext { @@ -28,15 +25,6 @@ namespace mbts.ui.spark { public void add_definition() => _controller.add_definition(); public void add_definition_clone(AlgoDefinitionVM src_definition) => _controller.add_definition_clone(src_definition); - public void add_template(AlgoDefinitionVM definition) => _controller.add_template(definition); - public void rename_definition(AlgoDefinitionVM definition) => _controller.rename_definition(definition); - public void rename_template(AlgoDefinitionTemplateVM template) => _controller.rename_template(template); - public void select_definition(AlgoDefinitionVM definition) => _controller.select_definition(definition); - public void select_template(AlgoDefinitionTemplateVM template) => _controller.select_template(template); - public IDisposable preserve_selected_definition() => _controller.preserve_selected_definition(); - - void _end_edit_executed(object s, ExecutedRoutedEventArgs e) => - _controller.end_edit(e); public static class VisualStateNames { public static class EditPane { @@ -75,14 +63,6 @@ namespace mbts.ui.spark { Inactive = $"{GroupName}{VisualStates.Inactive}"; } - public static class TreeViewBadge { - public const string GroupName = nameof(TreeViewBadge); - - public static readonly string - Active = $"{GroupName}{VisualStates.Active}", - Inactive = $"{GroupName}{VisualStates.Inactive}"; - } - public static class FavoriteToggleButton { public const string GroupName = nameof(FavoriteToggleButton); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioViewController.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioViewController.cs index dbdbd1f7b..6fa462c60 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioViewController.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioViewController.cs @@ -1,8 +1,6 @@ using mbts.spark; using mbts.ui.controls; using System; -using System.Collections.Generic; -using System.Linq; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; @@ -11,21 +9,14 @@ namespace mbts.ui.spark { interface IAlgoStudioViewController : IDisposable { void add_definition(); void add_definition_clone(AlgoDefinitionVM src_definition); - void add_template(AlgoDefinitionVM definition); - void rename_definition(AlgoDefinitionVM definition); - void rename_template(AlgoDefinitionTemplateVM template); - void end_edit(ExecutedRoutedEventArgs e); - void select_definition(AlgoDefinitionVM definition); - void select_template(AlgoDefinitionTemplateVM template); - IDisposable preserve_selected_definition(); } class AlgoStudioViewControllerFactory { static readonly IAlgoStudioViewController _empty = new EmptyController(); - public static IAlgoStudioViewController create(AlgoStudioVM vm, TreeView tree_view, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) => - vm == null || tree_view == null || name_text_box == null || color_picker_button == null || color_picker_popup == null ? - _empty : new Controller(vm, tree_view, name_text_box, color_picker_button, color_picker_popup); + public static IAlgoStudioViewController create(AlgoStudioVM vm, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) => + vm == null || name_text_box == null || color_picker_button == null || color_picker_popup == null ? + _empty : new Controller(vm, name_text_box, color_picker_button, color_picker_popup); ///

/// This wrapper class is returned by when the vm or tree_view is null. @@ -34,25 +25,16 @@ namespace mbts.ui.spark { class EmptyController : IAlgoStudioViewController { public void add_definition() { } public void add_definition_clone(AlgoDefinitionVM src_definition) { } - public void add_template(AlgoDefinitionVM definition) { } - public void rename_definition(AlgoDefinitionVM definition) { } - public void rename_template(AlgoDefinitionTemplateVM template) { } - public void end_edit(ExecutedRoutedEventArgs e) { } - public void select_definition(AlgoDefinitionVM definition) { } - public void select_template(AlgoDefinitionTemplateVM template) { } - public IDisposable preserve_selected_definition() => Disposable.empty; public void Dispose() { } } class Controller : IAlgoStudioViewController { readonly AlgoStudioVM _vm; - readonly TreeView _tree_view; readonly TextBox _name_text_box; IDisposable _dispose; - public Controller(AlgoStudioVM vm, TreeView tree_view, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) { + public Controller(AlgoStudioVM vm, TextBox name_text_box, Button color_picker_button, Popup color_picker_popup) { _vm = vm; - _tree_view = tree_view; _name_text_box = name_text_box; _dispose = PopupViewController.attach(color_picker_popup, color_picker_button); } @@ -67,67 +49,11 @@ namespace mbts.ui.spark { _begin_edit(); } - public void add_template(AlgoDefinitionVM def) { - var new_tmp = def.template_factory(); - def.templates.Add(new_tmp); - _begin_edit(); - } - - public void end_edit(ExecutedRoutedEventArgs e) { - if (e.OriginalSource is EditableTextBlock etb) { - etb.end_edit(); - _get_container(etb.DataContext)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true); - } - } - - public void rename_definition(AlgoDefinitionVM definition) { - if (_tree_view.ItemContainerGenerator.ContainerFromItem(definition) is TreeViewItem tvi) { - var etb = tvi.descendants_of_type().FirstOrDefault(); - etb.SetCurrentValue(EditableTextBlock.IsEditingProperty, true); - } - } - - public void rename_template(AlgoDefinitionTemplateVM template) { - if (_tree_view.ItemContainerGenerator.ContainerFromItem(template.owner) is TreeViewItem tvi) { - if (tvi.ItemContainerGenerator.ContainerFromItem(template) is TreeViewItem ttvi) { - var etb = ttvi.descendants_of_type().FirstOrDefault(); - etb.SetCurrentValue(EditableTextBlock.IsEditingProperty, true); - } - } - } - - public void select_definition(AlgoDefinitionVM definition) => - _tree_view.ItemContainerGenerator.ContainerFromItem(definition)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true); - - public void select_template(AlgoDefinitionTemplateVM template) { - if (_tree_view.ItemContainerGenerator.ContainerFromItem(template.owner) is TreeViewItem def_view) { - def_view.SetCurrentValue(TreeViewItem.IsSelectedProperty, true); - def_view.ItemContainerGenerator.ContainerFromItem(template)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true); - } - } - - public IDisposable preserve_selected_definition() => - Disposable.Create(() => { - var name = _vm.selected_definition.name; - if (_vm.definitions.TryGetFirst(d => d.name == name, out AlgoDefinitionVM def)) - _tree_view.ItemContainerGenerator.ContainerFromItem(def)?.SetCurrentValue(TreeViewItem.IsSelectedProperty, true); - }); - public void Dispose() => Disposable.dispose(ref _dispose); void _begin_edit() => WPFHelper.push_frame_until(() => Keyboard.Focus(_name_text_box) == _name_text_box); - - TreeViewItem _get_container(object obj) => - obj is AlgoDefinitionTemplateVM t ? _get_container(t) : - obj is AlgoDefinitionVM d ? _get_container(d) : null; - - TreeViewItem _get_container(AlgoDefinitionVM d) => - _tree_view.ItemContainerGenerator.ContainerFromItem(d) as TreeViewItem; - - TreeViewItem _get_container(AlgoDefinitionTemplateVM t) => - _get_container(t.owner) is TreeViewItem dview ? dview.ItemContainerGenerator.ContainerFromItem(t) as TreeViewItem : null; } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs index 24164b38f..d0e80f526 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs @@ -62,35 +62,18 @@ namespace mbts.spark { _vm = new AlgoStudioVM(_model); _vm.load_from(_state); _view = new AlgoStudioView { DataContext = _vm }; - _view.Resources[AlgoStudioView.BadgesInTreeViewVisibilityKey] = _ui_configuration.show_badges_in_tree_view ? Visibility.Visible : Visibility.Collapsed; _resources = new CompositeDisposable(); - // observable sources - var content_src = _vm.observe_selected().Select(_ => _vm.content_source); // add definition _commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, new DelegateCommand(_view.add_definition))); // add definition clone var add_definition_clone_spark_cmd = new ObservantSparkCommandCommand(Icons.DocumentCopy, d => $"Clone '{d?.name}'", d => d != null, _view.add_definition_clone); _commands.Add(add_definition_clone_spark_cmd); - // add template - var add_template_spark_cmd = new ObservantSparkCommandCommand(Icons.AddFile, d => $"Add '{d?.name}' Template", d => d != null, _view.add_template) { - show_in_toolbar = (_ui_configuration.add_template_button & bts.config.AlgoStudioOptions.AddTemplateButton.MainToolBar) == bts.config.AlgoStudioOptions.AddTemplateButton.MainToolBar, - show_in_context_menu = (_ui_configuration.add_template_button & bts.config.AlgoStudioOptions.AddTemplateButton.DefinitionContextMenu) == bts.config.AlgoStudioOptions.AddTemplateButton.DefinitionContextMenu - }; - _commands.Add(add_template_spark_cmd); - _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(add_definition_clone_spark_cmd, add_template_spark_cmd)); + _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(add_definition_clone_spark_cmd)); // save if (_ui_configuration.can_save_specific) { - var content_is_dirty_src = _vm.observe_selected().SelectManyInSeries(t => { - if (t.template != null) { - return t.template.observe_is_dirty(); - } else if (t.definition != null) { - return t.definition.subscribe_is_definition_dirty(); - } else return Observable.Return(false); - }); - _commands.Add(new ReactiveSparkCommand(content_src.OnDispatcher().Select(c => $"Save '{c?.name}'"), Icons.DiskFile, () => { - if (_vm.selected_template is AlgoDefinitionTemplateVM t) - _vm.save_template(t).ignore(); - else if (_vm.selected_definition is AlgoDefinitionVM d) + var content_is_dirty_src = _vm.subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false)); + _commands.Add(new ReactiveSparkCommand(_vm.subscribe_definition().OnDispatcher().Select(c => $"Save '{c?.name}'"), Icons.DiskFile, () => { + if (_vm.selected_definition is AlgoDefinitionVM d) _vm.save_definition(d).ignore(); }, content_is_dirty_src)); } @@ -101,48 +84,39 @@ namespace mbts.spark { // undo/redo if (_ui_configuration.can_undo_redo) { // undo - var undo_cmd = new ObservantCommand(() => _vm.content_source?.try_undo()); + var undo_cmd = new ObservantCommand(() => _vm.selected_definition?.try_undo()); var undo_spark_cmd = new SparkCommandCommand("Undo", Icons.UndoCircular, undo_cmd); - var can_undo_source = _vm.observe_selected().SelectManyInSeries(tup => { - IAlgoStudioContentVM content = (IAlgoStudioContentVM)tup.template ?? tup.definition; - return content != null ? + var can_undo_source = _vm.subscribe_definition().SelectManyInSeries(def => + def != null ? Observable.Create(o => { - content.can_undo_changed += notify; + def.can_undo_changed += notify; notify(); - return Disposable.Create(() => content.can_undo_changed -= notify); - void notify() => o.OnNext(content.can_undo); + return Disposable.Create(() => def.can_undo_changed -= notify); + void notify() => o.OnNext(def.can_undo); }) : - Observable.Return(false); - }); + Observable.Return(false)); _commands.Add(undo_spark_cmd); _resources.Add(can_undo_source.Subscribe(undo_cmd)); // redo - var redo_cmd = new ObservantCommand(() => _vm.content_source?.try_redo()); + var redo_cmd = new ObservantCommand(() => _vm.selected_definition?.try_redo()); var redo_spark_cmd = new SparkCommandCommand("Redo", Icons.RedoCircular, redo_cmd); - var can_redo_source = _vm.observe_selected().SelectManyInSeries(tup => { - IAlgoStudioContentVM content = (IAlgoStudioContentVM)tup.template ?? tup.definition; - return content != null ? + var can_redo_source = _vm.subscribe_definition().SelectManyInSeries(def => + def != null ? Observable.Create(o => { - content.can_redo_changed += notify; + def.can_redo_changed += notify; notify(); - return Disposable.Create(() => content.can_redo_changed -= notify); - void notify() => o.OnNext(content.can_redo); + return Disposable.Create(() => def.can_redo_changed -= notify); + void notify() => o.OnNext(def.can_redo); }) : - Observable.Return(false); - }); + Observable.Return(false)); _commands.Add(redo_spark_cmd); _resources.Add(can_redo_source.Subscribe(redo_cmd)); } // remove var remove_spark_cmd = new ObservantSparkCommandCommand(Icons.Trash, v => $"Remove '{v?.name}'", v => v != null, value => { - if (value is AlgoDefinitionTemplateVM t) { - _vm.remove_template(t).ignore(); - } else if (value is AlgoDefinitionVM d) { + if (value is AlgoDefinitionVM d) { string prompt; MessageBoxImage icon; - if (_model.algo_model.templates_enabled() && d.templates.Count > 0) { - prompt = $"Deleting this definition ({d.name}) will also delete its templates ({d.templates.Count}).\n\nDo you wan to Continue?"; - icon = MessageBoxImage.Warning; - } else if (d.key.mode == AlgoKey.Mode.Persisted) { + if (d.key.mode == AlgoKey.Mode.Persisted) { prompt = $"Are you sure you want to delete '{d.name}?'"; icon = MessageBoxImage.Question; } else { @@ -162,7 +136,7 @@ namespace mbts.spark { } }); _commands.Add(remove_spark_cmd); - _resources.Add(content_src.OnDispatcher().Subscribe(remove_spark_cmd)); + _resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_spark_cmd)); } void _dispose_core() { diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs deleted file mode 100644 index b036f0671..000000000 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioDefinitionTemplateModel.cs +++ /dev/null @@ -1,319 +0,0 @@ -using bts; -using bts.api.core; -using bts.api.orderman; -using bts.persist.algo; -using bts.spark; -using mbts.utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Disposables; -using System.Reactive.Linq; -using System.Threading.Tasks; - -namespace mbts.spark { - class AlgoStudioDefinitionTemplateModel : IAlgoStudioModel, IDisposable { - readonly AlgoService _service; - readonly AdminModel _admin_model; - readonly ErrorReporter _error_reporter; - readonly ObservableDemuxer _metadata_demuxer = new ObservableDemuxer(); - readonly TableUpdateDemuxer _definition_templates_demuxer; - IReadOnlyDictionary _algos = DictionaryHelper.empty(); - IReadOnlyDictionary _algo_templates = DictionaryHelper.empty(); - IDisposable _dispose; - - public AlgoStudioDefinitionTemplateModel(AlgoService service, IAlgoDefinitionMetadataService meta, AdminModel admin_model, ErrorReporter error_reporter, bts.config.AlgoStudioOptions ui_configuration) { - _service = service; - metadata_service = meta; - _admin_model = admin_model; - _error_reporter = error_reporter; - this.ui_configuration = ui_configuration; - _definition_templates_demuxer = new TableUpdateDemuxer(t => t.key, t => t.definition_key); - definitions = _service.subscribei_algos() - .Select(u => new Update( - u.all.Select(_Utils.definition_data).ToList(), - u.added.Select(_Utils.definition_data).ToList(), - u.changes.Select(ch => new Change(_Utils.definition_data(ch.Old), _Utils.definition_data(ch.New))).ToList(), - u.removed.Select(d => _Utils.definition_data(d)).ToList(), - def => def.key)) - .Table() - .Cache(); - templates = _service.subscribei_algo_templates() - .Select(u => new Update( - u.all.Select(_Utils.template_data).ToList(), - u.added.Select(_Utils.template_data).ToList(), - u.changes.Select(ch => new Change(_Utils.template_data(ch.Old), _Utils.template_data(ch.New))).ToList(), - u.removed.Select(_Utils.template_data).ToList(), - def => def.key)) - .Table() - .Cache(); - _dispose = new CompositeDisposable( - definitions.OnDispatcher().Subscribe(t => _algos = t.state), - templates.OnDispatcher().Subscribe(t => _algo_templates = t.state), - templates.Subscribe(_definition_templates_demuxer), - metadata_service.subscribe_metadata().Subscribe(_metadata_demuxer)); - } - - public IObservable> definitions { get; } - public IObservable> templates { get; } - public IAlgoDefinitionMetadataService metadata_service { get; } - public bts.config.AlgoStudioOptions ui_configuration { get; } - - public IObservable> subscribe_definition_templates(AlgoKey definition) => - _definition_templates_demuxer.subscribe(definition); - - public async Task save_definition(AlgoData definition_data) { - if (definition_data.key.is_persisted) { - // TODO: implement update op when backend ready - } else { - // create op - return await _create_definition(new CompositeAlgoDefinitionImmutable(_Utils.to_definition(definition_data))); - } - return null; - } - public async Task save_template(AlgoTemplateData template_data) { - if (template_data.key.is_persisted) { - // update op - return await _update_template(_Utils.to_recordi(template_data)); - } else { - // create op - return await _create_template(_Utils.to_templatei(template_data)); - } - } - - /// - /// The api is not used here (there are some unresolved dependency issues with definitions on the backend). - /// The definition is marked as hidden in the AlgoMetadata stored on the server. - /// - /// For implementation details, see: , - /// - public async Task remove_definition(AlgoKey key) { - if (_algos.TryGetValue(key, out AlgoData curr)) { - if (_definition_templates_demuxer.try_get_values(key, out IReadOnlyDictionary tmps)) { - foreach (var t in tmps.Values) - await remove_template(t.key); - } - await metadata_service.hide_definition(key); - return true; - } - return false; - } - - public async Task remove_template(AlgoKey template_key) { - var req = new AlgoServiceRemoveRequest(); - _Utils.set_key(ref req, template_key); - var reply = await _safe_execute(() => _service.remove_template_async(req), ActionMetadata.remove_template); - return reply.success && reply.value.Success; - } - - public void Dispose() => - Disposable.dispose(ref _dispose); - - async Task _create_definition(CompositeAlgoDefinitionImmutable definition) => - await _create_definition(definition, _admin_model.user.id); - - async Task _create_template(AlgoTemplateImmutable template) { - var (value, success) = await _error_reporter.safe_execute(() => _service.create_template_async( - new TemplateCreateRequest { UserId = _admin_model.user.id, NewTemplate = template.CloneToMutable() }), - r => r.Success, r => r.ErrMsg, ActionMetadata.CreateTemplate); - if (success) - return _Utils.template_data(value.Record); - return null; - } - - async Task _update_template(AlgoTemplateRecordImmutable template) { - var (value, success) = await _error_reporter.safe_execute(() => _service.update_template_async( - new TemplateUpdateRequest { Key = template.Key, UpdatedTemplate = template.AlgoTemplate.CloneToMutable() }), - r => r.Success, r => r.ErrMsg.ToString(), ActionMetadata.UpdateTemplate); - if (success) - return _Utils.template_data(template); - return null; - } - - async Task _create_definition(CompositeAlgoDefinitionImmutable definition, uint user_id) { - (var result, var success) = await _error_reporter.safe_execute(() => _service.create_composite_algo_async( - new CompositeAlgoCreateRequest { - NewAlgo = definition.CloneToMutable(), - UserId = user_id - }), r => r.Success, r => r.ErrMsg, "create definition"); - return success ? _Utils.definition_data(new CompositeAlgoRecordImmutable(result.Record)) : (AlgoData?)null; - } - - async Task> _safe_execute(Func>> execute, IActionMetadata am) { - try { - var result = await execute(); - if (!result.success) { - _report_error(am.present_progressive_desc, result.error_message); - } else if (!am.get_success(result.value)) { - _report_error(am.present_progressive_desc, am.get_error_msg(result.value)); - } - return result; - } catch (Exception ex) { - _report_error(am.present_progressive_desc, ex.ToString()); - } - return new Result(bts.api.ApiError.UnexpectedResponse); - } - - void _report_error(string present_progressive_desc, string msg) => - _error_reporter.report_error($"Error {present_progressive_desc}: {msg}", AlgoStudioWindow.NAME, System.Windows.MessageBoxImage.Warning); - - void _report_no_user_id(string desc) => - _error_reporter.report_error($"{desc} failed: did not find current user id"); - - // used for error handling/reporting - interface IActionMetadata { - string desc { get; } - string present_progressive_desc { get; } - } - - interface IActionMetadata : IActionMetadata { - bool get_success(TReply reply); - string get_error_msg(TReply reply); - } - - static class ActionMetadata { - public const string - CreateDefinition = "create definition", - UpdateDefinition = "update definition", - CreateTemplate = "create template", - UpdateTemplate = "update template"; - public static readonly IActionMetadata update_template = new Impl(_update, _template, r => r.Success, r => r.ErrMsg.ToString()); - public static readonly IActionMetadata remove_template = new Impl(_delete, _template, r => r.Success, r => r.ErrMsg.ToString()); - public static readonly IActionMetadata create_template = new Impl(_create, _template, r => r.Success, r => r.ErrMsg); - public static readonly IActionMetadata create_definition = new Impl(_create, _definition, r => r.Success, r => r.ErrMsg); - - static readonly DescTuple _create = new DescTuple("create", "creating"), _update = new DescTuple("update", "updating"), _delete = new DescTuple("delete", "deleting"); - static readonly string _definition = "definition", _template = "template"; - - class Impl : IActionMetadata { - readonly DescTuple _desc; - readonly string _subject; - readonly Func _get_success; - readonly Func _get_error_msg; - - public Impl(DescTuple desc, string subject, Func get_success, Func get_error_msg) { - _desc = desc; - _subject = subject; - _get_success = get_success; - _get_error_msg = get_error_msg; - } - public string desc => _desc.desc; - public string present_progressive_desc => _desc.present_progressive_desc; - public bool get_success(T reply) => _get_success(reply); - public string get_error_msg(T reply) => _get_error_msg(reply); - } - - struct DescTuple { - public readonly string desc, present_progressive_desc; - public DescTuple(string desc, string present_progressive_desc) { - this.desc = desc; - this.present_progressive_desc = present_progressive_desc; - } - } - } - - /// - /// The AlgoService protobuf types have been extracted out of the viewmodels (, , , ). - /// The viewmodels instead use these types to represent the data: is used in place of , and is used in place of . - /// This thin abstraction isolates the server-side from the client-side, so if one day the server side types change, we won't need to change any client-side code except the methods below which handle the conversion from server type to corresponding client type. - /// There are a couple other methods in here as well (this is an extensions class afterall), but [John]I am going out of town soon (1/6/18) and did not get a chance to organize these methods beyond containing them in . - /// - static class _Utils { - // AlgoTemplateImmutable custom_order_definition(i) - public static CustomOrderDefinitionImmutable custom_order_definitioni(AlgoTemplateImmutable templatei) { - switch (templatei.AlgoParamsCase) { - case AlgoTemplate.AlgoParamsOneofCase.CompositeAlgoParams: return templatei.CompositeAlgoParams.Algo; - case AlgoTemplate.AlgoParamsOneofCase.SystemAlgoParams: return templatei.SystemAlgoParams; - default: throw ExceptionBuilder.Argument.unexpected_case(templatei.AlgoParamsCase, nameof(templatei)); - } - } - - public static AlgoData definition_data(AlgoTemplateImmutable templatei) { - switch (templatei.AlgoParamsCase) { - case AlgoTemplate.AlgoParamsOneofCase.CompositeAlgoParams: return definition_data(templatei.CompositeAlgoParams); - case AlgoTemplate.AlgoParamsOneofCase.SystemAlgoParams: - return new AlgoData( - templatei.SystemAlgoParams, - templatei.SystemAlgoParams.CustomCase.display_name(), - get_key(templatei.SystemAlgoParams)); - default: throw ExceptionBuilder.Argument.unexpected_case(templatei.AlgoParamsCase, nameof(templatei)); - } - } - - public static AlgoData definition_data(CompositeAlgoRecordImmutable recordi) => new AlgoData(recordi.AlgoDefinition.Algo, recordi.AlgoDefinition.Name, get_key(recordi)); - - public static AlgoData definition_data(CompositeAlgoDefinitionImmutable definitioni) => - new AlgoData(definitioni.Algo, definitioni.Name, get_key(definitioni)); - - public static AlgoData? definition_data(Result result) { - if (result.success && result.value.Success) { - var r = result.value.Record; - return new AlgoData(new CustomOrderDefinitionImmutable(r.AlgoDefinition.Algo), r.AlgoDefinition.Name, new AlgoKey(new AlgoPersistedKey(r.Key))); - } else return null; - } - - // AlgoTemplateRecord(Immutable) template data - public static AlgoTemplateData template_data(AlgoTemplateRecord record) => template_data(new AlgoTemplateRecordImmutable(record)); - public static AlgoTemplateData template_data(AlgoTemplateRecordImmutable recordi) => new AlgoTemplateData(custom_order_definitioni(recordi.AlgoTemplate), recordi.AlgoTemplate.Name, get_key(recordi), definition_data(recordi.AlgoTemplate)); - - public static CompositeAlgoDefinition to_definition(AlgoData definition_data) => - new CompositeAlgoDefinition { - Name = definition_data.name, - Algo = definition_data.value.CloneToMutable() - }; - - // AlgoTemplateData to_record(i) - public static AlgoTemplateRecord to_record(AlgoTemplateData template) { - var record = new AlgoTemplateRecord { - AlgoTemplate = new AlgoTemplate { - Name = template.name, - CompositeAlgoParams = new CompositeAlgoDefinition { - Name = template.definition.name, - Algo = template.value.CloneToMutable() - } - } - }; - set_key(ref record, template.key); - return record; - } - public static AlgoTemplateRecordImmutable to_recordi(AlgoTemplateData template) => new AlgoTemplateRecordImmutable(to_record(template)); - - // AlgoTemplateData to_template(i) - public static AlgoTemplate to_template(AlgoTemplateData template) => - new AlgoTemplate { - Name = template.name, - CompositeAlgoParams = new CompositeAlgoDefinition { - Name = template.definition.name, - Algo = template.value.CloneToMutable() - } - }; - public static AlgoTemplateImmutable to_templatei(AlgoTemplateData template) => new AlgoTemplateImmutable(to_template(template)); - - public static AlgoKey get_key(CompositeAlgoRecordImmutable recordi) => new AlgoKey(new AlgoPersistedKey(recordi.Key)); - public static AlgoKey get_key(AlgoTemplateRecordImmutable recordi) => new AlgoKey(new AlgoPersistedKey(recordi.Key)); - public static AlgoKey get_key(CompositeAlgoDefinitionImmutable definitioni) => new AlgoKey(new AlgoPersistedKey(definitioni.Name)); - public static AlgoKey get_key(CustomOrderDefinitionImmutable custom_order_definitioni) => new AlgoKey(custom_order_definitioni.CustomCase); - - public static void set_key(ref AlgoTemplateRecord record, AlgoKey key) { - switch (key.mode) { - case AlgoKey.Mode.Persisted: - switch (key.persisted.mode) { - case AlgoPersistedKey.Mode.String: - record.Key = key.persisted.id_string; break; - } - break; - } - } - public static void set_key(ref AlgoServiceRemoveRequest request, AlgoKey key) { - switch (key.mode) { - case AlgoKey.Mode.Persisted: - switch (key.persisted.mode) { - case AlgoPersistedKey.Mode.String: - request.Key = key.persisted.id_string; break; - } - break; - } - } - } - } -} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs index 57518ae9f..2d859112d 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs @@ -6,10 +6,12 @@ using bts.spark; using mbts.utils; using System; using System.Collections.Generic; +using System.ComponentModel.Composition; using System.Reactive.Linq; using System.Threading.Tasks; namespace mbts.spark { + [Export(typeof(IAlgoStudioModel))] class AlgoStudioFlatDefinitionModel : IAlgoStudioModel, IDisposable { readonly AlgoDefinitionService _service; readonly AdminModel _admin_model; @@ -18,12 +20,12 @@ namespace mbts.spark { IReadOnlyDictionary _algo_templates = DictionaryHelper.empty(); IDisposable _dispose; - public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter, bts.config.AlgoStudioOptions ui_configuration) { + [ImportingConstructor] + public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter) { _service = service; this.metadata_service = metadata_service; _admin_model = admin_model; _error_reporter = error_reporter; - this.ui_configuration = ui_configuration; definitions = service.subscribei_algo_definitions() .Filter(r => r.Metadata.IsActive && r.Metadata.CreatorUserId == _admin_model.user.id) @@ -35,7 +37,7 @@ namespace mbts.spark { public IObservable> definitions { get; } public IObservable> templates => Observable.Empty>(); public IAlgoDefinitionMetadataService metadata_service { get; } - public bts.config.AlgoStudioOptions ui_configuration { get; } + public bts.config.AlgoStudioOptions ui_configuration { get; } = config.Configuration.get(); public IObservable> subscribe_definition_templates(AlgoKey definition_key) => Observable.Return(TableUpdate.mk_empty(t => t.key)); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/IAlgoStudioModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/IAlgoStudioModel.cs index 0d2b85cbe..acbcdffb5 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/IAlgoStudioModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/IAlgoStudioModel.cs @@ -1,10 +1,7 @@ using bts; -using bts.api; using bts.api.core; -using bts.spark; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Threading.Tasks; namespace mbts.spark { @@ -20,34 +17,13 @@ namespace mbts.spark { bts.config.AlgoStudioOptions ui_configuration { get; } } - class AlgoStudioModelExporter { - [ImportingConstructor] - AlgoStudioModelExporter(Spark.AlgoServiceWrapper service_wrapper, IAlgoDefinitionMetadataService meta, AdminModel admin_model, ErrorReporter error_reporter) { - var ui_configuration = config.Configuration.get(); - switch (service_wrapper.mode) { - case Spark.AlgoServiceWrapper.Mode.Flat: model = new AlgoStudioFlatDefinitionModel(service_wrapper.flat, meta, admin_model, error_reporter, ui_configuration); break; - case Spark.AlgoServiceWrapper.Mode.Hierarchical: model = new AlgoStudioDefinitionTemplateModel(service_wrapper.hierarhical, meta, admin_model, error_reporter, ui_configuration); break; - } - } - - [Export] - public IAlgoStudioModel model { get; } - } - static class AlgoStudioModelUtils { - public static bool templates_enabled(this IAlgoStudioModel model) => - get_templates_enabled(model.ui_configuration); - - public static bool get_templates_enabled(bts.config.AlgoStudioOptions ui_configuration) => - ui_configuration.add_template_button != bts.config.AlgoStudioOptions.AddTemplateButton.None; - public static IReadOnlyDictionary get_dynamic_resources(bts.config.AlgoStudioOptions ui_configuration) => new Dictionary { { AlgoStudioWindow.ShowAlgoToolBarRenameDefinitionKey, ui_configuration.can_modify_definition_name && ui_configuration.show_algo_toolbar_rename }, { AlgoStudioWindow.ShowAlgoToolBarSaveDefinitionKey, ui_configuration.can_modify_definition_values && ui_configuration.show_algo_toolbar_save }, { AlgoStudioWindow.ShowAlgoToolBarRevertDefinitionKey, ui_configuration.show_algo_toolbar_revert }, - { AlgoStudioWindow.ShowAlgoToolBarUndoRedoDefinitionKey, ui_configuration.show_algo_toolbar_undo_redo }, - { AlgoStudioWindow.TemplatesEnabledKey, get_templates_enabled(ui_configuration) } + { AlgoStudioWindow.ShowAlgoToolBarUndoRedoDefinitionKey, ui_configuration.show_algo_toolbar_undo_redo } }; } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs deleted file mode 100644 index 27cfd6f91..000000000 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs +++ /dev/null @@ -1,243 +0,0 @@ -using bts; -using bts.api.orderman; -using bts.utils; -using mbts.spark.utilities; -using mbts.ui; -using mbts.ui.shell; -using mbts.ui.utility; -using mbts.utils; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Reactive.Linq; -using System.Windows.Input; -using VisualStateNames = mbts.ui.spark.AlgoStudioView.VisualStateNames; - -namespace mbts.spark { - class AlgoDefinitionTemplateVM : DisposableViewModelBase, IAlgoStudioContentVM, IEquatable { - /// is referenced by an x:Static extension in OrderDetailsPopupControl.xaml . - /// In most cases, works just like , but for nested types, such as . - /// However, when the former is used to denote the DataType of a DataTemplate, a strange XamlReader exception is thrown at runtime. - /// After spending ~15 minutes investigating what was happening, [John]I decided it was more trouble than it was worth and opted for this workaround. - public static readonly Type CustomType = typeof(CustomTemplatePlaceholderVM); - readonly OrdersModel _model; - readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel(); - /// Note: the difference between and is that the former implements push/pop functionality so the user may undo/redo (like ctrl+z/ctrl+y in text editors), - /// while the latter is a lazy delegate-based container for the most recent value (). - readonly EditStack _edit_stack = new EditStack(); - readonly VersionContainer _version; - readonly DeferrableActionWrapper _refresh_on_local_change; - readonly Property _algo_root; - readonly DelegateProperty _can_undo, _can_redo, _is_dirty; - readonly Property _is_default, _is_favorite, _is_selected; - readonly Property _name, _abbreviation; - // maintains the state of each algo-root, so the user may change the definition root back and forth without any loss of state amongst the templates - Snapshot _committed; - - public AlgoDefinitionTemplateVM(AlgoDefinitionVM owner, OrdersModel model, AlgoData data, AlgoEditingPermissions editing_permissions = AlgoEditingPermissions.AllowEditValues) { - // init core data - this.owner = owner; - _model = model; - key = data.key; - _version = new VersionContainer(_snapshot); - // maintain states for different algo roots, so they aren't lost when the user changes the root algo type - var algo_map = new Dictionary { - { data.key, algo_vm_factory(data.value) } - }; - // init backing props - _name = backing(nameof(this.name), name); - _abbreviation = backing(nameof(abbreviation), string.Empty); - _is_default = backing(nameof(is_default), false); - _is_favorite = backing(nameof(is_favorite), false); - _is_selected = backing(nameof(is_selected), false); - _algo_root = backing(nameof(algo_root), get_algo_root(owner.algo_root)); - _committed = _version.value; - _can_redo = backing(nameof(can_redo), () => _edit_stack.get_can_redo(_version.value)); - _can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value)); - _is_dirty = backing(nameof(is_dirty), () => !_committed.Equals(_version.value)); - _can_redo.Changed += on_can_redo_changed; - _can_undo.Changed += on_can_undo_changed; - set_as_default_cmd = new DelegateCommand(() => { - if (!is_default && key.mode == AlgoKey.Mode.Persisted) - _model.algo_model.metadata_service.set_as_default(owner.key, key).ignore(); - }); - // init visual states - // TODO: implement these features in IAlgoMetadataService; until then, set the appropriate visual states. - _edit_pane_vs_model.set_state(VisualStateNames.Abbreviation.GroupName, VisualStateNames.Abbreviation.NotSupportedForTemplates); - _tree_view_vs_model.set_state(VisualStateNames.FavoriteToggleButton.GroupName, VisualStateNames.FavoriteToggleButton.Inactive); - switch (key.mode) { - case AlgoKey.Mode.Persisted: - _edit_stack.push(_committed); - _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Active); - break; - case AlgoKey.Mode.Unpersisted: _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Active); break; - case AlgoKey.Mode.Factory: _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, VisualStateNames.Name.Inactive); break; - } - // set hooks/subscriptions - _refresh_on_local_change = new DeferrableActionWrapper(on_local_changed); - _dispose = new System.Reactive.Disposables.CompositeDisposable( - as_demuxer().subscribe_many(_refresh_on_local_change.execute, nameof(name), nameof(abbreviation), nameof(is_default), nameof(is_favorite)), - owner.observe_algo_root().Subscribe(r => _algo_root.set(get_algo_root(r))), - _algo_root.observe_current(true).SelectManyInSeries(r => r?.subscribe_definition()).Subscribe(_ => _refresh_on_local_change.execute()), - Disposable.wrap_collection(algo_map.Values)) { - () => { - _can_redo.Changed -= on_can_redo_changed; - _can_undo.Changed -= on_can_undo_changed; - } - }; - // local methods - IAlgoVM algo_vm_factory(CustomOrderDefinitionImmutable def) => OrderTypeVMFactory.create(new AlgoData(def, def.CustomCase.display_name(), OrderDataHelper.get_shallow_factory_key(def)), editing_permissions); - IAlgoVM get_algo_root(IAlgoVM owner_root) { - var key = new AlgoKey(owner_root.order_type); - if (algo_map.TryGetValue(key, out IAlgoVM vm)) { - vm.load_structure(owner_root.definition); - } else { - vm = algo_map.GetOrAdd(key, ot => algo_vm_factory(owner_root.definition)); - } - return vm; - } - void on_can_undo_changed(bool oldval, bool newval) => can_undo_changed?.Invoke(); - void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke(); - void on_local_changed() { - _version.increment_version(); - _edit_stack.push_distinct(_version.value); - _is_dirty.refresh(); - _refresh_undo_redo(); - } - } - - public event Action can_redo_changed, can_undo_changed; - public event PropertyChange algo_root_changed { add => _algo_root.Changed += value; remove => _algo_root.Changed -= value; } - - public AlgoDefinitionVM owner { get; } - public AlgoKey owner_key => owner.key; - public AlgoKey key { get; } - public string name { get => _name.Value; set => _name.set(value); } - public string abbreviation { get => _abbreviation.Value; set => _abbreviation.set(value); } - public bool is_dirty => _is_dirty.Value; - public bool can_redo => _can_redo.Value; - public bool can_undo => _can_undo.Value; - public bool is_default => _is_default.Value; - public bool is_favorite { get => _is_favorite.Value; set => _is_favorite.set(value); } - public IAlgoVM algo_root => _algo_root.Value; - public virtual bool is_custom_placeholder => false; - public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); } - public bool is_expanded => false; - public bool is_persisted => key.mode == AlgoKey.Mode.Persisted; - public ObservableCollection edit_pane_visual_states => _edit_pane_vs_model.states; - public ObservableCollection tree_view_visual_states => _tree_view_vs_model.states; - public ICommand set_as_default_cmd { get; } - - public IObservable observe_is_dirty() => _is_dirty.observe_current(true); - public void undo() => _restore(_edit_stack.try_undo); - public void redo() => _restore(_edit_stack.try_redo); - - public void on_meta(bool is_default, bool is_favorite) { - _is_default.set(is_default); - _is_favorite.set(is_favorite); - } - - public AlgoData create_def_data() => - new AlgoData(algo_root.definition, name, key); - - public AlgoTemplateData create() => - create(owner.create_algo_def()); - - public AlgoTemplateData create(AlgoData record) { - if (!OrderDataHelper.EqualsHelpers.structure_equals(algo_root.definition, record.value)) - throw new InvalidOperationException("AlgoTemplate's algo structure does not match that of its parent."); - return new AlgoTemplateData(algo_root.definition, name, key, record); - } - - public AlgoDefinitionTemplateVM to_persisted(AlgoDefinitionVM persisted_owner, AlgoData template) => - new AlgoDefinitionTemplateVM(persisted_owner, _model, template); - - public void load_committed() => _load_from(_committed.name, _committed.definition, true); - - public void load_from(AlgoTemplateData value) { - if (key.mode != AlgoKey.Mode.Persisted) - throw new InvalidOperationException("AlgoStructure has not been saved yet."); - else if (value.key != key) - throw new InvalidOperationException("Value id does not match this id."); - _load_from(value.name, value.value, true); - } - - public bool Equals(AlgoDefinitionTemplateVM other) => other != null && key == other.key; - public override bool Equals(object obj) => Equals(obj as AlgoDefinitionTemplateVM); - public override int GetHashCode() => key.GetHashCode(); - - void _load_from(string new_name, CustomOrderDefinitionImmutable new_def, bool update_committed) { - using (_refresh_on_local_change.defer_execution()) { - name = new_name; - algo_root.load_from(new_def); - } - if (update_committed) { - _committed = _version.value; - _is_dirty.refresh(); - } - } - - void _refresh_undo_redo() { - _can_redo.refresh(); - _can_undo.refresh(); - } - - void _restore(TryGetValue try_get_snapshot) { - while (try_get_snapshot(out Snapshot next_state)) { - if (!_version.value.Equals(next_state)) { - _load_from(next_state.name, next_state.definition, false); - break; - } - } - } - - Snapshot _snapshot() => - new Snapshot(name, abbreviation, algo_root?.definition ?? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()), is_default, is_favorite); - - struct Snapshot : IEquatable { - public readonly string name, abbreviation; - public readonly CustomOrderDefinitionImmutable definition; - public readonly bool is_default, is_favorite; - - public Snapshot(string name, string abbreviation, CustomOrderDefinitionImmutable definition, bool is_default, bool is_favorite) { - this.name = name; - this.abbreviation = abbreviation; - this.definition = definition; - this.is_default = is_default; - this.is_favorite = is_favorite; - } - - public bool Equals(Snapshot other) => - name == other.name && - abbreviation == other.abbreviation && - is_default == other.is_default && - is_favorite == other.is_favorite && - OrderDataHelper.EqualsHelpers.equals(definition, other.definition); - - public override bool Equals(object obj) => - EqualityComparer.equals_obj(this, obj); - - public override int GetHashCode() => - EqualityComparer.aggregate_hash( - EqualityComparer.safe_aggregate_hash(name), - EqualityComparer.safe_aggregate_hash(abbreviation), - is_default.GetHashCode(), - is_favorite.GetHashCode(), - OrderDataHelper.EqualsHelpers.custom_order_def_compareri.GetHashCode(definition)); - - public static bool operator ==(Snapshot a, Snapshot b) => a.Equals(b); - public static bool operator !=(Snapshot a, Snapshot b) => !a.Equals(b); - } - - public class CustomTemplatePlaceholderVM : AlgoDefinitionTemplateVM { - const string _custom_name = "(Custom)"; - - public CustomTemplatePlaceholderVM(AlgoDefinitionVM owner, OrdersModel model, CustomOrderDefinitionImmutable definition) - : base(owner, model, new AlgoData(definition, _custom_name, new AlgoKey(Guid.NewGuid())), AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues) { - _edit_stack.reset(_snapshot()); - } - - public override bool is_custom_placeholder => true; - } - } -} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 7ec794043..40f7d4ef9 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -6,7 +6,6 @@ using bts.utils; using mbts.collections; using mbts.spark.utilities; using mbts.ui; -using mbts.ui.controls; using mbts.ui.controls.color_picker; using mbts.ui.shell; using mbts.ui.utility; @@ -18,7 +17,6 @@ using System.Collections.Specialized; using System.Linq; using System.Reactive.Disposables; using System.Reactive.Linq; -using System.Windows.Data; using System.Windows.Media; using VisualStateNames = mbts.ui.spark.AlgoStudioView.VisualStateNames; @@ -36,18 +34,14 @@ namespace mbts.spark { public static readonly CustomOrderDefinitionImmutable new_algo_def = OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg); readonly OrdersModel _model; readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel(); - readonly ObservableKeyedCollection _templates = new ObservableKeyedCollection(t => t.key); readonly EditStack _edit_stack = new EditStack(); readonly VersionContainer _version; readonly Property _is_expanded, _is_selected; readonly Property _algo_root, _visible_algo_root; - readonly Property _selected_template; readonly DelegateProperty _is_favorite, _is_dirty, _can_undo, _can_redo; readonly Property _name, _abbreviation; readonly ObservableKeyedCollection _algo_roots = new ObservableKeyedCollection(vm => vm.id); - readonly ObservableAppendCollection _templates_with_custom; readonly DeferrableActionWrapper _refresh_on_local_changes; - readonly ReactiveThresholdMonitor _any_templates_dirty_monitor = new ReactiveThresholdMonitor(t => t.observe_is_dirty()); readonly Property _selected_format; readonly EnumMaskInt32 _permissions_mask = new EnumMaskInt32(); @@ -55,15 +49,9 @@ namespace mbts.spark { Brush _badge_fill; Snapshot? _committed; AlgoDefinitionMetadata _metadata; - TableUpdateBuffer _template_update_buffer; - bool _connected; - public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, bool connect = false, AlgoFormats init_format = AlgoFormats.Exchange, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) { - var rv = new AlgoDefinitionVM(model, data, init_format, editing_permissions); - if (connect) - rv.connect(); - return rv; - } + public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, AlgoFormats init_format = AlgoFormats.Exchange, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) => + new AlgoDefinitionVM(model, data, init_format, editing_permissions); public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name, AlgoFormats init_format) => new AlgoDefinitionVM(model, new AlgoData(def, name, new AlgoKey(Guid.NewGuid())), init_format, (AlgoEditingPermissions)int.MaxValue); @@ -78,20 +66,8 @@ namespace mbts.spark { editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditValues | AlgoEditingPermissions.AllowSaveValues); if (!model.algo_model.ui_configuration.can_modify_definition_structure) editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); - else if (model.algo_model.templates_enabled()) { - resources.Add(_templates.Subscribe((s, e) => { - if (_templates.Count == 0) { - editing_permissions_mask |= AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure; - } else { - editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure); - } - })); - } key = def_data.key; algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer); - _template_update_buffer = new TableUpdateBuffer(t => t.key); - _templates_with_custom = new ObservableAppendCollection(templates); - templates_view = (ListCollectionView)CollectionViewSource.GetDefaultView(_templates_with_custom); custom_badge_color_palettes.AddRange(ColorPalette.all_presets(model.factory).Select(p => new ColorPaletteVM(p))); _version = new VersionContainer(_snapshot); var conf = _model.algo_model.ui_configuration; @@ -99,7 +75,6 @@ namespace mbts.spark { _name = backing(nameof(name), def_data.name); _abbreviation = backing(nameof(abbreviation), string.Empty); _selected_format = backing(nameof(selected_format), init_format); - _selected_template = backing(nameof(selected_template)); _is_favorite = backing(nameof(is_favorite), () => _favorite_index.HasValue); _is_expanded = backing(nameof(is_expanded), true); _is_selected = backing(nameof(is_selected), true); @@ -117,13 +92,7 @@ namespace mbts.spark { async void init_async() { // visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root // - this behavior is configurable in 'AlgoStudioOptions' in UI.proto (01/28/2018) - if (_model.algo_model.templates_enabled()) { - resources.Add(_selected_template.observe_current(true).Subscribe(t => _visible_algo_root.set(t?.algo_root))); - } else { - resources.Add(_algo_root.observe_current(true).Subscribe(_visible_algo_root.set)); - } - // init tree view item visual state - _tree_view_vs_model.set_state(VisualStateNames.TreeViewBadge.GroupName, conf.show_badges_in_tree_view ? VisualStateNames.TreeViewBadge.Active : VisualStateNames.TreeViewBadge.Inactive); + resources.Add(_algo_root.observe_current(true).Subscribe(_visible_algo_root.set)); // set hooks/subscriptions using (_refresh_on_local_changes.supress_execution()) { resources.AddRange( @@ -142,7 +111,6 @@ namespace mbts.spark { }), vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute()))), ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true), - ObservableAutoWrapper.connect_item_hooks(templates, t => new CompositeDisposable(_any_templates_dirty_monitor.join(t), t), true), Disposable.Create(() => { _can_redo.Changed -= on_can_redo_changed; _can_undo.Changed -= on_can_undo_changed; @@ -150,7 +118,6 @@ namespace mbts.spark { switch (key.mode) { case AlgoKey.Mode.Persisted: _metadata = new AlgoDefinitionMetadata(key); - resources.Add(_template_update_buffer.OnDispatcher().Subscribe(_on_templates)); resources.Add(model.algo_model.metadata_service.subscribe_metadata(key).OnDispatcher().Subscribe(_on_metadata)); _edit_pane_vs_model.set_state(VisualStateNames.Name.GroupName, conf.can_modify_definition_name ? VisualStateNames.Name.Active : VisualStateNames.Name.CannotRenameDefinition); break; @@ -206,7 +173,6 @@ namespace mbts.spark { public IReadOnlyObservableCollection algos_view { get; } public IAlgoVM algo_root { get => _algo_root.Value; set => _algo_root.set(value); } public IAlgoVM visible_algo_root => _visible_algo_root.Value; - public AlgoDefinitionTemplateVM selected_template { get => _selected_template.Value; set => _selected_template.set(value); } public int? favorite_index { get => _favorite_index; set { @@ -238,15 +204,6 @@ namespace mbts.spark { public EnabledValueVM custom_badge_color { get; } = new EnabledValueVM(); public ObservableCollection custom_badge_color_palettes { get; } = new ObservableCollection(); public Brush badge_fill => _badge_fill; - public ObservableCollection templates => _templates; - /// has the same elements as , plus the custom-placeholder-item, which is always at index 0. - /// The custom-placeholder supports legacy behavior in the ladder/ticket algo popup by allowing the user to manipulate the algo-structure (e.g. change an iceberg-limit order to iceberg-lean-cover-offset etc.). - /// However, the custom-placeholder item cannot be used to create/save algo-templates. - /// Algo-templates are just a set of values used to populate a concrete algo-structure; the 'structures' can be created in the AlgoStudio (). - /// If we were to strictly follow this paradigm, the user would no longer be able to freely change the algo-structure in the ladder/ticket popup (they would be forced to open up a new , and we know how much they hate more clicks!). - /// Some users might consider this a regression. The custom-placeholder-item addresses that concern. - public ObservableAppendCollection templates_with_custom => _templates_with_custom; - public ListCollectionView templates_view { get; } // format public AlgoFormats selected_format { get => _selected_format.Value; set => _selected_format.set(value); } public ObservableCollection formats { get; } = new ObservableCollection { AlgoFormats.Exchange, AlgoFormats.Spreader, AlgoFormats.Exchange | AlgoFormats.Spreader }; @@ -321,24 +278,7 @@ namespace mbts.spark { } } - // idempotent - public void prepend_custom_template() { - if (_templates_with_custom.appended_front.Count == 0) - _templates_with_custom.insert_front(new AlgoDefinitionTemplateVM.CustomTemplatePlaceholderVM(this, _model, algo_root.definition)); - } - - public AlgoDefinitionTemplateVM template_factory() => - new AlgoDefinitionTemplateVM(this, _model, algo_root.create_def_data().with(name: new_template_name)) { - is_selected = true - }; - public IObservable subscribe_is_definition_dirty() => _is_dirty.observe_current(true); - public IObservable subscribe_any_templates_dirty() => _any_templates_dirty_monitor; - public IObservable subscribe_is_definition_or_any_templates_dirty() => - Observable.Merge( - subscribe_is_definition_dirty().Select(v => v || _any_templates_dirty_monitor.is_above_threshold), - subscribe_any_templates_dirty().Select(v => v || is_dirty)) - .DistinctUntilChanged(); public void undo() => _restore(_edit_stack.try_undo); public void redo() => _restore(_edit_stack.try_redo); @@ -347,17 +287,6 @@ namespace mbts.spark { _assign_from_data(_committed.Value); _on_committed_changed(); } - /// - /// Subscribes to the templates source for this definition if it has been persisted (subscription requires a persistant id); does nothing if this definition has not been persisted, or if it is already subscribed (idempotent). - /// - public void connect() { - if (!_connected) { - _connected = true; - concat_disposable(_model.algo_model.subscribe_definition_templates(key).OnDispatcher().Subscribe(_template_update_buffer.OnNext)); - } - } - - public IDisposable buffer_updates() => _template_update_buffer.buffer_updates(); public void load_def(CustomOrderDefinitionImmutable def) { var key = OrderDataHelper.get_shallow_factory_key(def); @@ -464,12 +393,6 @@ namespace mbts.spark { using (_refresh_on_local_changes.supress_execution()) { _abbreviation.set(metadata.abbreviation); custom_badge_color.set_nullable(metadata.badge_color); - foreach (var t in templates) { - if (t.key.mode == AlgoKey.Mode.Persisted) - t.on_meta(t.key == metadata.default_template, metadata.favorite_templates.Contains(t.key)); - else - t.on_meta(false, false); - } _version.increment_version(); if (_edit_stack.size == 1 && _edit_stack.pos == 1) { // this is a hack to account for the metadata being part of the committed state, @@ -482,22 +405,6 @@ namespace mbts.spark { } } - void _on_templates(TableUpdate table) { - foreach (var rec in table.removed) - _templates.Remove(rec.key); - foreach (var rec in table.changed) - _templates[rec.key].load_from(rec); - foreach (var rec in table.added) { - if (_templates.TryGetValue(rec.key, out AlgoDefinitionTemplateVM tmp)) { - tmp.load_from(rec); - } else { - tmp = new AlgoDefinitionTemplateVM(this, _model, new AlgoData(rec.value, rec.name, rec.key)); - tmp.on_meta(tmp.key == _metadata.default_template, _metadata.favorite_templates.Contains(tmp.key)); - _templates.Add(tmp); - } - } - } - void _refresh_undo_redo() { _can_undo.refresh(); _can_redo.refresh(); diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs index 3f08d209a..d27b6b0e8 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs @@ -1,6 +1,5 @@ using bts; using bts.api.orderman; -using bts.collections; using bts.utils; using mbts.collections; using mbts.ui; @@ -14,6 +13,7 @@ using System.Linq; using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; +using System.Windows; using System.Windows.Input; using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData; @@ -37,24 +37,22 @@ namespace mbts.spark { }); } - class AlgoStudioVM : DisposableViewModelBase, IHandleSelectedItemChanged { + class AlgoStudioVM : DisposableViewModelBase { static readonly AlgoFormats _studio_formats = AlgoFormats.Exchange; readonly OrdersModel _model; readonly Property _selected_definition; - readonly Property _selected_template; readonly Property _editable_content; readonly DelegateProperty _save_cmd_tooltip, _revert_cmd_tooltip; readonly ObservableKeyedCollection _definitions = new ObservableKeyedCollection(d => d.key); readonly ListCollectionView _definitions_view; readonly TableUpdateBuffer _definitions_update_buffer; - readonly ReactiveThresholdMonitor _any_dirty_monitor = new ReactiveThresholdMonitor(d => d.subscribe_is_definition_or_any_templates_dirty()); + readonly ReactiveThresholdMonitor _any_dirty_monitor = new ReactiveThresholdMonitor(d => d.subscribe_is_definition_dirty()); IReadOnlyDictionary _persisted_meta = new Dictionary(); public AlgoStudioVM(OrdersModel model) { _model = model; _selected_definition = backing(nameof(selected_definition)); - _selected_template = backing(nameof(selected_template)); - _editable_content = backing(nameof(editable_content), observe_selected().SelectManyInSeries(tup => tup.template?.observe_algo_root() ?? tup.definition?.observe_algo_root()).OnDispatcher()); + _editable_content = backing(nameof(editable_content), subscribe_definition().SelectManyInSeries(def => def?.observe_algo_root()).OnDispatcher()); _definitions_update_buffer = new TableUpdateBuffer(def => def.key); _definitions_view = new ListCollectionView(definitions) { CustomSort = AlgoCollectionHelper.algo_definition_vm_comparer.to_non_generic() @@ -71,13 +69,18 @@ namespace mbts.spark { // _dispose = new CompositeDisposable( _model.algo_model.definitions.Subscribe(_definitions_update_buffer), - _definitions_update_buffer.OnDispatcher().Subscribe(u => AlgoCollectionHelper.update_persisted_definitions(_definitions, u, d => AlgoDefinitionVM.create(model, d, true, _studio_formats))), + _definitions_update_buffer.OnDispatcher().Subscribe(u => { + var orig_selected_def = selected_definition; + AlgoCollectionHelper.update_persisted_definitions(_definitions, u, d => AlgoDefinitionVM.create(model, d, _studio_formats)); + if (selected_definition == null) + selected_definition = definitions.FirstOrDefault(); + }), _model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(meta => { _persisted_meta = meta; definitions_view.Refresh(); }), - ObservableAutoWrapper.connect(observe_selected().Select(t => t.template?.edit_pane_visual_states ?? t.definition?.edit_pane_visual_states ?? new ObservableCollection()), content_visual_states), - observe_selected().SelectManyInSeries(t => t.template?.observe_is_dirty() ?? t.definition?.subscribe_is_definition_or_any_templates_dirty() ?? Observable.Return(false)).OnDispatcher() + ObservableAutoWrapper.connect(subscribe_definition().Select(def => def?.edit_pane_visual_states ?? new ObservableCollection()), content_visual_states), + subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false)).OnDispatcher() .Subscribe(new CompositeObserver(save_cmd, revert_cmd) { val => { _save_cmd_tooltip.refresh(); _revert_cmd_tooltip.refresh(); @@ -85,47 +88,30 @@ namespace mbts.spark { ObservableAutoWrapper.connect_item_hooks(definitions, d => new CompositeDisposable(_any_dirty_monitor.join(d), d), true)); // local methods string get_revert_tooltip() { - if (content_source is AlgoDefinitionTemplateVM tmp) { - switch (tmp.key.mode) { - case AlgoKey.Mode.Persisted: return tmp.is_dirty ? $"Revert changes to '{tmp.name}'" : "No changes to revert"; - } - } else if (content_source is AlgoDefinitionVM def) { - switch (def.key.mode) { - case AlgoKey.Mode.Persisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Revert changes to '{def.name}' templates" : "No changes to revert"; - } - } - return null; + var def = selected_definition; + return def != null && def.key.mode == AlgoKey.Mode.Persisted ? + (def.is_dirty ? $"Revert changes to '{def.name}' templates" : "No changes to revert") : + null; } async Task save_async(IAlgoStudioContentVM content) { - if (content is AlgoDefinitionTemplateVM tmp) { - await save_template(tmp); - } else if (content is AlgoDefinitionVM def) { + if (content is AlgoDefinitionVM def) await save_definition(def); - } } string get_save_tooltip() { - if (content_source is AlgoDefinitionTemplateVM tmp) { - switch (tmp.key.mode) { - case AlgoKey.Mode.Unpersisted: return tmp.is_dirty ? $"Save '{tmp.name}'" : $"Cannot Save '{tmp.name}'"; - case AlgoKey.Mode.Persisted: return tmp.is_dirty ? $"Save changes to '{tmp.name}'" : "No changes to save"; - } - } else if (content_source is AlgoDefinitionVM def) { + var def = selected_definition; + if (def != null) { switch (def.key.mode) { - case AlgoKey.Mode.Unpersisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'"; - case AlgoKey.Mode.Persisted: return def.is_dirty || def.templates.Any(t => t.is_dirty) ? $"Save changes to '{def.name}' templates" : "No changes to save"; + case AlgoKey.Mode.Unpersisted: return def.is_dirty ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'"; + case AlgoKey.Mode.Persisted: return def.is_dirty ? $"Save changes to '{def.name}' templates" : "No changes to save"; } } return null; } } - event Action<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)> _selected_changed; - public ObservableCollection definitions => _definitions; public ObservableCollection content_visual_states { get; } = new ObservableCollection(); public AlgoDefinitionVM selected_definition { get => _selected_definition.Value; set => _selected_definition.set(value); } - public AlgoDefinitionTemplateVM selected_template { get => _selected_template.Value; set => _selected_template.set(value); } - public IAlgoStudioContentVM content_source => (IAlgoStudioContentVM)selected_template ?? selected_definition; public IAlgoVM editable_content => _editable_content.Value; public ICollectionView definitions_view => _definitions_view; public ICommand save_cmd { get; } @@ -150,12 +136,6 @@ namespace mbts.spark { public StartupData create() => new StartupData(); public void load_from(StartupData state) { } public IObservable subscribe_definition() => _selected_definition.observe_current(true); - public IObservable subscribe_template() => _selected_template.observe_current(true); - public IObservable<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)> observe_selected() => - Observable.Create<(AlgoDefinitionVM definition, AlgoDefinitionTemplateVM template)>(o => { - _selected_changed += o.OnNext; - return Disposable.Create(() => _selected_changed -= o.OnNext); - }); public IObservable subscribe_dirty() => _any_dirty_monitor; public async Task remove_definition(AlgoDefinitionVM definition) { @@ -163,87 +143,43 @@ namespace mbts.spark { await _model.algo_model.remove_definition(definition.key); } else { // This is a new definition, which hasn't been saved/persisted yet. No need to call the server. - definition.templates.Clear(); definitions.Remove(definition); } } - public async Task remove_template(AlgoDefinitionTemplateVM template) { - if (template.key.mode == AlgoKey.Mode.Persisted) { - await _model.algo_model.remove_template(template.key); - } else { - // This is a new template, which hasn't been saved/persisted yet. No need to call the server. - template.owner.templates.Remove(template); - } - } + public Task save_definition(AlgoDefinitionVM definition) => + _save(new[] { definition }); - public async Task save_definition(AlgoDefinitionVM definition) { - using (_save_op()) { - var newly_persisted_keys = await AlgoPersistenceHelper.persist_definition(_model, _definitions, definition); - AlgoKey pkey; - switch (definition.key.mode) { - case AlgoKey.Mode.Unpersisted: - if (!newly_persisted_keys.TryGetValue(definition.key, out pkey)) - return; - break; - case AlgoKey.Mode.Persisted: - pkey = definition.key; - break; - default: return; - } - await _model.algo_model.metadata_service.update_metadata(pkey, _ => definition.create_metadata().with(id: pkey)); - } - } + public Task save_all() => + _save(definitions); - public async Task save_template(AlgoDefinitionTemplateVM template) { - using (_save_op()) - await AlgoPersistenceHelper.persist_template(_model, _definitions, template); - } - - public async Task save_all() => - await _save(definitions.WrapSelector(def => (def, def.templates.AsList()), t => t.def)); - - async Task _save(IList<(AlgoDefinitionVM definition, IList templates)> definition_templates) { - using (_save_op()) - await AlgoPersistenceHelper.persist(_model, definition_templates); - } - - IDisposable _save_op() { - int? def_index = selected_definition == null ? (int?)null : _definitions.IndexOf(selected_definition); - int? tmp_index = selected_template == null ? (int?)null : selected_definition.templates.IndexOf(selected_template); - return new CompositeDisposable(_definitions_update_buffer.buffer_updates()) { - () => { - if (def_index.HasValue) { - var def = _definitions[def_index.Value]; - if (tmp_index.HasValue) { - var tmp = def.templates[tmp_index.Value]; - tmp.is_selected = true; - } else def.is_selected = true; + async Task _save(IEnumerable definitions) { + var orig_selected = selected_definition; + var orig_selected_index = orig_selected == null ? -1 : this.definitions.IndexOf(orig_selected); + using (_definitions_update_buffer.buffer_updates()) { + var def_list = definitions as IList ?? definitions.ToList(); + await Task.WhenAll(definitions.Select(async d => { + var def = await _model.algo_model.save_definition(d.create_algo_def()); + if (def.HasValue) { + // don't forget to save metadata + await _model.algo_model.metadata_service.update_metadata(def.Value.key, _ => d.create_metadata().with(def.Value.key)); } - } - }; - } - - /// Despite the existence of these properties: , and , - /// still implements to update the properties that depend on the . - /// [John]I am going to Uganda in 3 days (today is 1/3/2019), and decided against removing this legacy-dependency at the last minute. - /// Fwiw, and are bound to . - /// They serve to prevent a quirky default behavior in TreeView: double clicking any TreeViewItem collapses the entire TreeView. - /// This behavior wasn't just quirky either, it actually conflicted with the double-click-to-set-template-as-default behavior. - /// (for details, ) - void IHandleSelectedItemChanged.on_selected_item_changed(object old_value, object new_value) { - if (new_value is AlgoDefinitionVM def) { - selected_definition = def; - selected_template = null; - } else if (new_value is AlgoDefinitionTemplateVM templ) { - selected_definition = templ.owner; - selected_template = templ; - } else { - selected_definition = null; - selected_template = null; + return def; + })).ContinueOnDispatcher(t => { + if (t.Status != TaskStatus.RanToCompletion) { + Log.Ui.debug_fatal($"Algo Studio error saving definitions: unexpected Task.Status '{t.Status}'."); + return; + } + var persisted_data = t.Result; + Log.assert(persisted_data.Length == def_list.Count); + for (int i = 0; i < persisted_data.Length; i++) { + if (!def_list[i].key.is_persisted && persisted_data[i].HasValue) + _definitions.Replace(def_list[i].key, def_list[i].to_persisted(persisted_data[i].Value)); + } + if (selected_definition != orig_selected && orig_selected_index >= 0 && orig_selected_index < this.definitions.Count) + selected_definition = this.definitions[orig_selected_index]; + }); } - _selected_changed?.Invoke((selected_definition, selected_template)); - RaisePropertyChanged(nameof(content_source)); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 82e95beb8..00c27f954 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -136,7 +136,7 @@ namespace mbts.spark { c.PropertyChanged -= on_prop_changed; } AccountTuple? account_factory(KeyValuePair kv) => new AccountTuple(kv.Key, kv.Value); - AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data, false); + AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data); } public event Action result_changed; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 7dc1fb12a..5411de8cf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -318,14 +318,13 @@ namespace mbts.spark { }), // custom templates (created by user) _model.algo_model.definitions.OnDispatcher().Subscribe(u => - AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_factory(true))))); + AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_algo_def_vm)))); // vm factory - Func mk_factory(bool connect) => - fd => { - var vm = AlgoDefinitionVM.create(_model, fd, connect, OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase), AlgoEditingPermissions.AllowEditValues); - vm.selected_format = OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase); - return vm; - }; + AlgoDefinitionVM mk_algo_def_vm(AlgoData fd) { + var vm = AlgoDefinitionVM.create(_model, fd, OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase), AlgoEditingPermissions.AllowEditValues); + vm.selected_format = OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase); + return vm; + } } void on_end_attaching() => Disposable.dispose(ref attach_vm_hooks); diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 81354eae0..27ecfe045 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -52,7 +52,6 @@ namespace mbts.spark { class OrderPropertiesEditorVM : DisposableViewModelBase { readonly OrdersModel _model; readonly Property _security; - readonly Property _selected_algo_template, _selected_favorite_algo_template; readonly SelectorProperty _accounts; readonly SelectorProperty _time_in_force; readonly SelectionModel _selected_algo_definition; @@ -60,8 +59,6 @@ namespace mbts.spark { readonly ObservableKeyedCollection _algo_definitions = new ObservableKeyedCollection(d => d.key); readonly ListCollectionView _algo_definitions_view, _favorite_algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); - readonly EditableCollectionModel _algo_template_collection_model; - readonly ObservableKeyedCollection _favorite_templates = new ObservableKeyedCollection(tvm => tvm.key); readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); @@ -74,7 +71,6 @@ namespace mbts.spark { var security_source = security_md_source.Select(smd => smd.security); _security = backing(nameof(security), security_source, SecurityDataHelper.Defaults.SecurityImmutable); security_source = _security.observe_current(true); - _selected_algo_template = backing(nameof(selected_algo_template)); _selected_algo_definition = new SelectionModel(algo_definitions, () => { var t = _model.factory.default_order_type(security); @@ -131,29 +127,8 @@ namespace mbts.spark { order_properties.Select(ops => ops.time_in_force), () => model.factory.default_time_in_force(security), tif => time_in_forces.Contains(tif)); - _selected_favorite_algo_template = backing(nameof(selected_favorite_algo_template)); - // items source views - algo_templates_view = CollectionViewSource.GetDefaultView(algo_templates); - var favorite_algo_templates_view = new ListCollectionView(ObservableAggregateCollection.create(_algo_definitions.AsCollection(), d => d.templates)); - favorite_algo_templates_view.LiveGroupingProperties.Add(nameof(AlgoDefinitionTemplateVM.owner_key)); - favorite_algo_templates_view.LiveFilteringProperties.Add(nameof(AlgoDefinitionTemplateVM.is_favorite)); - favorite_algo_templates_view.Filter = item => (item as AlgoDefinitionTemplateVM)?.is_favorite ?? false; - favorite_algo_templates_view.IsLiveFiltering = true; - this.favorite_algo_templates_view = favorite_algo_templates_view; // commands save_definition_cmd = new AsyncCommand(save_definition_async); - save_template_cmd = new AsyncCommand(save_template_async); - remove_template_cmd = new AsyncCommand(tvm => _model.algo_model.remove_template(tvm.key)); - toggle_is_favorite_cmd = new DelegateCommand(tvm => _favorite_templates.Add(tvm)); - _algo_template_collection_model = new EditableCollectionModel(d => selected_algo_definition == null ? default : selected_algo_definition.template_factory(), d => d != null); - redo_cmd = ObservantCommand.create( - t => t?.redo(), - t => t == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => t.can_redo_changed += cb, cb => t.can_redo_changed -= cb, () => t.can_redo).OnDispatcher(), - out IObserver redo_observer); - undo_cmd = ObservantCommand.create( - t => t?.undo(), - t => t == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => t.can_undo_changed += cb, cb => t.can_undo_changed -= cb, () => t.can_undo).OnDispatcher(), - out IObserver undo_observer); undo_definition_cmd = ObservantCommand.create( d => d?.undo(), d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(), @@ -186,31 +161,10 @@ namespace mbts.spark { algo_params_dirty_mon.Subscribe(set_default_algo_params_observer, revert_algo_params_observer), ObservableAutoWrapper.connect_item_hooks(_algo_param_rows, algo_params_dirty_mon.join), _selected_algo_definition.subscribe_changed(_selected_algo_definition_Changed), - as_demuxer().subscribe(nameof(selected_algo_template)).Subscribe( - undo_observer, - redo_observer), as_demuxer().subscribe(nameof(selected_algo_definition)).Subscribe( undo_definition_observer, redo_definition_observer, revert_definition_observer), - algo_definitions.Subscribe((s, e) => { - if (e.OldItems != null) - e.OldItems.OfType().DisposeAll(); - if (e.NewItems != null) { - foreach (AlgoDefinitionVM d in e.NewItems) { - switch (d.key.mode) { - case AlgoKey.Mode.Persisted: - if (_model.algo_model.ui_configuration.include_custom_templates && _model.algo_model.templates_enabled()) - d.prepend_custom_template(); - break; - case AlgoKey.Mode.Factory: - if (_model.algo_model.ui_configuration.include_legacy_custom_templates && _model.algo_model.templates_enabled()) - d.prepend_custom_template(); - break; - } - } - } - }), security_md_source.Select(smd => model.factory.default_algos(smd.security)).Table(s => s.key).Subscribe(factory_defs => { using (_selected_algo_definition.begin_update()) AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, factory_defs, fd => { @@ -222,43 +176,41 @@ namespace mbts.spark { model.algo_model.definitions.Subscribe(_definitions_buffer), _definitions_buffer.OnDispatcher().Subscribe(u => { AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, u, def_data => { - var def_vm = AlgoDefinitionVM.create(model, def_data, true, OrderDataHelper.get_algo_format(security.ContractCase), AlgoEditingPermissions.AllowEditValues); + var def_vm = AlgoDefinitionVM.create(model, def_data, OrderDataHelper.get_algo_format(security.ContractCase), AlgoEditingPermissions.AllowEditValues); def_vm.selected_format = OrderDataHelper.get_algo_format(security.ContractCase); def_vm.favorite_index = _get_favorite_algo_index(def_vm.key); return def_vm; }); - }), + }), model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(_on_template_metadata), ObservableAutoWrapper.connect_item_hooks(algo_definitions, vm => - Disposable.Create( - vm.connect_data(nullable_security_md_source), - security_source.Subscribe(s => { - var fmt = OrderDataHelper.get_algo_format(s.ContractCase); - foreach (var d in algo_definitions) - d.selected_format = fmt; - }), - vm), true)) { - () => { - Disposable.dispose(ref _template_collection_sync); - Disposable.dispose(ref _algo_param_rows_hook); - } + Disposable.Create( + vm.connect_data(nullable_security_md_source), + security_source.Subscribe(s => { + var fmt = OrderDataHelper.get_algo_format(s.ContractCase); + foreach (var d in algo_definitions) + d.selected_format = fmt; + }), + vm), + true)) { + () => Disposable.dispose(ref _algo_param_rows_hook) }; // local methods - async Task save_template_async(AlgoDefinitionTemplateVM template) { - using (_preserve_selection_by_index()) - await AlgoPersistenceHelper.persist_template(model, algo_definitions, template); - } async Task save_definition_async(AlgoDefinitionVM definition) { switch (definition.key.mode) { case AlgoKey.Mode.Persisted: - await AlgoPersistenceHelper.persist_definition(model, algo_definitions, definition); + using (_definitions_buffer.buffer_updates()) + await _model.algo_model.save_definition(definition.create_algo_def()); break; case AlgoKey.Mode.Factory: case AlgoKey.Mode.Unpersisted: using (_definitions_buffer.buffer_updates()) { - var persisted_key_lookup = await AlgoPersistenceHelper.persist_definition(model, algo_definitions, definition); - if (persisted_key_lookup.TryGetValue(definition.key, out AlgoKey pkey) && _algo_definitions.TryGetValue(pkey, out AlgoDefinitionVM pdef)) - selected_algo_definition = pdef; + var persisted_def = await model.algo_model.save_definition(definition.create_algo_def()); + if (persisted_def.HasValue) { + int pos = algo_definitions.IndexOf(definition); + if (pos >= 0) + selected_algo_definition = algo_definitions[pos] = definition.to_persisted(persisted_def.Value); + } if (definition.key.mode == AlgoKey.Mode.Factory) { /// Revert the factory definition to its original state. /// Note: this won't revert the parameters in the algo popup since the newly persisted definition () is selected now. @@ -283,32 +235,19 @@ namespace mbts.spark { new InlineUserProperty(); } - IDisposable _template_collection_sync; void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) { - Disposable.dispose(ref _template_collection_sync); Disposable.dispose(ref _algo_param_rows_hook); if (new_value != null) { - _template_collection_sync = ObservableAutoWrapper.connect_two_way(new_value.templates_with_custom, algo_templates); if (use_algo_param_grid) _algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows); if (reason != SelectionReason.Explicit) _selected_algo_stack.Push(new_value.key); - } else { - algo_templates.Clear(); } if (open_algo_popup_on_select) { if (reason == SelectionReason.UserSelectedNewValue && new_value?.algo_root is IAlgoVM ar && ar.can_expand) ar.is_expanded = true; } - if (selected_algo_template == null && _model.algo_model.templates_enabled()) { - if (new_value != null) - selected_algo_template = new_value.templates.FirstOrDefault(tvm => tvm.is_default, tvm => _favorite_templates.ContainsKey(tvm.key), tvm => true) ?? new_value.templates_with_custom.FirstOrDefault(); - } else { - RaisePropertyChanged(nameof(selected_algo_template)); - } RaisePropertyChanged(nameof(selected_algo_definition), nameof(selected_favorite_algo_definition), nameof(can_expand), nameof(is_expanded)); - _selected_favorite_algo_template.Value = selected_algo_template is AlgoDefinitionTemplateVM t && t.is_favorite ? t : null; - _algo_template_collection_model.OnNext(new_value); } public SecurityImmutable security => _security.Value; @@ -316,7 +255,6 @@ namespace mbts.spark { public AccountTuple? selected_account { get => _accounts.selected_item; set => _accounts.selected_item = value; } public ReadOnlyObservableCollection time_in_forces => _time_in_force.items; public TimeInForce selected_time_in_force { get => _time_in_force.selected_item; set => _time_in_force.selected_item = value; } - public CustomOrderDefinitionImmutable? definition => selected_algo_template?.algo_root?.definition; public int favorite_algos_column_count { get => _favorite_algos_column_count; private set => Set(ref _favorite_algos_column_count, value); } public bool use_algo_param_grid { get => _use_algo_param_grid; @@ -331,47 +269,14 @@ namespace mbts.spark { } // items sources public ObservableCollection algo_definitions => _algo_definitions; - public ObservableCollection algo_templates { get; } = new ObservableCollection(); public IReadOnlyObservableCollection algo_param_rows => _algo_param_rows; public ICollectionView algo_definitions_view => _algo_definitions_view; public ICollectionView favorite_algo_definitions_view => _favorite_algo_definitions_view; - public ICollectionView algo_templates_view { get; } - public ICollectionView favorite_algo_templates_view { get; } // selected items public AlgoDefinitionVM selected_algo_definition { get => _selected_algo_definition.selected_item; set => _selected_algo_definition.selected_item = value; } - public AlgoDefinitionTemplateVM selected_algo_template { - get => selected_algo_definition?.selected_template; - set { - if (value != selected_algo_template) { - if (value == null) { - if (selected_algo_definition != null) - selected_algo_definition.selected_template = null; - _selected_favorite_algo_template.set(null); - } else { - value.owner.selected_template = value; - _selected_algo_definition.select_explicit(value.owner); // idempotent - _selected_favorite_algo_template.Value = value.is_favorite ? value : null; // idempotent - } - RaisePropertyChanged(); - } - } - } - public AlgoDefinitionTemplateVM selected_favorite_algo_template { - get => _selected_favorite_algo_template.Value; - set { - if (_selected_favorite_algo_template.set_new(value)) { - if (value != null) { - value.owner.selected_template = value; - if (value.owner != selected_algo_definition) - _selected_algo_definition.select_explicit(value.owner); - RaisePropertyChanged(nameof(selected_algo_template)); - } - } - } - } public AlgoDefinitionVM selected_favorite_algo_definition { get => selected_algo_definition?.is_favorite ?? false ? selected_algo_definition : null; set { @@ -403,13 +308,10 @@ namespace mbts.spark { public ICommand revert_definition_cmd { get; } public ICommand set_default_algo_params_cmd { get; } public ICommand revert_algo_params_cmd { get; } - public ICommand undo_cmd { get; } - public ICommand redo_cmd { get; } public ICommand undo_definition_cmd { get; } public ICommand redo_definition_cmd { get; } public ICommand remove_template_cmd { get; } public ICommand toggle_is_favorite_cmd { get; } - public IEditableCollectionModel algo_template_collection_model => _algo_template_collection_model; public IObservable observe_account(bool start_immediately = false) => _accounts.observe_current(start_immediately); @@ -418,9 +320,7 @@ namespace mbts.spark { _time_in_force.observe_current(start_immediately); public IObservable observe_order_type(bool start_immediately = false) => - _model.algo_model.templates_enabled() ? - _selected_algo_template.observe_current(start_immediately).Select(t => t?.algo_root) : - _selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root); + _selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root); public OrderDefinition create(Side side) { if (HasErrors) @@ -428,25 +328,21 @@ namespace mbts.spark { var order = _model.factory.order(security, selected_account); order.TimeInForce = selected_time_in_force; order.Side = side; - if (_model.algo_model.templates_enabled()) { - selected_algo_template.algo_root.assign_to(order.CustomDef); - } else { - var algo = new CustomOrderDefinition(); - selected_algo_definition.algo_root.assign_to(algo); - switch (selected_algo_definition.key.mode) { - case AlgoKey.Mode.Persisted: - order.CustomDef = new CustomOrderDefinition { - Composite = new CompositeOrderDefinition { - AlgoTemplateKey = selected_algo_definition.key.persisted.id_uint, - Definition = algo - } - }; - selected_algo_definition.algo_root.assign_to(order.CustomDef.Composite.Definition); - break; - default: - order.CustomDef = algo; - break; - } + var algo = new CustomOrderDefinition(); + selected_algo_definition.algo_root.assign_to(algo); + switch (selected_algo_definition.key.mode) { + case AlgoKey.Mode.Persisted: + order.CustomDef = new CustomOrderDefinition { + Composite = new CompositeOrderDefinition { + AlgoTemplateKey = selected_algo_definition.key.persisted.id_uint, + Definition = algo + } + }; + selected_algo_definition.algo_root.assign_to(order.CustomDef.Composite.Definition); + break; + default: + order.CustomDef = algo; + break; } return order; } @@ -458,10 +354,6 @@ namespace mbts.spark { _favorite_algos_index = value.favorite_algos.Select((v, i) => (v, i)).ToDictionaryCrushed(t => t.v, t => t.i); foreach (var d in algo_definitions) { d.favorite_index = _get_favorite_algo_index(d.key); - foreach (var t in d.templates) { - if (t.key.mode == AlgoKey.Mode.Persisted) - t.is_favorite = _favorite_algos_index.ContainsKey(t.key); - } } favorite_algos_column_count = value.column_count; } @@ -479,29 +371,7 @@ namespace mbts.spark { void _on_template_metadata(IReadOnlyDictionary meta) { _algo_metadata = meta; - var curr_selected_template = selected_algo_template; - if (curr_selected_template?.is_favorite ?? false) - selected_favorite_algo_template = curr_selected_template; algo_definitions_view.Refresh(); } - - // This preserves the selected items through a save op. - // When a definition/template is persisted for the first time, its unpersisted-placeholder item is removed and replaced with a new persisted one. - // If an unpersisted item is selected when it is removed, the view will automatically select null - this method is a workaround for that. - IDisposable _preserve_selection_by_index() { - (int? selected_def_index, int? selected_tmp_index) = AlgoPersistenceHelper.selection_snapshot(algo_definitions, selected_algo_definition, selected_algo_template); - return new CompositeDisposable(_definitions_buffer.buffer_updates()) { - () => { - if (selected_def_index is int di && algo_definitions.check_index(di)) { - var def = algo_definitions[di]; - if (selected_tmp_index is int ti && def.templates.check_index(ti)) { - selected_algo_template = def.templates[ti]; - } else { - selected_algo_definition = def; - } - } - } - }; - } } } diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index a3b82fee1..ffde55bfd 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -55,14 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -378,36 +188,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml.cs b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml.cs index 5aff7d5e5..cd208a10b 100644 --- a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml.cs +++ b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml.cs @@ -1,16 +1,7 @@ using mbts.spark; -using mbts.ui.controls; -using mbts.ui.converters; -using mbts.ui.extensions; using mbts.ui.utility; -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Linq; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Input; namespace mbts.ui.spark.algo { @@ -18,51 +9,6 @@ namespace mbts.ui.spark.algo { /// Interaction logic for AlgoTemplateToolBar.xaml /// class AlgoTemplateToolBar : HeaderedItemsControl { - // The Favorites toggle button exists in 2 forms: as a MenuItem in AlgoTemplateToolBar, and as a ToggleButton in AlgoStudioView - // The const strings below are used to store this text in 1 place. - public const string - AddToFavoritesToolTip = "Add to Favorites", - RemoveFromFavoritesToolTip = "Remove from Favorites"; - - public static readonly IValueConverter FavoriteToggleButtonToolTipConverter = - ValueConverter.create(is_checked => is_checked ? RemoveFromFavoritesToolTip : AddToFavoritesToolTip); - - public static readonly RoutedUICommand - BeginAddNewCommand = new RoutedUICommand("Add New Template", "Add New", typeof(AlgoTemplateToolBar)), - BeginSaveCommand = new RoutedUICommand("Save Template", "Save", typeof(AlgoTemplateToolBar)), - BeginSaveDefinitionCommand = new RoutedUICommand("Save Definition", "Save", typeof(AlgoTemplateToolBar)), - BeginSaveAsCommand = new RoutedUICommand("Save Template As", "Save As", typeof(AlgoTemplateToolBar)), - BeginSaveDefinitionAsCommand = new RoutedUICommand("Save Definition As", "Save As", typeof(AlgoTemplateToolBar)), - BeginRevertCommand = new RoutedUICommand("Revert to Template", "Revert", typeof(AlgoTemplateToolBar)), - BeginRevertDefinitionCommand = new RoutedUICommand("Revert to Definition", "Revert", typeof(AlgoTemplateToolBar)), - BeginRedoCommand = new RoutedUICommand("Redo", "Redo", typeof(AlgoTemplateToolBar)), - BeginUndoCommand = new RoutedUICommand("Undo", "Undo", typeof(AlgoTemplateToolBar)), - BeginRedoDefinitionCommand = new RoutedUICommand("Redo Definition", "Redo Definition", typeof(AlgoTemplateToolBar)), - BeginUndoDefinitionCommand = new RoutedUICommand("Undo Definition", "Undo Definition", typeof(AlgoTemplateToolBar)), - BeginRemoveCommand = new RoutedUICommand("Delete Template", "Delete", typeof(AlgoTemplateToolBar)), - BeginToggleFavoriteCommand = new RoutedUICommand("Toggle Favorite", "Toggle Favorite", typeof(AlgoTemplateToolBar)); - - public static readonly ExecutedRoutedEventHandler - BeginAddNewExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._add_new()), - BeginSaveExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._save()), - BeginSaveDefinitionExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._save_definition()), - BeginSaveAsExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._save_as()), - BeginSaveDefinitionAsExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._save_definition_as()), - BeginRevertExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._revert()), - BeginRevertDefinitionExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._revert_definition()), - BeginRedoExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._redo()), - BeginUndoExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._undo()), - BeginRedoDefinitionExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._redo_definition()), - BeginUndoDefinitionExecuted = WPFHelper.create_cmd_executed((tb, _) => tb._undo_definition()), - BeginRemoveExecuted = WPFHelper.create_cmd_executed((tb, t) => tb._remove(t)), - BeginToggleFavoriteExecuted = WPFHelper.create_cmd_executed((tb, param) => tb.ToggleFavoriteCommand.TryExecuteIfCan(param)); - - ComboBox _templates_combo; - EditableTextBlock _definition_name_text; - IDisposable _input_hooks; - // this is a casted backing for 'Items' - IEditableCollectionViewAddNewItem _editable_items; - static AlgoTemplateToolBar() => DefaultStyleKeyProperty.OverrideMetadata(typeof(AlgoTemplateToolBar), new FrameworkPropertyMetadata(typeof(AlgoTemplateToolBar))); @@ -73,37 +19,6 @@ namespace mbts.ui.spark.algo { VisualStateNames.apply_all(this); } - #region ShowTemplatesDropDown - public static readonly DependencyProperty ShowTemplatesDropDownProperty = - WPFHelper.create_dp( - nameof(ShowTemplatesDropDown), - (o, v) => { - string dropdown_state, rename_state; - if (v) { - dropdown_state = VisualStateNames.TemplatesDropDown.Active; - rename_state = VisualStateNames.RenameTemplate.Active; - } else { - dropdown_state = VisualStateNames.TemplatesDropDown.Inactive; - rename_state = VisualStateNames.RenameTemplate.Inactive; - } - o._vsm.set_state(VisualStateNames.TemplatesDropDown.GroupName, dropdown_state); - o._vsm.set_state(VisualStateNames.RenameTemplate.GroupName, rename_state); - }, - coerce_require_persisted); - - public bool ShowTemplatesDropDown { get => (bool)GetValue(ShowTemplatesDropDownProperty); set => SetValue(ShowTemplatesDropDownProperty, value); } - #endregion - - #region ShowToggleFavorite - public static readonly DependencyProperty ShowToggleFavoriteProperty = - WPFHelper.create_dp( - nameof(ShowToggleFavorite), - (o, v) => VisualStateNames.ToggleFavorite.apply(o._vsm, v), - coerce_require_persisted); - - public bool ShowToggleFavorite { get => (bool)GetValue(ShowToggleFavoriteProperty); set => SetValue(ShowToggleFavoriteProperty, value); } - #endregion - #region ShowDefinitionName public static readonly DependencyProperty ShowDefinitionNameProperty = WPFHelper.create_dp(nameof(ShowDefinitionName)); @@ -130,16 +45,6 @@ namespace mbts.ui.spark.algo { public bool ShowRevertDefinition { get => (bool)GetValue(ShowRevertDefinitionProperty); set => SetValue(ShowRevertDefinitionProperty, value); } #endregion - #region ShowRenameDefinition - public static readonly DependencyProperty ShowRenameDefinitionProperty = - WPFHelper.create_dp( - nameof(ShowRenameDefinition), - (o, v) => VisualStateNames.RenameDefinition.apply(o._vsm, v), - coerce_require_persisted); - - public bool ShowRenameDefinition { get => (bool)GetValue(ShowRenameDefinitionProperty); set => SetValue(ShowRenameDefinitionProperty, value); } - #endregion - #region ShowSaveDefinition public static readonly DependencyProperty ShowSaveDefinitionProperty = WPFHelper.create_dp( @@ -154,7 +59,6 @@ namespace mbts.ui.spark.algo { public static readonly DependencyProperty DefinitionProperty = WPFHelper.create_dp(nameof(Definition), (o, v) => { - o.CoerceValue(ShowRenameDefinitionProperty); o.CoerceValue(ShowSaveDefinitionProperty); //o.CoerceValue(ShowRevertDefinitionProperty); o.CoerceValue(ShowUndoRedoButtonsProperty); @@ -163,51 +67,6 @@ namespace mbts.ui.spark.algo { public AlgoDefinitionVM Definition { get => GetValue(DefinitionProperty) as AlgoDefinitionVM; set => SetValue(DefinitionProperty, value); } #endregion - #region SelectedItem - public static readonly DependencyProperty SelectedItemProperty = - WPFHelper.create_dp( - nameof(SelectedItem), - FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, - (o, oldval, newval) => { - // TODO: consider an alternate solution to the problem here, subscribing to PropertyChanged for 1 property feels a little hackey. - // We could make IsEdited a non-readonly dp, and just bind to SelectedItem.is_edited; however, this compromises the AlgoTemplateToolBar's public interface bc the concept this value represents is not ambiguous. - // IsEdited always means 1 thing: the SelectedItem's (algo-template) order-definition is 'dirty' - different from the values currently in the OrderPropertiesEditor. - // The reason this is useful: - /// When the algo template becomes dirty (which is easy to tell via a dpchanged callback), we call . - /// Then, in any subsequent Save/SaveAs Executed callbacks, we check if an item is currently being edited (). - /// If that is true, we update the IAlgoTemplateItem's order-definition (). - /// - if (oldval is INotifyPropertyChanged oldnpc) oldnpc.PropertyChanged -= o._on_SelectedItem_PropertyChanged; - if (newval is INotifyPropertyChanged newnpc) newnpc.PropertyChanged += o._on_SelectedItem_PropertyChanged; - o.CoerceValue(IsEditedProperty); - }); - - void _on_SelectedItem_PropertyChanged(object sender, PropertyChangedEventArgs e) { - if (e.PropertyName == nameof(AlgoDefinitionTemplateVM.is_dirty)) - CoerceValue(IsEditedProperty); - } - - public AlgoDefinitionTemplateVM SelectedItem { get => GetValue(SelectedItemProperty) as AlgoDefinitionTemplateVM; set => SetValue(SelectedItemProperty, value); } - #endregion - - #region EditableCollectionModel - public static readonly DependencyProperty EditableCollectionModelProperty = - WPFHelper.create_dp, AlgoTemplateToolBar>(nameof(EditableCollectionModel)); - public IEditableCollectionModel EditableCollectionModel { get => GetValue(EditableCollectionModelProperty) as IEditableCollectionModel; set => SetValue(EditableCollectionModelProperty, value); } - #endregion - - #region AddNew - public static readonly DependencyProperty AddNewCommandProperty = - WPFHelper.create_dp(nameof(AddNewCommand)); - public ICommand AddNewCommand { get => GetValue(AddNewCommandProperty) as ICommand; set => SetValue(AddNewCommandProperty, value); } - #endregion - - #region Save - public static readonly DependencyProperty SaveCommandProperty = - WPFHelper.create_dp(nameof(SaveCommand)); - public ICommand SaveCommand { get => GetValue(SaveCommandProperty) as ICommand; set => SetValue(SaveCommandProperty, value); } - #endregion - #region SaveDefinition public static readonly DependencyProperty SaveDefinitionCommandProperty = WPFHelper.create_dp(nameof(SaveDefinitionCommand)); @@ -220,36 +79,12 @@ namespace mbts.ui.spark.algo { public ICommand SetDefaultsCommand { get => GetValue(SetDefaultsCommandProperty) as ICommand; set => SetValue(SetDefaultsCommandProperty, value); } #endregion - #region Revert - public static readonly DependencyProperty RevertCommandProperty = - WPFHelper.create_dp(nameof(RevertCommand)); - public ICommand RevertCommand { get => GetValue(RevertCommandProperty) as ICommand; set => SetValue(RevertCommandProperty, value); } - #endregion - #region RevertDefinition public static readonly DependencyProperty RevertDefinitionCommandProperty = WPFHelper.create_dp(nameof(RevertDefinitionCommand)); public ICommand RevertDefinitionCommand { get => GetValue(RevertDefinitionCommandProperty) as ICommand; set => SetValue(RevertDefinitionCommandProperty, value); } #endregion - #region Remove - public static readonly DependencyProperty RemoveCommandProperty = - WPFHelper.create_dp(nameof(RemoveCommand)); - public ICommand RemoveCommand { get => GetValue(RemoveCommandProperty) as ICommand; set => SetValue(RemoveCommandProperty, value); } - #endregion - - #region Undo - public static readonly DependencyProperty UndoCommandProperty = - WPFHelper.create_dp(nameof(UndoCommand)); - public ICommand UndoCommand { get => GetValue(UndoCommandProperty) as ICommand; set => SetValue(UndoCommandProperty, value); } - #endregion - - #region Redo - public static readonly DependencyProperty RedoCommandProperty = - WPFHelper.create_dp(nameof(RedoCommand)); - public ICommand RedoCommand { get => GetValue(RedoCommandProperty) as ICommand; set => SetValue(RedoCommandProperty, value); } - #endregion - #region UndoDefinition public static readonly DependencyProperty UndoDefinitionCommandProperty = WPFHelper.create_dp(nameof(UndoDefinitionCommand)); @@ -262,33 +97,6 @@ namespace mbts.ui.spark.algo { public ICommand RedoDefinitionCommand { get => GetValue(RedoDefinitionCommandProperty) as ICommand; set => SetValue(RedoDefinitionCommandProperty, value); } #endregion - #region ToggleFavorite - public static readonly DependencyProperty ToggleFavoriteCommandProperty = - WPFHelper.create_dp(nameof(ToggleFavoriteCommand)); - public ICommand ToggleFavoriteCommand { get => GetValue(ToggleFavoriteCommandProperty) as ICommand; set => SetValue(ToggleFavoriteCommandProperty, value); } - #endregion - - #region ToggleFavorite Parameter - public static readonly DependencyProperty ToggleFavoriteCommandParameterProperty = - WPFHelper.create_dp(nameof(ToggleFavoriteCommandParameter)); - public object ToggleFavoriteCommandParameter { get => GetValue(ToggleFavoriteCommandParameterProperty); set => SetValue(ToggleFavoriteCommandParameterProperty, value); } - #endregion - - #region IsEdited - /// - /// This property indicates whether or not the order definition held by the is 'dirty' - different from the one that would be created by the OrderPropertiesEditor at this time. - /// When it becomes dirty, we call . This leads the viewmodel to take a snapshot of its current state, - /// so in the event that another template is selected, or the values in the OrderPropertiesEditor are reverted, we can snap everything back into place by calling - /// - static readonly DependencyPropertyKey IsEditedPropertyKey = - WPFHelper.create_ro_dp( - nameof(IsEdited), - null, - (o, v) => o.SelectedItem is AlgoDefinitionTemplateVM t && t.is_dirty && !t.is_custom_placeholder); - internal static readonly DependencyProperty IsEditedProperty = IsEditedPropertyKey.DependencyProperty; - internal bool IsEdited { get => (bool)GetValue(IsEditedProperty); private set => SetValue(IsEditedPropertyKey, value); } - #endregion - #region IsEditing public static readonly DependencyProperty IsEditingProperty = WPFHelper.create_dp(nameof(IsEditing)); @@ -301,152 +109,14 @@ namespace mbts.ui.spark.algo { public bool IsReadOnly { get => (bool)GetValue(IsReadOnlyProperty); set => SetValue(IsReadOnlyProperty, value); } #endregion - public override void OnApplyTemplate() { - Disposable.dispose(ref _input_hooks); - _templates_combo = this.assert_template_child("PART_Templates_ComboBox"); - _definition_name_text = this.assert_template_child("PART_DefinitionName_EditableTextBlock"); - _input_hooks = Disposable.Create( - _definition_name_text.SubscribePreviewKeyDown((s, e) => { - switch (e.Key) { - case Key.Escape: - if (_definition_name_text.IsEditing) - _definition_name_text.abort(); - break; - } - }), - _templates_combo.SubscribePreviewKeyDown((s, e) => { - switch (e.Key) { - case Key.Enter: - Keyboard.ClearFocus(); - _commit(); - break; - case Key.Escape: - _cancel(); - Keyboard.ClearFocus(); - SetCurrentValue(IsEditingProperty, false); - break; - } - })); - } - - protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) { - base.OnItemsChanged(e); - _editable_items = Items; - } - static bool coerce_require_persisted(AlgoTemplateToolBar d, bool value) => value && d.Definition is AlgoDefinitionVM vm && vm.key.mode == AlgoKey.Mode.Persisted; - #region Transactional - void _add_new() { - _prepare_edit(); - var model = EditableCollectionModel; - if (model != null && model.can_add_new) - _editable_items.AddNewItem(model.new_item_factory()); - } - - void _cancel() => _editable_items.CancelAny(); - - void _commit(bool execute_save = false) { - if (_editable_items.IsEditingItem) { - var editing_item = (AlgoDefinitionTemplateVM)_editable_items.CurrentEditItem; - editing_item.name = _templates_combo.Text; - _editable_items.CommitEdit(); - SetCurrentValue(SelectedItemProperty, editing_item); - if (execute_save) - SaveCommand.TryExecuteIfCan(editing_item); - SetCurrentValue(IsEditingProperty, false); - } else if (_editable_items.IsAddingNew) { - var new_item = (AlgoDefinitionTemplateVM)_editable_items.CurrentAddItem; - new_item.name = _templates_combo.Text; - _editable_items.CommitNew(); - SetCurrentValue(SelectedItemProperty, new_item); - if (execute_save) - SaveCommand.TryExecuteIfCan(new_item); - SetCurrentValue(IsEditingProperty, false); - } else { - SaveCommand.TryExecuteIfCan(SelectedItem); - } - } - - void _revert() => RevertCommand.TryExecuteIfCan(null); - void _revert_definition() => RevertDefinitionCommand.TryExecuteIfCan(null); - - void _redo() => _redo(SelectedItem); - void _undo() => _undo(SelectedItem); - void _redo_definition() => _redo(Definition); - void _undo_definition() => _undo(Definition); - - void _redo(IAlgoStudioContentVM c) { - if (c != null && c.can_redo) - c.redo(); - } - void _undo(IAlgoStudioContentVM c) { - if (c != null && c.can_undo) - c.undo(); - } - - void _remove(object template) { - _editable_items?.Remove(template); - RemoveCommand.TryExecuteIfCan(template); - } - - void _save() { - if (SelectedItem == null) { - _add_new(); - } else _commit(true); - } - - void _save_definition() { - if (Definition is AlgoDefinitionVM d && d.is_dirty) { - _definition_name_text?.end_edit(); - SaveDefinitionCommand?.TryExecuteIfCan(d); - } - } - - void _save_as() { - if (SelectedItem == null) { - _add_new(); - } else { - _prepare_edit(); - _editable_items.EditItem(SelectedItem); - } - } - - void _save_definition_as() { - _definition_name_text?.begin_edit(); - } - - bool _focus() { - if (_templates_combo == null || !_templates_combo.IsEnabled) return false; - var textbox = _templates_combo.descendants_of_type().FirstOrDefault(); - if (textbox == null) return false; - FocusManager.SetFocusedElement(this, textbox); - Focus(); - Keyboard.Focus(textbox); - return true; - } - - void _prepare_edit() { - _editable_items.CancelAny(); - SetCurrentValue(IsEditingProperty, true); - // This is a hack ¯\_(ツ)_/¯ but it is effective and simple. - // The correct/non-hack way to achieve this behavior most likely requires re-templating the ComboBox - a lot of work. - /// The goal: auto-focus the textbox inside the ComboBox. - /// The dilemma: the textbox does not exist until the ComboBox is rendered again (since we just changed ComboBox.IsEditing to true in the previous line, this has not happened yet). - WPFHelper.push_frame_until(() => _focus()); - } - #endregion - public static class VisualStateNames { public static void apply_all(AlgoTemplateToolBar toolbar) { UndoRedo.apply(toolbar._vsm, toolbar.ShowUndoRedoButtons); RevertDefinition.apply(toolbar, toolbar.ShowRevertDefinition); - RenameDefinition.apply(toolbar._vsm, toolbar.ShowRenameDefinition); SaveDefinition.apply(toolbar._vsm, toolbar.ShowSaveDefinition); - TemplatesDropDown.apply(toolbar._vsm, toolbar.ShowTemplatesDropDown); - RenameTemplate.apply(toolbar._vsm, toolbar.ShowTemplatesDropDown); // there is no corresponding 'CanUserRenameTemplate' property at the moment, for now it just refers to ShowTemplates. - ToggleFavorite.apply(toolbar._vsm, toolbar.ShowToggleFavorite); } public static class UndoRedo { public const string GroupName = nameof(UndoRedo); @@ -466,15 +136,6 @@ namespace mbts.ui.spark.algo { public static void apply(AlgoTemplateToolBar owner, bool active) => owner.Dispatcher.InvokeAsync(() => owner._vsm.set_state(GroupName, active ? Active : Inactive)); } - public static class RenameDefinition { - public const string GroupName = nameof(RenameDefinition); - public static readonly string - Active = $"{GroupName}{VisualStates.Active}", - Inactive = $"{GroupName}{VisualStates.Inactive}"; - - public static void apply(VisualStateModel vsm, bool active) => - vsm.set_state(GroupName, active ? Active : Inactive); - } public static class SaveDefinition { public const string GroupName = nameof(SaveDefinition); public static readonly string @@ -484,33 +145,6 @@ namespace mbts.ui.spark.algo { public static void apply(VisualStateModel vsm, bool active) => vsm.set_state(GroupName, active ? Active : Inactive); } - public static class TemplatesDropDown { - public const string GroupName = nameof(TemplatesDropDown); - public static readonly string - Active = $"{GroupName}{VisualStates.Active}", - Inactive = $"{GroupName}{VisualStates.Inactive}"; - - public static void apply(VisualStateModel vsm, bool active) => - vsm.set_state(GroupName, active ? Active : Inactive); - } - public static class RenameTemplate { - public const string GroupName = nameof(RenameTemplate); - public static readonly string - Active = $"{GroupName}{VisualStates.Active}", - Inactive = $"{GroupName}{VisualStates.Inactive}"; - - public static void apply(VisualStateModel vsm, bool active) => - vsm.set_state(GroupName, active ? Active : Inactive); - } - public static class ToggleFavorite { - public const string GroupName = nameof(ToggleFavorite); - public static readonly string - Active = $"{GroupName}{VisualStates.Active}", - Inactive = $"{GroupName}{VisualStates.Inactive}"; - - public static void apply(VisualStateModel vsm, bool active) => - vsm.set_state(GroupName, active ? Active : Inactive); - } } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml b/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml deleted file mode 100644 index aae546707..000000000 --- a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml +++ /dev/null @@ -1,270 +0,0 @@ - - - White - - - - #FFCCCCCC - #FF888888 - #FF444444 - #FF888888 - #FF444444 - #FFAAAAAA - #FF888888 - Black - - - - - - - - - - - - #FFFFFFFF - #FF818181 - #FFCCEEFB - #FF27C7F7 - #FF595959 - #FF262626 - #FF82DFFB - #FF1CC4F7 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml.cs b/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml.cs deleted file mode 100644 index 815a421b5..000000000 --- a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml.cs +++ /dev/null @@ -1,33 +0,0 @@ -using mbts.ui.converters; -using System.Windows; -using System.Windows.Data; - -namespace mbts.ui.spark.algo { - static class AlgoTemplateTreeView { - public static readonly IMultiValueConverter ItemsMarginConverter = - ValueConverter.create((margin, level) => new Thickness(level * margin.Left, margin.Top, margin.Right, margin.Bottom)); - - public static readonly IValueConverter NodeLevelConverter = - ValueConverter.create(pnode => pnode + 1); - - public static readonly DependencyProperty ItemsMarginProperty = - DependencyProperty.RegisterAttached( - "ItemsMargin", - typeof(Thickness), - typeof(AlgoTemplateTreeView), - new PropertyMetadata(new Thickness(1))); - - public static Thickness GetItemsMargin(DependencyObject d) => (Thickness)d.GetValue(ItemsMarginProperty); - public static void SetItemsMargin(DependencyObject d, Thickness value) => d.SetValue(ItemsMarginProperty, value); - - public static readonly DependencyProperty NodeLevelProperty = - DependencyProperty.RegisterAttached( - "NodeLevel", - typeof(int), - typeof(AlgoTemplateTreeView), - new PropertyMetadata(0)); - - public static int GetNodeLevel(DependencyObject d) => (int)d.GetValue(NodeLevelProperty); - public static void SetNodeLevel(DependencyObject d, int value) => d.SetValue(NodeLevelProperty, value); - } -} \ No newline at end of file diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 28976f379..fea5ff2e8 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -22,12 +22,6 @@ 12 -