diff --git a/src/client/spark/Orders/OrderTypeVMs/JoinOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/JoinOrderVM.cs index 39cc9a547..185018df1 100644 --- a/src/client/spark/Orders/OrderTypeVMs/JoinOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/JoinOrderVM.cs @@ -30,7 +30,7 @@ namespace mbts.spark min_tick_offset_on_deploy = new InlineUserProperty(0, false); join_threshold = new InlineUserProperty( - new bts.spark.QuantityMeasure() { Absolute = 1}, false); + new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1}, false); enable_hedge = new InlineUserProperty(false, false); hedge_ticks = new InlineUserProperty(1, false); } diff --git a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs index e28779dfe..7c018378a 100644 --- a/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/OrderDataHelper.cs @@ -196,11 +196,13 @@ namespace mbts.spark.utilities { { Child = custom_order(), JoinThreshold = new QuantityMeasure(), + Hedge = custom_order(), }; public TopOrderDefinition top_order() => new TopOrderDefinition { Child = custom_order(), TopThreshold = new QuantityMeasure(), + Hedge = custom_order(), }; diff --git a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp index afdd1a406..278242156 100644 --- a/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp +++ b/src/server/sparkd/orderman/orders/book_algos/JoinOrder.cpp @@ -88,14 +88,39 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) case ORDER_STATUS_INACTIVE: { if(_def.side() == api::SIDE_BUY) + { me->opposite_at_inception = book.book.side(api::Side::SIDE_SELL)[0]; + double max_price = me->opposite_at_inception.price() - _tick_size * me->min_tick_offset_on_deploy; + if(me->min_tick_offset_on_deploy && _state.price() > max_price) + { + LOG(OrderMan, Info, "JoinOrder order {} repricing child {}", key().value(), _child.key().value()); + _state.set_price(max_price); + } + else + { + LOG(OrderMan, Info, "JoinOrder order {} launching child {}", key().value(), _child.key().value()); + _child.activate(Price(_state.price()), Quantity(_state.quantity())); + _child_state.set_status(ORDER_STATUS_PENDING_WORKING); + transition(ORDER_STATUS_WORKING); + } + } else + { me->opposite_at_inception = book.book.side(api::Side::SIDE_BUY)[0]; - - LOG(OrderMan, Info, "JoinOrder order {} launching child {}", key().value(), _child.key().value()); - _child.activate(Price(_state.price()), Quantity(_state.quantity())); - _child_state.set_status(ORDER_STATUS_PENDING_WORKING); - transition(ORDER_STATUS_WORKING); + double min_price = me->opposite_at_inception.price() + _tick_size * me->min_tick_offset_on_deploy; + if(me->min_tick_offset_on_deploy && _state.price() < min_price) + { + LOG(OrderMan, Info, "JoinOrder order {} repricing child {}", key().value(), _child.key().value()); + _state.set_price(min_price); + } + else + { + LOG(OrderMan, Info, "JoinOrder order {} launching child {}", key().value(), _child.key().value()); + _child.activate(Price(_state.price()), Quantity(_state.quantity())); + _child_state.set_status(ORDER_STATUS_PENDING_WORKING); + transition(ORDER_STATUS_WORKING); + } + } report_state(); } break; @@ -107,6 +132,7 @@ void JoinOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; if(me->opposite_at_inception.price() > same.price()) {} + //we join exactly once, but we can't detach because we have to hang around and look for hedges else if(!me->did_join && same.size() >= thresh.value()) { me->did_join = true;