added ability to CancelOrder() by ClientOrderId (#734)

vslee · web-flow · commit ddc7138201fa · 2022-02-10T16:02:42.000-08:00
- many, but not all, exchanges support this
diff --git a/src/ExchangeSharp/API/Exchanges/Aquanow/ExchangeAquanowAPI.cs b/src/ExchangeSharp/API/Exchanges/Aquanow/ExchangeAquanowAPI.cs
@@ -233,8 +233,9 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string
 			return orderDetails;
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			var payload = await GetNoncePayloadAsync();
 			payload["orderId"] = orderId;
 			JToken token = await MakeJsonRequestAsync<JToken>("/trades/v1/order", null, payload, "DELETE");
diff --git a/src/ExchangeSharp/API/Exchanges/BL3P/ExchangeBL3PAPI.cs b/src/ExchangeSharp/API/Exchanges/BL3P/ExchangeBL3PAPI.cs
@@ -292,10 +292,11 @@ protected override async Task<ExchangeOrderBook> OnGetOrderBookAsync(string mark
 			return ConvertToExchangeOrderBook(maxCount, bl3pOrderBook);
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
 			if (string.IsNullOrWhiteSpace(marketSymbol))
 				throw new ArgumentException("Value cannot be null or whitespace.", nameof(marketSymbol));
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 
 			var resultBody = await MakeRequestAsync(
 					$"/{marketSymbol}/money/order/cancel",
diff --git a/src/ExchangeSharp/API/Exchanges/BTSE/ExchangeBTSEAPI.cs b/src/ExchangeSharp/API/Exchanges/BTSE/ExchangeBTSEAPI.cs
@@ -67,7 +67,7 @@ protected override async Task<IEnumerable<MarketCandle>> OnGetCandlesAsync(strin
 				this.ParseCandle(token, marketSymbol, periodSeconds, 1, 2, 3, 4, 0, TimestampType.UnixMilliseconds, 5));
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null, bool isClientOrderId = false)
 		{
 			var payload = await GetNoncePayloadAsync();
 
diff --git a/src/ExchangeSharp/API/Exchanges/BinanceGroup/BinanceGroupCommon.cs b/src/ExchangeSharp/API/Exchanges/BinanceGroup/BinanceGroupCommon.cs
@@ -733,15 +733,18 @@ private async Task<IEnumerable<ExchangeOrderResult>> OnGetMyTradesAsync(string?
 			return trades;
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null, bool isClientOrderId = false)
 		{
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
 			if (string.IsNullOrWhiteSpace(marketSymbol))
 			{
 				throw new ArgumentNullException("Binance cancel order request requires symbol");
 			}
 			payload["symbol"] = marketSymbol!;
-			payload["orderId"] = orderId;
+			if (isClientOrderId) // Either orderId or origClientOrderId must be sent.
+				payload["origClientOrderId"] = orderId;
+			else
+				payload["orderId"] = orderId;
             var token = await MakeJsonRequestAsync<JToken>("/order", BaseUrlApi, payload, "DELETE");
 			var cancelledOrder = ParseOrder(token);
 			if (cancelledOrder.OrderId != orderId)
diff --git a/src/ExchangeSharp/API/Exchanges/BitBank/ExchangeBitBankAPI.cs b/src/ExchangeSharp/API/Exchanges/BitBank/ExchangeBitBankAPI.cs
@@ -141,8 +141,9 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
 			return ParseOrder(token);
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
 			if (marketSymbol == null)
 				throw new APIException("Bitbank requries market symbol when cancelling orders");
diff --git a/src/ExchangeSharp/API/Exchanges/BitMEX/ExchangeBitMEXAPI.cs b/src/ExchangeSharp/API/Exchanges/BitMEX/ExchangeBitMEXAPI.cs
@@ -614,10 +614,10 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string
 			return orders[0];
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
-			payload["orderID"] = orderId;
+			payload[isClientOrderId ? "clOrdID" : "orderID"] = orderId;
 			JToken token = await MakeJsonRequestAsync<JToken>("/order", BaseUrl, payload, "DELETE");
 		}
 	
diff --git a/src/ExchangeSharp/API/Exchanges/Bitfinex/ExchangeBitfinexAPI.cs b/src/ExchangeSharp/API/Exchanges/Bitfinex/ExchangeBitfinexAPI.cs
@@ -569,8 +569,9 @@ protected override Task<IWebSocket> OnGetCompletedOrderDetailsWebSocketAsync(Act
 			});
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
 			payload["order_id"] = orderId.ConvertInvariant<long>();
 			var token = await MakeJsonRequestAsync<JToken>("/order/cancel", BaseUrlV1, payload);
diff --git a/src/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs b/src/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs
@@ -487,9 +487,10 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr
             return orders2;
         }
 
-        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
-        {
-            if (string.IsNullOrWhiteSpace(orderId))
+        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
+		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
+			if (string.IsNullOrWhiteSpace(orderId))
             {
                 throw new APIException("OrderId is needed for canceling order");
             }
diff --git a/src/ExchangeSharp/API/Exchanges/Bittrex/ExchangeBittrexAPI.cs b/src/ExchangeSharp/API/Exchanges/Bittrex/ExchangeBittrexAPI.cs
@@ -456,8 +456,9 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr
 			return orders;
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			await MakeJsonRequestAsync<JToken>("/orders/" + orderId, null, await GetNoncePayloadAsync(), "DELETE");
 		}
 
diff --git a/src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitAPI.cs b/src/ExchangeSharp/API/Exchanges/Bybit/ExchangeBybitAPI.cs
@@ -778,10 +778,13 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string
 			}
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
 			var extraParams = new Dictionary<string, object>();
