Bump NBitcoin (Fix perf problem on signing of big transaction)

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
       - checkout
       - run:
           command: |
-            cd .circleci && ./run-tests.sh "Fast=Fast|ThirdParty=ThirdParty" && ./can-build.sh
+            cd .circleci && ./run-tests.sh "Fast=Fast" && ./can-build.sh
   selenium_tests:
     machine:
         enabled: true
@@ -24,14 +24,19 @@ jobs:
       - run:
           command: |
             cd .circleci && ./run-tests.sh "Integration=Integration"
-  trigger_docs_build:
+  external_tests:
     machine:
         enabled: true
-        image: circleci/classic:201808-01
     steps:
+      - checkout
       - run:
           command: |
-            curl -X POST -H "Authorization: token $GH_PAT"  -H "Accept: application/vnd.github.everest-preview+json"  -H "Content-Type: application/json" https://api.github.com/repos/btcpayserver/btcpayserver-doc/dispatches --data '{"event_type": "build_docs"}'
+            if [ "$CIRCLE_PROJECT_USERNAME" == "btcpayserver" ] && [ "$CIRCLE_PROJECT_REPONAME" == "btcpayserver" ]; then
+                cd .circleci && ./run-tests.sh "ExternalIntegration=ExternalIntegration"
+            else
+              echo "Skipping running ExternalIntegration tests outside of context of main user and repository that have access to secrets"
+            fi
+
 
   # publish jobs require $DOCKERHUB_REPO, $DOCKERHUB_USER, $DOCKERHUB_PASS defined
   amd64:
@@ -115,15 +120,12 @@ workflows:
       - fast_tests
       - selenium_tests
       - integration_tests
-  publish:
-    jobs:
-      - trigger_docs_build:
+      - external_tests:
           filters:
             branches:
-              ignore: /.*/
-            # only act on version tags
-            tags:
-              only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
+                only: master
+  publish:
+    jobs:
       - amd64:
           filters:
             # ignore any commit on any branch by default
@@ -133,6 +135,7 @@ workflows:
             # OR feature tags like vlndseedbackup
             # OR features on specific versions like v1.0.0.88-lndseedbackup-1
             tags:
+
               only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
       - arm32v7:
           filters:

.editorconfig

@@ -121,11 +121,8 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
-csharp_style_prefer_null_check_over_type_check = true:warning
-csharp_prefer_simple_using_statement = true:warning
 
 # C++ Files
-
 [*.{cpp,h,in}]
 curly_bracket_next_line = true
 indent_brace_style = Allman

.vscode/launch.json

@@ -10,14 +10,14 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/BTCPayServer/bin/Debug/net6.0/BTCPayServer.dll",
+            "program": "${workspaceFolder}/BTCPayServer/bin/Debug/netcoreapp3.1/BTCPayServer.dll",
             "args": [],
             "cwd": "${workspaceFolder}/BTCPayServer",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {
                 "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+                "pattern": "\\bListening on\\s+(https?://\\S+)"
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -31,10 +31,10 @@
     <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.1" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.19" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.19" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.18" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />

BTCPayServer.Abstractions/Configuration/DataDirectories.cs

@@ -2,11 +2,11 @@ namespace BTCPayServer.Configuration
 {
     public class DataDirectories
     {
-        public string DataDir { get; set; }
-        public string PluginDir { get; set; }
+        public string DataDir  { get; set; }
+        public string PluginDir  { get; set; }
         public string TempStorageDir { get; set; }
         public string StorageDir { get; set; }
     }
-
-
+    
+    
 }

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -9,7 +9,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations;
 
 namespace BTCPayServer.Abstractions.Contracts
 {
-    public abstract class BaseDbContextFactory<T> where T : DbContext
+    public abstract class BaseDbContextFactory<T> where T: DbContext
     {
         private readonly IOptions<DatabaseOptions> _options;
         private readonly string _schemaPrefix;
@@ -24,9 +24,7 @@ namespace BTCPayServer.Abstractions.Contracts
 
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
-#pragma warning disable EF1001 // Internal EF Core API usage.
-            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, opts)
-#pragma warning restore EF1001 // Internal EF Core API usage.
+            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies, IMigrationsAnnotationProvider annotations, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, annotations, opts)
             {
             }
 
@@ -92,10 +90,10 @@ namespace BTCPayServer.Abstractions.Contracts
                         .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
                     break;
                 case DatabaseType.MySQL:
-                    builder.UseMySql(_options.Value.ConnectionString, ServerVersion.AutoDetect(_options.Value.ConnectionString), o =>
+                    builder.UseMySql(_options.Value.ConnectionString, o =>
                     {
                         o.EnableRetryOnFailure(10);
-
+                            
                         if (!string.IsNullOrEmpty(_schemaPrefix))
                         {
                             o.MigrationsHistoryTable(_schemaPrefix);
@@ -106,6 +104,6 @@ namespace BTCPayServer.Abstractions.Contracts
                     throw new ArgumentOutOfRangeException();
             }
         }
-
+        
     }
 }

BTCPayServer.Abstractions/Contracts/IBTCPayServerPlugin.cs

@@ -28,5 +28,5 @@ namespace BTCPayServer.Abstractions.Contracts
             }
         }
     }
-
+    
 }

BTCPayServer.Abstractions/Contracts/INotificationHandler.cs

@@ -7,7 +7,7 @@ namespace BTCPayServer.Abstractions.Contracts
         public abstract string Identifier { get; }
         public abstract string NotificationType { get; }
     }
-
+    
     public interface INotificationHandler
     {
         string NotificationType { get; }
@@ -15,7 +15,7 @@ namespace BTCPayServer.Abstractions.Contracts
         public (string identifier, string name)[] Meta { get; }
         void FillViewModel(object notification, NotificationViewModel vm);
     }
-
+    
     public class NotificationViewModel
     {
         public string Id { get; set; }

BTCPayServer.Abstractions/Contracts/IPluginHookFilter.cs

@@ -5,7 +5,7 @@ namespace BTCPayServer.Abstractions.Contracts
     public interface IPluginHookFilter
     {
         public string Hook { get; }
-
+        
         Task<object> Execute(object args);
     }
 }

BTCPayServer.Abstractions/Contracts/IUIExtension.cs

@@ -3,7 +3,7 @@ namespace BTCPayServer.Abstractions.Contracts
     public interface IUIExtension
     {
         string Partial { get; }
-
+        
         string Location { get; }
     }
 }

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -9,70 +9,44 @@ 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";
 
-        public static void SetActivePage<T>(this ViewDataDictionary viewData, T activePage, string title = null, string activeId = null)
+        public static void SetActivePageAndTitle<T>(this ViewDataDictionary viewData, T activePage, string title = null, string mainTitle = null)
             where T : IConvertible
         {
-            SetActivePage(viewData, activePage.ToString(), activePage.GetType().ToString(), title, activeId);
-        }
-
-        public static void SetActivePage(this ViewDataDictionary viewData, string activePage, string category, string title = null, string activeId = null)
-        {
-            // Page Title
-            viewData["Title"] = title ?? activePage;
+            // Browser Title
+            viewData["Title"] = title ?? activePage.ToString();
+            // Breadcrumb
+            viewData["MainTitle"] = mainTitle;
+            viewData["PageTitle"] = title;
             // Navigation
             viewData[ACTIVE_PAGE_KEY] = activePage;
-            viewData[ACTIVE_ID_KEY] = activeId;
-            SetActiveCategory(viewData, category);
+            SetActiveCategory(viewData, activePage.GetType());
         }
 
         public static void SetActiveCategory<T>(this ViewDataDictionary viewData, T activeCategory)
