Fix: Payments to Top-Up could be undetected due to race condition

Suggested at https://github.com/btcpayserver/btcpayserver/pull/5490#issuecomment-1851066223
We can also configure this httpclient to use tor

.gitignore

@@ -298,4 +298,5 @@ Packed Plugins
 Plugins/packed
 
 BTCPayServer/wwwroot/swagger/v1/openapi.json
-BTCPayServer/appsettings.dev.json
+BTCPayServer/appsettings.dev.json
+BTCPayServer.Tests/monero_wallet

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -31,11 +31,11 @@
     <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.7" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="HtmlSanitizer" Version="8.0.723" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <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/Contracts/BaseDbContextFactory.cs

@@ -84,6 +84,7 @@ namespace BTCPayServer.Abstractions.Contracts
                         .UseNpgsql(_options.Value.ConnectionString, o =>
                         {
                             o.EnableRetryOnFailure(10);
+                            o.SetPostgresVersion(12, 0);
                             if (!string.IsNullOrEmpty(_schemaPrefix))
                             {
                                 o.MigrationsHistoryTable(_schemaPrefix);

BTCPayServer.Abstractions/Extensions/ViewsRazor.cs

@@ -20,6 +20,15 @@ namespace BTCPayServer.Abstractions.Extensions
             Relative
         }
 
+        public static void SetBlazorAllowed(this ViewDataDictionary viewData, bool allowed)
+        {
+            viewData["BlazorAllowed"] = allowed;
+        }
+        public static bool IsBlazorAllowed(this ViewDataDictionary viewData)
+        {
+            return viewData["BlazorAllowed"] is not false;
+        }
+
         public static void SetActivePage<T>(this ViewDataDictionary viewData, T activePage, string title = null, string activeId = null)
             where T : IConvertible
         {

BTCPayServer.Abstractions/Form/Form.cs

@@ -5,7 +5,6 @@ using System.Reflection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json.Linq;
-using Npgsql.Internal.TypeHandlers.GeometricHandlers;
 
 namespace BTCPayServer.Abstractions.Form;
 
@@ -105,31 +104,7 @@ public class Form
         }
     }
 
-    public void SetValues(JObject values)
-    {
-        var fields = GetAllFields().ToDictionary(k => k.FullName, k => k.Field);
-        SetValues(fields, new List<string>(), values);
-    }
-
-    private void SetValues(Dictionary<string, Field> fields, List<string> path, JObject values)
-    {
-        foreach (var prop in values.Properties())
-        {
-            List<string> propPath = new List<string>(path.Count + 1);
-            propPath.AddRange(path);
-            propPath.Add(prop.Name);
-            if (prop.Value.Type == JTokenType.Object)
-            {
-                SetValues(fields, propPath, (JObject)prop.Value);
-            }
-            else if (prop.Value.Type == JTokenType.String)
-            {
-                var fullName = string.Join('_', propPath.Where(s => !string.IsNullOrEmpty(s)));
-                if (fields.TryGetValue(fullName, out var f) && !f.Constant)
-                    f.Value = prop.Value.Value<string>();
-            }
-        }
-    }
+    
 
 
 }

BTCPayServer.Abstractions/Services/Safe.cs

@@ -1,5 +1,5 @@
 using System.Web;
-using Ganss.XSS;
+using Ganss.Xss;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 

BTCPayServer.Abstractions/TagHelpers/PermissionTagHelper.cs

@@ -2,12 +2,13 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.Extensions.Logging;
+using System;
+using System.Linq;
 
 namespace BTCPayServer.Abstractions.TagHelpers;
 
 [HtmlTargetElement(Attributes = "[permission]")]
-[HtmlTargetElement(Attributes = "[not-permission]"  )]
+[HtmlTargetElement(Attributes = "[not-permission]")]
 public class PermissionTagHelper : TagHelper
 {
     private readonly IAuthorizationService _authorizationService;
@@ -22,29 +23,72 @@ public class PermissionTagHelper : TagHelper
     public string Permission { get; set; }
     public string NotPermission { get; set; }
     public string PermissionResource { get; set; }
-    
+    public bool AndMode { get; set; } = false;
 
     public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
     {
-        if (string.IsNullOrEmpty(Permission) && string.IsNullOrEmpty(NotPermission))
+        var permissions = Permission?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+        var notPermissions = NotPermission?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
+
+        if (!permissions.Any() && !notPermissions.Any())
             return;
         if (_httpContextAccessor.HttpContext is null)
             return;
 
-        var expectedResult = !string.IsNullOrEmpty(Permission);
-        var key = $"{Permission??NotPermission}_{PermissionResource}";
-        if (!_httpContextAccessor.HttpContext.Items.TryGetValue(key, out var o) ||
-            o is not AuthorizationResult res)
+        bool shouldRender = true; // Assume tag should be rendered unless a check fails
+
+        // Process 'Permission' - User must have these permissions
+        if (permissions.Any())
         {
-            res = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User,
-                PermissionResource,
-                Permission);
-            _httpContextAccessor.HttpContext.Items.Add(key, res);
+            bool finalResult = AndMode;
+            foreach (var perm in permissions)
+            {
+                var key = $"{perm}_{PermissionResource}";
+                AuthorizationResult res = await GetOrAddAuthorizationResult(key, perm);
+
+                if (AndMode)
+                    finalResult &= res.Succeeded;
+                else
+                    finalResult |= res.Succeeded;
+
+                if (!AndMode && finalResult) break;
+            }
+
+            shouldRender = finalResult;
         }
-        if (expectedResult != res.Succeeded)
+
+        // Process 'NotPermission' - User must not have these permissions
+        if (shouldRender && notPermissions.Any())
+        {
+            foreach (var notPerm in notPermissions)
+            {
+                var key = $"{notPerm}_{PermissionResource}";
+                AuthorizationResult res = await GetOrAddAuthorizationResult(key, notPerm);
+
+                if (res.Succeeded) // If the user has a 'NotPermission', they should not see the tag
+                {
+                    shouldRender = false;
+                    break;
+                }
+            }
+        }
+
+        if (!shouldRender)
         {
             output.SuppressOutput();
         }
+    }
 
+    private async Task<AuthorizationResult> GetOrAddAuthorizationResult(string key, string permission)
+    {
+        if (!_httpContextAccessor.HttpContext.Items.TryGetValue(key, out var cachedResult))
+        {
+            var res = await _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext.User,
+                PermissionResource, permission);
+            _httpContextAccessor.HttpContext.Items[key] = res;
+            return res;
+        }
+
+        return cachedResult as AuthorizationResult;
     }
 }

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -16,7 +16,7 @@
         <Platforms>AnyCPU</Platforms>
     </PropertyGroup>
   <PropertyGroup>
-    <Version Condition=" '$(Version)' == '' ">1.7.2</Version>
+    <Version Condition=" '$(Version)' == '' ">1.7.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -30,9 +30,9 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.3.21" />
-      <PackageReference Include="NBitcoin" Version="7.0.24" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.1" />
+      <PackageReference Include="NBitcoin" Version="7.0.32" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -20,6 +20,12 @@ namespace BTCPayServer.Client
             return await HandleResponse<PullPaymentData>(response);
         }
 
+        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<PullPaymentData[]> GetPullPayments(string storeId, bool includeArchived = false, CancellationToken cancellationToken = default)
         {
             Dictionary<string, object> query = new Dictionary<string, object>();

BTCPayServer.Client/Models/CreateAppRequest.cs

@@ -28,6 +28,8 @@ namespace BTCPayServer.Client.Models
         public PosViewType DefaultView { get; set; }
         public bool ShowCustomAmount { get; set; } = false;
         public bool ShowDiscount { get; set; } = true;
+        public bool ShowSearch { get; set; } = true;
+        public bool ShowCategories { get; set; } = true;
         public bool EnableTips { get; set; } = true;
         public string CustomAmountPayButtonText { get; set; } = null;
         public string FixedAmountPayButtonText { get; set; } = null;
@@ -37,9 +39,9 @@ namespace BTCPayServer.Client.Models
         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 CheckoutType? CheckoutType { get; set; } = null;
     }
 
     public enum CrowdfundResetEvery
@@ -78,6 +80,7 @@ namespace BTCPayServer.Client.Models
         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/InvoiceExceptionStatus.cs

@@ -1,12 +1,12 @@
-namespace BTCPayServer.Client.Models
+namespace BTCPayServer.Client.Models;
+public enum InvoiceExceptionStatus
 {
-    public enum InvoiceExceptionStatus
-    {
-        None,
-        PaidLate,
-        PaidPartial,
-        Marked,
-        Invalid,
-        PaidOver
-    }
+    None,
+    PaidLate,
+    PaidPartial,
+    Marked,
+    Invalid,
+    PaidOver
 }
+
+

BTCPayServer.Client/Models/LNURLPayPaymentMethodBaseData.cs

@@ -1,8 +1,12 @@
+using Newtonsoft.Json;
+
 namespace BTCPayServer.Client.Models
 {
     public class LNURLPayPaymentMethodBaseData
     {
         public bool UseBech32Scheme { get; set; }
+        
+        [JsonProperty("lud12Enabled")]
         public bool LUD12Enabled { get; set; }
 
         public LNURLPayPaymentMethodBaseData()

BTCPayServer.Client/Models/LNURLPayPaymentMethodData.cs

@@ -16,11 +16,12 @@ namespace BTCPayServer.Client.Models
         {
         }
 
-        public LNURLPayPaymentMethodData(string cryptoCode, bool enabled, bool useBech32Scheme)
+        public LNURLPayPaymentMethodData(string cryptoCode, bool enabled, bool useBech32Scheme, bool lud12Enabled)
         {
             Enabled = enabled;
             CryptoCode = cryptoCode;
             UseBech32Scheme = useBech32Scheme;
+            LUD12Enabled = lud12Enabled;
         }
     }
 }

BTCPayServer.Client/Models/PaymentRequestData.cs

@@ -7,7 +7,7 @@ namespace BTCPayServer.Client.Models
     public class PaymentRequestData : PaymentRequestBaseData
     {
         [JsonConverter(typeof(StringEnumConverter))]
-        public PaymentRequestData.PaymentRequestStatus Status { get; set; }
+        public PaymentRequestStatus Status { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset CreatedTime { get; set; }
         public string Id { get; set; }
@@ -16,7 +16,8 @@ namespace BTCPayServer.Client.Models
         {
             Pending = 0,
             Completed = 1,
-            Expired = 2
+            Expired = 2,
+            Processing = 3
         }
     }
 }

BTCPayServer.Client/Models/PointOfSaleAppData.cs

@@ -9,6 +9,8 @@ namespace BTCPayServer.Client.Models
         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; }
     }
@@ -19,6 +21,8 @@ namespace BTCPayServer.Client.Models
         public string DefaultView { 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; }

BTCPayServer.Client/Models/RegisterBoltcardRequest.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NBitcoin.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public enum OnExistingBehavior
+    {
+        KeepVersion,
+        UpdateVersion
+    }
+    public class RegisterBoltcardRequest
+    {
+        [JsonConverter(typeof(HexJsonConverter))]
+        [JsonProperty("UID")]
+        public byte[] UID { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public OnExistingBehavior? OnExisting { get; set; }
+    }
+    public class RegisterBoltcardResponse
+    {
+        [JsonProperty("LNURLW")]
+        public string LNURLW { get; set; }
+        public int Version { get; set; }
+        [JsonProperty("K0")]
+        public string K0 { get; set; }
+        [JsonProperty("K1")]
+        public string K1 { get; set; }
+        [JsonProperty("K2")]
+        public string K2 { get; set; }
+        [JsonProperty("K3")]
+        public string K3 { get; set; }
+        [JsonProperty("K4")]
+        public string K4 { get; set; }
+    }
+}

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -37,14 +37,20 @@ namespace BTCPayServer.Client.Models
         public bool AnyoneCanCreateInvoice { get; set; }
         public string DefaultCurrency { get; set; }
         public bool RequiresRefundEmail { get; set; }
+
         [JsonConverter(typeof(StringEnumConverter))]
