Fix migration crash

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -32,8 +32,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.838" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />

BTCPayServer.Abstractions/Configuration/DataDirectories.cs

@@ -9,7 +9,6 @@ namespace BTCPayServer.Configuration
         public string TempStorageDir { get; set; }
         public string StorageDir { get; set; }
         public string TempDir { get; set; }
-        public string LangsDir { get; set; }
 
         public string ToDatadirFullPath(string path)
         {

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -4,8 +4,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.Options;
-using Npgsql;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations;
 
@@ -14,16 +12,15 @@ namespace BTCPayServer.Abstractions.Contracts
     public abstract class BaseDbContextFactory<T> where T : DbContext
     {
         private readonly IOptions<DatabaseOptions> _options;
-        private readonly string _migrationTableName;
+        private readonly string _schemaPrefix;
 
-        public BaseDbContextFactory(IOptions<DatabaseOptions> options, string migrationTableName)
+        public BaseDbContextFactory(IOptions<DatabaseOptions> options, string schemaPrefix)
         {
             _options = options;
-            _migrationTableName = migrationTableName;
+            _schemaPrefix = schemaPrefix;
         }
 
-        public T CreateContext() => CreateContext(null);
-        public abstract T CreateContext(Action<NpgsqlDbContextOptionsBuilder> npgsqlOptionsAction = null);
+        public abstract T CreateContext();
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
 #pragma warning disable EF1001 // Internal EF Core API usage.
@@ -68,27 +65,47 @@ namespace BTCPayServer.Abstractions.Contracts
             }
         }
 
-        public void ConfigureBuilder(DbContextOptionsBuilder builder) => ConfigureBuilder(builder, null);
-        public void ConfigureBuilder(DbContextOptionsBuilder builder, Action<NpgsqlDbContextOptionsBuilder> npgsqlOptionsAction = null)
+        public void ConfigureBuilder(DbContextOptionsBuilder builder)
         {
-            builder
-            .UseNpgsql(_options.Value.ConnectionString, o =>
+            switch (_options.Value.DatabaseType)
             {
-                o.EnableRetryOnFailure(10);
-                o.SetPostgresVersion(12, 0);
-                npgsqlOptionsAction?.Invoke(o);
-                var mainSearchPath = GetSearchPath(_options.Value.ConnectionString);
-                var schemaPrefix = string.IsNullOrEmpty(_migrationTableName) ? "__EFMigrationsHistory" : _migrationTableName;
-                o.MigrationsHistoryTable(schemaPrefix, mainSearchPath);
-            })
-            .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
+                case DatabaseType.Sqlite:
+                    builder.UseSqlite(_options.Value.ConnectionString, o =>
+                    {
+                        if (!string.IsNullOrEmpty(_schemaPrefix))
+                        {
+                            o.MigrationsHistoryTable(_schemaPrefix);
+                        }
+                    });
+                    break;
+                case DatabaseType.Postgres:
+                    builder
+                        .UseNpgsql(_options.Value.ConnectionString, o =>
+                        {
+                            o.EnableRetryOnFailure(10);
+                            o.SetPostgresVersion(12, 0);
+                            if (!string.IsNullOrEmpty(_schemaPrefix))
+                            {
+                                o.MigrationsHistoryTable(_schemaPrefix);
+                            }
+                        })
+                        .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
+                    break;
+                case DatabaseType.MySQL:
+                    builder.UseMySql(_options.Value.ConnectionString, ServerVersion.AutoDetect(_options.Value.ConnectionString), o =>
+                    {
+                        o.EnableRetryOnFailure(10);
+
+                        if (!string.IsNullOrEmpty(_schemaPrefix))
+                        {
+                            o.MigrationsHistoryTable(_schemaPrefix);
+                        }
+                    });
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
         }
 
-        private string GetSearchPath(string connectionString)
-        {
-            var connectionStringBuilder = new NpgsqlConnectionStringBuilder(connectionString);
-            var searchPaths = connectionStringBuilder.SearchPath?.Split(',');
-            return searchPaths is not { Length: > 0 } ? null : searchPaths[0];
-        }
     }
 }

BTCPayServer.Abstractions/Contracts/INotificationHandler.cs

@@ -25,6 +25,5 @@ namespace BTCPayServer.Abstractions.Contracts
         public string Body { get; set; }
         public string ActionLink { get; set; }
         public bool Seen { get; set; }
-        public string StoreId { get; set; }
     }
 }

BTCPayServer.Abstractions/Extensions/HttpRequestExtensions.cs

@@ -36,17 +36,6 @@ public static class HttpRequestExtensions
             request.Path.ToUriComponent());
     }
 
-    public static string GetCurrentUrlWithQueryString(this HttpRequest request)
-    {
-        return string.Concat(
-            request.Scheme,
-            "://",
-            request.Host.ToUriComponent(),
-            request.PathBase.ToUriComponent(),
-            request.Path.ToUriComponent(),
-            request.QueryString.ToUriComponent());
-    }
-
     public static string GetCurrentPath(this HttpRequest request)
     {
         return string.Concat(

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -12,7 +12,7 @@ namespace BTCPayServer.Abstractions.Extensions
         private const string ACTIVE_CATEGORY_KEY = "ActiveCategory";
         private const string ACTIVE_PAGE_KEY = "ActivePage";
         private const string ACTIVE_ID_KEY = "ActiveId";
-        private const string ACTIVE_CLASS = "active";
+        private const string ActivePageClass = "active";
 
         public enum DateDisplayFormat
         {
@@ -55,63 +55,50 @@ namespace BTCPayServer.Abstractions.Extensions
             viewData[ACTIVE_CATEGORY_KEY] = activeCategory;
         }
 
-        public static bool IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
-        {
-            if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY)) return false;
-            var activeId = viewData[ACTIVE_ID_KEY];
-            var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
-            var categoryMatch = category.Equals(activeCategory, StringComparison.InvariantCultureIgnoreCase);
-            var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryMatch && idMatch;
-        }
-
-        public static bool IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
+        public static string IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
         {
             return IsActiveCategory(viewData, category.ToString(), id);
         }
 
-        public static bool IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
+        public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
         {
-            if (!viewData.ContainsKey(ACTIVE_PAGE_KEY)) return false;
+            if (!viewData.ContainsKey(ACTIVE_CATEGORY_KEY))
+            {
+                return null;
+            }
+            var activeId = viewData[ACTIVE_ID_KEY];
+            var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
+            var categoryMatch = category.Equals(activeCategory, StringComparison.InvariantCultureIgnoreCase);
+            var idMatch = id == null || activeId == null || id.Equals(activeId);
+            return categoryMatch && idMatch ? ActivePageClass : null;
+        }
+
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, T page, object id = null)
+            where T : IConvertible
+        {
+            return IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id);
+        }
+
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
+            where T : IConvertible
+        {
+            return pages.Any(page => IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id) == ActivePageClass)
+                ? ActivePageClass
+                : null;
+        }
+
+        public static string IsActivePage(this ViewDataDictionary viewData, string page, string category, object id = null)
+        {
+            if (!viewData.ContainsKey(ACTIVE_PAGE_KEY))
+            {
+                return null;
+            }
             var activeId = viewData[ACTIVE_ID_KEY];
             var activePage = viewData[ACTIVE_PAGE_KEY]?.ToString();
             var activeCategory = viewData[ACTIVE_CATEGORY_KEY]?.ToString();
-            var categoryAndPageMatch = page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase) &&
-                (category == null || activeCategory != null && activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase));
+            var categoryAndPageMatch = (category == null || activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase)) && page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase);
             var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryAndPageMatch && idMatch;
-        }
-        
-        public static bool IsActivePage<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null)
-            where T : IConvertible
-        {
-            return pages.Any(page => ActivePageClass(viewData, page.ToString(), page.GetType().ToString(), id) == ACTIVE_CLASS);
-        }
-
-        public static string ActiveCategoryClass<T>(this ViewDataDictionary viewData, T category, object id = null)
-        {
-            return ActiveCategoryClass(viewData, category.ToString(), id);
-        }
-
-        public static string ActiveCategoryClass(this ViewDataDictionary viewData, string category, object id = null)
-        {
-            return IsActiveCategory(viewData, category, id) ? ACTIVE_CLASS : null;
-        }
-
-        public static string ActivePageClass<T>(this ViewDataDictionary viewData, T page, object id = null)
-            where T : IConvertible
-        {
-            return ActivePageClass(viewData, page.ToString(), page.GetType().ToString(), id);
-        }
-
-        public static string ActivePageClass(this ViewDataDictionary viewData, string page, string category, object id = null)
-        {
-            return IsActivePage(viewData, page, category, id) ? ACTIVE_CLASS : null;
-        }
-        
-        public static string ActivePageClass<T>(this ViewDataDictionary viewData, IEnumerable<T> pages, object id = null) where T : IConvertible
-        {
-            return IsActivePage(viewData, pages, id) ? ACTIVE_CLASS : null;
+            return categoryAndPageMatch && idMatch ? ActivePageClass : null;
         }
 
         public static HtmlString ToBrowserDate(this DateTimeOffset date, string netFormat, string jsDateFormat = "short", string jsTimeFormat = "short")

BTCPayServer.Abstractions/Models/DatabaseOptions.cs

@@ -2,6 +2,7 @@ namespace BTCPayServer.Abstractions.Models
 {
     public class DatabaseOptions
     {
+        public DatabaseType DatabaseType { get; set; }
         public string ConnectionString { get; set; }
     }
 }

BTCPayServer.Abstractions/Models/DatabaseType.cs

@@ -0,0 +1,9 @@
+namespace BTCPayServer.Abstractions.Models
+{
+    public enum DatabaseType
+    {
+        Sqlite,
+        Postgres,
+        MySQL,
+    }
+}

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -12,7 +12,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Configurations>Debug;Release</Configurations>
+        <Configurations>Debug;Release;Altcoins-Debug;Altcoins-Release</Configurations>
         <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
   <PropertyGroup>
@@ -31,7 +31,7 @@
   </ItemGroup>
     <ItemGroup>
       <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.1" />
-      <PackageReference Include="NBitcoin" Version="7.0.37" />
+      <PackageReference Include="NBitcoin" Version="7.0.34" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Client/BTCPayServerClient.APIKeys.cs