-			extraParams["order_id"] = orderId;
+			if (isClientOrderId)
+				extraParams["order_link_id"] = orderId;
+			else
+				extraParams["order_id"] = orderId;
 			if (!string.IsNullOrWhiteSpace(marketSymbol))
 			{
 				extraParams["symbol"] = marketSymbol;
diff --git a/src/ExchangeSharp/API/Exchanges/Coinbase/ExchangeCoinbaseAPI.cs b/src/ExchangeSharp/API/Exchanges/Coinbase/ExchangeCoinbaseAPI.cs
@@ -807,9 +807,9 @@ private async Task MakeFillRequest(DateTime? afterDate, string productId, List<E
 			}
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
-			var jToken = await MakeJsonRequestAsync<JToken>("orders/" + orderId, null, await GetNoncePayloadAsync(), "DELETE");
+			var jToken = await MakeJsonRequestAsync<JToken>("orders/" + (isClientOrderId ? "client:" : "") + orderId, null, await GetNoncePayloadAsync(), "DELETE");
 			if (jToken.ToStringInvariant() != orderId)
 				throw new APIException($"Cancelled {jToken.ToStringInvariant()} when trying to cancel {orderId}");
 		}
diff --git a/src/ExchangeSharp/API/Exchanges/Coinmate/ExchangeCoinmateAPI.cs b/src/ExchangeSharp/API/Exchanges/Coinmate/ExchangeCoinmateAPI.cs
@@ -151,7 +151,7 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string
 			};
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
 			var payload = await GetNoncePayloadAsync();
 			payload["orderId"] = orderId;
diff --git a/src/ExchangeSharp/API/Exchanges/Digifinex/ExchangeDigifinexAPI.cs b/src/ExchangeSharp/API/Exchanges/Digifinex/ExchangeDigifinexAPI.cs
@@ -432,8 +432,9 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
 			return new ExchangeOrderResult { OrderId = token["order_id"].ToStringInvariant() };
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
 			payload["order_id"] = orderId;
 			JToken token = await MakeJsonRequestAsync<JToken>("/spot/order/cancel", payload: payload, requestMethod: "POST");
diff --git a/src/ExchangeSharp/API/Exchanges/FTX/FTXGroupCommon.cs b/src/ExchangeSharp/API/Exchanges/FTX/FTXGroupCommon.cs
@@ -23,9 +23,15 @@ public FTXGroupCommon()
 		#region [ Implementation ]
 
 		/// <inheritdoc />