-        public CheckoutType CheckoutType { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public CheckoutType? CheckoutType { get; set; }
+
         public bool LightningAmountInSatoshi { get; set; }
         public bool LightningPrivateRouteHints { get; set; }
         public bool OnChainWithLnInvoiceFallback { get; set; }
         public bool LazyPaymentMethods { get; set; }
         public bool RedirectAutomatically { get; set; }
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool Archived { get; set; }
+
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public bool ShowRecommendedFee { get; set; } = true;
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
@@ -70,6 +76,17 @@ namespace BTCPayServer.Client.Models
 
         public bool PayJoinEnabled { get; set; }
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? AutoDetectLanguage { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? ShowPayInWalletButton { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? ShowStoreHeader { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? CelebratePayment { get; set; }
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public bool? PlaySoundOnPayment { get; set; }
+
         public InvoiceData.ReceiptOptions Receipt { get; set; }
 
 

BTCPayServer.Client/Models/StoreWebhookData.cs

@@ -11,8 +11,7 @@ namespace BTCPayServer.Client.Models
         {
             public bool Everything { get; set; } = true;
 
-            [JsonProperty(ItemConverterType = typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-            public WebhookEventType[] SpecificEvents { get; set; } = Array.Empty<WebhookEventType>();
+            public string[] SpecificEvents { get; set; } = Array.Empty<string>();
         }
 
         public bool Enabled { get; set; } = true;

BTCPayServer.Client/Models/WebhookEvent.cs

@@ -9,7 +9,7 @@ namespace BTCPayServer.Client.Models
 {
     public class WebhookEvent
     {
-        public readonly static JsonSerializerSettings DefaultSerializerSettings;
+        public static readonly JsonSerializerSettings DefaultSerializerSettings;
         static WebhookEvent()
         {
             DefaultSerializerSettings = new JsonSerializerSettings();
@@ -45,8 +45,7 @@ namespace BTCPayServer.Client.Models
             }
         }
         public bool IsRedelivery { get; set; }
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookEventType Type { get; set; }
+        public string Type { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset Timestamp { get; set; }
         [JsonExtensionData]

BTCPayServer.Client/Models/WebhookEventType.cs

@@ -1,13 +1,20 @@
-namespace BTCPayServer.Client.Models
+namespace BTCPayServer.Client.Models;
+
+public static class WebhookEventType
 {
-    public enum WebhookEventType
-    {
-        InvoiceCreated,
-        InvoiceReceivedPayment,
-        InvoiceProcessing,
-        InvoiceExpired,
-        InvoiceSettled,
-        InvoiceInvalid,
-        InvoicePaymentSettled,
-    }
+    public const string InvoiceCreated = nameof(InvoiceCreated);
+    public const string InvoiceReceivedPayment = nameof(InvoiceReceivedPayment);
+    public const string InvoiceProcessing = nameof(InvoiceProcessing);
+    public const string InvoiceExpired = nameof(InvoiceExpired);
+    public const string InvoiceSettled = nameof(InvoiceSettled);
+    public const string InvoiceInvalid = nameof(InvoiceInvalid);
+    public const string InvoicePaymentSettled = nameof(InvoicePaymentSettled);
+    public const string PayoutCreated = nameof(PayoutCreated);
+    public const string PayoutApproved = nameof(PayoutApproved);
+    public const string PayoutUpdated = nameof(PayoutUpdated);
+    public const string PaymentRequestUpdated = nameof(PaymentRequestUpdated);
+    public const string PaymentRequestCreated = nameof(PaymentRequestCreated);
+    public const string PaymentRequestArchived = nameof(PaymentRequestArchived);
+    public const string PaymentRequestStatusChanged = nameof(PaymentRequestStatusChanged);
+    
 }

BTCPayServer.Client/Models/WebhookInvoiceEvent.cs

@@ -1,44 +1,74 @@
+using System;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Client.Models
 {
-    public class WebhookInvoiceEvent : WebhookEvent
+    public class WebhookPayoutEvent : StoreWebhookEvent
+    {
+        public WebhookPayoutEvent(string evtType, string storeId)
+        {
+            if (!evtType.StartsWith("payout", StringComparison.InvariantCultureIgnoreCase))
+                throw new ArgumentException("Invalid event type", nameof(evtType));
+            Type = evtType;
+            StoreId = storeId;
+        }
+
+        [JsonProperty(Order = 2)] public string PayoutId { get; set; }
+        [JsonProperty(Order = 3)] public string PullPaymentId { get; set; }
+        [JsonProperty(Order = 4)] [JsonConverter(typeof(StringEnumConverter))]public PayoutState PayoutState { get; set; }
+    } 
+    public class WebhookPaymentRequestEvent : StoreWebhookEvent
+    {
+        public WebhookPaymentRequestEvent(string evtType, string storeId)
+        {
+            if (!evtType.StartsWith("paymentrequest", StringComparison.InvariantCultureIgnoreCase))
+                throw new ArgumentException("Invalid event type", nameof(evtType));
+            Type = evtType;
+            StoreId = storeId;
+        }
+
+        [JsonProperty(Order = 2)] public string PaymentRequestId { get; set; }
+        [JsonProperty(Order = 3)] [JsonConverter(typeof(StringEnumConverter))]public PaymentRequestData.PaymentRequestStatus Status { get; set; }
+    }
+    
+    public abstract class StoreWebhookEvent : WebhookEvent
+    {
+        [JsonProperty(Order = 1)] public string StoreId { get; set; }
+    }
+    
+    public class WebhookInvoiceEvent : StoreWebhookEvent
     {
         public WebhookInvoiceEvent()
         {
         }
 
-        public WebhookInvoiceEvent(WebhookEventType evtType)
-        {
-            this.Type = evtType;
+        public WebhookInvoiceEvent(string evtType, string storeId)
+        { 
+            if (!evtType.StartsWith("invoice", StringComparison.InvariantCultureIgnoreCase))
+                throw new ArgumentException("Invalid event type", nameof(evtType));
+            Type = evtType;
+            StoreId = storeId;
         }
 
-        [JsonProperty(Order = 1)] public string StoreId { get; set; }
         [JsonProperty(Order = 2)] public string InvoiceId { get; set; }
         [JsonProperty(Order = 3)] public JObject Metadata { get; set; }
     }
 
     public class WebhookInvoiceSettledEvent : WebhookInvoiceEvent
     {
-        public WebhookInvoiceSettledEvent()
-        {
-        }
-
-        public WebhookInvoiceSettledEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoiceSettledEvent(string storeId) : base(WebhookEventType.InvoiceSettled, storeId)
         {
         }
 
         public bool ManuallyMarked { get; set; }
+        public bool OverPaid { get; set; }
     }
 
     public class WebhookInvoiceInvalidEvent : WebhookInvoiceEvent
     {
-        public WebhookInvoiceInvalidEvent()
-        {
-        }
-
-        public WebhookInvoiceInvalidEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoiceInvalidEvent(string storeId) : base(WebhookEventType.InvoiceInvalid, storeId)
         {
         }
 
@@ -47,11 +77,7 @@ namespace BTCPayServer.Client.Models
 
     public class WebhookInvoiceProcessingEvent : WebhookInvoiceEvent
     {
-        public WebhookInvoiceProcessingEvent()
-        {
-        }
-
-        public WebhookInvoiceProcessingEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoiceProcessingEvent(string storeId) : base(WebhookEventType.InvoiceProcessing, storeId)
         {
         }
 
@@ -60,38 +86,25 @@ namespace BTCPayServer.Client.Models
 
     public class WebhookInvoiceReceivedPaymentEvent : WebhookInvoiceEvent
     {
-        public WebhookInvoiceReceivedPaymentEvent()
-        {
-        }
-
-        public WebhookInvoiceReceivedPaymentEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoiceReceivedPaymentEvent(string type, string storeId) : base(type, storeId)
         {
         }
 
         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
     {
-        public WebhookInvoicePaymentSettledEvent()
-        {
-        }
-
-        public WebhookInvoicePaymentSettledEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoicePaymentSettledEvent(string storeId) : base(WebhookEventType.InvoicePaymentSettled, storeId)
         {
         }
     }
 
     public class WebhookInvoiceExpiredEvent : WebhookInvoiceEvent
     {
-        public WebhookInvoiceExpiredEvent()
-        {
-        }
-
-        public WebhookInvoiceExpiredEvent(WebhookEventType evtType) : base(evtType)
+        public WebhookInvoiceExpiredEvent(string storeId) : base(WebhookEventType.InvoiceExpired, storeId)
         {
         }
 

BTCPayServer.Client/Permissions.cs

@@ -19,6 +19,7 @@ namespace BTCPayServer.Client
         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";
         public const string CanViewInvoices = "btcpay.store.canviewinvoices";
         public const string CanCreateInvoice = "btcpay.store.cancreateinvoice";
         public const string CanModifyInvoices = "btcpay.store.canmodifyinvoices";
@@ -33,7 +34,11 @@ namespace BTCPayServer.Client
         public const string CanManageUsers = "btcpay.server.canmanageusers";
         public const string CanDeleteUser = "btcpay.user.candeleteuser";
         public const string CanManagePullPayments = "btcpay.store.canmanagepullpayments";
+        public const string CanArchivePullPayments = "btcpay.store.canarchivepullpayments";
+        public const string CanManagePayouts = "btcpay.store.canmanagepayouts";
+        public const string CanViewPayouts = "btcpay.store.canviewpayouts";
         public const string CanCreatePullPayments = "btcpay.store.cancreatepullpayments";
+        public const string CanViewPullPayments = "btcpay.store.canviewpullpayments";
         public const string CanCreateNonApprovedPullPayments = "btcpay.store.cancreatenonapprovedpullpayments";
         public const string CanViewCustodianAccounts = "btcpay.store.canviewcustodianaccounts";
         public const string CanManageCustodianAccounts = "btcpay.store.canmanagecustodianaccounts";
@@ -52,6 +57,7 @@ namespace BTCPayServer.Client
                 yield return CanModifyServerSettings;
                 yield return CanModifyStoreSettings;
                 yield return CanViewStoreSettings;
+                yield return CanViewReports;
                 yield return CanViewPaymentRequests;
                 yield return CanModifyPaymentRequests;
                 yield return CanModifyProfile;
@@ -69,7 +75,9 @@ namespace BTCPayServer.Client
                 yield return CanViewLightningInvoiceInStore;
                 yield return CanCreateLightningInvoiceInStore;
                 yield return CanManagePullPayments;
+                yield return CanArchivePullPayments;
                 yield return CanCreatePullPayments;
+                yield return CanViewPullPayments;
                 yield return CanCreateNonApprovedPullPayments;
                 yield return CanViewCustodianAccounts;
                 yield return CanManageCustodianAccounts;
@@ -77,6 +85,8 @@ namespace BTCPayServer.Client
                 yield return CanWithdrawFromCustodianAccounts;
                 yield return CanTradeCustodianAccount;
                 yield return CanManageUsers;
+                yield return CanManagePayouts;
+                yield return CanViewPayouts;
             }
         }
         public static bool IsValidPolicy(string policy)
@@ -250,11 +260,13 @@ namespace BTCPayServer.Client
                 Policies.CanViewStoreSettings,
                 Policies.CanModifyStoreWebhooks,
                 Policies.CanModifyPaymentRequests,
+                Policies.CanManagePayouts,
                 Policies.CanUseLightningNodeInStore);
 
             PolicyHasChild(policyMap,Policies.CanManageUsers, Policies.CanCreateUser);
-            PolicyHasChild(policyMap,Policies.CanManagePullPayments, Policies.CanCreatePullPayments);
+            PolicyHasChild(policyMap,Policies.CanManagePullPayments, Policies.CanCreatePullPayments, Policies.CanArchivePullPayments);
             PolicyHasChild(policyMap,Policies.CanCreatePullPayments, Policies.CanCreateNonApprovedPullPayments);
+            PolicyHasChild(policyMap, Policies.CanCreateNonApprovedPullPayments, Policies.CanViewPullPayments);
             PolicyHasChild(policyMap,Policies.CanModifyPaymentRequests, Policies.CanViewPaymentRequests);
             PolicyHasChild(policyMap,Policies.CanModifyProfile, Policies.CanViewProfile);
             PolicyHasChild(policyMap,Policies.CanUseLightningNodeInStore, Policies.CanViewLightningInvoiceInStore, Policies.CanCreateLightningInvoiceInStore);
@@ -265,7 +277,8 @@ namespace BTCPayServer.Client
             PolicyHasChild(policyMap, Policies.CanUseInternalLightningNode, Policies.CanCreateLightningInvoiceInternalNode, Policies.CanViewLightningInvoiceInternalNode);
             PolicyHasChild(policyMap, Policies.CanManageCustodianAccounts, Policies.CanViewCustodianAccounts);
             PolicyHasChild(policyMap, Policies.CanModifyInvoices, Policies.CanViewInvoices, Policies.CanCreateInvoice, Policies.CanCreateLightningInvoiceInStore);
-            PolicyHasChild(policyMap, Policies.CanViewStoreSettings, Policies.CanViewInvoices, Policies.CanViewPaymentRequests);
+            PolicyHasChild(policyMap, Policies.CanViewStoreSettings, Policies.CanViewInvoices, Policies.CanViewPaymentRequests, Policies.CanViewReports, Policies.CanViewPullPayments, Policies.CanViewPayouts);
+            PolicyHasChild(policyMap, Policies.CanManagePayouts, Policies.CanViewPayouts);
 
             var missingPolicies = Policies.AllPolicies.ToHashSet();
             //recurse through the tree to see which policies are not included in the tree

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Althash.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitAlthash()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("HTML");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Htmlcoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.htmlcoin.com/api/tx/{0}" : "https://explorer.htmlcoin.com/api/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "HTML_X = HTML_USD",
-                                "HTML_USD = hitbtc(HTML_USD)"
-                },
-                CryptoImagePath = "imlegacy/althash.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("172'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Argoneum.cs

@@ -1,30 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitArgoneum()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("AGM");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Argoneum",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://chainz.cryptoid.info/agm/tx.dws?{0}"
-                    : "https://chainz.cryptoid.info/agm-test/tx.dws?{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                    {
-                        "AGM_X = AGM_BTC * BTC_X",
-                        "AGM_BTC = argoneum(AGM_BTC)"
-                    },
-                CryptoImagePath = "imlegacy/argoneum.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("421'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BGold.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitBGold()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("BTG");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "BGold",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://btgexplorer.com/tx/{0}" : "https://testnet.btgexplorer.com/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                    "BTG_X = BTG_BTC * BTC_X",
-                    "BTG_BTC = gate(BTG_BTC)",
-                },
-                CryptoImagePath = "imlegacy/btg.svg",
-                LightningImagePath = "imlegacy/btg-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("156'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BPlus.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitBPlus()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("XBC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "BPlus",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                    "XBC_X = XBC_BTC * BTC_X",
-                    "XBC_BTC = cryptopia(XBC_BTC)"
-                },
-                CryptoImagePath = "imlegacy/xbc.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("65'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -1,29 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitBitcore()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("BTX");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "BitCore",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.bitcore.cc/tx/{0}" : "https://explorer.bitcore.cc/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "BTX_X = BTX_BTC * BTC_X",
-                                "BTX_BTC = graviex(BTX_BTC)"
-                },
-                CryptoImagePath = "imlegacy/bitcore.svg",
-                LightningImagePath = "imlegacy/bitcore-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("160'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dash.cs

@@ -1,32 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitDash()
-        {
-            //not needed: NBitcoin.Altcoins.Dash.Instance.EnsureRegistered();
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("DASH");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Dash",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://insight.dash.org/insight/tx/{0}"
-                    : "https://testnet-insight.dashevo.org/insight/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                    {
-                        "DASH_X = DASH_BTC * BTC_X",
-                        "DASH_BTC = bitfinex(DSH_BTC)"
-                    },
-                CryptoImagePath = "imlegacy/dash.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("5'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitDogecoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("DOGE");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Dogecoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "DOGE_X = DOGE_BTC * BTC_X",
-                                "DOGE_BTC = bittrex(DOGE_BTC)"
-                },
-                CryptoImagePath = "imlegacy/dogecoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitFeathercoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("FTC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Feathercoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "FTC_X = FTC_BTC * BTC_X",
-                                "FTC_BTC = bittrex(FTC_BTC)"
-                },
-                CryptoImagePath = "imlegacy/feathercoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("8'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -1,33 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitGroestlcoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("GRS");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Groestlcoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm"
-                    : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                    "GRS_X = GRS_BTC * BTC_X",
-                    "GRS_BTC = bittrex(GRS_BTC)"
-                },
-                CryptoImagePath = "imlegacy/groestlcoin.png",
-                LightningImagePath = "imlegacy/groestlcoin-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("17'") : new KeyPath("1'"),
-                SupportRBF = true,
-                SupportPayJoin = true,
-                VaultSupported = true
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitLitecoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LTC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Litecoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://live.blockcypher.com/ltc/tx/{0}/"
-                    : "http://explorer.litecointools.com/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                    "LTC_X = LTC_BTC * BTC_X",
-                    "LTC_BTC = coingecko(LTC_BTC)"
-                },
-                CryptoImagePath = "imlegacy/litecoin.svg",
-                LightningImagePath = "imlegacy/litecoin-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("2'") : new KeyPath("1'"),
-                //https://github.com/pooler/electrum-ltc/blob/0d6989a9d2fb2edbea421c116e49d1015c7c5a91/electrum_ltc/constants.py
-                ElectrumMapping = NetworkType == ChainName.Mainnet
-                    ? new Dictionary<uint, DerivationType>()
-                    {
-                        {0x0488b21eU, DerivationType.Legacy },
-                        {0x049d7cb2U, DerivationType.SegwitP2SH },
-                        {0x04b24746U, DerivationType.Segwit },
-                    }
-                    : new Dictionary<uint, DerivationType>()
-                    {
-                        {0x043587cfU, DerivationType.Legacy },
-                        {0x044a5262U, DerivationType.SegwitP2SH },
-                        {0x045f1cf6U, DerivationType.Segwit }
-                    }
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -1,29 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitMonacoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("MONA");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                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,
-                DefaultRateRules = new[]
-                {
-                                "MONA_X = MONA_BTC * BTC_X",
-                                "MONA_BTC = bittrex(MONA_BTC)"
-                },
-                CryptoImagePath = "imlegacy/monacoin.png",
-                LightningImagePath = "imlegacy/mona-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("22'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitPolis()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("POLIS");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Polis",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://blockbook.polispay.org/tx/{0}" : "https://blockbook.polispay.org/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "POLIS_X = POLIS_BTC * BTC_X",
-                                "POLIS_BTC = polispay(POLIS_BTC)"
-                },
-                CryptoImagePath = "imlegacy/polis.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1997'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitUfo()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("UFO");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Ufo",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "UFO_X = UFO_BTC * BTC_X",
-                                "UFO_BTC = coinexchange(UFO_BTC)"
-                },
-                CryptoImagePath = "imlegacy/ufo.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("202'") : new KeyPath("1'")
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitViacoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("VIA");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Viacoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://explorer.viacoin.org/tx/{0}" : "https://explorer.viacoin.org/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                {
-                                "VIA_X = VIA_BTC * BTC_X",
-                                "VIA_BTC = bittrex(VIA_BTC)"
-                },
-                CryptoImagePath = "imlegacy/viacoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("14'") : new KeyPath("1'")
-            });
-        }
-    }
-}

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

@@ -1,37 +0,0 @@
-#if ALTCOINS
-using NBitcoin;
-using NBitcoin.Altcoins;
-using NBitcoin.Altcoins.Elements;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitLiquid()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
-            Add(new ElementsBTCPayNetwork()
-            {
-                AssetId = NetworkType == ChainName.Mainnet ? ElementsParams<Liquid>.PeggedAssetId : ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
-                CryptoCode = "LBTC",
-                NetworkCryptoCode = "LBTC",
-                DisplayName = "Liquid Bitcoin",
-                DefaultRateRules = new[]
-                {
-                    "LBTC_X = LBTC_BTC * BTC_X",
-                    "LBTC_BTC = 1",
-                },
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                CryptoImagePath = "imlegacy/liquid.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
-                SupportRBF = true
-            });
-        }
-    }
-
-
-}
-#endif

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

