CryptoExchange.Net/SharedApis/Interfaces/Rest/Futures/IFuturesOrderRestClient.cs

@@ -73,7 +73,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Spot get closed orders request options
         /// </summary>
-        GetClosedOrdersOptions GetClosedFuturesOrdersOptions { get; }
+        PaginatedEndpointOptions<GetClosedOrdersRequest> GetClosedFuturesOrdersOptions { get; }
         /// <summary>
         /// Get info on closed futures orders
         /// </summary>
@@ -96,7 +96,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Futures user trades request options
         /// </summary>
-        GetUserTradesOptions GetFuturesUserTradesOptions { get; }
+        PaginatedEndpointOptions<GetUserTradesRequest> GetFuturesUserTradesOptions { get; }
         /// <summary>
         /// Get futures user trade records
         /// </summary>

CryptoExchange.Net/SharedApis/Interfaces/Rest/Spot/ISpotOrderRestClient.cs

@@ -72,7 +72,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Spot get closed orders request options
         /// </summary>
-        GetClosedOrdersOptions GetClosedSpotOrdersOptions { get; }
+        PaginatedEndpointOptions<GetClosedOrdersRequest> GetClosedSpotOrdersOptions { get; }
         /// <summary>
         /// Get info on closed spot orders
         /// </summary>
@@ -95,7 +95,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Spot user trades request options
         /// </summary>
-        GetUserTradesOptions GetSpotUserTradesOptions { get; }
+        PaginatedEndpointOptions<GetUserTradesRequest> GetSpotUserTradesOptions { get; }
         /// <summary>
         /// Get spot user trade records
         /// </summary>

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetClosedOrdersOptions.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using System;
 using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
@@ -20,22 +19,8 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetClosedOrdersRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetClosedOrdersRequest.StartTime), $"Time filter is not supported");
 
             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
         }

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositsOptions.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using System;
 using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
@@ -20,22 +19,8 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetDepositsRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
 
             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
         }

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFundingRateHistoryOptions.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using System;
 using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
@@ -20,22 +19,8 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetFundingRateHistoryRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
 
             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
         }

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs

@@ -70,22 +70,8 @@ namespace CryptoExchange.Net.SharedApis
             if (!IsSupported(request.Interval))
                 return ArgumentError.Invalid(nameof(GetKlinesRequest.Interval), "Interval not supported");
 
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
 
             if (MaxAge.HasValue && request.StartTime < DateTime.UtcNow.Add(-MaxAge.Value))
                 return ArgumentError.Invalid(nameof(GetKlinesRequest.StartTime), $"Only the most recent {MaxAge} klines are available");

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionHistoryOptions.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using System;
 using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
@@ -20,22 +19,8 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetPositionHistoryRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
 
             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
         }

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetTradeHistoryOptions.cs

@@ -25,12 +25,6 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetTradeHistoryRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
             if (MaxAge.HasValue && request.StartTime < DateTime.UtcNow.Add(-MaxAge.Value))
                 return ArgumentError.Invalid(nameof(GetTradeHistoryRequest.StartTime), $"Only the most recent {MaxAge} trades are available");
 

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetUserTradesOptions.cs

@@ -1,51 +0,0 @@
-using CryptoExchange.Net.Objects;
-using System;
-using System.Text;
-
-namespace CryptoExchange.Net.SharedApis
-{
-    /// <summary>
-    /// Options for requesting user trades
-    /// </summary>
-    public class GetUserTradesOptions : PaginatedEndpointOptions<GetUserTradesRequest>
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public GetUserTradesOptions(bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit) 
-            : base(supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true)
-        {
-        }
-
-        /// <inheritdoc />
-        public override Error? ValidateRequest(string exchange, GetUserTradesRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
-        {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
-
-            return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
-        }
-
-        /// <inheritdoc />
-        public override string ToString(string exchange)
-        {
-            var sb = new StringBuilder(base.ToString(exchange));
-            sb.AppendLine($"Time filter supported: {TimePeriodFilterSupport}");
-            return sb.ToString();
-        }
-    }
-}

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetWithdrawalsOptions.cs

@@ -1,5 +1,4 @@
 using CryptoExchange.Net.Objects;
-using System;
 using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
@@ -20,22 +19,8 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public override Error? ValidateRequest(string exchange, GetWithdrawalsRequest request, TradingMode? tradingMode, TradingMode[] supportedApiTypes)
         {
-            if (!SupportsAscending && request.Direction == DataDirection.Ascending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
-
-            if (!SupportsDescending && request.Direction == DataDirection.Descending)
-                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Descending direction is not supported");
-
-            if (!TimePeriodFilterSupport)
-            {
-                // When going descending we can still allow startTime filter to limit the results
-                var now = DateTime.UtcNow;
-                if ((request.Direction != DataDirection.Descending && request.StartTime != null)
-                    || (request.EndTime != null && now - request.EndTime > TimeSpan.FromSeconds(5)))
-                {
-                    return ArgumentError.Invalid(nameof(GetDepositsRequest.StartTime), $"Time filter is not supported");
-                }
-            }
+            if (!TimePeriodFilterSupport && request.StartTime != null)
+                return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.StartTime), $"Time filter is not supported");
 
             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes);
         }

