From f1fdaf1aca886e7242d04b455a616266d49657ff Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:28:35 -0600 Subject: [PATCH 1/5] dict for external id vs bts key --- src/client/spark_fix/session/DropCopySession.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/client/spark_fix/session/DropCopySession.cs b/src/client/spark_fix/session/DropCopySession.cs index 6f08dcab9..aaa757abf 100644 --- a/src/client/spark_fix/session/DropCopySession.cs +++ b/src/client/spark_fix/session/DropCopySession.cs @@ -31,6 +31,7 @@ namespace bts.fix protected readonly ConcurrentDictionary _order_cache = new ConcurrentDictionary(); protected readonly ConcurrentDictionary _fix_clorderids = new ConcurrentDictionary(); + protected readonly ConcurrentDictionary _external_id_vs_bts_key = new ConcurrentDictionary(); public DropCopySession(IFixRouter router, SessionID sess) : base(router, sess) { } @@ -105,7 +106,12 @@ namespace bts.fix throw new IncorrectTagValue(QuickFix.Fields.Tags.SecurityRequestType); } - + void _add_order_info_to_caches(OrderRecordImmutable o) { + _order_cache[o.Key] = o; + if (o.HasDef && !string.IsNullOrEmpty(o.Def.ExternalOrderId)) { + _external_id_vs_bts_key[o.Def.ExternalOrderId] = o.Key; + } + } virtual async protected void subscribe_fills_and_orders(SessionID sessionID) { @@ -120,7 +126,7 @@ namespace bts.fix foreach (var order in o.added) { var ostat = build_order_status(sessionID, order); - _order_cache[order.Key] = order; + _add_order_info_to_caches(order); _router.send(ostat, sessionID); } foreach (var order in o.changed) From a2c74813017d4633f204e1d0a60c0a15761133dd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:30:48 -0600 Subject: [PATCH 2/5] populate new ExternalOrderId field with ClOrdID --- src/client/spark_fix/session/OrderSession.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/spark_fix/session/OrderSession.cs b/src/client/spark_fix/session/OrderSession.cs index c3ef603ee..c72617d9f 100644 --- a/src/client/spark_fix/session/OrderSession.cs +++ b/src/client/spark_fix/session/OrderSession.cs @@ -128,8 +128,10 @@ create algo cr.Quantity = Convert.ToUInt32(Math.Abs(create.OrderQty.getValue())); } catch { throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderQty); } - if(!create.IsSetClOrdID()) + if (!create.IsSetClOrdID()) throw new IncorrectTagValue(QuickFix.Fields.Tags.ClOrdID); + else + def.ExternalOrderId = create.ClOrdID.ToString(); var resp = _orderservice.Value.create_order(cr); _fix_clorderids[resp.OrderKey] = create.ClOrdID.getValue(); From ed3bc9f71ce4e00befa1706d8e27d6388a8dee5f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:32:50 -0600 Subject: [PATCH 3/5] Cancel and Cancel-Replace shoud use OrigClOrdID to lookup bts key --- src/client/spark_fix/session/OrderSession.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/client/spark_fix/session/OrderSession.cs b/src/client/spark_fix/session/OrderSession.cs index c72617d9f..86db04d27 100644 --- a/src/client/spark_fix/session/OrderSession.cs +++ b/src/client/spark_fix/session/OrderSession.cs @@ -58,9 +58,10 @@ create algo virtual public void OnMessage(OrderCancelRequest cancel, SessionID s) { - var id = cancel.OrderID.getValue(); - if(!uint.TryParse(id, out uint key)) - throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderID); + var original_client_id = cancel.OrigClOrdID.getValue(); + if (!base._external_id_vs_bts_key.ContainsKey(original_client_id)) + throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID); + var key = base._external_id_vs_bts_key[original_client_id]; var resp = _orderservice.Value.cancel_order(new Cancel { OrderKey = key }); if (resp.ErrorCode != OrderError.Ok) { @@ -70,9 +71,10 @@ create algo virtual public void OnMessage(OrderCancelReplaceRequest replace, SessionID s) { - var id = replace.OrderID.getValue(); - if (!uint.TryParse(id, out uint key)) - throw new IncorrectTagValue(QuickFix.Fields.Tags.OrderID); + var original_client_id = replace.OrigClOrdID.getValue(); + if (!base._external_id_vs_bts_key.ContainsKey(original_client_id)) + throw new IncorrectTagValue(QuickFix.Fields.Tags.OrigClOrdID); + var key = base._external_id_vs_bts_key[original_client_id]; double price = Convert.ToDouble(replace.Price.getValue()); uint sz = Convert.ToUInt32(Math.Abs(replace.OrderQty.getValue())); var upd = new Update From 59692852b5cc72d49f1eae88d3cf28b7e06709c2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:33:49 -0600 Subject: [PATCH 4/5] New, Cancel-Replace, Cancel client sample FIX sequence --- src/client/spark_fix/session/OrderSession.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/client/spark_fix/session/OrderSession.cs b/src/client/spark_fix/session/OrderSession.cs index 86db04d27..eed685956 100644 --- a/src/client/spark_fix/session/OrderSession.cs +++ b/src/client/spark_fix/session/OrderSession.cs @@ -27,6 +27,14 @@ delete limit create algo 8=FIX.4.29=15635=D49=CQG56=SPARK34=150=3073797=N52=20200109-20:20:5011=900010081=ACC A21=255=SIM:ESH0207=SIM54=160=20200809-18:20:3238=1040=244=320059=06401=Lean8401=118402=28405=010=128 + jake: + new + 8=FIX.4.29=15635=D49=CQG56=SPARK34=150=3073797=N52=20200109-20:20:5011=86753091=ACC A21=255=SIM:ESH0207=SIM54=160=20200809-18:20:3238=1040=244=320059=010=128 + cancel-replace + 8=FIX.4.29=11035=G49=CQG56=SPARK37=1341=867530911=867531021=155=ESH054=160=20200113-19:45:2938=1040=244=320110=017 + cancel + 8=FIX.4.29=8935=F49=CQG56=SPARK41=867530937=1311=867531155=ESH054=160=20200113-19:45:2738=1010=123 + */ class OrderSession : DropCopySession { From 9864d0b0fc648c3e08552f7df9e0b73a3ecc0f4f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 19 Feb 2020 16:36:08 -0600 Subject: [PATCH 5/5] using enums instead of magic numbers; OrderID to NONE on cancel(replace) rejects --- src/client/spark_fix/session/SessionBase.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/spark_fix/session/SessionBase.cs b/src/client/spark_fix/session/SessionBase.cs index c8c7be20d..6615e1bbe 100644 --- a/src/client/spark_fix/session/SessionBase.cs +++ b/src/client/spark_fix/session/SessionBase.cs @@ -165,6 +165,7 @@ namespace bts.fix if (reject_reason == OrderError.UnknownOrder) { rej.CxlRejReason = new CxlRejReason(CxlRejReason.UNKNOWN_ORDER); rej.OrdStatus = new OrdStatus(OrdStatus.REJECTED); + rej.OrderID = new OrderID("NONE"); } if (refmessage is QuickFix.FIX42.OrderCancelRequest cancel) @@ -173,9 +174,9 @@ namespace bts.fix rej.SetField(cancel.ClOrdID); if (cancel.IsSetOrigClOrdID()) rej.SetField(cancel.OrigClOrdID); - if (cancel.IsSetOrderID()) + if (cancel.IsSetOrderID() && reject_reason != OrderError.UnknownOrder) rej.SetField(cancel.OrderID); - rej.CxlRejResponseTo = new CxlRejResponseTo('1'); + rej.CxlRejResponseTo = new CxlRejResponseTo(CxlRejResponseTo.ORDER_CANCEL_REQUEST); rej.Text = new Text(text); _router.send(rej, sess); } @@ -185,15 +186,14 @@ namespace bts.fix rej.SetField(replace.ClOrdID); if (replace.IsSetOrigClOrdID()) rej.SetField(replace.OrigClOrdID); - if (replace.IsSetOrderID()) + if (replace.IsSetOrderID() && reject_reason != OrderError.UnknownOrder) rej.SetField(replace.OrderID); - rej.CxlRejResponseTo = new CxlRejResponseTo('2'); + rej.CxlRejResponseTo = new CxlRejResponseTo(CxlRejResponseTo.ORDER_CANCEL_REPLACE_REQUEST); rej.Text = new Text(text); _router.send(rej, sess); } else throw new UnsupportedMessageType(); - } protected bool security_types_equal(bts.api.SecurityType btstype, QuickFix.Fields.SecurityType fixtype)