@@ -1,83 +0,0 @@
-#if ALTCOINS
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitLiquidAssets()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
-            Add(new ElementsBTCPayNetwork()
-            {
-                CryptoCode = "USDt",
-                NetworkCryptoCode = "LBTC",
-                ShowSyncSummary = false,
-                DefaultRateRules = new[]
-                {
-                    "USDT_UST = 1",
-                    "USDT_X = USDT_BTC * BTC_X",
-                    "USDT_BTC = bitfinex(UST_BTC)",
-                },
-                AssetId = new uint256("ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2"),
-                DisplayName = "Liquid Tether",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                CryptoImagePath = "imlegacy/liquid-tether.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
-                SupportRBF = true,
-                SupportLightning = false
-            });
-
-            Add(new ElementsBTCPayNetwork()
-            {
-                CryptoCode = "ETB",
-                NetworkCryptoCode = "LBTC",
-                ShowSyncSummary = false,
-                DefaultRateRules = new[]
-                {
-
-                    "ETB_X = ETB_BTC * BTC_X",
-                    "ETB_BTC = bitpay(ETB_BTC)"
-                },
-                Divisibility = 2,
-                AssetId = new uint256("aa775044c32a7df391902b3659f46dfe004ccb2644ce2ddc7dba31e889391caf"),
-                DisplayName = "Ethiopian Birr",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                CryptoImagePath = "imlegacy/etb.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
-                SupportRBF = true,
-                SupportLightning = false
-            });
-
-            Add(new ElementsBTCPayNetwork()
-            {
-                CryptoCode = "LCAD",
-                NetworkCryptoCode = "LBTC",
-                ShowSyncSummary = false,
-                DefaultRateRules = new[]
-              {
-                    "LCAD_CAD = 1",
-                    "LCAD_X = CAD_BTC * BTC_X",
-                    "LCAD_BTC = bylls(CAD_BTC)",
-                    "CAD_BTC = LCAD_BTC"
-                },
-                AssetId = new uint256("0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a"),
-                DisplayName = "Liquid CAD",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://liquid.network/tx/{0}" : "https://liquid.network/testnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                CryptoImagePath = "imlegacy/lcad.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
-                SupportRBF = true,
-                SupportLightning = false
-            });
-        }
-    }
-
-
-}
-#endif

BTCPayServer.Common/Altcoins/Liquid/ElementsLikeBtcPayNetwork.cs

@@ -1,50 +0,0 @@
-#if ALTCOINS
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using BTCPayServer.Common;
-using NBitcoin;
-using NBXplorer;
-using NBXplorer.Models;
-
-namespace BTCPayServer
-{
-    public class ElementsBTCPayNetwork : BTCPayNetwork
-    {
-        public string NetworkCryptoCode { get; set; }
-        public uint256 AssetId { get; set; }
-        public override bool ReadonlyWallet { get; set; } = true;
-
-        public override IEnumerable<(MatchedOutput matchedOutput, OutPoint outPoint)> GetValidOutputs(
-            NewTransactionEvent evtOutputs)
-        {
-            return evtOutputs.Outputs.Where(output =>
-                output.Value is AssetMoney assetMoney && assetMoney.AssetId == AssetId).Select(output =>
-            {
-                var outpoint = new OutPoint(evtOutputs.TransactionData.TransactionHash, output.Index);
-                return (output, outpoint);
-            });
-        }
-
-        public override List<TransactionInformation> FilterValidTransactions(List<TransactionInformation> transactionInformationSet)
-        {
-            return transactionInformationSet.FindAll(information =>
-                information.Outputs.Any(output =>
-                    output.Value is AssetMoney assetMoney && assetMoney.AssetId == AssetId) ||
-                information.Inputs.Any(output =>
-                    output.Value is AssetMoney assetMoney && assetMoney.AssetId == AssetId));
-        }
-
-        public override PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, decimal? cryptoInfoDue)
-        {
-            //precision 0: 10 = 0.00000010
-            //precision 2: 10 = 0.00001000
-            //precision 8: 10 = 10
-            var money = cryptoInfoDue / (decimal)Math.Pow(10, 8 - Divisibility);
-            var builder = base.GenerateBIP21(cryptoInfoAddress, money);
-            builder.QueryParams.Add("assetid", AssetId.ToString());
-            return builder;
-        }
-    }
-}
-#endif

BTCPayServer.Common/Altcoins/Liquid/LiquidExtensions.cs

@@ -1,18 +0,0 @@
-#if ALTCOINS
-using System.Collections.Generic;
-using System.Linq;
-
-namespace BTCPayServer
-{
-    public static class LiquidExtensions
-    {
-        public static IEnumerable<string> GetAllElementsSubChains(this BTCPayNetworkProvider networkProvider, BTCPayNetworkProvider unfiltered)
-        {
-            var elementsBased = networkProvider.GetAll().OfType<ElementsBTCPayNetwork>();
-            var parentChains = elementsBased.Select(network => network.NetworkCryptoCode.ToUpperInvariant()).Distinct();
-            return unfiltered.GetAll().OfType<ElementsBTCPayNetwork>()
-                .Where(network => parentChains.Contains(network.NetworkCryptoCode)).Select(network => network.CryptoCode.ToUpperInvariant());
-        }
-    }
-}
-#endif

BTCPayServer.Common/Altcoins/Monero/BTCPayNetworkProvider.Monero.cs

@@ -1,28 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitMonero()
-        {
-            Add(new MoneroLikeSpecificBtcPayNetwork()
-            {
-                CryptoCode = "XMR",
-                DisplayName = "Monero",
-                Divisibility = 12,
-                BlockExplorerLink =
-                    NetworkType == ChainName.Mainnet
-                        ? "https://www.exploremonero.com/transaction/{0}"
-                        : "https://testnet.xmrchain.net/tx/{0}",
-                DefaultRateRules = new[]
-                {
-                    "XMR_X = XMR_BTC * BTC_X",
-                    "XMR_BTC = kraken(XMR_BTC)"
-                },
-                CryptoImagePath = "/imlegacy/monero.svg",
-                UriScheme = "monero"
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/Monero/MoneroLikeSpecificBtcPayNetwork.cs

@@ -1,8 +0,0 @@
-namespace BTCPayServer
-{
-    public class MoneroLikeSpecificBtcPayNetwork : BTCPayNetworkBase
-    {
-        public int MaxTrackedConfirmation = 10;
-        public string UriScheme { get; set; }
-    }
-}

BTCPayServer.Common/Altcoins/Zcash/BTCPayNetworkProvider.Zcash.cs

@@ -1,29 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        // Change this if you want another zcash coin
-        public void InitZcash()
-        {
-            Add(new ZcashLikeSpecificBtcPayNetwork()
-            {
-                CryptoCode = "ZEC",
-                DisplayName = "Zcash",
-                Divisibility = 8,
-                BlockExplorerLink =
-                    NetworkType == ChainName.Mainnet
-                        ? "https://www.exploreZcash.com/transaction/{0}"
-                        : "https://testnet.xmrchain.net/tx/{0}",
-                DefaultRateRules = new[]
-                {
-                    "ZEC_X = ZEC_BTC * BTC_X",
-                    "ZEC_BTC = kraken(ZEC_BTC)"
-                },
-                CryptoImagePath = "/imlegacy/zcash.png",
-                UriScheme = "zcash"
-            });
-        }
-    }
-}

BTCPayServer.Common/Altcoins/Zcash/ZcashLikeSpecificBtcPayNetwork.cs

@@ -1,8 +0,0 @@
-namespace BTCPayServer
-{
-    public class ZcashLikeSpecificBtcPayNetwork : BTCPayNetworkBase
-    {
-        public int MaxTrackedConfirmation = 10;
-        public string UriScheme { get; set; }
-    }
-}

BTCPayServer.Common/BTCPayNetwork.cs

@@ -4,6 +4,8 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using BTCPayServer.Common;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.DependencyInjection;
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
@@ -62,6 +64,31 @@ namespace BTCPayServer
         public KeyPath CoinType { get; set; }
 
         public Dictionary<uint, DerivationType> ElectrumMapping = new Dictionary<uint, DerivationType>();
+        public BTCPayNetwork SetDefaultElectrumMapping(ChainName chainName)
+        {
+            //https://github.com/spesmilo/electrum/blob/11733d6bc271646a00b69ff07657119598874da4/electrum/constants.py
+            ElectrumMapping = chainName == ChainName.Mainnet
+                    ? new Dictionary<uint, DerivationType>()
+                    {
+                        {0x0488b21eU, DerivationType.Legacy }, // xpub
+                        {0x049d7cb2U, DerivationType.SegwitP2SH }, // ypub
+                        {0x04b24746U, DerivationType.Segwit }, //zpub
+                    }
+                    : new Dictionary<uint, DerivationType>()
+                    {
+                        {0x043587cfU, DerivationType.Legacy}, // tpub
+                        {0x044a5262U, DerivationType.SegwitP2SH}, // upub
+                        {0x045f1cf6U, DerivationType.Segwit} // vpub
+                    };
+            if (!NBitcoinNetwork.Consensus.SupportSegwit)
+            {
+                ElectrumMapping =
+                    ElectrumMapping
+                    .Where(kv => kv.Value == DerivationType.Legacy)
+                    .ToDictionary(k => k.Key, k => k.Value);
+            }
+            return this;
+        }
 
         public virtual bool WalletSupported { get; set; } = true;
         public virtual bool ReadonlyWallet { get; set; } = false;
@@ -107,25 +134,8 @@ namespace BTCPayServer
 
     public abstract class BTCPayNetworkBase
     {
-        private string _blockExplorerLink;
         public bool ShowSyncSummary { get; set; } = true;
         public string CryptoCode { get; set; }
-
-        public string BlockExplorerLink
-        {
-            get => _blockExplorerLink;
-            set
-            {
-                if (string.IsNullOrEmpty(BlockExplorerLinkDefault))
-                {
-                    BlockExplorerLinkDefault = value;
-                }
-
-                _blockExplorerLink = value;
-            }
-        }
-
-        public string BlockExplorerLinkDefault { get; set; }
         public string DisplayName { get; set; }
         public int Divisibility { get; set; } = 8;
         public bool IsBTC
@@ -153,5 +163,8 @@ namespace BTCPayServer
         {
             return NBitcoin.JsonConverters.Serializer.ToString(obj, null);
         }
+        
+        [Obsolete("Use TransactionLinkProviders service instead")]
+        public string BlockExplorerLink { get; set; }
     }
 }

BTCPayServer.Common/BTCPayNetworkProvider.Bitcoin.cs

@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using NBitcoin;
-using NBXplorer;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitBitcoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("BTC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Bitcoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet ? "https://mempool.space/tx/{0}" :
-                                    NetworkType == Bitcoin.Instance.Signet.ChainName ? "https://mempool.space/signet/tx/{0}"
-                                    : "https://mempool.space/testnet/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                CryptoImagePath = "imlegacy/bitcoin.svg",
-                LightningImagePath = "imlegacy/bitcoin-lightning.svg",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("0'") : new KeyPath("1'"),
-                SupportRBF = true,
-                SupportPayJoin = true,
-                VaultSupported = true,
-                //https://github.com/spesmilo/electrum/blob/11733d6bc271646a00b69ff07657119598874da4/electrum/constants.py
-                ElectrumMapping = NetworkType == ChainName.Mainnet
-                    ? new Dictionary<uint, DerivationType>()
-                    {
-                        {0x0488b21eU, DerivationType.Legacy }, // xpub
-                        {0x049d7cb2U, DerivationType.SegwitP2SH }, // ypub
-                        {0x04b24746U, DerivationType.Segwit }, //zpub
-                    }
-                    : new Dictionary<uint, DerivationType>()
-                    {
-                        {0x043587cfU, DerivationType.Legacy}, // tpub
-                        {0x044a5262U, DerivationType.SegwitP2SH}, // upub
-                        {0x045f1cf6U, DerivationType.Segwit} // vpub
-                    }
-            });
-        }
-    }
-}

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -1,8 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using BTCPayServer.Configuration;
+using BTCPayServer.Logging;
+using Microsoft.AspNetCore.DataProtection.KeyManagement;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using NBitcoin;
 using NBXplorer;
+using StandardConfiguration;
 
 namespace BTCPayServer
 {
@@ -19,92 +26,39 @@ namespace BTCPayServer
             }
         }
 
-        BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
-        {
-            NetworkType = unfiltered.NetworkType;
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
-            _Networks = new Dictionary<string, BTCPayNetworkBase>();
-            cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
-            foreach (var network in unfiltered._Networks)
-            {
-                if (cryptoCodes.Contains(network.Key))
-                {
-                    _Networks.Add(network.Key, network.Value);
-                }
-            }
-        }
-
-
         public ChainName NetworkType { get; private set; }
-        public BTCPayNetworkProvider(ChainName networkType)
+        public BTCPayNetworkProvider(
+            IEnumerable<BTCPayNetworkBase> networks,
+            SelectedChains selectedChains,
+            NBXplorerNetworkProvider nbxplorerNetworkProvider,
+            Logs logs,
+            IConfiguration configuration)
         {
-            _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
-            NetworkType = networkType;
-            InitBitcoin();
-#if ALTCOINS
-            InitLiquid();
-            InitLiquidAssets();
-            InitLitecoin();
-            InitBitcore();
-            InitDogecoin();
-            InitBGold();
-            InitMonacoin();
-            InitDash();
-            InitFeathercoin();
-            InitAlthash();
-            InitGroestlcoin();
-            InitViacoin();
-            InitMonero();
-            InitZcash();
-            // InitArgoneum();//their rate source is down 9/15/20.
-            // InitMonetaryUnit(); Not supported from Bittrex from 11/23/2022, dead shitcoin
+#if !ALTCOINS
+            var onlyBTC = networks.Count() == 1 && networks.First().IsBTC;
+            if (!onlyBTC)
+                throw new ConfigException($"This build of BTCPay Server does not support altcoins");
+#endif
 
-            // Assume that electrum mappings are same as BTC if not specified
-            foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
+            _NBXplorerNetworkProvider = nbxplorerNetworkProvider;
+            NetworkType = nbxplorerNetworkProvider.NetworkType;
+            foreach (var network in networks)
             {
-                if (network.ElectrumMapping.Count == 0)
-                {
-                    network.ElectrumMapping = GetNetwork<BTCPayNetwork>("BTC").ElectrumMapping;
-                    if (!network.NBitcoinNetwork.Consensus.SupportSegwit)
-                    {
-                        network.ElectrumMapping =
-                            network.ElectrumMapping
-                            .Where(kv => kv.Value == DerivationType.Legacy)
-                            .ToDictionary(k => k.Key, k => k.Value);
-                    }
-                }
+                _Networks.Add(network.CryptoCode.ToUpperInvariant(), network);
             }
 
-            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            //InitBPlus();
-            //InitUfo();
-#endif
-        }
+            foreach (var chain in selectedChains.ExplicitlySelected)
+            {
+                if (GetNetwork<BTCPayNetworkBase>(chain) == null)
+                    throw new ConfigException($"Invalid chains \"{chain}\"");
+            }
 
-        /// <summary>
-        /// Keep only the specified crypto
-        /// </summary>
-        /// <param name="cryptoCodes">Crypto to support</param>
-        /// <returns></returns>
-        public BTCPayNetworkProvider Filter(string[] cryptoCodes)
-        {
-            return new BTCPayNetworkProvider(this, cryptoCodes);
+            logs.Configuration.LogInformation(
+                "Supported chains: " + String.Join(',', _Networks.Select(n => n.Key).ToArray()));
         }
 
         public BTCPayNetwork BTC => GetNetwork<BTCPayNetwork>("BTC");
         public BTCPayNetworkBase DefaultNetwork => BTC ?? GetAll().First();
-
-        public void Add(BTCPayNetwork network)
-        {
-            if (network.NBitcoinNetwork == null)
-                return;
-            Add(network as BTCPayNetworkBase);
-        }
-        public void Add(BTCPayNetworkBase network)
-        {
-            _Networks.Add(network.CryptoCode.ToUpperInvariant(), network);
-        }
-
         public IEnumerable<BTCPayNetworkBase> GetAll()
         {
             return _Networks.Values.ToArray();

BTCPayServer.Common/BTCPayServer.Common.csproj

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

BTCPayServer.Common/SelectedChains.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Bson;
+
+namespace BTCPayServer
+{
+    public class SelectedChains
+    {
+        HashSet<string> chains = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        bool all = false;
+        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;
+                    continue;
+                }
+                chains.Add(chain);
+            }
+            if (chains.Count == 0)
+                chains.Add("BTC");
+            if (all)
+                chains.Clear();
+        }
+
+        public bool Contains(string cryptoCode)
+        {
+            return all || chains.Contains(cryptoCode);
+        }
+        public void Add(string cryptoCode)
+        {
+            chains.Add(cryptoCode);
+        }
+        public IEnumerable<string> ExplicitlySelected => chains;
+    }
+}

BTCPayServer.Data/ApplicationDbContext.cs

