diff --git a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp index 5c05a0b9c..4c60f8cb5 100644 --- a/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp +++ b/src/app_sparkd/sparkd/execution/EMExecutionGateway.cpp @@ -522,7 +522,7 @@ void EMExecutionGateway::_process_cb_and_fire_er(const EMCallbackMsg &em_cb) { // TODO: this should be part of the update utils::Uuid guid; std::string fill_id = guid.to_text_string(); - to_array(fill_id, &er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(fill_id); } else { er.last_shares = Quantity(0); } @@ -581,7 +581,7 @@ void EMExecutionGateway::_fire_leg_er( l_er.msg_seq_num = me->msg_seq_num++; utils::Uuid guid; std::string fill_id = guid.to_text_string(); - to_array(fill_id, &l_er.exchange_fill_id.value()); + l_er.exchange_fill_id->copy_from(fill_id); LOG(OrderMan, Info, "EMExecutionGateway::_fire_leg_er firing er: {}", l_er.to_string()); me->on_exe_report( diff --git a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp index 259495a79..a7aef5979 100644 --- a/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/cross_margin/trade_data_stream/order_update.cpp @@ -150,7 +150,7 @@ bool OrderUpdate::to_execution_report( filled_quantity > 0 ? quote_asset_transacted_quantity / filled_quantity : 0.0; er.stop_price.value() = stop_price; - copy_to_array<40>(std::to_string(trade_id), er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(std::to_string(trade_id)); return true; } diff --git a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp index 8ce66b015..54ae1c69a 100644 --- a/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/spots/user_data_stream/order_update.cpp @@ -134,7 +134,7 @@ bool OrderUpdate::to_execution_report( filled_quantity > 0 ? quote_asset_transacted_quantity / filled_quantity : 0.0; er.stop_price.value() = stop_price; - copy_to_array<40>(std::to_string(trade_id), er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(std::to_string(trade_id)); return true; } @@ -163,7 +163,7 @@ bool OrderUpdate::to_execution_report( filled_quantity > 0 ? quote_asset_transacted_quantity / filled_quantity : 0.0; er.stop_price.value() = stop_price; - copy_to_array<40>(std::to_string(trade_id), er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(std::to_string(trade_id)); return true; } diff --git a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp index 91a58f8c5..e294c698d 100644 --- a/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp +++ b/src/lib_binance_execution/binance_execution/usds_futures/user_data_stream/order_update.cpp @@ -37,8 +37,7 @@ bool OrderUpdate::to_execution_report( er.last_price.value() = data.last_filled_price; er.avg_price.value() = data.avg_price; er.stop_price.value() = data.stop_price; - copy_to_array<40>( - std::to_string(data.trade_id), er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(std::to_string(data.trade_id)); return true; } diff --git a/src/lib_okx_execution/okx_execution/okx_execution_gateway.cpp b/src/lib_okx_execution/okx_execution/okx_execution_gateway.cpp index a546799ef..60e3e4c7f 100644 --- a/src/lib_okx_execution/okx_execution/okx_execution_gateway.cpp +++ b/src/lib_okx_execution/okx_execution/okx_execution_gateway.cpp @@ -290,7 +290,7 @@ struct OkxExecutionGateway::PImpl { } else if (!(order.at("fillSz").get() == "0")) { utils::Uuid guid; std::string fill_id = guid.to_text_string(); - to_array(fill_id, &report.exchange_fill_id.value()); + report.exchange_fill_id->copy_from(fill_id); } // report.transact_time = ExchangeTimeStampVar(std::stoll(order.at("uTime").get())); diff --git a/src/lib_onixs_fix/onixs_fix/OnixFIXListener.cpp b/src/lib_onixs_fix/onixs_fix/OnixFIXListener.cpp index 60eb1fb75..79e607353 100644 --- a/src/lib_onixs_fix/onixs_fix/OnixFIXListener.cpp +++ b/src/lib_onixs_fix/onixs_fix/OnixFIXListener.cpp @@ -171,7 +171,7 @@ void OnixFixListener::get_exe_report(Message msg, ExecutionReport &er) { auto exec_id_str = msg.get(FIX42::Tags::ExecID); std::string fill_id = exec_id_str.valid() ? exec_id_str.toString() : bts::utils::Uuid().to_text_string(); - to_array(fill_id, &er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(fill_id); auto last_px_str = msg.get(FIX42::Tags::LastPx); er.last_price = Price(last_px_str.valid() ? std::stod(last_px_str.toString()) : 0); diff --git a/src/lib_spark/spark/orderman/actors/FillStore.cpp b/src/lib_spark/spark/orderman/actors/FillStore.cpp index 3ef0b655a..9e8790645 100644 --- a/src/lib_spark/spark/orderman/actors/FillStore.cpp +++ b/src/lib_spark/spark/orderman/actors/FillStore.cpp @@ -277,8 +277,8 @@ void FillStore::on_execution_report( LOG(OrderMan, Info, "FillStore::on_execution_report er: {}", ev.data->to_string()); auto &er = *ev.data; - auto fk = fmt::format( - "{}:{}", er.order_key.value(), to_strn(er.exchange_fill_id)); + auto fk = + fmt::format("{}:{}", er.order_key.value(), er.exchange_fill_id); auto is_known = me->known_fills.count(fk); if (er.exec_type == api::orderman::EXEC_TYPE_PARTIAL_FILL || er.exec_type == api::orderman::EXEC_TYPE_FILL) { diff --git a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp index 936ecc1d9..2d947fd96 100644 --- a/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/CCAPIExecutionGateway.cpp @@ -373,7 +373,7 @@ void CCAPIExecutionGateway::_on_order_cb(const CCAPIOrderState &s) { auto &tr = s.cb_trades.back(); er.last_price = Price(tr.last_exec_price); er.last_shares = Quantity::create_new(tr.last_exec_qty); - to_array(tr.trade_id, &er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(tr.trade_id); } else { er.last_shares = Quantity(0); } diff --git a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp index d9b695945..51fbc6597 100644 --- a/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/GLBXExecutionGateway.cpp @@ -276,7 +276,7 @@ void GLBXExecutionGateway::on_exe_report( *last_px_sec, Price(msg.get())) : Price(0); if (msg.has()) - str_to(msg.get(), &data->exchange_fill_id); + data->exchange_fill_id->copy_from(msg.get()); orderman::ExchangeTimeStampStr t; str_to(msg.get(), &t); data->transact_time = t; diff --git a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp index 9ee1d9c0f..949b4710b 100644 --- a/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/ICEExecutionGateway.cpp @@ -451,7 +451,7 @@ void ICEExecutionGateway::on_exe_report( : Price(0); if (msg.has()) { auto execid = msg.get(); - str_to(execid, &data->exchange_fill_id); + data->exchange_fill_id->copy_from(msg.get()); if (msg.has()) me->exec_id_to_memo[execid] = msg.get(); } diff --git a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp index f7fc39949..341efc7b2 100644 --- a/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp +++ b/src/lib_spark/spark/orderman/gateways/sim/SimExecutionGateway.cpp @@ -789,7 +789,7 @@ void fill_execution_report(const SEGOrderState &seg_os, ExecutionReport &er) { if (!seg_os.last_filled_qty.is_zero()) { bts::utils::Uuid guid; std::string fill_id = guid.to_text_string(); - to_array(fill_id, &er.exchange_fill_id.value()); + er.exchange_fill_id->copy_from(fill_id); er.exec_type = api::orderman::EXEC_TYPE_PARTIAL_FILL; if (!seg_os.active()) { er.exec_type = api::orderman::EXEC_TYPE_FILL; diff --git a/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp b/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp index d5d5a36f6..6313588ef 100644 --- a/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp +++ b/src/lib_spark/spark/orderman/ilink3/IL3Parser.cpp @@ -75,8 +75,7 @@ bool IL3Parser::parse_common(const T &msg, ExecutionReport *data) { template void IL3Parser::parse_trade(const T &msg, ExecutionReport *data) { - orderman::to_array( - msg.getExecIDAsStringView(), &data->exchange_fill_id.value()); + data->exchange_fill_id->copy_from(msg.getExecIDAsStringView()); switch (msg.ordStatus()) { case iLinkBinary::OrdStatusTrd::Filled: data->order_status = diff --git a/src/lib_spark/spark/orderman/orderman_utils/exchange_fill_id.h b/src/lib_spark/spark/orderman/orderman_utils/exchange_fill_id.h new file mode 100644 index 000000000..ffe719b28 --- /dev/null +++ b/src/lib_spark/spark/orderman/orderman_utils/exchange_fill_id.h @@ -0,0 +1,22 @@ +#pragma once + +#include "spark/core/FMT_IMPL.h" +#include "spark/core/small_string.h" +#include "spark/utils/ValueWrapper.h" + +namespace bts::orderman { + +using ExchangeFillID = + utils::ValueWrapper>; + +inline void to_json(nlohmann::json &j, const ExchangeFillID &id) { + j = id.value(); +} + +inline void from_json(const nlohmann::json &j, ExchangeFillID &id) { + j.get_to(id.value()); +} + +} // namespace bts::orderman + +FMT_IMPL(bts::orderman::ExchangeFillID, a, "{}", a->to_string_view()); diff --git a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h index 84e607133..faf6b16ae 100644 --- a/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h +++ b/src/lib_spark/spark/orderman/orderman_utils/orderman_common.h @@ -2,10 +2,12 @@ #include "spark/api/services/OrderService.pb.h" #include "spark/core/FMT_IMPL.h" +#include "spark/core/small_string.h" #include "spark/domain_model/common.h" #include "spark/orderman/account_id.h" #include "spark/orderman/account_name.h" #include "spark/orderman/order_key.h" +#include "spark/orderman/orderman_utils/exchange_fill_id.h" #include "spark/orderman/orderman_utils/exchange_order_id.h" #include "spark/utils/ValueWrapper.h" #include "spark/utils/bts_assert.h" @@ -29,8 +31,6 @@ using UserID = utils::ValueWrapper; using OperatorID = utils::ValueWrapper>; using GatewayName = utils::ValueWrapper; -using ExchangeFillID = - utils::ValueWrapper>; const uint16_t NullTickToTradeCorID = 0; const auto fix_buffer_pool_size = 10000;