From 904ef92ece7d56bbb5374400eae8142a2489b4f6 Mon Sep 17 00:00:00 2001 From: taha afzal Date: Mon, 9 May 2022 14:40:28 -0400 Subject: [PATCH] Added reset_position to PositionService --- src/lib/api/services/OrderService.proto | 5 +++ src/lib/api/services/PositionService.proto | 6 +++ src/lib/orderman/OrderServiceServer.cpp | 17 ++++++- src/lib/orderman/OrderServiceServer.h | 3 ++ src/lib/orderman/actors/FillStore.cpp | 45 +++++++++++++++++++ src/lib/orderman/actors/FillStore.h | 3 ++ src/lib/orderman/actors/ServiceBridge.cpp | 12 ++++- src/lib/orderman/actors/ServiceBridge.h | 2 + .../orderman/events/ManuallyBustFillsEvent.h | 17 +++++++ .../sparkd/position/PositionServiceServer.cpp | 39 ++++++++++++++-- .../sparkd/position/PositionServiceServer.h | 13 ++++-- 11 files changed, 151 insertions(+), 11 deletions(-) create mode 100644 src/lib/orderman/events/ManuallyBustFillsEvent.h diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 7c1a1b9bb..0d4138b3f 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -16,6 +16,7 @@ service OrderService { rpc cancel_order(Cancel) returns (Response); rpc update_order(Update) returns (Response); rpc detach_order(Detach) returns (Response); + rpc manually_bust_all_fills(ManualBustParameters) returns (Response); rpc get_registered_dynamic_order_types(bts.api.VoidMessage) returns (RegisteredDynamicOrderTypes); @@ -27,6 +28,10 @@ service OrderService { rpc exchange_positions (ExchangePositionSub) returns (stream RetrievedExchangePosition); } +message ManualBustParameters{ + string account = 1; +} + // This gets added to uint32 quantity to produce the full qty message FractionalQuantity{ double fraction = 10; diff --git a/src/lib/api/services/PositionService.proto b/src/lib/api/services/PositionService.proto index 60bd881a2..f06dd7663 100644 --- a/src/lib/api/services/PositionService.proto +++ b/src/lib/api/services/PositionService.proto @@ -126,6 +126,11 @@ message SecurityParametersBatchOpResponse { string msg = 2; } +message ResetPositionParameters{ + string account = 1; + ManualFillBatch total_position = 2; +} + service PositionService { option (bts.api.service_description) = "Provides Position and PNL, per security, per account"; @@ -134,6 +139,7 @@ service PositionService { rpc remove_manual_fill (ManualFillBatch) returns (PositionServiceResponse); rpc set_base_position (BasePositionBatch) returns (SetBasePositionResponse); rpc update_security_parameters (SecurityParametersBatchOp) returns (SecurityParametersBatchOpResponse); + rpc reset_position (ResetPositionParameters) returns (PositionServiceResponse); // subscription rpc manual_fills(bts.api.VoidMessage) returns (stream ManualFill); diff --git a/src/lib/orderman/OrderServiceServer.cpp b/src/lib/orderman/OrderServiceServer.cpp index 2d9b950c6..6fbdd63d7 100644 --- a/src/lib/orderman/OrderServiceServer.cpp +++ b/src/lib/orderman/OrderServiceServer.cpp @@ -27,6 +27,7 @@ #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" +#include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/thread_manager.h" #include "lib/utils/type_name.h" @@ -311,7 +312,8 @@ void OrderServiceServer::on_orders( } LOG(OrderMan, Info, - "Publishing orders to the service API. Created {}, Updated {}", + "OrderServiceServer::on_orders publishing orders to the service API. " + "created {}, updated {}", created.size(), updated.size()); me->publish_orders(&created, &updated, nullptr); @@ -333,7 +335,8 @@ void OrderServiceServer::on_fills( } else updated.push_back(f); } - + LOG(OrderMan, Info, "OrderServiceServer::on_fills created: {} updated: {}", + created.size(), updated.size()); me->publish_fills(&created, &updated, nullptr); } @@ -407,6 +410,16 @@ void OrderServiceServer::get_registered_dynamic_order_types( r(response); } +void OrderServiceServer::manually_bust_all_fills( + const api::orderman::ManualBustParameters &p, + const api::Response &r) { + LOG(OrderMan, Info, "Received manually_bust_all_fills: {}", + utils::pb::to_string(p)); + me->service_bridge->manually_bust_all_fills(p); + api::orderman::Response response; + r(response); +} + void OrderServiceServer::on_order_op_result( OrderOpResultEvent const &op_result) { auto it = me->in_flight_order_ops.find(op_result.req_id); diff --git a/src/lib/orderman/OrderServiceServer.h b/src/lib/orderman/OrderServiceServer.h index 995a79e0c..8241ac52f 100644 --- a/src/lib/orderman/OrderServiceServer.h +++ b/src/lib/orderman/OrderServiceServer.h @@ -48,6 +48,9 @@ class OrderServiceServer : public api::orderman::OrderServiceBase { const api::VoidMessage &, const api::Response &) override; + void manually_bust_all_fills( + const api::orderman::ManualBustParameters &, + const api::Response &) override; private: struct PImpl; diff --git a/src/lib/orderman/actors/FillStore.cpp b/src/lib/orderman/actors/FillStore.cpp index 2ee3729a9..d50240189 100644 --- a/src/lib/orderman/actors/FillStore.cpp +++ b/src/lib/orderman/actors/FillStore.cpp @@ -5,6 +5,7 @@ #include "lib/domain_model/Security.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/SODPosition.h" +#include "lib/orderman/events/ManuallyBustFillsEvent.h" #include "lib/orderman/events/NewExecutionReportEvent.h" #include "lib/orderman/events/OrderDefinitionUpdateEvent.h" #include "lib/orderman/events/OrderStateUpdateEvent.h" @@ -12,9 +13,11 @@ #include "lib/os/os.h" #include "lib/persistence/SqliteStore.h" #include "lib/utils/PBUtils.h" +#include "lib/utils/bts_assert.h" #include "lib/utils/overloaded.h" #include +#include #include namespace bts { @@ -91,6 +94,8 @@ void FillStore::init() { // Subscribe to NewExecutionReportEvent for new fills subscribe( [this](auto const &ev) { this->on_execution_report(ev); }); + // subscribe( + // [this](auto const &ev) { this->on_manual_bust(ev); }); // Load stored fills, resolve their securities and publish the lot api::orderman::Fill fill; @@ -231,5 +236,45 @@ void FillStore::on_order_definition_update( } } +void FillStore::on_manual_bust( + const mercury::Update &ev) { + LOG(OrderMan, Info, "FillStore::on_manual_bust"); + if (ev.events->size() != 1) { + LOG(OrderMan, Error, "FillStore::on_manual_bust event_size: {}", + ev.events->size()); + } + // this goes through all the fills that belong to this account and set the + // status to BUSTED + const ManuallyBustFillsEvent &ev_it = ev.events->at(0); + const std::string &acc_to_bust = ev_it.account_name; + api::orderman::Fill fill; + auto all = me->store->retrieve_all()[fills_ns]; + for (auto const &kvp : all) { + if (utils::pb::from_string(kvp.second, &fill)) { + if (fill.account() == acc_to_bust) { + auto sec = + me->oracle.get_security(SecurityKey(fill.security_key())); + if (sec) { + fill.set_fill_status( + bts::api::orderman::Fill::FILL_STATUS_BUSTED); + auto fv = utils::pb::to_string(fill); + me->store->update(fills_ns, fill.fill_key(), fv); + publish(me->fill_stream, fill, *sec); + LOG(OrderMan, Info, "Busting fill: {}", fv); + } else { + LOG(persist, Error, + "Could not resolve security for fill {}. " + "This should be investigated", + kvp.first); + } + } + } else + LOG(persist, Error, + "Could not recover fill {} from storage. " + "This should be investigated", + kvp.first); + } +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/actors/FillStore.h b/src/lib/orderman/actors/FillStore.h index b7be1637f..b45c08689 100644 --- a/src/lib/orderman/actors/FillStore.h +++ b/src/lib/orderman/actors/FillStore.h @@ -2,12 +2,14 @@ #include "lib/md/SecurityOracle.h" #include "lib/mercury/actors/Actor.h" +#include "lib/mercury/events/Update.h" #include namespace bts { namespace orderman { class NewExecutionReportEvent; class OrderDefinitionUpdateEvent; +class ManuallyBustFillsEvent; // Listens for fill execution reports published by fix gateways, // republishing them as StoredFillEvent events and storing those on @@ -26,6 +28,7 @@ class FillStore : public mercury::Actor { void on_execution_report(const mercury::Update &); void on_order_definition_update( mercury::Update const &); + void on_manual_bust(const mercury::Update &); }; } // namespace orderman diff --git a/src/lib/orderman/actors/ServiceBridge.cpp b/src/lib/orderman/actors/ServiceBridge.cpp index 64915baa0..3b3e1f110 100644 --- a/src/lib/orderman/actors/ServiceBridge.cpp +++ b/src/lib/orderman/actors/ServiceBridge.cpp @@ -5,6 +5,7 @@ #include "lib/api/services/PositionService.pb.h" #include "lib/logging/logging.h" #include "lib/mercury/broker/BrokerProxy.h" +#include "lib/mercury/events/Stream.h" #include "lib/orderman/OrderRouter.h" #include "lib/orderman/events/AccountPnLUpdateEvent.h" #include "lib/orderman/events/ActivateOrderEvent.h" @@ -13,6 +14,7 @@ #include "lib/orderman/events/ExcessLiquidityUpdateEvent.h" #include "lib/orderman/events/ExchangePositionEvent.h" #include "lib/orderman/events/FilledPositionEvent.h" +#include "lib/orderman/events/ManuallyBustFillsEvent.h" #include "lib/orderman/events/NewAdminDataEvent.h" #include "lib/orderman/events/OrderManagerReadyEvent.h" #include "lib/orderman/events/OrderOpResultEvent.h" @@ -61,6 +63,7 @@ struct ServiceBridge::PImpl { mercury::Stream update_order_pub; mercury::Stream cancel_order_pub; mercury::Stream detach_order_pub; + mercury::Stream manually_bust_fills_pub; mercury::Stream new_admin_data_pub; mercury::Stream account_pnl_pub; mercury::Stream filled_position_pub; @@ -126,6 +129,7 @@ void ServiceBridge::init() { me->update_order_pub = make_stream(); me->cancel_order_pub = make_stream(); me->detach_order_pub = make_stream(); + me->manually_bust_fills_pub = make_stream(); me->new_admin_data_pub = make_stream(); me->account_pnl_pub = make_stream(); me->filled_position_pub = make_stream(); @@ -259,6 +263,13 @@ void ServiceBridge::detach_order(uint32_t rid, api::orderman::Detach const &c) { }); } +void ServiceBridge::manually_bust_all_fills( + const api::orderman::ManualBustParameters &c) { + LOG(OrderMan, Info, "Received manually_bust_all_fills: {}", + utils::pb::to_string(c)); + publish(me->manually_bust_fills_pub, c.account()); +} + void ServiceBridge::update_admin_data( std::shared_ptr const &admin) { me->service_call_marshaller.schedule_action([this, admin]() { @@ -317,7 +328,6 @@ std::optional make_pos_event( void ServiceBridge::update_position( api::position::Position_dataUpdate const &pos) { - std::vector evs; for (auto const &pu : pos.added()) { auto ev = make_pos_event(*pu, me->sec_db); diff --git a/src/lib/orderman/actors/ServiceBridge.h b/src/lib/orderman/actors/ServiceBridge.h index a71bd70cf..f568b4550 100644 --- a/src/lib/orderman/actors/ServiceBridge.h +++ b/src/lib/orderman/actors/ServiceBridge.h @@ -33,6 +33,7 @@ class Create; class Update; class Cancel; class Detach; +class ManualBustParameters; } // namespace orderman } // namespace api namespace orderman { @@ -85,6 +86,7 @@ class ServiceBridge : public mercury::Actor { void update_order(uint32_t rid, api::orderman::Update const &c); void cancel_order(uint32_t rid, api::orderman::Cancel const &c); void detach_order(uint32_t rid, api::orderman::Detach const &c); + void manually_bust_all_fills(api::orderman::ManualBustParameters const &c); void update_admin_data( std::shared_ptr const &admin); diff --git a/src/lib/orderman/events/ManuallyBustFillsEvent.h b/src/lib/orderman/events/ManuallyBustFillsEvent.h new file mode 100644 index 000000000..1e9dbdcff --- /dev/null +++ b/src/lib/orderman/events/ManuallyBustFillsEvent.h @@ -0,0 +1,17 @@ +#pragma once + +#include "lib/mercury/events/Event.h" + +namespace bts::orderman { + +class ManuallyBustFillsEvent : public mercury::Event { + public: + using SynopsisPolicy = mercury::NoSynopsis; + + ManuallyBustFillsEvent(const std::string &account_name_a) + : account_name(account_name_a) {} + + std::string account_name; +}; + +} // namespace bts::orderman diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index a1dccb90c..64526fc96 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -8,6 +8,7 @@ #include "lib/api/services/AdminService.pb.h" #include "lib/api/services/OrderService.client.pb.h" #include "lib/api/services/OrderService.pb.h" +#include "lib/api/services/PositionService.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/actors/SODPosition.h" #include "lib/persistence/SqliteStore.h" @@ -158,13 +159,13 @@ void PositionServiceServer::_delete_presod_local_on_start() const { me->manual_fills_store->remove(manual_fills_ns, rm_ids); } -const PositionUnit & -PositionServiceServer::_on_fill(const Fill &f, bool is_add) { +const PositionUnit &PositionServiceServer::_on_fill( + const Fill &f, bool is_add) { return me->state.on_fill(f, is_add); } -const PositionUnit & -PositionServiceServer::_on_manual_fill(const ManualFill &mf, bool is_add) { +const PositionUnit &PositionServiceServer::_on_manual_fill( + const ManualFill &mf, bool is_add) { return me->state.on_manual_fill(mf, is_add); } @@ -249,6 +250,36 @@ void PositionServiceServer::create_manual_fill( me->pos_publisher.flush(); } +void PositionServiceServer::reset_position( + const ::bts::api::position::ResetPositionParameters &reset_params, + const api::Response<::bts::api::position::PositionServiceResponse> &r) { + LOG(OrderMan, Info, + "PositionServiceServer::reset_position acct: {} n_recs: {}", + reset_params.account(), + reset_params.total_position().manual_fill().size()); + // find existing fills for this account and remove them + auto all = me->manual_fills_store->retrieve_all()[manual_fills_ns]; + ManualFillBatch fills_to_remove; + ManualFill rec; + for (auto const &kvp : all) + if (utils::pb::from_string(kvp.second, &rec)) { + if (rec.account_name() == reset_params.account()) { + fills_to_remove.add_manual_fill()->CopyFrom(rec); + } + } + remove_manual_fill(fills_to_remove, [&](const auto &) {}); + // now that existing fills have been removed, add the fills represeting total + // positions in the function arg + create_manual_fill(reset_params.total_position(), [&](const auto &) {}); + // bust all fills for this account by calling into OrderService + // api::orderman::ManualBustParameters mb_params; + // mb_params.set_account(reset_params.account()); + // me->order_service.manually_bust_all_fills(mb_params, [&](const auto &) + // {}); + bts::api::position::PositionServiceResponse resp; + r(resp); +} + void PositionServiceServer::update_manual_fill( const ManualFillBatch &batch, const api::Response &r) { diff --git a/src/server/sparkd/position/PositionServiceServer.h b/src/server/sparkd/position/PositionServiceServer.h index 8492d3a5b..712b33e45 100644 --- a/src/server/sparkd/position/PositionServiceServer.h +++ b/src/server/sparkd/position/PositionServiceServer.h @@ -41,12 +41,12 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { // this is the function that aggrgates the // position. is_add is to indicate if a row // is added or removed - const bts::api::position::PositionUnit & - _on_fill(const bts::api::orderman::Fill &fill, bool is_add); + const bts::api::position::PositionUnit &_on_fill( + const bts::api::orderman::Fill &fill, bool is_add); // analogous to the above, for manual fills (this inclused // both client(local) and server(admin) fills) - const bts::api::position::PositionUnit & - _on_manual_fill(const api::position::ManualFill &fill, bool is_add); + const bts::api::position::PositionUnit &_on_manual_fill( + const api::position::ManualFill &fill, bool is_add); void _periodic_poll(); // recomputes the whole pnl (no increments) and publishes it void _compute_pnl_and_publish(); @@ -83,6 +83,11 @@ class PositionServiceServer : public bts::api::position::PositionServiceBase { ::bts::api::position::SecurityParametersBatchOpResponse> &reply) override; + void reset_position( + const ::bts::api::position::ResetPositionParameters &, + const api::Response<::bts::api::position::PositionServiceResponse> &) + override; + ~PositionServiceServer(); }; } // namespace position