@@ -93,7 +93,7 @@ namespace BTCPayServer.Data
             ApplicationUser.OnModelCreating(builder, Database);
             AddressInvoiceData.OnModelCreating(builder);
             APIKeyData.OnModelCreating(builder, Database);
-            AppData.OnModelCreating(builder);
+            AppData.OnModelCreating(builder, Database);
             CustodianAccountData.OnModelCreating(builder, Database);
             //StoredFile.OnModelCreating(builder);
             InvoiceEventData.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.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace BTCPayServer.Data
 {

BTCPayServer.Data/Data/AppData.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
@@ -14,14 +15,22 @@ namespace BTCPayServer.Data
         public DateTimeOffset Created { get; set; }
         public bool TagAllInvoices { get; set; }
         public string Settings { get; set; }
+        public bool Archived { get; set; }
 
-        internal static void OnModelCreating(ModelBuilder builder)
+        internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<AppData>()
                        .HasOne(o => o.StoreData)
                        .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<AppData>()
                     .HasOne(a => a.StoreData);
+
+            if (databaseFacade.IsNpgsql())
+            {
+                builder.Entity<AppData>()
+                    .Property(o => o.Settings)
+                    .HasColumnType("JSONB");
+            }
         }
 
         // utility methods

BTCPayServer.Data/Data/InvoiceData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -30,11 +31,10 @@ namespace BTCPayServer.Data
         public List<PendingInvoiceData> PendingInvoices { get; set; }
         public List<InvoiceSearchData> InvoiceSearchData { get; set; }
         public List<RefundData> Refunds { get; set; }
-        public string CurrentRefundId { get; set; }
-        [ForeignKey("Id,CurrentRefundId")]
-        public RefundData CurrentRefund { get; set; }
-
 
+        [Timestamp]
+        // With this, update of InvoiceData will fail if the row was modified by another process
+        public uint XMin { get; set; }
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {
             builder.Entity<InvoiceData>()
@@ -42,8 +42,6 @@ namespace BTCPayServer.Data
                 .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
             builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
             builder.Entity<InvoiceData>().HasIndex(o => o.OrderId);
-            builder.Entity<InvoiceData>()
-                .HasOne(o => o.CurrentRefund);
             builder.Entity<InvoiceData>().HasIndex(o => o.Created);
 
             if (databaseFacade.IsNpgsql())

BTCPayServer.Data/Data/RefundData.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace BTCPayServer.Data
 {
@@ -13,7 +14,6 @@ namespace BTCPayServer.Data
         public PullPaymentData PullPaymentData { get; set; }
         public InvoiceData InvoiceData { get; set; }
 
-
         internal static void OnModelCreating(ModelBuilder builder)
         {
             builder.Entity<RefundData>()

BTCPayServer.Data/Data/StoreData.cs

@@ -48,6 +48,7 @@ namespace BTCPayServer.Data
         public IEnumerable<StoreSettingData> Settings { get; set; }
         public IEnumerable<FormData> Forms { get; set; }
         public IEnumerable<StoreRole> StoreRoles { get; set; }
+        public bool Archived { get; set; }
 
         internal static void OnModelCreating(ModelBuilder builder, DatabaseFacade databaseFacade)
         {

BTCPayServer.Data/Data/WalletObjectData.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Data
 {
-    public class WalletObjectData
+    public class WalletObjectData : IEqualityComparer<WalletObjectData>
     {
         public class Types
         {
@@ -88,9 +86,30 @@ namespace BTCPayServer.Data
             if (databaseFacade.IsNpgsql())
             {
                 builder.Entity<WalletObjectData>()
-                                .Property(o => o.Data)
-                                .HasColumnType("JSONB");
+                    .Property(o => o.Data)
+                    .HasColumnType("JSONB");
+                
             }
         }
+
+        public bool Equals(WalletObjectData x, WalletObjectData y)
+        {
+            if (ReferenceEquals(x, y)) return true;
+            if (ReferenceEquals(x, null)) return false;
+            if (ReferenceEquals(y, null)) return false;
+            if (x.GetType() != y.GetType()) return false;
+            return string.Equals(x.WalletId, y.WalletId, StringComparison.InvariantCultureIgnoreCase) &&
+                   string.Equals(x.Type, y.Type, StringComparison.InvariantCultureIgnoreCase) &&
+                   string.Equals(x.Id, y.Id, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public int GetHashCode(WalletObjectData obj)
+        {
+            HashCode hashCode = new HashCode();
+            hashCode.Add(obj.WalletId, StringComparer.InvariantCultureIgnoreCase);
+            hashCode.Add(obj.Type, StringComparer.InvariantCultureIgnoreCase);
+            hashCode.Add(obj.Id, StringComparer.InvariantCultureIgnoreCase);
+            return hashCode.ToHashCode();
+        }
     }
 }

BTCPayServer.Data/Migrations/20230906135844_AddArchivedFlagForStoresAndApps.cs

@@ -0,0 +1,39 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20230906135844_AddArchivedFlagForStoresAndApps")]
+    public partial class AddArchivedFlagForStoresAndApps : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Archived",
+                table: "Stores",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Archived",
+                table: "Apps",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Archived",
+                table: "Stores");
+
+            migrationBuilder.DropColumn(
+                name: "Archived",
+                table: "Apps");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20231020135844_AddBoltcardsTable.cs

@@ -0,0 +1,38 @@
+using System.Security.Permissions;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20231020135844_AddBoltcardsTable")]
+    public partial class AddBoltcardsTable : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "boltcards",
+                columns: table => new
+                {
+                    id = table.Column<string>(maxLength: 32, nullable: false),
+                    counter = table.Column<int>(type: "INT", nullable: false, defaultValue: 0),
+                    ppid = table.Column<string>(maxLength: 30, nullable: true),
+                    version = table.Column<int>(nullable: false, defaultValue: 0)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_id", x => x.id);
+                    table.ForeignKey("FK_boltcards_PullPayments", x => x.ppid, "PullPayments", "Id", onDelete: ReferentialAction.SetNull);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable("boltcards");
+        }
+    }
+}

BTCPayServer.Data/Migrations/20231121031609_removecurrentrefund.cs

@@ -0,0 +1,36 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20231121031609_removecurrentrefund")]
+    public partial class removecurrentrefund : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.IsNpgsql())
+            {
+                migrationBuilder.DropForeignKey(
+                    name: "FK_Invoices_Refunds_Id_CurrentRefundId",
+                    table: "Invoices");
+
+                migrationBuilder.DropIndex(
+                    name: "IX_Invoices_Id_CurrentRefundId",
+                    table: "Invoices");
+
+                migrationBuilder.DropColumn(
+                    name: "CurrentRefundId",
+                    table: "Invoices");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

BTCPayServer.Data/Migrations/20231219031609_appssettingstojson.cs

@@ -0,0 +1,26 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20231219031609_appssettingstojson")]
+    public partial class appssettingstojson : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (migrationBuilder.IsNpgsql())
+            {
+                migrationBuilder.Sql("ALTER TABLE \"Apps\" ALTER COLUMN \"Settings\" TYPE JSONB USING \"Settings\"::JSONB");
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -16,25 +16,7 @@ namespace BTCPayServer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.9");
-
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.Property<string>("Address")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTimeOffset?>("CreatedTime")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("InvoiceDataId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Address");
-
-                    b.HasIndex("InvoiceDataId");
-
-                    b.ToTable("AddressInvoices");
-                });
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
 
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
@@ -71,6 +53,24 @@ namespace BTCPayServer.Migrations
                     b.ToTable("ApiKeys");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTimeOffset?>("CreatedTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceDataId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Address");
+
+                    b.HasIndex("InvoiceDataId");
+
+                    b.ToTable("AddressInvoices");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.Property<string>("Id")
@@ -79,6 +79,9 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("AppType")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("Archived")
+                        .HasColumnType("INTEGER");
+
                     b.Property<DateTimeOffset>("Created")
                         .HasColumnType("TEXT");
 
@@ -284,9 +287,6 @@ namespace BTCPayServer.Migrations
                     b.Property<DateTimeOffset>("Created")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("CurrentRefundId")
-                        .HasColumnType("TEXT");
-
                     b.Property<string>("CustomerEmail")
                         .HasColumnType("TEXT");
 
@@ -305,6 +305,11 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("StoreDataId")
                         .HasColumnType("TEXT");
 
+                    b.Property<uint>("XMin")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("Id");
 
                     b.HasIndex("Created");
@@ -313,8 +318,6 @@ namespace BTCPayServer.Migrations
 
                     b.HasIndex("StoreDataId");
 
-                    b.HasIndex("Id", "CurrentRefundId");
-
                     b.ToTable("Invoices");
                 });
 
@@ -751,6 +754,9 @@ namespace BTCPayServer.Migrations
                     b.Property<string>("Id")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("Archived")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("DefaultCrypto")
                         .HasColumnType("TEXT");
 
@@ -780,31 +786,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("Stores");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-                {
-                    b.Property<string>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ApplicationUserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("FileName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("StorageFileName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("Timestamp")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ApplicationUserId");
-
-                    b.ToTable("Files");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
                 {
                     b.Property<string>("Id")
@@ -862,6 +843,31 @@ namespace BTCPayServer.Migrations
                     b.ToTable("StoreWebhooks");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageFileName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.ToTable("Files");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
                 {
                     b.Property<string>("Id")
@@ -1170,16 +1176,6 @@ namespace BTCPayServer.Migrations
                     b.ToTable("AspNetUserTokens", (string)null);
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
-                        .WithMany("AddressInvoices")
-                        .HasForeignKey("InvoiceDataId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("InvoiceData");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1197,6 +1193,16 @@ namespace BTCPayServer.Migrations
                     b.Navigation("User");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                        .WithMany("AddressInvoices")
+                        .HasForeignKey("InvoiceDataId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("InvoiceData");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1245,12 +1251,6 @@ namespace BTCPayServer.Migrations
                         .HasForeignKey("StoreDataId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("BTCPayServer.Data.RefundData", "CurrentRefund")
-                        .WithMany()
-                        .HasForeignKey("Id", "CurrentRefundId");
-
-                    b.Navigation("CurrentRefund");
-
                     b.Navigation("StoreData");
                 });
 
@@ -1413,15 +1413,6 @@ namespace BTCPayServer.Migrations
                     b.Navigation("PullPaymentData");
                 });
 
-            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
-                {
-                    b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
-                        .WithMany("StoredFiles")
-                        .HasForeignKey("ApplicationUserId");
-
-                    b.Navigation("ApplicationUser");
-                });
-
             modelBuilder.Entity("BTCPayServer.Data.StoreRole", b =>
                 {
                     b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
@@ -1462,6 +1453,15 @@ namespace BTCPayServer.Migrations
                     b.Navigation("Webhook");
                 });
 
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+                {
+                    b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                        .WithMany("StoredFiles")
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.Navigation("ApplicationUser");
+                });
+
             modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
                 {
                     b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")

BTCPayServer.PluginPacker/BTCPayServer.PluginPacker.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
       <OutputType>Exe</OutputType>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
       <Version>1.0.0.0</Version>
       <PackAsTool>true</PackAsTool>
       <ToolCommandName>btcpay-plugin</ToolCommandName>

BTCPayServer.Rating/AvailableRateProvider.cs

@@ -1,37 +0,0 @@
-using System;
-
-namespace BTCPayServer.Rating
-{
-    public enum RateSource
-    {
-        Coingecko,
-        Direct
-    }
-    public class AvailableRateProvider
-    {
-        public string Name { get; }
-        public string Url { get; }
-        public string Id { get; }
-        public RateSource Source { get; }
-
-        public AvailableRateProvider(string id, string name, string url) : this(id, name, url, RateSource.Direct)
-        {
-
-        }
-        public AvailableRateProvider(string id, string name, string url, RateSource source)
-        {
-            Id = id;
-            Name = name;
-            Url = url;
-            Source = source;
-        }
-
-        public string DisplayName =>
-            Source switch
-            {
-                RateSource.Direct => Name,
-                RateSource.Coingecko => $"{Name} (via CoinGecko)",
-                _ => throw new NotSupportedException(Source.ToString())
-            };
-    }
-}

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -4,11 +4,11 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="NBitcoin" Version="7.0.24" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="1.0.2" />
+    <PackageReference Include="NBitcoin" Version="7.0.32" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="DigitalRuby.ExchangeSharp" Version="1.0.4" />
   </ItemGroup>
 
   <ItemGroup>

BTCPayServer.Rating/CurrencyNameTable.cs

@@ -20,13 +20,13 @@ namespace BTCPayServer.Services.Rates
     }
     public class CurrencyNameTable
     {
-        public static CurrencyNameTable Instance = new CurrencyNameTable();
+        public static CurrencyNameTable Instance = new();
         public CurrencyNameTable()
         {
-            _Currencies = LoadCurrency().ToDictionary(k => k.Code);
+            _Currencies = LoadCurrency().ToDictionary(k => k.Code, StringComparer.InvariantCultureIgnoreCase);
         }
 
-        static readonly Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
+        static readonly Dictionary<string, IFormatProvider> _CurrencyProviders = new();
 
         public NumberFormatInfo GetNumberFormatInfo(string currency, bool useFallback)
         {

BTCPayServer.Rating/CurrencyPair.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer.Rating
         public static CurrencyPair Parse(string str)
         {
             if (!TryParse(str, out var result))
-                throw new FormatException("Invalid currency pair");
+                throw new FormatException($"Invalid currency pair ({str})");
             return result;
         }
         public static bool TryParse(string str, out CurrencyPair value)

BTCPayServer.Rating/Providers/ArgoneumRateProvider.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class ArgoneumRateProvider : IRateProvider
-    {
-        private readonly HttpClient _httpClient;
-        public ArgoneumRateProvider(HttpClient httpClient)
-        {
-            _httpClient = httpClient ?? new HttpClient();
-        }
-
-        public RateSourceInfo RateSourceInfo => new("argoneum", "Argoneum", "https://rates.argoneum.net/rates");
-
-        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            // Example result: AGM to BTC rate: {"agm":5000000.000000}
-            var response = await _httpClient.GetAsync("https://rates.argoneum.net/rates/btc", cancellationToken);
-            var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
-            var value = jobj["agm"].Value<decimal>();
-            return new[] { new PairRate(new CurrencyPair("BTC", "AGM"), new BidAsk(value)) };
-        }
-    }
-}

BTCPayServer.Rating/Providers/BTCTurkRateProvider.cs

@@ -29,7 +29,7 @@ namespace BTCPayServer.Rating.Providers
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.btcturk.com/api/v2/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.btcturk.com/api/v2/ticker", cancellationToken);
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             var tickers = jarray.ToObject<Ticker[]>();
             return tickers

BTCPayServer.Rating/Providers/BitbankRateProvider.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://public.bitbank.cc/tickers", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://public.bitbank.cc/tickers", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var data = jobj.ContainsKey("data") ? jobj["data"] : null;
             if (jobj["success"]?.Value<int>() != 1)

BTCPayServer.Rating/Providers/BitflyerRateProvider.cs

@@ -19,7 +19,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.bitflyer.jp/v1/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.bitflyer.jp/v1/ticker", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             if (jobj.Property("error_message")?.Value?.Value<string>() is string err)
             {

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -19,7 +19,9 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
+            if (response.Content.Headers.ContentType?.MediaType is not "application/json")
+                throw new HttpRequestException($"Unexpected content type when querying currency rates from Bitpay ({response.Content.Headers.ContentType?.MediaType})");
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             return jarray
                 .Children<JObject>()

BTCPayServer.Rating/Providers/BudaRateProvider.cs

@@ -18,7 +18,7 @@ public class BudaRateProvider : IRateProvider
 
     public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
     {
-        var response = await _httpClient.GetAsync("https://www.buda.com/api/v2/markets/btc-clp/ticker", cancellationToken);
+        using var response = await _httpClient.GetAsync("https://www.buda.com/api/v2/markets/btc-clp/ticker", cancellationToken);
         var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
         var minAsk = jobj["ticker"]["min_ask"][0].Value<decimal>();
         var maxBid = jobj["ticker"]["max_bid"][0].Value<decimal>();

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -18,7 +18,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var value = jobj["public_price"]["to_price"].Value<decimal>();
             return new[] { new PairRate(new CurrencyPair("BTC", "CAD"), new BidAsk(value)) };

BTCPayServer.Rating/Providers/CryptoMarketExchangeRateProvider.cs

@@ -28,7 +28,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.exchange.cryptomkt.com/api/3/public/ticker/", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.exchange.cryptomkt.com/api/3/public/ticker/", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
 
             return ((jobj as JObject) ?? new JObject())

BTCPayServer.Rating/Providers/ExchangeRateHostRateProvider.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.Services.Rates;
-
-
-public class ExchangeRateHostRateProvider : IRateProvider
-{
-    public RateSourceInfo RateSourceInfo => new("exchangeratehost", "Yadio", "https://api.exchangerate.host/latest?base=BTC");
-    private readonly HttpClient _httpClient;
-    public ExchangeRateHostRateProvider(HttpClient httpClient)
-    {
-        _httpClient = httpClient ?? new HttpClient();
-    }
-
-    public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
-    {
-        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
-        response.EnsureSuccessStatusCode();
-        var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
-        if(jobj["success"].Value<bool>() is not true || !jobj["base"].Value<string>().Equals("BTC", StringComparison.InvariantCulture))
-            throw new Exception("exchangerate.host returned a non success response or the base currency was not the requested one (BTC)");
-        var results = (JObject) jobj["rates"] ;
-        //key value is currency code to rate value
-        var list = new List<PairRate>();
-        foreach (var item in results)
-        {
-            string name = item.Key;
-            var value = item.Value.Value<decimal>();
-            list.Add(new PairRate(new CurrencyPair("BTC", name), new BidAsk(value)));
-        }
-
-        return list.ToArray();
-    }
-}

BTCPayServer.Rating/Providers/FreeCurrencyRatesRateProvider.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -18,7 +18,7 @@ public class FreeCurrencyRatesRateProvider : IRateProvider
 
     public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
     {
-        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        using var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
         response.EnsureSuccessStatusCode();
         var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
         var results = (JObject) jobj["btc"] ;

BTCPayServer.Rating/Providers/HitBTCRateProvider.cs

@@ -21,7 +21,7 @@ namespace BTCPayServer.Rating
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.hitbtc.com/api/2/public/ticker", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.hitbtc.com/api/2/public/ticker", cancellationToken);
             var jarray = await response.Content.ReadAsAsync<JArray>(cancellationToken);
             return jarray
                 .Children<JObject>()

BTCPayServer.Rating/Providers/KrakenExchangeRateProvider.cs

@@ -172,7 +172,7 @@ namespace BTCPayServer.Services.Rates
                 sb.Append(String.Join('&', payload.Select(kv => $"{kv.Key}={kv.Value}").OfType<object>().ToArray()));
             }
             var request = new HttpRequestMessage(HttpMethod.Get, sb.ToString());
-            var response = await HttpClient.SendAsync(request, cancellationToken);
+            using var response = await HttpClient.SendAsync(request, cancellationToken);
             string stringResult = await response.Content.ReadAsStringAsync();
             var result = JsonConvert.DeserializeObject<T>(stringResult);
             if (result is JToken json)

BTCPayServer.Rating/Providers/RipioExchangeProvider.cs

@@ -13,7 +13,7 @@ namespace BTCPayServer.Services.Rates
 {
     public class RipioExchangeProvider : IRateProvider
     {
-        public RateSourceInfo RateSourceInfo => new("ripio", "Ripio", "https://api.exchange.ripio.com/api/v1/rate/all/");
+        public RateSourceInfo RateSourceInfo => new("ripio", "Ripio", "https://api.ripiotrade.co/v4/public/tickers");
         private readonly HttpClient _httpClient;
         public RipioExchangeProvider(HttpClient httpClient)
         {
@@ -21,9 +21,9 @@ namespace BTCPayServer.Services.Rates
         }
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.exchange.ripio.com/api/v1/rate/all/", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.ripiotrade.co/v4/public/tickers", cancellationToken);
             response.EnsureSuccessStatusCode();
-            var jarray = (JArray)(await response.Content.ReadAsAsync<JArray>(cancellationToken));
+            var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
             return jarray
                 .Children<JObject>()
                 .Select(jobj => ParsePair(jobj))

BTCPayServer.Rating/Providers/YadioRateProvider.cs

@@ -23,7 +23,7 @@ namespace BTCPayServer.Services.Rates
 
         public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync("https://api.yadio.io/exrates/BTC", cancellationToken);
+            using var response = await _httpClient.GetAsync("https://api.yadio.io/exrates/BTC", cancellationToken);
             response.EnsureSuccessStatusCode();
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var results = jobj["BTC"];

BTCPayServer.Rating/RateSourceInfo.cs

@@ -1,21 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Rating
+#nullable enable
+namespace BTCPayServer.Rating;
+public enum RateSource
 {
-    public class RateSourceInfo
-    {
-        public RateSourceInfo(string id, string displayName, string url)
-        {
-            Id = id;
-            DisplayName = displayName;
-            Url = url;
-        }
-        public string Id { get; set; }
-        public string DisplayName { get; set; }
-        public string Url { get; set; }
-    }
+    Coingecko,
+    Direct
 }
+public record RateSourceInfo(string Id, string DisplayName, string Url, RateSource Source = RateSource.Direct);

BTCPayServer.Rating/Services/RateProviderFactory.cs

@@ -85,14 +85,13 @@ namespace BTCPayServer.Services.Rates
                     bgFetcher.RefreshRate = TimeSpan.FromMinutes(1.0);
                     bgFetcher.ValidatyTime = TimeSpan.FromMinutes(5.0);
                     Providers.Add(supportedExchange.Id, bgFetcher);
-                    var rsi = coingecko.RateSourceInfo;
-                    AvailableRateProviders.Add(new(rsi.Id, rsi.DisplayName, rsi.Url, RateSource.Coingecko));
+                    AvailableRateProviders.Add(coingecko.RateSourceInfo);
                 }
             }
             AvailableRateProviders.Sort((a, b) => StringComparer.Ordinal.Compare(a.DisplayName, b.DisplayName));
         }
 
