Added support for setting BrokerId

JKorf · Sep 30, 2023 · d83beb5 · d83beb5
1 parent 4dea2c5
commit d83beb5
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 14 deletions.
diff --git a/OKX.Net/Clients/UnifiedApi/OKXRestClientUnifiedApi.cs b/OKX.Net/Clients/UnifiedApi/OKXRestClientUnifiedApi.cs
@@ -11,6 +11,8 @@ internal class OKXRestClientUnifiedApi : RestApiClient, IOKXRestClientUnifiedApi
     #region Internal Fields
     private static TimeSyncState _timeSyncState = new("Unified Api");
 
+    internal readonly string _ref = "078ee129065aBCDE";
+
     public event Action<OrderId>? OnOrderPlaced;
     public event Action<OrderId>? OnOrderCanceled;
     #endregion
@@ -32,6 +34,8 @@ internal OKXRestClientUnifiedApi(ILogger logger, HttpClient? httpClient, OKXRest
         Trading = new OKXRestClientUnifiedApiTrading(this);
         SubAccounts = new OKXRestClientUnifiedApiSubAccounts(this);
 
+        _ref = !string.IsNullOrEmpty(options.BrokerId) ? options.BrokerId : "078ee129065aBCDE";
+
         if (options.Environment.EnvironmentName == TradeEnvironmentNames.Testnet)
         {
             StandardRequestHeaders = new Dictionary<string, string>

diff --git a/OKX.Net/Clients/UnifiedApi/OKXRestClientUnifiedApiTrading.cs b/OKX.Net/Clients/UnifiedApi/OKXRestClientUnifiedApiTrading.cs
@@ -7,7 +7,6 @@
 namespace OKX.Net.Clients.UnifiedApi;
 internal class OKXRestClientUnifiedApiTrading : IOKXRestClientUnifiedApiTrading
 {
-    private const string _ref = "078ee129065aBCDE";
     private const string _bodyParameterKey = "<BODY>";
 
     private static Random _random = new Random();
@@ -70,8 +69,8 @@ public virtual async Task<WebCallResult<OKXOrderPlaceResponse>> PlaceOrderAsync(
             {"side", JsonConvert.SerializeObject(side, new OrderSideConverter(false)) },
             {"ordType", JsonConvert.SerializeObject(type, new OrderTypeConverter(false)) },
             {"sz", quantity.ToString(CultureInfo.InvariantCulture) },
-            {"tag", _ref },
-            {"clOrdId",  _ref + (clientOrderId ?? RandomString(15)) },
+            {"tag", _baseClient._ref },
+            {"clOrdId",  _baseClient._ref + (clientOrderId ?? RandomString(15)) },
         };
         parameters.AddOptionalParameter("px", price?.ToString(CultureInfo.InvariantCulture));
         parameters.AddOptionalParameter("ccy", asset);
@@ -119,8 +118,8 @@ public virtual async Task<WebCallResult<IEnumerable<OKXOrderPlaceResponse>>> Pla
     {
         foreach (var order in orders)
         {
-            order.Tag = _ref;
-            order.ClientOrderId = _ref + (order.ClientOrderId ?? RandomString(15));
+            order.Tag = _baseClient._ref;
+            order.ClientOrderId = _baseClient._ref + (order.ClientOrderId ?? RandomString(15));
         }
 
         var parameters = new Dictionary<string, object>
@@ -276,8 +275,8 @@ public virtual async Task<WebCallResult<OKXClosePositionResponse>> ClosePosition
         var parameters = new Dictionary<string, object> {
             {"instId", symbol },
             {"mgnMode", JsonConvert.SerializeObject(marginMode, new MarginModeConverter(false)) },
-            {"tag", "c84128021aecBCDE" },
-            {"clOrdId", _ref + RandomString(15) }
+            {"tag", _baseClient._ref },
+            {"clOrdId", _baseClient._ref + RandomString(15) }
 
         };
         if (positionSide.HasValue)
@@ -565,8 +564,8 @@ public virtual async Task<WebCallResult<OKXAlgoOrderResponse>> PlaceAlgoOrderAsy
             {"side", JsonConvert.SerializeObject(orderSide, new OrderSideConverter(false)) },
             {"ordType", JsonConvert.SerializeObject(algoOrderType, new AlgoOrderTypeConverter(false)) },
             {"sz", quantity.ToString() },
-            {"tag", _ref },
-            {"clOrdId", _ref + RandomString(15) }
+            {"tag", _baseClient._ref },
+            {"clOrdId", _baseClient._ref + RandomString(15) }
         };
         parameters.AddOptionalParameter("ccy", asset);
         parameters.AddOptionalParameter("reduceOnly", reduceOnly);

diff --git a/OKX.Net/Clients/UnifiedApi/OKXSocketClientUnifiedApi.cs b/OKX.Net/Clients/UnifiedApi/OKXSocketClientUnifiedApi.cs
@@ -19,6 +19,7 @@ public class OKXSocketClientUnifiedApi : SocketApiClient, IOKXSocketClientUnifie
     /// <inheritdoc />
     public IOKXSocketClientUnifiedApiTrading Trading { get; }
 
+    internal readonly string _ref = "078ee129065aBCDE";
     private bool _demoTrading;
     #region ctor
 
@@ -33,6 +34,8 @@ internal OKXSocketClientUnifiedApi(ILogger logger, OKXSocketOptions options) :
         ExchangeData = new OKXSocketClientUnifiedApiExchangeData(logger, this);
         Trading = new OKXSocketClientUnifiedApiTrading(logger, this);
 
+        _ref = !string.IsNullOrEmpty(options.BrokerId) ? options.BrokerId : "078ee129065aBCDE";
+
         _demoTrading = options.Environment.EnvironmentName == TradeEnvironmentNames.Testnet;
     }
     #endregion

diff --git a/OKX.Net/Clients/UnifiedApi/OKXSocketClientUnifiedApiTrading.cs b/OKX.Net/Clients/UnifiedApi/OKXSocketClientUnifiedApiTrading.cs
@@ -12,7 +12,6 @@ public class OKXSocketClientUnifiedApiTrading : IOKXSocketClientUnifiedApiTradin
 {
     private readonly OKXSocketClientUnifiedApi _client;
     private static Random _random = new Random();
-    private const string _ref = "078ee129065aBCDE";
 
     private readonly ILogger _logger;
 
@@ -53,8 +52,8 @@ public async Task<CallResult<OKXOrderPlaceResponse>> PlaceOrderAsync(string symb
         };
 
         parameters.AddOptionalParameter("ccy", asset);
-        parameters.AddOptionalParameter("clOrdId", _ref + (clientOrderId ?? RandomString(15)));
-        parameters.AddOptionalParameter("tag", _ref);
+        parameters.AddOptionalParameter("clOrdId", _client._ref + (clientOrderId ?? RandomString(15)));
+        parameters.AddOptionalParameter("tag", _client._ref);
         parameters.AddOptionalParameter("posSide", EnumConverter.GetString(positionSide));
         parameters.AddOptionalParameter("px", price?.ToString(CultureInfo.InvariantCulture));
         parameters.AddOptionalParameter("reduceOnly", reduceOnly);
@@ -75,8 +74,8 @@ public async Task<CallResult<IEnumerable<OKXOrderPlaceResponse>>> PlaceMultipleO
     {
         foreach (var order in orders)
         {
-            order.Tag = _ref;
-            order.ClientOrderId = _ref + (order.ClientOrderId ?? RandomString(15));
+            order.Tag = _client._ref;
+            order.ClientOrderId = _client._ref + (order.ClientOrderId ?? RandomString(15));
         }
 
         return await _client.QueryInternalAsync<IEnumerable<OKXOrderPlaceResponse>>(_client.GetUri("/ws/v5/private"), "batch-orders", orders, true, 1).ConfigureAwait(false);

diff --git a/OKX.Net/OKX.Net.xml b/OKX.Net/OKX.Net.xml
diff --git a/OKX.Net/Objects/Options/OKXRestOptions.cs b/OKX.Net/Objects/Options/OKXRestOptions.cs
@@ -21,6 +21,11 @@ public class OKXRestOptions : RestExchangeOptions<OKXEnvironment, OKXApiCredenti
     /// </summary>
     public bool SignPublicRequests { get; set; }
 
+    /// <summary>
+    /// Broker ID for earning rebates
+    /// </summary>
+    public string? BrokerId { get; set; }
+
     /// <summary>
     /// Options for the  unified API
     /// </summary>
@@ -30,6 +35,7 @@ internal OKXRestOptions Copy()
     {
         var options = Copy<OKXRestOptions>();
         options.SignPublicRequests = SignPublicRequests;
+        options.BrokerId = BrokerId;
         options.UnifiedOptions = UnifiedOptions.Copy<RestApiOptions>();
         return options;
     }

diff --git a/OKX.Net/Objects/Options/OKXSocketOptions.cs b/OKX.Net/Objects/Options/OKXSocketOptions.cs
@@ -17,6 +17,11 @@ public class OKXSocketOptions : SocketExchangeOptions<OKXEnvironment>
         Environment = OKXEnvironment.Live
     };
 
+    /// <summary>
+    /// Broker ID for earning rebates
+    /// </summary>
+    public string? BrokerId { get; set; }
+
     /// <summary>
     /// Options for the Unified API
     /// </summary>
@@ -25,6 +30,7 @@ public class OKXSocketOptions : SocketExchangeOptions<OKXEnvironment>
     internal OKXSocketOptions Copy()
     {
         var options = Copy<OKXSocketOptions>();
+        options.BrokerId = BrokerId;
         options.UnifiedOptions = UnifiedOptions.Copy<SocketApiOptions>();
         return options;
     }