CryptoExchange.Net/SharedApis/Models/Pagination.cs

@@ -20,7 +20,6 @@ namespace CryptoExchange.Net.SharedApis
         public string? FromId { get; set; }
         public int? Offset { get; set; }
         public int? Page { get; set; }
-        public string? Cursor { get; set; }
     }
     public class PageRequest
     {
@@ -60,15 +59,9 @@ namespace CryptoExchange.Net.SharedApis
                 if (direction == DataDirection.Ascending)
                 {
                     if (startTime == null)
-                    {
                         startTime = endTime.Add(-maxPeriod.Value);
-                    }
                     else
-                    {
                         endTime = startTime.Value.Add(maxPeriod.Value);
-                        if (endTime > DateTime.UtcNow)
-                            endTime = DateTime.UtcNow;
-                    }
                 }
                 else
                 {
@@ -83,13 +76,12 @@ namespace CryptoExchange.Net.SharedApis
                 Direction = direction,
                 FromId = paginationRequest?.FromId,
                 Offset = paginationRequest?.Offset,
-                Page = paginationRequest?.Page,
-                Cursor = paginationRequest?.Cursor
+                Page = paginationRequest?.Page
             };
         }
 
         public static PageRequest? GetNextPageRequest(
-            Func<PageRequest?> nextPageRequest,
+            Func<PageRequest> nextPageRequest,
             int resultCount,
             IEnumerable<DateTime> timestamps,
             DateTime? requestStartTime,
@@ -101,16 +93,7 @@ namespace CryptoExchange.Net.SharedApis
             )
         {
             if (HasNextPage(resultCount, timestamps, requestStartTime, requestEndTime, limit, direction))
-            {
-                var result = nextPageRequest();
-                if (result != null) 
-                {
-#warning correct?
-                    result.StartTime ??= lastPaginationData.StartTime;
-                    result.EndTime ??= lastPaginationData.EndTime;
-                    return result;
-                }
-            }
+                return nextPageRequest();
 
             if (maxTimespan != null)
             {
@@ -160,11 +143,11 @@ namespace CryptoExchange.Net.SharedApis
 
         public static PageRequest NextPageFromPage(PaginationParameters lastPaginationData)
         {
-            return new PageRequest { Page = (lastPaginationData.Page ?? 1) + 1 };
+            return new PageRequest { Page = lastPaginationData.Page + 1 };
         }
         public static PageRequest NextPageFromOffset(PaginationParameters lastPaginationData, int resultCount)
         {
-            return new PageRequest { Offset = (lastPaginationData.Offset ?? 0) + resultCount };
+            return new PageRequest { Offset = lastPaginationData.Offset + resultCount };
         }
         public static PageRequest NextPageFromCursor(string nextCursor)
         {
@@ -178,7 +161,7 @@ namespace CryptoExchange.Net.SharedApis
         {
             return new PageRequest { FromId = nextFromId };
         }
-        public static PageRequest NextPageFromTime(PaginationParameters lastPaginationData, DateTime lastTimestamp, bool setOtherTimeLimiter = true)
+        public static PageRequest NextPageFromTime(PaginationParameters lastPaginationData, DateTime lastTimestamp, bool setOtherTimeLimiter)
         {
             if (lastPaginationData.Direction == DataDirection.Ascending)
                 return new PageRequest { StartTime = lastTimestamp.AddMilliseconds(1), EndTime = setOtherTimeLimiter ? lastPaginationData.EndTime : null  };
@@ -202,11 +185,10 @@ namespace CryptoExchange.Net.SharedApis
             }
             else
             {
-                var lastPageStartTime = lastPaginationParameters.StartTime ?? lastPaginationParameters.EndTime!.Value.Add(-period);
                 if (requestStartTime != null)
-                    return (lastPageStartTime - requestStartTime.Value).TotalSeconds > 1;
+                    return (lastPaginationParameters.StartTime!.Value - requestStartTime.Value).TotalSeconds > 1;
                 else
-                    return (lastPageStartTime - (lastPaginationParameters.EndTime!.Value - period)).TotalSeconds > 1;
+                    return (lastPaginationParameters.StartTime!.Value - (lastPaginationParameters.EndTime!.Value - period)).TotalSeconds > 1;
             }
         }
 

CryptoExchange.Net/SharedApis/Models/Rest/GetTradeHistoryRequest.cs

@@ -14,7 +14,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Filter by end time
         /// </summary>
-        public DateTime? EndTime { get; set; }
+        public DateTime EndTime { get; set; }
         /// <summary>
         /// Max number of results
         /// </summary>
@@ -33,7 +33,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <param name="limit">Max number of results</param>
         /// <param name="direction">Data direction</param>
         /// <param name="exchangeParameters">Exchange specific parameters</param>
-        public GetTradeHistoryRequest(SharedSymbol symbol, DateTime startTime, DateTime? endTime = null, int? limit = null, DataDirection? direction = null, ExchangeParameters? exchangeParameters = null) : base(symbol, exchangeParameters)
+        public GetTradeHistoryRequest(SharedSymbol symbol, DateTime startTime, DateTime endTime, int? limit = null, DataDirection? direction = null, ExchangeParameters? exchangeParameters = null) : base(symbol, exchangeParameters)
         {
             StartTime = startTime;
             EndTime = endTime;