From cc23cf0d4c463298a6daf2d1f677ea033ef5efb7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 19 Dec 2017 18:21:16 -0500 Subject: [PATCH] initial native order support --- src/lib/api/services/OrderService2.proto | 17 +- src/lib/utils/PBUtils.h | 16 +- .../actors/order_manager/OrderBuilder.h | 2 +- .../orderman2/order_factory/OrderFactory.cpp | 19 +- .../orderman2/order_factory/OrderFactory.h | 4 +- .../sparkd/orderman2/orders/LimitOrder.cpp | 193 ++++++++++++++---- .../sparkd/orderman2/orders/LimitOrder.h | 11 +- .../orderman2/orders/PostActivationServices.h | 15 -- ...ervices.h => PreActivationOrderServices.h} | 6 +- 9 files changed, 209 insertions(+), 74 deletions(-) delete mode 100644 src/server/sparkd/orderman2/orders/PostActivationServices.h rename src/server/sparkd/orderman2/orders/{PreActivationServices.h => PreActivationOrderServices.h} (64%) diff --git a/src/lib/api/services/OrderService2.proto b/src/lib/api/services/OrderService2.proto index 4555d8e0b..693ad760f 100644 --- a/src/lib/api/services/OrderService2.proto +++ b/src/lib/api/services/OrderService2.proto @@ -46,15 +46,16 @@ message OrderDefinition { TimeInForce time_in_force = 7; ManualOrderIndicator manual_order_indicator = 8; CTICode cti_code = 9; - + CustomerOrFirm customer_or_firm = 10; + oneof custom { - LimitOrderDefinition limit = 10; - MarketOrderDefinition market = 11; - StopMarketOrderDefinition stop_market = 12; - StopLimitOrderDefinition stop_limit = 13; - IcebergOrderDefinition iceberg = 14; - SpreaderOrderDefinition spreader = 15; - TimeBoxOrderDefinition time_box = 16; + LimitOrderDefinition limit = 11; + MarketOrderDefinition market = 12; + StopMarketOrderDefinition stop_market = 13; + StopLimitOrderDefinition stop_limit = 14; + IcebergOrderDefinition iceberg = 15; + SpreaderOrderDefinition spreader = 16; + TimeBoxOrderDefinition time_box = 17; } } diff --git a/src/lib/utils/PBUtils.h b/src/lib/utils/PBUtils.h index 793c10e9c..98fba0fb3 100755 --- a/src/lib/utils/PBUtils.h +++ b/src/lib/utils/PBUtils.h @@ -2,9 +2,10 @@ #include #include +#include +#include #include "lib/utils/datetime.h" #include "lib/utils/bts_assert.h" - #include "bts_export.h" namespace google { @@ -32,9 +33,18 @@ template T from_string(const std::string &str) return result; } - -}} +google::protobuf::Timestamp pb_now() +{ + ::google::protobuf::Timestamp result; + struct timeval tv; + gettimeofday(&tv, NULL); + result.set_seconds(tv.tv_sec); + result.set_nanos(tv.tv_usec * 1000); + return result; } +}}} + + diff --git a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h index a1ce9c746..7235be0d0 100644 --- a/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h +++ b/src/server/sparkd/orderman2/actors/order_manager/OrderBuilder.h @@ -4,7 +4,7 @@ #include #include "server/sparkd/orderman2/orderman2_utils/orderman2_common.h" #include "lib/api/services/OrderService2.pb.h" -#include "server/sparkd/orderman2/orders/PreActivationServices.h" +#include "server/sparkd/orderman2/orders/PreActivationOrderServices.h" #include "server/sparkd/orderman2/actors/order_manager/OrderServices.h" #include "lib/logging/logging.h" #include "server/sparkd/orderman2/actors/order_manager/ChildOrder.h" diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp index 9762a5dad..d4a423ad0 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.cpp @@ -7,7 +7,7 @@ #include "server/sparkd/orderman2/orders/LimitOrder.h" #include "lib/logging/logging.h" #include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h" -#include "server/sparkd/orderman2/orders/PreActivationServices.h" +#include "server/sparkd/orderman2/orders/PreActivationOrderServices.h" #include @@ -42,13 +42,20 @@ OrderKey gen_order_id() struct OrderFactory::PImpl { - PImpl(securities::ISecurityDB &db) : my_orders(), sec_db(db) {} + PImpl(securities::ISecurityDB &db, + config::JetFIX::Connection const&cfg) : + my_orders(), sec_db(db),cfg(cfg) {} std::vector> my_orders; securities::ISecurityDB &sec_db; + config::JetFIX::Connection const cfg; }; -OrderFactory::OrderFactory (securities::ISecurityDB &db) : me (new PImpl(db)) {} +OrderFactory::OrderFactory (securities::ISecurityDB &db, + config::JetFIX::Connection const&cfg) : + me (new PImpl(db,cfg)) +{} + OrderFactory::~OrderFactory () {} Order &OrderFactory::create (OrderKey parent,api::orderman2::OrderDefinition const&def) @@ -56,7 +63,7 @@ Order &OrderFactory::create (OrderKey parent,api::orderman2::OrderDefinition con auto k = gen_order_id(); auto pk = parent; auto &order = allocate(k,pk,def); - order.on_init_new(def, PreActivationOrderServices{me->sec_db,*this}); + order.on_init_new(def, PreActivationOrderServices{me->sec_db,me->cfg,*this}); return order; } @@ -65,7 +72,7 @@ Order &OrderFactory::recover(api::orderman2::OrderRecord const&rec) auto k = OrderKey(rec.key()); auto pk = OrderKey(rec.parent_key()); auto &order = allocate(k,pk,rec.def()); - order.on_init_recovered (rec, PreActivationOrderServices{me->sec_db,*this}); + order.on_init_recovered (rec, PreActivationOrderServices{me->sec_db,me->cfg,*this}); return order; } @@ -97,7 +104,7 @@ Order &OrderFactory::recreate_from_exe_report(ExecutionReport const&r) bts_assert(false); break; } - native_order->on_init_from_exe_report(r,PreActivationOrderServices{me->sec_db,*this}); + native_order->on_init_from_exe_report(r,PreActivationOrderServices{me->sec_db,me->cfg,*this}); native_order->_key = r.order_key; native_order->_parent_key = null_order_key(); diff --git a/src/server/sparkd/orderman2/order_factory/OrderFactory.h b/src/server/sparkd/orderman2/order_factory/OrderFactory.h index 44267f605..6e6913369 100644 --- a/src/server/sparkd/orderman2/order_factory/OrderFactory.h +++ b/src/server/sparkd/orderman2/order_factory/OrderFactory.h @@ -2,6 +2,7 @@ #include #include "server/sparkd/orderman2/order_factory/IOrderFactory.h" +#include "lib/config/protos/jetfix.pb.h" // fwd namespace bts { @@ -17,7 +18,8 @@ namespace orderman2 { class OrderFactory : public IOrderFactory { public: - OrderFactory(securities::ISecurityDB &db); + OrderFactory(securities::ISecurityDB &db, + config::JetFIX::Connection const&cfg); ~OrderFactory(); Order &create (OrderKey parent,api::orderman2::OrderDefinition const&) override; diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.cpp b/src/server/sparkd/orderman2/orders/LimitOrder.cpp index fd923f6ee..422e3f2bd 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.cpp +++ b/src/server/sparkd/orderman2/orders/LimitOrder.cpp @@ -1,12 +1,117 @@ #include "LimitOrder.h" + #include "server/sparkd/orderman2/orderman2_utils/ExecutionReport.h" #include "lib/api/services/OrderService2.pb.h" #include "server/sparkd/orderman2/order_factory/IOrderFactory.h" +#include "server/sparkd/jetfix/codec/FIXFragment.h" +#include "server/sparkd/jetfix/codec/FieldDefinitions.h" +#include "server/sparkd/orderman2/orderman2_utils/fix_order_codec.h" +#include "server/sparkd/orderman2/orders/PreActivationOrderServices.h" +#include "server/sparkd/securities/ISecurityDB.h" +#include "lib/utils/PBUtils.h" + #include namespace bts { namespace orderman2 { +api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus ); + +struct LimitOrder::PImpl +{ + api::orderman2::OrderDefinition definition; + api::orderman2::OrderState state; + + jetfix::FIXFragment update_encoding; + jetfix::FIXFragment::Bookmark update_price_bm; + jetfix::FIXFragment::Bookmark update_quantity_bm; + jetfix::FIXFragment::Bookmark update_transact_time_bm; + + jetfix::FIXFragment create_encoding; + jetfix::FIXFragment::Bookmark create_price_bm; + jetfix::FIXFragment::Bookmark create_quantity_bm; + jetfix::FIXFragment::Bookmark create_transact_time_bm; + + jetfix::FIXFragment cancel_encoding; + jetfix::FIXFragment::Bookmark cancel_transact_time_bm; +}; + +LimitOrder::LimitOrder() : me (new PImpl()) {} + +void LimitOrder::on_init_new(api::orderman2::OrderDefinition const&def, + const PreActivationOrderServices&serv) +{ + me->definition = def; + me->state.limit(); + auto sec = serv.sec_db.resolve(SecurityKey(def.security_key())); + if (!sec) { + me->state.set_status(api::orderman2::ORDER_STATUS_ERROR); + me->state.set_last_msg(fmt::format ("Unknown security: {}",def.security_key())); + } + else { + me->state.set_status(api::orderman2::ORDER_STATUS_INACTIVE); + init_fix(*sec); + } +} + +void LimitOrder::on_init_recovered(api::orderman2::OrderRecord const&rec, + const PreActivationOrderServices &serv) +{ + me->definition = rec.def(); + me->state = rec.state(); + + if (me->state.status() == api::orderman2::ORDER_STATUS_ACTIVE) { + auto const &def = rec.def(); + auto sec = serv.sec_db.resolve(SecurityKey(def.security_key())); + if (!sec) { + me->state.set_status(api::orderman2::ORDER_STATUS_ERROR); + me->state.set_last_msg(fmt::format ("Unknown security: {}",def.security_key())); + } + else + init_fix(*sec); + } +} + +void LimitOrder::on_init_from_exe_report(ExecutionReport const&er, const PreActivationOrderServices &os) +{ + auto k = er.order_key; + + api::orderman2::OrderRecord orecord; + orecord.set_key(k.value()); + orecord.set_parent_key(null_order_key().value()); + + auto &def = *orecord.mutable_def(); + def.set_security_key(er.security->id()); + def.set_side(er.side); + def.set_login(to_str(er.operator_id)); + def.set_account(to_str(er.account_name)); + def.set_time_in_force(er.time_in_force); + def.set_manual_order_indicator(er.manual_order_indicator); + def.set_cti_code(api::orderman2::CTICode(er.cfg->cti_code()[0])); + def.set_customer_or_firm(api::orderman2::CustomerOrFirm(er.cfg->customer_or_firm())); + def.mutable_limit(); + + auto &state = *orecord.mutable_state(); + state.set_status(map_status(er.order_status)); + state.set_price(er.price.value()); + state.set_quantity(er.quantity.value()); + state.set_filled_quantity(er.filled_quantity.value()); + state.set_last_price(er.last_price.value()); + state.set_avg_price(er.avg_price.value()); + state.set_last_msg(er.msg); + struct timeval tv; + gettimeofday(&tv, NULL); + state.mutable_last_change()->set_seconds(tv.tv_sec); + state.mutable_last_change()->set_nanos(tv.tv_usec * 1000); + + auto &limit_state = *state.mutable_limit(); + limit_state.set_exchange_order_id(to_str(er.exchange_order_id)); + + on_init_recovered(orecord,os); +} + +LimitOrder::~LimitOrder() {} + api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus status) { using namespace api::orderman2; @@ -49,45 +154,63 @@ api::orderman2::OrderStatus map_status(api::orderman2::NativeOrderStatus status) } } -void LimitOrder::on_init_from_exe_report(ExecutionReport const&er, const PreActivationOrderServices &os) +void LimitOrder::init_fix(api::Security const&sec) { - auto k = er.order_key; + using namespace jetfix; + auto const&def = me->definition; + // initialize update FIX + auto &update_encoding = me->update_encoding; + update_encoding.add (def.login()); + me->update_price_bm = update_encoding.add (0,price_sz()); + me->update_quantity_bm = update_encoding.add (0,quantity_sz()); + me->update_transact_time_bm = + update_encoding.add (datetime::FIX_timestamp(datetime::now())); + update_encoding.add (def.account()); + update_encoding.add (def.side()); + update_encoding.add (def.time_in_force()); + update_encoding.add (api::orderman2::NATIVE_ORDER_TYPE_LIMIT); + update_encoding.add (def.manual_order_indicator()); + update_encoding.add (def.cti_code()); + update_encoding.add (def.customer_or_firm()); + update_encoding.add (sec.glbx().security_desc()); + std::string clordid(clordid_sz(),' '); + encode_clorid(key(),SecurityKey(sec.id()),&clordid); + update_encoding.add (clordid); + update_encoding.add (clordid); + update_encoding.add (clordid); - api::orderman2::OrderRecord orecord; - orecord.set_key(k.value()); - orecord.set_parent_key(null_order_key().value()); + // initialize create FIX + auto &create_encoding = me->create_encoding; + create_encoding.add (def.login()); + me->create_price_bm = create_encoding.add (0,price_sz()); + me->create_quantity_bm = create_encoding.add (0,quantity_sz()); + me->create_transact_time_bm = create_encoding.add ( + datetime::FIX_timestamp(datetime::now())); + create_encoding.add (def.account()); + create_encoding.add (def.side()); + create_encoding.add (def.time_in_force()); + create_encoding.add (api::orderman2::NATIVE_ORDER_TYPE_LIMIT); + create_encoding.add (def.manual_order_indicator()); + create_encoding.add (def.customer_or_firm()); + create_encoding.add (def.cti_code()); + create_encoding.add (sec.glbx().security_desc()); + create_encoding.add (clordid); - auto &def = *orecord.mutable_def(); - def.set_security_key(er.security->id()); - def.set_side(er.side); - def.set_login(to_str(er.operator_id)); - def.set_account(to_str(er.account_name)); - def.set_time_in_force(er.time_in_force); - def.set_manual_order_indicator(er.manual_order_indicator); - def.set_cti_code(api::orderman2::CTICode(er.cfg->cti_code()[0])); - - def.mutable_limit(); - - auto &state = *orecord.mutable_state(); - state.set_status(map_status(er.order_status)); - state.set_price(er.price.value()); - state.set_quantity(er.quantity.value()); - state.set_filled_quantity(er.filled_quantity.value()); - state.set_last_price(er.last_price.value()); - state.set_avg_price(er.avg_price.value()); - state.set_last_msg(er.msg); - struct timeval tv; - gettimeofday(&tv, NULL); - state.mutable_last_change()->set_seconds(tv.tv_sec); - state.mutable_last_change()->set_nanos(tv.tv_usec * 1000); - - auto &limit_state = *state.mutable_limit(); - limit_state.set_exchange_order_id(to_str(er.exchange_order_id)); - - on_init_recovered(orecord,os); + // initialize cancel FIX + auto &cancel_encoding = me->cancel_encoding; + cancel_encoding.add (def.login()); + me->cancel_transact_time_bm = + cancel_encoding.add (datetime::FIX_timestamp(datetime::now())); + cancel_encoding.add (def.account()); + cancel_encoding.add (def.side()); + cancel_encoding.add (def.time_in_force()); + cancel_encoding.add (api::orderman2::NATIVE_ORDER_TYPE_LIMIT); + cancel_encoding.add (def.manual_order_indicator()); + cancel_encoding.add (sec.glbx().security_desc()); + cancel_encoding.add (clordid); + cancel_encoding.add (clordid); + cancel_encoding.add (clordid); } -LimitOrder::~LimitOrder() {} - }} diff --git a/src/server/sparkd/orderman2/orders/LimitOrder.h b/src/server/sparkd/orderman2/orders/LimitOrder.h index f93941546..68756370b 100644 --- a/src/server/sparkd/orderman2/orders/LimitOrder.h +++ b/src/server/sparkd/orderman2/orders/LimitOrder.h @@ -11,12 +11,13 @@ namespace orderman2 { class LimitOrder : public NativeOrder { public: + LimitOrder(); ~LimitOrder() override; void on_init_new(api::orderman2::OrderDefinition const&, - const PreActivationOrderServices&) override {} + const PreActivationOrderServices&) override; void on_init_recovered(api::orderman2::OrderRecord const&, - const PreActivationOrderServices &) override {} + const PreActivationOrderServices &) override; void on_init_from_exe_report(ExecutionReport const&, const PreActivationOrderServices &) override ; void on_activate(Price,Quantity,OrderServices &) override {} @@ -24,7 +25,11 @@ public: void on_update(Price , Quantity ) override {} void on_crack() override {} void on_cancel() override {} - + +private: + struct PImpl; + std::unique_ptr me; + void init_fix(api::Security const&sec); }; }} diff --git a/src/server/sparkd/orderman2/orders/PostActivationServices.h b/src/server/sparkd/orderman2/orders/PostActivationServices.h deleted file mode 100644 index 8dc368b95..000000000 --- a/src/server/sparkd/orderman2/orders/PostActivationServices.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/mercury/actors/ContentSubscription.h" - -namespace bts { -namespace orderman2 { - -class PostActivationServices -{ -public: - -}; - -}} diff --git a/src/server/sparkd/orderman2/orders/PreActivationServices.h b/src/server/sparkd/orderman2/orders/PreActivationOrderServices.h similarity index 64% rename from src/server/sparkd/orderman2/orders/PreActivationServices.h rename to src/server/sparkd/orderman2/orders/PreActivationOrderServices.h index 533790aba..771f28884 100644 --- a/src/server/sparkd/orderman2/orders/PreActivationServices.h +++ b/src/server/sparkd/orderman2/orders/PreActivationOrderServices.h @@ -12,11 +12,13 @@ class PreActivationOrderServices { public: PreActivationOrderServices (securities::ISecurityDB &db, - OrderFactory &f) - : sec_db(db), order_factory(f) + config::JetFIX::Connection const &cfg, + OrderFactory &f) + : sec_db(db), cfg(cfg),order_factory(f) {} securities::ISecurityDB &sec_db; + config::JetFIX::Connection const &cfg; OrderFactory &order_factory; };