-        {
-            SetActiveCategory(viewData, activeCategory.ToString());
-        }
-
-        public static void SetActiveCategory(this ViewDataDictionary viewData, string activeCategory)
         {
             viewData[ACTIVE_CATEGORY_KEY] = activeCategory;
         }
 
-        public static string IsActiveCategory<T>(this ViewDataDictionary viewData, T category, object id = null)
-        {
-            return IsActiveCategory(viewData, category.ToString(), id);
-        }
-        
-        public static string IsActiveCategory(this ViewDataDictionary viewData, string category, object id = null)
+        public static string IsActiveCategory<T>(this ViewDataDictionary viewData, T category)
         {
             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 ? "active" : null;
+            var activeCategory = (T)viewData[ACTIVE_CATEGORY_KEY];
+            return category.Equals(activeCategory) ? "active" : null;
         }
 
-        public static string IsActivePage<T>(this ViewDataDictionary viewData, T page, object id = null)
+        public static string IsActivePage<T>(this ViewDataDictionary viewData, T page)
             where T : IConvertible
-        {
-            return IsActivePage(viewData, page.ToString(), page.GetType().ToString(), id);
-        }
-        
-        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 = (category == null || activeCategory.Equals(category, StringComparison.InvariantCultureIgnoreCase)) && page.Equals(activePage, StringComparison.InvariantCultureIgnoreCase);
-            var idMatch = id == null || activeId == null || id.Equals(activeId);
-            return categoryAndPageMatch && idMatch ? "active" : null;
+            var activePage = (T)viewData[ACTIVE_PAGE_KEY];
+            return page.Equals(activePage) ? "active" : null;
         }
 
         public static HtmlString ToBrowserDate(this DateTimeOffset date)
@@ -86,13 +60,10 @@ namespace BTCPayServer.Abstractions.Extensions
             var displayDate = date.ToString("o", CultureInfo.InvariantCulture);
             return new HtmlString($"<span class='localizeDate'>{displayDate}</span>");
         }
-
+        
         public static string ToTimeAgo(this DateTimeOffset date)
         {
-            var diff = DateTimeOffset.UtcNow - date;
-            var formatted = diff.Seconds > 0
-                ? $"{diff.TimeString()} ago"
-                : $"in {diff.Negate().TimeString()}";
+            var formatted = (DateTimeOffset.UtcNow - date).TimeString() + " ago";
             return formatted;
         }
 

BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs

@@ -96,7 +96,8 @@ namespace BTCPayServer.Security
         /// <param name="script"></param>
         public void AllowInline(string script)
         {
-            ArgumentNullException.ThrowIfNull(script);
+            if (script is null)
+                throw new ArgumentNullException(nameof(script));
             var sha = GetSha256(script);
             Add("script-src", $"'sha256-{sha}'");
         }

BTCPayServer.Abstractions/Services/PluginAction.cs

@@ -3,7 +3,7 @@ using BTCPayServer.Abstractions.Contracts;
 
 namespace BTCPayServer.Abstractions.Services
 {
-    public abstract class PluginAction<T> : IPluginHookAction
+    public abstract class PluginAction<T>:IPluginHookAction
     {
         public abstract string Hook { get; }
         public Task Execute(object args)

BTCPayServer.Abstractions/Services/PluginHookFilter.cs

@@ -3,7 +3,7 @@ using BTCPayServer.Abstractions.Contracts;
 
 namespace BTCPayServer.Abstractions.Services
 {
-    public abstract class PluginHookFilter<T> : IPluginHookFilter
+    public abstract class PluginHookFilter<T>:IPluginHookFilter
     {
         public abstract string Hook { get; }
 

BTCPayServer.Abstractions/Services/UIExtension.cs

@@ -2,7 +2,7 @@ using BTCPayServer.Abstractions.Contracts;
 
 namespace BTCPayServer.Abstractions.Services
 {
-    public class UIExtension : IUIExtension
+    public class UIExtension: IUIExtension
     {
         public UIExtension(string partial, string location)
         {

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <LangVersion>10.0</LangVersion>
         <Company>BTCPay Server</Company>
         <Copyright>Copyright © BTCPay Server 2020</Copyright>
         <Description>A client library for BTCPay Server Greenfield API</Description>
@@ -14,7 +13,7 @@
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>
   <PropertyGroup>
-    <Version Condition=" '$(Version)' == '' ">1.6.0</Version>
+    <Version Condition=" '$(Version)' == '' ">1.4.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -28,9 +27,9 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="NBitcoin" Version="6.0.19" />
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.2.8" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="NBitcoin" Version="6.0.13" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.2.6" />
+      <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />

BTCPayServer.Client/BTCPayServerClient.Invoices.cs

@@ -17,8 +17,6 @@ namespace BTCPayServer.Client
             DateTimeOffset? endDate = null,
             string textSearch = null,
             bool includeArchived = false,
-            int? skip = null,
-            int? take = null,
             CancellationToken token = default)
         {
             Dictionary<string, object> queryPayload = new Dictionary<string, object>();
@@ -35,18 +33,8 @@ namespace BTCPayServer.Client
             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);
-            }
-
+                queryPayload.Add(nameof(status), status.Select(s=> s.ToString().ToLower()).ToArray());
+            
             var response =
                 await _httpClient.SendAsync(
                     CreateHttpRequest($"api/v1/stores/{storeId}/invoices",
@@ -116,7 +104,7 @@ namespace BTCPayServer.Client
         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",
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/unarchive", 
                     method: HttpMethod.Post), token);
             return await HandleResponse<InvoiceData>(response);
         }
@@ -124,7 +112,7 @@ namespace BTCPayServer.Client
         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",
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/payment-methods/{paymentMethod}/activate", 
                     method: HttpMethod.Post), token);
             await HandleResponse(response);
         }

BTCPayServer.Client/BTCPayServerClient.LNURLPayPaymentMethods.cs

@@ -1,59 +0,0 @@
-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
-    {
-        public virtual async Task<IEnumerable<LNURLPayPaymentMethodData>>
-            GetStoreLNURLPayPaymentMethods(string storeId, bool? enabled = null,
-                CancellationToken token = default)
-        {
-            var query = new Dictionary<string, object>();
-            if (enabled != null)
-            {
-                query.Add(nameof(enabled), enabled);
-            }
-
-            var response =
-                await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/LNURLPay",
-                        query), token);
-            return await HandleResponse<IEnumerable<LNURLPayPaymentMethodData>>(response);
-        }
-
-        public virtual async Task<LNURLPayPaymentMethodData> GetStoreLNURLPayPaymentMethod(
-            string storeId,
-            string cryptoCode, CancellationToken token = default)
-        {
-            var response =
-                await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/LNURLPay/{cryptoCode}"), token);
-            return await HandleResponse<LNURLPayPaymentMethodData>(response);
-        }
-
-        public virtual async Task RemoveStoreLNURLPayPaymentMethod(string storeId,
-            string cryptoCode, CancellationToken token = default)
-        {
-            var response =
-                await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/LNURLPay/{cryptoCode}",
-                        method: HttpMethod.Delete), token);
-            await HandleResponse(response);
-        }
-
-        public virtual async Task<LNURLPayPaymentMethodData> UpdateStoreLNURLPayPaymentMethod(
-            string storeId,
-            string cryptoCode, LNURLPayPaymentMethodData paymentMethod,
-            CancellationToken token = default)
-        {
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/LNURLPay/{cryptoCode}",
-                    bodyPayload: paymentMethod, method: HttpMethod.Put), token);
-            return await HandleResponse<LNURLPayPaymentMethodData>(response);
-        }
-    }
-}