-		protected async override Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected async override Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
-			await MakeJsonRequestAsync<JToken>($"/orders/{orderId}", null, await GetNoncePayloadAsync(), "DELETE");
+			var url = "/orders/";
+			if (isClientOrderId)
+			{
+				url += "by_client_id/";
+			}
+
+			await MakeJsonRequestAsync<JToken>($"{url}{orderId}", null, await GetNoncePayloadAsync(), "DELETE");
 		}
 
 		/// <inheritdoc />
diff --git a/src/ExchangeSharp/API/Exchanges/GateIo/ExchangeGateIoAPI.cs b/src/ExchangeSharp/API/Exchanges/GateIo/ExchangeGateIoAPI.cs
@@ -421,12 +421,13 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr
 			return responseToken.Select(x => ParseOrder(x)).ToArray();
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string symbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string symbol = null, bool isClientOrderId = false)
 		{
 			if (string.IsNullOrEmpty(symbol))
 			{
 				throw new InvalidOperationException("MarketSymbol is required for cancelling order with Gate.io API");
 			}
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 
 			Dictionary<string, object> payload = await GetNoncePayloadAsync();
 			await MakeJsonRequestAsync<JToken>($"/spot/orders/{orderId}?currency_pair={symbol}", BaseUrl, payload, "DELETE");
diff --git a/src/ExchangeSharp/API/Exchanges/Gemini/ExchangeGeminiAPI.cs b/src/ExchangeSharp/API/Exchanges/Gemini/ExchangeGeminiAPI.cs
@@ -355,8 +355,9 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetOpenOrderDe
 			return orders;
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			object nonce = await GenerateNonceAsync();
 			await MakeJsonRequestAsync<JToken>("/order/cancel", null, new Dictionary<string, object> { { "nonce", nonce }, { "order_id", orderId } });
 		}
diff --git a/src/ExchangeSharp/API/Exchanges/Hitbtc/ExchangeHitbtcAPI.cs b/src/ExchangeSharp/API/Exchanges/Hitbtc/ExchangeHitbtcAPI.cs
@@ -353,10 +353,11 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
             return result;
         }
 
-        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
-        {
-            // this call returns info about the success of the cancel. Sure would be nice have a return type on this method.
-            JToken token = await MakeJsonRequestAsync<JToken>("/order/" + orderId, null, await GetNoncePayloadAsync(), "DELETE");
+        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
+		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
+			// this call returns info about the success of the cancel. Sure would be nice have a return type on this method.
+			JToken token = await MakeJsonRequestAsync<JToken>("/order/" + orderId, null, await GetNoncePayloadAsync(), "DELETE");
         }
 
         private void ParseAveragePriceAndFeesFromFills(ExchangeOrderResult result, JToken fillsToken)
diff --git a/src/ExchangeSharp/API/Exchanges/Huobi/ExchangeHuobiAPI.cs b/src/ExchangeSharp/API/Exchanges/Huobi/ExchangeHuobiAPI.cs
@@ -717,10 +717,16 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
             return ParsePlaceOrder(obj, order);
         }
 
