From 81d67f640bc299eacd2aeac349784c3cfa3e545c Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 31 Oct 2018 17:26:34 -0400 Subject: [PATCH] my head hurts from the f# --- src/client/spark_api/md/Authenticator.cs | 23 +++++ src/client/spark_api/md/LazyAsync.cs | 17 ++++ src/client/spark_api/md/Locator.cs | 16 ++++ src/client/spark_api/md/MarketDataClient.cs | 35 ++++--- src/client/spark_excel/ExcelAddin.cs | 16 ++++ .../extensions/OrderService_Excel.cs | 4 +- ...MDFormatter.cs => TopOfBookMDFormatter.cs} | 4 +- .../rtd/formatting/TopicMDFormatter.cs | 90 ++++++++++++++++++ .../rtd/subscriptions/MDSubscribe.cs | 43 ++++++++- .../spark_excel/spark_excel_example.xlsm | Bin 23817 -> 23893 bytes src/client/spark_sdk/samples/OrderSample.cs | 13 +-- src/lib/CMakeDeps.cmake | 2 +- .../templates/excel/excel.pb.cs | 23 +++-- .../api/service_helpers/AdminServiceUtils.cpp | 7 +- .../api/service_helpers/AdminServiceUtils.h | 2 +- src/lib/api/services/AdminService.proto | 15 +++ src/lib/domain_model/Security.proto | 6 +- src/lib/md/relay/QueryServer.cpp | 47 +++++---- src/server/sparkd/user/AdminServiceServer.cpp | 16 ++-- src/web/ui/src/Accounts/Types.fs | 5 +- src/web/ui/src/Users/State.fs | 4 + src/web/ui/src/Users/Types.fs | 2 + src/web/ui/src/Users/View.fs | 3 +- 23 files changed, 316 insertions(+), 77 deletions(-) create mode 100644 src/client/spark_api/md/Authenticator.cs create mode 100644 src/client/spark_api/md/LazyAsync.cs create mode 100644 src/client/spark_api/md/Locator.cs rename src/client/spark_excel/rtd/formatting/{TopMDFormatter.cs => TopOfBookMDFormatter.cs} (88%) create mode 100644 src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs new file mode 100644 index 000000000..34aca3bfc --- /dev/null +++ b/src/client/spark_api/md/Authenticator.cs @@ -0,0 +1,23 @@ +using System; +using System.Threading.Tasks; +using bts.api; +using bts.api.core; + +namespace bts.api +{ + public class Authenticator + { + readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); + user.AuthToken _token = null; + public Authenticator() { } + + public user.AuthToken last_token => _token; + public async Task login(string login, string password) + { + var res = await _auth.Value.authenticate_login_async(new user.AuthenticateLoginRequest { Login = login, Password = password }); + if (res.success) + _token = res.value.Token; + return _token; + } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/LazyAsync.cs b/src/client/spark_api/md/LazyAsync.cs new file mode 100644 index 000000000..c83dd4095 --- /dev/null +++ b/src/client/spark_api/md/LazyAsync.cs @@ -0,0 +1,17 @@ + +using System; +using System.Threading.Tasks; + +namespace bts +{ + public class AsyncLazy : Lazy> + { + public AsyncLazy(Func valueFactory) : + base(() => Task.Factory.StartNew(valueFactory)) + { } + + public AsyncLazy(Func> taskFactory) : + base(() => Task.Factory.StartNew(() => taskFactory()).Unwrap()) + { } + } +} \ No newline at end of file diff --git a/src/client/spark_api/md/Locator.cs b/src/client/spark_api/md/Locator.cs new file mode 100644 index 000000000..e86c98a05 --- /dev/null +++ b/src/client/spark_api/md/Locator.cs @@ -0,0 +1,16 @@ +using System; +using System.Threading.Tasks; +using bts.api; +using bts.api.core; + +namespace bts.api +{ + public static class Locator + { + readonly static Lazy _context = new Lazy(() => new ServiceContext(), true); + public static T locate(string qualifier="") where T : class, IApiClient + { + return _context.Value.locate(qualifier); + } + } +} diff --git a/src/client/spark_api/md/MarketDataClient.cs b/src/client/spark_api/md/MarketDataClient.cs index 748ffdea8..9f06f6aeb 100644 --- a/src/client/spark_api/md/MarketDataClient.cs +++ b/src/client/spark_api/md/MarketDataClient.cs @@ -33,49 +33,48 @@ namespace bts.api.md readonly ConcurrentDictionary _data = new ConcurrentDictionary(); readonly ConcurrentDictionary _security_key_to_desc= new ConcurrentDictionary(); readonly ConcurrentDictionary _security_desc_to_key = new ConcurrentDictionary(); - readonly Lazy _subscription; + readonly MDRequest _subscription; readonly Venue _venue; - readonly static Lazy _md = new Lazy(() => locate(), true); + readonly static Lazy _md = new Lazy(() => Locator.locate(), true); readonly static ConcurrentDictionary _venue_cache = new ConcurrentDictionary(); static readonly List _all_products; static MarketDataClient() { _all_products = _md.Value.request_products(new VoidMessage()).Products.ToList(); } - public static bool create_or_get(api.Venue exchange, out MarketDataClient md) + + public static IEnumerable cached_exchanges => _venue_cache.Keys; + public static bool create_or_get(api.Venue exchange, out MarketDataClient md, user.AuthToken token = null) { if (!_venue_cache.TryGetValue(exchange, out md)) { - _venue_cache[exchange] = md = new MarketDataClient(exchange); + _venue_cache[exchange] = md = new MarketDataClient(exchange, token); return true; } return false; } - public MarketDataClient(bts.api.Venue exchange = Venue.Unset) + public MarketDataClient(bts.api.Venue exchange = Venue.Unset, user.AuthToken token = null) { _venue = exchange; - _subscription = new Lazy(() => load_request(exchange)); + _subscription = load_request(exchange, token); } - MDRequest load_request(bts.api.Venue exchange) + public void set_auth_token(user.AuthToken toke) { - var req = new MDRequest(); + _subscription.Token = toke?.Token ?? string.Empty; + } + + MDRequest load_request(bts.api.Venue exchange, user.AuthToken token) + { + var req = new MDRequest() { Token = token?.Token ?? string.Empty } ; var prods = _all_products.Where(x=>x.Exchange == exchange || exchange == bts.api.Venue.Unset); foreach(var prod in prods) req.Channels.Add(new SecurityChannel() { Exchange = prod.Exchange, Type = prod.Type, Symbol = prod.Symbol, Flags = 0 }); return req; } - static MarketDataRelay locate() - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } - public Security lookup(security_key key) { Data value; @@ -217,7 +216,7 @@ namespace bts.api.md bool check_subscriptions(uint flags, Func selector) { - foreach (var sub in _subscription.Value.Channels) + foreach (var sub in _subscription.Channels) { if (selector(sub)) { @@ -251,7 +250,7 @@ namespace bts.api.md while (!rep.success && count++ < 5); while (true) { - var reply = await _md.Value.requestmd_async(_subscription.Value); + var reply = await _md.Value.requestmd_async(_subscription); if (reply.success) { foreach (var channel in reply.value.Channels) diff --git a/src/client/spark_excel/ExcelAddin.cs b/src/client/spark_excel/ExcelAddin.cs index 60e03aa99..421639146 100644 --- a/src/client/spark_excel/ExcelAddin.cs +++ b/src/client/spark_excel/ExcelAddin.cs @@ -69,5 +69,21 @@ namespace bts.excel Utilities.bts_load_assembly(ass); } } + + public static void calculate_full_rebuild() + { + object app = ExcelDnaUtil.Application; + var mi = app?.GetType().GetMethod("CalculateFullRebuild", BindingFlags.Instance | BindingFlags.Public); + if(mi != null) + mi.Invoke(app, null); + } + + public static void calculate_full() + { + object app = ExcelDnaUtil.Application; + var mi = app?.GetType().GetMethod("CalculateFull", BindingFlags.Instance | BindingFlags.Public); + if (mi != null) + mi.Invoke(app, null); + } } } \ No newline at end of file diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index 399369e46..dcdb0dec6 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -14,8 +14,8 @@ namespace bts.api.orderman { public partial class OrderService_Excel { - readonly static Lazy _users = new Lazy(() => locate(), true); - readonly static Lazy _admin = new Lazy(() => locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); [ExcelFunction(Category = "BTS", Description = "Cancel an Order by Order ID", IsMacroType = true)] diff --git a/src/client/spark_excel/rtd/formatting/TopMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs similarity index 88% rename from src/client/spark_excel/rtd/formatting/TopMDFormatter.cs rename to src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs index 5a8e65fb7..82cb46be8 100644 --- a/src/client/spark_excel/rtd/formatting/TopMDFormatter.cs +++ b/src/client/spark_excel/rtd/formatting/TopOfBookMDFormatter.cs @@ -3,10 +3,10 @@ using System; namespace bts.excel.rtd { - class TopMDFormatter : IExcelFormatter + class TopOfBookMDFormatter : IExcelFormatter { readonly co2.ChannelUpdate _update; - public TopMDFormatter(co2.ChannelUpdate upd) + public TopOfBookMDFormatter(co2.ChannelUpdate upd) { _update = upd; } diff --git a/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs new file mode 100644 index 000000000..92af1f8a3 --- /dev/null +++ b/src/client/spark_excel/rtd/formatting/TopicMDFormatter.cs @@ -0,0 +1,90 @@ + +using System; + +namespace bts.excel.rtd +{ + class TopicMDFormatter : IExcelFormatter + { + readonly co2.ChannelUpdate _update; + readonly string _topic; + public TopicMDFormatter(co2.ChannelUpdate upd, string topic) + { + _update = upd; + _topic = topic; + } + + public object[,] format(bool include_headers = false) + { + var retval = new object[1, 1]; + switch (_topic.ToLower()) + { + case "bid": + case "bidprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Bids?[0]?.Mantissa ?? 0, _update?.Direct?.Bids?[0]?.Exponent ?? 0); + break; + case "ask": + case "askprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Direct?.Asks?[0]?.Mantissa ?? 0, _update?.Direct?.Asks?[0]?.Exponent ?? 0); + break; + case "bidsize": + case "bidqty": + retval[0, 0] = _update?.Direct?.Bids?[0]?.Size; + break; + case "asksize": + case "askqty": + retval[0, 0] = _update?.Direct?.Asks?[0]?.Size; + break; + case "impliedbid": + case "impliedbidprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Bids?[0]?.Mantissa ?? 0, _update?.Implied?.Bids?[0]?.Exponent ?? 0); + break; + case "impliedask": + case "impliedaskprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Implied?.Asks?[0]?.Mantissa ?? 0, _update?.Implied?.Asks?[0]?.Exponent ?? 0); + break; + case "impliedbidsize": + case "impliedbidqty": + retval[0, 0] = _update?.Implied?.Bids?[0]?.Size; + break; + case "impliedasksize": + case "impliedaskqty": + retval[0, 0] = _update?.Implied?.Asks?[0]?.Size; + break; + case "settlement": + case "settlementprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.Settlement?.Mantissa ?? 0, _update?.Misc?.Settlement?.Exponent ?? 0); + break; + case "previoussettlement": + case "previoussettlementprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.Misc?.PreviousSettlementPrice?.Mantissa ?? 0, _update?.Misc?.PreviousSettlementPrice?.Exponent ?? 0); + break; + case "open": + case "openprice": + retval[0, 0] = _update?.Misc?.OpenPrice; + break; + case "close": + case "closeprice": + retval[0, 0] = _update?.Misc?.ClosePrice; + break; + case "high": + case "highprice": + retval[0, 0] = _update?.Misc?.SessionHigh; + break; + case "low": + case "lowprice": + retval[0, 0] = _update?.Misc?.SessionLow; + break; + case "last": + case "lastprice": + retval[0, 0] = BookMDFormatter.format_md(_update?.LastTrade?.Mantissa ?? 0, _update?.LastTrade?.Exponent ?? 0); + break; + case "lastsize": + case "lastqty": + retval[0, 0] = _update?.LastTrade?.Size; + break; + } + return retval; + } + } + +} \ No newline at end of file diff --git a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs index 88f408c7e..8b60cdcfd 100644 --- a/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs +++ b/src/client/spark_excel/rtd/subscriptions/MDSubscribe.cs @@ -14,6 +14,25 @@ namespace bts.excel.rtd { public class MDSubscribe { + static Authenticator _auth = new Authenticator(); + async public static void spark_login(string login, string password, ExcelAsyncHandle handle) + { + try + { + var toke = await _auth.login(login, password); + foreach (var ven in MarketDataClient.cached_exchanges) + { + MarketDataClient.create_or_get(ven, out MarketDataClient md); + md?.set_auth_token(toke); + } + handle.SetResult(toke?.Token ?? "Could not log in check user/pass"); + } + catch(Exception ex) + { + handle.SetException(ex); + } + } + public static MarketDataClient market_data(api.Venue exchange) { var newc = MarketDataClient.create_or_get(exchange, out MarketDataClient md); @@ -83,18 +102,18 @@ namespace bts.excel.rtd [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] - public static object spark_md_top( + public static object spark_md_top_of_book( [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) { var param = new object[] { contract, symbol, security_type, exchange }; - return ObservableRtdUtil.Observe(nameof(spark_md_top), param, + return ObservableRtdUtil.Observe(nameof(spark_md_top_of_book), param, () => md_observable(contract, symbol, security_type, exchange).Select(x => { if (x is co2.ChannelUpdate upd) - return new TopMDFormatter(upd).format(); + return new TopOfBookMDFormatter(upd).format(); return x; })); } @@ -116,5 +135,23 @@ namespace bts.excel.rtd })); } + + [ExcelFunction(Category = "BTS", Description = "Subscribe to BTS Spark top of book market data")] + public static object spark_md( + [ExcelArgument("Required. The 'Topic' string, 'bid', 'ask', etc")] string topic, + [ExcelArgument("Required. The specific contract, GCZ8 or ZNU8-ZNZ8, etc")] string contract, + [ExcelArgument("Required. The symbol, GC or ZN, etc")] string symbol, + [ExcelArgument("Optional. The type, Future or Spread, default = Future")] string security_type = null, + [ExcelArgument("Optional. The exchange, default = GLBX")] string exchange = null) + { + var param = new object[] { topic, contract, symbol, security_type, exchange }; + return ObservableRtdUtil.Observe(nameof(spark_md), param, + () => md_observable(contract, symbol, security_type, exchange).Select(x => + { + if (x is co2.ChannelUpdate upd) + return new TopicMDFormatter(upd, topic).format(); + return x; + })); + } } } \ No newline at end of file diff --git a/src/client/spark_excel/spark_excel_example.xlsm b/src/client/spark_excel/spark_excel_example.xlsm index ebca73ad1a009ad185b4561bdfb6eddbba82d739..c7cd7d17df092735c29ee1d960b01ce4bdff677a 100644 GIT binary patch delta 15886 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�f7@U~(Wwwybkc(3q;vamMkyWqaakqOig(pIn5|UO#??7ndZAMf zvr+64Y+fV=yOpsluWKj1;Yw*gK*==zNvMQ>2`ZR@w*+Bif=kz-)!we`MBV@lUFgW; zNjTwC<4oE+*iQg$HveK)V&t2orsMVLrb3iiknJ!bt2fM&J6xbgeqREmhkLLwqA722 zvp>o_lKhAcna7vCE$F;jc~-RUv-K=o@5S^~SHBOrDvrBJTgvNGpk*$c{X}sQfpex$ ze+-IqIr0>*!70Gw*-rTUsSyf5lYXRV)X>yzvQl~}STYqi1kLVxKy@2W1%duf@1sw< z4buqTu{v5bmXI0YvjDS!8XNDWTuISG6A1da>fhf| z1*%tHa+tEoWJPMm^MN5YexH7XMm^=fNqSfzKhc?smWZEDE!aoYG+6p_MiXZ-+9g7c z2#rKB4>D;rLc$1HX5w6h>*11OVdTrclJx$eXkKSK?qNjR>#-cgOw>rb%a11IFqf`I z>B&xbjFSB_6*FpWssPFg$-i(8cM`T2Ry>+2#@H$TV8Y;3mo3>LX_3z;03!pKYVP9+ zxubF1WZvdOE^&rT`;f91gkpU08J4Rq)&z5NIh@3F*mpl^rfD9N;*Og-3YOAmF$#2@ ztIK){4?^si*PCCPTHDGhv-&t9Bhc2q<#aq%eYdkVTA$Jv%mAj`DYty6Xw`h56;kf1 z+fq*6^$I58q@|4NWg|`MhrrEiu7BnwcdMZcvE~h+B{VoU->tuV-u|Sc-RdUvY^9~Z zm)-V2mn*wo)Gqi9dFm3nMpxdGK&@~}Q*iGHI$@RC_&9tiJ}e1SQrewgdF@pHsJA|^ zsm`X_U-7fbPZ%hN^yxB3gQqJPG)#h zY=;@a#CF*;n@JvnB+wwn+aT~b7O@~#iBoNk@>obaK*$~MPWw*iBvlquryM`dPOgSr zF_y|&fI?t_o6KVz$GxN|B}lcB5(il=Bk`TaZQqHU&3p)_fO%;Ko0&>&j=A&|hQPuV zUs?0FTQ)FjEmuh*9s?tPs+Hh>nH*)1lk6|?n$4<)oS9%FQ#ntCG00hbkYbmFmZ>7v z9}*UF6vIX8C;l20C(47V7f17EBUTfHLZv21;U|vrZ*|d&V@U947puC{Wt+c>LmaEX*F{Shz7?6|Y}^=T5k(3|Y4wf5gR z&dS=8|C>jfOrgV%_diLVU?3paApf@^m?>l19HjQdZhn-nn@1O!vG6bOit4y!~fsC7zE@W%>OBnD#-;Z a1ei*)kpH&o|1d=X@%-oPjcWa;_5T6V#1k1& znOT|39l#MCz;&b0U~B}J%t@2b_yD_2M!3*h&}aC-n;P3;_C!MYd6QoolZ^S6&MUOs z=+rWyf2OEHyFVy9@0D%BawH>{N_PdiJNQ~7KY=d)%#+F4BTEZvh)ep?oEl;)X7R!OQ#O zUhN-#&FnCNN61(VFD*$AfTkAZ&d6gCloZ`pd@;<20&~vcjLz%jD3^SSv?H& z{*dLI^)w3;iYRr1AHr?ye8avR_QgHcD%U~bn6%tQA=#8r%EPH)*A=WE>(y5;OBBBi zV(Y!3?g?*9`2n^2@`vEHblFkOFM>7zur5b{ECEFkv{V$#>9HfU-n>;rax_I+j|>)R z0MGBiN|)xAT&iZpr{5|wTM^0RF7Ru^8&pIbm>`+XOYv`l7*hGkw&w&DF5qU(MLOjweA) z#WwT8{c(G5Mt*>_+j(1GP()0mDh3Y};WX%dHBj+)FrK|8PC|MeD z%Xh-)rPMsAjLwh%wPG|{rE9n~hd@pX)BHEzA|5~qmMiRxWb3voXh;dkkT{@~8`qoC zT-@|>qcABe)rBAwrF`a!zij}g8rQ2zSeVlh`%&vbb_y)v#IrZdebi$8j{MitYxE_q zGt;ch|AbZT?*9W;^#31N^GJ)R{=wS#w+*b;qFIzjntV}aw-_$5FQ;l>twT$DR;%p2 zO5*>(Dj{sg2*!F^M)VLME1$&lzhTY%0sfDPz)bMx+7@B}0Z}?6{h(qcb)!Q9Z0)fp z6Tkh6KL|8$zT!!a*ZSaUrG1Y34C)|11MeNXw1@&n*9pqqA@Ot{*R2{H;1M z`ZuGEZ!&jWKQx*rKdz52y}p2VCVd}$e(-*3NO*?H*|*Z=i)KfUwrpPT*~8=hPc{$W zW5XT~{Mx(AgL{X!4ychA!=lr5!*azkT>iLHhPQAL<9gV*x4}UdZ%ẉG?Ed|8zfl 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 f#iT _orders = new Lazy(() => locate(), true); - readonly static Lazy _users = new Lazy(() => locate(), true); - readonly static Lazy _admin = new Lazy(() => locate(), true); - static T locate() where T : class, IApiClient - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } + readonly static Lazy _orders = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); void print_update(T update) { diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 5022d6833..255a29c21 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/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.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/services/UserService.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/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/dynamic_orders.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/dynamic_orders.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/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/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.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/md2_tests.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/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/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/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.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/services/UserService.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/Executor.conf;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/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/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.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/md2_tests.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/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/service_compiler/templates/excel/excel.pb.cs b/src/lib/api/service_compiler/templates/excel/excel.pb.cs index 1ed7feef3..c3c2f3b5c 100644 --- a/src/lib/api/service_compiler/templates/excel/excel.pb.cs +++ b/src/lib/api/service_compiler/templates/excel/excel.pb.cs @@ -25,14 +25,21 @@ namespace {{package}} // {{comment}} public partial class {{name}}_Excel : IDisposable { - readonly static Lazy<{{name}}> _service = new Lazy<{{name}}>(() => locate<{{name}}>(), true); - static T locate() where T : class, IApiClient - { - using (var ctx = new api.core.ServiceContext()) - { - return ctx.locate(); - } - } + readonly static object _lock = new object(); + readonly static Lazy<{{name}}> _service = new Lazy<{{name}}>(() => bts.api.Locator.locate<{{name}}>(), true); + // volatile static api.core.ServiceContext _ctx; + // static T locate() where T : class, IApiClient + // { + // if(_ctx == null) + // { + // lock(_lock) + // { + // if (_ctx == null) + // _ctx = new api.core.ServiceContext(); + // } + // } + // return _ctx.locate(); + // } public void Dispose() { diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index ea073db71..2c0c0106d 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -883,7 +883,7 @@ void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, admin_data); if(cme_data!=nullptr){ for (const auto& cme_mic_data : cme_data->md_permissions()){ - MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user.name(), + MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, cme_mic_data); entitlements.push_back(rv); } @@ -891,10 +891,11 @@ void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, } } MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( - const std::string& user, + const BTSUser& user, const CMEMicData& cme_mic_data){ MDEntitlementReportUnit rv; - rv.set_user(user); + rv.set_user(user.name()); + rv.set_user_id(user.id()); rv.set_exchange("GLBX"); switch(cme_mic_data.mic()) { diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 9836c65ee..5e001ebf0 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -230,7 +230,7 @@ public: std::vector& entitlements); // Gets a reporting unit out of CMEMicData static MDEntitlementReportUnit get_cme_md_entitlement_unit( - const std::string& user, + const BTSUser& user, const CMEMicData& cme_mic_data); static void get_user_symbol_permissions( const AdminData& data, diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index f77a11eb8..e9df474d8 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -277,6 +277,18 @@ message SIMAccountData { string clearing_account = 40; } +enum ProfessionalDesignation +{ + PROFESSIONALDESIGNATION_PRO = 0; + PROFESSIONALDESIGNATION_NONPRO = 1; +} + +enum DisplayDesignation +{ + DISPLAYDESIGNATION_DISPLAY = 0; + DISPLAYDESIGNATION_NONDISPLAY = 1; +} + message CMEUserData{ string operator_id = 10; string ats_operator_id = 20; @@ -287,6 +299,8 @@ message CMEUserData{ string smp_instruction = 70; string max_order_rate_per_connection = 80; string location = 90; + ProfessionalDesignation pro_nonpro = 100; + DisplayDesignation display_nondisplay = 110; // add suff here repeated CMEMicData md_permissions = 1000; } @@ -371,6 +385,7 @@ message OrderCancelRequest{ message MDEntitlementReportUnit{ string record_id = 1 [(bts.api.key)=true]; string user = 10; + uint32 user_id=11; string exchange = 20; string mic = 30; bool enabled = 40; diff --git a/src/lib/domain_model/Security.proto b/src/lib/domain_model/Security.proto index 3d2b5f738..5e921021e 100644 --- a/src/lib/domain_model/Security.proto +++ b/src/lib/domain_model/Security.proto @@ -53,7 +53,11 @@ enum CMEMics { } enum ICEMics{ - ICE_FUTURES_CANADA=0; + ICE_UNSET=0; + ICE_US = 1; + ICE_EU = 2; + ICE_LIFFE = 3; + ICE_CA = 4; } enum Side { diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index 6cbfcfc08..e5fc8c2c4 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -17,6 +17,8 @@ #include "lib/api/services/MarketDataRelay.server.pb.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/AdminService.client.pb.h" +#include "lib/api/service_helpers/AdminServiceUtils.h" +#include "lib/config/protos/cme_reference_data.pb.h" #ifndef _WIN32 #include "lib/metrics/metrics.h" #endif @@ -357,7 +359,7 @@ public: if (groupiter != _groups.end()) { auto& group = groupiter->second; bool is_entitled = bypass_entitlement || - ch.exchange() == api::VENUE_SIM || + /*ch.exchange() == api::VENUE_SIM || */ ch.exchange() == api::VENUE_BTS || (entitlements && entitlements->count(ch.symbol())); fill(ch, *group, reply->add_channels(), is_entitled); @@ -517,28 +519,39 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, std::shared db.check_heartbeats(threadpool); }); container->health_timer->start(); - + // Subscribe to entitlement data container->entitlement_sub = - container->admin_client.subscribe_md_permissions_data().subscribe([=](const api::admin::Md_permissions_dataUpdate& update) { - auto entitlements = std::make_shared>(); - for (const auto& row : update.all()) { - if (row && row->enabled()) { - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert(row->symbol()); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert(row->symbol()); + container->admin_client.subscribe_md_entitlement_data().subscribe([=](const api::admin::Md_entitlement_dataUpdate& update) { + const auto& all_updates = update.all(); + utils::Dispatcher::background().post([all_updates, container]() + { + const auto& cme_symb_mics = config::get().cme_mic(); + auto entitlements = std::make_shared>(); + for (const auto& row : all_updates) { + if (row && row->enabled()) { + for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++){ + if(api::CMEMics_Name(mic->second) == row->mic()) { + const auto& symbol = mic->first; + auto iter = entitlements->find(row->user_id()); + if (iter == entitlements->end()) { + Entitlements ents; + ents.insert(symbol); + ents.insert("SIM:" + symbol); + entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); + } + else { + iter->second.insert(symbol); + iter->second.insert("SIM:" + symbol); + } + } + } } } - } - container->relay.update_entitlements(entitlements); + container->relay.update_entitlements(entitlements); + }); }); - // Add a few threads to keep md latency low for (int x = 1; x < std::min(4, os::num_cores()); ++x) { threadpool.add_thread(); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index ff1505cb9..526ff3804 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -241,12 +241,12 @@ void AdminServiceServer::_publish_md_entitlements(){ _md_entit_publisher.add_or_update(e); _md_entit_publisher.flush(); } -void AdminServiceServer::_publish_md_permissions(){ - std::vector perms; - for (const BTSUser* user : AdminServiceUtils::users(_state,false)) - AdminServiceUtils::get_user_symbol_permissions(_state,*user,perms); - for (const auto& p : perms) - _md_perm_publisher.add_or_update(p); - _md_perm_publisher.flush(); -} +// void AdminServiceServer::_publish_md_permissions(){ +// std::vector perms; +// for (const BTSUser* user : AdminServiceUtils::users(_state,false)) +// AdminServiceUtils::get_user_symbol_permissions(_state,*user,perms); +// for (const auto& p : perms) +// _md_perm_publisher.add_or_update(p); +// _md_perm_publisher.flush(); +// } }} diff --git a/src/web/ui/src/Accounts/Types.fs b/src/web/ui/src/Accounts/Types.fs index 402f009e8..a4eb88d62 100644 --- a/src/web/ui/src/Accounts/Types.fs +++ b/src/web/ui/src/Accounts/Types.fs @@ -14,8 +14,9 @@ type Tab = | ConnectionsTab | OrdersTab -let venues = Venue.values |> Array.skip 1 -let securityTypes = SecurityType.values |> Array.skip 1 +let venues = [| Venue.GLBX; Venue.SIM |] + +let securityTypes = [| SecurityType.FUTURE; SecurityType.SPREAD |] let emptyAccount = Access.Accounts.empty diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index e8b73011e..e4ee5b4c9 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -62,6 +62,8 @@ let defaultScratchUser = { smpInstruction = "" maxOrderRatePerConnection = "" location = "" + proNonpro = ProfessionalDesignation.PRO + displayNondisplay = DisplayDesignation.DISPLAY mdPermissions = [||] } simData = { @@ -186,6 +188,8 @@ let applyUpdate (field:UserField) (user:BTSUser) = | SimOperatorID oid -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with operatorId = oid } | SMPID smpid -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpId = smpid } | CMELocation loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with location = loc } + | CMEProNonPro loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with proNonpro = loc } + | CMEDisplayNonDisplay loc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with displayNondisplay = loc } | SimLocation loc -> updateSIMExchangeUserData user { user.userData.exchangeUserData.simData with location = loc } | SMPInstruction smpi -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with smpInstruction = smpi } | MaxOrderRatePerConnection morpc -> updateCMEExchangeUserData user { user.userData.exchangeUserData.cmeData with maxOrderRatePerConnection = morpc } diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 1beeb47f8..5f58e4854 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -25,6 +25,8 @@ type UserField = | AddAccount of string | RemoveAccount of string | CMEMic of CMEMicData +| CMEProNonPro of ProfessionalDesignation +| CMEDisplayNonDisplay of DisplayDesignation type Msg = diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 5388afa8c..9ed2fba4c 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -142,7 +142,8 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = let micList = [ for micValue in bts.api.CMEMics.values do yield ( - if (micValue = bts.api.CMEMics.UNSET) |> not then + if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || + micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then Fields.checkbox (sprintf "%O" micValue) ""