BTCPayServer.Client/BTCPayServerClient.Notifications.cs

@@ -9,22 +9,13 @@ namespace BTCPayServer.Client
 {
     public partial class BTCPayServerClient
     {
-        public virtual async Task<IEnumerable<NotificationData>> GetNotifications(bool? seen = null, int? skip = null,
-            int? take = null, CancellationToken token = default)
+        public virtual async Task<IEnumerable<NotificationData>> GetNotifications(bool? seen = null,
+            CancellationToken token = default)
         {
-            Dictionary<string, object> 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);
-
-            var response = await _httpClient.SendAsync(
-                CreateHttpRequest($"api/v1/users/me/notifications",
-                    queryPayload), token);
-
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/users/me/notifications",
+                        seen != null ? new Dictionary<string, object>() {{nameof(seen), seen}} : null), token);
             return await HandleResponse<IEnumerable<NotificationData>>(response);
         }
 
@@ -41,7 +32,7 @@ namespace BTCPayServer.Client
         {
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/users/me/notifications/{notificationId}",
-                    method: HttpMethod.Put, bodyPayload: new UpdateNotification() { Seen = seen }), token);
+                    method: HttpMethod.Put, bodyPayload: new UpdateNotification() {Seen = seen}), token);
             return await HandleResponse<NotificationData>(response);
         }
 

BTCPayServer.Client/BTCPayServerClient.OnChainPaymentMethods.cs

@@ -63,7 +63,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/preview",
                     bodyPayload: paymentMethod,
-                    queryPayload: new Dictionary<string, object>() { { "offset", offset }, { "amount", amount } },
+                    queryPayload: new Dictionary<string, object>() {{"offset", offset}, {"amount", amount}},
                     method: HttpMethod.Post), token);
             return await HandleResponse<OnChainPaymentMethodPreviewResultData>(response);
         }
@@ -74,11 +74,11 @@ namespace BTCPayServer.Client
         {
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/preview",
-                    queryPayload: new Dictionary<string, object>() { { "offset", offset }, { "amount", amount } },
+                    queryPayload: new Dictionary<string, object>() {{"offset", offset}, {"amount", amount}},
                     method: HttpMethod.Get), token);
             return await HandleResponse<OnChainPaymentMethodPreviewResultData>(response);
         }
-
+        
         public virtual async Task<OnChainPaymentMethodDataWithSensitiveData> GenerateOnChainWallet(string storeId,
             string cryptoCode, GenerateOnChainWalletRequest request,
             CancellationToken token = default)

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -25,14 +25,14 @@ namespace BTCPayServer.Client
             Dictionary<string, object> queryParams = new Dictionary<string, object>();
             if (blockTarget != null)
             {
-                queryParams.Add("blockTarget", blockTarget);
+                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);
         }
-
+        
         public virtual async Task<OnChainWalletAddressData> GetOnChainWalletReceiveAddress(string storeId, string cryptoCode, bool forceGenerate = false,
             CancellationToken token = default)
         {
@@ -44,16 +44,16 @@ namespace BTCPayServer.Client
                     }), token);
             return await HandleResponse<OnChainWalletAddressData>(response);
         }
-
+        
         public virtual async Task UnReserveOnChainWalletReceiveAddress(string storeId, string cryptoCode,
             CancellationToken token = default)
         {
             var response =
                 await _httpClient.SendAsync(
-                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/wallet/address", method: HttpMethod.Delete), token);
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/wallet/address",method:HttpMethod.Delete), token);
             await HandleResponse(response);
         }
-
+       
         public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
             string storeId, string cryptoCode, TransactionStatus[] statusFilter = null,
             CancellationToken token = default)
@@ -68,7 +68,7 @@ namespace BTCPayServer.Client
                     CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/wallet/transactions", query), token);
             return await HandleResponse<IEnumerable<OnChainWalletTransactionData>>(response);
         }
-
+        
         public virtual async Task<OnChainWalletTransactionData> GetOnChainWalletTransaction(
             string storeId, string cryptoCode, string transactionId,
             CancellationToken token = default)
@@ -78,7 +78,7 @@ namespace BTCPayServer.Client
                     CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/Onchain/{cryptoCode}/wallet/transactions/{transactionId}"), token);
             return await HandleResponse<OnChainWalletTransactionData>(response);
         }
-
+        
         public virtual async Task<IEnumerable<OnChainWalletUTXOData>> GetOnChainWalletUTXOs(string storeId,
             string cryptoCode,
             CancellationToken token = default)
@@ -88,7 +88,7 @@ namespace BTCPayServer.Client
                     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)
@@ -103,7 +103,7 @@ namespace BTCPayServer.Client
                     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)

BTCPayServer.Client/BTCPayServerClient.PaymentRequests.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer.Client
             var response =
                 await _httpClient.SendAsync(
                     CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests",
-                        new Dictionary<string, object>() { { nameof(includeArchived), includeArchived } }), token);
+                        new Dictionary<string, object>() {{nameof(includeArchived), includeArchived}}), token);
             return await HandleResponse<IEnumerable<PaymentRequestData>>(response);
         }
 

BTCPayServer.Client/BTCPayServerClient.cs

@@ -18,6 +18,7 @@ namespace BTCPayServer.Client
         private readonly string _username;
         private readonly string _password;
         private readonly HttpClient _httpClient;
+
         public Uri Host => _btcpayHost;
 
         public string APIKey => _apiKey;
@@ -47,25 +48,18 @@ namespace BTCPayServer.Client
 
         protected async Task HandleResponse(HttpResponseMessage message)
         {
-            if (!message.IsSuccessStatusCode && message.Content?.Headers?.ContentType?.MediaType?.StartsWith("application/json", StringComparison.OrdinalIgnoreCase) is true)
+            if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
             {
-                if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
-                {
-                    var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
-                    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);
-                }
+                var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
+                ;
+                throw new GreenFieldValidationException(err);
             }
+            else if (message.StatusCode == System.Net.HttpStatusCode.BadRequest)
+            {
+                var err = JsonConvert.DeserializeObject<Models.GreenfieldAPIError>(await message.Content.ReadAsStringAsync());
+                throw new GreenFieldAPIException(err);
+            }
+
             message.EnsureSuccessStatusCode();
         }
 