-        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
-        {
+        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
+		{
             var payload = await GetNoncePayloadAsync();
-            await MakeJsonRequestAsync<JToken>($"/order/orders/{orderId}/submitcancel", PrivateUrlV1, payload, "POST");
+			JToken data;
+			if (isClientOrderId)
+			{
+				payload.Add("clientOrderId", orderId);
+				data = await MakeJsonRequestAsync<JToken>($"/order/orders/submitCancelClientOrder", PrivateUrlV1, payload, "POST");
+			}
+			else data = await MakeJsonRequestAsync<JToken>($"/order/orders/{orderId}/submitcancel", PrivateUrlV1, payload, "POST");
         }
 
         protected override async Task<IEnumerable<ExchangeTransaction>> OnGetDepositHistoryAsync(string currency)
diff --git a/src/ExchangeSharp/API/Exchanges/Kraken/ExchangeKrakenAPI.cs b/src/ExchangeSharp/API/Exchanges/Kraken/ExchangeKrakenAPI.cs
@@ -768,8 +768,9 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr
 		//    return token["trades"].Select(t => TradeHistoryToExchangeOrderResult(t));
 		//}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			object nonce = await GenerateNonceAsync();
 			Dictionary<string, object> payload = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase)
 			{ { "txid", orderId }, { "nonce", nonce }
diff --git a/src/ExchangeSharp/API/Exchanges/KuCoin/ExchangeKuCoinAPI.cs b/src/ExchangeSharp/API/Exchanges/KuCoin/ExchangeKuCoinAPI.cs
@@ -422,20 +422,11 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
         /// </summary>
         /// <param name="orderId">The Original Order Id return from Place Order</param>
         /// <returns></returns>
-        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
-        {
-            // Find order detail
-            ExchangeOrderResult order = await GetOrderDetailsAsync(orderId, marketSymbol: marketSymbol);
-
-            // There is no order to be cancelled
-            if (order == null)
-            {
-                return;
-            }
-
+        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
+		{
             var payload = await GetNoncePayloadAsync();
 
-            JToken token = await MakeJsonRequestAsync<JToken>("/orders/" + orderId, null, payload, "DELETE");
+			JToken token = await MakeJsonRequestAsync<JToken>(isClientOrderId ? "/order/client-order/" : "/orders/" + orderId, null, payload, "DELETE");
         }
 
         protected override async Task<ExchangeDepositDetails> OnGetDepositAddressAsync(string currency, bool forceRegenerate = false)
diff --git a/src/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs b/src/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs
@@ -345,8 +345,9 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr
 		}
 
 		//CancelOrder   12
-		protected override async Task OnCancelOrderAsync(string orderId, string symbol = null)
+		protected override async Task OnCancelOrderAsync(string orderId, string symbol = null, bool isClientOrderId = false)
 		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
 			Dictionary<string, object> payload = new Dictionary<string, object>
 			{
 				{ "api_key", PublicApiKey.ToUnsecureString() },
diff --git a/src/ExchangeSharp/API/Exchanges/Livecoin/ExchangeLivecoinAPI.cs b/src/ExchangeSharp/API/Exchanges/Livecoin/ExchangeLivecoinAPI.cs
@@ -286,10 +286,11 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
             return new ExchangeOrderResult() { OrderId = token["orderId"].ToStringInvariant(), Result = ExchangeAPIOrderResult.Open };
         }
 
-        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)
-        {
-            // can only cancel limit orders, which kinda makes sense, but we also need the currency pair, which requires a lookup
-            var order = await OnGetOrderDetailsAsync(orderId);
+        protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)
+		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
+			// can only cancel limit orders, which kinda makes sense, but we also need the currency pair, which requires a lookup
+			var order = await OnGetOrderDetailsAsync(orderId);
             if (order != null)
             {
                 // { "success": true,"cancelled": true,"message": null,"quantity": 0.0005,"tradeQuantity": 0}
diff --git a/src/ExchangeSharp/API/Exchanges/NDAX/ExchangeNDAXAPI.cs b/src/ExchangeSharp/API/Exchanges/NDAX/ExchangeNDAXAPI.cs
@@ -226,9 +226,10 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetOpenOrderDe
         }
 
 
