CryptoExchange.Net v8.0.0, shared interfaces

JKorf · Sep 27, 2024 · 4d2985f · 4d2985f
1 parent 74b341a
commit 4d2985f
Show file tree

Hide file tree

Showing 33 changed files with 2,641 additions and 46 deletions.
diff --git a/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/GetCrossMarginPositionMode.txt b/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/GetCrossMarginPositionMode.txt
@@ -3,11 +3,11 @@ GET
 true
 {
   "status": "ok",
-  "data": [
+  "data": 
     {
       "margin_account": "USDT",
       "position_mode": "single_side"
     }
-  ],
+  ,
   "ts": 1566899973811
 }
diff --git a/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/GetIsolatedMarginPositionMode.txt b/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/GetIsolatedMarginPositionMode.txt
@@ -3,11 +3,11 @@ GET
 true
 {
   "status": "ok",
-  "data": [
+  "data": 
     {
       "margin_account": "USDT",
       "position_mode": "single_side"
     }
-  ],
+  ,
   "ts": 1566899973811
 }
diff --git a/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/SetCrossMarginPositionMode.txt b/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/SetCrossMarginPositionMode.txt
@@ -3,11 +3,11 @@ POST
 true
 {
   "status": "ok",
-  "data": [
+  "data": 
     {
       "margin_account": "USDT",
       "position_mode": "single_side"
     }
-  ],
+  ,
   "ts": 1566899973811
 }
diff --git a/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/SetIsolatedMarginPositionMode.txt b/HTX.Net.UnitTests/Endpoints/UsdtMarginSwap/Account/SetIsolatedMarginPositionMode.txt
@@ -3,11 +3,11 @@ POST
 true
 {
   "status": "ok",
-  "data": [
+  "data": 
     {
       "margin_account": "BTC-USDT",
       "position_mode": "single_side"
     }
-  ],
+  ,
   "ts": 1566899973811
 }
diff --git a/HTX.Net.UnitTests/TestImplementations/TestSocket.cs b/HTX.Net.UnitTests/TestImplementations/TestSocket.cs
@@ -19,6 +19,7 @@ public class TestSocket: IWebsocket
         public event Func<Task> OnReconnected;
         public event Func<Task> OnReconnecting;
         public event Func<int, Task> OnRequestRateLimited;
+        public event Func<Task> OnConnectRateLimited;
 #pragma warning restore 0067
         public event Func<int, Task> OnRequestSent;
         public event Func<WebSocketMessageType, ReadOnlyMemory<byte>, Task> OnStreamMessage;

diff --git a/HTX.Net/Clients/SpotApi/HTXRestClientSpotApi.cs b/HTX.Net/Clients/SpotApi/HTXRestClientSpotApi.cs
@@ -2,6 +2,7 @@
 using CryptoExchange.Net.CommonObjects;
 using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Interfaces.CommonClients;
+using CryptoExchange.Net.SharedApis;
 using HTX.Net.Enums;
 using HTX.Net.Interfaces.Clients.SpotApi;
 using HTX.Net.Objects.Internal;
@@ -10,7 +11,7 @@
 namespace HTX.Net.Clients.SpotApi
 {
     /// <inheritdoc />
-    internal class HTXRestClientSpotApi : RestApiClient, IHTXRestClientSpotApi, ISpotClient
+    internal partial class HTXRestClientSpotApi : RestApiClient, IHTXRestClientSpotApi, ISpotClient
     {
         /// <inheritdoc />
         public new HTXRestOptions ClientOptions => (HTXRestOptions)base.ClientOptions;
@@ -64,8 +65,12 @@ internal HTXRestClientSpotApi(ILogger logger, HttpClient? httpClient, HTXRestOpt
 
         protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer();
 
+
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToLowerInvariant()}{quoteAsset.ToLowerInvariant()}";
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null)
+        {
+            return $"{baseAsset.ToLowerInvariant()}{quoteAsset.ToLowerInvariant()}";
+        }
 
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
@@ -529,5 +534,6 @@ protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync()
         /// <inheritdoc />
         /// TODO make this take an accountId param so we don't need it in the interface?
         public ISpotClient CommonSpotClient => this;
+        public IHTXRestClientSpotApiShared SharedClient => this;
     }
 }
diff --git a/HTX.Net/Clients/SpotApi/HTXRestClientSpotApiAccount.cs b/HTX.Net/Clients/SpotApi/HTXRestClientSpotApiAccount.cs
@@ -371,7 +371,7 @@ public async Task<WebCallResult<long>> CancelWithdrawalAsync(long id, Cancellati
         #region Get Withdraw Deposit History
 
         /// <inheritdoc />
-        public async Task<WebCallResult<IEnumerable<HTXWithdrawDeposit>>> GetWithdrawDepositHistoryAsync(WithdrawDepositType type, string? asset = null, int? from = null, int? size = null, FilterDirection? direction = null, CancellationToken ct = default)
+        public async Task<WebCallResult<IEnumerable<HTXWithdrawDeposit>>> GetWithdrawDepositHistoryAsync(WithdrawDepositType type, string? asset = null, long? from = null, int? size = null, FilterDirection? direction = null, CancellationToken ct = default)
         {
             asset = asset?.ToLowerInvariant();
 

diff --git a/HTX.Net/Clients/SpotApi/HTXRestClientSpotApiShared.cs b/HTX.Net/Clients/SpotApi/HTXRestClientSpotApiShared.cs
diff --git a/HTX.Net/Clients/SpotApi/HTXSocketClientSpotApi.cs b/HTX.Net/Clients/SpotApi/HTXSocketClientSpotApi.cs
@@ -2,6 +2,7 @@
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.SharedApis;
 using CryptoExchange.Net.Sockets;
 using HTX.Net.Enums;
 using HTX.Net.Interfaces.Clients.SpotApi;
@@ -17,7 +18,7 @@
 namespace HTX.Net.Clients.SpotApi
 {
     /// <inheritdoc />
-    internal class HTXSocketClientSpotApi : SocketApiClient, IHTXSocketClientSpotApi
+    internal partial class HTXSocketClientSpotApi : SocketApiClient, IHTXSocketClientSpotApi
     {
         private static readonly MessagePath _idPath = MessagePath.Get().Property("id");
         private static readonly MessagePath _actionPath = MessagePath.Get().Property("action");
@@ -45,8 +46,10 @@ internal HTXSocketClientSpotApi(ILogger logger, HTXSocketOptions options)
 
         protected override IByteMessageAccessor CreateAccessor() => new SystemTextJsonByteMessageAccessor();
 
+        public IHTXSocketClientSpotApiShared SharedClient => this;
+
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToLowerInvariant()}{quoteAsset.ToLowerInvariant()}";
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => $"{baseAsset.ToLowerInvariant()}{quoteAsset.ToLowerInvariant()}";
 
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)
@@ -79,6 +82,7 @@ public override ReadOnlyMemory<byte> PreprocessStreamMessage(SocketConnection co
             return data.DecompressGzip();
         }
 
+
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new HTXAuthenticationProvider(credentials, false);