@@ -83,13 +77,6 @@ namespace BTCPayServer.Client
             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)

BTCPayServer.Client/GreenFieldAPIException.cs

@@ -2,16 +2,14 @@ using System;
 
 namespace BTCPayServer.Client
 {
-    public class GreenfieldAPIException : Exception
+    public class GreenFieldAPIException : Exception
     {
-        public GreenfieldAPIException(int httpCode, Models.GreenfieldAPIError error) : base(error.Message)
+        public GreenFieldAPIException(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; }
     }
 }

BTCPayServer.Client/GreenFieldValidationException.cs

@@ -4,9 +4,9 @@ using BTCPayServer.Client.Models;
 
 namespace BTCPayServer.Client
 {
-    public class GreenfieldValidationException : Exception
+    public class GreenFieldValidationException : Exception
     {
-        public GreenfieldValidationException(Models.GreenfieldValidationError[] errors) : base(BuildMessage(errors))
+        public GreenFieldValidationException(Models.GreenfieldValidationError[] errors) : base(BuildMessage(errors))
         {
             ValidationErrors = errors;
         }

BTCPayServer.Client/JsonConverters/MnemonicJsonConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using NBitcoin;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/JsonConverters/NodeUriJsonConverter.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer.Client.JsonConverters
 
         public override void WriteJson(JsonWriter writer, [AllowNull] NodeInfo value, JsonSerializer serializer)
         {
-            if (value is not null)
+            if (value is NodeInfo)
                 writer.WriteValue(value.ToString());
         }
     }

BTCPayServer.Client/JsonConverters/NumericStringJsonConverter.cs

@@ -22,17 +22,13 @@ namespace BTCPayServer.JsonConverters
             switch (token.Type)
             {
                 case JTokenType.Float:
-                    if (objectType == typeof(decimal) || objectType == typeof(decimal?))
-                        return token.Value<decimal>();
-                    if (objectType == typeof(double) || objectType == typeof(double?))
-                        return token.Value<double>();
-                    throw new JsonSerializationException("Unexpected object type: " + objectType);
                 case JTokenType.Integer:
                 case JTokenType.String:
-                    if (objectType == typeof(decimal) || objectType == typeof(decimal?))
+                    if (objectType == typeof(decimal) || objectType == typeof(decimal?) )
                         return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
                     if (objectType == typeof(double) || objectType == typeof(double?))
                         return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
+
                     throw new JsonSerializationException("Unexpected object type: " + objectType);
                 case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
                     return null;

BTCPayServer.Client/JsonConverters/TimeSpanJsonConverter.cs

@@ -29,17 +29,6 @@ namespace BTCPayServer.Client.JsonConverters
                 return TimeSpan.FromMinutes(value);
             }
         }
-        public class Days : TimeSpanJsonConverter
-        {
-            protected override long ToLong(TimeSpan value)
-            {
-                return (long)value.TotalDays;
-            }
-            protected override TimeSpan ToTimespan(long value)
-            {
-                return TimeSpan.FromDays(value);
-            }
-        }
         public override bool CanConvert(Type objectType)
         {
             return objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?);

BTCPayServer.Client/JsonConverters/WordcountJsonConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;

BTCPayServer.Client/JsonConverters/WordlistJsonConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -21,7 +21,7 @@ public class WordlistJsonConverter : JsonConverter
             {"PortugueseBrazil", Wordlist.PortugueseBrazil},
             {"Czech", Wordlist.Czech}
         };
-
+            
         _WordlistsReverse = _Wordlists.ToDictionary(kv => kv.Value, kv => kv.Key);
     }
 

BTCPayServer.Client/Models/AddCustomerEmailRequest.cs

@@ -4,4 +4,4 @@ namespace BTCPayServer.Client.Models
     {
         public string Email { get; set; }
     }
-}
+}

BTCPayServer.Client/Models/CreateInvoiceRequest.cs

@@ -1,5 +1,9 @@
+using System;
+using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Client.Models
 {

BTCPayServer.Client/Models/CreateOnChainTransactionRequest.cs

@@ -18,7 +18,7 @@ namespace BTCPayServer.Client.Models
         }
         [JsonConverter(typeof(FeeRateJsonConverter))]
         public FeeRate FeeRate { get; set; }
-        public bool ProceedWithPayjoin { get; set; } = true;
+        public bool ProceedWithPayjoin { get; set; }= true;
         public bool ProceedWithBroadcast { get; set; } = true;
         public bool NoChange { get; set; } = false;
         [JsonProperty(ItemConverterType = typeof(OutpointJsonConverter))]

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -13,9 +13,6 @@ namespace BTCPayServer.Client.Models
         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; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? ExpiresAt { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]

BTCPayServer.Client/Models/GenerateOnChainWalletRequest.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.Client.JsonConverters;
 using NBitcoin;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -8,7 +8,7 @@ namespace BTCPayServer.Client
     public class GenerateOnChainWalletRequest
     {
         public int AccountNumber { get; set; } = 0;
-        [JsonConverter(typeof(MnemonicJsonConverter))]
+        [JsonConverter(typeof(MnemonicJsonConverter))]	
         public Mnemonic ExistingMnemonic { get; set; }
         [JsonConverter(typeof(WordlistJsonConverter))]
         public NBitcoin.Wordlist WordList { get; set; }

BTCPayServer.Client/Models/GenericPaymentMethodData.cs

@@ -1,4 +1,4 @@
-namespace BTCPayServer.Client.Models
+namespace BTCPayServer.Client.Models
 {
     public class GenericPaymentMethodData
     {

BTCPayServer.Client/Models/GreenfieldPermissionAPIError.cs

@@ -1,17 +0,0 @@
-using System;
-
-namespace BTCPayServer.Client.Models
-{
-    public class GreenfieldPermissionAPIError : GreenfieldAPIError
-    {
-        public GreenfieldPermissionAPIError(string missingPermission, string message = null) : base()
-        {
-            MissingPermission = missingPermission;
-            Code = "missing-permission";
-            Message = message ?? $"Insufficient API Permissions. Please use an API key with permission \"{MissingPermission}\". You can create an API key in your account's settings / Api Keys.";
-        }
-
-        public string MissingPermission { get; }
-
-    }
-}

BTCPayServer.Client/Models/InvoiceData.cs

@@ -40,7 +40,6 @@ 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; }
         }
     }
@@ -63,7 +62,6 @@ namespace BTCPayServer.Client.Models
         public DateTimeOffset CreatedTime { get; set; }
         [JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
         public InvoiceStatus[] AvailableStatusesForManualMarking { get; set; }
-        public bool Archived { get; set; }
     }
     public enum InvoiceStatus
     {

BTCPayServer.Client/Models/InvoiceExceptionStatus.cs

@@ -9,4 +9,4 @@ namespace BTCPayServer.Client.Models
         Invalid,
         PaidOver
     }
-}
+}

BTCPayServer.Client/Models/InvoicePaymentMethodDataModel.cs

@@ -33,8 +33,6 @@ namespace BTCPayServer.Client.Models
         public List<Payment> Payments { get; set; }
         public string PaymentMethod { get; set; }
 