-        public List<AvailableRateProvider> AvailableRateProviders { get; } = new List<AvailableRateProvider>();
+        public List<RateSourceInfo> AvailableRateProviders { get; } = new List<RateSourceInfo>();
 
         public async Task<QueryRateResult> QueryRates(string exchangeName, CancellationToken cancellationToken)
         {

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
+using BTCPayServer.Events;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
 using BTCPayServer.Lightning;
@@ -23,6 +24,7 @@ using Newtonsoft.Json.Linq;
 using OpenQA.Selenium;
 using Xunit;
 using Xunit.Abstractions;
+using Xunit.Sdk;
 using WalletSettingsViewModel = BTCPayServer.Models.StoreViewModels.WalletSettingsViewModel;
 
 namespace BTCPayServer.Tests
@@ -756,24 +758,26 @@ noninventoryitem:
                 vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
 
-                //inventoryitem has 1 item available
-                await tester.WaitForEvent<AppInventoryUpdaterHostedService.UpdateAppInventory>(() =>
+                async Task AssertCanBuy(string choiceKey, bool expected)
                 {
-                    Assert.IsType<RedirectToActionResult>(publicApps
-                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
-                    return Task.CompletedTask;
-                });
+                    var redirect = Assert.IsType<RedirectToActionResult>(await publicApps
+                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: choiceKey));
+                    if (expected)
+                        Assert.Equal("UIInvoice", redirect.ControllerName);
+                    else
+                        Assert.NotEqual("UIInvoice", redirect.ControllerName);
+                }
+
+                //inventoryitem has 1 item available
+                await AssertCanBuy("inventoryitem", true);
 
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
+                await AssertCanBuy("inventoryitem", false);
 
                 //inventoryitem has unlimited items available
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
-                Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
+                await AssertCanBuy("noninventoryitem", true);
+                await AssertCanBuy("noninventoryitem", true);
 
                 //verify invoices where created
                 invoices = user.BitPay.GetInvoices();
@@ -805,7 +809,6 @@ btconly:
     - BTC
 normal:
   price: 1.0";
-
                 vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 Assert.IsType<RedirectToActionResult>(publicApps

BTCPayServer.Tests/AltcoinTests/ElementsTests.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Configuration;
 using BTCPayServer.Controllers;
 using BTCPayServer.Models.WalletViewModels;
+using BTCPayServer.Plugins.Altcoins;
 using BTCPayServer.Services.Wallets;
 using BTCPayServer.Tests.Logging;
 using Microsoft.AspNetCore.Mvc;
@@ -52,11 +53,12 @@ namespace BTCPayServer.Tests
             {
                 tester.ActivateLBTC();
                 await tester.StartAsync();
+                
+                //https://github.com/ElementsProject/elements/issues/956
+                await tester.LBTCExplorerNode.SendCommandAsync("rescanblockchain");
                 var user = tester.NewAccount();
-                user.GrantAccess();
-                user.RegisterDerivationScheme("LBTC");
-                user.RegisterDerivationScheme("USDT");
-                user.RegisterDerivationScheme("ETB");
+                await user.GrantAccessAsync();
+               
                 await tester.LBTCExplorerNode.GenerateAsync(4);
                 //no tether on our regtest, lets create it and set it
                 var tether = tester.NetworkProvider.GetNetwork<ElementsBTCPayNetwork>("USDT");
@@ -75,6 +77,10 @@ namespace BTCPayServer.Tests
                     .AssetId = etb.AssetId;
 
 
+                user.RegisterDerivationScheme("LBTC");
+                user.RegisterDerivationScheme("USDT");
+                user.RegisterDerivationScheme("ETB");
+                
                 //test: register 2 assets on the same elements network and make sure paying an invoice on one does not affect the other in any way
                 var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(0.1m, "BTC"));
                 Assert.Equal(3, invoice.SupportedTransactionCurrencies.Count);
@@ -82,7 +88,7 @@ namespace BTCPayServer.Tests
                 //1 lbtc = 1 btc
                 Assert.Equal(1, ci.Rate);
                 var star = await tester.LBTCExplorerNode.SendCommandAsync("sendtoaddress", ci.Address, ci.Due, "", "", false, true,
-                    1, "UNSET", lbtc.AssetId);
+                    1, "UNSET",false, lbtc.AssetId.ToString());
 
                 TestUtils.Eventually(() =>
                 {
@@ -95,8 +101,7 @@ namespace BTCPayServer.Tests
 
                 ci = invoice.CryptoInfo.Single(info => info.CryptoCode.Equals("USDT"));
                 Assert.Equal(3, invoice.SupportedTransactionCurrencies.Count);
-                star = await tester.LBTCExplorerNode.SendCommandAsync("sendtoaddress", ci.Address, ci.Due, "", "", false, true,
-                    1, "UNSET", tether.AssetId);
+                star =  tester.LBTCExplorerNode.SendCommand("sendtoaddress", ci.Address, decimal.Parse(ci.Due), "x", "z", false, true, 1, "unset", false, tether.AssetId.ToString());
 
                 TestUtils.Eventually(() =>
                 {

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="../Build/Common.csproj" />
   <PropertyGroup>
+    <NoWarn>$(NoWarn),xUnit1031</NoWarn>
     <IsPackable>false</IsPackable>
     <UserSecretsId>AB0AC1DD-9D26-485B-9416-56A33F268117</UserSecretsId>
     <!--https://devblogs.microsoft.com/aspnet/testing-asp-net-core-mvc-web-apps-in-memory/-->
@@ -19,13 +20,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="114.0.5735.9000" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+	<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="119.0.6045.10500" />
+	<PackageReference Include="xunit" Version="2.6.3" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -232,17 +232,13 @@ namespace BTCPayServer.Tests
                 ndax.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_CAD"), new BidAsk(6000m)));
                 rateProvider.Providers.Add("ndax", ndax);
 
-                var bittrex = new MockRateProvider();
-                bittrex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("DOGE_BTC"), new BidAsk(0.004m)));
-                rateProvider.Providers.Add("bittrex", bittrex);
-
-
                 var bitfinex = new MockRateProvider();
                 bitfinex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("UST_BTC"), new BidAsk(0.000136m)));
                 rateProvider.Providers.Add("bitfinex", bitfinex);
 
                 var bitpay = new MockRateProvider();
                 bitpay.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("ETB_BTC"), new BidAsk(0.1m)));
+                bitpay.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("DOGE_BTC"), new BidAsk(0.004m)));
                 rateProvider.Providers.Add("bitpay", bitpay);
                 var kraken = new MockRateProvider();
                 kraken.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("ETH_BTC"), new BidAsk(0.1m)));

BTCPayServer.Tests/ChargeTester.cs

@@ -12,7 +12,8 @@ namespace BTCPayServer.Tests
         {
             this._Parent = serverTester;
             var url = serverTester.GetEnvironment(environmentName, defaultValue);
-            Client = (ChargeClient)LightningClientFactory.CreateClient(url, network);
+
+            Client = (ChargeClient)new LightningClientFactory(network).Create(url);
             P2PHost = _Parent.GetEnvironment(environmentName + "_HOST", defaultHost);
         }
         public ChargeClient Client { get; set; }

BTCPayServer.Tests/CrowdfundTests.cs

@@ -54,13 +54,33 @@ namespace BTCPayServer.Tests
                 Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps2.ListApps(user2.StoreId).Result).Model);
             Assert.Single(appList.Apps);
             Assert.Empty(appList2.Apps);