-        protected override async Task OnCancelOrderAsync(string orderId, string symbol = null)
-        {
-            var result = await MakeJsonRequestAsync<GenericResponse>("CancelOrder", null,
+        protected override async Task OnCancelOrderAsync(string orderId, string symbol = null, bool isClientOrderId = false)
+		{
+			if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");
+			var result = await MakeJsonRequestAsync<GenericResponse>("CancelOrder", null,
                 new Dictionary<string, object>()
                 {
                     {"OrderId", orderId},
diff --git a/src/ExchangeSharp/API/Exchanges/OKGroup/ExchangeOKExAPI.cs b/src/ExchangeSharp/API/Exchanges/OKGroup/ExchangeOKExAPI.cs
@@ -295,7 +295,7 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string
 			return ParseOrders(token).First();
 		}
 
-		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol)
+		protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol, bool isClientOrderId = false)
 		{
 			if (string.IsNullOrEmpty(orderId))
 			{
@@ -308,7 +308,10 @@ protected override async Task OnCancelOrderAsync(string orderId, string marketSy
 			}
 
 			var payload = await GetNoncePayloadAsync();
-			payload["ordId"] = orderId;
+			if (isClientOrderId)
+				payload["client_oid "] = orderId;
+			else
+				payload["ordId"] = orderId;
 			payload["instId"] = marketSymbol;
 			await MakeJsonRequestAsync<JToken>("/trade/cancel-order", BaseUrlV5, payload, "POST");
 		}
diff --git a/src/ExchangeSharp/API/Exchanges/OKGroup/OKGroupCommon.cs b/src/ExchangeSharp/API/Exchanges/OKGroup/OKGroupCommon.cs
diff --git a/src/ExchangeSharp/API/Exchanges/Poloniex/ExchangePoloniexAPI.cs b/src/ExchangeSharp/API/Exchanges/Poloniex/ExchangePoloniexAPI.cs
diff --git a/src/ExchangeSharp/API/Exchanges/Yobit/ExchangeYobitAPI.cs b/src/ExchangeSharp/API/Exchanges/Yobit/ExchangeYobitAPI.cs
diff --git a/src/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs b/src/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs
diff --git a/src/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs b/src/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs

Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,9 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string`
`233`	`233`	`return orderDetails;`
`234`	`234`	`}`
`235`	`235`
`236`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`236`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`237`	`237`	`{`
	`238`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
`238`	`239`	`var payload = await GetNoncePayloadAsync();`
`239`	`240`	`payload["orderId"] = orderId;`
`240`	`241`	`JToken token = await MakeJsonRequestAsync<JToken>("/trades/v1/order", null, payload, "DELETE");`
Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,11 @@ protected override async Task<ExchangeOrderBook> OnGetOrderBookAsync(string mark`
`292`	`292`	`return ConvertToExchangeOrderBook(maxCount, bl3pOrderBook);`
`293`	`293`	`}`
`294`	`294`
`295`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`295`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`296`	`296`	`{`
`297`	`297`	`if (string.IsNullOrWhiteSpace(marketSymbol))`
`298`	`298`	`throw new ArgumentException("Value cannot be null or whitespace.", nameof(marketSymbol));`
	`299`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
`299`	`300`
`300`	`301`	`var resultBody = await MakeRequestAsync(`
`301`	`302`	`$"/{marketSymbol}/money/order/cancel",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected override async Task<IEnumerable<MarketCandle>> OnGetCandlesAsync(strin`
`67`	`67`	`this.ParseCandle(token, marketSymbol, periodSeconds, 1, 2, 3, 4, 0, TimestampType.UnixMilliseconds, 5));`
`68`	`68`	`}`
`69`	`69`
`70`		`- protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null)`
	`70`	`+ protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null, bool isClientOrderId = false)`
`71`	`71`	`{`
`72`	`72`	`var payload = await GetNoncePayloadAsync();`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -733,15 +733,18 @@ private async Task<IEnumerable<ExchangeOrderResult>> OnGetMyTradesAsync(string?`
`733`	`733`	`return trades;`
`734`	`734`	`}`
`735`	`735`
`736`		`- protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null)`
	`736`	`+ protected override async Task OnCancelOrderAsync(string orderId, string? marketSymbol = null, bool isClientOrderId = false)`
`737`	`737`	`{`
`738`	`738`	`Dictionary<string, object> payload = await GetNoncePayloadAsync();`
`739`	`739`	`if (string.IsNullOrWhiteSpace(marketSymbol))`
`740`	`740`	`{`
`741`	`741`	`throw new ArgumentNullException("Binance cancel order request requires symbol");`
`742`	`742`	`}`
`743`	`743`	`payload["symbol"] = marketSymbol!;`
`744`		`- payload["orderId"] = orderId;`
	`744`	`+ if (isClientOrderId) // Either orderId or origClientOrderId must be sent.`
	`745`	`+ payload["origClientOrderId"] = orderId;`
	`746`	`+ else`
	`747`	`+ payload["orderId"] = orderId;`
`745`	`748`	`var token = await MakeJsonRequestAsync<JToken>("/order", BaseUrlApi, payload, "DELETE");`
`746`	`749`	`var cancelledOrder = ParseOrder(token);`
`747`	`750`	`if (cancelledOrder.OrderId != orderId)`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,9 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd`
`141`	`141`	`return ParseOrder(token);`
`142`	`142`	`}`
`143`	`143`
`144`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`144`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`145`	`145`	`{`
	`146`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
`146`	`147`	`Dictionary<string, object> payload = await GetNoncePayloadAsync();`
`147`	`148`	`if (marketSymbol == null)`
`148`	`149`	`throw new APIException("Bitbank requries market symbol when cancelling orders");`
Original file line number	Diff line number	Diff line change
`@@ -614,10 +614,10 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string`
`614`	`614`	`return orders[0];`
`615`	`615`	`}`
`616`	`616`
`617`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`617`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`618`	`618`	`{`
`619`	`619`	`Dictionary<string, object> payload = await GetNoncePayloadAsync();`
`620`		`- payload["orderID"] = orderId;`
	`620`	`+ payload[isClientOrderId ? "clOrdID" : "orderID"] = orderId;`
`621`	`621`	`JToken token = await MakeJsonRequestAsync<JToken>("/order", BaseUrl, payload, "DELETE");`
`622`	`622`	`}`
`623`	`623`
Original file line number	Diff line number	Diff line change
`@@ -569,8 +569,9 @@ protected override Task<IWebSocket> OnGetCompletedOrderDetailsWebSocketAsync(Act`
`569`	`569`	`});`
`570`	`570`	`}`
`571`	`571`
`572`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`572`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`573`	`573`	`{`
	`574`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
`574`	`575`	`Dictionary<string, object> payload = await GetNoncePayloadAsync();`
`575`	`576`	`payload["order_id"] = orderId.ConvertInvariant<long>();`
`576`	`577`	`var token = await MakeJsonRequestAsync<JToken>("/order/cancel", BaseUrlV1, payload);`
Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,10 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr`
`487`	`487`	`return orders2;`
`488`	`488`	`}`
`489`	`489`
`490`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
`491`		`- {`
`492`		`- if (string.IsNullOrWhiteSpace(orderId))`
	`490`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
	`491`	`+ {`
	`492`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
	`493`	`+ if (string.IsNullOrWhiteSpace(orderId))`
`493`	`494`	`{`
`494`	`495`	`throw new APIException("OrderId is needed for canceling order");`
`495`	`496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -456,8 +456,9 @@ protected override async Task<IEnumerable<ExchangeOrderResult>> OnGetCompletedOr`
`456`	`456`	`return orders;`
`457`	`457`	`}`
`458`	`458`
`459`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`459`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`460`	`460`	`{`
	`461`	`+ if (isClientOrderId) throw new NotSupportedException("Cancelling by client order ID is not supported in ExchangeSharp. Please submit a PR if you are interested in this feature");`
`461`	`462`	`await MakeJsonRequestAsync<JToken>("/orders/" + orderId, null, await GetNoncePayloadAsync(), "DELETE");`
`462`	`463`	`}`
`463`	`464`
Original file line number	Diff line number	Diff line change
`@@ -778,10 +778,13 @@ protected override async Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string`
`778`	`778`	`}`
`779`	`779`	`}`
`780`	`780`
`781`		`- protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null)`
	`781`	`+ protected override async Task OnCancelOrderAsync(string orderId, string marketSymbol = null, bool isClientOrderId = false)`
`782`	`782`	`{`
`783`	`783`	`var extraParams = new Dictionary<string, object>();`
`784`		`- extraParams["order_id"] = orderId;`
	`784`	`+ if (isClientOrderId)`
	`785`	`+ extraParams["order_link_id"] = orderId;`
	`786`	`+ else`
	`787`	`+ extraParams["order_id"] = orderId;`
`785`	`788`	`if (!string.IsNullOrWhiteSpace(marketSymbol))`
`786`	`789`	`{`
`787`	`790`	`extraParams["symbol"] = marketSymbol;`