-        public string CryptoCode { get; set; }
-
         public class Payment
         {
             public string Id { get; set; }
@@ -52,7 +50,7 @@ namespace BTCPayServer.Client.Models
             public PaymentStatus Status { get; set; }
 
             public string Destination { get; set; }
-
+            
             public enum PaymentStatus
             {
                 Invalid,

BTCPayServer.Client/Models/LNURLPayPaymentMethodBaseData.cs

@@ -1,14 +0,0 @@
-namespace BTCPayServer.Client.Models
-{
-    public class LNURLPayPaymentMethodBaseData
-    {
-        public bool UseBech32Scheme { get; set; }
-        public bool EnableForStandardInvoices { get; set; }
-        public bool LUD12Enabled { get; set; }
-
-        public LNURLPayPaymentMethodBaseData()
-        {
-
-        }
-    }
-}

BTCPayServer.Client/Models/LNURLPayPaymentMethodData.cs

@@ -1,27 +0,0 @@
-namespace BTCPayServer.Client.Models
-{
-    public class LNURLPayPaymentMethodData : LNURLPayPaymentMethodBaseData
-    {
-        /// <summary>
-        /// Whether the payment method is enabled
-        /// </summary>
-        public bool Enabled { get; set; }
-
-        /// <summary>
-        /// Crypto code of the payment method
-        /// </summary>
-        public string CryptoCode { get; set; }
-
-        public LNURLPayPaymentMethodData()
-        {
-        }
-
-        public LNURLPayPaymentMethodData(string cryptoCode, bool enabled, bool useBech32Scheme, bool enableForStandardInvoices)
-        {
-            Enabled = enabled;
-            CryptoCode = cryptoCode;
-            UseBech32Scheme = useBech32Scheme;
-            EnableForStandardInvoices = enableForStandardInvoices;
-        }
-    }
-}

BTCPayServer.Client/Models/LabelData.cs

@@ -11,4 +11,4 @@ namespace BTCPayServer.Client.Models
 
         [JsonExtensionData] public Dictionary<string, JToken> AdditionalData { get; set; }
     }
-}
+}

BTCPayServer.Client/Models/LightningNetworkPaymentMethodBaseData.cs

@@ -1,13 +1,12 @@
-namespace BTCPayServer.Client.Models
+namespace BTCPayServer.Client.Models
 {
     public class LightningNetworkPaymentMethodBaseData
     {
 
         public string ConnectionString { get; set; }
-        public bool DisableBOLT11PaymentOption { get; set; }
         public LightningNetworkPaymentMethodBaseData()
         {
-
+            
         }
     }
 }

BTCPayServer.Client/Models/LightningNetworkPaymentMethodData.cs

@@ -1,6 +1,6 @@
 namespace BTCPayServer.Client.Models
 {
-    public class LightningNetworkPaymentMethodData : LightningNetworkPaymentMethodBaseData
+    public class LightningNetworkPaymentMethodData: LightningNetworkPaymentMethodBaseData
     {
         /// <summary>
         /// Whether the payment method is enabled
@@ -16,13 +16,12 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod, bool disableBOLT11PaymentOption)
+        public LightningNetworkPaymentMethodData(string cryptoCode, string connectionString, bool enabled, string paymentMethod)
         {
             Enabled = enabled;
             CryptoCode = cryptoCode;
             ConnectionString = connectionString;
             PaymentMethod = paymentMethod;
-            DisableBOLT11PaymentOption = disableBOLT11PaymentOption;
         }
 
         public string PaymentMethod { get; set; }

BTCPayServer.Client/Models/OnChainPaymentMethodBaseData.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models
@@ -19,6 +19,6 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-
+        
     }
 }

BTCPayServer.Client/Models/OnChainPaymentMethodData.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Client.Models
 
         public OnChainPaymentMethodDataPreview()
         {
-
+            
         }
 
         public OnChainPaymentMethodDataPreview(string cryptoCode, string derivationScheme, string label, RootedKeyPath accountKeyPath)
@@ -34,7 +34,7 @@ namespace BTCPayServer.Client.Models
 
         public OnChainPaymentMethodData()
         {
-
+            
         }
 
         public OnChainPaymentMethodData(string cryptoCode, string derivationScheme, bool enabled, string label, RootedKeyPath accountKeyPath, string paymentMethod) :

BTCPayServer.Client/Models/OnChainPaymentMethodDataWithSensitiveData.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.Client.JsonConverters;
 using NBitcoin;
 using Newtonsoft.Json;
 

BTCPayServer.Client/Models/PaymentRequestBaseData.cs

@@ -8,12 +8,10 @@ namespace BTCPayServer.Client.Models
 {
     public class PaymentRequestBaseData
     {
-        public string StoreId { get; set; }
         [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
         public string Currency { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset? ExpiryDate { get; set; }
+        public DateTime? ExpiryDate { get; set; }
         public string Title { get; set; }
         public string Description { get; set; }
         public string Email { get; set; }

BTCPayServer.Client/Models/PaymentRequestData.cs

@@ -8,8 +8,7 @@ namespace BTCPayServer.Client.Models
     {
         [JsonConverter(typeof(StringEnumConverter))]
         public PaymentRequestData.PaymentRequestStatus Status { get; set; }
-        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
-        public DateTimeOffset CreatedTime { get; set; }
+        public DateTimeOffset Created { get; set; }
         public string Id { get; set; }
         public bool Archived { get; set; }
 

BTCPayServer.Client/Models/PayoutData.cs

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

BTCPayServer.Client/Models/PullPaymentBaseData.cs

@@ -18,9 +18,6 @@ namespace BTCPayServer.Client.Models
         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; }
         public bool Archived { get; set; }
         public string ViewLink { get; set; }
     }

BTCPayServer.Client/Models/ServerInfoData.cs

@@ -29,14 +29,14 @@ namespace BTCPayServer.Client.Models
         /// </summary>
         public IEnumerable<SyncStatus> SyncStatus { get; set; }
     }
-
+    
     public class SyncStatus
     {
         public string CryptoCode { get; set; }
         public virtual bool Available { get; set; }
     }
 
-    public class ServerInfoSyncStatusData : SyncStatus
+    public class ServerInfoSyncStatusData: SyncStatus
     {
         public int ChainHeight { get; set; }
         public int? SyncHeight { get; set; }

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -29,7 +29,8 @@ namespace BTCPayServer.Client.Models
         public string LightningDescriptionTemplate { get; set; }
         public double PaymentTolerance { get; set; } = 0;
         public bool AnyoneCanCreateInvoice { get; set; }
-        public string DefaultCurrency { get; set; }
+
+
         public bool RequiresRefundEmail { get; set; }
         public bool LightningAmountInSatoshi { get; set; }
         public bool LightningPrivateRouteHints { get; set; }
@@ -41,9 +42,9 @@ namespace BTCPayServer.Client.Models
         public bool ShowRecommendedFee { get; set; } = true;
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public int RecommendedFeeBlockTarget { get; set; } = 1;
-
+        
         public string DefaultPaymentMethod { get; set; }
-
+        
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string DefaultLang { get; set; } = "en";
 

BTCPayServer.Client/Models/TransactionStatus.cs

@@ -6,4 +6,4 @@ namespace BTCPayServer.Client.Models
         Confirmed,
         Replaced
     }
-}
+}