@@ -1,44 +1,58 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<ApiKeyData> GetCurrentAPIKeyInfo(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<ApiKeyData>("api/v1/api-keys/current", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<ApiKeyData> GetCurrentAPIKeyInfo(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/api-keys/current"), token);
+            return await HandleResponse<ApiKeyData>(response);
+        }
 
-    public virtual async Task<ApiKeyData> CreateAPIKey(CreateApiKeyRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<ApiKeyData>("api/v1/api-keys", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<ApiKeyData> CreateAPIKey(CreateApiKeyRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/api-keys", bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<ApiKeyData>(response);
+        }
 
-    public virtual async Task<ApiKeyData> CreateAPIKey(string userId, CreateApiKeyRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<ApiKeyData>($"api/v1/users/{userId}/api-keys", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<ApiKeyData> CreateAPIKey(string userId, CreateApiKeyRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{userId}/api-keys",
+            bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<ApiKeyData>(response);
+        }
 
-    public virtual async Task RevokeCurrentAPIKeyInfo(CancellationToken token = default)
-    {
-        await SendHttpRequest("api/v1/api-keys/current", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task RevokeCurrentAPIKeyInfo(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/api-keys/current", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task RevokeAPIKey(string apikey, CancellationToken token = default)
-    {
-        if (apikey == null) throw new ArgumentNullException(nameof(apikey));
-        await SendHttpRequest($"api/v1/api-keys/{apikey}", null, HttpMethod.Delete, token);
-    }
-    public virtual async Task RevokeAPIKey(string userId, string apikey, CancellationToken token = default)
-    {
-        if (apikey == null) throw new ArgumentNullException(nameof(apikey));
-        if (userId is null) throw new ArgumentNullException(nameof(userId));
-        await SendHttpRequest($"api/v1/users/{userId}/api-keys/{apikey}", null, HttpMethod.Delete, token);
+        public virtual async Task RevokeAPIKey(string apikey, CancellationToken token = default)
+        {
+            if (apikey == null)
+                throw new ArgumentNullException(nameof(apikey));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/api-keys/{apikey}", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+        public virtual async Task RevokeAPIKey(string userId, string apikey, CancellationToken token = default)
+        {
+            if (apikey == null)
+                throw new ArgumentNullException(nameof(apikey));
+            if (userId is null)
+                throw new ArgumentNullException(nameof(userId));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{userId}/api-keys/{apikey}", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Apps.cs

@@ -1,81 +1,103 @@
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<PointOfSaleAppData> CreatePointOfSaleApp(string storeId,
-        PointOfSaleAppRequest request, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<PointOfSaleAppData>($"api/v1/stores/{storeId}/apps/pos", request, HttpMethod.Post, token);
-    }
 
-    public virtual async Task<CrowdfundAppData> CreateCrowdfundApp(string storeId,
-        CrowdfundAppRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<CrowdfundAppData>($"api/v1/stores/{storeId}/apps/crowdfund", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<PointOfSaleAppData> CreatePointOfSaleApp(string storeId,
+            CreatePointOfSaleAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/apps/pos", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<PointOfSaleAppData>(response);
+        }
 
-    public virtual async Task<PointOfSaleAppData> UpdatePointOfSaleApp(string appId,
-        PointOfSaleAppRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<PointOfSaleAppData>($"api/v1/apps/pos/{appId}", request, HttpMethod.Put, token);
-    }
+        public virtual async Task<CrowdfundAppData> CreateCrowdfundApp(string storeId,
+            CreateCrowdfundAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/apps/crowdfund", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<CrowdfundAppData>(response);
+        }
 
-    public virtual async Task<AppBaseData> GetApp(string appId, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        return await SendHttpRequest<AppBaseData>($"api/v1/apps/{appId}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<PointOfSaleAppData> UpdatePointOfSaleApp(string appId,
+            CreatePointOfSaleAppRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/pos/{appId}", bodyPayload: request,
+                    method: HttpMethod.Put), token);
+            return await HandleResponse<PointOfSaleAppData>(response);
+        }
 
-    public virtual async Task<AppBaseData[]> GetAllApps(string storeId, CancellationToken token = default)
-    {
-        if (storeId == null) throw new ArgumentNullException(nameof(storeId));
-        return await SendHttpRequest<AppBaseData[]>($"api/v1/stores/{storeId}/apps", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<AppDataBase> GetApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/{appId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<AppDataBase>(response);
+        }
 
-    public virtual async Task<AppBaseData[]> GetAllApps(CancellationToken token = default)
-    {
-        return await SendHttpRequest<AppBaseData[]>("api/v1/apps", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<AppDataBase[]> GetAllApps(string storeId, CancellationToken token = default)
+        {
+            if (storeId == null)
+                throw new ArgumentNullException(nameof(storeId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/apps",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<AppDataBase[]>(response);
+        }
 
-    public virtual async Task<PointOfSaleAppData> GetPosApp(string appId, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        return await SendHttpRequest<PointOfSaleAppData>($"api/v1/apps/pos/{appId}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<AppDataBase[]> GetAllApps(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<AppDataBase[]>(response);
+        }
 
-    public virtual async Task<CrowdfundAppData> GetCrowdfundApp(string appId, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        return await SendHttpRequest<CrowdfundAppData>($"api/v1/apps/crowdfund/{appId}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<PointOfSaleAppData> GetPosApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/pos/{appId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<PointOfSaleAppData>(response);
+        }
 
-    public virtual async Task<AppSalesStats> GetAppSales(string appId, int numberOfDays = 7, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        var queryPayload = new Dictionary<string, object> { { nameof(numberOfDays), numberOfDays } };
-        return await SendHttpRequest<AppSalesStats>($"api/v1/apps/{appId}/sales", queryPayload, HttpMethod.Get, token);
-    }
+        public virtual async Task<CrowdfundAppData> GetCrowdfundApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/crowdfund/{appId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<CrowdfundAppData>(response);
+        }
 
-    public virtual async Task<List<AppItemStats>> GetAppTopItems(string appId, int offset = 0, int count = 10, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        var queryPayload = new Dictionary<string, object> { { nameof(offset), offset }, { nameof(count), count } };
-        return await SendHttpRequest<List<AppItemStats>>($"api/v1/apps/{appId}/top-items", queryPayload, HttpMethod.Get, token);
-    }
-
-    public virtual async Task DeleteApp(string appId, CancellationToken token = default)
-    {
-        if (appId == null) throw new ArgumentNullException(nameof(appId));
-        await SendHttpRequest($"api/v1/apps/{appId}", null, HttpMethod.Delete, token);
+        public virtual async Task DeleteApp(string appId, CancellationToken token = default)
+        {
+            if (appId == null)
+                throw new ArgumentNullException(nameof(appId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/apps/{appId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Authorization.cs

@@ -1,29 +1,34 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public static Uri GenerateAuthorizeUri(Uri btcpayHost, string[] permissions, bool strict = true,
-        bool selectiveStores = false, (string ApplicationIdentifier, Uri Redirect) applicationDetails = default)
+    public partial class BTCPayServerClient
     {
-        var result = new UriBuilder(btcpayHost) { Path = "api-keys/authorize" };
-        AppendPayloadToQuery(result,
-            new Dictionary<string, object>
-            {
-                {"strict", strict}, {"selectiveStores", selectiveStores}, {"permissions", permissions}
-            });
 
-        if (applicationDetails.Redirect != null)
+        public static Uri GenerateAuthorizeUri(Uri btcpayHost, string[] permissions, bool strict = true,
+            bool selectiveStores = false, (string ApplicationIdentifier, Uri Redirect) applicationDetails = default)
         {
-            AppendPayloadToQuery(result, new KeyValuePair<string, object>("redirect", applicationDetails.Redirect));
-            if (!string.IsNullOrEmpty(applicationDetails.ApplicationIdentifier))
-            {
-                AppendPayloadToQuery(result, new KeyValuePair<string, object>("applicationIdentifier", applicationDetails.ApplicationIdentifier));
-            }
-        }
+            var result = new UriBuilder(btcpayHost);
+            result.Path = "api-keys/authorize";
 
-        return result.Uri;
+            AppendPayloadToQuery(result,
+                new Dictionary<string, object>()
+                {
+                    {"strict", strict}, {"selectiveStores", selectiveStores}, {"permissions", permissions}
+                });
+
+            if (applicationDetails.Redirect != null)
+            {
+                AppendPayloadToQuery(result, new KeyValuePair<string, object>("redirect", applicationDetails.Redirect));
+                if (!string.IsNullOrEmpty(applicationDetails.ApplicationIdentifier))
+                {
+                    AppendPayloadToQuery(result, new KeyValuePair<string, object>("applicationIdentifier", applicationDetails.ApplicationIdentifier));
+                }
+            }
+
+            return result.Uri;
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Files.cs

@@ -1,29 +0,0 @@
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Client.Models;
-
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
-{
-    public virtual async Task<FileData[]> GetFiles(CancellationToken token = default)
-    {
-        return await SendHttpRequest<FileData[]>("api/v1/files", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<FileData> GetFile(string fileId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<FileData>($"api/v1/files/{fileId}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<FileData> UploadFile(string filePath, string mimeType, CancellationToken token = default)
-    {
-        return await UploadFileRequest<FileData>("api/v1/files", filePath, mimeType, "file", HttpMethod.Post, token);
-    }
-
-    public virtual async Task DeleteFile(string fileId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/files/{fileId}", null, HttpMethod.Delete, token);
-    }
-}

BTCPayServer.Client/BTCPayServerClient.Health.cs

@@ -1,14 +1,15 @@
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<ApiHealthData> GetHealth(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<ApiHealthData>("api/v1/health", null, HttpMethod.Get, token);
+        public virtual async Task<ApiHealthData> GetHealth(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/health"), token);
+            return await HandleResponse<ApiHealthData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Invoices.cs

@@ -7,101 +7,139 @@ using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 using NBitcoin;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<InvoiceData>> GetInvoices(string storeId, string[] orderId = null,
-        InvoiceStatus[] status = null,
-        DateTimeOffset? startDate = null,
-        DateTimeOffset? endDate = null,
-        string textSearch = null,
-        bool includeArchived = false,
-        int? skip = null,
-        int? take = null,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        var queryPayload = new Dictionary<string, object> { { nameof(includeArchived), includeArchived } };
-        if (startDate is { } s)
-            queryPayload.Add(nameof(startDate), Utils.DateTimeToUnixTime(s));
-        if (endDate is { } e)
-            queryPayload.Add(nameof(endDate), Utils.DateTimeToUnixTime(e));
-        if (orderId != null)
-            queryPayload.Add(nameof(orderId), orderId);
-        if (textSearch != null)
-            queryPayload.Add(nameof(textSearch), textSearch);
-        if (status != null)
-            queryPayload.Add(nameof(status), status.Select(s => s.ToString().ToLower()).ToArray());
-        if (skip != null)
-            queryPayload.Add(nameof(skip), skip);
-        if (take != null)
-            queryPayload.Add(nameof(take), take);
-
-        return await SendHttpRequest<IEnumerable<InvoiceData>>($"api/v1/stores/{storeId}/invoices", queryPayload, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<InvoiceData> GetInvoice(string storeId, string invoiceId,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices/{invoiceId}", null, HttpMethod.Get, token);
-    }
-    public virtual async Task<InvoicePaymentMethodDataModel[]> GetInvoicePaymentMethods(string storeId, string invoiceId,
-        bool onlyAccountedPayments = true, bool includeSensitive = false,
-        CancellationToken token = default)
-    {
-        var queryPayload = new Dictionary<string, object>
+        public virtual async Task<IEnumerable<InvoiceData>> GetInvoices(string storeId, string[] orderId = null,
+            InvoiceStatus[] status = null,
+            DateTimeOffset? startDate = null,
+            DateTimeOffset? endDate = null,
+            string textSearch = null,
+            bool includeArchived = false,
+            int? skip = null,
+            int? take = null,
+            CancellationToken token = default)
         {
-            { nameof(onlyAccountedPayments), onlyAccountedPayments },
-            { nameof(includeSensitive), includeSensitive }
-        };
-        return await SendHttpRequest<InvoicePaymentMethodDataModel[]>($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods", queryPayload, HttpMethod.Get, token);
-    }
+            Dictionary<string, object> queryPayload = new Dictionary<string, object>();
+            queryPayload.Add(nameof(includeArchived), includeArchived);
 
-    public virtual async Task ArchiveInvoice(string storeId, string invoiceId,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}", null, HttpMethod.Delete, token);
-    }
+            if (startDate is DateTimeOffset s)
+                queryPayload.Add(nameof(startDate), Utils.DateTimeToUnixTime(s));
 
-    public virtual async Task<InvoiceData> CreateInvoice(string storeId,
-        CreateInvoiceRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices", request, HttpMethod.Post, token);
-    }
+            if (endDate is DateTimeOffset e)
+                queryPayload.Add(nameof(endDate), Utils.DateTimeToUnixTime(e));
 
-    public virtual async Task<InvoiceData> UpdateInvoice(string storeId, string invoiceId,
-        UpdateInvoiceRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices/{invoiceId}", request, HttpMethod.Put, token);
-    }
+            if (orderId != null)
+                queryPayload.Add(nameof(orderId), orderId);
+            if (textSearch != null)
+                queryPayload.Add(nameof(textSearch), textSearch);
+            if (status != null)
+                queryPayload.Add(nameof(status), status.Select(s => s.ToString().ToLower()).ToArray());
 
-    public virtual async Task<InvoiceData> MarkInvoiceStatus(string storeId, string invoiceId,
-        MarkInvoiceStatusRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        if (request.Status != InvoiceStatus.Settled && request.Status != InvoiceStatus.Invalid) throw new ArgumentOutOfRangeException(nameof(request.Status), "Status can only be Invalid or Complete");
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices/{invoiceId}/status", request, HttpMethod.Post, token);
-    }
+            if (skip != null)
+            {
+                queryPayload.Add(nameof(skip), skip);
+            }
 
-    public virtual async Task<InvoiceData> UnarchiveInvoice(string storeId, string invoiceId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/invoices/{invoiceId}/unarchive", null, HttpMethod.Post, token);
-    }
+            if (take != null)
+            {
+                queryPayload.Add(nameof(take), take);
+            }
 
-    public virtual async Task ActivateInvoicePaymentMethod(string storeId, string invoiceId, string paymentMethod, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods/{paymentMethod}/activate", null, HttpMethod.Post, token);
-    }
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/invoices",
+                        queryPayload), token);
+            return await HandleResponse<IEnumerable<InvoiceData>>(response);
+        }
 
-    public virtual async Task<PullPaymentData> RefundInvoice(
-        string storeId,
-        string invoiceId,
-        RefundInvoiceRequest request,
-        CancellationToken token = default
-    )
-    {
-        return await SendHttpRequest<PullPaymentData>($"api/v1/stores/{storeId}/invoices/{invoiceId}/refund", request, HttpMethod.Post, token);
+        public virtual async Task<InvoiceData> GetInvoice(string storeId, string invoiceId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}"), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+        public virtual async Task<InvoicePaymentMethodDataModel[]> GetInvoicePaymentMethods(string storeId, string invoiceId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods"), token);
+            return await HandleResponse<InvoicePaymentMethodDataModel[]>(response);
+        }
+
+        public virtual async Task ArchiveInvoice(string storeId, string invoiceId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<InvoiceData> CreateInvoice(string storeId,
+            CreateInvoiceRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task<InvoiceData> UpdateInvoice(string storeId, string invoiceId,
+            UpdateInvoiceRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}", bodyPayload: request,
+                    method: HttpMethod.Put), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task<InvoiceData> MarkInvoiceStatus(string storeId, string invoiceId,
+            MarkInvoiceStatusRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            if (request.Status != InvoiceStatus.Settled && request.Status != InvoiceStatus.Invalid)
+                throw new ArgumentOutOfRangeException(nameof(request.Status), "Status can only be Invalid or Complete");
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/status", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task<InvoiceData> UnarchiveInvoice(string storeId, string invoiceId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/unarchive",
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task ActivateInvoicePaymentMethod(string storeId, string invoiceId, string paymentMethod, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods/{paymentMethod}/activate",
+                    method: HttpMethod.Post), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<PullPaymentData> RefundInvoice(
+            string storeId,
+            string invoiceId,
+            RefundInvoiceRequest request,
+            CancellationToken token = default
+        )
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/refund", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<PullPaymentData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Lightning.Internal.cs

@@ -5,101 +5,142 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<LightningNodeInformationData> GetLightningNodeInfo(string cryptoCode,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<LightningNodeInformationData>($"api/v1/server/lightning/{cryptoCode}/info", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<LightningNodeBalanceData>($"api/v1/server/lightning/{cryptoCode}/balance", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task ConnectToLightningNode(string cryptoCode, ConnectToNodeRequest request,
-        CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        await SendHttpRequest($"api/v1/server/lightning/{cryptoCode}/connect", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<LightningChannelData>>($"api/v1/server/lightning/{cryptoCode}/channels", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task OpenLightningChannel(string cryptoCode, OpenLightningChannelRequest request,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/server/lightning/{cryptoCode}/channels", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<string> GetLightningDepositAddress(string cryptoCode, CancellationToken token = default)
-    {
-        return await SendHttpRequest<string>($"api/v1/server/lightning/{cryptoCode}/address", null, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<LightningPaymentData> PayLightningInvoice(string cryptoCode, PayLightningInvoiceRequest request,
-        CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<LightningPaymentData>($"api/v1/server/lightning/{cryptoCode}/invoices/pay", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<LightningPaymentData> GetLightningPayment(string cryptoCode,
-        string paymentHash, CancellationToken token = default)
-    {
-        if (paymentHash == null) throw new ArgumentNullException(nameof(paymentHash));
-        return await SendHttpRequest<LightningPaymentData>($"api/v1/server/lightning/{cryptoCode}/payments/{paymentHash}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningInvoiceData> GetLightningInvoice(string cryptoCode,
-        string invoiceId, CancellationToken token = default)
-    {
-        if (invoiceId == null) throw new ArgumentNullException(nameof(invoiceId));
-        return await SendHttpRequest<LightningInvoiceData>($"api/v1/server/lightning/{cryptoCode}/invoices/{invoiceId}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string cryptoCode,
-        bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
-    {
-        var queryPayload = new Dictionary<string, object>();
-        if (pendingOnly is bool v)
+        public virtual async Task<LightningNodeInformationData> GetLightningNodeInfo(string cryptoCode,
+            CancellationToken token = default)
         {
-            queryPayload.Add("pendingOnly", v.ToString());
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/info",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningNodeInformationData>(response);
         }
-        if (offsetIndex is > 0)
-        {
-            queryPayload.Add("offsetIndex", offsetIndex);
-        }
-        return await SendHttpRequest<LightningInvoiceData[]>($"api/v1/server/lightning/{cryptoCode}/invoices", queryPayload, HttpMethod.Get, token);
-    }
 
-    public virtual async Task<LightningPaymentData[]> GetLightningPayments(string cryptoCode,
-        bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
-    {
-        var queryPayload = new Dictionary<string, object>();
-        if (includePending is bool v)
+        public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string cryptoCode,
+            CancellationToken token = default)
         {
-            queryPayload.Add("includePending", v.ToString());
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/balance",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningNodeBalanceData>(response);
         }
-        if (offsetIndex is > 0)
-        {
-            queryPayload.Add("offsetIndex", offsetIndex);
-        }
-        return await SendHttpRequest<LightningPaymentData[]>($"api/v1/server/lightning/{cryptoCode}/payments", queryPayload, HttpMethod.Get, token);
-    }
 
-    public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string cryptoCode, CreateLightningInvoiceRequest request,
-        CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<LightningInvoiceData>($"api/v1/server/lightning/{cryptoCode}/invoices", request, HttpMethod.Post, token);
+        public virtual async Task ConnectToLightningNode(string cryptoCode, ConnectToNodeRequest request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/connect", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string cryptoCode,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/channels",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<IEnumerable<LightningChannelData>>(response);
+        }
+
+        public virtual async Task OpenLightningChannel(string cryptoCode, OpenLightningChannelRequest request,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/channels", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<string> GetLightningDepositAddress(string cryptoCode, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/address", method: HttpMethod.Post), token);
+            return await HandleResponse<string>(response);
+        }
+
+        public virtual async Task<LightningPaymentData> PayLightningInvoice(string cryptoCode, PayLightningInvoiceRequest request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices/pay", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<LightningPaymentData>(response);
+        }
+
+        public virtual async Task<LightningPaymentData> GetLightningPayment(string cryptoCode,
+            string paymentHash, CancellationToken token = default)
+        {
+            if (paymentHash == null)
+                throw new ArgumentNullException(nameof(paymentHash));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/payments/{paymentHash}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningPaymentData>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData> GetLightningInvoice(string cryptoCode,
+            string invoiceId, CancellationToken token = default)
+        {
+            if (invoiceId == null)
+                throw new ArgumentNullException(nameof(invoiceId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices/{invoiceId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningInvoiceData>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string cryptoCode,
+            bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
+        {
+            var queryPayload = new Dictionary<string, object>();
+            if (pendingOnly is bool v)
+            {
+                queryPayload.Add("pendingOnly", v.ToString());
+            }
+            if (offsetIndex is > 0)
+            {
+                queryPayload.Add("offsetIndex", offsetIndex);
+            }
+
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices", queryPayload), token);
+            return await HandleResponse<LightningInvoiceData[]>(response);
+        }
+
+        public virtual async Task<LightningPaymentData[]> GetLightningPayments(string cryptoCode,
+            bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
+        {
+            var queryPayload = new Dictionary<string, object>();
+            if (includePending is bool v)
+            {
+                queryPayload.Add("includePending", v.ToString());
+            }
+            if (offsetIndex is > 0)
+            {
+                queryPayload.Add("offsetIndex", offsetIndex);
+            }
+
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/payments", queryPayload), token);
+            return await HandleResponse<LightningPaymentData[]>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string cryptoCode, CreateLightningInvoiceRequest request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/server/lightning/{cryptoCode}/invoices", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<LightningInvoiceData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -5,102 +5,144 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<LightningNodeInformationData> GetLightningNodeInfo(string storeId, string cryptoCode,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<LightningNodeInformationData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/info", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string storeId, string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<LightningNodeBalanceData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/balance", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task ConnectToLightningNode(string storeId, string cryptoCode, ConnectToNodeRequest request,
-        CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        await SendHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/connect", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string storeId, string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<LightningChannelData>>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/channels", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task OpenLightningChannel(string storeId, string cryptoCode, OpenLightningChannelRequest request,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/channels", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<string> GetLightningDepositAddress(string storeId, string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<string>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/address", null, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<LightningPaymentData> PayLightningInvoice(string storeId, string cryptoCode, PayLightningInvoiceRequest request,
-        CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<LightningPaymentData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/pay", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<LightningPaymentData> GetLightningPayment(string storeId, string cryptoCode,
-        string paymentHash, CancellationToken token = default)
-    {
-        if (paymentHash == null) throw new ArgumentNullException(nameof(paymentHash));
-        return await SendHttpRequest<LightningPaymentData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/payments/{paymentHash}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningInvoiceData> GetLightningInvoice(string storeId, string cryptoCode,
-        string invoiceId, CancellationToken token = default)
-    {
-        if (invoiceId == null) throw new ArgumentNullException(nameof(invoiceId));
-        return await SendHttpRequest<LightningInvoiceData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/{invoiceId}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string storeId, string cryptoCode,
-        bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
-    {
-        var queryPayload = new Dictionary<string, object>();
-        if (pendingOnly is bool v)
+        public virtual async Task<LightningNodeInformationData> GetLightningNodeInfo(string storeId, string cryptoCode,
+            CancellationToken token = default)
         {
-            queryPayload.Add("pendingOnly", v.ToString());
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/info",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningNodeInformationData>(response);
         }
-        if (offsetIndex is > 0)
-        {
-            queryPayload.Add("offsetIndex", offsetIndex);
-        }
-        return await SendHttpRequest<LightningInvoiceData[]>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", queryPayload, HttpMethod.Get, token);
-    }
 
-    public virtual async Task<LightningPaymentData[]> GetLightningPayments(string storeId, string cryptoCode,
-        bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
-    {
-        var queryPayload = new Dictionary<string, object>();
-        if (includePending is bool v)
+        public virtual async Task<LightningNodeBalanceData> GetLightningNodeBalance(string storeId, string cryptoCode,
+            CancellationToken token = default)
         {
-            queryPayload.Add("includePending", v.ToString());
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/balance",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningNodeBalanceData>(response);
         }
-        if (offsetIndex is > 0)
-        {
-            queryPayload.Add("offsetIndex", offsetIndex);
-        }
-        return await SendHttpRequest<LightningPaymentData[]>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/payments", queryPayload, HttpMethod.Get, token);
-    }
 
-    public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string storeId, string cryptoCode,
-        CreateLightningInvoiceRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<LightningInvoiceData>($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", request, HttpMethod.Post, token);
+        public virtual async Task ConnectToLightningNode(string storeId, string cryptoCode, ConnectToNodeRequest request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/connect", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<IEnumerable<LightningChannelData>> GetLightningNodeChannels(string storeId, string cryptoCode,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/channels",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<IEnumerable<LightningChannelData>>(response);
+        }
+
+        public virtual async Task OpenLightningChannel(string storeId, string cryptoCode, OpenLightningChannelRequest request,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/channels", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<string> GetLightningDepositAddress(string storeId, string cryptoCode,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/address", method: HttpMethod.Post),
+                token);
+            return await HandleResponse<string>(response);
+        }
+
+        public virtual async Task<LightningPaymentData> PayLightningInvoice(string storeId, string cryptoCode, PayLightningInvoiceRequest request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/pay", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<LightningPaymentData>(response);
+        }
+
+        public virtual async Task<LightningPaymentData> GetLightningPayment(string storeId, string cryptoCode,
+            string paymentHash, CancellationToken token = default)
+        {
+            if (paymentHash == null)
+                throw new ArgumentNullException(nameof(paymentHash));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/payments/{paymentHash}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningPaymentData>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData> GetLightningInvoice(string storeId, string cryptoCode,
+            string invoiceId, CancellationToken token = default)
+        {
+            if (invoiceId == null)
+                throw new ArgumentNullException(nameof(invoiceId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices/{invoiceId}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningInvoiceData>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData[]> GetLightningInvoices(string storeId, string cryptoCode,
+            bool? pendingOnly = null, long? offsetIndex = null, CancellationToken token = default)
+        {
+            var queryPayload = new Dictionary<string, object>();
+            if (pendingOnly is bool v)
+            {
+                queryPayload.Add("pendingOnly", v.ToString());
+            }
+            if (offsetIndex is > 0)
+            {
+                queryPayload.Add("offsetIndex", offsetIndex);
+            }
+
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", queryPayload), token);
+            return await HandleResponse<LightningInvoiceData[]>(response);
+        }
+
+        public virtual async Task<LightningPaymentData[]> GetLightningPayments(string storeId, string cryptoCode,
+            bool? includePending = null, long? offsetIndex = null, CancellationToken token = default)
+        {
+            var queryPayload = new Dictionary<string, object>();
+            if (includePending is bool v)
+            {
+                queryPayload.Add("includePending", v.ToString());
+            }
+            if (offsetIndex is > 0)
+            {
+                queryPayload.Add("offsetIndex", offsetIndex);
+            }
+
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/payments", queryPayload), token);
+            return await HandleResponse<LightningPaymentData[]>(response);
+        }
+
+        public virtual async Task<LightningInvoiceData> CreateLightningInvoice(string storeId, string cryptoCode,
+            CreateLightningInvoiceRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning/{cryptoCode}/invoices", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<LightningInvoiceData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.LightningAddresses.cs

@@ -3,32 +3,46 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<LightningAddressData[]> GetStoreLightningAddresses(string storeId,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<LightningAddressData[]>($"api/v1/stores/{storeId}/lightning-addresses", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<LightningAddressData[]> GetStoreLightningAddresses(string storeId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning-addresses",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningAddressData[]>(response);
+        }
 
-    public virtual async Task<LightningAddressData> GetStoreLightningAddress(string storeId, string username,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<LightningAddressData>($"api/v1/stores/{storeId}/lightning-addresses/{username}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<LightningAddressData> GetStoreLightningAddress(string storeId, string username,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning-addresses/{username}",
+                    method: HttpMethod.Get), token);
+            return await HandleResponse<LightningAddressData>(response);
+        }
 
-    public virtual async Task RemoveStoreLightningAddress(string storeId, string username,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/lightning-addresses/{username}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task RemoveStoreLightningAddress(string storeId, string username,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning-addresses/{username}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task<LightningAddressData> AddOrUpdateStoreLightningAddress(string storeId,
-        string username, LightningAddressData data,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<LightningAddressData>($"api/v1/stores/{storeId}/lightning-addresses/{username}", data, HttpMethod.Post, token);
+        public virtual async Task<LightningAddressData> AddOrUpdateStoreLightningAddress(string storeId,
+            string username, LightningAddressData data,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/lightning-addresses/{username}",
+                    method: HttpMethod.Post, bodyPayload: data), token);
+
+            return await HandleResponse<LightningAddressData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Misc.cs

@@ -1,19 +1,23 @@
-using System.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<PermissionMetadata[]> GetPermissionMetadata(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<PermissionMetadata[]>("misc/permissions", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<Language[]> GetAvailableLanguages(CancellationToken token = default)
-    {
-        return await SendHttpRequest<Language[]>("misc/lang", null, HttpMethod.Get, token);
+        public virtual async Task<PermissionMetadata[]> GetPermissionMetadata(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("misc/permissions"), token);
+            return await HandleResponse<PermissionMetadata[]>(response);
+        }
+        public virtual async Task<Language[]> GetAvailableLanguages(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("misc/lang"), token);
+            return await HandleResponse<Language[]>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Notifications.cs

@@ -1,52 +1,56 @@
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<NotificationData>> GetNotifications(bool? seen = null, int? skip = null,
-        int? take = null, string[] storeId = null, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        var queryPayload = new Dictionary<string, object>();
-        if (seen != null)
-            queryPayload.Add(nameof(seen), seen);
-        if (skip != null)
-            queryPayload.Add(nameof(skip), skip);
-        if (take != null)
-            queryPayload.Add(nameof(take), take);
-        if (storeId != null)
-            queryPayload.Add(nameof(storeId), storeId);
-        return await SendHttpRequest<IEnumerable<NotificationData>>("api/v1/users/me/notifications", queryPayload, HttpMethod.Get, token);
-    }
+        public virtual async Task<IEnumerable<NotificationData>> GetNotifications(bool? seen = null, int? skip = null,
+            int? take = null, CancellationToken token = default)
+        {
+            Dictionary<string, object> queryPayload = new Dictionary<string, object>();
 
-    public virtual async Task<NotificationData> GetNotification(string notificationId,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<NotificationData>($"api/v1/users/me/notifications/{notificationId}", null, HttpMethod.Get, token);
-    }
+            if (seen != null)
+                queryPayload.Add(nameof(seen), seen);
+            if (skip != null)
+                queryPayload.Add(nameof(skip), skip);
+            if (take != null)
+                queryPayload.Add(nameof(take), take);
 
-    public virtual async Task<NotificationData> UpdateNotification(string notificationId, bool? seen,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<NotificationData>($"api/v1/users/me/notifications/{notificationId}", new UpdateNotification { Seen = seen }, HttpMethod.Put, token);
-    }
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/users/me/notifications",
+                    queryPayload), token);
 
-    public virtual async Task<NotificationSettingsData> GetNotificationSettings(CancellationToken token = default)
-    {
-        return await SendHttpRequest<NotificationSettingsData>("api/v1/users/me/notification-settings", null, HttpMethod.Get, token);
-    }
+            return await HandleResponse<IEnumerable<NotificationData>>(response);
+        }
 
-    public virtual async Task<NotificationSettingsData> UpdateNotificationSettings(UpdateNotificationSettingsRequest request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<NotificationSettingsData>("api/v1/users/me/notification-settings", request, HttpMethod.Put, token);
-    }
+        public virtual async Task<NotificationData> GetNotification(string notificationId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/users/me/notifications/{notificationId}"), token);
+            return await HandleResponse<NotificationData>(response);
+        }
 
-    public virtual async Task RemoveNotification(string notificationId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/users/me/notifications/{notificationId}", null, HttpMethod.Delete, token);
+        public virtual async Task<NotificationData> UpdateNotification(string notificationId, bool? seen,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/users/me/notifications/{notificationId}",
+                    method: HttpMethod.Put, bodyPayload: new UpdateNotification() { Seen = seen }), token);
+            return await HandleResponse<NotificationData>(response);
+        }
+
+        public virtual async Task RemoveNotification(string notificationId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/users/me/notifications/{notificationId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.OnChainPaymentMethods.cs

@@ -5,35 +5,45 @@ using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 using Newtonsoft.Json.Linq;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<OnChainPaymentMethodPreviewResultData>
-        PreviewProposedStoreOnChainPaymentMethodAddresses(
-            string storeId, string paymentMethodId, string derivationScheme, int offset = 0,
-            int amount = 10,
-            CancellationToken token = default)
-    {
-        return await SendHttpRequest<UpdatePaymentMethodRequest, OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/preview",
-            new Dictionary<string, object> { { "offset", offset }, { "amount", amount } },
-            new UpdatePaymentMethodRequest { Config = JValue.CreateString(derivationScheme) },
-            HttpMethod.Post, token);
-    }
+	public partial class BTCPayServerClient
+	{
+		public virtual async Task<OnChainPaymentMethodPreviewResultData>
+			PreviewProposedStoreOnChainPaymentMethodAddresses(
+				string storeId, string paymentMethodId, string derivationScheme, int offset = 0,
+				int amount = 10,
+				CancellationToken token = default)
+		{
+			var response = await _httpClient.SendAsync(
+				CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/preview",
+					bodyPayload: new UpdatePaymentMethodRequest() { Config = JValue.CreateString(derivationScheme) },
+					queryPayload: new Dictionary<string, object>() { { "offset", offset }, { "amount", amount } },
+					method: HttpMethod.Post), token);
+			return await HandleResponse<OnChainPaymentMethodPreviewResultData>(response);
+		}
 
-    public virtual async Task<OnChainPaymentMethodPreviewResultData> PreviewStoreOnChainPaymentMethodAddresses(
-        string storeId, string paymentMethodId, int offset = 0, int amount = 10,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<OnChainPaymentMethodPreviewResultData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/preview",
-            new Dictionary<string, object> { { "offset", offset }, { "amount", amount } }, HttpMethod.Get, token);
-    }
+		public virtual async Task<OnChainPaymentMethodPreviewResultData> PreviewStoreOnChainPaymentMethodAddresses(
+			string storeId, string paymentMethodId, int offset = 0, int amount = 10,
+			CancellationToken token = default)
+		{
+			var response = await _httpClient.SendAsync(
+				CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/preview",
+					queryPayload: new Dictionary<string, object>() { { "offset", offset }, { "amount", amount } },
+					method: HttpMethod.Get), token);
+			return await HandleResponse<OnChainPaymentMethodPreviewResultData>(response);
+		}
 
-    public virtual async Task<GenerateOnChainWalletResponse> GenerateOnChainWallet(string storeId,
-        string paymentMethodId, GenerateOnChainWalletRequest request,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<GenerateOnChainWalletResponse>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/wallet/generate", request, HttpMethod.Post, token);
-    }
+		public virtual async Task<GenerateOnChainWalletResponse> GenerateOnChainWallet(string storeId,
+			string paymentMethodId, GenerateOnChainWalletRequest request,
+			CancellationToken token = default)
+		{
+			var response = await _httpClient.SendAsync(
+				CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}/generate",
+					bodyPayload: request,
+					method: HttpMethod.Post), token);
+			return await HandleResponse<GenerateOnChainWalletResponse>(response);
+		}
 
+	}
 }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.Objects.cs

@@ -1,62 +1,82 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
+using NBitcoin;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<OnChainWalletObjectData> GetOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId, bool? includeNeighbourData = null, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        var parameters = new Dictionary<string, object>();
-        if (includeNeighbourData is bool v)
-            parameters.Add("includeNeighbourData", v);
-        try
+        public virtual async Task<OnChainWalletObjectData> GetOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId, bool? includeNeighbourData = null, CancellationToken token = default)
         {
-            return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}", parameters, HttpMethod.Get, token);
+            Dictionary<string, object> parameters = new Dictionary<string, object>();
+            if (includeNeighbourData is bool v)
+                parameters.Add("includeNeighbourData", v);
+            var response =
+            await _httpClient.SendAsync(
+            CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", parameters, method: HttpMethod.Get), token);
+            try
+            {
+                return await HandleResponse<OnChainWalletObjectData>(response);
+            }
+            catch (GreenfieldAPIException err) when (err.APIError.Code == "wallet-object-not-found")
+            {
+                return null;
+            }
         }
-        catch (GreenfieldAPIException err) when (err.APIError.Code == "wallet-object-not-found")
+        public virtual async Task<OnChainWalletObjectData[]> GetOnChainWalletObjects(string storeId, string cryptoCode, GetWalletObjectsRequest query = null, CancellationToken token = default)
         {
-            return null;
+            Dictionary<string, object> parameters = new Dictionary<string, object>();
+            if (query?.Type is string s)
+                parameters.Add("type", s);
+            if (query?.Ids is string[] ids)
+                parameters.Add("ids", ids);
+            if (query?.IncludeNeighbourData is bool v)
+                parameters.Add("includeNeighbourData", v);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", parameters, method: HttpMethod.Get), token);
+            return await HandleResponse<OnChainWalletObjectData[]>(response);
+        }
+        public virtual async Task RemoveOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}", method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+        public virtual async Task<OnChainWalletObjectData> AddOrUpdateOnChainWalletObject(string storeId, string cryptoCode, AddOnChainWalletObjectRequest request,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects", method: HttpMethod.Post, bodyPayload: request), token);
+            return await HandleResponse<OnChainWalletObjectData>(response);
+        }
+        public virtual async Task AddOrUpdateOnChainWalletLink(string storeId, string cryptoCode,
+            OnChainWalletObjectId objectId,
+            AddOnChainWalletObjectLinkRequest request = null,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links", method: HttpMethod.Post, bodyPayload: request), token);
+            await HandleResponse(response);
+        }
+        public virtual async Task RemoveOnChainWalletLinks(string storeId, string cryptoCode,
+            OnChainWalletObjectId objectId,
+            OnChainWalletObjectId link,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", method: HttpMethod.Delete), token);
+            await HandleResponse(response);
         }
-    }
-    public virtual async Task<OnChainWalletObjectData[]> GetOnChainWalletObjects(string storeId, string cryptoCode, GetWalletObjectsRequest query = null, CancellationToken token = default)
-    {
-        Dictionary<string, object> parameters = new Dictionary<string, object>();
-        if (query?.Type is string s)
-            parameters.Add("type", s);
-        if (query?.Ids is string[] ids)
-            parameters.Add("ids", ids);
-        if (query?.IncludeNeighbourData is bool v)
-            parameters.Add("includeNeighbourData", v);
-        return await SendHttpRequest<OnChainWalletObjectData[]>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects", parameters, HttpMethod.Get, token);
-    }
-    public virtual async Task RemoveOnChainWalletObject(string storeId, string cryptoCode, OnChainWalletObjectId objectId,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}", null, HttpMethod.Delete, token);
-    }
-    public virtual async Task<OnChainWalletObjectData> AddOrUpdateOnChainWalletObject(string storeId, string cryptoCode, AddOnChainWalletObjectRequest request,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<OnChainWalletObjectData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task AddOrUpdateOnChainWalletLink(string storeId, string cryptoCode,
-        OnChainWalletObjectId objectId,
-        AddOnChainWalletObjectLinkRequest request = null,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}/links", request, HttpMethod.Post, token);
-    }
-
-    public virtual async Task RemoveOnChainWalletLinks(string storeId, string cryptoCode,
-        OnChainWalletObjectId objectId,
-        OnChainWalletObjectId link,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/objects/{objectId.Type}/{objectId.Id}/links/{link.Type}/{link.Id}", null, HttpMethod.Delete, token);
     }
 }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -7,105 +7,138 @@ using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 using NBitcoin;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<OnChainWalletOverviewData> ShowOnChainWalletOverview(string storeId, string cryptoCode,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<OnChainWalletOverviewData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet", null, HttpMethod.Get, token);
-    }
-    public virtual async Task<OnChainWalletFeeRateData> GetOnChainFeeRate(string storeId, string cryptoCode, int? blockTarget = null,
-        CancellationToken token = default)
-    {
-        var queryParams = new Dictionary<string, object>();
-        if (blockTarget != null)
+        public virtual async Task<OnChainWalletOverviewData> ShowOnChainWalletOverview(string storeId, string cryptoCode,
+            CancellationToken token = default)
         {
-            queryParams.Add("blockTarget", blockTarget);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet"), token);
+            return await HandleResponse<OnChainWalletOverviewData>(response);
         }
-        return await SendHttpRequest<OnChainWalletFeeRateData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/feerate", queryParams, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<OnChainWalletAddressData> GetOnChainWalletReceiveAddress(string storeId, string cryptoCode, bool forceGenerate = false,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<OnChainWalletAddressData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/address", new Dictionary<string, object>
+        public virtual async Task<OnChainWalletFeeRateData> GetOnChainFeeRate(string storeId, string cryptoCode, int? blockTarget = null,
+            CancellationToken token = default)
         {
-            {"forceGenerate", forceGenerate}
-        }, HttpMethod.Get, token);
-    }
-
-    public virtual async Task UnReserveOnChainWalletReceiveAddress(string storeId, string cryptoCode,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/address", null, HttpMethod.Delete, token);
-    }
-
-    public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
-        string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null, int skip = 0,
-        CancellationToken token = default)
-    {
-        var query = new Dictionary<string, object>();
-        if (statusFilter?.Any() is true)
-        {
-            query.Add(nameof(statusFilter), statusFilter);
+            Dictionary<string, object> queryParams = new Dictionary<string, object>();
+            if (blockTarget != null)
+            {
+                queryParams.Add("blockTarget", blockTarget);
+            }
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/feeRate", queryParams), token);
+            return await HandleResponse<OnChainWalletFeeRateData>(response);
         }
-        if (labelFilter != null)
+
+        public virtual async Task<OnChainWalletAddressData> GetOnChainWalletReceiveAddress(string storeId, string cryptoCode, bool forceGenerate = false,
+            CancellationToken token = default)
         {
-            query.Add(nameof(labelFilter), labelFilter);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/address", new Dictionary<string, object>()
+                    {
+                        {"forceGenerate", forceGenerate}
+                    }), token);
+            return await HandleResponse<OnChainWalletAddressData>(response);
         }
-        if (skip != 0)
+
+        public virtual async Task UnReserveOnChainWalletReceiveAddress(string storeId, string cryptoCode,
+            CancellationToken token = default)
         {
-            query.Add(nameof(skip), skip);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/address", method: HttpMethod.Delete), token);
+            await HandleResponse(response);
         }
-        return await SendHttpRequest<IEnumerable<OnChainWalletTransactionData>>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", query, HttpMethod.Get, token);
-    }
 
-    public virtual async Task<OnChainWalletTransactionData> GetOnChainWalletTransaction(
-        string storeId, string cryptoCode, string transactionId,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions/{transactionId}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(
-        string storeId, string cryptoCode, string transactionId,
-        PatchOnChainTransactionRequest request,
-        bool force = false, CancellationToken token = default)
-    {
-        return await SendHttpRequest<PatchOnChainTransactionRequest, OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions/{transactionId}", 
-            new Dictionary<string, object> { {"force", force} }, request, HttpMethod.Patch, token);
-    }
-
-    public virtual async Task<IEnumerable<OnChainWalletUTXOData>> GetOnChainWalletUTXOs(string storeId,
-        string cryptoCode,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<OnChainWalletUTXOData>>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/utxos", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<OnChainWalletTransactionData> CreateOnChainTransaction(string storeId,
-        string cryptoCode, CreateOnChainTransactionRequest request,
-        CancellationToken token = default)
-    {
-        if (!request.ProceedWithBroadcast)
+        public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
+            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null, int skip = 0,
+            CancellationToken token = default)
         {
-            throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
-                "Please use CreateOnChainTransactionButDoNotBroadcast when wanting to only create the transaction");
+            var query = new Dictionary<string, object>();
+            if (statusFilter?.Any() is true)
+            {
+                query.Add(nameof(statusFilter), statusFilter);
+            }
+            if (labelFilter != null)
+            {
+                query.Add(nameof(labelFilter), labelFilter);
+            }
+            if (skip != 0)
+            {
+                query.Add(nameof(skip), skip);
+            }
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", query), token);
+            return await HandleResponse<IEnumerable<OnChainWalletTransactionData>>(response);
         }
-        return await SendHttpRequest<OnChainWalletTransactionData>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", request, HttpMethod.Post, token);
-    }
 
-    public virtual async Task<Transaction> CreateOnChainTransactionButDoNotBroadcast(string storeId,
-        string cryptoCode, CreateOnChainTransactionRequest request, Network network,
-        CancellationToken token = default)
-    {
-        if (request.ProceedWithBroadcast)
+        public virtual async Task<OnChainWalletTransactionData> GetOnChainWalletTransaction(
+            string storeId, string cryptoCode, string transactionId,
+            CancellationToken token = default)
         {
-            throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
-                "Please use CreateOnChainTransaction when wanting to also broadcast the transaction");
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}"), token);
+            return await HandleResponse<OnChainWalletTransactionData>(response);
+        }
+
+        public virtual async Task<OnChainWalletTransactionData> PatchOnChainWalletTransaction(
+            string storeId, string cryptoCode, string transactionId,
+            PatchOnChainTransactionRequest request,
+            bool force = false, CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions/{transactionId}", queryPayload: new Dictionary<string, object>()
+                    {
+                        {"force", force}
+                    }, bodyPayload: request, HttpMethod.Patch), token);
+            return await HandleResponse<OnChainWalletTransactionData>(response);
+        }
+
+        public virtual async Task<IEnumerable<OnChainWalletUTXOData>> GetOnChainWalletUTXOs(string storeId,
+            string cryptoCode,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/utxos"), token);
+            return await HandleResponse<IEnumerable<OnChainWalletUTXOData>>(response);
+        }
+
+        public virtual async Task<OnChainWalletTransactionData> CreateOnChainTransaction(string storeId,
+            string cryptoCode, CreateOnChainTransactionRequest request,
+            CancellationToken token = default)
+        {
+            if (!request.ProceedWithBroadcast)
+            {
+                throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
+                    "Please use CreateOnChainTransactionButDoNotBroadcast when wanting to only create the transaction");
+            }
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", null, request, HttpMethod.Post), token);
+            return await HandleResponse<OnChainWalletTransactionData>(response);
+        }
+
+        public virtual async Task<Transaction> CreateOnChainTransactionButDoNotBroadcast(string storeId,
+            string cryptoCode, CreateOnChainTransactionRequest request, Network network,
+            CancellationToken token = default)
+        {
+            if (request.ProceedWithBroadcast)
+            {
+                throw new ArgumentOutOfRangeException(nameof(request.ProceedWithBroadcast),
+                    "Please use CreateOnChainTransaction when wanting to also broadcast the transaction");
+            }
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", null, request, HttpMethod.Post), token);
+            return Transaction.Parse(await HandleResponse<string>(response), network);
         }
-        return Transaction.Parse(await SendHttpRequest<string>($"api/v1/stores/{storeId}/payment-methods/{cryptoCode}-CHAIN/wallet/transactions", request, HttpMethod.Post, token), network);
     }
 }

BTCPayServer.Client/BTCPayServerClient.PaymentRequests.cs

@@ -5,49 +5,72 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<PaymentRequestData>> GetPaymentRequests(string storeId,
-        bool includeArchived = false,
-        CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<IEnumerable<PaymentRequestData>>($"api/v1/stores/{storeId}/payment-requests",
-            new Dictionary<string, object> { { nameof(includeArchived), includeArchived } }, HttpMethod.Get, token);
-    }
+        public virtual async Task<IEnumerable<PaymentRequestData>> GetPaymentRequests(string storeId,
+            bool includeArchived = false,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests",
+                        new Dictionary<string, object>() { { nameof(includeArchived), includeArchived } }), token);
+            return await HandleResponse<IEnumerable<PaymentRequestData>>(response);
+        }
 
-    public virtual async Task<PaymentRequestData> GetPaymentRequest(string storeId, string paymentRequestId,
-        CancellationToken token = default)
-    {
-        return await SendHttpRequest<PaymentRequestData>($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<PaymentRequestData> GetPaymentRequest(string storeId, string paymentRequestId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}"), token);
+            return await HandleResponse<PaymentRequestData>(response);
+        }
 
-    public virtual async Task ArchivePaymentRequest(string storeId, string paymentRequestId,
-        CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task ArchivePaymentRequest(string storeId, string paymentRequestId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task<Client.Models.InvoiceData> PayPaymentRequest(string storeId, string paymentRequestId, PayPaymentRequestRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        if (storeId is null) throw new ArgumentNullException(nameof(storeId));
-        if (paymentRequestId is null) throw new ArgumentNullException(nameof(paymentRequestId));
-        return await SendHttpRequest<InvoiceData>($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}/pay", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<Client.Models.InvoiceData> PayPaymentRequest(string storeId, string paymentRequestId, PayPaymentRequestRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            if (storeId is null)
+                throw new ArgumentNullException(nameof(storeId));
+            if (paymentRequestId is null)
+                throw new ArgumentNullException(nameof(paymentRequestId));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}/pay", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<Client.Models.InvoiceData>(response);
+        }
 
-    public virtual async Task<PaymentRequestData> CreatePaymentRequest(string storeId,
-        CreatePaymentRequestRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<PaymentRequestData>($"api/v1/stores/{storeId}/payment-requests", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<PaymentRequestData> CreatePaymentRequest(string storeId,
+            CreatePaymentRequestRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<PaymentRequestData>(response);
+        }
 
-    public virtual async Task<PaymentRequestData> UpdatePaymentRequest(string storeId, string paymentRequestId,
-        UpdatePaymentRequestRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<PaymentRequestData>($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}", request, HttpMethod.Put, token);
+        public virtual async Task<PaymentRequestData> UpdatePaymentRequest(string storeId, string paymentRequestId,
+            UpdatePaymentRequestRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests/{paymentRequestId}", bodyPayload: request,
+                    method: HttpMethod.Put), token);
+            return await HandleResponse<PaymentRequestData>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.PayoutProcessors.cs

@@ -1,16 +1,18 @@
 #nullable enable
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<PayoutProcessorData>> GetPayoutProcessors(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<IEnumerable<PayoutProcessorData>>("api/v1/payout-processors", null, HttpMethod.Get, token);
+        public virtual async Task<IEnumerable<PayoutProcessorData>> GetPayoutProcessors(
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/payout-processors"), token);
+            return await HandleResponse<IEnumerable<PayoutProcessorData>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -5,90 +5,113 @@ using System.Threading.Tasks;
 using System.Web;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<PullPaymentData> CreatePullPayment(string storeId, CreatePullPaymentRequest request, CancellationToken cancellationToken = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<PullPaymentData>($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", request, HttpMethod.Post, cancellationToken);
-    }
+        public virtual async Task<PullPaymentData> CreatePullPayment(string storeId, CreatePullPaymentRequest request, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<PullPaymentData>(response);
+        }
+        public virtual async Task<PullPaymentData> GetPullPayment(string pullPaymentId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PullPaymentData>(response);
+        }
 
-    public virtual async Task<PullPaymentData> GetPullPayment(string pullPaymentId, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PullPaymentData>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", null, HttpMethod.Get, cancellationToken);
-    }
+        public virtual async Task<RegisterBoltcardResponse> RegisterBoltcard(string pullPaymentId, RegisterBoltcardRequest request, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/boltcards", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<RegisterBoltcardResponse>(response);
+        }
 
-    public virtual async Task<RegisterBoltcardResponse> RegisterBoltcard(string pullPaymentId, RegisterBoltcardRequest request, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<RegisterBoltcardResponse>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/boltcards", request, HttpMethod.Post, cancellationToken);
-    }
+        public virtual async Task<PullPaymentData[]> GetPullPayments(string storeId, bool includeArchived = false, CancellationToken cancellationToken = default)
+        {
+            Dictionary<string, object> query = new Dictionary<string, object>();
+            query.Add("includeArchived", includeArchived);
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", queryPayload: query, method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PullPaymentData[]>(response);
+        }
 
-    public virtual async Task<PullPaymentData[]> GetPullPayments(string storeId, bool includeArchived = false, CancellationToken cancellationToken = default)
-    {
-        var query = new Dictionary<string, object> { { "includeArchived", includeArchived } };
-        return await SendHttpRequest<PullPaymentData[]>($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments", query, HttpMethod.Get, cancellationToken);
-    }
+        public virtual async Task ArchivePullPayment(string storeId, string pullPaymentId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", method: HttpMethod.Delete), cancellationToken);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task ArchivePullPayment(string storeId, string pullPaymentId, CancellationToken cancellationToken = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}", null, HttpMethod.Delete, cancellationToken);
-    }
+        public virtual async Task<PayoutData[]> GetPayouts(string pullPaymentId, bool includeCancelled = false, CancellationToken cancellationToken = default)
+        {
+            Dictionary<string, object> query = new Dictionary<string, object>();
+            query.Add("includeCancelled", includeCancelled);
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", queryPayload: query, method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData[]>(response);
+        }
+        public virtual async Task<PayoutData[]> GetStorePayouts(string storeId, bool includeCancelled = false, CancellationToken cancellationToken = default)
+        {
+            Dictionary<string, object> query = new Dictionary<string, object>();
+            query.Add("includeCancelled", includeCancelled);
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts", queryPayload: query, method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData[]>(response);
+        }
+        public virtual async Task<PayoutData> CreatePayout(string pullPaymentId, CreatePayoutRequest payoutRequest, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        }
+        public virtual async Task<PayoutData> GetPullPaymentPayout(string pullPaymentId, string payoutId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        }
+        public virtual async Task<PayoutData> GetStorePayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts/{payoutId}", method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        }
+        public virtual async Task<PayoutData> CreatePayout(string storeId, CreatePayoutThroughStoreRequest payoutRequest, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        }
+        public virtual async Task CancelPayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", method: HttpMethod.Delete), cancellationToken);
+            await HandleResponse(response);
+        }
+        public virtual async Task<PayoutData> ApprovePayout(string storeId, string payoutId, ApprovePayoutRequest request, CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", bodyPayload: request, method: HttpMethod.Post), cancellationToken);
+            return await HandleResponse<PayoutData>(response);
+        }
 
-    public virtual async Task<PayoutData[]> GetPayouts(string pullPaymentId, bool includeCancelled = false, CancellationToken cancellationToken = default)
-    {
-        var query = new Dictionary<string, object> { { "includeCancelled", includeCancelled } };
-        return await SendHttpRequest<PayoutData[]>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", query, HttpMethod.Get, cancellationToken);
-    }
+        public virtual async Task MarkPayoutPaid(string storeId, string payoutId,
+            CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest(
+                    $"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}/mark-paid",
+                    method: HttpMethod.Post), cancellationToken);
+            await HandleResponse(response);
+        }
+        public virtual async Task MarkPayout(string storeId, string payoutId, MarkPayoutRequest request,
+            CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest(
+                    $"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}/mark",
+                    method: HttpMethod.Post, bodyPayload: request), cancellationToken);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task<PayoutData[]> GetStorePayouts(string storeId, bool includeCancelled = false, CancellationToken cancellationToken = default)
-    {
-        var query = new Dictionary<string, object> { { "includeCancelled", includeCancelled } };
-        return await SendHttpRequest<PayoutData[]>($"api/v1/stores/{storeId}/payouts", queryPayload: query, method: HttpMethod.Get, cancellationToken);
-    }
-
-    public virtual async Task<PayoutData> CreatePayout(string pullPaymentId, CreatePayoutRequest payoutRequest, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PayoutData>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts", bodyPayload: payoutRequest, HttpMethod.Post, cancellationToken);
-    }
-
-    public virtual async Task<PayoutData> GetPullPaymentPayout(string pullPaymentId, string payoutId, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PayoutData>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/payouts/{payoutId}", null, HttpMethod.Get, cancellationToken);
-    }
-
-    public virtual async Task<PayoutData> GetStorePayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PayoutData>($"api/v1/stores/{storeId}/payouts/{payoutId}", null, HttpMethod.Get, cancellationToken);
-    }
-
-    public virtual async Task<PayoutData> CreatePayout(string storeId, CreatePayoutThroughStoreRequest payoutRequest, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PayoutData>($"api/v1/stores/{storeId}/payouts", bodyPayload: payoutRequest, method: HttpMethod.Post, cancellationToken);
-    }
-
-    public virtual async Task CancelPayout(string storeId, string payoutId, CancellationToken cancellationToken = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", null, HttpMethod.Delete, cancellationToken);
-    }
-
-    public virtual async Task<PayoutData> ApprovePayout(string storeId, string payoutId, ApprovePayoutRequest request, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PayoutData>($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}", request, HttpMethod.Post, cancellationToken);
-    }
-
-    public virtual async Task MarkPayoutPaid(string storeId, string payoutId, CancellationToken cancellationToken = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}/mark-paid", null, HttpMethod.Post, cancellationToken);
-    }
-
-    public virtual async Task MarkPayout(string storeId, string payoutId, MarkPayoutRequest request, CancellationToken cancellationToken = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{HttpUtility.UrlEncode(storeId)}/payouts/{HttpUtility.UrlEncode(payoutId)}/mark", request, HttpMethod.Post, cancellationToken);
-    }
-
-    public virtual async Task<PullPaymentLNURL> GetPullPaymentLNURL(string pullPaymentId, CancellationToken cancellationToken = default)
-    {
-        return await SendHttpRequest<PullPaymentLNURL>($"api/v1/pull-payments/{HttpUtility.UrlEncode(pullPaymentId)}/lnurl", null, HttpMethod.Get, cancellationToken);
+        public virtual async Task<PullPaymentLNURL> GetPullPaymentLNURL(string pullPaymentId,
+            CancellationToken cancellationToken = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest(
+                    $"/api/v1/pull-payments/{pullPaymentId}/lnurl",
+                    method: HttpMethod.Get), cancellationToken);
+            return await HandleResponse<PullPaymentLNURL>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,20 +1,22 @@
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<ServerInfoData> GetServerInfo(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<ServerInfoData>("api/v1/server/info", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<ServerInfoData> GetServerInfo(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/server/info"), token);
+            return await HandleResponse<ServerInfoData>(response);
+        }
         
-    public virtual async Task<List<RoleData>> GetServerRoles(CancellationToken token = default)
-    {
-        return await SendHttpRequest<List<RoleData>>("api/v1/server/roles", null, HttpMethod.Get, token);
+        public virtual async Task<List<RoleData>> GetServerRoles(CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/server/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StoreEmail.cs

@@ -3,22 +3,35 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<EmailSettingsData> GetStoreEmailSettings(string storeId, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<EmailSettingsData>($"api/v1/stores/{storeId}/email", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<EmailSettingsData> GetStoreEmailSettings(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/email", method: HttpMethod.Get),
+                token);
+            return await HandleResponse<EmailSettingsData>(response);
+        }
 
-    public virtual async Task<EmailSettingsData> UpdateStoreEmailSettings(string storeId, EmailSettingsData request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<EmailSettingsData>($"api/v1/stores/{storeId}/email", request, method: HttpMethod.Put, token);
-    }
+        public virtual async Task<EmailSettingsData> UpdateStoreEmailSettings(string storeId, EmailSettingsData request,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/email", bodyPayload: request, method: HttpMethod.Put),
+                token);
+            return await HandleResponse<EmailSettingsData>(response);
+        }
 
-    public virtual async Task SendEmail(string storeId, SendEmailRequest request, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/email/send", request, HttpMethod.Post, token);
+        public virtual async Task SendEmail(string storeId, SendEmailRequest request,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/email/send", bodyPayload: request, method: HttpMethod.Post),
+                token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StorePaymentMethods.cs

@@ -4,42 +4,64 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<GenericPaymentMethodData> UpdateStorePaymentMethod(string storeId, string paymentMethodId, UpdatePaymentMethodRequest request, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<GenericPaymentMethodData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}", request, HttpMethod.Put, token);
-    }
-
-    public virtual async Task RemoveStorePaymentMethod(string storeId, string paymentMethodId)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}", null, HttpMethod.Delete, CancellationToken.None);
-    }
-
-    public virtual async Task<GenericPaymentMethodData> GetStorePaymentMethod(string storeId, string paymentMethodId, bool? includeConfig = null, CancellationToken token = default)
-    {
-        var query = new Dictionary<string, object>();
-        if (includeConfig != null)
+        public virtual async Task<GenericPaymentMethodData> UpdateStorePaymentMethod(
+            string storeId,
+            string paymentMethodId,
+            UpdatePaymentMethodRequest request,
+            CancellationToken token = default)
         {
-            query.Add(nameof(includeConfig), includeConfig);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}", bodyPayload: request, method: HttpMethod.Put),
+                    token);
+            return await HandleResponse<GenericPaymentMethodData>(response);
         }
-        return await SendHttpRequest<GenericPaymentMethodData>($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}", query, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<GenericPaymentMethodData[]> GetStorePaymentMethods(string storeId, bool? onlyEnabled = null, bool? includeConfig = null, CancellationToken token = default)
-    {
-        var query = new Dictionary<string, object>();
-        if (onlyEnabled != null)
+        public virtual async Task RemoveStorePaymentMethod(string storeId, string paymentMethodId)
         {
-            query.Add(nameof(onlyEnabled), onlyEnabled);
-        }
-        if (includeConfig != null)
-        {
-            query.Add(nameof(includeConfig), includeConfig);
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}", method: HttpMethod.Delete),
+                    CancellationToken.None);
+            await HandleResponse(response);
         }
 
-        return await SendHttpRequest<GenericPaymentMethodData[]>($"api/v1/stores/{storeId}/payment-methods", query, HttpMethod.Get, token);
+        public virtual async Task<GenericPaymentMethodData> GetStorePaymentMethod(string storeId,
+            string paymentMethodId, bool? includeConfig = null, CancellationToken token = default)
+        {
+            var query = new Dictionary<string, object>();
+            if (includeConfig != null)
+            {
+                query.Add(nameof(includeConfig), includeConfig);
+            }
+
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/{paymentMethodId}",
+                        query), token);
+            return await HandleResponse<GenericPaymentMethodData>(response);
+        }
+        public virtual async Task<GenericPaymentMethodData[]> GetStorePaymentMethods(string storeId,
+            bool? onlyEnabled = null, bool? includeConfig = null, CancellationToken token = default)
+        {
+            var query = new Dictionary<string, object>();
+            if (onlyEnabled != null)
+            {
+                query.Add(nameof(onlyEnabled), onlyEnabled);
+            }
+            if (includeConfig != null)
+            {
+                query.Add(nameof(includeConfig), includeConfig);
+            }
+
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods",
+                        query), token);
+            return await HandleResponse<GenericPaymentMethodData[]>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StorePayoutProcessors.cs

@@ -5,37 +5,44 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<PayoutProcessorData>> GetPayoutProcessors(string storeId, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<IEnumerable<PayoutProcessorData>>($"api/v1/stores/{storeId}/payout-processors", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<IEnumerable<PayoutProcessorData>> GetPayoutProcessors(string storeId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors"), token);
+            return await HandleResponse<IEnumerable<PayoutProcessorData>>(response);
+        }
+        public virtual async Task RemovePayoutProcessor(string storeId, string processor, string paymentMethod, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors/{processor}/{paymentMethod}", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task RemovePayoutProcessor(string storeId, string processor, string paymentMethod, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/payout-processors/{processor}/{paymentMethod}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task<IEnumerable<LightningAutomatedPayoutSettings>> GetStoreLightningAutomatedPayoutProcessors(string storeId, string? paymentMethod = null,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors/LightningAutomatedPayoutSenderFactory{(paymentMethod is null ? string.Empty : $"/{paymentMethod}")}"), token);
+            return await HandleResponse<IEnumerable<LightningAutomatedPayoutSettings>>(response);
+        }
+        public virtual async Task<LightningAutomatedPayoutSettings> UpdateStoreLightningAutomatedPayoutProcessors(string storeId, string paymentMethod, LightningAutomatedPayoutSettings request, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors/LightningAutomatedPayoutSenderFactory/{paymentMethod}", null, request, HttpMethod.Put), token);
+            return await HandleResponse<LightningAutomatedPayoutSettings>(response);
+        }
+        public virtual async Task<OnChainAutomatedPayoutSettings> UpdateStoreOnChainAutomatedPayoutProcessors(string storeId, string paymentMethod, OnChainAutomatedPayoutSettings request, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors/OnChainAutomatedPayoutSenderFactory/{paymentMethod}", null, request, HttpMethod.Put), token);
+            return await HandleResponse<OnChainAutomatedPayoutSettings>(response);
+        }
 
-    public virtual async Task<IEnumerable<LightningAutomatedPayoutSettings>> GetStoreLightningAutomatedPayoutProcessors(string storeId, string? paymentMethod = null, CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<LightningAutomatedPayoutSettings>>($"api/v1/stores/{storeId}/payout-processors/LightningAutomatedPayoutSenderFactory{(paymentMethod is null ? string.Empty : $"/{paymentMethod}")}", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<LightningAutomatedPayoutSettings> UpdateStoreLightningAutomatedPayoutProcessors(string storeId, string paymentMethod, LightningAutomatedPayoutSettings request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<LightningAutomatedPayoutSettings>($"api/v1/stores/{storeId}/payout-processors/LightningAutomatedPayoutSenderFactory/{paymentMethod}", request, HttpMethod.Put, token);
-    }
-
-    public virtual async Task<OnChainAutomatedPayoutSettings> UpdateStoreOnChainAutomatedPayoutProcessors(string storeId, string paymentMethod, OnChainAutomatedPayoutSettings request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<OnChainAutomatedPayoutSettings>($"api/v1/stores/{storeId}/payout-processors/OnChainAutomatedPayoutSenderFactory/{paymentMethod}", request, HttpMethod.Put, token);
-    }
-
-    public virtual async Task<IEnumerable<OnChainAutomatedPayoutSettings>> GetStoreOnChainAutomatedPayoutProcessors(string storeId, string? paymentMethod = null, CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<OnChainAutomatedPayoutSettings>>($"api/v1/stores/{storeId}/payout-processors/OnChainAutomatedPayoutSenderFactory{(paymentMethod is null ? string.Empty : $"/{paymentMethod}")}", null, HttpMethod.Get, token);
+        public virtual async Task<IEnumerable<OnChainAutomatedPayoutSettings>> GetStoreOnChainAutomatedPayoutProcessors(string storeId, string? paymentMethod = null,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payout-processors/OnChainAutomatedPayoutSenderFactory{(paymentMethod is null ? string.Empty : $"/{paymentMethod}")}"), token);
+            return await HandleResponse<IEnumerable<OnChainAutomatedPayoutSettings>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StoreRatesConfiguration.cs

@@ -4,34 +4,61 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<StoreRateConfiguration> GetStoreRateConfiguration(string storeId, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<StoreRateConfiguration>($"api/v1/stores/{storeId}/rates/configuration", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<StoreRateConfiguration> GetStoreRateConfiguration(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration", method: HttpMethod.Get),
+                token);
+            return await HandleResponse<StoreRateConfiguration>(response);
+        }
 
-    public virtual async Task<List<RateSource>> GetRateSources(CancellationToken token = default)
-    {
-        return await SendHttpRequest<List<RateSource>>("misc/rate-sources", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<List<RateSource>> GetRateSources(
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"misc/rate-sources", method: HttpMethod.Get),
+                token);
+            return await HandleResponse<List<RateSource>>(response);
+        }
 
-    public virtual async Task<StoreRateConfiguration> UpdateStoreRateConfiguration(string storeId, StoreRateConfiguration request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<StoreRateConfiguration>($"api/v1/stores/{storeId}/rates/configuration", request, HttpMethod.Put, token);
-    }
+        public virtual async Task<StoreRateConfiguration> UpdateStoreRateConfiguration(string storeId,
+            StoreRateConfiguration request,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration", bodyPayload: request,
+                    method: HttpMethod.Put),
+                token);
+            return await HandleResponse<StoreRateConfiguration>(response);
+        }
 
-    public virtual async Task<List<StoreRateResult>> PreviewUpdateStoreRateConfiguration(string storeId, StoreRateConfiguration request, string[] currencyPair = null, CancellationToken token = default)
-    {
-        var queryPayload = currencyPair == null ? null : new Dictionary<string, object> { { "currencyPair", currencyPair } };
-        return await SendHttpRequest<StoreRateConfiguration, List<StoreRateResult>>($"api/v1/stores/{storeId}/rates/configuration/preview", queryPayload, request, HttpMethod.Post, token);
-    }
+        public virtual async Task<List<StoreRateResult>> PreviewUpdateStoreRateConfiguration(string storeId,
+            StoreRateConfiguration request,
+            string[] currencyPair,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates/configuration/preview", bodyPayload: request,
+                    queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
+                    method: HttpMethod.Post),
+                token);
+            return await HandleResponse<List<StoreRateResult>>(response);
+        }
 
-    public virtual async Task<List<StoreRateResult>> GetStoreRates(string storeId, string[] currencyPair = null, CancellationToken token = default)
-    {
-        var queryPayload = currencyPair == null ? null : new Dictionary<string, object> { { "currencyPair", currencyPair } };
-        return await SendHttpRequest<List<StoreRateResult>>($"api/v1/stores/{storeId}/rates", queryPayload, HttpMethod.Get, token);
+        public virtual async Task<List<StoreRateResult>> GetStoreRates(string storeId, string[] currencyPair,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/rates",
+                    queryPayload: new Dictionary<string, object>() { { "currencyPair", currencyPair } },
+                    method: HttpMethod.Get),
+                token);
+            return await HandleResponse<List<StoreRateResult>>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.StoreUsers.cs

@@ -5,28 +5,40 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<List<RoleData>> GetStoreRoles(string storeId, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<List<RoleData>>($"api/v1/stores/{storeId}/roles", null,  HttpMethod.Get,token);
-    }
+        public virtual async Task<List<RoleData>> GetStoreRoles(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/roles"), token);
+            return await HandleResponse<List<RoleData>>(response);
+        }
         
-    public virtual async Task<IEnumerable<StoreUserData>> GetStoreUsers(string storeId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<IEnumerable<StoreUserData>>($"api/v1/stores/{storeId}/users", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<IEnumerable<StoreUserData>> GetStoreUsers(string storeId,
+            CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/users"), token);
+            return await HandleResponse<IEnumerable<StoreUserData>>(response);
+        }
 
-    public virtual async Task RemoveStoreUser(string storeId, string userId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/users/{userId}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task RemoveStoreUser(string storeId, string userId, CancellationToken token = default)
+        {
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/users/{userId}", method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task AddStoreUser(string storeId, StoreUserData request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        await SendHttpRequest<StoreUserData>($"api/v1/stores/{storeId}/users", request, HttpMethod.Post, token);
+        public virtual async Task AddStoreUser(string storeId, StoreUserData request,
+            CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            using var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/users", bodyPayload: request, method: HttpMethod.Post),
+                token);
+            await HandleResponse(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Stores.cs

@@ -5,45 +5,47 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<IEnumerable<StoreData>> GetStores(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<IEnumerable<StoreData>>("api/v1/stores", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<IEnumerable<StoreData>> GetStores(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/stores"), token);
+            return await HandleResponse<IEnumerable<StoreData>>(response);
+        }
 
-    public virtual async Task<StoreData> GetStore(string storeId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<StoreData>($"api/v1/stores/{storeId}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<StoreData> GetStore(string storeId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}"), token);
+            return await HandleResponse<StoreData>(response);
+        }
 
-    public virtual async Task RemoveStore(string storeId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task RemoveStore(string storeId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}", method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task<StoreData> CreateStore(CreateStoreRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        return await SendHttpRequest<StoreData>("api/v1/stores", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<StoreData> CreateStore(CreateStoreRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/stores", bodyPayload: request, method: HttpMethod.Post), token);
+            return await HandleResponse<StoreData>(response);
+        }
 
-    public virtual async Task<StoreData> UpdateStore(string storeId, UpdateStoreRequest request, CancellationToken token = default)
-    {
-        if (request == null) throw new ArgumentNullException(nameof(request));
-        if (storeId == null) throw new ArgumentNullException(nameof(storeId));
-        return await SendHttpRequest<StoreData>($"api/v1/stores/{storeId}", request, HttpMethod.Put, token);
-    }
+        public virtual async Task<StoreData> UpdateStore(string storeId, UpdateStoreRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            if (storeId == null)
+                throw new ArgumentNullException(nameof(storeId));
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}", bodyPayload: request, method: HttpMethod.Put), token);
+            return await HandleResponse<StoreData>(response);
+        }
 
-    public virtual async Task<StoreData> UploadStoreLogo(string storeId, string filePath, string mimeType, CancellationToken token = default)
-    {
-        return await UploadFileRequest<StoreData>($"api/v1/stores/{storeId}/logo", filePath, mimeType, "file", HttpMethod.Post, token);
-    }
-
-    public virtual async Task DeleteStoreLogo(string storeId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/stores/{storeId}/logo", null, HttpMethod.Delete, token);
     }
 }

BTCPayServer.Client/BTCPayServerClient.Users.cs

@@ -4,68 +4,60 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<ApplicationUserData> GetCurrentUser(CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<ApplicationUserData>("api/v1/users/me", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<ApplicationUserData> GetCurrentUser(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users/me"), token);
+            return await HandleResponse<ApplicationUserData>(response);
+        }
 
-    public virtual async Task<ApplicationUserData> UpdateCurrentUser(UpdateApplicationUserRequest request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<ApplicationUserData>("api/v1/users/me", request, HttpMethod.Put, token);
-    }
+        public virtual async Task<ApplicationUserData> CreateUser(CreateApplicationUserRequest request,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/users", null, request, HttpMethod.Post), token);
+            return await HandleResponse<ApplicationUserData>(response);
+        }
 
-    public virtual async Task<ApplicationUserData> UploadCurrentUserProfilePicture(string filePath, string mimeType, CancellationToken token = default)
-    {
-        return await UploadFileRequest<ApplicationUserData>("api/v1/users/me/picture", filePath, mimeType, "file", HttpMethod.Post, token);
-    }
+        public virtual async Task DeleteUser(string userId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{userId}", null, HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
 
-    public virtual async Task DeleteCurrentUserProfilePicture(CancellationToken token = default)
-    {
-        await SendHttpRequest("api/v1/users/me/picture", null, HttpMethod.Delete, token);
-    }
-    
-    public virtual async Task<ApplicationUserData> CreateUser(CreateApplicationUserRequest request, CancellationToken token = default)
-    {
-        return await SendHttpRequest<ApplicationUserData>("api/v1/users", request, HttpMethod.Post, token);
-    }
+        public virtual async Task<ApplicationUserData> GetUserByIdOrEmail(string idOrEmail, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}", null, HttpMethod.Get), token);
+            return await HandleResponse<ApplicationUserData>(response);
+        }
 
-    public virtual async Task DeleteUser(string userId, CancellationToken token = default)
-    {
-        await SendHttpRequest($"api/v1/users/{userId}", null, HttpMethod.Delete, token);
-    }
+        public virtual async Task<bool> LockUser(string idOrEmail, bool locked, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}/lock", null,
+                new LockUserRequest { Locked = locked }, HttpMethod.Post), token);
+            await HandleResponse(response);
+            return response.IsSuccessStatusCode;
+        }
 
-    public virtual async Task<ApplicationUserData> GetUserByIdOrEmail(string idOrEmail, CancellationToken token = default)
-    {
-        return await SendHttpRequest<ApplicationUserData>($"api/v1/users/{idOrEmail}", null, HttpMethod.Get, token);
-    }
+        public virtual async Task<bool> ApproveUser(string idOrEmail, bool approved, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}/approve", null,
+                new ApproveUserRequest { Approved = approved }, HttpMethod.Post), token);
+            await HandleResponse(response);
+            return response.IsSuccessStatusCode;
+        }
 
-    public virtual async Task<bool> LockUser(string idOrEmail, bool locked, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}/lock", null,
-            new LockUserRequest { Locked = locked }, HttpMethod.Post), token);
-        await HandleResponse(response);
-        return response.IsSuccessStatusCode;
-    }
+        public virtual async Task<ApplicationUserData[]> GetUsers(CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/", null, HttpMethod.Get), token);
+            return await HandleResponse<ApplicationUserData[]>(response);
+        }
 
-    public virtual async Task<bool> ApproveUser(string idOrEmail, bool approved, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/users/{idOrEmail}/approve", null,
-            new ApproveUserRequest { Approved = approved }, HttpMethod.Post), token);
-        await HandleResponse(response);
-        return response.IsSuccessStatusCode;
-    }
-
-    public virtual async Task<ApplicationUserData[]> GetUsers(CancellationToken token = default)
-    {
-        return await SendHttpRequest<ApplicationUserData[]>("api/v1/users/", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task DeleteCurrentUser(CancellationToken token = default)
-    {
-        await DeleteUser("me", token);
+        public virtual async Task DeleteCurrentUser(CancellationToken token = default)
+        {
+            await DeleteUser("me", token);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.Webhooks.cs

@@ -3,56 +3,61 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    public virtual async Task<StoreWebhookData> CreateWebhook(string storeId, CreateStoreWebhookRequest create, CancellationToken token = default)
+    public partial class BTCPayServerClient
     {
-        return await SendHttpRequest<StoreWebhookData>($"api/v1/stores/{storeId}/webhooks", create, HttpMethod.Post, token);
-    }
+        public virtual async Task<StoreWebhookData> CreateWebhook(string storeId, Client.Models.CreateStoreWebhookRequest create, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks", bodyPayload: create, method: HttpMethod.Post), token);
+            return await HandleResponse<StoreWebhookData>(response);
+        }
+        public virtual async Task<StoreWebhookData> GetWebhook(string storeId, string webhookId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}"), token);
+            if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                return null;
+            return await HandleResponse<StoreWebhookData>(response);
+        }
+        public virtual async Task<StoreWebhookData> UpdateWebhook(string storeId, string webhookId, Models.UpdateStoreWebhookRequest update, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}", bodyPayload: update, method: HttpMethod.Put), token);
+            return await HandleResponse<StoreWebhookData>(response);
+        }
+        public virtual async Task<bool> DeleteWebhook(string storeId, string webhookId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}", method: HttpMethod.Delete), token);
+            return response.IsSuccessStatusCode;
+        }
+        public virtual async Task<StoreWebhookData[]> GetWebhooks(string storeId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks"), token);
+            return await HandleResponse<StoreWebhookData[]>(response);
+        }
+        public virtual async Task<WebhookDeliveryData[]> GetWebhookDeliveries(string storeId, string webhookId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries"), token);
+            return await HandleResponse<WebhookDeliveryData[]>(response);
+        }
+        public virtual async Task<WebhookDeliveryData> GetWebhookDelivery(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}"), token);
+            if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                return null;
+            return await HandleResponse<WebhookDeliveryData>(response);
+        }
+        public virtual async Task<string> RedeliverWebhook(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}/redeliver", null, HttpMethod.Post), token);
+            return await HandleResponse<string>(response);
+        }
 
-    public virtual async Task<StoreWebhookData> GetWebhook(string storeId, string webhookId, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}"), token);
-        return response.StatusCode == System.Net.HttpStatusCode.NotFound ? null : await HandleResponse<StoreWebhookData>(response);
-    }
-
-    public virtual async Task<StoreWebhookData> UpdateWebhook(string storeId, string webhookId, UpdateStoreWebhookRequest update, CancellationToken token = default)
-    {
-        return await SendHttpRequest<StoreWebhookData>($"api/v1/stores/{storeId}/webhooks/{webhookId}", update, HttpMethod.Put, token);
-    }
-
-    public virtual async Task<bool> DeleteWebhook(string storeId, string webhookId, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}", method: HttpMethod.Delete), token);
-        return response.IsSuccessStatusCode;
-    }
-
-    public virtual async Task<StoreWebhookData[]> GetWebhooks(string storeId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<StoreWebhookData[]>($"api/v1/stores/{storeId}/webhooks", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<WebhookDeliveryData[]> GetWebhookDeliveries(string storeId, string webhookId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<WebhookDeliveryData[]>($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries", null, HttpMethod.Get, token);
-    }
-
-    public virtual async Task<WebhookDeliveryData> GetWebhookDelivery(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}"), token);
-        return response.StatusCode == System.Net.HttpStatusCode.NotFound ? null : await HandleResponse<WebhookDeliveryData>(response);
-    }
-
-    public virtual async Task<string> RedeliverWebhook(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
-    {
-        return await SendHttpRequest<string>($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}/redeliver", null, HttpMethod.Post, token);
-    }
-
-    public virtual async Task<WebhookEvent> GetWebhookDeliveryRequest(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
-    {
-        var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}/request"), token);
-        return response.StatusCode == System.Net.HttpStatusCode.NotFound ? null : await HandleResponse<WebhookEvent>(response);
+        public virtual async Task<WebhookEvent> GetWebhookDeliveryRequest(string storeId, string webhookId, string deliveryId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/webhooks/{webhookId}/deliveries/{deliveryId}/request"), token);
+            if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                return null;
+            return await HandleResponse<WebhookEvent>(response);
+        }
     }
 }

BTCPayServer.Client/BTCPayServerClient.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -10,192 +9,154 @@ using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Client;
-
-public partial class BTCPayServerClient
+namespace BTCPayServer.Client
 {
-    private readonly string _apiKey;
-    private readonly Uri _btcpayHost;
-    private readonly string _username;
-    private readonly string _password;
-    protected readonly HttpClient _httpClient;
-    public Uri Host => _btcpayHost;
-
-    public string APIKey => _apiKey;
-
-    public BTCPayServerClient(Uri btcpayHost, HttpClient httpClient = null)
+    public partial class BTCPayServerClient
     {
-        if (btcpayHost == null) throw new ArgumentNullException(nameof(btcpayHost));
-        _btcpayHost = btcpayHost;
-        _httpClient = httpClient ?? new HttpClient();
-    }
+        private readonly string _apiKey;
+        private readonly Uri _btcpayHost;
+        private readonly string _username;
+        private readonly string _password;
+        private readonly HttpClient _httpClient;
+        public Uri Host => _btcpayHost;
 
-    public BTCPayServerClient(Uri btcpayHost, string APIKey, HttpClient httpClient = null)
-    {
-        _apiKey = APIKey;
-        _btcpayHost = btcpayHost;
-        _httpClient = httpClient ?? new HttpClient();
-    }
+        public string APIKey => _apiKey;
 
-    public BTCPayServerClient(Uri btcpayHost, string username, string password, HttpClient httpClient = null)
-    {
-        _apiKey = APIKey;
-        _btcpayHost = btcpayHost;
-        _username = username;
-        _password = password;
-        _httpClient = httpClient ?? new HttpClient();
-    }
-
-    protected async Task HandleResponse(HttpResponseMessage message)
-    {
-        if (!message.IsSuccessStatusCode && message.Content?.Headers?.ContentType?.MediaType?.StartsWith("application/json", StringComparison.OrdinalIgnoreCase) is true)
+        public BTCPayServerClient(Uri btcpayHost, HttpClient httpClient = null)
         {
-            if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
+            if (btcpayHost == null)
+                throw new ArgumentNullException(nameof(btcpayHost));
+            _btcpayHost = btcpayHost;
+            _httpClient = httpClient ?? new HttpClient();
+        }
+        public BTCPayServerClient(Uri btcpayHost, string APIKey, HttpClient httpClient = null)
+        {
+            _apiKey = APIKey;
+            _btcpayHost = btcpayHost;
+            _httpClient = httpClient ?? new HttpClient();
+        }
+
+        public BTCPayServerClient(Uri btcpayHost, string username, string password, HttpClient httpClient = null)
+        {
+            _apiKey = APIKey;
+            _btcpayHost = btcpayHost;
+            _username = username;
+            _password = password;
+            _httpClient = httpClient ?? new HttpClient();
+        }
+
+        protected async Task HandleResponse(HttpResponseMessage message)
+        {
+            if (!message.IsSuccessStatusCode && message.Content?.Headers?.ContentType?.MediaType?.StartsWith("application/json", StringComparison.OrdinalIgnoreCase) is true)
             {
-                var aa = await message.Content.ReadAsStringAsync();
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(aa);
-                throw new GreenfieldValidationException(err);
+                if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
+                {
+                    var aa = await message.Content.ReadAsStringAsync();
+                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(aa);
+                    throw new GreenfieldValidationException(err);
+                }
+                if (message.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    var err = JsonConvert.DeserializeObject<Models.GreenfieldPermissionAPIError>(await message.Content.ReadAsStringAsync());
+                    throw new GreenfieldAPIException((int)message.StatusCode, err);
+                }
+                else
+                {
+                    var err = JsonConvert.DeserializeObject<Models.GreenfieldAPIError>(await message.Content.ReadAsStringAsync());
+                    if (err.Code != null)
+                        throw new GreenfieldAPIException((int)message.StatusCode, err);
+                }
             }
-            if (message.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            message.EnsureSuccessStatusCode();
+        }
+
+        protected async Task<T> HandleResponse<T>(HttpResponseMessage message)
+        {
+            await HandleResponse(message);
+            var str = await message.Content.ReadAsStringAsync();
+            return JsonConvert.DeserializeObject<T>(str);
+        }
+
+        public async Task<T> SendHttpRequest<T>(string path,
+            Dictionary<string, object> queryPayload = null,
+            HttpMethod method = null, CancellationToken cancellationToken = default)
+        {
+            using var resp = await _httpClient.SendAsync(CreateHttpRequest(path, queryPayload, method), cancellationToken);
+            return await HandleResponse<T>(resp);
+        }
+        public async Task<T> SendHttpRequest<T>(string path,
+        object bodyPayload = null,
+        HttpMethod method = null, CancellationToken cancellationToken = default)
+        {
+            using var resp = await _httpClient.SendAsync(CreateHttpRequest(path: path, bodyPayload: bodyPayload, method: method), cancellationToken);
+            return await HandleResponse<T>(resp);
+        }
+        protected virtual HttpRequestMessage CreateHttpRequest(string path,
+            Dictionary<string, object> queryPayload = null,
+            HttpMethod method = null)
+        {
+            UriBuilder uriBuilder = new UriBuilder(_btcpayHost) { Path = path };
+            if (queryPayload != null && queryPayload.Any())
             {
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldPermissionAPIError>(await message.Content.ReadAsStringAsync());
-                throw new GreenfieldAPIException((int)message.StatusCode, err);
+                AppendPayloadToQuery(uriBuilder, queryPayload);
+            }
+
+            var httpRequest = new HttpRequestMessage(method ?? HttpMethod.Get, uriBuilder.Uri);
+            if (_apiKey != null)
+                httpRequest.Headers.Authorization = new AuthenticationHeaderValue("token", _apiKey);
+            else if (!string.IsNullOrEmpty(_username))
+            {
+                httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", System.Convert.ToBase64String(Encoding.ASCII.GetBytes(_username + ":" + _password)));
+            }
+
+
+            return httpRequest;
+        }
+
+        protected virtual HttpRequestMessage CreateHttpRequest<T>(string path,
+            Dictionary<string, object> queryPayload = null,
+            T bodyPayload = default, HttpMethod method = null)
+        {
+            var request = CreateHttpRequest(path, queryPayload, method);
+            if (typeof(T).IsPrimitive || !EqualityComparer<T>.Default.Equals(bodyPayload, default(T)))
+            {
+                request.Content = new StringContent(JsonConvert.SerializeObject(bodyPayload), Encoding.UTF8, "application/json");
+            }
+
+            return request;
+        }
+
+        public static void AppendPayloadToQuery(UriBuilder uri, KeyValuePair<string, object> keyValuePair)
+        {
+            if (uri.Query.Length > 1)
+                uri.Query += "&";
+
+            UriBuilder uriBuilder = uri;
+            if (!(keyValuePair.Value is string) &&
+                keyValuePair.Value.GetType().GetInterfaces().Contains((typeof(IEnumerable))))
+            {
+                foreach (var item in (IEnumerable)keyValuePair.Value)
+                {
+                    uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
+                                       Uri.EscapeDataString(item.ToString()) + "&";
+                }
             }
             else
-            {
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldAPIError>(await message.Content.ReadAsStringAsync());
-                if (err.Code != null)
-                    throw new GreenfieldAPIException((int)message.StatusCode, err);
-            }
-        }
-        message.EnsureSuccessStatusCode();
-    }
-
-    protected virtual async Task<T> HandleResponse<T>(HttpResponseMessage message)
-    {
-        await HandleResponse(message);
-        var str = await message.Content.ReadAsStringAsync();
-        return JsonConvert.DeserializeObject<T>(str);
-    }
-
-    public virtual async Task SendHttpRequest(string path,
-        Dictionary<string, object> queryPayload = null,
-        HttpMethod method = null, CancellationToken cancellationToken = default)
-    {
-        using var resp = await _httpClient.SendAsync(CreateHttpRequest(path, queryPayload, method), cancellationToken);
-        await HandleResponse(resp);
-    }
-
-    public virtual async Task<T> SendHttpRequest<T>(string path,
-        Dictionary<string, object> queryPayload = null,
-        HttpMethod method = null, CancellationToken cancellationToken = default)
-    {
-        using var resp = await _httpClient.SendAsync(CreateHttpRequest(path, queryPayload, method), cancellationToken);
-        return await HandleResponse<T>(resp);
-    }
-
-    public virtual async Task SendHttpRequest(string path,
-        object bodyPayload = null,
-        HttpMethod method = null, CancellationToken cancellationToken = default)
-    {
-        using var resp = await _httpClient.SendAsync(CreateHttpRequest(path: path, bodyPayload: bodyPayload, method: method), cancellationToken);
-        await HandleResponse(resp);
-    }
-
-    protected virtual async Task<T> SendHttpRequest<T>(string path,
-        object bodyPayload = null,
-        HttpMethod method = null, CancellationToken cancellationToken = default)
-    {
-        using var resp = await _httpClient.SendAsync(CreateHttpRequest(path: path, bodyPayload: bodyPayload, method: method), cancellationToken);
-        return await HandleResponse<T>(resp);
-    }
-        
-    protected virtual async Task<TRes> SendHttpRequest<TReq, TRes>(string path,
-        Dictionary<string, object> queryPayload = null,
-        TReq bodyPayload = default, HttpMethod method = null, CancellationToken cancellationToken = default)
-    {
-        using var resp = await _httpClient.SendAsync(CreateHttpRequest(path: path, bodyPayload: bodyPayload, queryPayload: queryPayload, method: method), cancellationToken);
-        return await HandleResponse<TRes>(resp);
-    }
-
-    protected virtual HttpRequestMessage CreateHttpRequest(string path,
-        Dictionary<string, object> queryPayload = null,
-        HttpMethod method = null)
-    {
-        var uriBuilder = new UriBuilder(_btcpayHost);
-        uriBuilder.Path += (uriBuilder.Path.EndsWith("/") || path.StartsWith("/") ? "" : "/") + path;
-        if (queryPayload != null && queryPayload.Any())
-        {
-            AppendPayloadToQuery(uriBuilder, queryPayload);
-        }
-
-        var httpRequest = new HttpRequestMessage(method ?? HttpMethod.Get, uriBuilder.Uri);
-        if (_apiKey != null)
-            httpRequest.Headers.Authorization = new AuthenticationHeaderValue("token", _apiKey);
-        else if (!string.IsNullOrEmpty(_username))
-        {
-            httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes(_username + ":" + _password)));
-        }
-
-        return httpRequest;
-    }
-
-    protected virtual HttpRequestMessage CreateHttpRequest<T>(string path,
-        Dictionary<string, object> queryPayload = null,
-        T bodyPayload = default, HttpMethod method = null)
-    {
-        var request = CreateHttpRequest(path, queryPayload, method);
-        if (typeof(T).IsPrimitive || !EqualityComparer<T>.Default.Equals(bodyPayload, default(T)))
-        {
-            request.Content = new StringContent(JsonConvert.SerializeObject(bodyPayload), Encoding.UTF8, "application/json");
-        }
-
-        return request;
-    }
-
-    protected virtual async Task<T> UploadFileRequest<T>(string apiPath, string filePath, string mimeType, string formFieldName, HttpMethod method = null, CancellationToken token = default)
-    {
-        using MultipartFormDataContent multipartContent = new();
-        var fileContent = new StreamContent(File.OpenRead(filePath));
-        var fileName = Path.GetFileName(filePath);
-        fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse(mimeType);
-        multipartContent.Add(fileContent, formFieldName, fileName);
-        var req = CreateHttpRequest(apiPath, null, method ?? HttpMethod.Post);
-        req.Content = multipartContent;
-        using var resp = await _httpClient.SendAsync(req, token);
-        return await HandleResponse<T>(resp);
-    }
-
-    public static void AppendPayloadToQuery(UriBuilder uri, KeyValuePair<string, object> keyValuePair)
-    {
-        if (uri.Query.Length > 1)
-            uri.Query += "&";
-
-        UriBuilder uriBuilder = uri;
-        if (!(keyValuePair.Value is string) &&
-            keyValuePair.Value.GetType().GetInterfaces().Contains((typeof(IEnumerable))))
-        {
-            foreach (var item in (IEnumerable)keyValuePair.Value)
             {
                 uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
-                                   Uri.EscapeDataString(item.ToString()) + "&";
+                                   Uri.EscapeDataString(keyValuePair.Value.ToString()) + "&";
             }
+            uri.Query = uri.Query.Trim('&');
         }
-        else
-        {
-            uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
-                               Uri.EscapeDataString(keyValuePair.Value.ToString()) + "&";
-        }
-        uri.Query = uri.Query.Trim('&');
-    }
 
-    public static void AppendPayloadToQuery(UriBuilder uri, Dictionary<string, object> payload)
-    {
-        if (uri.Query.Length > 1)
-            uri.Query += "&";
-        foreach (KeyValuePair<string, object> keyValuePair in payload)
+        public static void AppendPayloadToQuery(UriBuilder uri, Dictionary<string, object> payload)
         {
-            AppendPayloadToQuery(uri, keyValuePair);
+            if (uri.Query.Length > 1)
+                uri.Query += "&";
+            foreach (KeyValuePair<string, object> keyValuePair in payload)
+            {
+                AppendPayloadToQuery(uri, keyValuePair);
+            }
         }
     }
 }

BTCPayServer.Client/GreenFieldAPIException.cs

@@ -1,15 +1,17 @@
 using System;
 
-namespace BTCPayServer.Client;
-
-public class GreenfieldAPIException : Exception
+namespace BTCPayServer.Client
 {
-    public GreenfieldAPIException(int httpCode, Models.GreenfieldAPIError error) : base(error.Message)
+    public class GreenfieldAPIException : Exception
     {
-        if (error == null) throw new ArgumentNullException(nameof(error));
-        HttpCode = httpCode;
-        APIError = error;
+        public GreenfieldAPIException(int httpCode, Models.GreenfieldAPIError error) : base(error.Message)
+        {
+            if (error == null)
+                throw new ArgumentNullException(nameof(error));
+            HttpCode = httpCode;
+            APIError = error;
+        }
+        public Models.GreenfieldAPIError APIError { get; }
+        public int HttpCode { get; set; }
     }
-    public Models.GreenfieldAPIError APIError { get; }
-    public int HttpCode { get; set; }
 }

BTCPayServer.Client/GreenFieldValidationException.cs

@@ -2,25 +2,27 @@ using System;
 using System.Text;
 using BTCPayServer.Client.Models;
 
-namespace BTCPayServer.Client;
-
-public class GreenfieldValidationException : Exception
+namespace BTCPayServer.Client
 {
-    public GreenfieldValidationException(GreenfieldValidationError[] errors) : base(BuildMessage(errors))
+    public class GreenfieldValidationException : Exception
     {
-        ValidationErrors = errors;
-    }
-
-    private static string BuildMessage(GreenfieldValidationError[] errors)
-    {
-        if (errors == null) throw new ArgumentNullException(nameof(errors));
-        var builder = new StringBuilder();
-        foreach (var error in errors)
+        public GreenfieldValidationException(Models.GreenfieldValidationError[] errors) : base(BuildMessage(errors))
         {
-            builder.AppendLine($"{error.Path}: {error.Message}");
+            ValidationErrors = errors;
         }
-        return builder.ToString();
-    }
 
-    public GreenfieldValidationError[] ValidationErrors { get; }
+        private static string BuildMessage(GreenfieldValidationError[] errors)
+        {
+            if (errors == null)
+                throw new ArgumentNullException(nameof(errors));
+            StringBuilder builder = new StringBuilder();
+            foreach (var error in errors)
+            {
+                builder.AppendLine($"{error.Path}: {error.Message}");
+            }
+            return builder.ToString();
+        }
+
+        public Models.GreenfieldValidationError[] ValidationErrors { get; }
+    }
 }

BTCPayServer.Client/JsonConverters/TimeSpanJsonConverter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Globalization;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
@@ -59,8 +58,6 @@ namespace BTCPayServer.Client.JsonConverters
                         return null;
                     return TimeSpan.Zero;
                 }
-                if (reader.TokenType == JsonToken.String && TimeSpan.TryParse(reader.Value?.ToString(), CultureInfo.InvariantCulture, out var res))
-                    return res;
                 if (reader.TokenType != JsonToken.Integer)
                     throw new JsonObjectException("Invalid timespan, expected integer", reader);
                 return ToTimespan((long)reader.Value);

BTCPayServer.Client/Models/AppBaseData.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Client.Models;
-
-public class AppBaseData
-{
-    public string Id { get; set; }
-    public string AppType { get; set; }
-    public string AppName { get; set; }
-    public string StoreId { get; set; }
-    [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-    public bool? Archived { get; set; }
-    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-    public DateTimeOffset Created { get; set; }
-    [JsonExtensionData]
-    public IDictionary<string, JToken> AdditionalData { get; set; } = new Dictionary<string, JToken>();
-}
-
-public interface IAppRequest
-{
-    public string AppName { get; set; }
-}

BTCPayServer.Client/Models/AppItemStats.cs

@@ -1,15 +0,0 @@
-using BTCPayServer.JsonConverters;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models;
-
-public class AppItemStats
-{
-    public string ItemCode { get; set; }
-    public string Title { get; set; }
-    public int SalesCount { get; set; }
-    
-    [JsonConverter(typeof(NumericStringJsonConverter))]
-    public decimal Total { get; set; }
-    public string TotalFormatted { get; set; }
-}

BTCPayServer.Client/Models/AppSalesStats.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models;
-
-public class AppSalesStats
-{
-    public int SalesCount { get; set; }
-    public IEnumerable<AppSalesStatsItem> Series { get; set; }
-}
-
-public class AppSalesStatsItem
-{
-    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-    public DateTime Date { get; set; }
-    public string Label { get; set; }
-    public int SalesCount { get; set; }
-}

BTCPayServer.Client/Models/ApplicationUserData.cs

@@ -14,16 +14,6 @@ namespace BTCPayServer.Client.Models
         /// the email AND username of the user
         /// </summary>
         public string Email { get; set; }
-        
-        /// <summary>
-        /// the name of the user
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// the image url of the user
-        /// </summary>
-        public string ImageUrl { get; set; }
 
         /// <summary>
         /// Whether the user has verified their email

BTCPayServer.Client/Models/CreateAppRequest.cs

@@ -0,0 +1,88 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public enum PosViewType
+    {
+        Static,
+        Cart,
+        Light,
+        Print
+    }
+
+    public class CreateAppRequest
+    {
+        public string AppName { get; set; }
+        public string AppType { get; set; }
+    }
+
+    public class CreatePointOfSaleAppRequest : CreateAppRequest
+    {
+        public string Currency { get; set; } = null;
+        public string Title { get; set; } = null;
+        public string Description { get; set; } = null;
+        public string Template { get; set; } = null;
+        [JsonConverter(typeof(StringEnumConverter))]
+        public PosViewType DefaultView { get; set; }
+        public bool ShowItems { get; set; } = false;
+        public bool ShowCustomAmount { get; set; } = false;
+        public bool ShowDiscount { get; set; } = false;
+        public bool ShowSearch { get; set; } = true;
+        public bool ShowCategories { get; set; } = true;
+        public bool EnableTips { get; set; } = false;
+        public string CustomAmountPayButtonText { get; set; } = null;
+        public string FixedAmountPayButtonText { get; set; } = null;
+        public string TipText { get; set; } = null;
+        public string CustomCSSLink { get; set; } = null;
+        public string NotificationUrl { get; set; } = null;
+        public string RedirectUrl { get; set; } = null;
+        public bool? RedirectAutomatically { get; set; } = null;
+        public bool? RequiresRefundEmail { get; set; } = null;
+        public bool? Archived { get; set; } = null;
+        public string FormId { get; set; } = null;
+        public string EmbeddedCSS { get; set; } = null;
+    }
+
+    public enum CrowdfundResetEvery
+    {
+        Never,
+        Hour,
+        Day,
+        Month,
+        Year
+    }
+
+    public class CreateCrowdfundAppRequest : CreateAppRequest
+    {
+        public string Title { get; set; } = null;
+        public bool? Enabled { get; set; } = null;
+        public bool? EnforceTargetAmount { get; set; } = null;
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? StartDate { get; set; } = null;
+        public string TargetCurrency { get; set; } = null;
+        public string Description { get; set; } = null;
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? EndDate { get; set; } = null;
+        public decimal? TargetAmount { get; set; } = null;
+        public string CustomCSSLink { get; set; } = null;
+        public string MainImageUrl { get; set; } = null;
+        public string EmbeddedCSS { get; set; } = null;
+        public string NotificationUrl { get; set; } = null;
+        public string Tagline { get; set; } = null;
+        public string PerksTemplate { get; set; } = null;
+        public bool? SoundsEnabled { get; set; } = null;
+        public string DisqusShortname { get; set; } = null;
+        public bool? AnimationsEnabled { get; set; } = null;
+        public int? ResetEveryAmount { get; set; } = null;
+        [JsonConverter(typeof(StringEnumConverter))]
+        public CrowdfundResetEvery ResetEvery { get; set; } = CrowdfundResetEvery.Never;
+        public bool? DisplayPerksValue { get; set; } = null;
+        public bool? DisplayPerksRanking { get; set; } = null;
+        public bool? SortPerksByPopularity { get; set; } = null;
+        public bool? Archived { get; set; } = null;
+        public string[] Sounds { get; set; } = null;
+        public string[] AnimationColors { get; set; } = null;
+    }
+}

BTCPayServer.Client/Models/CreateApplicationUserRequest.cs

@@ -2,16 +2,6 @@ namespace BTCPayServer.Client.Models
 {
     public class CreateApplicationUserRequest
     {
-        /// <summary>
-        /// the name of the new user
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// the image url of the new user
-        /// </summary>
-        public string ImageUrl { get; set; }
-
         /// <summary>
         /// the email AND username of the new user
         /// </summary>

BTCPayServer.Client/Models/CreatePayoutRequest.cs

@@ -8,6 +8,6 @@ namespace BTCPayServer.Client.Models
         public string Destination { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? Amount { get; set; }
-        public string PayoutMethodId { get; set; }
+        public string PaymentMethod { get; set; }
     }
 }

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -12,6 +12,8 @@ namespace BTCPayServer.Client.Models
         [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
         public string Currency { get; set; }
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
+        public TimeSpan? Period { get; set; }
         [JsonConverter(typeof(TimeSpanJsonConverter.Days))]
         [JsonProperty("BOLT11Expiration")]
         public TimeSpan? BOLT11Expiration { get; set; }
@@ -19,7 +21,7 @@ namespace BTCPayServer.Client.Models
         public DateTimeOffset? ExpiresAt { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? StartsAt { get; set; }
-        public string[] PayoutMethods { get; set; }
+        public string[] PaymentMethods { get; set; }
         public bool AutoApproveClaims { get; set; }
     }
 }

BTCPayServer.Client/Models/CrowdfundAppData.cs

@@ -1,55 +0,0 @@
-#nullable enable
-using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace BTCPayServer.Client.Models;
-
-public abstract class CrowdfundBaseData : AppBaseData
-{
-    public string? Title { get; set; }
-    public bool? Enabled { get; set; }
-    public bool? EnforceTargetAmount { get; set; }
-    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-    public DateTimeOffset? StartDate { get; set; }
-    public string? TargetCurrency { get; set; }
-    public string? Description { get; set; }
-    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-    public DateTimeOffset? EndDate { get; set; }
-    public decimal? TargetAmount { get; set; }
-    public string? MainImageUrl { get; set; }
-    public string? NotificationUrl { get; set; }
-    public string? Tagline { get; set; }
-    public bool? DisqusEnabled { get; set; }
-    public string? DisqusShortname { get; set; }
-    public bool? SoundsEnabled { get; set; }
-    public bool? AnimationsEnabled { get; set; }
-    public int? ResetEveryAmount { get; set; }
-    [JsonConverter(typeof(StringEnumConverter))]
-    public CrowdfundResetEvery? ResetEvery { get; set; }
-    public bool? DisplayPerksValue { get; set; }
-    public bool? DisplayPerksRanking { get; set; }
-    public bool? SortPerksByPopularity { get; set; }
-    public string[]? Sounds { get; set; }
-    public string[]? AnimationColors { get; set; }
-    public string? FormId { get; set; }
-}
-
-public class CrowdfundAppData : CrowdfundBaseData
-{
-    public object? Perks { get; set; }
-}
-
-public class CrowdfundAppRequest : CrowdfundBaseData, IAppRequest
-{
-    public string? PerksTemplate { get; set; }
-}
-
-public enum CrowdfundResetEvery
-{
-    Never,
-    Hour,
-    Day,
-    Month,
-    Year
-}

BTCPayServer.Client/Models/FileData.cs

@@ -1,16 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace BTCPayServer.Client.Models;
-
-public class FileData
-{
-    public string Id { get; set; }
-    public string UserId { get; set; }
-    public string Uri { get; set; }
-    public string Url { get; set; }
-    public string OriginalName { get; set; }
-    public string StorageName { get; set; }
-    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-    public DateTimeOffset? CreatedAt { get; set; }
-}

BTCPayServer.Client/Models/GenerateOnChainWalletRequest.cs

@@ -10,7 +10,6 @@ namespace BTCPayServer.Client
 {
     public class GenerateOnChainWalletRequest
     {
-        public string Label { get; set; }
         public int AccountNumber { get; set; } = 0;
         [JsonConverter(typeof(MnemonicJsonConverter))]
         public Mnemonic ExistingMnemonic { get; set; }
@@ -30,7 +29,6 @@ namespace BTCPayServer.Client
     {
         public class ConfigData
         {
-            public string Label { get; set; }
             public string AccountDerivation { get; set; }
             [JsonExtensionData]
             IDictionary<string, JToken> AdditionalData { get; set; }

BTCPayServer.Client/Models/GreenfieldAPIError.cs

@@ -11,7 +11,8 @@ namespace BTCPayServer.Client.Models
         public GreenfieldAPIError(string code, string message)
         {
             code = code ?? "generic-error";
-            if (message == null) throw new ArgumentNullException(nameof(message));
+            if (message == null)
+                throw new ArgumentNullException(nameof(message));
             Code = code;
             Message = message;
         }

BTCPayServer.Client/Models/GreenfieldValidationError.cs

@@ -6,12 +6,14 @@ namespace BTCPayServer.Client.Models
     {
         public GreenfieldValidationError()
         {
-        }
 
+        }
         public GreenfieldValidationError(string path, string message)
         {
-            if (path == null) throw new ArgumentNullException(nameof(path));
-            if (message == null) throw new ArgumentNullException(nameof(message));
+            if (path == null)
+                throw new ArgumentNullException(nameof(path));
+            if (message == null)
+                throw new ArgumentNullException(nameof(message));
             Path = path;
             Message = message;
         }

BTCPayServer.Client/Models/InvoiceData.cs

@@ -83,7 +83,9 @@ namespace BTCPayServer.Client.Models
             public string RedirectURL { get; set; }
 
             public bool? RedirectAutomatically { get; set; }
+            public bool? RequiresRefundEmail { get; set; } = null;
             public string DefaultLanguage { get; set; }
+            public CheckoutType? CheckoutType { get; set; }
             public bool? LazyPaymentMethods { get; set; }
         }
     }

BTCPayServer.Client/Models/InvoiceExceptionStatus.cs

@@ -5,6 +5,7 @@ public enum InvoiceExceptionStatus
     PaidLate,
     PaidPartial,
     Marked,
+    Invalid,
     PaidOver
 }
 

BTCPayServer.Client/Models/LightningAddressData.cs

@@ -1,5 +1,3 @@
-using Newtonsoft.Json.Linq;
-
 namespace BTCPayServer.Client.Models;
 
 public class LightningAddressData
@@ -8,5 +6,5 @@ public class LightningAddressData
     public string CurrencyCode { get; set; }
     public decimal? Min { get; set; }
     public decimal? Max { get; set; }
-    public JObject InvoiceMetadata { get; set; }
+
 }

BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs

@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class LightningAutomatedPayoutSettings
 {
-    public string PayoutMethodId { get; set; }
+    public string PaymentMethod { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

BTCPayServer.Client/Models/NotificationData.cs

@@ -9,7 +9,6 @@ namespace BTCPayServer.Client.Models
         public string Identifier { get; set; }
         public string Type { get; set; }
         public string Body { get; set; }
-        public string StoreId { get; set; }
         public bool Seen { get; set; }
         public Uri Link { get; set; }
 

BTCPayServer.Client/Models/NotificationSettingsData.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-
-namespace BTCPayServer.Client.Models;
-
-public class NotificationSettingsData
-{
-    public List<NotificationSettingsItemData> Notifications { get; set; }
-}
-
-public class NotificationSettingsItemData
-{
-    public string Identifier { get; set; }
-    public string Name { get; set; }
-    public bool Enabled { get; set; }
-}

BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs

@@ -6,7 +6,7 @@ namespace BTCPayServer.Client.Models;
 
 public class OnChainAutomatedPayoutSettings
 {
-    public string PayoutMethodId { get; set; }
+    public string PaymentMethod { get; set; }
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }

BTCPayServer.Client/Models/PaymentMethodCriteriaData.cs

@@ -5,7 +5,7 @@ namespace BTCPayServer.Client.Models;
 
 public class PaymentMethodCriteriaData
 {
-    public string PaymentMethodId { get; set; }
+    public string PaymentMethod { get; set; }
     public string CurrencyCode { get; set; }
     [JsonConverter(typeof(NumericStringJsonConverter))]
     public decimal Amount { get; set; }

BTCPayServer.Client/Models/PaymentRequestBaseData.cs

@@ -17,6 +17,9 @@ namespace BTCPayServer.Client.Models
         public string Title { get; set; }
         public string Description { get; set; }
         public string Email { get; set; }
+
+        public string EmbeddedCSS { get; set; }
+        public string CustomCSSLink { get; set; }
         public bool AllowCustomPaymentAmounts { get; set; }
 
         [JsonExtensionData]

BTCPayServer.Client/Models/PayoutData.cs

@@ -21,13 +21,12 @@ namespace BTCPayServer.Client.Models
         public string Id { get; set; }
         public string PullPaymentId { get; set; }
         public string Destination { get; set; }
-        public string PayoutMethodId { get; set; }
+        public string PaymentMethod { get; set; }
+        public string CryptoCode { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal OriginalAmount { get; set; }
-        public string OriginalCurrency { get; set; }
-        public string PayoutCurrency { get; set; }
+        public decimal Amount { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
-        public decimal? PayoutAmount { get; set; }
+        public decimal? PaymentMethodAmount { get; set; }
         [JsonConverter(typeof(StringEnumConverter))]
         public PayoutState State { get; set; }
         public int Revision { get; set; }

BTCPayServer.Client/Models/PayoutProcessorData.cs

@@ -4,6 +4,6 @@ namespace BTCPayServer.Client.Models
     {
         public string Name { get; set; }
         public string FriendlyName { get; set; }
-        public string[] PayoutMethods { get; set; }
+        public string[] PaymentMethods { get; set; }
     }
 }

BTCPayServer.Client/Models/PointOfSaleAppData.cs

@@ -1,48 +1,72 @@
-#nullable enable
-using System.Collections.Generic;
+using System;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
 
-namespace BTCPayServer.Client.Models;
-
-public abstract class PointOfSaleBaseData : AppBaseData
+namespace BTCPayServer.Client.Models
 {
-    public string? Title { get; set; }
-    [JsonConverter(typeof(StringEnumConverter))]
-    public PosViewType? DefaultView { get; set; }
-    public bool? ShowItems { get; set; }
-    public bool? ShowCustomAmount { get; set; }
-    public bool? ShowDiscount { get; set; }
-    public bool? ShowSearch { get; set; }
-    public bool? ShowCategories { get; set; }
-    public bool? EnableTips { get; set; }
-    public string? Currency { get; set; }
-    public string? FixedAmountPayButtonText { get; set; }
-    public string? CustomAmountPayButtonText { get; set; }
-    public string? TipText { get; set; }
-    public string? NotificationUrl { get; set; }
-    public string? RedirectUrl { get; set; }
-    public string? Description { get; set; }
-    public bool? RedirectAutomatically { get; set; }
-    public int[]? CustomTipPercentages { get; set; }
-    public string? FormId { get; set; }
-}
+    public class AppDataBase
+    {
+        public string Id { get; set; }
+        public string AppType { get; set; }
+        public string Name { get; set; }
+        public string StoreId { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? Archived { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset Created { get; set; }
+    }
 
-public class PointOfSaleAppData : PointOfSaleBaseData
-{
-    public object? Items { get; set; }
-}
+    public class PointOfSaleAppData : AppDataBase
+    {
+        public string Title { get; set; }
+        public string DefaultView { get; set; }
+        public bool ShowItems { get; set; }
+        public bool ShowCustomAmount { get; set; }
+        public bool ShowDiscount { get; set; }
+        public bool ShowSearch { get; set; }
+        public bool ShowCategories { get; set; }
+        public bool EnableTips { get; set; }
+        public string Currency { get; set; }
+        public object Items { get; set; }
+        public string FixedAmountPayButtonText { get; set; }
+        public string CustomAmountPayButtonText { get; set; }
+        public string TipText { get; set; }
+        public string CustomCSSLink { get; set; }
+        public string NotificationUrl { get; set; }
+        public string RedirectUrl { get; set; }
+        public string Description { get; set; }
+        public string EmbeddedCSS { get; set; }
+        public bool? RedirectAutomatically { get; set; }
+        public bool? RequiresRefundEmail { get; set; }
+    }
 
-public class PointOfSaleAppRequest : PointOfSaleBaseData, IAppRequest
-{
-    public string? Template { get; set; }
-}
-
-public enum PosViewType
-{
-    Static,
-    Cart,
-    Light,
-    Print
+    public class CrowdfundAppData : AppDataBase
+    {
+        public string Title { get; set; }
+        public bool Enabled { get; set; }
+        public bool EnforceTargetAmount { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? StartDate { get; set; }
+        public string TargetCurrency { get; set; }
+        public string Description { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? EndDate { get; set; }
+        public decimal? TargetAmount { get; set; }
+        public string CustomCSSLink { get; set; }
+        public string MainImageUrl { get; set; }
+        public string EmbeddedCSS { get; set; }
+        public string NotificationUrl { get; set; }
+        public string Tagline { get; set; }
+        public object Perks { get; set; }
+        public bool DisqusEnabled { get; set; }
+        public string DisqusShortname { get; set; }
+        public bool SoundsEnabled { get; set; }
+        public bool AnimationsEnabled { get; set; }
+        public int ResetEveryAmount { get; set; }
+        public string ResetEvery { get; set; }
+        public bool DisplayPerksValue { get; set; }
+        public bool DisplayPerksRanking { get; set; }
+        public bool SortPerksByPopularity { get; set; }
+        public string[] Sounds { get; set; }
+        public string[] AnimationColors { get; set; }
+    }
 }

BTCPayServer.Client/Models/PullPaymentBaseData.cs

@@ -24,6 +24,8 @@ namespace BTCPayServer.Client.Models
         public string Currency { get; set; }
         [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
+        public TimeSpan? Period { get; set; }
         [JsonConverter(typeof(TimeSpanJsonConverter.Days))]
         [JsonProperty("BOLT11Expiration")]
         public TimeSpan BOLT11Expiration { get; set; }

BTCPayServer.Client/Models/RefundInvoiceRequest.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Client.Models
     public class RefundInvoiceRequest
     {
         public string? Name { get; set; } = null;
-        public string? PayoutMethodId { get; set; }
+        public string? PaymentMethod { get; set; }
         public string? Description { get; set; } = null;
         
         [JsonConverter(typeof(StringEnumConverter))]

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -16,12 +16,6 @@ namespace BTCPayServer.Client.Models
 
         public string Website { get; set; }
 
-        public string BrandColor { get; set; }
-        public bool ApplyBrandColorToBackend { get; set; }
-        public string LogoUrl { get; set; }
-        public string CssUrl { get; set; }
-        public string PaymentSoundUrl { get; set; }
-
         public string SupportUrl { get; set; }
 
         [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
@@ -42,6 +36,11 @@ namespace BTCPayServer.Client.Models
         public double PaymentTolerance { get; set; } = 0;
         public bool AnyoneCanCreateInvoice { get; set; }
         public string DefaultCurrency { get; set; }
+        public bool RequiresRefundEmail { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public CheckoutType? CheckoutType { get; set; }
 
         public bool LightningAmountInSatoshi { get; set; }
         public bool LightningPrivateRouteHints { get; set; }
@@ -62,6 +61,10 @@ namespace BTCPayServer.Client.Models
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string DefaultLang { get; set; } = "en";
 
+        public string CustomLogo { get; set; }
+
+        public string CustomCSS { get; set; }
+
         public string HtmlTitle { get; set; }
 
         [JsonConverter(typeof(StringEnumConverter))]
@@ -91,6 +94,12 @@ namespace BTCPayServer.Client.Models
         public IDictionary<string, JToken> AdditionalData { get; set; }
     }
 
+    public enum CheckoutType
+    {
+        V1,
+        V2
+    }
+
     public enum NetworkFeeMode
     {
         MultiplePaymentsOnly,

BTCPayServer.Client/Models/UpdateApplicationUserRequest.cs

@@ -1,29 +0,0 @@
-namespace BTCPayServer.Client.Models;
-
-public class UpdateApplicationUserRequest
-{
-    /// <summary>
-    /// the name of the user
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// the image url of the user
-    /// </summary>
-    public string ImageUrl { get; set; }
-
-    /// <summary>
-    /// the email AND username of the user
-    /// </summary>
-    public string Email { get; set; }
-
-    /// <summary>
-    /// current password of the user
-    /// </summary>
-    public string CurrentPassword { get; set; }
-
-    /// <summary>
-    /// new password of the user
-    /// </summary>
-    public string NewPassword { get; set; }
-}

BTCPayServer.Client/Models/UpdateNotificationSettingsRequest.cs

@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace BTCPayServer.Client.Models;
-
-public class UpdateNotificationSettingsRequest
-{
-    public List<string> Disabled { get; set; }
-}

BTCPayServer.Client/Permissions.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text.RegularExpressions;
 
 namespace BTCPayServer.Client
 {
@@ -18,7 +16,7 @@ namespace BTCPayServer.Client
         public const string CanUseLightningNodeInStore = "btcpay.store.canuselightningnode";
         public const string CanModifyServerSettings = "btcpay.server.canmodifyserversettings";
         public const string CanModifyStoreSettings = "btcpay.store.canmodifystoresettings";
-        public const string CanModifyWebhooks = "btcpay.store.webhooks.canmodifywebhooks";
+        public const string CanModifyStoreWebhooks = "btcpay.store.webhooks.canmodifywebhooks";
         public const string CanModifyStoreSettingsUnscoped = "btcpay.store.canmodifystoresettings:";
         public const string CanViewStoreSettings = "btcpay.store.canviewstoresettings";
         public const string CanViewReports = "btcpay.store.canviewreports";
@@ -50,7 +48,7 @@ namespace BTCPayServer.Client
                 yield return CanViewInvoices;
                 yield return CanCreateInvoice;
                 yield return CanModifyInvoices;
-                yield return CanModifyWebhooks;
+                yield return CanModifyStoreWebhooks;
                 yield return CanModifyServerSettings;
                 yield return CanModifyStoreSettings;
                 yield return CanViewStoreSettings;
@@ -106,16 +104,6 @@ namespace BTCPayServer.Client
         {
             return policy.StartsWith("btcpay.user", StringComparison.OrdinalIgnoreCase);
         }
-
-        private static readonly CultureInfo _culture = new (CultureInfo.InvariantCulture.Name);
-        public static string DisplayName(string policy)
-        {
-            var p = policy.Split(".");
-            if (p.Length < 3 || p[0] != "btcpay") return policy;
-            var constName = typeof(Policies).GetFields().Select(f => f.Name).FirstOrDefault(f => f.Equals(p[^1], StringComparison.OrdinalIgnoreCase));
-            var perm = string.IsNullOrEmpty(constName) ? string.Join(' ', p[2..]) : Regex.Replace(constName, "([A-Z])", " $1", RegexOptions.Compiled).Trim();
-            return $"{_culture.TextInfo.ToTitleCase(p[1])}: {_culture.TextInfo.ToTitleCase(perm)}";
-        }
     }
 
     public class PermissionSet
@@ -259,7 +247,7 @@ namespace BTCPayServer.Client
                 Policies.CanManagePullPayments,
                 Policies.CanModifyInvoices,
                 Policies.CanViewStoreSettings,
-                Policies.CanModifyWebhooks,
+                Policies.CanModifyStoreWebhooks,
                 Policies.CanModifyPaymentRequests,
                 Policies.CanManagePayouts,
                 Policies.CanUseLightningNodeInStore);

BTCPayServer.Common/BTCPayNetwork.cs

@@ -133,7 +133,7 @@ namespace BTCPayServer
 
         public string GetTrackedDestination(Script scriptPubKey)
         {
-            return scriptPubKey.Hash.ToString();
+            return scriptPubKey.Hash.ToString() + "#" + CryptoCode.ToUpperInvariant();
         }
     }
 

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -34,6 +34,11 @@ namespace BTCPayServer
             Logs logs)
         {
             var networksList = networks.ToList();
+#if !ALTCOINS
+            var onlyBTC = networksList.Count == 1 && networksList.First().IsBTC;
+            if (!onlyBTC)
+                throw new ConfigException($"This build of BTCPay Server does not support altcoins. Configured networks: {string.Join(',', networksList.Select(n => n.CryptoCode).ToArray())}");
+#endif
             _NBXplorerNetworkProvider = nbxplorerNetworkProvider;
             NetworkType = nbxplorerNetworkProvider.NetworkType;
             foreach (var network in networksList)

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -4,9 +4,12 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="4.3.1" />
+    <PackageReference Include="NBXplorer.Client" Version="4.3.0" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
+  <ItemGroup Condition="'$(Altcoins)' != 'true'">
+    <Compile Remove="Altcoins\**\*.cs"></Compile>
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Altcoins\" />
   </ItemGroup>

BTCPayServer.Common/SelectedChains.cs

@@ -12,12 +12,17 @@ namespace BTCPayServer
     {
         HashSet<string> chains = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         bool all = false;
-        public SelectedChains(IConfiguration configuration)
+        public SelectedChains(IConfiguration configuration, Logs logs)
         {
             foreach (var chain in (configuration["chains"] ?? "btc")
                 .Split(',', StringSplitOptions.RemoveEmptyEntries)
                     .Select(t => t.ToUpperInvariant()))
             {
+                if (new[] { "ETH", "USDT20", "FAU" }.Contains(chain, StringComparer.OrdinalIgnoreCase))
+                {
+                    logs.Configuration.LogWarning($"'{chain}' is not anymore supported, please remove it from 'chains'");
+                    continue;
+                }
                 if (chain == "*")
                 {
                     all = true;

BTCPayServer.Data/ApplicationDbContext.cs

@@ -12,22 +12,35 @@ namespace BTCPayServer.Data
     {
         public ApplicationDbContext CreateDbContext(string[] args)
         {
+
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
-			// Same as launchsettings.json, it's connecting to the docker's postgres.
-            builder.UseNpgsql("User ID=postgres;Include Error Detail=true;Host=127.0.0.1;Port=39372;Database=btcpayserver");
-            return new ApplicationDbContext(builder.Options);
+
+            builder.UseSqlite("Data Source=temp.db");
+
+            return new ApplicationDbContext(builder.Options, true);
         }
     }
+
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
+        private readonly bool _designTime;
+
+        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options, bool designTime = false)
             : base(options)
         {
+            _designTime = designTime;
         }
+#nullable enable
+        public async Task<string?> GetMigrationState()
+        {
+            return (await Settings.FromSqlRaw("SELECT \"Id\", \"Value\" FROM \"Settings\" WHERE \"Id\"='MigrationData'").AsNoTracking().FirstOrDefaultAsync())?.Value;
+        }
+#nullable restore
         public DbSet<AddressInvoiceData> AddressInvoices { get; set; }
         public DbSet<APIKeyData> ApiKeys { get; set; }
         public DbSet<AppData> Apps { get; set; }
         public DbSet<StoredFile> Files { get; set; }
+        public DbSet<InvoiceEventData> InvoiceEvents { get; set; }
         public DbSet<InvoiceSearchData> InvoiceSearches { get; set; }
         public DbSet<InvoiceWebhookDeliveryData> InvoiceWebhookDeliveries { get; set; }
         public DbSet<InvoiceData> Invoices { get; set; }
@@ -39,6 +52,7 @@ namespace BTCPayServer.Data
         public DbSet<PaymentRequestData> PaymentRequests { get; set; }
         public DbSet<PaymentData> Payments { get; set; }
         public DbSet<PayoutData> Payouts { get; set; }
+        public DbSet<PendingInvoiceData> PendingInvoices { get; set; }
         public DbSet<PlannedTransaction> PlannedTransactions { get; set; }
         public DbSet<PullPaymentData> PullPayments { get; set; }
         public DbSet<RefundData> Refunds { get; set; }
@@ -62,6 +76,13 @@ namespace BTCPayServer.Data
         public DbSet<PayoutProcessorData> PayoutProcessors { get; set; }
         public DbSet<FormData> Forms { get; set; }
 
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            var isConfigured = optionsBuilder.Options.Extensions.OfType<RelationalOptionsExtension>().Any();
+            if (!isConfigured)
+                optionsBuilder.UseSqlite("Data Source=temp.db");
+        }
+
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
@@ -73,6 +94,7 @@ namespace BTCPayServer.Data
             APIKeyData.OnModelCreating(builder, Database);
             AppData.OnModelCreating(builder, Database);
             //StoredFile.OnModelCreating(builder);
+            InvoiceEventData.OnModelCreating(builder);
             InvoiceSearchData.OnModelCreating(builder);
             InvoiceWebhookDeliveryData.OnModelCreating(builder);
             InvoiceData.OnModelCreating(builder, Database);
@@ -82,8 +104,9 @@ namespace BTCPayServer.Data
             PairingCodeData.OnModelCreating(builder);
             //PayjoinLock.OnModelCreating(builder);
             PaymentRequestData.OnModelCreating(builder, Database);
-            PaymentData.OnModelCreating(builder);
+            PaymentData.OnModelCreating(builder, Database);
             PayoutData.OnModelCreating(builder, Database);
+            PendingInvoiceData.OnModelCreating(builder);
             //PlannedTransaction.OnModelCreating(builder);
             PullPaymentData.OnModelCreating(builder, Database);
             RefundData.OnModelCreating(builder);
@@ -106,6 +129,28 @@ namespace BTCPayServer.Data
             WebhookData.OnModelCreating(builder, Database);
             FormData.OnModelCreating(builder, Database);
             StoreRole.OnModelCreating(builder, Database);
+
+
+            if (Database.IsSqlite() && !_designTime)
+            {
+                // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations
+                // here: https://docs.microsoft.com/en-us/ef/core/providers/sqlite/limitations#query-limitations
+                // To work around this, when the Sqlite database provider is used, all model properties of type DateTimeOffset
+                // use the DateTimeOffsetToBinaryConverter
+                // Based on: https://github.com/aspnet/EntityFrameworkCore/issues/10784#issuecomment-415769754
+                // This only supports millisecond precision, but should be sufficient for most use cases.
+                foreach (var entityType in builder.Model.GetEntityTypes())
+                {
+                    var properties = entityType.ClrType.GetProperties().Where(p => p.PropertyType == typeof(DateTimeOffset));
+                    foreach (var property in properties)
+                    {
+                        builder
+                            .Entity(entityType.Name)
+                            .Property(property.Name)
+                            .HasConversion(new Microsoft.EntityFrameworkCore.Storage.ValueConversion.DateTimeOffsetToBinaryConverter());
+                    }
+                }
+            }
         }
     }
 

BTCPayServer.Data/ApplicationDbContextFactory.cs

@@ -1,28 +1,24 @@
 using System;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
 
 namespace BTCPayServer.Data
 {
     public class ApplicationDbContextFactory : BaseDbContextFactory<ApplicationDbContext>
     {
-        public ApplicationDbContextFactory(IOptions<DatabaseOptions> options, ILoggerFactory loggerFactory) : base(options, "")
+        public ApplicationDbContextFactory(IOptions<DatabaseOptions> options) : base(options, "")
         {
-            LoggerFactory = loggerFactory;
         }
 
-        public ILoggerFactory LoggerFactory { get; }
-
-        public override ApplicationDbContext CreateContext(Action<NpgsqlDbContextOptionsBuilder> npgsqlOptionsAction = null)
+        public override ApplicationDbContext CreateContext()
         {
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
-            builder.UseLoggerFactory(LoggerFactory);
-            builder.AddInterceptors(MigrationInterceptor.Instance);
-            ConfigureBuilder(builder, npgsqlOptionsAction);
+            builder.AddInterceptors(Data.InvoiceData.MigrationInterceptor.Instance);
+            ConfigureBuilder(builder);
             return new ApplicationDbContext(builder.Options);
         }
     }

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -3,24 +3,15 @@
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.7" />
-    <PackageReference Include="NBitcoin.Altcoins" Version="3.0.24" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="NBitcoin.Altcoins" Version="3.0.23" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="DBScripts\*.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="DBScripts\001.InvoiceFunctions.sql" />
-    <None Remove="DBScripts\002.RefactorPayouts.sql" />
-    <None Remove="DBScripts\003.RefactorPendingInvoicesPayments.sql" />
-    <None Remove="DBScripts\004.MonitoredInvoices.sql" />
-  </ItemGroup>
 </Project>

BTCPayServer.Data/DBScripts/000.Init.sql

@@ -1,301 +0,0 @@
-CREATE TABLE "AddressInvoices" (
-    "Address" text NOT NULL,
-    "InvoiceDataId" text,
-    "CreatedTime" timestamp with time zone
-);
-CREATE TABLE "ApiKeys" (
-    "Id" character varying(50) NOT NULL,
-    "StoreId" character varying(50),
-    "Permissions" text,
-    "Type" integer DEFAULT 0 NOT NULL,
-    "UserId" character varying(50),
-    "Label" text
-);
-CREATE TABLE "Apps" (
-    "Id" text NOT NULL,
-    "AppType" text,
-    "Created" timestamp with time zone NOT NULL,
-    "Name" text,
-    "Settings" text,
-    "StoreDataId" text,
-    "TagAllInvoices" boolean DEFAULT false NOT NULL
-);
-CREATE TABLE "AspNetRoleClaims" (
-    "Id" integer NOT NULL,
-    "ClaimType" text,
-    "ClaimValue" text,
-    "RoleId" text NOT NULL
-);
-CREATE TABLE "AspNetRoles" (
-    "Id" text NOT NULL,
-    "ConcurrencyStamp" text,
-    "Name" character varying(256),
-    "NormalizedName" character varying(256)
-);
-CREATE TABLE "AspNetUserClaims" (
-    "Id" integer NOT NULL,
-    "ClaimType" text,
-    "ClaimValue" text,
-    "UserId" text NOT NULL
-);
-CREATE TABLE "AspNetUserLogins" (
-    "LoginProvider" character varying(255) NOT NULL,
-    "ProviderKey" character varying(255) NOT NULL,
-    "ProviderDisplayName" text,
-    "UserId" text NOT NULL
-);
-CREATE TABLE "AspNetUserRoles" (
-    "UserId" text NOT NULL,
-    "RoleId" text NOT NULL
-);
-CREATE TABLE "AspNetUserTokens" (
-    "UserId" text NOT NULL,
-    "LoginProvider" character varying(64) NOT NULL,
-    "Name" character varying(64) NOT NULL,
-    "Value" text
-);
-CREATE TABLE "AspNetUsers" (
-    "Id" text NOT NULL,
-    "AccessFailedCount" integer NOT NULL,
-    "ConcurrencyStamp" text,
-    "Email" character varying(256),
-    "EmailConfirmed" boolean NOT NULL,
-    "LockoutEnabled" boolean NOT NULL,
-    "LockoutEnd" timestamp with time zone,
-    "NormalizedEmail" character varying(256),
-    "NormalizedUserName" character varying(256),
-    "PasswordHash" text,
-    "PhoneNumber" text,
-    "PhoneNumberConfirmed" boolean NOT NULL,
-    "SecurityStamp" text,
-    "TwoFactorEnabled" boolean NOT NULL,
-    "UserName" character varying(256),
-    "RequiresEmailConfirmation" boolean DEFAULT false NOT NULL
-);
-CREATE TABLE "Files" (
-    "Id" text NOT NULL,
-    "FileName" text,
-    "StorageFileName" text,
-    "Timestamp" timestamp with time zone NOT NULL,
-    "ApplicationUserId" text
-);
-CREATE TABLE "HistoricalAddressInvoices" (
-    "InvoiceDataId" text NOT NULL,
-    "Address" text NOT NULL,
-    "Assigned" timestamp with time zone NOT NULL,
-    "UnAssigned" timestamp with time zone,
-    "CryptoCode" text
-);
-CREATE TABLE "InvoiceEvents" (
-    "InvoiceDataId" text NOT NULL,
-    "UniqueId" text NOT NULL,
-    "Message" text,
-    "Timestamp" timestamp with time zone NOT NULL
-);
-CREATE TABLE "Invoices" (
-    "Id" text NOT NULL,
-    "Blob" bytea,
-    "Created" timestamp with time zone NOT NULL,
-    "CustomerEmail" text,
-    "ExceptionStatus" text,
-    "ItemCode" text,
-    "OrderId" text,
-    "Status" text,
-    "StoreDataId" text
-);
-CREATE TABLE "PairedSINData" (
-    "Id" text NOT NULL,
-    "Label" text,
-    "PairingTime" timestamp with time zone NOT NULL,
-    "SIN" text,
-    "StoreDataId" text
-);
-CREATE TABLE "PairingCodes" (
-    "Id" text NOT NULL,
-    "DateCreated" timestamp with time zone NOT NULL,
-    "Expiration" timestamp with time zone NOT NULL,
-    "Facade" text,
-    "Label" text,
-    "SIN" text,
-    "StoreDataId" text,
-    "TokenValue" text
-);
-CREATE TABLE "PaymentRequests" (
-    "Id" text NOT NULL,
-    "StoreDataId" text,
-    "Status" integer NOT NULL,
-    "Blob" bytea,
-    "Created" timestamp with time zone DEFAULT '1970-01-01 00:00:00+00'::timestamp with time zone NOT NULL
-);
-CREATE TABLE "Payments" (
-    "Id" text NOT NULL,
-    "Blob" bytea,
-    "InvoiceDataId" text,
-    "Accounted" boolean DEFAULT false NOT NULL
-);
-CREATE TABLE "PendingInvoices" (
-    "Id" text NOT NULL
-);
-CREATE TABLE "RefundAddresses" (
-    "Id" text NOT NULL,
-    "Blob" bytea,
-    "InvoiceDataId" text
-);
-CREATE TABLE "Settings" (
-    "Id" text NOT NULL,
-    "Value" text
-);
-CREATE TABLE "Stores" (
-    "Id" text NOT NULL,
-    "DerivationStrategy" text,
-    "SpeedPolicy" integer NOT NULL,
-    "StoreCertificate" bytea,
-    "StoreName" text,
-    "StoreWebsite" text,
-    "StoreBlob" bytea,
-    "DerivationStrategies" text,
-    "DefaultCrypto" text
-);
-CREATE TABLE "U2FDevices" (
-    "Id" text NOT NULL,
-    "Name" text,
-    "KeyHandle" bytea NOT NULL,
-    "PublicKey" bytea NOT NULL,
-    "AttestationCert" bytea NOT NULL,
-    "Counter" integer NOT NULL,
-    "ApplicationUserId" text
-);
-CREATE TABLE "UserStore" (
-    "ApplicationUserId" text NOT NULL,
-    "StoreDataId" text NOT NULL,
-    "Role" text
-);
-CREATE TABLE "WalletTransactions" (
-    "WalletDataId" text NOT NULL,
-    "TransactionId" text NOT NULL,
-    "Labels" text,
-    "Blob" bytea
-);
-CREATE TABLE "Wallets" (
-    "Id" text NOT NULL,
-    "Blob" bytea
-);
-ALTER TABLE ONLY "AddressInvoices"
-    ADD CONSTRAINT "PK_AddressInvoices" PRIMARY KEY ("Address");
-ALTER TABLE ONLY "ApiKeys"
-    ADD CONSTRAINT "PK_ApiKeys" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "Apps"
-    ADD CONSTRAINT "PK_Apps" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "AspNetRoleClaims"
-    ADD CONSTRAINT "PK_AspNetRoleClaims" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "AspNetRoles"
-    ADD CONSTRAINT "PK_AspNetRoles" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "AspNetUserClaims"
-    ADD CONSTRAINT "PK_AspNetUserClaims" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "AspNetUserLogins"
-    ADD CONSTRAINT "PK_AspNetUserLogins" PRIMARY KEY ("LoginProvider", "ProviderKey");
-ALTER TABLE ONLY "AspNetUserRoles"
-    ADD CONSTRAINT "PK_AspNetUserRoles" PRIMARY KEY ("UserId", "RoleId");
-ALTER TABLE ONLY "AspNetUserTokens"
-    ADD CONSTRAINT "PK_AspNetUserTokens" PRIMARY KEY ("UserId", "LoginProvider", "Name");
-ALTER TABLE ONLY "AspNetUsers"
-    ADD CONSTRAINT "PK_AspNetUsers" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "Files"
-    ADD CONSTRAINT "PK_Files" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "HistoricalAddressInvoices"
-    ADD CONSTRAINT "PK_HistoricalAddressInvoices" PRIMARY KEY ("InvoiceDataId", "Address");
-ALTER TABLE ONLY "InvoiceEvents"
-    ADD CONSTRAINT "PK_InvoiceEvents" PRIMARY KEY ("InvoiceDataId", "UniqueId");
-ALTER TABLE ONLY "Invoices"
-    ADD CONSTRAINT "PK_Invoices" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "PairedSINData"
-    ADD CONSTRAINT "PK_PairedSINData" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "PairingCodes"
-    ADD CONSTRAINT "PK_PairingCodes" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "PaymentRequests"
-    ADD CONSTRAINT "PK_PaymentRequests" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "Payments"
-    ADD CONSTRAINT "PK_Payments" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "PendingInvoices"
-    ADD CONSTRAINT "PK_PendingInvoices" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "RefundAddresses"
-    ADD CONSTRAINT "PK_RefundAddresses" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "Settings"
-    ADD CONSTRAINT "PK_Settings" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "Stores"
-    ADD CONSTRAINT "PK_Stores" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "U2FDevices"
-    ADD CONSTRAINT "PK_U2FDevices" PRIMARY KEY ("Id");
-ALTER TABLE ONLY "UserStore"
-    ADD CONSTRAINT "PK_UserStore" PRIMARY KEY ("ApplicationUserId", "StoreDataId");
-ALTER TABLE ONLY "WalletTransactions"
-    ADD CONSTRAINT "PK_WalletTransactions" PRIMARY KEY ("WalletDataId", "TransactionId");
-ALTER TABLE ONLY "Wallets"
-    ADD CONSTRAINT "PK_Wallets" PRIMARY KEY ("Id");
-CREATE INDEX "EmailIndex" ON "AspNetUsers" USING btree ("NormalizedEmail");
-CREATE INDEX "IX_AddressInvoices_InvoiceDataId" ON "AddressInvoices" USING btree ("InvoiceDataId");
-CREATE INDEX "IX_ApiKeys_StoreId" ON "ApiKeys" USING btree ("StoreId");
-CREATE INDEX "IX_ApiKeys_UserId" ON "ApiKeys" USING btree ("UserId");
-CREATE INDEX "IX_Apps_StoreDataId" ON "Apps" USING btree ("StoreDataId");
-CREATE INDEX "IX_AspNetRoleClaims_RoleId" ON "AspNetRoleClaims" USING btree ("RoleId");
-CREATE INDEX "IX_AspNetUserClaims_UserId" ON "AspNetUserClaims" USING btree ("UserId");
-CREATE INDEX "IX_AspNetUserLogins_UserId" ON "AspNetUserLogins" USING btree ("UserId");
-CREATE INDEX "IX_AspNetUserRoles_RoleId" ON "AspNetUserRoles" USING btree ("RoleId");
-CREATE INDEX "IX_Files_ApplicationUserId" ON "Files" USING btree ("ApplicationUserId");
-CREATE INDEX "IX_Invoices_StoreDataId" ON "Invoices" USING btree ("StoreDataId");
-CREATE INDEX "IX_PairedSINData_SIN" ON "PairedSINData" USING btree ("SIN");
-CREATE INDEX "IX_PairedSINData_StoreDataId" ON "PairedSINData" USING btree ("StoreDataId");
-CREATE INDEX "IX_PaymentRequests_Status" ON "PaymentRequests" USING btree ("Status");
-CREATE INDEX "IX_PaymentRequests_StoreDataId" ON "PaymentRequests" USING btree ("StoreDataId");
-CREATE INDEX "IX_Payments_InvoiceDataId" ON "Payments" USING btree ("InvoiceDataId");
-CREATE INDEX "IX_RefundAddresses_InvoiceDataId" ON "RefundAddresses" USING btree ("InvoiceDataId");
-CREATE INDEX "IX_U2FDevices_ApplicationUserId" ON "U2FDevices" USING btree ("ApplicationUserId");
-CREATE INDEX "IX_UserStore_StoreDataId" ON "UserStore" USING btree ("StoreDataId");
-CREATE UNIQUE INDEX "RoleNameIndex" ON "AspNetRoles" USING btree ("NormalizedName");
-CREATE UNIQUE INDEX "UserNameIndex" ON "AspNetUsers" USING btree ("NormalizedUserName");
-ALTER TABLE ONLY "AddressInvoices"
-    ADD CONSTRAINT "FK_AddressInvoices_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "ApiKeys"
-    ADD CONSTRAINT "FK_ApiKeys_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "ApiKeys"
-    ADD CONSTRAINT "FK_ApiKeys_Stores_StoreId" FOREIGN KEY ("StoreId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "Apps"
-    ADD CONSTRAINT "FK_Apps_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetRoleClaims"
-    ADD CONSTRAINT "FK_AspNetRoleClaims_AspNetRoles_RoleId" FOREIGN KEY ("RoleId") REFERENCES "AspNetRoles"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetUserClaims"
-    ADD CONSTRAINT "FK_AspNetUserClaims_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetUserLogins"
-    ADD CONSTRAINT "FK_AspNetUserLogins_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetUserRoles"
-    ADD CONSTRAINT "FK_AspNetUserRoles_AspNetRoles_RoleId" FOREIGN KEY ("RoleId") REFERENCES "AspNetRoles"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetUserRoles"
-    ADD CONSTRAINT "FK_AspNetUserRoles_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "AspNetUserTokens"
-    ADD CONSTRAINT "FK_AspNetUserTokens_AspNetUsers_UserId" FOREIGN KEY ("UserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "Files"
-    ADD CONSTRAINT "FK_Files_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE RESTRICT;
-ALTER TABLE ONLY "HistoricalAddressInvoices"
-    ADD CONSTRAINT "FK_HistoricalAddressInvoices_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "InvoiceEvents"
-    ADD CONSTRAINT "FK_InvoiceEvents_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "Invoices"
-    ADD CONSTRAINT "FK_Invoices_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "PairedSINData"
-    ADD CONSTRAINT "FK_PairedSINData_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "PaymentRequests"
-    ADD CONSTRAINT "FK_PaymentRequests_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "Payments"
-    ADD CONSTRAINT "FK_Payments_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "PendingInvoices"
-    ADD CONSTRAINT "FK_PendingInvoices_Invoices_Id" FOREIGN KEY ("Id") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "RefundAddresses"
-    ADD CONSTRAINT "FK_RefundAddresses_Invoices_InvoiceDataId" FOREIGN KEY ("InvoiceDataId") REFERENCES "Invoices"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "U2FDevices"
-    ADD CONSTRAINT "FK_U2FDevices_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE RESTRICT;
-ALTER TABLE ONLY "UserStore"
-    ADD CONSTRAINT "FK_UserStore_AspNetUsers_ApplicationUserId" FOREIGN KEY ("ApplicationUserId") REFERENCES "AspNetUsers"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "UserStore"
-    ADD CONSTRAINT "FK_UserStore_Stores_StoreDataId" FOREIGN KEY ("StoreDataId") REFERENCES "Stores"("Id") ON DELETE CASCADE;
-ALTER TABLE ONLY "WalletTransactions"
-    ADD CONSTRAINT "FK_WalletTransactions_Wallets_WalletDataId" FOREIGN KEY ("WalletDataId") REFERENCES "Wallets"("Id") ON DELETE CASCADE;

BTCPayServer.Data/DBScripts/001.InvoiceFunctions.sql

@@ -1,12 +0,0 @@
-CREATE OR REPLACE FUNCTION get_orderid(invoice_blob jsonb)
-RETURNS text AS $$
-    SELECT invoice_blob->'metadata'->>'orderId';
-$$ LANGUAGE sql IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION get_itemcode(invoice_blob jsonb)
-RETURNS text AS $$
-    SELECT invoice_blob->'metadata'->>'itemCode';
-$$ LANGUAGE sql IMMUTABLE;
-
-CREATE INDEX IF NOT EXISTS "IX_Invoices_Metadata_OrderId" ON "Invoices" (get_orderid("Blob2")) WHERE get_orderid("Blob2") IS NOT NULL;
-CREATE INDEX IF NOT EXISTS "IX_Invoices_Metadata_ItemCode" ON "Invoices" (get_itemcode("Blob2")) WHERE get_itemcode("Blob2") IS NOT NULL;

BTCPayServer.Data/DBScripts/002.RefactorPayouts.sql

@@ -1,62 +0,0 @@
--- Rename column
-ALTER TABLE "Payouts" RENAME COLUMN "PaymentMethodId" TO "PayoutMethodId";
-
--- Add Currency column, guessed from the PaymentMethodId
-ALTER TABLE "Payouts" ADD COLUMN "Currency" TEXT;
-UPDATE "Payouts" SET
-    "Currency" = split_part("PayoutMethodId", '_', 1),
-    "PayoutMethodId"=
-        CASE
-            WHEN ("Blob"->>'Amount')::NUMERIC < 0 THEN 'TOPUP'
-            WHEN split_part("PayoutMethodId", '_', 2) = 'LightningLike' THEN split_part("PayoutMethodId", '_', 1) || '-LN'
-            ELSE split_part("PayoutMethodId", '_', 1) || '-CHAIN'
-        END;
-ALTER TABLE "Payouts" ALTER COLUMN "Currency" SET NOT NULL;
-
--- Remove Currency and Limit from PullPayment Blob, and put it into the columns in the table
-ALTER TABLE "PullPayments" ADD COLUMN "Currency" TEXT;
-UPDATE "PullPayments" SET "Currency" = "Blob"->>'Currency';
-ALTER TABLE "PullPayments" ALTER COLUMN "Currency" SET NOT NULL;
-ALTER TABLE "PullPayments" ADD COLUMN "Limit" NUMERIC;
-UPDATE "PullPayments" SET "Limit" = ("Blob"->>'Limit')::NUMERIC;
-ALTER TABLE "PullPayments" ALTER COLUMN "Limit" SET NOT NULL;
-
--- Remove unused properties, rename SupportedPaymentMethods, and fix legacy payment methods IDs
-UPDATE "PullPayments" SET 
-    "Blob" = jsonb_set(
-	    "Blob" - 'SupportedPaymentMethods' - 'Limit' - 'Currency' - 'Period',
-	    '{SupportedPayoutMethods}',
-	    (SELECT jsonb_agg(to_jsonb(
-		    CASE
-	                WHEN split_part(value::TEXT, '_', 2) = 'LightningLike' THEN split_part(value::TEXT, '_', 1) || '-LN'
-        	        ELSE split_part(value::TEXT, '_', 1) || '-CHAIN'
-	            END))
-	    FROM jsonb_array_elements_text("Blob"->'SupportedPaymentMethods') AS value
-	));
-
---Remove "Amount" and "CryptoAmount" from Payout Blob, and put it into the columns in the table
--- Respectively "OriginalAmount" and "Amount"
-
-ALTER TABLE "Payouts" ADD COLUMN "Amount" NUMERIC;
-UPDATE "Payouts" SET "Amount" = ("Blob"->>'CryptoAmount')::NUMERIC;
-
-ALTER TABLE "Payouts" ADD COLUMN "OriginalAmount" NUMERIC;
-UPDATE "Payouts" SET "OriginalAmount" = ("Blob"->>'Amount')::NUMERIC;
-ALTER TABLE "Payouts" ALTER COLUMN "OriginalAmount" SET NOT NULL;
-
-ALTER TABLE "Payouts" ADD COLUMN "OriginalCurrency" TEXT;
-
-
-UPDATE "Payouts" p
-SET
-    "OriginalCurrency" = "Currency",
-    "Blob" = "Blob" - 'Amount' - 'CryptoAmount'
-WHERE "PullPaymentDataId" IS NULL AND "OriginalCurrency" IS NULL;
-
-UPDATE "Payouts" p
-SET 
-    "OriginalCurrency" = pp."Currency"
-FROM "PullPayments" pp
-WHERE "OriginalCurrency" IS NULL AND pp."Id"=p."PullPaymentDataId";
-
-ALTER TABLE "Payouts" ALTER COLUMN "OriginalCurrency" SET NOT NULL;

BTCPayServer.Data/DBScripts/003.RefactorPendingInvoicesPayments.sql

@@ -1,9 +0,0 @@
-CREATE OR REPLACE FUNCTION is_pending(status TEXT)
-RETURNS BOOLEAN AS $$
-    SELECT status = 'Processing' OR status = 'New';
-$$ LANGUAGE sql IMMUTABLE;
-
-CREATE INDEX "IX_Invoices_Pending" ON "Invoices"((1)) WHERE is_pending("Status");
-CREATE INDEX "IX_Payments_Pending" ON "Payments"((1)) WHERE is_pending("Status");
-DROP TABLE "PendingInvoices";
-ANALYZE "Invoices";

BTCPayServer.Data/DBScripts/004.MonitoredInvoices.sql

@@ -1,23 +0,0 @@
-CREATE OR REPLACE FUNCTION get_prompt(invoice_blob JSONB, payment_method_id TEXT)
-RETURNS JSONB AS $$
-    SELECT invoice_blob->'prompts'->payment_method_id
-$$ LANGUAGE sql IMMUTABLE;
-
-
-CREATE OR REPLACE FUNCTION get_monitored_invoices(arg_payment_method_id TEXT, include_non_activated BOOLEAN)
-RETURNS TABLE (invoice_id TEXT, payment_id TEXT, payment_method_id TEXT) AS $$
-WITH cte AS (
--- Get all the invoices which are pending. Even if no payments.
-SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i LEFT JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
-        WHERE is_pending(i."Status")
-UNION ALL
--- For invoices not pending, take all of those which have pending payments
-SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i INNER JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
-        WHERE is_pending(p."Status") AND NOT is_pending(i."Status"))
-SELECT cte.* FROM cte
-JOIN "Invoices" i ON cte.invoice_id=i."Id"
-LEFT JOIN "Payments" p ON cte.payment_id=p."Id" AND cte.payment_method_id=p."PaymentMethodId"
-WHERE (p."PaymentMethodId" IS NOT NULL AND p."PaymentMethodId" = arg_payment_method_id) OR
-      (p."PaymentMethodId" IS NULL AND get_prompt(i."Blob2", arg_payment_method_id) IS NOT NULL AND
-        (include_non_activated IS TRUE OR (get_prompt(i."Blob2", arg_payment_method_id)->'inactive')::BOOLEAN IS NOT TRUE));
-$$ LANGUAGE SQL STABLE;

BTCPayServer.Data/DBScriptsMigration.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace BTCPayServer.Data
-{
-    public abstract class DBScriptsMigration : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            foreach (var script in GetType().GetCustomAttributes<DBScriptAttribute>().OrderBy(n => n.ScriptName))
-            {
-                var name = Assembly.GetExecutingAssembly().GetManifestResourceNames()
-                    .First(s => s.EndsWith("." + script.ScriptName, StringComparison.Ordinal));
-                var stream = Assembly.GetExecutingAssembly()
-                            .GetManifestResourceStream(name);
-                using var reader = new StreamReader(stream, Encoding.UTF8);
-                migrationBuilder.Sql(reader.ReadToEnd());
-            }
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    public class DBScriptAttribute : Attribute
-    {
-        public DBScriptAttribute(string scriptName)
-        {
-            ScriptName = scriptName;
-        }
-        public string ScriptName { get; set; }
-    }
-}

BTCPayServer.Data/Data/APIKeyData.cs

@@ -41,9 +41,12 @@ namespace BTCPayServer.Data
             builder.Entity<APIKeyData>()
                 .HasIndex(o => o.StoreId);
 
-            builder.Entity<APIKeyData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<APIKeyData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -9,7 +9,7 @@ namespace BTCPayServer.Data
         public string Address { get; set; }
         public InvoiceData InvoiceData { get; set; }
         public string InvoiceDataId { get; set; }
-        public string PaymentMethodId { get; set; }
+        public DateTimeOffset? CreatedTime { get; set; }
 
 
         internal static void OnModelCreating(ModelBuilder builder)
@@ -19,7 +19,7 @@ namespace BTCPayServer.Data
                    .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AddressInvoiceData>()
 #pragma warning disable CS0618
-                .HasKey(o => new { o.Address, o.PaymentMethodId });
+                .HasKey(o => o.Address);
 #pragma warning restore CS0618
         }
     }

BTCPayServer.Data/Data/AppData.cs

@@ -25,9 +25,12 @@ namespace BTCPayServer.Data
             builder.Entity<AppData>()
                     .HasOne(a => a.StoreData);
 
-            builder.Entity<AppData>()
-                .Property(o => o.Settings)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<AppData>()
+                    .Property(o => o.Settings)
+                    .HasColumnType("JSONB");
+            }
         }
 
         // utility methods

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
@@ -18,7 +19,7 @@ namespace BTCPayServer.Data
         public List<APIKeyData> APIKeys { get; set; }
         public DateTimeOffset? Created { get; set; }
         public string DisabledNotifications { get; set; }
-        
+
         public List<NotificationData> Notifications { get; set; }
         public List<UserStore> UserStores { get; set; }
         public List<Fido2Credential> Fido2Credentials { get; set; }
@@ -34,18 +35,17 @@ namespace BTCPayServer.Data
             builder.Entity<ApplicationUser>()
                 .HasMany<IdentityUserRole<string>>(user => user.UserRoles)
                 .WithOne().HasForeignKey(role => role.UserId);
-
-            builder.Entity<ApplicationUser>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<ApplicationUser>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 
     public class UserBlob
     {
         public bool ShowInvoiceStatusChangeHint { get; set; }
-        public string ImageUrl { get; set; }
-        public string Name { get; set; }
-        public string InvitationToken { get; set; }
     }
 }

BTCPayServer.Data/Data/Fido2Credential.cs

@@ -30,10 +30,12 @@ namespace BTCPayServer.Data
                 .HasOne(o => o.ApplicationUser)
                 .WithMany(i => i.Fido2Credentials)
                 .HasForeignKey(i => i.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<Fido2Credential>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<Fido2Credential>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
 
         public ApplicationUser ApplicationUser { get; set; }

BTCPayServer.Data/Data/FormData.cs

@@ -21,8 +21,11 @@ public class FormData
             .WithMany(o => o.Forms).OnDelete(DeleteBehavior.Cascade);
         builder.Entity<FormData>().HasIndex(o => o.StoreId);
 
-        builder.Entity<FormData>()
-            .Property(o => o.Config)
-            .HasColumnType("JSONB");
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<FormData>()
+                .Property(o => o.Config)
+                .HasColumnType("JSONB");
+        }
     }
 }

BTCPayServer.Data/Data/InvoiceData.Migration.cs

@@ -15,13 +15,32 @@ using Microsoft.EntityFrameworkCore.Diagnostics;
 using BTCPayServer.Migrations;
 using Newtonsoft.Json.Serialization;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace BTCPayServer.Data
 {
-    public partial class InvoiceData : MigrationInterceptor.IHasMigration
+    public partial class InvoiceData
     {
+        /// <summary>
+        /// We have a migration running in the background that will migrate the data from the old blob to the new blob
+        /// Meanwhile, we need to make sure that invoices which haven't been migrated yet are migrated on the fly.
+        /// </summary>
+        public class MigrationInterceptor : IMaterializationInterceptor
+        {
+            public static readonly MigrationInterceptor Instance = new MigrationInterceptor();
+            public object InitializedInstance(MaterializationInterceptionData materializationData, object entity)
+            {
+                if (entity is InvoiceData invoiceData && invoiceData.Currency is null)
+                {
+                    invoiceData.Migrate();
+                }
+                else if (entity is PaymentData paymentData && paymentData.Currency is null)
+                {
+                    paymentData.Migrate();
+                }
+                return entity;
+            }
+        }
+
         static HashSet<string> superflousProperties = new HashSet<string>()
         {
             "availableAddressHashes",
@@ -48,21 +67,17 @@ namespace BTCPayServer.Data
             "archived",
             "isUnderPaid",
             "requiresRefundEmail",
-            "invoiceTime",
-            "checkoutType",
-            "customLogo",
-            "customCSS"
+            "invoiceTime"
         };
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        public bool TryMigrate()
+        public void Migrate()
         {
             if (Currency is not null)
-                return false;
+                return;
             if (Blob is not (null or { Length: 0 }))
             {
                 Blob2 = MigrationExtensions.Unzip(Blob);
-                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
                 Blob = null;
             }
             var blob = JObject.Parse(Blob2);
@@ -119,7 +134,7 @@ namespace BTCPayServer.Data
                     blob.Move(["productInformation", prop.Name], ["metadata", prop.Name]);
             }
             blob.Move(["orderId"], ["metadata", "orderId"]);
-            foreach (string prop in new string[] { "posData", "defaultLanguage", "notificationEmail", "notificationURL", "storeSupportUrl", "redirectURL" })
+            foreach (string prop in new string[] { "posData", "checkoutType", "defaultLanguage", "notificationEmail", "notificationURL", "storeSupportUrl", "redirectURL" })
             {
                 blob.RemoveIfNull(prop);
             }
@@ -210,10 +225,11 @@ namespace BTCPayServer.Data
             }
 
             blob.ConvertNumberToString("price");
-            Currency = blob["currency"].Value<string>().ToUpperInvariant();
+            Currency = blob["currency"].Value<string>();
             var isTopup = blob["type"]?.Value<string>() is "TopUp";
             var amount = decimal.Parse(blob["price"].Value<string>(), CultureInfo.InvariantCulture);
             Amount = isTopup && amount == 0 ? null : decimal.Parse(blob["price"].Value<string>(), CultureInfo.InvariantCulture);
+            CustomerEmail = null;
             foreach (var prop in superflousProperties)
                 blob.Property(prop)?.Remove();
             if (blob["speedPolicy"] is JValue { Type: JTokenType.Integer, Value: 0 or 0L })
@@ -330,31 +346,10 @@ namespace BTCPayServer.Data
             if (blob["defaultPaymentMethod"] is not (null or { Type : JTokenType.Null }))
                 blob["defaultPaymentMethod"] = MigrationExtensions.MigratePaymentMethodId(blob["defaultPaymentMethod"].Value<string>());
             blob.Remove("derivationStrategies");
-            Status = Status switch
-            {
-                "new" => "New",
-                "paid" => "Processing",
-                "complete" or "confirmed" => "Settled",
-                "expired" => "Expired",
-                null or "invalid" => "Invalid",
-                _ => throw new NotSupportedException($"Unknown Status for invoice ({Status})")
-            };
-            ExceptionStatus = ExceptionStatus switch
-            {
-                "marked" => "Marked",
-                "paidLate" => "PaidLate",
-                "paidPartial" => "PaidPartial",
-                "paidOver" => "PaidOver",
-                null or "" => "",
-                _ => throw new NotSupportedException($"Unknown ExceptionStatus for invoice ({ExceptionStatus})")
-            };
+
             blob["version"] = 3;
             Blob2 = blob.ToString(Formatting.None);
-            return true;
         }
-
-        [NotMapped]
-        public bool Migrated { get; set; }
         static string[] detailsRemoveDefault =
             [
                 "paymentMethodFeeRate",

BTCPayServer.Data/Data/InvoiceData.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Newtonsoft.Json.Linq;
-
 
 namespace BTCPayServer.Data
 {
@@ -18,21 +16,23 @@ namespace BTCPayServer.Data
 
         public DateTimeOffset Created { get; set; }
         public List<PaymentData> Payments { get; set; }
+        public List<InvoiceEventData> Events { get; set; }
 
         [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
         public string Blob2 { get; set; }
+        public string ItemCode { get; set; }
+        public string OrderId { get; set; }
         public string Status { get; set; }
         public string ExceptionStatus { get; set; }
+		[Obsolete("Unused")]
+        public string CustomerEmail { get; set; }
         public List<AddressInvoiceData> AddressInvoices { get; set; }
         public bool Archived { get; set; }
+        public List<PendingInvoiceData> PendingInvoices { get; set; }
         public List<InvoiceSearchData> InvoiceSearchData { get; set; }
         public List<RefundData> Refunds { get; set; }
 
-		public static string GetOrderId(string blob) => throw new NotSupportedException();
-		public static string GetItemCode(string blob) => throw new NotSupportedException();
-        public static bool IsPending(string status) => throw new NotSupportedException();
-
         [Timestamp]
         // With this, update of InvoiceData will fail if the row was modified by another process
         public uint XMin { get; set; }
@@ -42,16 +42,17 @@ namespace BTCPayServer.Data
                 .HasOne(o => o.StoreData)
                 .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
+            builder.Entity<InvoiceData>().HasIndex(o => o.OrderId);
             builder.Entity<InvoiceData>().HasIndex(o => o.Created);
-            builder.Entity<InvoiceData>()
-                    .Property(o => o.Blob2)
-                    .HasColumnType("JSONB");
-            builder.Entity<InvoiceData>()
-                    .Property(o => o.Amount)
-                    .HasColumnType("NUMERIC");
-			builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(GetOrderId), new[] { typeof(string) }), b => b.HasName("get_orderid"));
-			builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(GetItemCode), new[] { typeof(string) }), b => b.HasName("get_itemcode"));
-            builder.HasDbFunction(typeof(InvoiceData).GetMethod(nameof(IsPending), new[] { typeof(string) }), b => b.HasName("is_pending"));
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<InvoiceData>()
+                        .Property(o => o.Blob2)
+                        .HasColumnType("JSONB");
+                builder.Entity<InvoiceData>()
+                        .Property(o => o.Amount)
+                        .HasColumnType("NUMERIC");
+            }
         }
     }
 }

BTCPayServer.Data/Data/InvoiceEventData.cs

@@ -6,10 +6,28 @@ namespace BTCPayServer.Data
     public class InvoiceEventData
     {
         public string InvoiceDataId { get; set; }
+        public InvoiceData InvoiceData { get; set; }
+        public string UniqueId { get; set; }
         public DateTimeOffset Timestamp { get; set; }
         public string Message { get; set; }
         public EventSeverity Severity { get; set; } = EventSeverity.Info;
 
+
+        internal static void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<InvoiceEventData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<InvoiceEventData>()
+                .HasKey(o => new
+                {
+                    o.InvoiceDataId,
+#pragma warning disable CS0618
+                    o.UniqueId
+#pragma warning restore CS0618
+                });
+        }
+
         public enum EventSeverity
         {
             Info,

BTCPayServer.Data/Data/LightingAddressData.cs

@@ -27,9 +27,12 @@ public class LightningAddressData : IHasBlob<LightningAddressDataBlob>
             .IsRequired()
             .OnDelete(DeleteBehavior.Cascade);
         builder.Entity<LightningAddressData>().HasKey(o => o.Username);
-        builder.Entity<LightningAddressData>()
-            .Property(o => o.Blob2)
-            .HasColumnType("JSONB");
+        if (databaseFacade.IsNpgsql())
+        {
+            builder.Entity<LightningAddressData>()
+                .Property(o => o.Blob2)
+                .HasColumnType("JSONB");
+        }
     }
 }
 

BTCPayServer.Data/Data/MigrationExtensions.cs

@@ -147,8 +147,5 @@ namespace BTCPayServer.Data
                 return $"{splitted[0]}-CHAIN";
             throw new NotSupportedException("Unknown payment id " + paymentMethodId);
         }
-
-        // Make postgres happy
-        public static string SanitizeJSON(string json) => json.Replace("\\u0000", string.Empty, StringComparison.OrdinalIgnoreCase);
     }
 }

BTCPayServer.Data/Data/MigrationInterceptor.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore;
-
-namespace BTCPayServer.Data
-{
-    /// <summary>
-    /// We have a migration running in the background that will migrate the data from the old blob to the new blob
-    /// Meanwhile, we need to make sure that invoices which haven't been migrated yet are migrated on the fly.
-    /// </summary>
-    public class MigrationInterceptor : IMaterializationInterceptor, ISaveChangesInterceptor
-    {
-        public interface IHasMigration
-        {
-            bool TryMigrate();
-            bool Migrated { get; set; }
-        }
-        public static readonly MigrationInterceptor Instance = new MigrationInterceptor();
-        public object InitializedInstance(MaterializationInterceptionData materializationData, object entity)
-        {
-            if (entity is IHasMigration hasMigration && hasMigration.TryMigrate())
-            {
-                hasMigration.Migrated = true;
-            }
-            return entity;
-        }
-
-        public ValueTask<InterceptionResult<int>> SavingChangesAsync(DbContextEventData eventData, InterceptionResult<int> result, CancellationToken cancellationToken = default(CancellationToken))
-        {
-
-            foreach (var entry in eventData.Context.ChangeTracker.Entries())
-            {
-                if (entry is { Entity: IHasMigration { Migrated: true }, State: EntityState.Modified })
-                    // It seems doing nothing, but this actually set all properties as modified
-                    entry.State = EntityState.Modified;
-            }
-            return new ValueTask<InterceptionResult<int>>(result);
-        }
-    }
-}

BTCPayServer.Data/Data/NotificationData.cs

@@ -2,6 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
 
 namespace BTCPayServer.Data
 {
@@ -22,15 +23,19 @@ namespace BTCPayServer.Data
         public byte[] Blob { get; set; }
         public string Blob2 { get; set; }
 
+
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<NotificationData>()
                 .HasOne(o => o.ApplicationUser)
                 .WithMany(n => n.Notifications)
                 .HasForeignKey(k => k.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<NotificationData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<NotificationData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 }

BTCPayServer.Data/Data/PaymentData.Migration.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
 using BTCPayServer.Migrations;
-using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using NBitcoin;
 using NBitcoin.Altcoins;
 using NBitcoin.DataEncoders;
@@ -16,17 +13,16 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
-    public partial class PaymentData : MigrationInterceptor.IHasMigration
+    public partial class PaymentData
     {
-        public bool TryMigrate()
+        public void Migrate()
         {
 #pragma warning disable CS0618 // Type or member is obsolete
             if (Currency is not null)
-                return false;
+                return;
             if (Blob is not (null or { Length: 0 }))
             {
                 Blob2 = MigrationExtensions.Unzip(Blob);
-                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
                 Blob = null;
             }
             var blob = JObject.Parse(Blob2);
@@ -46,10 +42,9 @@ namespace BTCPayServer.Data
             }
 
             var cryptoCode = blob["cryptoCode"].Value<string>();
-            MigratedPaymentMethodId = PaymentMethodId;
-            PaymentMethodId = cryptoCode + "_" + blob["cryptoPaymentDataType"].Value<string>();
-            PaymentMethodId = MigrationExtensions.MigratePaymentMethodId(PaymentMethodId);
-            var divisibility = MigrationExtensions.GetDivisibility(PaymentMethodId);
+            Type = cryptoCode + "_" + blob["cryptoPaymentDataType"].Value<string>();
+            Type = MigrationExtensions.MigratePaymentMethodId(Type);
+            var divisibility = MigrationExtensions.GetDivisibility(Type);
             Currency = blob["cryptoCode"].Value<string>();
             blob.Remove("cryptoCode");
             blob.Remove("cryptoPaymentDataType");
@@ -162,13 +157,7 @@ namespace BTCPayServer.Data
 			Blob2 = blob.ToString(Formatting.None);
             Accounted = null;
 #pragma warning restore CS0618 // Type or member is obsolete
-            return true;
         }
-        [NotMapped]
-        public bool Migrated { get; set; }
-        [NotMapped]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public string MigratedPaymentMethodId { get; set; }
 
         static readonly DateTimeOffset unixRef = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
         public static long DateTimeToMilliUnixTime(in DateTime time)

BTCPayServer.Data/Data/PaymentData.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
@@ -27,15 +26,13 @@ namespace BTCPayServer.Data
         [Obsolete("Use Blob2 instead")]
         public byte[] Blob { get; set; }
         public string Blob2 { get; set; }
-        public string PaymentMethodId { get; set; }
+        public string Type { get; set; }
         [Obsolete("Use Status instead")]
         public bool? Accounted { get; set; }
         public PaymentStatus? Status { get; set; }
-        public static bool IsPending(PaymentStatus? status) => throw new NotSupportedException();
-        internal static void OnModelCreating(ModelBuilder builder)
+
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
-            builder.Entity<PaymentData>()
-                .HasKey(o => new { o.Id, o.PaymentMethodId });
             builder.Entity<PaymentData>()
                    .HasOne(o => o.InvoiceData)
                    .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
@@ -44,13 +41,15 @@ namespace BTCPayServer.Data
             builder.Entity<PaymentData>()
                    .Property(o => o.Status)
                    .HasConversion<string>();
-            builder.Entity<PaymentData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
-            builder.Entity<PaymentData>()
-                    .Property(o => o.Amount)
-                    .HasColumnType("NUMERIC");
-            builder.HasDbFunction(typeof(PaymentData).GetMethod(nameof(IsPending), new[] { typeof(PaymentStatus?) }), b => b.HasName("is_pending"));
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<PaymentData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+                builder.Entity<PaymentData>()
+                        .Property(o => o.Amount)
+                        .HasColumnType("NUMERIC");
+            }
         }
     }
 }

BTCPayServer.Data/Data/PaymentRequestData.Migration.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Data
-{
-    public partial class PaymentRequestData : MigrationInterceptor.IHasMigration
-    {
-        [NotMapped]
-        public bool Migrated { get; set; }
-
-        public bool TryMigrate()
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            if (Blob is null && Blob2 is not null)
-                return false;
-            if (Blob2 is null)
-            {
-                Blob2 = Blob is not (null or { Length: 0 }) ? MigrationExtensions.Unzip(Blob) : "{}";
-                Blob2 = MigrationExtensions.SanitizeJSON(Blob2);
-            }
-            Blob = null;
-#pragma warning restore CS0618 // Type or member is obsolete
-            var jobj = JObject.Parse(Blob2);
-            // Fixup some legacy payment requests
-            if (jobj["expiryDate"].Type == JTokenType.Date)
-            {
-                jobj["expiryDate"] = new JValue(NBitcoin.Utils.DateTimeToUnixTime(jobj["expiryDate"].Value<DateTime>()));
-                Blob2 = jobj.ToString(Newtonsoft.Json.Formatting.None);
-            }
-            return true;
-        }
-    }
-}

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public partial class PaymentRequestData : IHasBlobUntyped
+    public class PaymentRequestData : IHasBlobUntyped
     {
         public string Id { get; set; }
         public DateTimeOffset Created { get; set; }
@@ -32,9 +32,12 @@ namespace BTCPayServer.Data
             builder.Entity<PaymentRequestData>()
                 .HasIndex(o => o.Status);
 
-            builder.Entity<PaymentRequestData>()
-                .Property(o => o.Blob2)
-                .HasColumnType("JSONB");
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<PaymentRequestData>()
+                    .Property(o => o.Blob2)
+                    .HasColumnType("JSONB");
+            }
         }
     }
 }