-            Assert.Equal("test", appList.Apps[0].AppName);
-            Assert.Equal(apps.CreatedAppId, appList.Apps[0].Id);
-            Assert.True(appList.Apps[0].Role.ToPermissionSet(appList.Apps[0].StoreId).Contains(Policies.CanModifyStoreSettings, appList.Apps[0].StoreId));
-            Assert.Equal(user.StoreId, appList.Apps[0].StoreId);
-            Assert.IsType<NotFoundResult>(apps2.DeleteApp(appList.Apps[0].Id));
-            Assert.IsType<ViewResult>(apps.DeleteApp(appList.Apps[0].Id));
-            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(appList.Apps[0].Id).Result);
+            Assert.Equal("test", app.AppName);
+            Assert.Equal(apps.CreatedAppId, app.Id);
+            Assert.True(app.Role.ToPermissionSet(app.StoreId).Contains(Policies.CanModifyStoreSettings, app.StoreId));
+            Assert.Equal(user.StoreId, app.StoreId);
+            // Archive
+            redirect = Assert.IsType<RedirectResult>(apps.ToggleArchive(app.Id).Result);
+            Assert.EndsWith("/settings/crowdfund", redirect.Url);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
+            Assert.Empty(appList.Apps);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId, archived: true).Result).Model);
+            app = appList.Apps[0];
+            Assert.True(app.Archived);
+            Assert.IsType<NotFoundResult>(await crowdfund.ViewCrowdfund(app.Id));
+            // Unarchive
+            redirect = Assert.IsType<RedirectResult>(apps.ToggleArchive(app.Id).Result);
+            Assert.EndsWith("/settings/crowdfund", redirect.Url);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
+            app = appList.Apps[0];
+            Assert.False(app.Archived);
+            var crowdfundViewModel = await crowdfund.UpdateCrowdfund(app.Id).AssertViewModelAsync<UpdateCrowdfundViewModel>();
+            crowdfundViewModel.Enabled = true;
+            Assert.IsType<RedirectToActionResult>(crowdfund.UpdateCrowdfund(app.Id, crowdfundViewModel, "save").Result);
+            Assert.IsType<ViewResult>(await crowdfund.ViewCrowdfund(app.Id));
+            // Delete
+            Assert.IsType<NotFoundResult>(apps2.DeleteApp(app.Id));
+            Assert.IsType<ViewResult>(apps.DeleteApp(app.Id));
+            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(app.Id).Result);
             Assert.Equal(nameof(UIStoresController.Dashboard), redirectToAction.ActionName);
             appList = await apps.ListApps(user.StoreId).AssertViewModelAsync<ListAppsViewModel>();
             Assert.Empty(appList.Apps);

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim AS builder
 
 RUN apt-get update && apt-get install -y --no-install-recommends chromium-driver \
     && rm -rf /var/lib/apt/lists/*

BTCPayServer.Tests/Extensions.cs

@@ -98,7 +98,7 @@ retry:
                 }
                 Thread.Sleep(50);
             }
-            Assert.False(true, "Elements was found");
+            Assert.Fail("Elements was found");
         }
 
         public static void UntilJsIsReady(this WebDriverWait wait)
@@ -197,10 +197,11 @@ retry:
             driver.FindElement(selector).Click();
         }
 
-        [DebuggerHidden]
         public static bool ElementDoesNotExist(this IWebDriver driver, By selector)
         {
-            Assert.Throws<NoSuchElementException>(() =>
+            Assert.Throws<NoSuchElementException>(
+            [DebuggerStepThrough]
+            () =>
             {
                 driver.FindElement(selector);
             });

BTCPayServer.Tests/FastTests.cs

@@ -10,6 +10,7 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Configuration;
@@ -18,11 +19,15 @@ using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
 using BTCPayServer.JsonConverters;
+using BTCPayServer.Logging;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Payments.Lightning;
+using BTCPayServer.Plugins;
+using BTCPayServer.Plugins.Bitcoin;
 using BTCPayServer.Rating;
 using BTCPayServer.Services;
+using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Labels;
 using BTCPayServer.Services.Rates;
@@ -130,7 +135,7 @@ namespace BTCPayServer.Tests
                 var tags = new HashSet<String>(g.Select(o => o.Tag));
                 if (tags.Count != 1)
                 {
-                    Assert.False(true, $"All docker images '{g.Key}' in docker-compose.yml and docker-compose.altcoins.yml should have the same tags. (Found {string.Join(',', tags)})");
+                    Assert.Fail($"All docker images '{g.Key}' in docker-compose.yml and docker-compose.altcoins.yml should have the same tags. (Found {string.Join(',', tags)})");
                 }
             }
         }
@@ -346,11 +351,70 @@ namespace BTCPayServer.Tests
             Assert.True(Torrc.TryParse(input, out torrc));
             Assert.Equal(expected, torrc.ToString());
         }
+
+        [Fact]
+        public void CanParseCartItems()
+        {
+            Assert.True(AppService.TryParsePosCartItems(new JObject()
+            {
+                {"cart", new JArray()
+                {
+                    new JObject()
+                    {
+                        { "id", "ddd"},
+                        {"price", 4},
+                        {"count", 1}
+                    }
+                }}
+            }, out var items));
+            Assert.Equal("ddd", items[0].Id);
+            Assert.Equal(1, items[0].Count);
+            Assert.Equal(4, items[0].Price);
+
+            // Using legacy parsing
+            Assert.True(AppService.TryParsePosCartItems(new JObject()
+            {
+                {"cart", new JArray()
+                {
+                    new JObject()
+                    {
+                        { "id", "ddd"},
+                        {"price", new JObject()
+                            {
+                                { "value", 8.49m }
+                            }
+                        },
+                        {"count", 1}
+                    }
+                }}
+            }, out items));
+            Assert.Equal("ddd", items[0].Id);
+            Assert.Equal(1, items[0].Count);
+            Assert.Equal(8.49m, items[0].Price);
+
+            Assert.False(AppService.TryParsePosCartItems(new JObject()
+            {
+                {"cart", new JArray()
+                {
+                    new JObject()
+                    {
+                        { "id", "ddd"},
+                        {"price", new JObject()
+                            {
+                                { "value", "nocrahs" }
+                            }
+                        },
+                        {"count", 1}
+                    }
+                }}
+            }, out items));
+        }
+
         [Fact]
         public void CanCalculateDust()
         {
             var entity = new InvoiceEntity() { Currency = "USD" };
-            entity.Networks = new BTCPayNetworkProvider(ChainName.Regtest);
+            entity.Networks = CreateNetworkProvider(ChainName.Regtest);
 #pragma warning disable CS0618
             entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
@@ -396,7 +460,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanCalculateCryptoDue()
         {
-            var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
+            var networkProvider = CreateNetworkProvider(ChainName.Regtest);
             var entity = new InvoiceEntity() { Currency = "USD" };
             entity.Networks = networkProvider;
 #pragma warning disable CS0618
@@ -584,7 +648,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanAcceptInvoiceWithTolerance()
         {
-            var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
+            var networkProvider = CreateNetworkProvider(ChainName.Regtest);
             var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
             {
                 new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
@@ -704,7 +768,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public async Task CanEnumerateTorServices()
         {
-            var tor = new TorServices(new BTCPayNetworkProvider(ChainName.Regtest),
+            var tor = new TorServices(CreateNetworkProvider(ChainName.Regtest),
                 new OptionsWrapper<BTCPayServerOptions>(new BTCPayServerOptions()
                 {
                     TorrcFile = TestUtils.GetTestDataFullPath("Tor/torrc")
@@ -716,7 +780,7 @@ namespace BTCPayServer.Tests
             Assert.Single(tor.Services.Where(t => t.ServiceType == TorServiceType.RPC));
             Assert.True(tor.Services.Count(t => t.ServiceType == TorServiceType.Other) > 1);
 
-            tor = new TorServices(new BTCPayNetworkProvider(ChainName.Regtest),
+            tor = new TorServices(CreateNetworkProvider(ChainName.Regtest),
                 new OptionsWrapper<BTCPayServerOptions>(new BTCPayServerOptions()
                 {
                     TorrcFile = null,
@@ -753,7 +817,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void CanParseDerivationSchemes()
         {
-            var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
+            var networkProvider = CreateNetworkProvider(ChainName.Regtest);
             var parser = new DerivationSchemeParser(networkProvider.BTC);
 
             // xpub
@@ -779,7 +843,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(expected, inner.ToString());
 
             // Output Descriptor
-            networkProvider = new BTCPayNetworkProvider(ChainName.Mainnet);
+            networkProvider = CreateNetworkProvider(ChainName.Mainnet);
             parser = new DerivationSchemeParser(networkProvider.BTC);
             var od = "wpkh([8bafd160/49h/0h/0h]xpub661MyMwAqRbcGVBsTGeNZN6QGVHmMHLdSA4FteGsRrEriu4pnVZMZWnruFFFXkMnyoBjyHndD3Qwcfz4MPzBUxjSevweNFQx7SAYZATtcDw/0/*)#9x4vkw48";
             (strategyBase, rootedKeyPath) = parser.ParseOutputDescriptor(od);
@@ -821,8 +885,8 @@ namespace BTCPayServer.Tests
         [Fact]
         public void ParseDerivationSchemeSettings()
         {
-            var testnet = new BTCPayNetworkProvider(ChainName.Testnet).GetNetwork<BTCPayNetwork>("BTC");
-            var mainnet = new BTCPayNetworkProvider(ChainName.Mainnet).GetNetwork<BTCPayNetwork>("BTC");
+            var testnet = CreateNetworkProvider(ChainName.Testnet).GetNetwork<BTCPayNetwork>("BTC");
+            var mainnet = CreateNetworkProvider(ChainName.Mainnet).GetNetwork<BTCPayNetwork>("BTC");
             var root = new Mnemonic(
                     "usage fever hen zero slide mammal silent heavy donate budget pulse say brain thank sausage brand craft about save attract muffin advance illegal cabbage")
                 .DeriveExtKey();
@@ -894,6 +958,40 @@ namespace BTCPayServer.Tests
             Assert.Equal("49'/0'/0'", specter.AccountKeySettings[0].AccountKeyPath.ToString());
             Assert.Equal("Specter", specter.Label);
             Assert.Null(error);
+            
+            //BSMS BIP129, Nunchuk
+
+            var bsms = @"BSMS 1.0
+wsh(sortedmulti(1,[5c9e228d/48'/0'/0'/2']xpub6EgGHjcvovyN3nK921zAGPfuB41cJXkYRdt3tLGmiMyvbgHpss4X1eRZwShbEBb1znz2e2bCkCED87QZpin3sSYKbmCzQ9Sc7LaV98ngdeX/**,[2b0e251e/48'/0'/0'/2']xpub6DrimHB8KUSkPvmJ8Pk8RE769EdDm2VEoZ8MBz76w9QupP8Py4wexs4Pa3aRB1LUEhc9GyY6ypDWEFFRCgqeDQePcyWQfjtmintrehq3JCL/**))
+/0/*,/1/*
+bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
+";
+            
+            Assert.True(DerivationSchemeSettings.TryParseFromWalletFile(bsms,
+                mainnet, out var nunchuk, out error));
+            
+            Assert.Equal(2,  nunchuk.AccountKeySettings.Length);
+            //check that the account key settings match those in bsms string
+            Assert.Equal("5c9e228d", nunchuk.AccountKeySettings[0].RootFingerprint.ToString());
+            Assert.Equal("48'/0'/0'/2'", nunchuk.AccountKeySettings[0].AccountKeyPath.ToString());
+Assert.Equal("2b0e251e", nunchuk.AccountKeySettings[1].RootFingerprint.ToString());
+            Assert.Equal("48'/0'/0'/2'", nunchuk.AccountKeySettings[1].AccountKeyPath.ToString());
+
+            var multsig = Assert.IsType < MultisigDerivationStrategy >
+                          (Assert.IsType<P2WSHDerivationStrategy>(nunchuk.AccountDerivation).Inner);
+            
+            Assert.True(multsig.LexicographicOrder);
+           Assert.Equal(1, multsig.RequiredSignatures);
+           
+           var deposit = new NBXplorer.KeyPathTemplates(null).GetKeyPathTemplate(DerivationFeature.Deposit);
+           var line =nunchuk.AccountDerivation.GetLineFor(deposit).Derive(0);
+               
+           Assert.Equal(BitcoinAddress.Create("bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku", Network.Main).ScriptPubKey, 
+               line.ScriptPubKey);
+            
+            Assert.Equal("BSMS", nunchuk.Source);
+            Assert.Null(error);
+            
 
             // Failure case
             Assert.False(DerivationSchemeSettings.TryParseFromWalletFile(
@@ -904,10 +1002,10 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        public void CheckRatesProvider()
+        public async Task CheckRatesProvider()
         {
             var spy = new SpyRateProvider();
-            RateRules.TryParse("X_X = bittrex(X_X);", out var rateRules);
+            RateRules.TryParse("X_X = bitpay(X_X);", out var rateRules);
 
             var factory = CreateBTCPayRateFactory();
             factory.Providers.Clear();
@@ -915,24 +1013,23 @@ namespace BTCPayServer.Tests
             factory.Providers.Clear();
             var fetch = new BackgroundFetcherRateProvider(spy);
             fetch.DoNotAutoFetchIfExpired = true;
-            factory.Providers.Add("bittrex", fetch);
-            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter()
-                .GetResult();
+            factory.Providers.Add("bitpay", fetch);
+            var fetchedRate = await fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default);
             spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
+            fetchedRate = await fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default);
             spy.AssertNotHit();
-            fetch.UpdateIfNecessary(default).GetAwaiter().GetResult();
+            await fetch.UpdateIfNecessary(default);
             spy.AssertNotHit();
             fetch.RefreshRate = TimeSpan.FromSeconds(1.0);
             Thread.Sleep(1020);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
+            fetchedRate = await fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default);
             spy.AssertNotHit();
             fetch.ValidatyTime = TimeSpan.FromSeconds(1.0);
-            fetch.UpdateIfNecessary(default).GetAwaiter().GetResult();
+            await fetch.UpdateIfNecessary(default);
             spy.AssertHit();
-            fetch.GetRatesAsync(default).GetAwaiter().GetResult();
+            await fetch.GetRatesAsync(default);
             Thread.Sleep(1000);
-            Assert.Throws<InvalidOperationException>(() => fetch.GetRatesAsync(default).GetAwaiter().GetResult());
+            await Assert.ThrowsAsync<InvalidOperationException>(() => fetch.GetRatesAsync(default));
         }
 
         public static RateProviderFactory CreateBTCPayRateFactory()
@@ -1186,7 +1283,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void HasCurrencyDataForNetworks()
         {
-            var btcPayNetworkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
+            var btcPayNetworkProvider = CreateNetworkProvider(ChainName.Regtest);
             foreach (var network in btcPayNetworkProvider.GetAll())
             {
                 var cd = CurrencyNameTable.Instance.GetCurrencyData(network.CryptoCode, false);
@@ -1517,7 +1614,7 @@ namespace BTCPayServer.Tests
             StringBuilder builder = new StringBuilder();
             builder.AppendLine("// Some cool comments");
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("// Some other cool comments");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X);");
@@ -1528,7 +1625,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(
                 "// Some cool comments\n" +
                 "DOGE_X = DOGE_BTC * BTC_X * 1.1;\n" +
-                "DOGE_BTC = bittrex(DOGE_BTC);\n" +
+                "DOGE_BTC = bitpay(DOGE_BTC);\n" +
                 "// Some other cool comments\n" +
                 "BTC_USD = kraken(BTC_USD);\n" +
                 "BTC_X = coinbase(BTC_X);\n" +
@@ -1536,10 +1633,10 @@ namespace BTCPayServer.Tests
                 rules.ToString());
             var tests = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1"),
+                (Pair: "DOGE_USD", Expected: "bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1"),
                 (Pair: "BTC_USD", Expected: "kraken(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
+                (Pair: "DOGE_CAD", Expected: "bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02"),
                 (Pair: "SATS_CAD", Expected: "0.00000001 * coinbase(BTC_CAD)"),
                 (Pair: "Sats_USD", Expected: "0.00000001 * kraken(BTC_USD)")
@@ -1549,13 +1646,13 @@ namespace BTCPayServer.Tests
                 Assert.Equal(test.Expected, rules.GetRuleFor(CurrencyPair.Parse(test.Pair)).ToString());
             }
             rules.Spread = 0.2m;
-            Assert.Equal("(bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
+            Assert.Equal("(bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1) * (0.8, 1.2)", rules.GetRuleFor(CurrencyPair.Parse("DOGE_USD")).ToString());
             ////////////////
 
             // Check errors conditions
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = LTC_CAD * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("LTC_CHF = LTC_CHF * 1.01");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
@@ -1576,7 +1673,7 @@ namespace BTCPayServer.Tests
             // Check if we can resolve exchange rates
             builder = new StringBuilder();
             builder.AppendLine("DOGE_X = DOGE_BTC * BTC_X * 1.1");
-            builder.AppendLine("DOGE_BTC = Bittrex(DOGE_BTC)");
+            builder.AppendLine("DOGE_BTC = bitpay(DOGE_BTC)");
             builder.AppendLine("BTC_usd = kraken(BTC_USD)");
             builder.AppendLine("BTC_X = Coinbase(BTC_X)");
             builder.AppendLine("X_X = CoinAverage(X_X) * 1.02");
@@ -1584,10 +1681,10 @@ namespace BTCPayServer.Tests
 
             var tests2 = new[]
             {
-                (Pair: "DOGE_USD", Expected: "bittrex(DOGE_BTC) * kraken(BTC_USD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),kraken(BTC_USD)"),
+                (Pair: "DOGE_USD", Expected: "bitpay(DOGE_BTC) * kraken(BTC_USD) * 1.1", ExpectedExchangeRates: "bitpay(DOGE_BTC),kraken(BTC_USD)"),
                 (Pair: "BTC_USD", Expected: "kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)", ExpectedExchangeRates: "coinbase(BTC_CAD)"),
-                (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),coinbase(BTC_CAD)"),
+                (Pair: "DOGE_CAD", Expected: "bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bitpay(DOGE_BTC),coinbase(BTC_CAD)"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02", ExpectedExchangeRates: "coinaverage(LTC_CAD)"),
                 (Pair: "SATS_USD", Expected: "0.00000001 * kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
                 (Pair: "SATS_EUR", Expected: "0.00000001 * coinbase(BTC_EUR)", ExpectedExchangeRates: "coinbase(BTC_EUR)")
@@ -1599,11 +1696,11 @@ namespace BTCPayServer.Tests
                 Assert.Equal(test.ExpectedExchangeRates, string.Join(',', rule.ExchangeRates.OfType<object>().ToArray()));
             }
             var rule2 = rules.GetRuleFor(CurrencyPair.Parse("DOGE_CAD"));
-            rule2.ExchangeRates.SetRate("bittrex", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
+            rule2.ExchangeRates.SetRate("bitpay", CurrencyPair.Parse("DOGE_BTC"), new BidAsk(5000m));
             rule2.Reevaluate();
             Assert.True(rule2.HasError);
             Assert.Equal("5000 * ERR_RATE_UNAVAILABLE(coinbase, BTC_CAD) * 1.1", rule2.ToString(true));
-            Assert.Equal("bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", rule2.ToString(false));
+            Assert.Equal("bitpay(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", rule2.ToString(false));
             rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_CAD"), new BidAsk(2000.4m));
             rule2.Reevaluate();
             Assert.False(rule2.HasError);
@@ -1765,8 +1862,7 @@ namespace BTCPayServer.Tests
                         new KeyValuePair<string, string>("chains", "usdt")}
                 })
             });
-
-            var networkProvider = config.ConfigureNetworkProvider(BTCPayLogs);
+            var networkProvider = CreateNetworkProvider(config);
             Assert.NotNull(networkProvider.GetNetwork("LBTC"));
             Assert.NotNull(networkProvider.GetNetwork("USDT"));
         }
@@ -1774,9 +1870,9 @@ namespace BTCPayServer.Tests
         [Trait("Altcoins", "Altcoins")]
         public void CanParseDerivationScheme()
         {
-            var testnetNetworkProvider = new BTCPayNetworkProvider(ChainName.Testnet);
-            var regtestNetworkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
-            var mainnetNetworkProvider = new BTCPayNetworkProvider(ChainName.Mainnet);
+            var testnetNetworkProvider = CreateNetworkProvider(ChainName.Testnet);
+            var regtestNetworkProvider = CreateNetworkProvider(ChainName.Regtest);
+            var mainnetNetworkProvider = CreateNetworkProvider(ChainName.Mainnet);
             var testnetParser = new DerivationSchemeParser(testnetNetworkProvider.GetNetwork<BTCPayNetwork>("BTC"));
             var mainnetParser = new DerivationSchemeParser(mainnetNetworkProvider.GetNetwork<BTCPayNetwork>("BTC"));
             NBXplorer.DerivationStrategy.DerivationStrategyBase result;
@@ -1942,7 +2038,7 @@ namespace BTCPayServer.Tests
         {
 #pragma warning disable CS0618
             var dummy = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest).ToString();
-            var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
+            var networkProvider = CreateNetworkProvider(ChainName.Regtest);
             var networkBTC = networkProvider.GetNetwork("BTC");
             var networkLTC = networkProvider.GetNetwork("LTC");
             InvoiceEntity invoiceEntity = new InvoiceEntity();
@@ -2014,6 +2110,7 @@ namespace BTCPayServer.Tests
         [Fact]
         public void AllPoliciesShowInUI()
         {
+            var a = new BitpayRateProvider(new System.Net.Http.HttpClient()).GetRatesAsync(default).Result;
             foreach (var policy in Policies.AllPolicies)
             {
                 Assert.True(UIManageController.AddApiKeyViewModel.PermissionValueItem.PermissionDescriptions.ContainsKey(policy));
@@ -2059,7 +2156,7 @@ namespace BTCPayServer.Tests
             {
                 ["derivationStrategy"] = "tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf"
             };
-            var scheme = DerivationSchemeSettings.Parse("tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf", new BTCPayNetworkProvider(ChainName.Regtest).BTC);
+            var scheme = DerivationSchemeSettings.Parse("tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf", CreateNetworkProvider(ChainName.Regtest).BTC);
 
             scheme.Source = "ManualDerivationScheme";
             scheme.AccountOriginal = "tpubDDLQZ1WMdy5YJAJWmRNoTJ3uQkavEPXCXnmD4eAuo9BKbzFUBbJmVHys5M3ku4Qw1C165wGpVWH55gZpHjdsCyntwNzhmCAzGejSL6rzbyf";
@@ -2079,7 +2176,7 @@ namespace BTCPayServer.Tests
             .Select(o =>
             {
                 var entity = JsonConvert.DeserializeObject<InvoiceEntity>(o.ToString());
-                entity.Networks = new BTCPayNetworkProvider(ChainName.Regtest);
+                entity.Networks = CreateNetworkProvider(ChainName.Regtest);
                 return entity.DerivationStrategies.ToString();
             })
             .ToHashSet();

BTCPayServer.Tests/FormTests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Form;
 using BTCPayServer.Forms;
 using Microsoft.AspNetCore.Http;
@@ -10,16 +11,25 @@ using Xunit.Abstractions;
 
 namespace BTCPayServer.Tests;
 
-[Trait("Fast", "Fast")]
+[Collection(nameof(NonParallelizableCollectionDefinition))]
+[Trait("Integration", "Integration")]
 public class FormTests : UnitTestBase
 {
     public FormTests(ITestOutputHelper helper) : base(helper)
     {
     }
 
-    [Fact]
-    public void CanParseForm()
+
+    [Fact(Timeout = TestUtils.TestTimeout)]
+    [Trait("Integration", "Integration")]  
+    public async Task CanParseForm()
     {
+        using var tester = CreateServerTester();
+        await tester.StartAsync();
+        var user = tester.NewAccount();
+        user.GrantAccess();
+        var service = tester.PayTester.GetService<FormDataService>();
+
         var form = new Form()
         {
             Fields = new List<Field>
@@ -40,8 +50,6 @@ public class FormTests : UnitTestBase
                 }
             }
         };
-        var providers = new FormComponentProviders(new List<IFormComponentProvider>());
-        var service = new FormDataService(null, providers);
         Assert.False(service.IsFormSchemaValid(form.ToString(), out _, out _));
         form = new Form
         {
@@ -164,7 +172,7 @@ public class FormTests : UnitTestBase
         Assert.Equal("original", obj["invoice"]["test"].Value<string>());
         Assert.Equal("updated", obj["invoice_item3"].Value<string>());
         Clear(form);
-        form.SetValues(obj);
+        service.SetValues(form, obj);
         obj = service.GetValues(form);
         Assert.Equal("original", obj["invoice"]["test"].Value<string>());
         Assert.Equal("updated", obj["invoice_item3"].Value<string>());
@@ -182,12 +190,73 @@ public class FormTests : UnitTestBase
                 }
             }
         };
-        form.SetValues(obj);
+        
+        service.SetValues(form, obj);
         obj = service.GetValues(form);
         Assert.Null(obj["test"].Value<string>());
-        form.SetValues(new JObject { ["test"] = "hello" });
+        
+        service.SetValues(form, new JObject { ["test"] = "hello" });
         obj = service.GetValues(form);
         Assert.Equal("hello", obj["test"].Value<string>());
+
+        var req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Null(req.Amount);
+        Assert.Null(req.Currency);
+        
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}amount",
+            Type = "number",
+            Value = "1"
+        });
+        req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Equal(1, req.Amount);
+        
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}amount_adjustment",
+            Type = "number",
+            Value = "1"
+        });
+        req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Equal(2, req.Amount);
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}amount_adjustment2",
+            Type = "number",
+            Value = "2"
+        });
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}currency",
+            Type = "text",
+            Value = "eur"
+        });
+        req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Equal("eur", req.Currency);
+        Assert.Equal(4, req.Amount);
+        
+
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}amount_multiply_adjustment",
+            Type = "number",
+            Value = "2"
+        });
+        
+        req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Equal(8, req.Amount);
+        
+        
+        form.Fields.Add(new Field
+        {
+            Name = $"{FormDataService.InvoiceParameterPrefix}amount_multiply_adjustment1",
+            Type = "number",
+            Value = "2"
+        });
+        
+        req = service.GenerateInvoiceParametersFromForm(form);
+        Assert.Equal(16, req.Amount);
     }
 
     private void Clear(Form form)

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
@@ -16,8 +16,6 @@ using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.PayoutProcessors;
-using BTCPayServer.PayoutProcessors.OnChain;
-using BTCPayServer.Plugins;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Custodian.Client.MockCustodian;
 using BTCPayServer.Services.Notifications;
@@ -25,13 +23,13 @@ using BTCPayServer.Services.Notifications.Blobs;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Hosting;
 using NBitcoin;
 using NBitpayClient;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
+using Xunit.Sdk;
 using CreateApplicationUserRequest = BTCPayServer.Client.Models.CreateApplicationUserRequest;
 
 namespace BTCPayServer.Tests
@@ -301,6 +299,7 @@ namespace BTCPayServer.Tests
             Assert.Equal(user.StoreId, app.StoreId);
             Assert.Equal("PointOfSale", app.AppType);
             Assert.Equal("test app title", app.Title);
+            Assert.False(app.Archived);
 
             // Make sure we return a 404 if we try to get an app that doesn't exist
             await AssertHttpError(404, async () =>
@@ -324,17 +323,20 @@ namespace BTCPayServer.Tests
                 new CreatePointOfSaleAppRequest()
                 {
                     AppName = "new app name",
-                    Title = "new app title"
+                    Title = "new app title",
+                    Archived = true
                 }
             );
             // Test generic GET app endpoint first
             retrievedApp = await client.GetApp(app.Id);
             Assert.Equal("new app name", retrievedApp.Name);
+            Assert.True(retrievedApp.Archived);
 
             // Test the POS-specific endpoint also
             var retrievedPosApp = await client.GetPosApp(app.Id);
             Assert.Equal("new app name", retrievedPosApp.Name);
             Assert.Equal("new app title", retrievedPosApp.Title);
+            Assert.True(retrievedPosApp.Archived);
 
             // Make sure we return a 404 if we try to delete an app that doesn't exist
             await AssertHttpError(404, async () =>
@@ -466,6 +468,7 @@ namespace BTCPayServer.Tests
             Assert.Equal("test app from API", app.Name);
             Assert.Equal(user.StoreId, app.StoreId);
             Assert.Equal("Crowdfund", app.AppType);
+            Assert.False(app.Archived);
 
             // Make sure we return a 404 if we try to get an app that doesn't exist
             await AssertHttpError(404, async () =>
@@ -482,11 +485,13 @@ namespace BTCPayServer.Tests
             Assert.Equal(app.Name, retrievedApp.Name);
             Assert.Equal(app.StoreId, retrievedApp.StoreId);
             Assert.Equal(app.AppType, retrievedApp.AppType);
+            Assert.False(retrievedApp.Archived);
 
             // Test the crowdfund-specific endpoint also
-            var retrievedPosApp = await client.GetCrowdfundApp(app.Id);
-            Assert.Equal(app.Name, retrievedPosApp.Name);
-            Assert.Equal(app.Title, retrievedPosApp.Title);
+            var retrievedCfApp = await client.GetCrowdfundApp(app.Id);
+            Assert.Equal(app.Name, retrievedCfApp.Name);
+            Assert.Equal(app.Title, retrievedCfApp.Title);
+            Assert.False(retrievedCfApp.Archived);
 
             // Make sure we return a 404 if we try to delete an app that doesn't exist
             await AssertHttpError(404, async () =>
@@ -536,10 +541,12 @@ namespace BTCPayServer.Tests
             Assert.Equal(posApp.Name, apps[0].Name);
             Assert.Equal(posApp.StoreId, apps[0].StoreId);
             Assert.Equal(posApp.AppType, apps[0].AppType);
+            Assert.False(apps[0].Archived);
 
             Assert.Equal(crowdfundApp.Name, apps[1].Name);
             Assert.Equal(crowdfundApp.StoreId, apps[1].StoreId);
             Assert.Equal(crowdfundApp.AppType, apps[1].AppType);
+            Assert.False(apps[1].Archived);
 
             // Get all apps for all store now
             apps = await client.GetAllApps();
@@ -549,15 +556,17 @@ namespace BTCPayServer.Tests
             Assert.Equal(posApp.Name, apps[0].Name);
             Assert.Equal(posApp.StoreId, apps[0].StoreId);
             Assert.Equal(posApp.AppType, apps[0].AppType);
+            Assert.False(apps[0].Archived);
 
             Assert.Equal(crowdfundApp.Name, apps[1].Name);
             Assert.Equal(crowdfundApp.StoreId, apps[1].StoreId);
             Assert.Equal(crowdfundApp.AppType, apps[1].AppType);
+            Assert.False(apps[1].Archived);
 
             Assert.Equal(newApp.Name, apps[2].Name);
             Assert.Equal(newApp.StoreId, apps[2].StoreId);
             Assert.Equal(newApp.AppType, apps[2].AppType);
-
+            Assert.False(apps[2].Archived);
         }
 
         [Fact(Timeout = TestTimeout)]
@@ -878,7 +887,7 @@ namespace BTCPayServer.Tests
 
             TestLogs.LogInformation("Can't archive without knowing the walletId");
             var ex = await AssertAPIError("missing-permission", async () => await client.ArchivePullPayment("lol", result.Id));
-            Assert.Equal("btcpay.store.canmanagepullpayments", ((GreenfieldPermissionAPIError)ex.APIError).MissingPermission);
+            Assert.Equal("btcpay.store.canarchivepullpayments", ((GreenfieldPermissionAPIError)ex.APIError).MissingPermission);
             TestLogs.LogInformation("Can't archive without permission");
             await AssertAPIError("unauthenticated", async () => await unauthenticated.ArchivePullPayment(storeId, result.Id));
             await client.ArchivePullPayment(storeId, result.Id);
@@ -1077,7 +1086,39 @@ namespace BTCPayServer.Tests
             Assert.IsType<string>(lnrURLs.LNURLUri);
             Assert.Equal(12.303228134m, test4.Amount);
             Assert.Equal("BTC", test4.Currency);
-            
+
+            // Check we can register Boltcard
+            var uid = new byte[7];
+            RandomNumberGenerator.Fill(uid);
+            var card = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid
+            });
+            Assert.Equal(0, card.Version);
+            var card1keys = new[] { card.K0, card.K1, card.K2, card.K3, card.K4 };
+            Assert.DoesNotContain(null, card1keys);
+            var card2 = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid
+            });
+            Assert.Equal(1, card2.Version);
+            Assert.StartsWith("lnurlw://", card2.LNURLW);
+            Assert.EndsWith("/boltcard", card2.LNURLW);
+            var card2keys = new[] { card2.K0, card2.K1, card2.K2, card2.K3, card2.K4 };
+            Assert.DoesNotContain(null, card2keys);
+            for (int i = 0; i < card1keys.Length; i++)
+            {
+                if (i == 1)
+                    Assert.Contains(card1keys[i], card2keys);
+                else
+                    Assert.DoesNotContain(card1keys[i], card2keys);
+            }
+            var card3 = await client.RegisterBoltcard(test4.Id, new RegisterBoltcardRequest()
+            {
+                UID = uid,
+                OnExisting = OnExistingBehavior.KeepVersion
+            });
+            Assert.Equal(card2.Version, card3.Version);
             // Test with SATS denomination values
             var testSats = await client.CreatePullPayment(storeId, new Client.Models.CreatePullPaymentRequest()
             {
@@ -1272,20 +1313,23 @@ namespace BTCPayServer.Tests
             using var tester = CreateServerTester();
             await tester.StartAsync();
             var user = tester.NewAccount();
-            user.GrantAccess();
+            await user.GrantAccessAsync();
             await user.MakeAdmin();
             var client = await user.CreateClient(Policies.Unrestricted);
 
             //create store
-            var newStore = await client.CreateStore(new CreateStoreRequest() { Name = "A" });
+            var newStore = await client.CreateStore(new CreateStoreRequest { Name = "A" });
+            Assert.Equal("A", newStore.Name);
+            Assert.Equal(CheckoutType.V2, newStore.CheckoutType);
 
             //update store
             Assert.Empty(newStore.PaymentMethodCriteria);
             await client.GenerateOnChainWallet(newStore.Id, "BTC", new GenerateOnChainWalletRequest());
-            var updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest()
+            var updatedStore = await client.UpdateStore(newStore.Id, new UpdateStoreRequest
             {
                 Name = "B",
-                PaymentMethodCriteria = new List<PaymentMethodCriteriaData>()
+                CheckoutType = CheckoutType.V1,
+                PaymentMethodCriteria = new List<PaymentMethodCriteriaData>
             {
                 new()
                 {
@@ -1297,6 +1341,7 @@ namespace BTCPayServer.Tests
              }
             });
             Assert.Equal("B", updatedStore.Name);
+            Assert.Equal(CheckoutType.V1, updatedStore.CheckoutType);
             var s = (await client.GetStore(newStore.Id));
             Assert.Equal("B", s.Name);
             var pmc = Assert.Single(s.PaymentMethodCriteria);
@@ -1351,6 +1396,13 @@ namespace BTCPayServer.Tests
             }
             tester.DeleteStore = false;
             Assert.Empty(await client.GetStores());
+            
+            // Archive
+            var archivableStore = await client.CreateStore(new CreateStoreRequest { Name = "Archivable" });
+            Assert.False(archivableStore.Archived);
+            archivableStore = await client.UpdateStore(archivableStore.Id, new UpdateStoreRequest { Name = "Archived", Archived = true });
+            Assert.Equal("Archived", archivableStore.Name);
+            Assert.True(archivableStore.Archived);
         }
 
         private async Task<GreenfieldValidationException> AssertValidationError(string[] fields, Func<Task> act)
@@ -1443,7 +1495,7 @@ namespace BTCPayServer.Tests
         [Trait("Integration", "Integration")]
         public async Task CanUseWebhooks()
         {
-            void AssertHook(FakeServer fakeServer, Client.Models.StoreWebhookData hook)
+            void AssertHook(FakeServer fakeServer, StoreWebhookData hook)
             {
                 Assert.True(hook.Enabled);
                 Assert.True(hook.AuthorizedEvents.Everything);
@@ -1592,7 +1644,7 @@ namespace BTCPayServer.Tests
             using var tester = CreateServerTester();
             await tester.StartAsync();
             var user = tester.NewAccount();
-            user.GrantAccess();
+            await user.GrantAccessAsync();
             await user.MakeAdmin();
             var client = await user.CreateClient(Policies.Unrestricted);
             var viewOnly = await user.CreateClient(Policies.CanViewPaymentRequests);
@@ -1674,11 +1726,18 @@ namespace BTCPayServer.Tests
                         BitcoinAddress.Create(invoice.BitcoinAddress, tester.ExplorerNode.Network), invoice.BtcDue);
                 });
                 await TestUtils.EventuallyAsync(async () =>
-                 {
-                     Assert.Equal(Invoice.STATUS_PAID, user.BitPay.GetInvoice(invoiceId).Status);
-                     if (!partialPayment)
-                         Assert.Equal(PaymentRequestData.PaymentRequestStatus.Completed, (await client.GetPaymentRequest(user.StoreId, paymentTestPaymentRequest.Id)).Status);
-                 });
+                {
+                    Assert.Equal(Invoice.STATUS_PAID, (await user.BitPay.GetInvoiceAsync(invoiceId)).Status);
+                    if (!partialPayment)
+                        Assert.Equal(PaymentRequestData.PaymentRequestStatus.Processing, (await client.GetPaymentRequest(user.StoreId, paymentTestPaymentRequest.Id)).Status);
+                });
+                await tester.ExplorerNode.GenerateAsync(1);
+                await TestUtils.EventuallyAsync(async () =>
+                {
+                    Assert.Equal(Invoice.STATUS_CONFIRMED, (await user.BitPay.GetInvoiceAsync(invoiceId)).Status);
+                    if (!partialPayment)
+                        Assert.Equal(PaymentRequestData.PaymentRequestStatus.Completed, (await client.GetPaymentRequest(user.StoreId, paymentTestPaymentRequest.Id)).Status);
+                });
             }
             await Pay(invoiceId);
 
@@ -2074,18 +2133,18 @@ namespace BTCPayServer.Tests
             //validation errors
             await AssertValidationError(new[] { nameof(CreateInvoiceRequest.Amount), $"{nameof(CreateInvoiceRequest.Checkout)}.{nameof(CreateInvoiceRequest.Checkout.PaymentTolerance)}", $"{nameof(CreateInvoiceRequest.Checkout)}.{nameof(CreateInvoiceRequest.Checkout.PaymentMethods)}[0]" }, async () =>
             {
-                await client.CreateInvoice(user.StoreId, new CreateInvoiceRequest() { Amount = -1, Checkout = new CreateInvoiceRequest.CheckoutOptions() { PaymentTolerance = -2, PaymentMethods = new[] { "jasaas_sdsad" } } });
+                await client.CreateInvoice(user.StoreId, new CreateInvoiceRequest { Amount = -1, Checkout = new CreateInvoiceRequest.CheckoutOptions { PaymentTolerance = -2, PaymentMethods = new[] { "jasaas_sdsad" } } });
             });
 
             await AssertHttpError(403, async () =>
             {
                 await viewOnly.CreateInvoice(user.StoreId,
-                    new CreateInvoiceRequest() { Currency = "helloinvalid", Amount = 1 });
+                    new CreateInvoiceRequest { Currency = "helloinvalid", Amount = 1 });
             });
             await user.RegisterDerivationSchemeAsync("BTC");
             string origOrderId = "testOrder";
             var newInvoice = await client.CreateInvoice(user.StoreId,
-                new CreateInvoiceRequest()
+                new CreateInvoiceRequest
                 {
                     Currency = "USD",
                     Amount = 1,
@@ -2172,7 +2231,7 @@ namespace BTCPayServer.Tests
 
             //list NonExisting Status
             var invoicesNonExistingStatus = await viewOnly.GetInvoices(user.StoreId,
-                status: new[] { BTCPayServer.Client.Models.InvoiceStatus.Invalid });
+                status: new[] { InvoiceStatus.Invalid });
             Assert.NotNull(invoicesNonExistingStatus);
             Assert.Empty(invoicesNonExistingStatus);
 
@@ -2190,7 +2249,7 @@ namespace BTCPayServer.Tests
 
             //update
             newInvoice = await client.CreateInvoice(user.StoreId,
-                new CreateInvoiceRequest() { Currency = "USD", Amount = 1 });
+                new CreateInvoiceRequest { Currency = "USD", Amount = 1 });
             Assert.Contains(InvoiceStatus.Settled, newInvoice.AvailableStatusesForManualMarking);
             Assert.Contains(InvoiceStatus.Invalid, newInvoice.AvailableStatusesForManualMarking);
             await client.MarkInvoiceStatus(user.StoreId, newInvoice.Id, new MarkInvoiceStatusRequest()
@@ -2202,7 +2261,7 @@ namespace BTCPayServer.Tests
             Assert.DoesNotContain(InvoiceStatus.Settled, newInvoice.AvailableStatusesForManualMarking);
             Assert.Contains(InvoiceStatus.Invalid, newInvoice.AvailableStatusesForManualMarking);
             newInvoice = await client.CreateInvoice(user.StoreId,
-                new CreateInvoiceRequest() { Currency = "USD", Amount = 1 });
+                new CreateInvoiceRequest { Currency = "USD", Amount = 1 });
             await client.MarkInvoiceStatus(user.StoreId, newInvoice.Id, new MarkInvoiceStatusRequest()
             {
                 Status = InvoiceStatus.Invalid
@@ -2217,13 +2276,13 @@ namespace BTCPayServer.Tests
             await AssertHttpError(403, async () =>
             {
                 await viewOnly.UpdateInvoice(user.StoreId, invoice.Id,
-                    new UpdateInvoiceRequest()
+                    new UpdateInvoiceRequest
                     {
                         Metadata = metadataForUpdate
                     });
             });
             invoice = await client.UpdateInvoice(user.StoreId, invoice.Id,
-                new UpdateInvoiceRequest()
+                new UpdateInvoiceRequest
                 {
                     Metadata = metadataForUpdate
                 });
@@ -2263,13 +2322,12 @@ namespace BTCPayServer.Tests
             await client.UnarchiveInvoice(user.StoreId, invoice.Id);
             Assert.NotNull(await client.GetInvoice(user.StoreId, invoice.Id));
 
-
             foreach (var marked in new[] { InvoiceStatus.Settled, InvoiceStatus.Invalid })
             {
                 var inv = await client.CreateInvoice(user.StoreId,
-                new CreateInvoiceRequest() { Currency = "USD", Amount = 100 });
+                new CreateInvoiceRequest { Currency = "USD", Amount = 100 });
                 await user.PayInvoice(inv.Id);
-                await client.MarkInvoiceStatus(user.StoreId, inv.Id, new MarkInvoiceStatusRequest()
+                await client.MarkInvoiceStatus(user.StoreId, inv.Id, new MarkInvoiceStatusRequest
                 {
                     Status = marked
                 });
@@ -2297,13 +2355,12 @@ namespace BTCPayServer.Tests
                 }
             }
 
-
             newInvoice = await client.CreateInvoice(user.StoreId,
-                new CreateInvoiceRequest()
+                new CreateInvoiceRequest
                 {
                     Currency = "USD",
                     Amount = 1,
-                    Checkout = new CreateInvoiceRequest.CheckoutOptions()
+                    Checkout = new CreateInvoiceRequest.CheckoutOptions
                     {
                         DefaultLanguage = "it-it ",
                         RedirectURL = "http://toto.com/lol"
@@ -3760,9 +3817,19 @@ namespace BTCPayServer.Tests
                 {
                     case "before-automated-payout-processing":
                         beforeHookTcs.TrySetResult();
+                        var bd = (BeforePayoutActionData)tuple.args;
+                        foreach (var p in bd.Payouts)
+                        {
+                            TestLogs.LogInformation("Before Processed: " + p.Id);
+                        }
                         break;
                     case "after-automated-payout-processing":
                         afterHookTcs.TrySetResult();
+                        var ad = (AfterPayoutActionData)tuple.args;
+                        foreach (var p in ad.Payouts)
+                        {
+                            TestLogs.LogInformation("After Processed: " + p.Id);
+                        }
                         break;
                 }
             };
@@ -3777,7 +3844,21 @@ namespace BTCPayServer.Tests
             await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
             await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
             payouts = await adminClient.GetStorePayouts(admin.StoreId);
-            Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress && data.Id == payoutThatShouldBeProcessedStraightAway.Id));
+            try
+            {
+                Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress && data.Id == payoutThatShouldBeProcessedStraightAway.Id));
+            }
+            catch (SingleException)
+            {
+                TestLogs.LogInformation("Debugging flaky test...");
+                TestLogs.LogInformation("payoutThatShouldBeProcessedStraightAway: " + payoutThatShouldBeProcessedStraightAway.Id);
+                foreach (var p in payouts)
+                {
+                    TestLogs.LogInformation("Payout Id: " + p.Id);
+                    TestLogs.LogInformation("Payout State: " + p.State);
+                }
+                throw;
+            }
             
             beforeHookTcs = new TaskCompletionSource();
             afterHookTcs = new TaskCompletionSource();
@@ -4450,7 +4531,7 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             await AssertHttpError(404, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal(storeId, "WRONG-ACCOUNT-ID", simulateWithdrawalRequest));
 
             // Test: SimulateWithdrawal, wrong store ID
-            // TODO it is wierd that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found.
+            // TODO it is weird that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found.
             await AssertHttpError(403, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, simulateWithdrawalRequest));
 
             // Test: SimulateWithdrawal, correct payment method, wrong amount
@@ -4481,7 +4562,7 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi
             await AssertHttpError(404, async () => await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, "WRONG-ACCOUNT-ID", createWithdrawalRequest));
 
             // Test: CreateWithdrawal, wrong store ID
-            // TODO it is wierd that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found.
+            // TODO it is weird that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found.
             await AssertHttpError(403, async () => await withdrawalClient.CreateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, createWithdrawalRequest));
 
             // Test: CreateWithdrawal, correct payment method, wrong amount

BTCPayServer.Tests/POSTests.cs

@@ -1,8 +1,10 @@
 using System.Threading.Tasks;
+using BTCPayServer.Client;
 using BTCPayServer.Controllers;
 using BTCPayServer.Data;
 using BTCPayServer.Hosting;
 using BTCPayServer.Models.AppViewModels;
+using BTCPayServer.Plugins.Crowdfund.Models;
 using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Controllers;
 using BTCPayServer.Plugins.PointOfSale.Models;
@@ -123,12 +125,14 @@ donation:
   price: 1.02
   custom: true
 ";
+            vmpos.Currency = "EUR";
             vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
             Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
             await pos.UpdatePointOfSale(app.Id).AssertViewModelAsync<UpdatePointOfSaleViewModel>();
             var publicApps = user.GetController<UIPointOfSaleController>();
             var vmview = await publicApps.ViewPointOfSale(app.Id, PosViewType.Cart).AssertViewModelAsync<ViewPointOfSaleViewModel>();
 
+            Assert.Equal("EUR", vmview.CurrencyCode);
             // apple shouldn't be available since we it's set to "disabled: true" above
             Assert.Equal(2, vmview.Items.Length);
             Assert.Equal("orange", vmview.Items[0].Title);
@@ -139,6 +143,41 @@ donation:
             // apple is not found
             Assert.IsType<NotFoundResult>(publicApps
                 .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
+            
+            // List
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
+            app = appList.Apps[0];
+            apps = user.GetController<UIAppsController>();
+            appData = new AppData { Id = app.Id, StoreDataId = app.StoreId, Name = app.AppName, AppType = appType, Settings = "{\"currency\":\"EUR\"}" };
+            apps.HttpContext.SetAppData(appData);
+            pos.HttpContext.SetAppData(appData);
+            Assert.Single(appList.Apps);
+            Assert.Equal("test", app.AppName);
+            Assert.True(app.Role.ToPermissionSet(appList.Apps[0].StoreId).Contains(Policies.CanModifyStoreSettings, app.StoreId));
+            Assert.Equal(user.StoreId, app.StoreId);
+            Assert.False(app.Archived);
+            // Archive
+            redirect = Assert.IsType<RedirectResult>(apps.ToggleArchive(app.Id).Result);
+            Assert.EndsWith("/settings/pos", redirect.Url);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
+            Assert.Empty(appList.Apps);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId, archived: true).Result).Model);
+            app = appList.Apps[0];
+            Assert.True(app.Archived);
+            Assert.IsType<NotFoundResult>(await publicApps.ViewPointOfSale(app.Id, PosViewType.Static));
+            // Unarchive
+            redirect = Assert.IsType<RedirectResult>(apps.ToggleArchive(app.Id).Result);
+            Assert.EndsWith("/settings/pos", redirect.Url);
+            appList = Assert.IsType<ListAppsViewModel>(Assert.IsType<ViewResult>(apps.ListApps(user.StoreId).Result).Model);
+            app = appList.Apps[0];
+            Assert.False(app.Archived);
+            Assert.IsType<ViewResult>(await publicApps.ViewPointOfSale(app.Id, PosViewType.Static));
+            // Delete
+            Assert.IsType<ViewResult>(apps.DeleteApp(app.Id));
+            var redirectToAction = Assert.IsType<RedirectToActionResult>(apps.DeleteAppPost(app.Id).Result);
+            Assert.Equal(nameof(UIStoresController.Dashboard), redirectToAction.ActionName);
+            appList = await apps.ListApps(user.StoreId).AssertViewModelAsync<ListAppsViewModel>();
+            Assert.Empty(appList.Apps);
         }
     }
 }

BTCPayServer.Tests/PaymentRequestTests.cs

@@ -31,7 +31,6 @@ namespace BTCPayServer.Tests
             user.RegisterDerivationScheme("BTC");
 
             var user2 = tester.NewAccount();
-
             await user2.GrantAccessAsync();
 
             var paymentRequestController = user.GetController<UIPaymentRequestController>();
@@ -162,7 +161,7 @@ namespace BTCPayServer.Tests
             using var tester = CreateServerTester();
             await tester.StartAsync();
             var user = tester.NewAccount();
-            user.GrantAccess();
+            await user.GrantAccessAsync();
             user.RegisterDerivationScheme("BTC");
 
             var paymentRequestController = user.GetController<UIPaymentRequestController>();
@@ -170,7 +169,7 @@ namespace BTCPayServer.Tests
             Assert.IsType<NotFoundResult>(await
                 paymentRequestController.CancelUnpaidPendingInvoice(Guid.NewGuid().ToString(), false));
 
-            var request = new UpdatePaymentRequestViewModel()
+            var request = new UpdatePaymentRequestViewModel
             {
                 Title = "original juice",
                 Currency = "BTC",

BTCPayServer.Tests/SeleniumTester.cs

@@ -295,17 +295,12 @@ namespace BTCPayServer.Tests
 
         public void AddLightningNode()
         {
-            AddLightningNode(null, null, true);
+            AddLightningNode(null, true);
         }
 
-        public void AddLightningNode(LightningConnectionType? connectionType = null, bool test = true)
+        public void AddLightningNode(string connectionType = null, bool test = true)
         {
-            AddLightningNode(null, connectionType, test);
-        }
-
-        public void AddLightningNode(string cryptoCode = null, LightningConnectionType? connectionType = null, bool test = true)
-        {
-            cryptoCode ??= "BTC";
+            var cryptoCode = "BTC";
             if (!Driver.PageSource.Contains("Connect to a Lightning node"))
             {
                 GoToLightningSettings();
@@ -565,7 +560,7 @@ namespace BTCPayServer.Tests
             walletId ??= WalletId;
             GoToWallet(walletId, WalletsNavPages.Receive);
             Driver.FindElement(By.Id("generateButton")).Click();
-            var addressStr = Driver.FindElement(By.Id("Address")).GetAttribute("value");
+            var addressStr = Driver.FindElement(By.Id("Address")).GetAttribute("data-text");
             var address = BitcoinAddress.Create(addressStr, ((BTCPayNetwork)Server.NetworkProvider.GetNetwork(walletId.CryptoCode)).NBitcoinNetwork);
             for (var i = 0; i < coins; i++)
             {