BTCPayServer.Client/Models/UpdateLightningNetworkPaymentMethodRequest.cs

@@ -1,6 +1,6 @@
 namespace BTCPayServer.Client.Models
 {
-    public class UpdateLightningNetworkPaymentMethodRequest : LightningNetworkPaymentMethodBaseData
+    public class UpdateLightningNetworkPaymentMethodRequest: LightningNetworkPaymentMethodBaseData
     {
         /// <summary>
         /// Whether the payment method is enabled

BTCPayServer.Client/Models/UpdateOnChainPaymentMethodRequest.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Client.Models
 
         public UpdateOnChainPaymentMethodRequest()
         {
-
+            
         }
 
         public UpdateOnChainPaymentMethodRequest(bool enabled, string derivationScheme, string label, RootedKeyPath accountKeyPath)

BTCPayServer.Client/Models/WebhookInvoiceEvent.cs

@@ -73,7 +73,6 @@ namespace BTCPayServer.Client.Models
         public bool AfterExpiration { get; set; }
         public string PaymentMethod { get; set; }
         public InvoicePaymentMethodDataModel.Payment Payment { get; set; }
-        public bool OverPaid { get; set; }
     }
 
     public class WebhookInvoicePaymentSettledEvent : WebhookInvoiceReceivedPaymentEvent

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Althash.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Althash",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.htmlcoin.com/api/tx/{0}" : "https://explorer.htmlcoin.com/api/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "htmlcoin",
                 DefaultRateRules = new[]
                 {
                                 "HTML_X = HTML_USD",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Argoneum.cs

@@ -15,6 +15,7 @@ namespace BTCPayServer
                     ? "https://chainz.cryptoid.info/agm/tx.dws?{0}"
                     : "https://chainz.cryptoid.info/agm-test/tx.dws?{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "argoneum",
                 DefaultRateRules = new[]
                     {
                         "AGM_X = AGM_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BGold.cs

@@ -13,6 +13,7 @@ namespace BTCPayServer
                 DisplayName = "BGold",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://btgexplorer.com/tx/{0}" : "https://testnet.btgexplorer.com/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoingold",
                 DefaultRateRules = new[]
                 {
                     "BTG_X = BTG_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BPlus.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "BPlus",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bplus-fix-it",
                 DefaultRateRules = new[]
                 {
                     "XBC_X = XBC_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "BitCore",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.bitcore.cc/tx/{0}" : "https://explorer.bitcore.cc/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcore",
                 DefaultRateRules = new[]
                 {
                                 "BTX_X = BTX_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Chaincoin.cs

@@ -15,6 +15,7 @@ namespace BTCPayServer
                     ? "https://explorer.chaincoin.org/Explorer/Transaction/{0}"
                     : "https://test.explorer.chaincoin.org/Explorer/Transaction/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "chaincoin",
                 DefaultRateRules = new[]
                     {
                         "CHC_X = CHC_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dash.cs

@@ -16,6 +16,7 @@ namespace BTCPayServer
                     ? "https://insight.dash.org/insight/tx/{0}"
                     : "https://testnet-insight.dashevo.org/insight/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "dash",
                 DefaultRateRules = new[]
                     {
                         "DASH_X = DASH_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Dogecoin",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "dogecoin",
                 DefaultRateRules = new[]
                 {
                                 "DOGE_X = DOGE_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Feathercoin",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "feathercoin",
                 DefaultRateRules = new[]
                 {
                                 "FTC_X = FTC_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -15,6 +15,7 @@ namespace BTCPayServer
                     ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm"
                     : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "groestlcoin",
                 DefaultRateRules = new[]
                 {
                     "GRS_X = GRS_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

@@ -17,6 +17,7 @@ namespace BTCPayServer
                     ? "https://live.blockcypher.com/ltc/tx/{0}/"
                     : "http://explorer.litecointools.com/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "litecoin",
                 DefaultRateRules = new[]
                 {
                     "LTC_X = LTC_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Monacoin",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "monacoin",
                 DefaultRateRules = new[]
                 {
                                 "MONA_X = MONA_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.MonetaryUnit.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "MonetaryUnit",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}" : "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "monetaryunit",
                 DefaultRateRules = new[]
                 {
                                 "MUE_X = MUE_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Polis",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockbook.polispay.org/tx/{0}" : "https://blockbook.polispay.org/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "polis",
                 DefaultRateRules = new[]
                 {
                                 "POLIS_X = POLIS_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Ufo",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "ufo",
                 DefaultRateRules = new[]
                 {
                                 "UFO_X = UFO_BTC * BTC_X",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -14,6 +14,7 @@ namespace BTCPayServer
                 DisplayName = "Viacoin",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.viacoin.org/tx/{0}" : "https://explorer.viacoin.org/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "viacoin",
                 DefaultRateRules = new[]
                 {
                                 "VIA_X = VIA_BTC * BTC_X",

BTCPayServer.Common/Altcoins/Ethereum/BTCPayNetworkProvider.Ethereum.cs

@@ -0,0 +1,78 @@
+#if ALTCOINS
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitEthereum()
+        {
+            Add(new EthereumBTCPayNetwork()
+            {
+                CryptoCode = "ETH",
+                DisplayName = "Ethereum",
+                DefaultRateRules = new[] {"ETH_X = ETH_BTC * BTC_X", "ETH_BTC = kraken(ETH_BTC)"},
+                BlockExplorerLink =
+                    NetworkType == ChainName.Mainnet
+                        ? "https://etherscan.io/address/{0}"
+                        : "https://ropsten.etherscan.io/address/{0}",
+                CryptoImagePath = "/imlegacy/eth.png",
+                ShowSyncSummary = true,
+                CoinType = NetworkType == ChainName.Mainnet? 60 : 1,
+                ChainId = NetworkType == ChainName.Mainnet ? 1 : 3,
+                Divisibility = 18,
+            });
+        }
+        
+        public void InitERC20()
+        {
+            if (NetworkType != ChainName.Mainnet)
+            {
+                Add(new ERC20BTCPayNetwork()
+                {
+                    CryptoCode = "FAU",
+                    DisplayName = "Faucet Token",
+                    DefaultRateRules = new[]
+                    {
+                        "FAU_X = FAU_BTC * BTC_X",
+                        "FAU_BTC = 0.01",
+                    },
+                    BlockExplorerLink = "https://ropsten.etherscan.io/address/{0}#tokentxns",
+                    ShowSyncSummary = false,
+                    CoinType =  1,
+                    ChainId =  3,
+                    //use https://erc20faucet.com for testnet
+                    SmartContractAddress = "0xFab46E002BbF0b4509813474841E0716E6730136",
+                    Divisibility = 18,
+                    CryptoImagePath = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=",
+                });
+            }
+            else
+            {
+                Add(new ERC20BTCPayNetwork()
+                {
+                    CryptoCode = "USDT20",
+                    DisplayName = "Tether USD (ERC20)",
+                    DefaultRateRules = new[]
+                    {
+                        "USDT20_UST = 1",
+                        "USDT20_X = USDT20_BTC * BTC_X",
+                        "USDT20_BTC = bitfinex(UST_BTC)",
+                    },
+                    BlockExplorerLink =
+                        NetworkType == ChainName.Mainnet
+                            ? "https://etherscan.io/address/{0}#tokentxns"
+                            : "https://ropsten.etherscan.io/address/{0}#tokentxns",
+                    CryptoImagePath = "/imlegacy/liquid-tether.svg",
+                    ShowSyncSummary = false,
+                    CoinType = NetworkType == ChainName.Mainnet? 60 : 1,
+                    ChainId = NetworkType == ChainName.Mainnet ? 1 : 3,
+                    SmartContractAddress = "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+                    Divisibility = 6
+                });
+            }
+            
+        }
+    }
+}
+#endif

BTCPayServer.Common/Altcoins/Ethereum/EthereumBTCPayNetwork.cs

@@ -0,0 +1,20 @@
+#if ALTCOINS
+namespace BTCPayServer
+{
+    public class EthereumBTCPayNetwork : BTCPayNetworkBase
+    {
+        public int ChainId { get; set; }
+        public int CoinType { get; set; }
+
+        public string GetDefaultKeyPath()
+        {
+            return $"m/44'/{CoinType}'/0'/0/x";
+        }
+    }
+
+    public class ERC20BTCPayNetwork : EthereumBTCPayNetwork
+    {
+        public string SmartContractAddress { get; set; }
+    }
+}
+#endif

BTCPayServer.Common/Altcoins/Ethereum/EthereumExtensions.cs

@@ -0,0 +1,20 @@
+#if ALTCOINS
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BTCPayServer
+{
+    public static class EthereumExtensions
+    {
+        
+        public static IEnumerable<string> GetAllEthereumSubChains(this BTCPayNetworkProvider networkProvider, BTCPayNetworkProvider unfiltered)
+        {
+            var ethBased = networkProvider.GetAll().OfType<EthereumBTCPayNetwork>();
+            var chainId = ethBased.Select(network => network.ChainId).Distinct();
+            return unfiltered.GetAll().OfType<EthereumBTCPayNetwork>()
+                .Where(network => chainId.Contains(network.ChainId))
+                .Select(network => network.CryptoCode.ToUpperInvariant());
+        }
+    }
+}
+#endif

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.Liquid.cs

@@ -24,6 +24,7 @@ namespace BTCPayServer
                 },
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
                 CryptoImagePath = "imlegacy/liquid.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.LiquidAssets.cs

@@ -23,6 +23,7 @@ namespace BTCPayServer
                 DisplayName = "Liquid Tether",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
                 CryptoImagePath = "imlegacy/liquid-tether.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
@@ -46,6 +47,7 @@ namespace BTCPayServer
                 DisplayName = "Ethiopian Birr",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
                 CryptoImagePath = "imlegacy/etb.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
@@ -68,6 +70,7 @@ namespace BTCPayServer
                 DisplayName = "Liquid CAD",
                 BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
                 CryptoImagePath = "imlegacy/lcad.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
                 CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),

BTCPayServer.Common/BTCPayNetwork.cs

@@ -66,6 +66,7 @@ namespace BTCPayServer
         public virtual bool ReadonlyWallet { get; set; } = false;
         public virtual bool VaultSupported { get; set; } = false;
         public int MaxTrackedConfirmation { get; set; } = 6;
+        public string UriScheme { get; set; }
         public bool SupportPayJoin { get; set; } = false;
         public bool SupportLightning { get; set; } = true;
 
@@ -89,7 +90,7 @@ namespace BTCPayServer
 
         public virtual PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, Money cryptoInfoDue)
         {
-            var builder = new PaymentUrlBuilder(this.NBitcoinNetwork.UriScheme);
+            var builder = new PaymentUrlBuilder(UriScheme);
             builder.Host = cryptoInfoAddress;
             if (cryptoInfoDue != null && cryptoInfoDue != Money.Zero)
             {

BTCPayServer.Common/BTCPayNetworkProvider.Bitcoin.cs

@@ -17,6 +17,7 @@ namespace BTCPayServer
                                     NetworkType == Bitcoin.Instance.Signet.ChainName ? "https://explorer.bc-2.jp/tx/{0}"
                                     : "https://blockstream.info/testnet/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoin",
                 CryptoImagePath = "imlegacy/bitcoin.svg",
                 LightningImagePath = "imlegacy/bitcoin-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -59,6 +59,8 @@ namespace BTCPayServer
             InitChaincoin();
             // InitArgoneum();//their rate source is down 9/15/20.
             InitMonetaryUnit();
+            InitEthereum();
+            InitERC20();
 
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
@@ -121,7 +123,8 @@ namespace BTCPayServer
         }
         public T GetNetwork<T>(string cryptoCode) where T : BTCPayNetworkBase
         {
-            ArgumentNullException.ThrowIfNull(cryptoCode);
+            if (cryptoCode == null)
+                throw new ArgumentNullException(nameof(cryptoCode));
             if (!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
             {
                 if (cryptoCode == "XBT")

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="4.1.3" />
+    <PackageReference Include="NBXplorer.Client" Version="4.1.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(Altcoins)' != 'true'">
     <Compile Remove="Altcoins\**\*.cs"></Compile>

BTCPayServer.Common/IExplorerClientProvider.cs

@@ -1,4 +1,4 @@
-using NBXplorer;
+using NBXplorer;
 
 namespace BTCPayServer.Common
 {

BTCPayServer.Common/Logging/Logs.cs

@@ -6,11 +6,11 @@ namespace BTCPayServer.Logging
 {
     public class Logs
     {
-        public Logs()
+        static Logs()
         {
             Configure(new FuncLoggerFactory(n => NullLogger.Instance));
         }
-        public void Configure(ILoggerFactory factory)
+        public static void Configure(ILoggerFactory factory)
         {
             if (factory == null)
                 Configure(new FuncLoggerFactory(n => NullLogger.Instance));
@@ -21,16 +21,16 @@ namespace BTCPayServer.Logging
                 Events = factory.CreateLogger("Events");
             }
         }
-        public ILogger Configuration
+        public static ILogger Configuration
         {
             get; set;
         }
-        public ILogger PayServer
+        public static ILogger PayServer
         {
             get; set;
         }
 
-        public ILogger Events
+        public static ILogger Events
         {
             get; set;
         }

BTCPayServer.Common/MultiProcessingQueue.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using ProcessingAction = System.Func<System.Threading.CancellationToken, System.Threading.Tasks.Task>;
-
-namespace BTCPayServer
-{
-    /// <summary>
-    /// This class make sure that enqueued actions sharing the same queue name
-    /// are executed sequentially.
-    /// This is useful to preserve order of events.
-    /// </summary>
-    public class MultiProcessingQueue
-    {
-        Dictionary<string, ProcessingQueue> _Queues = new Dictionary<string, ProcessingQueue>();
-        class ProcessingQueue
-        {
-            internal Channel<ProcessingAction> Chan = Channel.CreateUnbounded<ProcessingAction>();
-            internal Task ProcessTask;
-            public async Task Process(CancellationToken cancellationToken)
-            {
-                retry:
-                while (Chan.Reader.TryRead(out var item))
-                {
-                    await item(cancellationToken);
-                }
-                if (Chan.Writer.TryComplete())
-                {
-                    goto retry;
-                }
-            }
-        }
-
-        public int QueueCount
-        {
-            get
-            {
-                lock (_Queues)
-                {
-                    Cleanup();
-                    return _Queues.Count;
-                }
-            }
-        }
-        CancellationTokenSource cts = new CancellationTokenSource();
-        bool stopped;
-        public void Enqueue(string queueName, ProcessingAction act)
-        {
-            lock (_Queues)
-            {
-                retry:
-                if (stopped)
-                    return;
-                Cleanup();
-                bool created = false;
-                if (!_Queues.TryGetValue(queueName, out var queue))
-                {
-                    queue = new ProcessingQueue();
-                    _Queues.Add(queueName, queue);
-                    created = true;
-                }
-                if (!queue.Chan.Writer.TryWrite(act))
-                    goto retry;
-                if (created)
-                    queue.ProcessTask = queue.Process(cts.Token);
-            }
-        }
-
-        private void Cleanup()
-        {
-            var removeList = new List<string>();
-            foreach (var q in _Queues)
-            {
-                if (q.Value.Chan.Reader.Completion.IsCompletedSuccessfully)
-                {
-                    removeList.Add(q.Key);
-                }
-            }
-            foreach (var q in removeList)
-            {
-                _Queues.Remove(q);
-            }
-        }
-
-        public async Task Abort(CancellationToken cancellationToken)
-        {
-            stopped = true;
-            ProcessingQueue[] queues = null;
-            lock (_Queues)
-            {
-                queues = _Queues.Select(c => c.Value).ToArray();
-            }
-            cts.Cancel();
-            var delay = Task.Delay(-1, cancellationToken);
-            foreach (var q in queues)
-            {
-                try
-                {
-                    await Task.WhenAny(q.ProcessTask, delay);
-                }
-                catch
-                {
-                }
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            lock (_Queues)
-            {
-                Cleanup();
-            }
-        }
-    }
-}

BTCPayServer.Common/ZipUtils.cs

@@ -21,10 +21,12 @@ namespace BTCPayServer
         public static string Unzip(byte[] bytes)
         {
             MemoryStream ms = new MemoryStream(bytes);
-            using GZipStream gzip = new GZipStream(ms, CompressionMode.Decompress);
-            StreamReader reader = new StreamReader(gzip, Encoding.UTF8);
-            var unzipped = reader.ReadToEnd();
-            return unzipped;
+            using (GZipStream gzip = new GZipStream(ms, CompressionMode.Decompress))
+            {
+                StreamReader reader = new StreamReader(gzip, Encoding.UTF8);
+                var unzipped = reader.ReadToEnd();
+                return unzipped;
+            }
         }
     }
 }

BTCPayServer.Data/ApplicationDbContext.cs

@@ -75,7 +75,6 @@ namespace BTCPayServer.Data
 
             // some of the data models don't have OnModelCreating for now, commenting them
 
-            ApplicationUser.OnModelCreating(builder);
             AddressInvoiceData.OnModelCreating(builder);
             APIKeyData.OnModelCreating(builder);
             AppData.OnModelCreating(builder);

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.19">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.19" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />

BTCPayServer.Data/Data/APIKeyData.cs

@@ -8,10 +8,10 @@ namespace BTCPayServer.Data
         [MaxLength(50)]
         public string Id { get; set; }
 
-        [MaxLength(50)]
+        [MaxLength(50)] 
         public string StoreId { get; set; }
 
-        [MaxLength(50)]
+        [MaxLength(50)] 
         public string UserId { get; set; }
 
         public APIKeyType Type { get; set; } = APIKeyType.Legacy;

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
 {
@@ -19,16 +18,5 @@ namespace BTCPayServer.Data
         public List<NotificationData> Notifications { get; set; }
         public List<UserStore> UserStores { get; set; }
         public List<Fido2Credential> Fido2Credentials { get; set; }
-
-        public byte[] Blob { get; set; }
-
-        public List<IdentityUserRole<string>> UserRoles { get; set; }
-
-        public static void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<ApplicationUser>()
-                .HasMany<IdentityUserRole<string>>(user => user.UserRoles)
-                .WithOne().HasForeignKey(role => role.UserId);
-        }
     }
 }

BTCPayServer.Data/Data/Fido2Credential.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 
@@ -17,10 +16,7 @@ namespace BTCPayServer.Data
         public CredentialType Type { get; set; }
         public enum CredentialType
         {
-            [Display(Name = "Security device (FIDO2)")]
-            FIDO2,
-            [Display(Name = "Lightning node (LNURL Auth)")]
-            LNURLAuth
+            FIDO2
         }
         public static void OnModelCreating(ModelBuilder builder)
         {

BTCPayServer.Data/Data/PayoutData.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using BTCPayServer.Client.Models;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
@@ -20,24 +19,25 @@ namespace BTCPayServer.Data
         [MaxLength(20)]
         [Required]
         public string PaymentMethodId { get; set; }
+        public string Destination { get; set; }
         public byte[] Blob { get; set; }
         public byte[] Proof { get; set; }
-#nullable enable
-        public string? Destination { get; set; }
-#nullable restore
+
 
         internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<PayoutData>()
                 .HasOne(o => o.PullPaymentData)
                 .WithMany(o => o.Payouts).OnDelete(DeleteBehavior.Cascade);
+
             builder.Entity<PayoutData>()
                 .Property(o => o.State)
                 .HasConversion<string>();
             builder.Entity<PayoutData>()
-                .HasIndex(o => o.State);
+                .HasIndex(o => o.Destination)
+                .IsUnique();
             builder.Entity<PayoutData>()
-                .HasIndex(x => new { DestinationId = x.Destination, x.State });
+                .HasIndex(o => o.State);
         }
 
         // utility methods

BTCPayServer.Data/Data/U2FDevice.cs

@@ -19,8 +19,8 @@ namespace BTCPayServer.Data
 
         public string ApplicationUserId { get; set; }
         public ApplicationUser ApplicationUser { get; set; }
-
-
+        
+        
         internal static void OnModelCreating(ModelBuilder builder)
         {
 #pragma warning disable CS0618 // Type or member is obsolete

BTCPayServer.Data/Migrations/20200625064111_refundnotificationpullpayments.cs

@@ -20,7 +20,7 @@ namespace BTCPayServer.Migrations
                 name: "CurrentRefundId",
                 table: "Invoices",
                 nullable: true,
-        maxLength: maxLength);
+		maxLength: maxLength);
 
             migrationBuilder.CreateTable(
                 name: "Notifications",

BTCPayServer.Data/Migrations/20200901161733_AddInvoiceEventLogSeverity.cs

@@ -1,10 +1,10 @@
-using BTCPayServer.Data;
+using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
-
+    
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20200901161733_AddInvoiceEventLogSeverity")]
     public partial class AddInvoiceEventLogSeverity : Migration

BTCPayServer.Data/Migrations/20201002145033_AddCreateDateToUser.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20201007090617_u2fDeviceCascade.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Data;
+using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 

BTCPayServer.Data/Migrations/20201015151438_AddDisabledNotificationsToUser.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Data;
+using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;